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_Bool GetThis(); - sal_Bool GetThisCol(); + bool GetThis(); + bool GetThisCol(); public: ScDocumentIterator( ScDocument* pDocument, SCTAB nStartTable, SCTAB nEndTable ); ~ScDocumentIterator(); - sal_Bool GetFirst(); - sal_Bool GetNext(); + bool GetFirst(); + bool GetNext(); ScBaseCell* GetCell(); const ScPatternAttr* GetPattern(); @@ -109,27 +109,27 @@ private: SCROW nNextRow; SCROW nAttrEndRow; short nNumFmtType; - sal_Bool bNumValid; - sal_Bool bSubTotal; - sal_Bool bNextValid; - sal_Bool bCalcAsShown; - sal_Bool bTextAsZero; + bool bNumValid; + bool bSubTotal; + bool bNextValid; + bool bCalcAsShown; + bool bTextAsZero; - sal_Bool GetThis(double& rValue, sal_uInt16& rErr); + bool GetThis(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 ); void GetCurNumFmtInfo( short& nType, sal_uLong& nIndex ); /// Does NOT reset rValue if no value found! - sal_Bool GetFirst(double& rValue, sal_uInt16& rErr); + bool GetFirst(double& rValue, sal_uInt16& rErr); /// Does NOT reset rValue if no value found! - sal_Bool GetNext(double& rValue, sal_uInt16& rErr) + bool GetNext(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_Bool bSubTotal; + bool bSubTotal; 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_uInt8 nStopOnMismatch; sal_uInt8 nTestEqualCondition; - sal_Bool bAdvanceQuery; - sal_Bool bIgnoreMismatchOnLeadingStrings; + bool bAdvanceQuery; + bool bIgnoreMismatchOnLeadingStrings; 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: // increments all Entry.nField, if column // changes, for ScInterpreter ScHLookup() - void SetAdvanceQueryParamEntryField( sal_Bool bVal ) + void SetAdvanceQueryParamEntryField( bool bVal ) { bAdvanceQuery = bVal; } void AdvanceQueryParamEntryField(); @@ -318,17 +318,17 @@ public: cell range is assumed to be sorted; stops on first value being greater than the queried value and GetFirst()/GetNext() return NULL. StoppedOnMismatch() - returns sal_True then. + returns true then. However, the iterator's conditions are not set to end all queries, GetCol() and GetRow() return values for the non-matching cell, further GetNext() calls may be executed. */ - void SetStopOnMismatch( sal_Bool bVal ) + void SetStopOnMismatch( bool bVal ) { nStopOnMismatch = sal::static_int_cast<sal_uInt8>(bVal ? nStopOnMismatchEnabled : nStopOnMismatchDisabled); } - sal_Bool StoppedOnMismatch() const + bool StoppedOnMismatch() const { return nStopOnMismatch == nStopOnMismatchExecuted; } /** If set, an additional test for SC_EQUAL condition is @@ -336,13 +336,13 @@ public: SC_GREATER_EQUAL conditions are to be tested. May be used where a cell range is assumed to be sorted to stop if an equal match is found. */ - void SetTestEqualCondition( sal_Bool bVal ) + void SetTestEqualCondition( bool bVal ) { nTestEqualCondition = sal::static_int_cast<sal_uInt8>(bVal ? nTestEqualConditionEnabled : nTestEqualConditionDisabled); } - sal_Bool IsEqualConditionFulfilled() const + bool IsEqualConditionFulfilled() const { return nTestEqualCondition == nTestEqualConditionFulfilled; } /** In a range assumed to be sorted find either the last of @@ -360,7 +360,7 @@ public: @param bIgnoreMismatchOnLeadingStrings Normally strings are sorted behind numerical - values. If this parameter is sal_True, the search does + values. If this parameter is true, the search does not stop when encountering a string and does not assume that no values follow anymore. If querying for a string a mismatch on the first @@ -372,9 +372,9 @@ public: iterator is not usable anymore except for obtaining the number format! */ - sal_Bool FindEqualOrSortedLastInRange( SCCOL& nFoundCol, - SCROW& nFoundRow, sal_Bool bSearchForEqualAfterMismatch = false, - sal_Bool bIgnoreMismatchOnLeadingStrings = sal_True ); + bool FindEqualOrSortedLastInRange( SCCOL& nFoundCol, + SCROW& nFoundRow, bool bSearchForEqualAfterMismatch = false, + bool bIgnoreMismatchOnLeadingStrings = true ); }; class ScDocAttrIterator // all attribute areas @@ -431,7 +431,7 @@ private: SCSIZE* pNextIndices; SCCOL nCol; SCROW nRow; - sal_Bool bMore; + bool bMore; public: ScHorizontalCellIterator(ScDocument* pDocument, SCTAB nTable, @@ -439,7 +439,7 @@ public: ~ScHorizontalCellIterator(); ScBaseCell* GetNext( SCCOL& rCol, SCROW& rRow ); - sal_Bool ReturnNext( SCCOL& rCol, SCROW& rRow ); + bool ReturnNext( SCCOL& rCol, SCROW& rRow ); /// Set a(nother) sheet and (re)init. void SetTab( SCTAB nTab ); @@ -499,7 +499,7 @@ private: const ScPatternAttr** ppPatterns; SCCOL nCol; SCROW nRow; - sal_Bool bRowEmpty; + bool bRowEmpty; public: ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB nTable, @@ -541,7 +541,7 @@ public: SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); ~ScUsedAreaIterator(); - sal_Bool GetNext(); + bool GetNext(); SCCOL GetStartCol() const { return nFoundStartCol; } SCCOL GetEndCol() const { return nFoundEndCol; } diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 9588638..874fa90 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -91,7 +91,7 @@ ScDocumentIterator::~ScDocumentIterator() { } -sal_Bool ScDocumentIterator::GetThisCol() +bool ScDocumentIterator::GetThisCol() { ScTable* pTab = NULL; while ( nTab < pDoc->GetTableCount() && (pTab = pDoc->maTabs[nTab]) == NULL ) @@ -112,7 +112,7 @@ sal_Bool ScDocumentIterator::GetThisCol() ScColumn* pCol = &pTab->aCol[nCol]; ScAttrArray* pAtt = pCol->pAttrArray; - sal_Bool bFound = false; + bool bFound = false; do { SCROW nColRow; @@ -136,13 +136,13 @@ sal_Bool ScDocumentIterator::GetThisCol() if (nColRow == nRow) { - bFound = sal_True; + bFound = true; pCell = pCol->maItems[nColPos].pCell; pPattern = pAtt->pData[nAttrPos].pPattern; } else if ( pAtt->pData[nAttrPos].pPattern != pDefPattern ) { - bFound = sal_True; + bFound = true; pCell = NULL; pPattern = pAtt->pData[nAttrPos].pPattern; } @@ -156,10 +156,10 @@ sal_Bool ScDocumentIterator::GetThisCol() return bFound; } -sal_Bool ScDocumentIterator::GetThis() +bool ScDocumentIterator::GetThis() { - sal_Bool bEnd = false; - sal_Bool bSuccess = false; + bool bEnd = false; + bool bSuccess = false; while ( !bSuccess && !bEnd ) { @@ -176,7 +176,7 @@ sal_Bool ScDocumentIterator::GetThis() nCol = 0; ++nTab; if (nTab > nEndTab) - bEnd = sal_True; + bEnd = true; } nRow = 0; nColPos = 0; @@ -187,7 +187,7 @@ sal_Bool ScDocumentIterator::GetThis() return !bEnd; } -sal_Bool ScDocumentIterator::GetFirst() +bool ScDocumentIterator::GetFirst() { nCol = 0; nTab = nStartTab; @@ -199,7 +199,7 @@ sal_Bool ScDocumentIterator::GetFirst() return GetThis(); } -sal_Bool ScDocumentIterator::GetNext() +bool ScDocumentIterator::GetNext() { ++nRow; @@ -244,7 +244,7 @@ void lcl_IterGetNumberFormat( sal_uLong& nFormat, const ScAttrArray*& rpArr, } ScValueIterator::ScValueIterator( ScDocument* pDocument, const ScRange& rRange, - sal_Bool bSTotal, sal_Bool bTextZero ) : + bool bSTotal, bool bTextZero ) : pDoc( pDocument ), nNumFmtIndex(0), nStartCol( rRange.aStart.Col() ), @@ -284,7 +284,7 @@ ScValueIterator::ScValueIterator( ScDocument* pDocument, const ScRange& rRange, nAttrEndRow = 0; } -sal_Bool ScValueIterator::GetThis(double& rValue, sal_uInt16& rErr) +bool ScValueIterator::GetThis(double& rValue, sal_uInt16& rErr) { if (nTab >= pDoc->GetTableCount()) { @@ -350,7 +350,7 @@ sal_Bool ScValueIterator::GetThis(double& rValue, sal_uInt16& rErr) { fNextValue = ((ScValueCell*)pCol->maItems[nColRow].pCell)->GetValue(); nNextRow = pCol->maItems[nColRow].nRow; - bNextValid = sal_True; + bNextValid = true; if ( bCalcAsShown ) { lcl_IterGetNumberFormat( nNumFormat, pAttrArray, @@ -359,7 +359,7 @@ sal_Bool ScValueIterator::GetThis(double& rValue, sal_uInt16& rErr) } } - return sal_True; // gefunden + return true; // gefunden } // break; case CELLTYPE_FORMULA: @@ -372,14 +372,14 @@ sal_Bool ScValueIterator::GetThis(double& rValue, sal_uInt16& rErr) rValue = ((ScFormulaCell*)pCell)->GetValue(); nRow--; bNumValid = false; - return sal_True; // gefunden + return true; // gefunden } else if ( bTextAsZero ) { rValue = 0.0; nRow--; bNumValid = false; - return sal_True; + return true; } } } @@ -393,9 +393,9 @@ sal_Bool ScValueIterator::GetThis(double& rValue, sal_uInt16& rErr) rValue = 0.0; nNumFmtType = NUMBERFORMAT_NUMBER; nNumFmtIndex = 0; - bNumValid = sal_True; + bNumValid = true; --nRow; - return sal_True; + return true; } } break; @@ -438,13 +438,13 @@ void ScValueIterator::GetCurNumFmtInfo( short& nType, sal_uLong& nIndex ) } else nNumFmtType = pDoc->GetFormatTable()->GetType( nNumFmtIndex ); - bNumValid = sal_True; + bNumValid = true; } nType = nNumFmtType; nIndex = nNumFmtIndex; } -sal_Bool ScValueIterator::GetFirst(double& rValue, sal_uInt16& rErr) +bool ScValueIterator::GetFirst(double& rValue, sal_uInt16& rErr) { nCol = nStartCol; nRow = nStartRow; @@ -600,7 +600,7 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue) nNumFmtType = NUMBERFORMAT_NUMBER; nNumFmtIndex = 0; rValue.mnError = 0; - return sal_True; // gefunden + return true; // gefunden } // break; case CELLTYPE_FORMULA: @@ -613,7 +613,7 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue) nNumFmtIndex, ScAddress( nCol, nRow, nTab ), pCell ); rValue.mnError = ((ScFormulaCell*)pCell)->GetErrCode(); - return sal_True; // gefunden + return true; // gefunden } else nRow++; @@ -935,7 +935,7 @@ bool ScDBQueryDataIterator::GetNext(Value& rValue) ScCellIterator::ScCellIterator( ScDocument* pDocument, SCCOL nSCol, SCROW nSRow, SCTAB nSTab, - SCCOL nECol, SCROW nERow, SCTAB nETab, sal_Bool bSTotal ) : + SCCOL nECol, SCROW nERow, SCTAB nETab, bool bSTotal ) : pDoc( pDocument ), nStartCol( nSCol), nStartRow( nSRow), @@ -979,7 +979,7 @@ ScCellIterator::ScCellIterator( ScDocument* pDocument, } ScCellIterator::ScCellIterator - ( ScDocument* pDocument, const ScRange& rRange, sal_Bool bSTotal ) : + ( ScDocument* pDocument, const ScRange& rRange, bool bSTotal ) : pDoc( pDocument ), nStartCol( rRange.aStart.Col() ), nStartRow( rRange.aStart.Row() ), @@ -1089,7 +1089,7 @@ ScBaseCell* ScCellIterator::GetNext() //------------------------------------------------------------------------------- ScQueryCellIterator::ScQueryCellIterator(ScDocument* pDocument, SCTAB nTable, - const ScQueryParam& rParam, sal_Bool bMod ) : + const ScQueryParam& rParam, bool bMod ) : mpParam(new ScQueryParam(rParam)), pDoc( pDocument ), nTab( nTable), @@ -1265,14 +1265,14 @@ void ScQueryCellIterator::AdvanceQueryParamEntryField() } -sal_Bool ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol, - SCROW& nFoundRow, sal_Bool bSearchForEqualAfterMismatch, - sal_Bool bIgnoreMismatchOnLeadingStringsP ) +bool ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol, + SCROW& nFoundRow, bool bSearchForEqualAfterMismatch, + bool bIgnoreMismatchOnLeadingStringsP ) { nFoundCol = MAXCOL+1; nFoundRow = MAXROW+1; - SetStopOnMismatch( sal_True ); // assume sorted keys - SetTestEqualCondition( sal_True ); + SetStopOnMismatch( true ); // assume sorted keys + SetTestEqualCondition( true ); bIgnoreMismatchOnLeadingStrings = bIgnoreMismatchOnLeadingStringsP; bool bRegExp = mpParam->bRegExp && mpParam->GetEntry(0).GetQueryItem().meType == ScQueryEntry::ByString; bool bBinary = !bRegExp && mpParam->bByRow && (mpParam->GetEntry(0).eOp == @@ -1336,7 +1336,7 @@ sal_Bool ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol, nCol = nFoundCol; nRow = nFoundRow; nColRow = nColRowSave; - return sal_True; + return true; } if ( (bSearchForEqualAfterMismatch || mpParam->bRegExp) && StoppedOnMismatch() ) @@ -1377,7 +1377,7 @@ sal_Bool ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol, nFoundCol = GetCol(); nFoundRow = GetRow(); nColRowSave = nColRow; - SetStopOnMismatch( sal_True ); + SetStopOnMismatch( true ); } while (GetNext()); nCol = nFoundCol; nRow = nFoundRow; @@ -1490,7 +1490,7 @@ ScBaseCell* ScQueryCellIterator::BinarySearch() bDone = true; continue; // while } - sal_Bool bStr = pCol->maItems[i].pCell->HasStringData(); + bool bStr = pCol->maItems[i].pCell->HasStringData(); nRes = 0; // compares are content<query:-1, content>query:1 // Cell value comparison similar to ScTable::ValidQuery() @@ -1670,7 +1670,7 @@ ScHorizontalCellIterator::ScHorizontalCellIterator(ScDocument* pDocument, SCTAB nEndRow( nRow2 ), nCol( nCol1 ), nRow( nRow1 ), - bMore( sal_True ) + bMore( true ) { if (nTab >= pDoc->GetTableCount()) OSL_FAIL("try to access index out of bounds, FIX IT"); @@ -1745,7 +1745,7 @@ ScBaseCell* ScHorizontalCellIterator::GetNext( SCCOL& rCol, SCROW& rRow ) return NULL; } -sal_Bool ScHorizontalCellIterator::ReturnNext( SCCOL& rCol, SCROW& rRow ) +bool ScHorizontalCellIterator::ReturnNext( SCCOL& rCol, SCROW& rRow ) { rCol = nCol; rRow = nRow; @@ -1754,14 +1754,14 @@ sal_Bool ScHorizontalCellIterator::ReturnNext( SCCOL& rCol, SCROW& rRow ) void ScHorizontalCellIterator::Advance() { - sal_Bool bFound = false; + bool bFound = false; SCCOL i; for (i=nCol+1; i<=nEndCol && !bFound; i++) if (pNextRows[i-nStartCol] == nRow) { nCol = i; - bFound = sal_True; + bFound = true; } if (!bFound) @@ -1777,7 +1777,7 @@ void ScHorizontalCellIterator::Advance() if (nMinRow <= nEndRow) { nRow = nMinRow; - bFound = sal_True; + bFound = true; } } @@ -1934,7 +1934,7 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB ppPatterns = new const ScPatternAttr*[nEndCol-nStartCol+1]; SCROW nSkipTo = MAXROW; - sal_Bool bEmpty = sal_True; + bool bEmpty = true; for (i=nStartCol; i<=nEndCol; i++) { SCCOL nPos = i - nStartCol; @@ -2004,7 +2004,7 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo if ( nRow > nEndRow ) // schon am Ende? return NULL; // nichts gefunden - sal_Bool bEmpty = sal_True; + bool bEmpty = true; SCCOL i; for ( i = nStartCol; i <= nEndCol; i++) @@ -2056,7 +2056,7 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo //------------------------------------------------------------------------------- -inline sal_Bool IsGreater( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) +inline bool IsGreater( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { return ( nRow1 > nRow2 ) || ( nRow1 == nRow2 && nCol1 > nCol2 ); } @@ -2076,7 +2076,7 @@ ScUsedAreaIterator::~ScUsedAreaIterator() { } -sal_Bool ScUsedAreaIterator::GetNext() +bool ScUsedAreaIterator::GetNext() { // Iteratoren weiterzaehlen @@ -2094,8 +2094,8 @@ sal_Bool ScUsedAreaIterator::GetNext() // naechsten Abschnitt heraussuchen - sal_Bool bFound = sal_True; - sal_Bool bUseCell = false; + bool bFound = true; + bool bUseCell = false; if ( pCell && pPattern ) { @@ -2112,7 +2112,7 @@ sal_Bool ScUsedAreaIterator::GetNext() } else { - bUseCell = sal_True; + bUseCell = true; if ( nAttrRow == nCellRow && nAttrCol1 == nCellCol ) // Attribute auf der Zelle ? pFoundPattern = pPattern; else @@ -2122,7 +2122,7 @@ sal_Bool ScUsedAreaIterator::GetNext() else if ( pCell ) // nur Zelle -> direkt uebernehmen { pFoundPattern = NULL; - bUseCell = sal_True; // Position von Zelle + bUseCell = true; // Position von Zelle } else if ( pPattern ) // nur Attribute -> direkt uebernehmen { commit 240464f62bcd95a62ee1692aaa7e5f74a693a5ba Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Mon Mar 26 00:37:07 2012 +0200 clean-up sc's macros_test a bit diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index cfba258..9a68b77 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -47,31 +47,9 @@ #include "scitems.hxx" #include "document.hxx" -#define ODS_FORMAT_TYPE 50331943 -#define XLS_FORMAT_TYPE 318767171 -#define XLSX_FORMAT_TYPE 268959811 - -#define ODS 0 -#define XLS 1 -#define XLSX 2 - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -namespace { - -struct FileFormat { - const char* pName; const char* pFilterName; const char* pTypeName; sal_uLong nFormatType; -}; - -FileFormat aFileFormats[] = { - { "ods" , "calc8", "", ODS_FORMAT_TYPE }, - { "xls" , "MS Excel 97", "calc_MS_EXCEL_97", XLS_FORMAT_TYPE }, - { "xlsx", "Calc MS Excel 2007 XML" , "MS Excel 2007 XML", XLSX_FORMAT_TYPE } -}; - -} - /* Implementation of Macros test */ class ScMacrosTest : public test::BootstrapFixture, public unotest::MacrosTest @@ -114,12 +92,10 @@ void ScMacrosTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUSt void ScMacrosTest::testStarBasic() { const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("StarBasic.")); - rtl::OUString aFileExtension(aFileFormats[0].pName, strlen(aFileFormats[0].pName), RTL_TEXTENCODING_UTF8 ); - rtl::OUString aFilterName(aFileFormats[0].pFilterName, strlen(aFileFormats[0].pFilterName), RTL_TEXTENCODING_UTF8) ; + rtl::OUString aFileExtension("ods"); rtl::OUString aFileName; createFileURL(aFileNameBase, aFileExtension, aFileName); - rtl::OUString aFilterType(aFileFormats[0].pTypeName, strlen(aFileFormats[0].pTypeName), RTL_TEXTENCODING_UTF8); - std::cout << aFileFormats[0].pName << " Test" << std::endl; + std::cout << "StarBasic test" << std::endl; uno::Reference< com::sun::star::lang::XComponent > xComponent = loadFromDesktop(aFileName); CPPUNIT_ASSERT_MESSAGE("Failed to load StarBasic.ods", xComponent.is()); @@ -159,10 +135,7 @@ void ScMacrosTest::testVba() } }; - rtl::OUString aFileExtension(aFileFormats[1].pName, strlen(aFileFormats[1].pName), RTL_TEXTENCODING_UTF8 ); - rtl::OUString aFilterName(aFileFormats[1].pFilterName, strlen(aFileFormats[1].pFilterName), RTL_TEXTENCODING_UTF8) ; - rtl::OUString aFilterType(aFileFormats[1].pTypeName, strlen(aFileFormats[1].pTypeName), RTL_TEXTENCODING_UTF8); - std::cout << aFileFormats[1].pName << " Test" << std::endl; + rtl::OUString aFileExtension("xls"); for ( sal_uInt32 i=0; i<SAL_N_ELEMENTS( testInfo ); ++i ) { rtl::OUString aFileName; commit 891574788ad6ab612c1c2653c070ab8b7e297072 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Mon Mar 26 00:31:01 2012 +0200 disable password test onwindows for now diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 4aac0fc..7ff3ba0 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -126,7 +126,7 @@ public: CPPUNIT_TEST(testBugFixesXLSX); //disable testPassword on MacOSX due to problems with libsqlite3 //also crashes on DragonFly due to problems with nss/nspr headers -#if !defined(MACOSX) && !defined(DRAGONFLY) +#if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(WNT) CPPUNIT_TEST(testPasswordOld); CPPUNIT_TEST(testPasswordNew); #endif _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits