[Libreoffice-commits] .: 3 commits - sc/inc sc/qa sc/source
sc/inc/column.hxx | 11 ---
sc/inc/document.hxx |3 ---
sc/inc/table.hxx|4
sc/qa/unit/ucalc.cxx|7 +++
sc/source/core/data/column.cxx | 15 ---
sc/source/core/data/column3.cxx |3 ---
sc/source/core/data/documen3.cxx| 12
sc/source/core/data/document.cxx| 16
sc/source/core/data/table1.cxx | 11 +++
sc/source/core/data/table2.cxx | 35 ---
sc/source/core/data/table3.cxx | 12
sc/source/core/data/table6.cxx |5 -
sc/source/filter/excel/colrowst.cxx |5 -
sc/source/ui/docshell/dbdocimp.cxx |1 -
sc/source/ui/docshell/docfunc.cxx |8
sc/source/ui/docshell/docsh.cxx | 10 --
sc/source/ui/docshell/docsh8.cxx|3 ---
sc/source/ui/docshell/impex.cxx |2 --
sc/source/ui/docshell/olinefun.cxx | 15 +++
sc/source/ui/undo/undoblk.cxx | 16
sc/source/ui/unoobj/cellsuno.cxx|6 --
21 files changed, 37 insertions(+), 163 deletions(-)
New commits:
commit 52faa1f933f07ac93752dffdc1a35620029252e3
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Nov 1 16:28:57 2012 -0400
Explicitly call these methods to init / update note positions.
Since we don't use inc / dec recalc level, we need to do this.
Change-Id: Ia99b4dbfceefd1ed951a61374250c5c61e39a62a
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index 1882593..e77f4ca 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1499,6 +1499,8 @@ sal_Bool ScDocFunc::InsertCells( const ScRange rRange,
const ScMarkData* pTabMa
itr = aMark.begin();
for (; itr != itrEnd nTabCount; ++itr)
{
+pDoc-InitializeNoteCaptions(*itr);
+
i = *itr;
if( pDoc-HasAttrib( nMergeTestStartX, nMergeTestStartY, i,
nMergeTestEndX, nMergeTestEndY, i, HASATTR_MERGED | HASATTR_OVERLAPPED ) )
{
@@ -1721,6 +1723,8 @@ sal_Bool ScDocFunc::InsertCells( const ScRange rRange,
const ScMarkData* pTabMa
for (; itr != itrEnd *itr nTabCount; ++itr)
{
i = *itr;
+pDoc-SetDrawPageSize(i);
+
if (bNeedRefresh)
pDoc-ExtendMerge( nMergeTestStartX, nMergeTestStartY,
nMergeTestEndX, nMergeTestEndY, i, sal_True );
else
@@ -1904,6 +1908,8 @@ sal_Bool ScDocFunc::DeleteCells( const ScRange rRange,
const ScMarkData* pTabMa
itr = aMark.begin();
for (; itr != itrEnd *itr nTabCount; ++itr)
{
+pDoc-InitializeNoteCaptions(*itr);
+
SCTAB i = *itr;
if ( pDoc-HasAttrib( nUndoStartX, nUndoStartY, i, nMergeTestEndX,
nMergeTestEndY, i, HASATTR_MERGED | HASATTR_OVERLAPPED ))
{
@@ -2227,6 +2233,8 @@ sal_Bool ScDocFunc::DeleteCells( const ScRange rRange,
const ScMarkData* pTabMa
itr = aMark.begin(), itrEnd = aMark.end();
for (; itr != itrEnd *itr nTabCount; ++itr)
{
+pDoc-SetDrawPageSize(*itr);
+
if ( eCmd == DEL_DELCOLS || eCmd == DEL_DELROWS )
pDoc-UpdatePageBreaks( *itr );
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 3fe71b1..754aed1 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -284,6 +284,10 @@ void ScUndoInsertCells::Undo()
BeginUndo();
DoChange( sal_True );
EndUndo();
+
+ScDocument* pDoc = pDocShell-GetDocument();
+for (SCTAB i = 0; i nCount; ++i)
+pDoc-SetDrawPageSize(pTabs[i]);
}
void ScUndoInsertCells::Redo()
@@ -295,6 +299,10 @@ void ScUndoInsertCells::Redo()
if ( pPasteUndo )
pPasteUndo-Redo(); // redo paste last
+
+ScDocument* pDoc = pDocShell-GetDocument();
+for (SCTAB i = 0; i nCount; ++i)
+pDoc-SetDrawPageSize(pTabs[i]);
}
void ScUndoInsertCells::Repeat(SfxRepeatTarget rTarget)
@@ -519,6 +527,10 @@ void ScUndoDeleteCells::Undo()
pViewShell-MarkRange( ScRange(aEffRange.aStart.Col(),
aEffRange.aStart.Row(), pTabs[i], aEffRange.aEnd.Col(), aEffRange.aEnd.Row(),
pTabs[i]+pScenarios[i]) );
}
}
+
+ScDocument* pDoc = pDocShell-GetDocument();
+for (SCTAB i = 0; i nCount; ++i)
+pDoc-SetDrawPageSize(pTabs[i]);
}
void ScUndoDeleteCells::Redo()
@@ -532,6 +544,10 @@ void ScUndoDeleteCells::Redo()
ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
if (pViewShell)
pViewShell-DoneBlockMode();// current way
+
+ScDocument* pDoc = pDocShell-GetDocument();
+for (SCTAB i = 0; i nCount; ++i)
+pDoc-SetDrawPageSize(pTabs[i]);
}
void ScUndoDeleteCells::Repeat(SfxRepeatTarget rTarget)
commit b10833d4db6046f2d32ea44a60cb19a626d80447
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu
[Libreoffice-commits] .: 3 commits - sc/inc sc/qa sc/source
sc/inc/colorscale.hxx |8 +-
sc/inc/conditio.hxx|6 -
sc/qa/unit/data/ods/colorScale.ods |binary
sc/qa/unit/data/xlsx/colorScale.xlsx |binary
sc/qa/unit/subsequent_filters-test.cxx | 119 ++---
sc/source/core/data/colorscale.cxx | 54 +-
sc/source/core/data/conditio.cxx |4 -
7 files changed, 156 insertions(+), 35 deletions(-)
New commits:
commit 0222ce3cc6bdf4f6927139347ef5506a869eb977
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Sep 23 20:06:18 2012 +0200
add color scale import test for xlsx
Change-Id: I8877d285be21ea4cd010cb532de593b3f5ab5975
diff --git a/sc/qa/unit/data/xlsx/colorScale.xlsx
b/sc/qa/unit/data/xlsx/colorScale.xlsx
new file mode 100644
index 000..33234ee
Binary files /dev/null and b/sc/qa/unit/data/xlsx/colorScale.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 6a2267a..8670345 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -142,6 +142,7 @@ public:
void testDataValidityODS();
void testColorScaleODS();
+void testColorScaleXLSX();
void testDataBarODS();
void testNewCondFormat();
@@ -194,6 +195,7 @@ public:
CPPUNIT_TEST(testControlImport);
CPPUNIT_TEST(testColorScaleODS);
+CPPUNIT_TEST(testColorScaleXLSX);
CPPUNIT_TEST(testDataBarODS);
CPPUNIT_TEST(testNewCondFormat);
@@ -1568,6 +1570,26 @@ void ScFiltersTest::testColorScaleODS()
testColorScale_Impl(pDoc, aBuffer.makeStringAndClear());
}
+void ScFiltersTest::testColorScaleXLSX()
+{
+const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(colorScale.));
+rtl::OUString aFileExtension(aFileFormats[XLSX].pName,
strlen(aFileFormats[XLSX].pName), RTL_TEXTENCODING_UTF8 );
+rtl::OUString aFilterName(aFileFormats[XLSX].pFilterName,
strlen(aFileFormats[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ;
+rtl::OUString aFileName;
+createFileURL(aFileNameBase, aFileExtension, aFileName);
+rtl::OUString aFilterType(aFileFormats[XLSX].pTypeName,
strlen(aFileFormats[XLSX].pTypeName), RTL_TEXTENCODING_UTF8);
+std::cout aFileFormats[XLSX].pName Test std::endl;
+ScDocShellRef xDocSh = load (aFilterName, aFileName, rtl::OUString(),
aFilterType, aFileFormats[XLSX].nFormatType);
+
+CPPUNIT_ASSERT_MESSAGE(Failed to load colorScale.xlsx, xDocSh.Is());
+
+ScDocument* pDoc = xDocSh-GetDocument();
+
+rtl::OUStringBuffer aBuffer(getSrcRootPath());
+
aBuffer.append(m_aBaseString).append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/reference/)));
+testColorScale_Impl(pDoc, aBuffer.makeStringAndClear());
+}
+
void ScFiltersTest::testDataBarODS()
{
commit cb3ab592fd462bdd877178c6f0f0b7638938f0ce
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Sep 23 19:57:11 2012 +0200
improve the color Scale test
Change-Id: I6004874b83adbc602dcad83192cf68607bee5a96
diff --git a/sc/qa/unit/data/ods/colorScale.ods
b/sc/qa/unit/data/ods/colorScale.ods
index 1c3fe6e..1e1f457 100644
Binary files a/sc/qa/unit/data/ods/colorScale.ods and
b/sc/qa/unit/data/ods/colorScale.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index d48c455..6a2267a 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -141,9 +141,9 @@ public:
void testRepeatedColumnsODS();
void testDataValidityODS();
-void testColorScale();
-void testDataBar();
-void testCondFormat();
+void testColorScaleODS();
+void testDataBarODS();
+void testNewCondFormat();
//change this test file only in excel and not in calc
void testSharedFormulaXLSX();
@@ -193,9 +193,9 @@ public:
CPPUNIT_TEST(testCellValueXLSX);
CPPUNIT_TEST(testControlImport);
-CPPUNIT_TEST(testColorScale);
-CPPUNIT_TEST(testDataBar);
-CPPUNIT_TEST(testCondFormat);
+CPPUNIT_TEST(testColorScaleODS);
+CPPUNIT_TEST(testDataBarODS);
+CPPUNIT_TEST(testNewCondFormat);
CPPUNIT_TEST(testNumberFormatHTML);
CPPUNIT_TEST(testNumberFormatCSV);
@@ -1485,7 +1485,70 @@ void ScFiltersTest::testPivotTableBasicODS()
xDocSh-DoClose();
}
-void ScFiltersTest::testColorScale()
+namespace {
+
+void testColorScale_Impl(ScDocument* pDoc, const rtl::OUString aBaseString)
+{
+// first color scale
+{
+rtl::OUStringBuffer aBuf;
+const ScConditionalFormat* pFormat = pDoc-GetCondFormat(1,1,0);
+CPPUNIT_ASSERT(pFormat);
+pFormat-dumpInfo(aBuf);
+rtl::OUString aString = aBuf.makeStringAndClear();
+rtl::OUString aFilePath = aBaseString +
rtl::OUString(colorScale_1.txt);
+std::string aStdString;
+loadFile(aFilePath, aStdString);
+rtl::OUString aRefString =
[Libreoffice-commits] .: 3 commits - sc/inc sc/qa sc/source
sc/inc/column.hxx|2
sc/inc/document.hxx |2
sc/inc/global.hxx|8 ++
sc/inc/table.hxx |6 +
sc/qa/unit/ucalc.cxx | 36 --
sc/source/core/data/column2.cxx | 20 ++---
sc/source/core/data/document.cxx |4 -
sc/source/core/data/table1.cxx | 134 ---
sc/source/ui/vba/vbarange.cxx| 13 +--
sc/source/ui/view/tabview2.cxx |8 +-
sc/source/ui/view/viewfun2.cxx |4 -
11 files changed, 163 insertions(+), 74 deletions(-)
New commits:
commit 5e0672f32ea6a4d3d6cf66874d0d7c0bdb3dec1d
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Aug 9 15:58:00 2012 +0200
remove useless variable
Change-Id: Ic04e11cd0768bc203188f0b5adb5f4b9725fd6d9
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index fbd84e7..d381db3 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1335,7 +1335,6 @@ SCROW ScColumn::FindNextVisibleRowWithContent(SCROW nRow,
bool bForward) const
{
if(bForward)
{
-bool bFound = false;
do
{
nRow++;
@@ -1362,13 +1361,12 @@ SCROW ScColumn::FindNextVisibleRowWithContent(SCROW
nRow, bool bForward) const
nRow = maItems[nIndex].nRow - 1;
}
}
-while(!bFound nRow MAXROW);
+while(nRow MAXROW);
return MAXROW;
}
else
{
-bool bFound = false;
do
{
nRow--;
@@ -1390,7 +1388,7 @@ SCROW ScColumn::FindNextVisibleRowWithContent(SCROW nRow,
bool bForward) const
else
nRow = maItems[nIndex-1].nRow + 1;
}
-while(!bFound nRow 0);
+while(nRow 0);
return 0;
}
commit a69d704dc0950ab62e260cb93eb5f37db45e2183
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Aug 9 15:56:00 2012 +0200
adapt unit test and activate all test cases
Change-Id: If5998c62709de0f95b2870327fca951cd81f2406
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index fc51b22..49beff8 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4617,27 +4617,27 @@ void Test::testFindAreaPosRowDown()
SCCOL nCol = 0;
SCROW nRow = 0;
-pDoc-FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
CPPUNIT_ASSERT_EQUAL(static_castSCROW(1), nRow);
CPPUNIT_ASSERT_EQUAL(static_castSCCOL(0), nCol);
-pDoc-FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
CPPUNIT_ASSERT_EQUAL(static_castSCROW(2), nRow);
CPPUNIT_ASSERT_EQUAL(static_castSCCOL(0), nCol);
-pDoc-FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
CPPUNIT_ASSERT_EQUAL(static_castSCROW(5), nRow);
CPPUNIT_ASSERT_EQUAL(static_castSCCOL(0), nCol);
-pDoc-FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
CPPUNIT_ASSERT_EQUAL(static_castSCROW(6), nRow);
CPPUNIT_ASSERT_EQUAL(static_castSCCOL(0), nCol);
-pDoc-FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
CPPUNIT_ASSERT_EQUAL(static_castSCROW(MAXROW), nRow);
CPPUNIT_ASSERT_EQUAL(static_castSCCOL(0), nCol);
@@ -4645,12 +4645,12 @@ void Test::testFindAreaPosRowDown()
nCol = 1;
nRow = 2;
-pDoc-FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
CPPUNIT_ASSERT_EQUAL(static_castSCROW(3), nRow);
CPPUNIT_ASSERT_EQUAL(static_castSCCOL(1), nCol);
-pDoc-FindAreaPos(nCol, nRow, 0, 0, 1);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_DOWN);
CPPUNIT_ASSERT_EQUAL(static_castSCROW(6), nRow);
CPPUNIT_ASSERT_EQUAL(static_castSCCOL(1), nCol);
@@ -4678,29 +4678,27 @@ void Test::testFindAreaPosColRight()
SCCOL nCol = 0;
SCROW nRow = 0;
-pDoc-FindAreaPos(nCol, nRow, 0, 1, 0);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_RIGHT);
CPPUNIT_ASSERT_EQUAL(static_castSCROW(0), nRow);
CPPUNIT_ASSERT_EQUAL(static_castSCCOL(1), nCol);
-pDoc-FindAreaPos(nCol, nRow, 0, 1, 0);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_RIGHT);
CPPUNIT_ASSERT_EQUAL(static_castSCROW(0), nRow);
CPPUNIT_ASSERT_EQUAL(static_castSCCOL(2), nCol);
-pDoc-FindAreaPos(nCol, nRow, 0, 1, 0);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_RIGHT);
CPPUNIT_ASSERT_EQUAL(static_castSCROW(0), nRow);
-// BUG! This returns right now 4 because FindAreaPos does
-// not yet work correctly with hidden rows
-//CPPUNIT_ASSERT_EQUAL(static_castSCCOL(5), nCol);
+CPPUNIT_ASSERT_EQUAL(static_castSCCOL(5), nCol);
-pDoc-FindAreaPos(nCol, nRow, 0, 1, 0);
+pDoc-FindAreaPos(nCol, nRow, 0, SC_MOVE_RIGHT);
CPPUNIT_ASSERT_EQUAL(static_castSCROW(0), nRow);
[Libreoffice-commits] .: 3 commits - sc/inc sc/qa sc/source
sc/inc/dociter.hxx | 70 -
sc/qa/extras/macros-test.cxx | 33 +--
sc/qa/unit/subsequent_filters-test.cxx |2
sc/source/core/data/dociter.cxx| 92 -
4 files changed, 85 insertions(+), 112 deletions(-)
New commits:
commit 549a68159c3faa7bc698cd980c5c589931643549
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Mar 26 03:10:24 2012 +0200
sal_Bool - bool in dociter.[ch]xx
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index febd041..79495e1 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -73,15 +73,15 @@ private:
SCSIZE nColPos;
SCSIZE nAttrPos;
-sal_BoolGetThis();
-sal_BoolGetThisCol();
+boolGetThis();
+boolGetThisCol();
public:
ScDocumentIterator( ScDocument* pDocument, SCTAB nStartTable,
SCTAB nEndTable );
~ScDocumentIterator();
-sal_BoolGetFirst();
-sal_BoolGetNext();
+boolGetFirst();
+boolGetNext();
ScBaseCell* GetCell();
const ScPatternAttr*GetPattern();
@@ -109,27 +109,27 @@ private:
SCROW nNextRow;
SCROW nAttrEndRow;
short nNumFmtType;
-sal_BoolbNumValid;
-sal_BoolbSubTotal;
-sal_BoolbNextValid;
-sal_BoolbCalcAsShown;
-sal_BoolbTextAsZero;
+boolbNumValid;
+boolbSubTotal;
+boolbNextValid;
+boolbCalcAsShown;
+boolbTextAsZero;
-sal_BoolGetThis(double rValue, sal_uInt16 rErr);
+boolGetThis(double rValue, sal_uInt16 rErr);
public:
ScValueIterator(ScDocument* pDocument,
-const ScRange rRange, sal_Bool bSTotal =
false,
-sal_Bool bTextAsZero = false );
+const ScRange rRange, bool bSTotal =
false,
+bool bTextAsZero = false );
voidGetCurNumFmtInfo( short nType, sal_uLong nIndex );
/// Does NOT reset rValue if no value found!
-sal_BoolGetFirst(double rValue, sal_uInt16 rErr);
+boolGetFirst(double rValue, sal_uInt16 rErr);
/// Does NOT reset rValue if no value found!
-sal_BoolGetNext(double rValue, sal_uInt16 rErr)
+boolGetNext(double rValue, sal_uInt16 rErr)
{
return bNextValid ? ( bNextValid = false, rValue =
fNextValue,
rErr = 0, nRow = nNextRow,
-++nColRow, bNumValid = false,
sal_True )
+++nColRow, bNumValid = false,
true )
: ( ++nRow, GetThis(rValue, rErr) );
}
};
@@ -233,16 +233,16 @@ private:
SCROW nRow;
SCTAB nTab;
SCSIZE nColRow;
-sal_BoolbSubTotal;
+boolbSubTotal;
ScBaseCell* GetThis();
public:
ScCellIterator(ScDocument* pDocument,
SCCOL nSCol, SCROW nSRow, SCTAB nSTab,
SCCOL nECol, SCROW nERow, SCTAB nETab,
- sal_Bool bSTotal = false);
+ bool bSTotal = false);
ScCellIterator(ScDocument* pDocument,
- const ScRange rRange, sal_Bool bSTotal =
false);
+ const ScRange rRange, bool bSTotal =
false);
ScBaseCell* GetFirst();
ScBaseCell* GetNext();
SCCOL GetCol() const { return nCol; }
@@ -281,8 +281,8 @@ private:
SCROW nAttrEndRow;
sal_uInt8nStopOnMismatch;
sal_uInt8nTestEqualCondition;
-sal_BoolbAdvanceQuery;
-sal_BoolbIgnoreMismatchOnLeadingStrings;
+boolbAdvanceQuery;
+boolbIgnoreMismatchOnLeadingStrings;
ScBaseCell* GetThis();
@@ -299,7 +299,7 @@ private:
public:
ScQueryCellIterator(ScDocument* pDocument, SCTAB nTable,
-const ScQueryParam aParam, sal_Bool
bMod = true);
+const ScQueryParam aParam, bool bMod
= true);
// for bMod = FALSE the QueryParam has
to be filled
// (bIsString)
ScBaseCell* GetFirst();
@@ -309,7 +309,7 @@ public:
