diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-25 12:03:58 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-02 08:02:54 +0000 |
commit | 4978328534c0f759eea7d0c196046f1d53b06925 (patch) | |
tree | cf9dcd62c4f09dcd08115bbda2a8950678a38562 /sc | |
parent | 1461ebbbb5d47d90e31f0945a4878a68fbee5213 (diff) |
convert method names in tools::SvRef to be more like our other..
reference classes, uno::Reference and rtl::Reference.
Specifically rename Is()->is() and Clear()->clear().
Change-Id: Icb7e05e2d09cb9977121508b837ba0961dabb4ae
Reviewed-on: https://gerrit.libreoffice.org/33576
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
48 files changed, 302 insertions, 302 deletions
diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx index 1be7cf6c8819..04e7c595be8a 100644 --- a/sc/qa/unit/bugfix-test.cxx +++ b/sc/qa/unit/bugfix-test.cxx @@ -61,7 +61,7 @@ void ScFiltersTest::testTdf64229() xDocSh->DoHardRecalc(true); - CPPUNIT_ASSERT_MESSAGE("Failed to load fdo64229b.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load fdo64229b.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -79,7 +79,7 @@ void ScFiltersTest::testTdf36933() xDocSh->DoHardRecalc(true); - CPPUNIT_ASSERT_MESSAGE("Failed to load fdo36933test.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load fdo36933test.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -97,7 +97,7 @@ void ScFiltersTest::testTdf43700() xDocSh->DoHardRecalc(true); - CPPUNIT_ASSERT_MESSAGE("Failed to load fdo43700test.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load fdo43700test.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -115,7 +115,7 @@ void ScFiltersTest::testTdf43534() xDocSh->DoHardRecalc(true); - CPPUNIT_ASSERT_MESSAGE("Failed to load fdo43534test.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load fdo43534test.*", xDocSh.is()); // ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx index 1a27357f4f35..942042194bf7 100644 --- a/sc/qa/unit/copy_paste_test.cxx +++ b/sc/qa/unit/copy_paste_test.cxx @@ -56,7 +56,7 @@ void ScCopyPasteTest::testCopyPasteXLS() // 1. Open the document ScDocShellRef xDocSh = loadDoc("chartx2.", FORMAT_XLS); - CPPUNIT_ASSERT_MESSAGE("Failed to load chartx2.xls.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load chartx2.xls.", xDocSh.is()); uno::Reference< frame::XModel2 > xModel2 ( xDocSh->GetModel(), UNO_QUERY ); CPPUNIT_ASSERT( xModel2.is() ); diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 13b323906b56..4354cc41d041 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -118,7 +118,7 @@ bool ScFiltersTest::load(const OUString &rFilter, const OUString &rURL, { ScDocShellRef xDocShRef = ScBootstrapFixture::load(rURL, rFilter, rUserData, OUString(), nFilterFlags, nClipboardID, nFilterVersion ); - bool bLoaded = xDocShRef.Is(); + bool bLoaded = xDocShRef.is(); //reference counting of ScDocShellRef is very confused. if (bLoaded) xDocShRef->DoClose(); @@ -187,7 +187,7 @@ void ScFiltersTest::testRangeNameODS() { ScDocShellRef xDocSh = loadDoc("named-ranges-global.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load named-ranges-global.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load named-ranges-global.*", xDocSh.is()); xDocSh->DoHardRecalc(true); @@ -320,7 +320,7 @@ void ScFiltersTest::testContentXLSB() void ScFiltersTest::testContentXLS_XML() { ScDocShellRef xDocSh = loadDoc("universal-content.", FORMAT_XLS_XML); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); testContentImpl(rDoc, FORMAT_XLS_XML); @@ -330,7 +330,7 @@ void ScFiltersTest::testContentXLS_XML() void ScFiltersTest::testSharedFormulaXLS() { ScDocShellRef xDocSh = loadDoc("shared-formula/basic.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); xDocSh->DoHardRecalc(true); // Check the results of formula cells in the shared formula range. @@ -354,7 +354,7 @@ void ScFiltersTest::testSharedFormulaXLS() // to handle these wrong ranges that Excel stores. xDocSh = loadDoc("shared-formula/gap.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc2 = xDocSh->GetDocument(); rDoc2.CalcAll(); @@ -556,7 +556,7 @@ void testEnhancedProtectionImpl( ScDocument& rDoc ) void ScFiltersTest::testEnhancedProtectionXLS() { ScDocShellRef xDocSh = loadDoc("enhanced-protection.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); testEnhancedProtectionImpl( rDoc); @@ -567,7 +567,7 @@ void ScFiltersTest::testEnhancedProtectionXLS() void ScFiltersTest::testEnhancedProtectionXLSX() { ScDocShellRef xDocSh = loadDoc("enhanced-protection.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); testEnhancedProtectionImpl( rDoc); @@ -578,7 +578,7 @@ void ScFiltersTest::testEnhancedProtectionXLSX() void ScFiltersTest::testSortWithSharedFormulasODS() { ScDocShellRef xDocSh = loadDoc("shared-formula/sort-crash.", FORMAT_ODS, true); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // E2:E10 should be shared. @@ -630,7 +630,7 @@ void ScFiltersTest::testSortWithSharedFormulasODS() void ScFiltersTest::testSortWithSheetExternalReferencesODS() { ScDocShellRef xDocSh = loadDoc("sort-with-sheet-external-references.", FORMAT_ODS, true); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); sc::AutoCalcSwitch aACSwitch(rDoc, true); // turn auto calc on. rDoc.CalcAll(); diff --git a/sc/qa/unit/functions_test.cxx b/sc/qa/unit/functions_test.cxx index 0cc94007364b..bed9aa096815 100644 --- a/sc/qa/unit/functions_test.cxx +++ b/sc/qa/unit/functions_test.cxx @@ -34,7 +34,7 @@ bool FunctionsTest::load(const OUString& rFilter, const OUString& rURL, { ScDocShellRef xDocShRef = ScBootstrapFixture::load(rURL, rFilter, rUserData, OUString(), nFilterFlags, nClipboardID, nFilterVersion ); - CPPUNIT_ASSERT(xDocShRef.Is()); + CPPUNIT_ASSERT(xDocShRef.is()); xDocShRef->DoHardRecalc(true); diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index 439df8af4328..f8bdd1166d01 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -549,7 +549,7 @@ ScDocShellRef ScBootstrapFixture::load( bool bReadWrite, { xDocShRef->DoClose(); // load failed. - xDocShRef.Clear(); + xDocShRef.clear(); } return xDocShRef; @@ -649,7 +649,7 @@ ScDocShellRef ScBootstrapFixture::saveAndReload( ScDocShell* pShell, sal_Int32 n OUString aFilterType(aFileFormats[nFormat].pTypeName, strlen(aFileFormats[nFormat].pTypeName), RTL_TEXTENCODING_UTF8); ScDocShellRef xDocSh = saveAndReload(pShell, aFilterName, OUString(), aFilterType, aFileFormats[nFormat].nFormatType); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); return xDocSh; } @@ -691,12 +691,12 @@ void ScBootstrapFixture::miscRowHeightsTest( TestParam* aTestValues, unsigned in int nImportType = aTestValues[ index ].nImportType; int nExportType = aTestValues[ index ].nExportType; ScDocShellRef xShell = loadDoc( sFileName, nImportType ); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); if ( nExportType != -1 ) xShell = saveAndReload(&(*xShell), nExportType ); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocument& rDoc = xShell->GetDocument(); diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx index 64290cdcdae2..ec39852db255 100644 --- a/sc/qa/unit/opencl-test.cxx +++ b/sc/qa/unit/opencl-test.cxx @@ -538,11 +538,11 @@ bool ScOpenCLTest::initTestEnv(const OUString& fileName, sal_Int32 nFormat, return false; xDocSh = loadDoc(fileName, nFormat, bReadWrite); - CPPUNIT_ASSERT_MESSAGE("Failed to load document.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load document.", xDocSh.is()); enableOpenCL(); xDocShRes = loadDoc(fileName, nFormat, bReadWrite); - CPPUNIT_ASSERT_MESSAGE("Failed to load document.", xDocShRes.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load document.", xDocShRes.is()); return true; } @@ -4747,15 +4747,15 @@ void ScOpenCLTest::setUp() void ScOpenCLTest::tearDown() { //close test env - if(xDocSh.Is()) + if(xDocSh.is()) { xDocSh->DoClose(); - xDocSh.Clear(); + xDocSh.clear(); } - if(xDocShRes.Is()) + if(xDocShRes.is()) { xDocShRes->DoClose(); - xDocShRes.Clear(); + xDocShRes.clear(); } uno::Reference< lang::XComponent > diff --git a/sc/qa/unit/range.cxx b/sc/qa/unit/range.cxx index 968434467e20..802175823a10 100644 --- a/sc/qa/unit/range.cxx +++ b/sc/qa/unit/range.cxx @@ -53,7 +53,7 @@ void ScAddressTest::setUp() void ScAddressTest::tearDown() { - m_xDocShRef.Clear(); + m_xDocShRef.clear(); BootstrapFixture::tearDown(); } @@ -94,7 +94,7 @@ void ScRangeTest::setUp() void ScRangeTest::tearDown() { - m_xDocShRef.Clear(); + m_xDocShRef.clear(); BootstrapFixture::tearDown(); } diff --git a/sc/qa/unit/rangelst_test.cxx b/sc/qa/unit/rangelst_test.cxx index 1931a856175e..dce700164ecd 100644 --- a/sc/qa/unit/rangelst_test.cxx +++ b/sc/qa/unit/rangelst_test.cxx @@ -100,7 +100,7 @@ void Test::setUp() void Test::tearDown() { - m_xDocShRef.Clear(); + m_xDocShRef.clear(); BootstrapFixture::tearDown(); } diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index b4cb9856eed7..6413db82c015 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -366,7 +366,7 @@ void ScExportTest::test() ScDocShellRef xDocSh = saveAndReload(pShell, FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rLoadedDoc = xDocSh->GetDocument(); double aVal = rLoadedDoc.GetValue(0,0,0); ASSERT_DOUBLES_EQUAL(aVal, 1.0); @@ -390,7 +390,7 @@ void ScExportTest::testPasswordExportODS() OUString aFilterType(getFileFormats()[nFormat].pTypeName, strlen(getFileFormats()[nFormat].pTypeName), RTL_TEXTENCODING_UTF8); ScDocShellRef xDocSh = saveAndReloadPassword(pShell, aFilterName, OUString(), aFilterType, getFileFormats()[nFormat].nFormatType); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rLoadedDoc = xDocSh->GetDocument(); double aVal = rLoadedDoc.GetValue(0,0,0); ASSERT_DOUBLES_EQUAL(aVal, 1.0); @@ -401,10 +401,10 @@ void ScExportTest::testPasswordExportODS() void ScExportTest::testConditionalFormatExportODS() { ScDocShellRef xShell = loadDoc("new_cond_format_test_export.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFile("new_cond_format_test_export."); OUString aCSVPath; @@ -417,10 +417,10 @@ void ScExportTest::testConditionalFormatExportODS() void ScExportTest::testConditionalFormatExportXLSX() { ScDocShellRef xShell = loadDoc("new_cond_format_test_export.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); { OUString aCSVFile("new_cond_format_test_export."); @@ -441,10 +441,10 @@ void ScExportTest::testConditionalFormatExportXLSX() void ScExportTest::testColorScaleExportODS() { ScDocShellRef xShell = loadDoc("colorscale.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -457,10 +457,10 @@ void ScExportTest::testColorScaleExportODS() void ScExportTest::testColorScaleExportXLSX() { ScDocShellRef xShell = loadDoc("colorscale.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -473,10 +473,10 @@ void ScExportTest::testColorScaleExportXLSX() void ScExportTest::testDataBarExportODS() { ScDocShellRef xShell = loadDoc("databar.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -488,10 +488,10 @@ void ScExportTest::testDataBarExportODS() void ScExportTest::testFormatExportODS() { ScDocShellRef xShell = loadDoc("formats.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -505,7 +505,7 @@ void ScExportTest::testCommentExportXLSX() { //tdf#104729 FILESAVE OpenOffice do not save author of the comment during export to .xlsx ScDocShellRef xShell = loadDoc("comment.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/comments1.xml"); @@ -522,7 +522,7 @@ void ScExportTest::testCustomColumnWidthExportXLSX() { //tdf#100946 FILESAVE Excel on OS X ignored column widths in XLSX last saved by LO ScDocShellRef xShell = loadDoc("custom_column_width.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/worksheets/sheet1.xml"); @@ -614,7 +614,7 @@ void ScExportTest::testXfDefaultValuesXLSX() { //tdf#70565 FORMATTING: User Defined Custom Formatting is not applied during importing XLSX documents ScDocShellRef xShell = loadDoc("xf_default_values.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/styles.xml"); @@ -639,7 +639,7 @@ void ScExportTest::testColumnWidthResaveXLSX() // tdf#91475 FILESAVE: Column width is not preserved in XLSX / after round trip. // Test if after resave .xlsx file, columns width is identical with with previous one ScDocShellRef xShell = loadDoc("different-column-width-excel2010.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/worksheets/sheet1.xml"); @@ -680,7 +680,7 @@ void ScExportTest::testColumnWidthExportFromODStoXLSX() ScDocShellRef xShell = loadDoc("different-column-width.", FORMAT_ODS); - CPPUNIT_ASSERT( xShell.Is() ); + CPPUNIT_ASSERT( xShell.is() ); ScDocument& rOdsDoc = xShell->GetDocument(); @@ -708,7 +708,7 @@ void ScExportTest::testColumnWidthExportFromODStoXLSX() // We expect that column width from .ods will be exactly the same as imported from .xlsx ScDocShellRef xXlsxDocSh = saveAndReload( xShell.get(), FORMAT_XLSX ); - CPPUNIT_ASSERT( xXlsxDocSh.Is() ); + CPPUNIT_ASSERT( xXlsxDocSh.is() ); ScDocument& rDoc = xXlsxDocSh->GetDocument(); @@ -741,7 +741,7 @@ void ScExportTest::testOutlineExportXLSX() //tdf#100347 FILESAVE FILEOPEN after exporting to .xlsx format grouping are lost //tdf#51524 FILESAVE .xlsx and.xls looses width information for hidden/collapsed grouped columns ScDocShellRef xShell = loadDoc("outline.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/worksheets/sheet1.xml"); @@ -896,7 +896,7 @@ void ScExportTest::testHiddenEmptyRowsXLSX() { //tdf#98106 FILESAVE: Hidden and empty rows became visible when export to .XLSX ScDocShellRef xShell = loadDoc("hidden-empty-rows.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/worksheets/sheet1.xml"); @@ -912,7 +912,7 @@ void ScExportTest::testLandscapeOrientationXLSX() { //tdf#48767 - Landscape page orientation is not loaded from .xlsx format with MS Excel, after export with Libre Office ScDocShellRef xShell = loadDoc("hidden-empty-rows.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/worksheets/sheet1.xml"); @@ -926,10 +926,10 @@ void ScExportTest::testLandscapeOrientationXLSX() void ScExportTest::testDataBarExportXLSX() { ScDocShellRef xShell = loadDoc("databar.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1061,7 +1061,7 @@ void setEscapement( ScFieldEditEngine& rEE, sal_Int32 nPara, sal_Int32 nStart, s void ScExportTest::testNamedRangeBugfdo62729() { ScDocShellRef xShell = loadDoc("fdo62729.", FORMAT_ODS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocument& rDoc = xShell->GetDocument(); ScRangeName* pNames = rDoc.GetRangeName(); @@ -1073,7 +1073,7 @@ void ScExportTest::testNamedRangeBugfdo62729() ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_ODS); xShell->DoClose(); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc2 = xDocSh->GetDocument(); pNames = rDoc2.GetRangeName(); @@ -1467,7 +1467,7 @@ void ScExportTest::testRichTextExportODS() ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh.get(), FORMAT_ODS); { xOrigDocSh->DoClose(); - CPPUNIT_ASSERT(xNewDocSh.Is()); + CPPUNIT_ASSERT(xNewDocSh.is()); ScDocument& rDoc2 = xNewDocSh->GetDocument(); CPPUNIT_ASSERT_MESSAGE("Reloaded document should at least have one sheet.", rDoc2.GetTableCount() > 0); ScFieldEditEngine* pEE = &rDoc2.GetEditEngine(); @@ -1563,7 +1563,7 @@ void ScExportTest::testRichTextExportODS() void ScExportTest::testRichTextCellFormatXLSX() { ScDocShellRef xDocSh = loadDoc("cellformat.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); std::shared_ptr<utl::TempFile> pXPathFile = ScBootstrapFixture::exportTo(&(*xDocSh), FORMAT_XLSX); xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory, "xl/worksheets/sheet1.xml"); @@ -1649,7 +1649,7 @@ void ScExportTest::testCellValuesExportODS() // save and reload ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh.get(), FORMAT_ODS); xOrigDocSh->DoClose(); - CPPUNIT_ASSERT(xNewDocSh.Is()); + CPPUNIT_ASSERT(xNewDocSh.is()); ScDocument& rDoc = xNewDocSh->GetDocument(); CPPUNIT_ASSERT_MESSAGE("Reloaded document should at least have one sheet.", rDoc.GetTableCount() > 0); @@ -1705,7 +1705,7 @@ void ScExportTest::testCellNoteExportODS() // save and reload ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh.get(), FORMAT_ODS); xOrigDocSh->DoClose(); - CPPUNIT_ASSERT(xNewDocSh.Is()); + CPPUNIT_ASSERT(xNewDocSh.is()); ScDocument& rDoc = xNewDocSh->GetDocument(); aPos.SetRow(0); // Move back to A1. @@ -1741,7 +1741,7 @@ void ScExportTest::testCellNoteExportXLS() ScDocShellRef xNewDocSh = saveAndReload(xOrigDocSh.get(), FORMAT_XLS); { xOrigDocSh->DoClose(); - CPPUNIT_ASSERT(xNewDocSh.Is()); + CPPUNIT_ASSERT(xNewDocSh.is()); ScDocument& rDoc = xNewDocSh->GetDocument(); CPPUNIT_ASSERT_EQUAL_MESSAGE("This document should have 3 sheets.", SCTAB(3), rDoc.GetTableCount()); @@ -1791,11 +1791,11 @@ void checkMatrixRange(ScDocument& rDoc, const ScRange& rRange) void ScExportTest::testInlineArrayXLS() { ScDocShellRef xShell = loadDoc("inline-array.", FORMAT_XLS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLS); xShell->DoClose(); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1814,11 +1814,11 @@ void ScExportTest::testInlineArrayXLS() void ScExportTest::testEmbeddedChartXLS() { ScDocShellRef xShell = loadDoc("embedded-chart.", FORMAT_XLS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLS); xShell->DoClose(); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1841,10 +1841,10 @@ void ScExportTest::testEmbeddedChartXLS() void ScExportTest::testCellAnchoredGroupXLS() { ScDocShellRef xDocSh_in = loadDoc("cell-anchored-group.", FORMAT_XLS); - CPPUNIT_ASSERT_MESSAGE("Failed to load cell-anchored-group.xls", xDocSh_in.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load cell-anchored-group.xls", xDocSh_in.is()); ScDocShellRef xDocSh = saveAndReload(&(*xDocSh_in), FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to save and reload cell-anchored-group.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to save and reload cell-anchored-group.ods", xDocSh.is()); // the document contains a group anchored on the first cell, make sure it's there in the right place ScDocument& rDoc = xDocSh->GetDocument(); @@ -1868,11 +1868,11 @@ void ScExportTest::testCellAnchoredGroupXLS() void ScExportTest::testFormulaReferenceXLS() { ScDocShellRef xShell = loadDoc("formula-reference.", FORMAT_XLS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLS); xShell->DoClose(); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1891,10 +1891,10 @@ void ScExportTest::testFormulaReferenceXLS() void ScExportTest::testSheetProtectionXLSX() { ScDocShellRef xShell = loadDoc("ProtecteSheet1234Pass.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); const ScTableProtection* pTabProtect = rDoc.GetTabProtection(0); @@ -1960,7 +1960,7 @@ void ScExportTest::testExcelCellBorders( sal_uLong nFormatType ) }; ScDocShellRef xDocSh = loadDoc("cell-borders.", nFormatType); - CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is()); { ScDocument& rDoc = xDocSh->GetDocument(); @@ -2050,10 +2050,10 @@ void ScExportTest::testBordersExchangeXLSX() }; ScDocShellRef xShell = loadDoc("test_borders_export.", FORMAT_ODS); // load the ods with our Borders - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); // save the ods to xlsx and load xlsx - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); for (size_t nCol = 0; nCol < nMaxCol; ++nCol) @@ -2291,7 +2291,7 @@ void ScExportTest::testTrackChangesSimpleXLSX() // First, test the xls variant. ScDocShellRef xDocSh = loadDoc("track-changes/simple-cell-changes.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument* pDoc = &xDocSh->GetDocument(); bool bGood = aTest.check(*pDoc); CPPUNIT_ASSERT_MESSAGE("Initial check failed (xls).", bGood); @@ -2319,7 +2319,7 @@ void ScExportTest::testTrackChangesSimpleXLSX() // Now, test the xlsx variant the same way. xDocSh = loadDoc("track-changes/simple-cell-changes.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); pDoc = &xDocSh->GetDocument(); aTest.check(*pDoc); CPPUNIT_ASSERT_MESSAGE("Initial check failed (xlsx).", bGood); @@ -2387,14 +2387,14 @@ void ScExportTest::testSheetTabColorsXLSX() ScDocShellRef xDocSh = loadDoc("sheet-tab-color.", FORMAT_XLSX); { - CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); bool bRes = aTest.checkContent(rDoc); CPPUNIT_ASSERT_MESSAGE("Failed on the initial content check.", bRes); } ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to reload file.", xDocSh2.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to reload file.", xDocSh2.is()); xDocSh->DoClose(); ScDocument& rDoc = xDocSh2->GetDocument(); bool bRes = aTest.checkContent(rDoc); @@ -2474,7 +2474,7 @@ void ScExportTest::testSharedFormulaExportXLS() ScDocShellRef xDocSh = loadDoc("shared-formula/3d-reference.", FORMAT_ODS); { - CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Check the content of the original. @@ -2484,7 +2484,7 @@ void ScExportTest::testSharedFormulaExportXLS() ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_XLS); xDocSh->DoClose(); - CPPUNIT_ASSERT_MESSAGE("Failed to reload file.", xDocSh2.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to reload file.", xDocSh2.is()); ScDocument& rDoc = xDocSh2->GetDocument(); @@ -2565,7 +2565,7 @@ void ScExportTest::testSharedFormulaExportXLSX() ScDocShellRef xDocSh = loadDoc("shared-formula/3d-reference.", FORMAT_XLSX); { - CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); bool bRes = aTest.checkContent(rDoc); @@ -2580,7 +2580,7 @@ void ScExportTest::testSharedFormulaExportXLSX() ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_XLSX); xDocSh->DoClose(); - CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh2.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh2.is()); ScDocument& rDoc = xDocSh2->GetDocument(); rDoc.CalcAll(); // Recalculate to flush all cached results. @@ -2635,7 +2635,7 @@ void ScExportTest::testSharedFormulaStringResultExportXLSX() ScDocShellRef xDocSh = loadDoc("shared-formula/text-results.", FORMAT_XLSX); { - CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Check content without re-calculation, to test cached formula results. @@ -2650,7 +2650,7 @@ void ScExportTest::testSharedFormulaStringResultExportXLSX() // Reload and check again. ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_XLSX); xDocSh->DoClose(); - CPPUNIT_ASSERT_MESSAGE("Failed to re-load file.", xDocSh2.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to re-load file.", xDocSh2.is()); ScDocument& rDoc = xDocSh2->GetDocument(); bool bRes = aTest.checkContent(rDoc); @@ -2662,7 +2662,7 @@ void ScExportTest::testSharedFormulaStringResultExportXLSX() void ScExportTest::testFunctionsExcel2010( sal_uLong nFormatType ) { ScDocShellRef xShell = loadDoc("functions-excel-2010.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), nFormatType); ScDocument& rDoc = xDocSh->GetDocument(); @@ -2686,7 +2686,7 @@ void ScExportTest::testFunctionsExcel2010XLS() void ScExportTest::testCeilingFloor( sal_uLong nFormatType ) { ScDocShellRef xShell = loadDoc("ceiling-floor.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), nFormatType); ScDocument& rDoc = xDocSh->GetDocument(); @@ -2716,7 +2716,7 @@ void ScExportTest::testCeilingFloorODS() void ScExportTest::testRelativePathsODS() { ScDocShellRef xDocSh = loadDoc("fdo79305.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "content.xml", FORMAT_ODS); CPPUNIT_ASSERT(pDoc); @@ -2743,7 +2743,7 @@ void testSheetProtection_Impl(ScDocument& rDoc) void ScExportTest::testSheetProtectionODS() { ScDocShellRef xDocSh = loadDoc("sheet-protection.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); { ScDocument& rDoc = xDocSh->GetDocument(); @@ -2878,7 +2878,7 @@ void ScExportTest::testPivotTableXLSX() } aTest; ScDocShellRef xDocSh = loadDoc("pivot-table/many-fields-in-cache.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument* pDoc = &xDocSh->GetDocument(); // Initial check. @@ -2887,7 +2887,7 @@ void ScExportTest::testPivotTableXLSX() ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_XLSX); xDocSh->DoClose(); - CPPUNIT_ASSERT(xDocSh2.Is()); + CPPUNIT_ASSERT(xDocSh2.is()); pDoc = &xDocSh2->GetDocument(); // Reload check. @@ -2998,7 +2998,7 @@ void ScExportTest::testPivotTableTwoDataFieldsXLSX() } aTest; ScDocShellRef xDocSh = loadDoc("pivot-table/two-data-fields.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument* pDoc = &xDocSh->GetDocument(); // Initial check. @@ -3007,7 +3007,7 @@ void ScExportTest::testPivotTableTwoDataFieldsXLSX() ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_XLSX); xDocSh->DoClose(); - CPPUNIT_ASSERT(xDocSh2.Is()); + CPPUNIT_ASSERT(xDocSh2.is()); pDoc = &xDocSh2->GetDocument(); // Reload check. @@ -3020,7 +3020,7 @@ void ScExportTest::testPivotTableTwoDataFieldsXLSX() void ScExportTest::testPivotTableMedianODS() { ScDocShellRef xDocSh = loadDoc("pivot-table-median.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load test document.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load test document.", xDocSh.is()); // Export the document and import again for a check ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), FORMAT_ODS); @@ -3079,7 +3079,7 @@ void ScExportTest::testSwappedOutImageExport() ScDocShellRef xDocSh = loadDoc("document_with_two_images.", FORMAT_ODS); const OString sFailedMessage = OString("Failed on filter: ") + aFilterNames[nFilter]; - CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xDocSh.is()); // Export the document and import again for a check ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), nFilter); @@ -3158,11 +3158,11 @@ void ScExportTest::tearDown() void ScExportTest::testSupBookVirtualPathXLS() { ScDocShellRef xShell = loadDoc("external-ref.", FORMAT_XLS); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLS); xShell->DoClose(); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -3230,7 +3230,7 @@ void ScExportTest::testImageWithSpecialID() ScDocShellRef xDocSh = loadDoc("images_with_special_IDs.", FORMAT_ODS); const OString sFailedMessage = OString("Failed on filter: ") + aFilterNames[nFilter]; - CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xDocSh.is()); // Export the document and import again for a check ScDocShellRef xDocSh2 = saveAndReload(xDocSh.get(), nFilter); @@ -3310,10 +3310,10 @@ void ScExportTest::testSheetLocalRangeNameXLS() void ScExportTest::testSheetTextBoxHyperlinkXLSX() { ScDocShellRef xShell = loadDoc("textbox-hyperlink.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3326,7 +3326,7 @@ void ScExportTest::testSheetTextBoxHyperlinkXLSX() void ScExportTest::testFontSizeXLSX() { ScDocShellRef xDocSh = loadDoc("fontSize.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3339,10 +3339,10 @@ void ScExportTest::testFontSizeXLSX() void ScExportTest::testSheetCharacterKerningSpaceXLSX() { ScDocShellRef xShell = loadDoc("textbox-CharKerningSpace.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3359,10 +3359,10 @@ void ScExportTest::testSheetCharacterKerningSpaceXLSX() void ScExportTest::testSheetCondensedCharacterSpaceXLSX() { ScDocShellRef xShell = loadDoc("textbox-CondensedCharacterSpace.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3380,7 +3380,7 @@ void ScExportTest::testTextUnderlineColorXLSX() { ScDocShellRef xDocSh = loadDoc("underlineColor.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3393,10 +3393,10 @@ void ScExportTest::testTextUnderlineColorXLSX() void ScExportTest::testSheetRunParagraphPropertyXLSX() { ScDocShellRef xShell = loadDoc("TextColor.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/sharedStrings.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3411,7 +3411,7 @@ void ScExportTest::testPreserveTextWhitespaceXLSX() { ScDocShellRef xShell = loadDoc("preserve-whitespace.", FORMAT_XLSX); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/sharedStrings.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3423,7 +3423,7 @@ void ScExportTest::testPreserveTextWhitespace2XLSX() { ScDocShellRef xShell = loadDoc("preserve_space.", FORMAT_XLSX); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/sharedStrings.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3436,7 +3436,7 @@ void ScExportTest::testPreserveTextWhitespace2XLSX() void ScExportTest::testHiddenShapeXLSX() { ScDocShellRef xDocSh = loadDoc("hiddenShape.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/drawings/drawing1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3446,7 +3446,7 @@ void ScExportTest::testHiddenShapeXLSX() void ScExportTest::testHyperlinkXLSX() { ScDocShellRef xDocSh = loadDoc("hyperlink.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/drawings/_rels/drawing1.xml.rels", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3456,7 +3456,7 @@ void ScExportTest::testHyperlinkXLSX() void ScExportTest::testMoveCellAnchoredShapesODS() { ScDocShellRef xDocSh = loadDoc("move-cell-anchored-shapes.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load move-cell-anchored-shapes.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load move-cell-anchored-shapes.ods", xDocSh.is()); // There are two cell-anchored objects on the first sheet. ScDocument& rDoc = xDocSh->GetDocument(); @@ -3619,10 +3619,10 @@ void ScExportTest::testMoveCellAnchoredShapesODS() void ScExportTest::testMatrixMultiplicationXLSX() { ScDocShellRef xShell = loadDoc("matrix-multiplication.", FORMAT_XLSX); - CPPUNIT_ASSERT(xShell.Is()); + CPPUNIT_ASSERT(xShell.is()); ScDocShellRef xDocSh = saveAndReload(&(*xShell), FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/worksheets/sheet1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3645,11 +3645,11 @@ void ScExportTest::testMatrixMultiplicationXLSX() void ScExportTest::testRefStringXLSX() { ScDocShellRef xDocSh = loadDoc("ref_string.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); //make sure ref syntax gets saved for MSO-produced docs xDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); ScCalcConfig aCalcConfig = rDoc.GetCalcConfig(); @@ -3662,10 +3662,10 @@ void ScExportTest::testRefStringConfigXLSX() { // this doc is configured with CalcA1 ref syntax ScDocShellRef xDocSh = loadDoc("empty.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); xDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); ScCalcConfig aConfig = rDoc.GetCalcConfig(); @@ -3676,7 +3676,7 @@ void ScExportTest::testRefStringConfigXLSX() // this doc has no entry for ref syntax xDocSh = loadDoc("empty-noconf.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to open 2nd doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open 2nd doc", xDocSh.is()); ScDocument& rDoc2 = xDocSh->GetDocument(); aConfig = rDoc2.GetCalcConfig(); @@ -3689,7 +3689,7 @@ void ScExportTest::testRefStringConfigXLSX() rDoc2.SetCalcConfig( aConfig ); ScDocShellRef xNewDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to reload 2nd doc", xNewDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to reload 2nd doc", xNewDocSh.is()); // ... and make sure it got saved ScDocument& rDoc3 = xNewDocSh->GetDocument(); @@ -3718,7 +3718,7 @@ void ScExportTest::testRefStringUnspecified() rDoc.SetGrammar( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 ); ScDocShellRef xDocSh = saveAndReload(pShell, FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to reload doc", xDocSh.is()); // with string ref syntax at its default value, we should've saved ExcelA1 ScDocument& rDoc2 = xDocSh->GetDocument(); @@ -3747,7 +3747,7 @@ void ScExportTest::testHeaderImageODS() void ScExportTest::testTextDirectionXLSX() { ScDocShellRef xDocSh = loadDoc("writingMode.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/styles.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3759,7 +3759,7 @@ void ScExportTest::testTextDirectionXLSX() void ScExportTest::testTdf88657ODS() { ScDocShellRef xDocSh = loadDoc("tdf88657.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "styles.xml", FORMAT_ODS); CPPUNIT_ASSERT(pDoc); @@ -3770,7 +3770,7 @@ void ScExportTest::testTdf88657ODS() void ScExportTest::testConditionalFormatRangeListXLSX() { ScDocShellRef xDocSh = loadDoc("conditionalformat_rangelist.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/worksheets/sheet1.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3781,9 +3781,9 @@ void ScExportTest::testConditionalFormatRangeListXLSX() void ScExportTest::testEscapeCharInNumberFormatXLSX() { ScDocShellRef xDocSh = loadDoc("tdf81939.", FORMAT_XLSX); - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); xDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX); - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/styles.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3808,9 +3808,9 @@ void ScExportTest::testEscapeCharInNumberFormatXLSX() void ScExportTest::testNatNumInNumberFormatXLSX() { ScDocShellRef xDocSh = loadDoc("tdf79398_NatNum5.", FORMAT_ODS); - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); xDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX); // Convert [NatNum5] to [DBNum2] in Chinese - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/styles.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3823,12 +3823,12 @@ void ScExportTest::testNatNumInNumberFormatXLSX() void ScExportTest::testExponentWithoutSignFormatXLSX() { ScDocShellRef xDocSh = loadDoc("tdf102370_ExponentWithoutSign.", FORMAT_ODS); - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); xDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX); - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); xDocSh = saveAndReload( &(*xDocSh), FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); sal_uInt32 nNumberFormat; @@ -3845,9 +3845,9 @@ void ScExportTest::testExponentWithoutSignFormatXLSX() void ScExportTest::testExtendedLCIDXLSX() { ScDocShellRef xDocSh = loadDoc("tdf36038_ExtendedLCID.", FORMAT_ODS); - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); xDocSh = saveAndReload( &(*xDocSh), FORMAT_XLSX); - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, "xl/styles.xml", FORMAT_XLSX); CPPUNIT_ASSERT(pDoc); @@ -3886,7 +3886,7 @@ void ScExportTest::testExtendedLCIDXLSX() void ScExportTest::testHiddenRepeatedRowsODS() { ScDocShellRef xDocSh = loadDoc("empty.", FORMAT_ODS); - CPPUNIT_ASSERT( xDocSh.Is() ); + CPPUNIT_ASSERT( xDocSh.is() ); { ScDocument& rDoc = xDocSh->GetDocument(); @@ -3907,7 +3907,7 @@ void ScExportTest::testHiddenRepeatedRowsODS() void ScExportTest::testHyperlinkTargetFrameODS() { ScDocShellRef xDocSh = loadDoc("hyperlink_frame.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); const EditTextObject* pEditText = rDoc.GetEditText(ScAddress(2, 5, 0)); diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index e7b436d90bb1..76def6f36e40 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -364,7 +364,7 @@ bool ScFiltersTest::load(const OUString &rFilter, const OUString &rURL, { ScDocShellRef xDocShRef = ScBootstrapFixture::load( rURL, rFilter, rUserData, OUString(), nFilterFlags, nClipboardID, nFilterVersion); - bool bLoaded = xDocShRef.Is(); + bool bLoaded = xDocShRef.is(); //reference counting of ScDocShellRef is very confused. if (bLoaded) xDocShRef->DoClose(); @@ -409,7 +409,7 @@ void testRangeNameImpl(ScDocument& rDoc) void ScFiltersTest::testBasicCellContentODS() { ScDocShellRef xDocSh = loadDoc("basic-cell-content.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load basic-cell-content.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load basic-cell-content.ods", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aStr = rDoc.GetString(1, 1, 0); // B2 @@ -436,7 +436,7 @@ void ScFiltersTest::testBooleanFormatXLSX() SvNumberFormatter* pNumFormatter = rDoc.GetFormatTable(); const OUString aBooleanTypeStr = "\"TRUE\";\"TRUE\";\"FALSE\""; - CPPUNIT_ASSERT_MESSAGE("Failed to load check-boolean.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load check-boolean.xlsx", xDocSh.is()); sal_uInt32 nNumberFormat; for (SCROW i = 0; i <= 1; i++) @@ -516,7 +516,7 @@ void ScFiltersTest::testHardRecalcODS() ScDocShellRef xDocSh = loadDoc("hard-recalc.", FORMAT_ODS); xDocSh->DoHardRecalc(true); - CPPUNIT_ASSERT_MESSAGE("Failed to load hard-recalc.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load hard-recalc.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -533,7 +533,7 @@ void ScFiltersTest::testFunctionsODS() ScDocShellRef xDocSh = loadDoc("functions.", FORMAT_ODS); xDocSh->DoHardRecalc(true); - CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -562,7 +562,7 @@ void ScFiltersTest::testFunctionsODS() xDocSh->DoClose(); xDocSh = loadDoc("database-functions.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.is()); xDocSh->DoHardRecalc(true); ScDocument& rDoc2 = xDocSh->GetDocument(); @@ -572,7 +572,7 @@ void ScFiltersTest::testFunctionsODS() xDocSh->DoClose(); xDocSh = loadDoc("date-time-functions.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.is()); xDocSh->DoHardRecalc(true); ScDocument& rDoc3 = xDocSh->GetDocument(); createCSVPath("date-time-functions.", aCSVFileName); @@ -591,7 +591,7 @@ void ScFiltersTest::testFunctionsODS() void ScFiltersTest::testFunctionsExcel2010() { ScDocShellRef xDocSh = loadDoc("functions-excel-2010.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); // perform hard re-calculation. @@ -603,7 +603,7 @@ void ScFiltersTest::testFunctionsExcel2010() void ScFiltersTest::testCeilingFloorXLSX() { ScDocShellRef xDocSh = loadDoc("ceiling-floor.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); // perform hard re-calculation. @@ -616,7 +616,7 @@ void ScFiltersTest::testCachedFormulaResultsODS() { { ScDocShellRef xDocSh = loadDoc("functions.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load functions.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -642,7 +642,7 @@ void ScFiltersTest::testCachedFormulaResultsODS() { ScDocShellRef xDocSh = loadDoc("cachedValue.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load cachedValue.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load cachedValue.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -689,7 +689,7 @@ void ScFiltersTest::testCachedMatrixFormulaResultsODS() { ScDocShellRef xDocSh = loadDoc("matrix.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load matrix.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load matrix.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); //test matrix @@ -722,7 +722,7 @@ void ScFiltersTest::testCachedMatrixFormulaResultsODS() void ScFiltersTest::testFormulaDepAcrossSheetsODS() { ScDocShellRef xDocSh = loadDoc("formula-across-sheets.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load the file.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the file.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); sc::AutoCalcSwitch aACSwitch(rDoc, true); // Make sure auto calc is turned on. @@ -746,7 +746,7 @@ void ScFiltersTest::testFormulaDepAcrossSheetsODS() void ScFiltersTest::testFormulaDepDeleteContentsODS() { ScDocShellRef xDocSh = loadDoc("formula-delete-contents.", FORMAT_ODS, true); - CPPUNIT_ASSERT_MESSAGE("Failed to load the file.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the file.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); sc::UndoSwitch aUndoSwitch(rDoc, true); // Enable undo. @@ -901,7 +901,7 @@ void ScFiltersTest::testMatrixXLS() ScDocShellRef xDocSh = loadDoc("matrix.", FORMAT_XLS); xDocSh->DoHardRecalc(true); - CPPUNIT_ASSERT_MESSAGE("Failed to load matrix.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load matrix.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVFileName; @@ -916,7 +916,7 @@ void ScFiltersTest::testDoubleThinBorder() // double-thin borders created with size less than 1.15 where invisible (and subsequently lost) on round-trips. ScDocShellRef xDocSh = loadDoc("tdf88827_borderDoubleThin.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load tdf88827_borderDoubleThin.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load tdf88827_borderDoubleThin.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); const editeng::SvxBorderLine* pLeft = nullptr; @@ -935,7 +935,7 @@ void ScFiltersTest::testBorderODS() { ScDocShellRef xDocSh = loadDoc("border.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load border.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load border.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); const editeng::SvxBorderLine* pLeft = nullptr; @@ -1031,7 +1031,7 @@ void ScFiltersTest::testBordersOoo33() ScDocShellRef xDocSh = loadDoc("borders_ooo33.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load borders_ooo33.*", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load borders_ooo33.*", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); const editeng::SvxBorderLine* pLeft = nullptr; @@ -1083,7 +1083,7 @@ void ScFiltersTest::testBordersOoo33() void ScFiltersTest::testBugFixesODS() { ScDocShellRef xDocSh = loadDoc("bug-fixes.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.ods", xDocSh.is()); xDocSh->DoHardRecalc(true); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1119,7 +1119,7 @@ void ScFiltersTest::testBugFixesODS() void ScFiltersTest::testBugFixesXLS() { ScDocShellRef xDocSh = loadDoc("bug-fixes.", FORMAT_XLS); - CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.xls", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.xls", xDocSh.is()); xDocSh->DoHardRecalc(true); xDocSh->GetDocument(); @@ -1129,7 +1129,7 @@ void ScFiltersTest::testBugFixesXLS() void ScFiltersTest::testBugFixesXLSX() { ScDocShellRef xDocSh = loadDoc("bug-fixes.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.xls", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load bugFixes.xls", xDocSh.is()); xDocSh->DoHardRecalc(true); xDocSh->GetDocument(); @@ -1351,7 +1351,7 @@ void ScFiltersTest::testDataValidityODS() void ScFiltersTest::testDataTableMortgageXLS() { ScDocShellRef xDocSh = loadDoc("data-table/mortgage.", FORMAT_XLS); - CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.is()); ScFormulaOptions aOptions; aOptions.SetFormulaSepArg(","); @@ -1384,7 +1384,7 @@ void ScFiltersTest::testDataTableMortgageXLS() void ScFiltersTest::testDataTableOneVarXLSX() { ScDocShellRef xDocSh = loadDoc("data-table/one-variable.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.is()); ScFormulaOptions aOptions; aOptions.SetFormulaSepArg(","); @@ -1427,7 +1427,7 @@ void ScFiltersTest::testDataTableOneVarXLSX() void ScFiltersTest::testDataTableMultiTableXLSX() { ScDocShellRef xDocSh = loadDoc("data-table/multi-table.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xDocSh.is()); ScFormulaOptions aOptions; aOptions.SetFormulaSepArg(","); @@ -1471,7 +1471,7 @@ void ScFiltersTest::testBrokenQuotesCSV() ScDocShellRef xDocSh = ScBootstrapFixture::load(aFileName, aFilterName, OUString(), aFilterType, nFormatType, nClipboardId); - CPPUNIT_ASSERT_MESSAGE("Failed to load fdo48621_broken_quotes.csv", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load fdo48621_broken_quotes.csv", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aSheet2CSV("fdo48621_broken_quotes_exported."); @@ -1498,7 +1498,7 @@ void ScFiltersTest::testCellValueXLSX() ScDocShellRef xDocSh = ScBootstrapFixture::load( aFileName, aFilterName, OUString(), aFilterType, nFormatType, nClipboardId); - CPPUNIT_ASSERT_MESSAGE("Failed to load cell-value.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load cell-value.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aCSVPath; @@ -1511,7 +1511,7 @@ void ScFiltersTest::testCellValueXLSX() void ScFiltersTest::testRowIndex1BasedXLSX() { ScDocShellRef xDocSh = loadDoc("row-index-1-based.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // A1 @@ -1564,10 +1564,10 @@ void ScFiltersTest::testPassword_Impl(const OUString& aFileNameBase) { xDocSh->DoClose(); // load failed. - xDocSh.Clear(); + xDocSh.clear(); } - CPPUNIT_ASSERT_MESSAGE("Failed to load password.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load password.ods", xDocSh.is()); xDocSh->GetDocument(); xDocSh->DoClose(); } @@ -1597,7 +1597,7 @@ void ScFiltersTest::testPasswordWrongSHA() void ScFiltersTest::testControlImport() { ScDocShellRef xDocSh = loadDoc("singlecontrol.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load singlecontrol.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load singlecontrol.xlsx", xDocSh.is()); uno::Reference< frame::XModel > xModel = xDocSh->GetModel(); uno::Reference< sheet::XSpreadsheetDocument > xDoc(xModel, UNO_QUERY_THROW); @@ -1613,7 +1613,7 @@ void ScFiltersTest::testControlImport() void ScFiltersTest::testChartImportODS() { ScDocShellRef xDocSh = loadDoc("chart-import-basic.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load chart-import-basic.ods.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load chart-import-basic.ods.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1647,7 +1647,7 @@ void ScFiltersTest::testChartImportODS() void ScFiltersTest::testChartImportXLS() { ScDocShellRef xDocSh = loadDoc("chartx.", FORMAT_XLS); - CPPUNIT_ASSERT_MESSAGE("Failed to load chartx.xls.", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load chartx.xls.", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1664,7 +1664,7 @@ void ScFiltersTest::testChartImportXLS() void ScFiltersTest::testNumberFormatHTML() { ScDocShellRef xDocSh = loadDoc("numberformat.", FORMAT_HTML); - CPPUNIT_ASSERT_MESSAGE("Failed to load numberformat.html", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load numberformat.html", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1691,7 +1691,7 @@ void ScFiltersTest::testNumberFormatHTML() void ScFiltersTest::testNumberFormatCSV() { ScDocShellRef xDocSh = loadDoc("numberformat.", FORMAT_CSV); - CPPUNIT_ASSERT_MESSAGE("Failed to load numberformat.csv", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load numberformat.csv", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1718,7 +1718,7 @@ void ScFiltersTest::testNumberFormatCSV() void ScFiltersTest::testCellAnchoredShapesODS() { ScDocShellRef xDocSh = loadDoc("cell-anchored-shapes.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load cell-anchored-shapes.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load cell-anchored-shapes.ods", xDocSh.is()); // There are two cell-anchored objects on the first sheet. ScDocument& rDoc = xDocSh->GetDocument(); @@ -1746,7 +1746,7 @@ void ScFiltersTest::testCellAnchoredShapesODS() void ScFiltersTest::testCellAnchoredHiddenShapesXLSX() { ScDocShellRef xDocSh = loadDoc("cell-anchored-hidden-shapes.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load cell-anchored-shapes.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load cell-anchored-shapes.xlsx", xDocSh.is()); // There are two cell-anchored objects on the first sheet. ScDocument& rDoc = xDocSh->GetDocument(); @@ -1790,7 +1790,7 @@ bool hasDimension(const std::vector<const ScDPSaveDimension*>& rDims, const OUSt void ScFiltersTest::testPivotTableBasicODS() { ScDocShellRef xDocSh = loadDoc("pivot-table-basic.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load pivot-table-basic.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load pivot-table-basic.ods", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); CPPUNIT_ASSERT_EQUAL_MESSAGE( @@ -1853,7 +1853,7 @@ void ScFiltersTest::testPivotTableBasicODS() void ScFiltersTest::testPivotTableNamedRangeSourceODS() { ScDocShellRef xDocSh = loadDoc("pivot-table-named-range-source.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load pivot-table-named-range-source.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load pivot-table-named-range-source.ods", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -1909,7 +1909,7 @@ bool checkVisiblePageFieldMember( const ScDPSaveDimension::MemberList& rMembers, void ScFiltersTest::testPivotTableSharedCacheGroupODS() { ScDocShellRef xDocSh = loadDoc("pivot-table-shared-cache-with-group.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Make sure that page field's visibility settings are loaded correctly. @@ -2044,7 +2044,7 @@ void ScFiltersTest::testPivotTableSharedCacheGroupODS() void ScFiltersTest::testGetPivotDataXLS() { ScDocShellRef xDocSh = loadDoc("pivot-getpivotdata.", FORMAT_XLS); - CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -2060,7 +2060,7 @@ void ScFiltersTest::testGetPivotDataXLS() void ScFiltersTest::testPivotTableSharedGroupXLSX() { ScDocShellRef xDocSh = loadDoc("pivot-table/shared-group-field.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Check whether right group names are imported for both tables @@ -2100,7 +2100,7 @@ void ScFiltersTest::testPivotTableSharedGroupXLSX() void ScFiltersTest::testPivotTableSharedDateGroupXLSX() { ScDocShellRef xDocSh = loadDoc("pivot-table/shared-dategroup.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Check whether right date labels are imported for both tables @@ -2139,7 +2139,7 @@ void ScFiltersTest::testPivotTableSharedDateGroupXLSX() void ScFiltersTest::testPivotTableSharedNestedDateGroupXLSX() { ScDocShellRef xDocSh = loadDoc("pivot-table/shared-nested-dategroup.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Check whether right date groups are imported for both tables @@ -2184,7 +2184,7 @@ void ScFiltersTest::testPivotTableSharedNestedDateGroupXLSX() void ScFiltersTest::testPivotTableSharedNumGroupXLSX() { ScDocShellRef xDocSh = loadDoc("pivot-table/shared-numgroup.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Check whether right number groups are imported for both tables @@ -2221,7 +2221,7 @@ void ScFiltersTest::testPivotTableSharedNumGroupXLSX() void ScFiltersTest::testRowHeightODS() { ScDocShellRef xDocSh = loadDoc("row-height-import.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load row-height-import.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load row-height-import.ods", xDocSh.is()); SCTAB nTab = 0; SCROW nRow = 0; @@ -2264,7 +2264,7 @@ void ScFiltersTest::testRowHeightODS() void ScFiltersTest::testRichTextContentODS() { ScDocShellRef xDocSh = loadDoc("rich-text-cells.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load rich-text-cells.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load rich-text-cells.ods", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aTabName; @@ -2524,7 +2524,7 @@ void ScFiltersTest::testRichTextContentODS() void ScFiltersTest::testDataBarODS() { ScDocShellRef xDocSh = loadDoc("databar.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); testDataBar_Impl(rDoc); @@ -2535,7 +2535,7 @@ void ScFiltersTest::testDataBarODS() void ScFiltersTest::testDataBarXLSX() { ScDocShellRef xDocSh = loadDoc("databar.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); testDataBar_Impl(rDoc); @@ -2546,7 +2546,7 @@ void ScFiltersTest::testDataBarXLSX() void ScFiltersTest::testColorScaleODS() { ScDocShellRef xDocSh = loadDoc("colorscale.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); testColorScale2Entry_Impl(rDoc); @@ -2558,7 +2558,7 @@ void ScFiltersTest::testColorScaleODS() void ScFiltersTest::testColorScaleXLSX() { ScDocShellRef xDocSh = loadDoc("colorscale.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); testColorScale2Entry_Impl(rDoc); @@ -2571,7 +2571,7 @@ void ScFiltersTest::testNewCondFormatODS() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("new_cond_format_test.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to load new_cond_format_test.ods", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load new_cond_format_test.ods", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -2587,7 +2587,7 @@ void ScFiltersTest::testNewCondFormatXLSX() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("new_cond_format_test.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load new_cond_format_test.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load new_cond_format_test.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -2603,7 +2603,7 @@ void ScFiltersTest::testCondFormatThemeColorXLSX() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("condformat_theme_color.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load condformat_theme_color.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load condformat_theme_color.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); ScConditionalFormat* pFormat = rDoc.GetCondFormat(0, 0, 0); @@ -2641,7 +2641,7 @@ void ScFiltersTest::testCondFormatThemeColor2XLSX() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("cond_format_theme_color2.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load cond_format_theme_color2.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load cond_format_theme_color2.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); ScConditionalFormat* pFormat = rDoc.GetCondFormat(5, 5, 0); @@ -2680,7 +2680,7 @@ void ScFiltersTest::testCondFormatThemeColor3XLSX() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("cond_format_theme_color3.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load document", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load document", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); ScConditionalFormat* pFormat = rDoc.GetCondFormat(1, 3, 0); @@ -2754,7 +2754,7 @@ void ScFiltersTest::testComplexIconSetsXLSX() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("complex_icon_set.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load complex_icon_set.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load complex_icon_set.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); CPPUNIT_ASSERT_EQUAL(size_t(3), rDoc.GetCondFormList(0)->size()); @@ -2780,7 +2780,7 @@ void ScFiltersTest::testCondFormatParentXLSX() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("cond_parent.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load cond_parent.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load cond_parent.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); const SfxItemSet* pCondSet = rDoc.GetCondResult(2, 5, 0); @@ -2796,7 +2796,7 @@ void ScFiltersTest::testColorScaleNumWithRefXLSX() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("colorscale_num_with_ref.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load colorscale_num_with_ref.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load colorscale_num_with_ref.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); ScConditionalFormatList* pList = rDoc.GetCondFormList(0); @@ -3041,7 +3041,7 @@ void ScFiltersTest::testOrcusODSStyleInterface() void ScFiltersTest::testLiteralInFormulaXLS() { ScDocShellRef xDocSh = loadDoc("shared-string/literal-in-formula.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -3217,7 +3217,7 @@ void ScFiltersTest::testOutlineODS() void ScFiltersTest::testColumnStyleXLSX() { ScDocShellRef xDocSh = loadDoc("column-style.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); const ScPatternAttr* pPattern = rDoc.GetPattern(0,0,0); @@ -3238,7 +3238,7 @@ void ScFiltersTest::testColumnStyleXLSX() void ScFiltersTest::testSharedFormulaHorizontalXLS() { ScDocShellRef xDocSh = loadDoc("shared-formula/horizontal.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Make sure K2:S2 on the 2nd sheet are all formula cells. @@ -3278,7 +3278,7 @@ void ScFiltersTest::testSharedFormulaHorizontalXLS() void ScFiltersTest::testSharedFormulaWrappedRefsXLS() { ScDocShellRef xDocSh = loadDoc("shared-formula/wrapped-refs.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -3306,7 +3306,7 @@ void ScFiltersTest::testSharedFormulaWrappedRefsXLS() void ScFiltersTest::testSharedFormulaBIFF5() { ScDocShellRef xDocSh = loadDoc("shared-formula/biff5.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -3322,7 +3322,7 @@ void ScFiltersTest::testSharedFormulaBIFF5() void ScFiltersTest::testSharedFormulaXLSB() { ScDocShellRef xDocSh = loadDoc("shared_formula.", FORMAT_XLSB); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -3345,7 +3345,7 @@ void ScFiltersTest::testSharedFormulaXLS() { // fdo#80091 ScDocShellRef xDocSh = loadDoc("shared-formula/relative-refs1.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -3366,7 +3366,7 @@ void ScFiltersTest::testSharedFormulaXLS() { // fdo#84556 and some related tests ScDocShellRef xDocSh = loadDoc("shared-formula/relative-refs2.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -3435,7 +3435,7 @@ void ScFiltersTest::testSharedFormulaColumnLabelsODS() { ScDocShellRef xDocSh = loadDoc("shared-formula/column-labels.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -3464,7 +3464,7 @@ void ScFiltersTest::testSharedFormulaColumnRowLabelsODS() { ScDocShellRef xDocSh = loadDoc("shared-formula/column-row-labels.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); rDoc.CalcAll(); @@ -3502,7 +3502,7 @@ void ScFiltersTest::testSharedFormulaColumnRowLabelsODS() void ScFiltersTest::testExternalRefCacheXLSX() { ScDocShellRef xDocSh = loadDoc("external-refs.", FORMAT_XLSX); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // These string values are cached external cell values. @@ -3518,7 +3518,7 @@ void ScFiltersTest::testExternalRefCacheODS() { ScDocShellRef xDocSh = loadDoc("external-ref-cache.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Cells B2:B4 have VLOOKUP with external references which should all show "text". @@ -3537,7 +3537,7 @@ void ScFiltersTest::testHybridSharedStringODS() { ScDocShellRef xDocSh = loadDoc("hybrid-shared-string.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // A2 contains formula with MATCH function. The result must be 2, not #N/A! @@ -3549,7 +3549,7 @@ void ScFiltersTest::testHybridSharedStringODS() void ScFiltersTest::testCopyMergedNumberFormats() { ScDocShellRef xDocSh = loadDoc("copy-merged-number-formats.", FORMAT_ODS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // Cells B1, C1 and D1 are formatted as dates. @@ -3572,7 +3572,7 @@ void ScFiltersTest::testCopyMergedNumberFormats() void ScFiltersTest::testVBAUserFunctionXLSM() { ScDocShellRef xDocSh = loadDoc("vba-user-function.", FORMAT_XLSM); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); // A1 contains formula with user-defined function, and the function is defined in VBA. @@ -3600,7 +3600,7 @@ void ScFiltersTest::testEmbeddedImageXLS() // imported properly. ScDocShellRef xDocSh = loadDoc("file-with-png-image.", FORMAT_XLS); - CPPUNIT_ASSERT(xDocSh.Is()); + CPPUNIT_ASSERT(xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); ScDrawLayer* pDL = rDoc.GetDrawLayer(); @@ -3621,7 +3621,7 @@ void ScFiltersTest::testEmbeddedImageXLS() void ScFiltersTest::testErrorOnExternalReferences() { ScDocShellRef xDocSh = loadDoc("blank.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to open empty doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open empty doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -3640,7 +3640,7 @@ void ScFiltersTest::testErrorOnExternalReferences() void ScFiltersTest::testEditEngStrikeThroughXLSX() { ScDocShellRef xDocSh = loadDoc("strike-through.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -3673,7 +3673,7 @@ void ScFiltersTest::testEditEngStrikeThroughXLSX() void ScFiltersTest::testRefStringXLSX() { ScDocShellRef xDocSh = loadDoc("ref_string.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -3689,7 +3689,7 @@ void ScFiltersTest::testRefStringXLSX() void ScFiltersTest::testColumnStyle2XLSX() { ScDocShellRef xDocSh = loadDoc("column_style.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); const ScPatternAttr* pAttr = rDoc.GetPattern(1, 1, 0); @@ -3728,7 +3728,7 @@ void ScFiltersTest::testColumnStyle2XLSX() void ScFiltersTest::testBnc762542() { ScDocShellRef xDocSh = loadDoc("bnc762542.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer(); @@ -3754,7 +3754,7 @@ void ScFiltersTest::testBnc762542() void ScFiltersTest::testHiddenSheetsXLSX() { ScDocShellRef xDocSh = loadDoc("hidden_sheets.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); CPPUNIT_ASSERT_EQUAL_MESSAGE("1st sheet should be hidden", false, rDoc.IsVisible(0)); @@ -3783,7 +3783,7 @@ void checkValidationFormula(const ScAddress& rPos, ScDocument& rDoc, const OUStr void ScFiltersTest::testRelFormulaValidationXLS() { ScDocShellRef xDocSh = loadDoc("validation.", FORMAT_XLS); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); @@ -3796,7 +3796,7 @@ void ScFiltersTest::testRelFormulaValidationXLS() void ScFiltersTest::testTdf100458() { ScDocShellRef xDocSh = loadDoc("tdf100458_lost_zero_value.", FORMAT_ODS); - CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); CPPUNIT_ASSERT(rDoc.HasValueData(0, 0, 0)); CPPUNIT_ASSERT_EQUAL(double(0.0), rDoc.GetValue(0,0,0)); @@ -3807,7 +3807,7 @@ void ScFiltersTest::testTdf100458() void ScFiltersTest::testTdf100709XLSX() { ScDocShellRef xDocSh = ScBootstrapFixture::loadDoc("tdf100709.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load tdf100709.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load tdf100709.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); CPPUNIT_ASSERT_EQUAL_MESSAGE("Cell B52 should not be formatted with a $", OUString("218"), rDoc.GetString(1, 51, 0)); @@ -3819,7 +3819,7 @@ void ScFiltersTest::testTdf100709XLSX() void ScFiltersTest::testTdf97598XLSX() { ScDocShellRef xDocSh = loadDoc("tdf97598_scenarios.", FORMAT_XLSX); - CPPUNIT_ASSERT_MESSAGE("Failed to load tdf97598_secenarios.xlsx", xDocSh.Is()); + CPPUNIT_ASSERT_MESSAGE("Failed to load tdf97598_secenarios.xlsx", xDocSh.is()); ScDocument& rDoc = xDocSh->GetDocument(); OUString aStr = rDoc.GetString(0, 0, 0); // A1 diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index a23bda10a9f2..86f04c4b8f5b 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -144,7 +144,7 @@ void Test::setUp() void Test::tearDown() { m_pImpl->m_xDocShell->DoClose(); - m_pImpl->m_xDocShell.Clear(); + m_pImpl->m_xDocShell.clear(); BootstrapFixture::tearDown(); } diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index a9f5a875a0f2..97ffab7b2899 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -1132,7 +1132,7 @@ void ScDocument::LimitChartArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, void ScDocument::LimitChartIfAll( ScRangeListRef& rRangeList ) { ScRangeListRef aNew = new ScRangeList; - if (rRangeList.Is()) + if (rRangeList.is()) { for ( size_t i = 0, nCount = rRangeList->size(); i < nCount; i++ ) { diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 2d5c3ad6264f..3b5e8485c2c2 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -621,7 +621,7 @@ void ScGlobal::Clear() ScDocumentPool::DeleteVersionMaps(); DELETEZ(pEmptyOUString); - xDrawClipDocShellRef.Clear(); + xDrawClipDocShellRef.clear(); } rtl_TextEncoding ScGlobal::GetCharsetValue( const OUString& rCharSet ) diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index f055130c4e98..8d6bfa1d8119 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -357,7 +357,7 @@ bool ScTableProtectionImpl::updateReference( UpdateRefMode eMode, ScDocument* pD for (::std::vector<ScEnhancedProtection>::iterator it(maEnhancedProtection.begin()); it != maEnhancedProtection.end(); ++it) { - if ((*it).maRangeList.Is()) + if ((*it).maRangeList.is()) bChanged |= (*it).maRangeList->UpdateReference( eMode, pDoc, rWhere, nDx, nDy, nDz); } return bChanged; @@ -382,7 +382,7 @@ bool ScTableProtectionImpl::isBlockEditable( const ScRange& rRange ) const for (::std::vector<ScEnhancedProtection>::const_iterator it(maEnhancedProtection.begin()), itEnd(maEnhancedProtection.end()); it != itEnd; ++it) { - if (!(*it).hasSecurityDescriptor() && (*it).maRangeList.Is()) + if (!(*it).hasSecurityDescriptor() && (*it).maRangeList.is()) { if ((*it).maRangeList->In( rRange)) { @@ -402,7 +402,7 @@ bool ScTableProtectionImpl::isBlockEditable( const ScRange& rRange ) const for (::std::vector<ScEnhancedProtection>::const_iterator it(maEnhancedProtection.begin()), itEnd(maEnhancedProtection.end()); it != itEnd; ++it) { - if (!(*it).hasSecurityDescriptor() && (*it).maRangeList.Is()) + if (!(*it).hasSecurityDescriptor() && (*it).maRangeList.is()) { ScRangeList aList( (*it).maRangeList->GetIntersectedRange( rRange)); if (aList.size() == 1 && *aList[0] == rRange) @@ -423,7 +423,7 @@ bool ScTableProtectionImpl::isBlockEditable( const ScRange& rRange ) const for (::std::vector<ScEnhancedProtection>::const_iterator it(maEnhancedProtection.begin()), itEnd(maEnhancedProtection.end()); it != itEnd; ++it) { - if (!(*it).hasSecurityDescriptor() && (*it).maRangeList.Is()) + if (!(*it).hasSecurityDescriptor() && (*it).maRangeList.is()) { // Ranges are editable if no password is assigned. if (!(*it).hasPassword()) diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx index 37285a353c04..cb6b9f5ad980 100644 --- a/sc/source/core/tool/charthelper.cxx +++ b/sc/source/core/tool/charthelper.cxx @@ -321,7 +321,7 @@ void ScChartHelper::AddRangesIfProtectedChart( ScRangeListVector& rRangesVector, if (pListener) { const ScRangeListRef& rRangeList = pListener->GetRangeList(); - if ( rRangeList.Is() ) + if ( rRangeList.is() ) { rRangesVector.push_back( *rRangeList ); } diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index dd294347e9b9..98a501319662 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -655,8 +655,8 @@ void ScChartListenerCollection::SetDiffDirty( { const ScRangeListRef& rList1 = pCL->GetRangeList(); const ScRangeListRef& rList2 = pCLCmp->GetRangeList(); - bool b1 = rList1.Is(); - bool b2 = rList2.Is(); + bool b1 = rList1.is(); + bool b2 = rList2.is(); if ( b1 != b2 || (b1 && b2 && (*rList1 != *rList2)) ) pDoc->SetChartRangeList( pCL->GetName(), rList1 ); } @@ -678,7 +678,7 @@ void ScChartListenerCollection::SetRangeDirty( const ScRange& rRange ) { ScChartListener *const pCL = it.second.get(); const ScRangeListRef& rList = pCL->GetRangeList(); - if ( rList.Is() && rList->Intersects( rRange ) ) + if ( rList.is() && rList->Intersects( rRange ) ) { bDirty = true; pCL->SetDirty( true ); diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx index f4bd0c8c5615..7d820e437658 100644 --- a/sc/source/core/tool/chartpos.cxx +++ b/sc/source/core/tool/chartpos.cxx @@ -67,7 +67,7 @@ ScChartPositioner::ScChartPositioner( ScDocument* pDoc, const ScRangeListRef& rR bRowHeaders( false ), bDummyUpperLeft( false ) { - if ( aRangeListRef.Is() ) + if ( aRangeListRef.is() ) CheckColRowHeaders(); } diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 781b02549c9c..e5462e838a0e 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -78,15 +78,15 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument } // try to open "Book" or "Workbook" stream in OLE storage - if( xRootStrg.Is() ) + if( xRootStrg.is() ) { // try to open the "Book" stream tools::SvRef<SotStorageStream> xBookStrm = ScfTools::OpenStorageStreamRead( xRootStrg, EXC_STREAM_BOOK ); - XclBiff eBookBiff = xBookStrm.Is() ? XclImpStream::DetectBiffVersion( *xBookStrm ) : EXC_BIFF_UNKNOWN; + XclBiff eBookBiff = xBookStrm.is() ? XclImpStream::DetectBiffVersion( *xBookStrm ) : EXC_BIFF_UNKNOWN; // try to open the "Workbook" stream tools::SvRef<SotStorageStream> xWorkbookStrm = ScfTools::OpenStorageStreamRead( xRootStrg, EXC_STREAM_WORKBOOK ); - XclBiff eWorkbookBiff = xWorkbookStrm.Is() ? XclImpStream::DetectBiffVersion( *xWorkbookStrm ) : EXC_BIFF_UNKNOWN; + XclBiff eWorkbookBiff = xWorkbookStrm.is() ? XclImpStream::DetectBiffVersion( *xWorkbookStrm ) : EXC_BIFF_UNKNOWN; // decide which stream to use if( (eWorkbookBiff != EXC_BIFF_UNKNOWN) && ((eBookBiff == EXC_BIFF_UNKNOWN) || (eWorkbookBiff > eBookBiff)) ) @@ -167,7 +167,7 @@ static FltError lcl_ExportExcelBiff( SfxMedium& rMedium, ScDocument *pDocument, // open the "Book"/"Workbook" stream tools::SvRef<SotStorageStream> xStrgStrm = ScfTools::OpenStorageStreamWrite( xRootStrg, aStrmName ); - if( !xStrgStrm.Is() || xStrgStrm->GetError() ) return eERR_OPEN; + if( !xStrgStrm.is() || xStrgStrm->GetError() ) return eERR_OPEN; xStrgStrm->SetBufferSize( 0x8000 ); // still needed? diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index d7f1ab76243e..a0fed54c1ab1 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -365,7 +365,7 @@ void ImportExcel8::ReadBasic() SfxObjectShell* pShell = GetDocShell(); tools::SvRef<SotStorage> xRootStrg = GetRootStorage(); const SvtFilterOptions& rFilterOpt = SvtFilterOptions::Get(); - if( pShell && xRootStrg.Is() ) try + if( pShell && xRootStrg.is() ) try { // #FIXME need to get rid of this, we can also do this from within oox // via the "ooo.vba.VBAGlobals" service @@ -375,7 +375,7 @@ void ImportExcel8::ReadBasic() { // see if we have the XCB stream tools::SvRef<SotStorageStream> xXCB = xRootStrg->OpenSotStream( "XCB", StreamMode::STD_READ ); - if ( xXCB.Is()|| SVSTREAM_OK == xXCB->GetError() ) + if ( xXCB.is()|| SVSTREAM_OK == xXCB->GetError() ) { ScCTBWrapper wrapper; if ( wrapper.Read( *xXCB ) ) @@ -450,7 +450,7 @@ void ImportExcel8::PostDocLoad() { // BIFF5+ without storage is possible tools::SvRef<SotStorage> xRootStrg = GetRootStorage(); - if( xRootStrg.Is() ) try + if( xRootStrg.is() ) try { uno::Reference< document::XDocumentPropertiesSupplier > xDPS( pShell->GetModel(), uno::UNO_QUERY_THROW ); uno::Reference< document::XDocumentProperties > xDocProps( xDPS->getDocumentProperties(), uno::UNO_SET_THROW ); diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 623041d41585..d0e96abc9eb1 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -519,7 +519,7 @@ void XclExpSheetProtection::SaveXml( XclExpXmlStream& rStrm ) XML_hashValue, (*it).maHashValue.isEmpty() ? nullptr : XclXmlUtils::ToOString( (*it).maHashValue).getStr(), XML_saltValue, (*it).maSaltValue.isEmpty() ? nullptr : XclXmlUtils::ToOString( (*it).maSaltValue).getStr(), XML_spinCount, (*it).mnSpinCount ? OString::number( (*it).mnSpinCount).getStr() : nullptr, - XML_sqref, (*it).maRangeList.Is() ? XclXmlUtils::ToOString( *(*it).maRangeList).getStr() : nullptr, + XML_sqref, (*it).maRangeList.is() ? XclXmlUtils::ToOString( *(*it).maRangeList).getStr() : nullptr, FSEND); } rWorksheet->endElement( XML_protectedRanges); diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index a268427ccd69..289ffb78fc62 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -77,7 +77,7 @@ FltError ExportBiff5::Write() OSL_ENSURE( pDocShell, "ExportBiff5::Write - no document shell" ); tools::SvRef<SotStorage> xRootStrg = GetRootStorage(); - OSL_ENSURE( xRootStrg.Is(), "ExportBiff5::Write - no root storage" ); + OSL_ENSURE( xRootStrg.is(), "ExportBiff5::Write - no root storage" ); VBAExportMode eVbaExportMode = VBAExportMode::NONE; if( GetBiff() == EXC_BIFF8 ) @@ -92,7 +92,7 @@ FltError ExportBiff5::Write() } } - if ( pDocShell && xRootStrg.Is() && eVbaExportMode == VBAExportMode::FULL_EXPORT) + if ( pDocShell && xRootStrg.is() && eVbaExportMode == VBAExportMode::FULL_EXPORT) { VbaExport aExport(pDocShell->GetModel()); if (aExport.containsVBAProject()) @@ -101,7 +101,7 @@ FltError ExportBiff5::Write() aExport.exportVBA( xVBARoot.get() ); } } - else if( pDocShell && xRootStrg.Is() && eVbaExportMode == VBAExportMode::REEXPORT_STREAM ) + else if( pDocShell && xRootStrg.is() && eVbaExportMode == VBAExportMode::REEXPORT_STREAM ) { SvxImportMSVBasic aBasicImport( *pDocShell, *xRootStrg ); const ErrCode nErr = aBasicImport.SaveOrDelMSVBAStorage( true, EXC_STORAGE_VBA_PROJECT ); @@ -112,7 +112,7 @@ FltError ExportBiff5::Write() pExcDoc->ReadDoc(); // ScDoc -> ExcDoc pExcDoc->Write( aOut ); // wechstreamen - if( pDocShell && xRootStrg.Is() ) + if( pDocShell && xRootStrg.is() ) { using namespace ::com::sun::star; uno::Reference<document::XDocumentPropertiesSupplier> xDPS( diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 62f84eb69ae5..568843df78e1 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -804,7 +804,7 @@ void XclExpPivotCache::WriteCacheStream() { tools::SvRef<SotStorage> xSvStrg = OpenStorage( EXC_STORAGE_PTCACHE ); tools::SvRef<SotStorageStream> xSvStrm = OpenStream( xSvStrg, ScfTools::GetHexStr( maPCInfo.mnStrmId ) ); - if( xSvStrm.Is() ) + if( xSvStrm.is() ) { XclExpStream aStrm( *xSvStrm, GetRoot() ); // SXDB diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 2d3221ab5702..350324b98d89 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -3393,7 +3393,7 @@ SdrObjectPtr XclImpDffConverter::CreateSdrObject( const XclImpPictureObj& rPicOb { if( rPicObj.IsOcxControl() ) { - if( mxCtlsStrm.Is() ) try + if( mxCtlsStrm.is() ) try { /* set controls form, needed in virtual function InsertControl() called from ReadOCXExcelKludgeStream() */ @@ -3425,7 +3425,7 @@ SdrObjectPtr XclImpDffConverter::CreateSdrObject( const XclImpPictureObj& rPicOb SfxObjectShell* pDocShell = GetDocShell(); tools::SvRef<SotStorage> xSrcStrg = GetRootStorage(); OUString aStrgName = rPicObj.GetOleStorageName(); - if( pDocShell && xSrcStrg.Is() && (!aStrgName.isEmpty()) ) + if( pDocShell && xSrcStrg.is() && (!aStrgName.isEmpty()) ) { // first try to resolve graphic from DFF storage Graphic aGraphic; diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 9888e08d6581..fc451bf173a2 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -711,7 +711,7 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm ) // open pivot cache storage stream tools::SvRef<SotStorage> xSvStrg = OpenStorage( EXC_STORAGE_PTCACHE ); tools::SvRef<SotStorageStream> xSvStrm = OpenStream( xSvStrg, ScfTools::GetHexStr( mnStrmId ) ); - if( !xSvStrm.Is() ) + if( !xSvStrm.is() ) return; // create Excel record stream object diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index cef5e3886a38..58f37e30bb71 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -239,7 +239,7 @@ uno::Sequence< beans::NamedValue > XclRoot::RequestEncryptionData( ::comphelper: bool XclRoot::HasVbaStorage() const { tools::SvRef<SotStorage> xRootStrg = GetRootStorage(); - return xRootStrg.Is() && xRootStrg->IsContained( EXC_STORAGE_VBA_PROJECT ); + return xRootStrg.is() && xRootStrg->IsContained( EXC_STORAGE_VBA_PROJECT ); } tools::SvRef<SotStorage> XclRoot::OpenStorage( tools::SvRef<SotStorage> const & xStrg, const OUString& rStrgName ) const diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index ea78de7c3df8..1ba516220885 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -164,7 +164,7 @@ OUString ScfTools::ConvertToScDefinedName(const OUString& rName ) tools::SvRef<SotStorage> ScfTools::OpenStorageRead( tools::SvRef<SotStorage> const & xStrg, const OUString& rStrgName ) { tools::SvRef<SotStorage> xSubStrg; - if( xStrg.Is() && xStrg->IsContained( rStrgName ) ) + if( xStrg.is() && xStrg->IsContained( rStrgName ) ) xSubStrg = xStrg->OpenSotStorage( rStrgName, StreamMode::STD_READ ); return xSubStrg; } @@ -172,7 +172,7 @@ tools::SvRef<SotStorage> ScfTools::OpenStorageRead( tools::SvRef<SotStorage> con tools::SvRef<SotStorage> ScfTools::OpenStorageWrite( tools::SvRef<SotStorage> const & xStrg, const OUString& rStrgName ) { tools::SvRef<SotStorage> xSubStrg; - if( xStrg.Is() ) + if( xStrg.is() ) xSubStrg = xStrg->OpenSotStorage( rStrgName, StreamMode::STD_WRITE ); return xSubStrg; } @@ -180,16 +180,16 @@ tools::SvRef<SotStorage> ScfTools::OpenStorageWrite( tools::SvRef<SotStorage> co tools::SvRef<SotStorageStream> ScfTools::OpenStorageStreamRead( tools::SvRef<SotStorage> const & xStrg, const OUString& rStrmName ) { tools::SvRef<SotStorageStream> xStrm; - if( xStrg.Is() && xStrg->IsContained( rStrmName ) && xStrg->IsStream( rStrmName ) ) + if( xStrg.is() && xStrg->IsContained( rStrmName ) && xStrg->IsStream( rStrmName ) ) xStrm = xStrg->OpenSotStream( rStrmName, StreamMode::STD_READ ); return xStrm; } tools::SvRef<SotStorageStream> ScfTools::OpenStorageStreamWrite( tools::SvRef<SotStorage> const & xStrg, const OUString& rStrmName ) { - OSL_ENSURE( !xStrg.Is() || !xStrg->IsContained( rStrmName ), "ScfTools::OpenStorageStreamWrite - stream exists already" ); + OSL_ENSURE( !xStrg.is() || !xStrg->IsContained( rStrmName ), "ScfTools::OpenStorageStreamWrite - stream exists already" ); tools::SvRef<SotStorageStream> xStrm; - if( xStrg.Is() ) + if( xStrg.is() ) xStrm = xStrg->OpenSotStream( rStrmName, StreamMode::STD_WRITE | StreamMode::TRUNC ); return xStrm; } diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index b1d7ce658002..a3254edbe451 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -1601,8 +1601,8 @@ bool XclExpChangeTrack::WriteUserNamesStream() { bool bRet = false; tools::SvRef<SotStorageStream> xSvStrm = OpenStream( EXC_STREAM_USERNAMES ); - OSL_ENSURE( xSvStrm.Is(), "XclExpChangeTrack::WriteUserNamesStream - no stream" ); - if( xSvStrm.Is() ) + OSL_ENSURE( xSvStrm.is(), "XclExpChangeTrack::WriteUserNamesStream - no stream" ); + if( xSvStrm.is() ) { XclExpStream aXclStrm( *xSvStrm, GetRoot() ); XclExpChTr0x0191().Save( aXclStrm ); @@ -1623,8 +1623,8 @@ void XclExpChangeTrack::Write() if( WriteUserNamesStream() ) { tools::SvRef<SotStorageStream> xSvStrm = OpenStream( EXC_STREAM_REVLOG ); - OSL_ENSURE( xSvStrm.Is(), "XclExpChangeTrack::Write - no stream" ); - if( xSvStrm.Is() ) + OSL_ENSURE( xSvStrm.is(), "XclExpChangeTrack::Write - no stream" ); + if( xSvStrm.is() ) { XclExpStream aXclStrm( *xSvStrm, GetRoot(), EXC_MAXRECSIZE_BIFF8 + 8 ); diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index 6b1b40e5c839..986ffff734ad 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -45,11 +45,11 @@ XclImpChangeTrack::XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStrea // "Revision Log" and "User Names" streams when Change Tracking is active but the Revision log // remains if Change Tracking is turned off. tools::SvRef<SotStorageStream> xUserStrm = OpenStream( EXC_STREAM_USERNAMES ); - if( !xUserStrm.Is() ) + if( !xUserStrm.is() ) return; xInStrm = OpenStream( EXC_STREAM_REVLOG ); - if( xInStrm.Is() ) + if( xInStrm.is() ) { xInStrm->Seek( STREAM_SEEK_TO_END ); sal_uInt64 const nStreamLen = xInStrm->Tell(); diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index a79b695a514a..4a1438f0052f 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -413,9 +413,9 @@ std::unique_ptr<XclExpOcxControlObj> XclEscherEx::CreateOCXCtrlObj( Reference< X if( xCtrlModel.is() ) { // output stream - if( !mxCtlsStrm.Is() ) + if( !mxCtlsStrm.is() ) mxCtlsStrm = OpenStream( EXC_STREAM_CTLS ); - if( mxCtlsStrm.Is() ) + if( mxCtlsStrm.is() ) { OUString aClassName; sal_uInt32 nStrmStart = static_cast< sal_uInt32 >( mxCtlsStrm->Tell() ); diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 4d1c3c0f5793..f35be3157e1f 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -890,7 +890,7 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm ) sprintf( aBuf, "%08X", static_cast< unsigned int >( nPictureId ) ); aStorageName += OUString::createFromAscii(aBuf); tools::SvRef<SotStorage> xOleStg = pRootStorage->OpenSotStorage( aStorageName ); - if( xOleStg.Is() ) + if( xOleStg.is() ) { uno::Reference < embed::XEmbeddedObject > xObj( static_cast<const SdrOle2Obj&>(rOleObj).GetObjRef() ); if ( xObj.is() ) @@ -1605,7 +1605,7 @@ void XclExpSheetEnhancedProtection::WriteBody( XclExpStream& rStrm ) rStrm.WriteZeroBytesToRecord(5); // reserved1 (1 bytes) and reserved2 (4 bytes) XclRangeList aRefs; - if (maEnhancedProtection.maRangeList.Is()) + if (maEnhancedProtection.maRangeList.is()) mrRoot.GetAddressConverter().ConvertRangeList( aRefs, *maEnhancedProtection.maRangeList, false); sal_uInt16 nCref = ulimit_cast<sal_uInt16>(aRefs.size()); rStrm << nCref; // cref diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 260817a97928..c7f169fc45f6 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3395,7 +3395,7 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, if (pListener) { const ScRangeListRef& rRangeList = pListener->GetRangeList(); - if ( rRangeList.Is() ) + if ( rRangeList.is() ) { ScRangeStringConverter::GetStringFromRangeList( sRanges, rRangeList.get(), pDoc, FormulaGrammar::CONV_OOO ); if ( !sRanges.isEmpty() ) diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 1c0a506e1cda..d2f3deb9e7cd 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -236,10 +236,10 @@ ScDrawTransferObj::~ScDrawTransferObj() } aOleData = TransferableDataHelper(); // clear before releasing the mutex - aDocShellRef.Clear(); + aDocShellRef.clear(); delete pModel; - aDrawPersistRef.Clear(); // after the model + aDrawPersistRef.clear(); // after the model delete pBookmark; delete pDragSourceView; @@ -715,7 +715,7 @@ void ScDrawTransferObj::CreateOLEData() void ScDrawTransferObj::InitDocShell() { - if ( !aDocShellRef.Is() ) + if ( !aDocShellRef.is() ) { ScDocShell* pDocSh = new ScDocShell; aDocShellRef = pDocSh; // ref must be there before InitNew diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 34fa4e0a58b7..16880d5a5deb 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -197,9 +197,9 @@ ScTransferObj::~ScTransferObj() delete pDoc; // ScTransferObj is owner of clipboard document - aDocShellRef.Clear(); // before releasing the mutex + aDocShellRef.clear(); // before releasing the mutex - aDrawPersistRef.Clear(); // after the model + aDrawPersistRef.clear(); // after the model } @@ -612,7 +612,7 @@ ScMarkData ScTransferObj::GetSourceMarkData() void ScTransferObj::InitDocShell(bool bLimitToPageSize) { - if ( !aDocShellRef.Is() ) + if ( !aDocShellRef.is() ) { ScDocShell* pDocSh = new ScDocShell; aDocShellRef = pDocSh; // ref must be there before InitNew @@ -759,7 +759,7 @@ SfxObjectShell* ScTransferObj::SetDrawClipDoc( bool bAnyOle ) { // update ScGlobal::xDrawClipDocShellRef - ScGlobal::xDrawClipDocShellRef.Clear(); + ScGlobal::xDrawClipDocShellRef.clear(); if (bAnyOle) { ScGlobal::xDrawClipDocShellRef = new ScDocShell(SfxModelFlags::EMBEDDED_OBJECT | SfxModelFlags::DISABLE_EMBEDDED_SCRIPTS); // there must be a ref @@ -768,7 +768,7 @@ SfxObjectShell* ScTransferObj::SetDrawClipDoc( bool bAnyOle ) } else { - ScGlobal::xDrawClipDocShellRef.Clear(); + ScGlobal::xDrawClipDocShellRef.clear(); return nullptr; } } diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index d76404bba990..61b412bfd819 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -248,7 +248,7 @@ void ScDocShell::UnlockPaint_Impl(bool bDoc) pPaintLockData = nullptr; // nicht weitersammeln ScRangeListRef xRangeList = pPaint->GetRangeList(); - if ( xRangeList.Is() ) + if ( xRangeList.is() ) { PaintPartFlags nParts = pPaint->GetParts(); for ( size_t i = 0, nCount = xRangeList->size(); i < nCount; i++ ) diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 3f11472077cf..6b2ee929d124 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -292,7 +292,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) bValid = true; } else - aRangeListRef.Clear(); + aRangeListRef.clear(); } ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 94b8752f429e..fa08f9492ae3 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -2460,7 +2460,7 @@ ScDocument* ScExternalRefManager::getSrcDocument(sal_uInt16 nFileId) catch (const css::uno::Exception&) { } - if (!aSrcDoc.maShell.Is()) + if (!aSrcDoc.maShell.is()) { // source document could not be loaded. return nullptr; @@ -2559,7 +2559,7 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt if (!pNewShell->DoLoad(pMedium.release())) { aRef->DoClose(); - aRef.Clear(); + aRef.clear(); return aRef; } @@ -2913,7 +2913,7 @@ bool ScExternalRefManager::refreshSrcDocument(sal_uInt16 nFileId) } catch ( const css::uno::Exception& ) {} - if (!xDocShell.Is()) + if (!xDocShell.is()) // Failed to load the document. Bail out. return false; diff --git a/sc/source/ui/docshell/pntlock.cxx b/sc/source/ui/docshell/pntlock.cxx index 138c4eb613a2..ed7aca968e17 100644 --- a/sc/source/ui/docshell/pntlock.cxx +++ b/sc/source/ui/docshell/pntlock.cxx @@ -33,7 +33,7 @@ ScPaintLockData::~ScPaintLockData() void ScPaintLockData::AddRange( const ScRange& rRange, PaintPartFlags nP ) { - if (!xRangeList.Is()) + if (!xRangeList.is()) xRangeList = new ScRangeList; xRangeList->Join( rRange ); diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 5c2ff38af891..7c83260d88ba 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -534,7 +534,7 @@ ScDocumentLoader::ScDocumentLoader( const OUString& rFileName, ScDocumentLoader::~ScDocumentLoader() { - if ( aRef.Is() ) + if ( aRef.is() ) aRef->DoClose(); else if ( pMedium ) delete pMedium; @@ -542,14 +542,14 @@ ScDocumentLoader::~ScDocumentLoader() void ScDocumentLoader::ReleaseDocRef() { - if ( aRef.Is() ) + if ( aRef.is() ) { // release reference without calling DoClose - caller must // have another reference to the doc and call DoClose later pDocShell = nullptr; pMedium = nullptr; - aRef.Clear(); + aRef.clear(); } } diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 69afe42fe9ec..241b370ac4d9 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -346,7 +346,7 @@ IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg else { pDocShTables->DoClose(); - aDocShTablesRef.Clear(); + aDocShTablesRef.clear(); pDocShTables = nullptr; FillTables_Impl( nullptr ); diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 67bc379f9c7f..94fc4e677dff 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -126,7 +126,7 @@ void ScLinkedAreaDlg::LoadDocument( const OUString& rFile, const OUString& rFilt // unload old document pSourceShell->DoClose(); pSourceShell = nullptr; - aSourceRef.Clear(); + aSourceRef.clear(); } if ( !rFile.isEmpty() ) @@ -239,7 +239,7 @@ IMPL_LINK( ScLinkedAreaDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, { pSourceShell->DoClose(); pSourceShell = nullptr; - aSourceRef.Clear(); + aSourceRef.clear(); m_pCbUrl->SetText( EMPTY_OUSTRING ); } diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index ae624ce46827..5ae09b2d92be 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -3034,7 +3034,7 @@ ScMemChart* ScCellRangesBase::CreateMemChart_Impl() const xChartRanges->Append( ScRange( nStartX, nStartY, nTab, nEndX, nEndY, nTab ) ); } } - if (!xChartRanges.Is()) // sonst Ranges direkt uebernehmen + if (!xChartRanges.is()) // sonst Ranges direkt uebernehmen xChartRanges = new ScRangeList(aRanges); ScChartArray aArr( &pDocShell->GetDocument(), xChartRanges, OUString() ); @@ -3113,7 +3113,7 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub long nRowCount = aData.getLength(); long nColCount = nRowCount ? aData[0].getLength() : 0; ScRangeListRef xChartRanges = GetLimitedChartRanges_Impl( nColCount, nRowCount ); - if ( pDocShell && xChartRanges.Is() ) + if ( pDocShell && xChartRanges.is() ) { ScDocument& rDoc = pDocShell->GetDocument(); ScChartArray aArr( &rDoc, xChartRanges, OUString() ); @@ -3184,7 +3184,7 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions( { long nRowCount = aRowDescriptions.getLength(); ScRangeListRef xChartRanges = GetLimitedChartRanges_Impl( 1, nRowCount ); - if ( pDocShell && xChartRanges.Is() ) + if ( pDocShell && xChartRanges.is() ) { ScDocument& rDoc = pDocShell->GetDocument(); ScChartArray aArr( &rDoc, xChartRanges, OUString() ); @@ -3253,7 +3253,7 @@ void SAL_CALL ScCellRangesBase::setColumnDescriptions( { long nColCount = aColumnDescriptions.getLength(); ScRangeListRef xChartRanges = GetLimitedChartRanges_Impl( nColCount, 1 ); - if ( pDocShell && xChartRanges.Is() ) + if ( pDocShell && xChartRanges.is() ) { ScDocument& rDoc = pDocShell->GetDocument(); ScChartArray aArr( &rDoc, xChartRanges, OUString() ); @@ -9293,7 +9293,7 @@ public: void Join( const ScRange& rNewRange ); const ScRangeList& GetRanges(); - void Clear() { aReturnRanges.Clear(); } // aJoinedRanges and aCompletedRanges are cleared in GetRanges + void Clear() { aReturnRanges.clear(); } // aJoinedRanges and aCompletedRanges are cleared in GetRanges }; void ScUniqueFormatsEntry::Join( const ScRange& rNewRange ) diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 10d89ce5e6ab..e8ad9ea2caea 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -601,7 +601,7 @@ void ScChartObj::getFastPropertyValue( uno::Any& rValue, sal_Int32 nHandle ) con break; const ScRangeListRef& rRangeList = pListener->GetRangeList(); - if (!rRangeList.Is()) + if (!rRangeList.is()) break; size_t nCount = rRangeList->size(); @@ -685,7 +685,7 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() ScRangeListRef xRanges = new ScRangeList; bool bColHeaders, bRowHeaders; GetData_Impl( xRanges, bColHeaders, bRowHeaders ); - if ( xRanges.Is() ) + if ( xRanges.is() ) { size_t nCount = xRanges->size(); @@ -732,7 +732,7 @@ void SAL_CALL ScChartObj::setRanges( const uno::Sequence<table::CellRangeAddress } ScRangeListRef xNewRanges( pList ); - if ( !xOldRanges.Is() || *xOldRanges != *xNewRanges ) + if ( !xOldRanges.is() || *xOldRanges != *xNewRanges ) Update_Impl( xNewRanges, bColHeaders, bRowHeaders ); } diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx index d0c72c57600b..bb5bcd3f98eb 100644 --- a/sc/source/ui/unoobj/exceldetect.cxx +++ b/sc/source/ui/unoobj/exceldetect.cxx @@ -67,7 +67,7 @@ bool hasStream(const uno::Reference<io::XInputStream>& xInStream, const OUString try { tools::SvRef<SotStorage> xStorage = new SotStorage(pStream, false); - if (!xStorage.Is() || xStorage->GetError()) + if (!xStorage.is() || xStorage->GetError()) return false; return xStorage->IsStream(rName); } diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index f0851b5b092a..e9be96c7d5f1 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -356,7 +356,7 @@ void ScDrawView::DoCopy() // update ScGlobal::xDrawClipDocShellRef ScDrawLayer::SetGlobalDrawPersist( ScTransferObj::SetDrawClipDoc(!aRanges.empty()) ); - if (ScGlobal::xDrawClipDocShellRef.Is()) + if (ScGlobal::xDrawClipDocShellRef.is()) { // Copy data referenced by the chart objects to the draw clip // document. We need to do this before GetMarkedObjModel() below. @@ -382,7 +382,7 @@ void ScDrawView::DoCopy() ScDrawTransferObj* pTransferObj = new ScDrawTransferObj( pModel, pDocSh, aObjDesc ); uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj ); - if ( ScGlobal::xDrawClipDocShellRef.Is() ) + if ( ScGlobal::xDrawClipDocShellRef.is() ) { pTransferObj->SetDrawPersist( ScGlobal::xDrawClipDocShellRef.get() ); // keep persist for ole objects alive } @@ -418,7 +418,7 @@ uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable() ScDrawTransferObj* pTransferObj = new ScDrawTransferObj( pModel, pDocSh, aObjDesc ); uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj ); - if ( ScGlobal::xDrawClipDocShellRef.Is() ) + if ( ScGlobal::xDrawClipDocShellRef.is() ) { pTransferObj->SetDrawPersist( ScGlobal::xDrawClipDocShellRef.get() ); // keep persist for ole objects alive } diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx index 0d4dc36c7ec5..b01c9de1158b 100644 --- a/sc/source/ui/view/spelldialog.cxx +++ b/sc/source/ui/view/spelldialog.cxx @@ -146,7 +146,7 @@ void ScSpellDialogChildWindow::Reset() mxUndoDoc.reset(); mxRedoDoc.reset(); mxOldSel.reset(); - mxOldRangeList.Clear(); + mxOldRangeList.clear(); mpViewShell = nullptr; mpViewData = nullptr; mpDocShell = nullptr; diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 2c481f5ce0fe..64a5cb68b362 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -272,7 +272,7 @@ bool ScViewFunc::CopyToClip( ScDocument* pClipDoc, const ScRangeList& rRanges, b ScTransferObj* pTransferObj = new ScTransferObj( pClipDoc, aObjDesc ); uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj ); - if ( ScGlobal::xDrawClipDocShellRef.Is() ) + if ( ScGlobal::xDrawClipDocShellRef.is() ) { SfxObjectShellRef aPersistRef( ScGlobal::xDrawClipDocShellRef.get() ); pTransferObj->SetDrawPersist( aPersistRef );// keep persist for ole objects alive @@ -381,7 +381,7 @@ bool ScViewFunc::CopyToClip( ScDocument* pClipDoc, const ScRangeList& rRanges, b ScTransferObj* pTransferObj = new ScTransferObj( pDocClip.release(), aObjDesc ); uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj ); - if ( ScGlobal::xDrawClipDocShellRef.Is() ) + if ( ScGlobal::xDrawClipDocShellRef.is() ) { SfxObjectShellRef aPersistRef( ScGlobal::xDrawClipDocShellRef.get() ); pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 48c322485a35..1076636ec120 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -161,12 +161,12 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, OUString aStr; tools::SvRef<SotStorageStream> xStream; - if ( aDataHelper.GetSotStorageStream( SotClipboardFormatId::RTF, xStream ) && xStream.Is() ) + if ( aDataHelper.GetSotStorageStream( SotClipboardFormatId::RTF, xStream ) && xStream.is() ) // mba: clipboard always must contain absolute URLs (could be from alien source) aImpEx.ImportStream( *xStream, OUString(), SotClipboardFormatId::RTF ); else if ( aDataHelper.GetString( SotClipboardFormatId::RTF, aStr ) ) aImpEx.ImportString( aStr, SotClipboardFormatId::RTF ); - else if ( aDataHelper.GetSotStorageStream( SotClipboardFormatId::RICHTEXT, xStream ) && xStream.Is() ) + else if ( aDataHelper.GetSotStorageStream( SotClipboardFormatId::RICHTEXT, xStream ) && xStream.is() ) aImpEx.ImportStream( *xStream, OUString(), SotClipboardFormatId::RICHTEXT ); else if ( aDataHelper.GetString( SotClipboardFormatId::RICHTEXT, aStr ) ) aImpEx.ImportString( aStr, SotClipboardFormatId::RICHTEXT ); diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 6f1cc0646ecd..ac66ce82421e 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -164,7 +164,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, } xDocShRef->DoClose(); - xDocShRef.Clear(); + xDocShRef.clear(); } else { @@ -298,7 +298,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, OUString aStr; tools::SvRef<SotStorageStream> xStream; - if ( aDataHelper.GetSotStorageStream( nFormatId, xStream ) && xStream.Is() ) + if ( aDataHelper.GetSotStorageStream( nFormatId, xStream ) && xStream.is() ) { if (nFormatId == SotClipboardFormatId::HTML) { |