diff options
Diffstat (limited to 'sc/qa/extras')
-rw-r--r-- | sc/qa/extras/htmlexporttest.cxx | 4 | ||||
-rw-r--r-- | sc/qa/extras/macros-test.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/new_cond_format.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/scannotationobj.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/scannotationsobj.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/sccellcursorobj.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/sccellrangeobj.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/scdatabaserangeobj.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/scdatapilotfieldobj.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/scdatapilottableobj.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/scmodelobj.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/scnamedrangeobj.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/scnamedrangesobj.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/scoutlineobj.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/scpdfexport.cxx | 12 | ||||
-rw-r--r-- | sc/qa/extras/screcordchanges.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/sctablesheetobj.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/sctablesheetsobj.cxx | 2 | ||||
-rw-r--r-- | sc/qa/extras/vba-macro-test.cxx | 38 |
19 files changed, 43 insertions, 43 deletions
diff --git a/sc/qa/extras/htmlexporttest.cxx b/sc/qa/extras/htmlexporttest.cxx index 774f75078a85..4e83e51139b2 100644 --- a/sc/qa/extras/htmlexporttest.cxx +++ b/sc/qa/extras/htmlexporttest.cxx @@ -33,7 +33,7 @@ public: void testHtmlSkipImage() { - loadFromURL(u"BaseForHTMLExport.ods"); + loadFromFile(u"BaseForHTMLExport.ods"); save("HTML (StarCalc)"); htmlDocUniquePtr pDoc = parseHtml(maTempFile); CPPUNIT_ASSERT (pDoc); @@ -52,7 +52,7 @@ public: void testTdf155244() { - loadFromURL(u"default-styles.ods"); + loadFromFile(u"default-styles.ods"); save("XHTML Calc File"); xmlDocUniquePtr pXmlDoc = parseXml(maTempFile); diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index c483a05c9300..4494f3f65bee 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -781,7 +781,7 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testShapeLayerId) CPPUNIT_TEST_FIXTURE(ScMacrosTest, testFunctionAccessIndirect) { - OUString aFileName = loadFromURL(u"tdf120161.ods"); // just some document with known values in cells + OUString aFileName = loadFromFile(u"tdf120161.ods"); // just some document with known values in cells const OUString aReference = "'" + aFileName + "'#$Sheet1.A1"; diff --git a/sc/qa/extras/new_cond_format.cxx b/sc/qa/extras/new_cond_format.cxx index 9cab2bdd1edc..9749d639c6cc 100644 --- a/sc/qa/extras/new_cond_format.cxx +++ b/sc/qa/extras/new_cond_format.cxx @@ -434,7 +434,7 @@ void ScConditionalFormatTest::setUp() { UnoApiTest::setUp(); // get the test file - loadFromURL(u"new_cond_format_api.ods"); + loadFromFile(u"new_cond_format_api.ods"); } CPPUNIT_TEST_SUITE_REGISTRATION(ScConditionalFormatTest); diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx index 4498ff5ad743..fe092e019892 100644 --- a/sc/qa/extras/scannotationobj.cxx +++ b/sc/qa/extras/scannotationobj.cxx @@ -123,7 +123,7 @@ void ScAnnontationObj::setUp() UnoApiTest::setUp(); // get the test file - loadFromURL(u"ScAnnotationObj.ods"); + loadFromFile(u"ScAnnotationObj.ods"); } CPPUNIT_TEST_SUITE_REGISTRATION(ScAnnontationObj); diff --git a/sc/qa/extras/scannotationsobj.cxx b/sc/qa/extras/scannotationsobj.cxx index 8e711f8e9362..b81107e0571a 100644 --- a/sc/qa/extras/scannotationsobj.cxx +++ b/sc/qa/extras/scannotationsobj.cxx @@ -99,7 +99,7 @@ void ScAnnontationsObj::setUp() UnoApiTest::setUp(); // get the test file - loadFromURL(u"ScAnnotationObj.ods"); + loadFromFile(u"ScAnnotationObj.ods"); } CPPUNIT_TEST_SUITE_REGISTRATION(ScAnnontationsObj); diff --git a/sc/qa/extras/sccellcursorobj.cxx b/sc/qa/extras/sccellcursorobj.cxx index de237299275b..c2b861ccd1b5 100644 --- a/sc/qa/extras/sccellcursorobj.cxx +++ b/sc/qa/extras/sccellcursorobj.cxx @@ -202,7 +202,7 @@ void ScCellCursorObj::setUp() { UnoApiTest::setUp(); - loadFromURL(u"ScCellCursorObj.ods"); + loadFromFile(u"ScCellCursorObj.ods"); } CPPUNIT_TEST_SUITE_REGISTRATION(ScCellCursorObj); diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index c7635cb21022..5470ae757906 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -245,7 +245,7 @@ void ScCellRangeObj::setUp() { UnoApiTest::setUp(); - loadFromURL(u"xcellrangesquery.ods"); + loadFromFile(u"xcellrangesquery.ods"); } CPPUNIT_TEST_SUITE_REGISTRATION(ScCellRangeObj); diff --git a/sc/qa/extras/scdatabaserangeobj.cxx b/sc/qa/extras/scdatabaserangeobj.cxx index 178ce8e680b6..4ddc137e4b25 100644 --- a/sc/qa/extras/scdatabaserangeobj.cxx +++ b/sc/qa/extras/scdatabaserangeobj.cxx @@ -97,7 +97,7 @@ void ScDatabaseRangeObj::setUp() { UnoApiTest::setUp(); - loadFromURL(u"ScDatabaseRangeObj.ods"); + loadFromFile(u"ScDatabaseRangeObj.ods"); } CPPUNIT_TEST_SUITE_REGISTRATION(ScDatabaseRangeObj); diff --git a/sc/qa/extras/scdatapilotfieldobj.cxx b/sc/qa/extras/scdatapilotfieldobj.cxx index f7ead7940576..789bc5a5baab 100644 --- a/sc/qa/extras/scdatapilotfieldobj.cxx +++ b/sc/qa/extras/scdatapilotfieldobj.cxx @@ -109,7 +109,7 @@ void ScDataPilotFieldObj::setUp() { UnoApiTest::setUp(); - loadFromURL(u"scdatapilotfieldobj.ods"); + loadFromFile(u"scdatapilotfieldobj.ods"); } CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldObj); diff --git a/sc/qa/extras/scdatapilottableobj.cxx b/sc/qa/extras/scdatapilottableobj.cxx index 2a6bfa08ddd2..e0c66269f5f5 100644 --- a/sc/qa/extras/scdatapilottableobj.cxx +++ b/sc/qa/extras/scdatapilottableobj.cxx @@ -131,7 +131,7 @@ void ScDataPilotTableObj::setUp() { UnoApiTest::setUp(); // create a calc document - loadFromURL(u"ScDataPilotTableObj.ods"); + loadFromFile(u"ScDataPilotTableObj.ods"); } CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotTableObj); diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx index 1c2d9c615f1c..1c57effa3a2d 100644 --- a/sc/qa/extras/scmodelobj.cxx +++ b/sc/qa/extras/scmodelobj.cxx @@ -105,7 +105,7 @@ void ScModelObj::setUp() { UnoApiTest::setUp(); // create a calc document - loadFromURL(u"ScModelObj.ods"); + loadFromFile(u"ScModelObj.ods"); } CPPUNIT_TEST_SUITE_REGISTRATION(ScModelObj); diff --git a/sc/qa/extras/scnamedrangeobj.cxx b/sc/qa/extras/scnamedrangeobj.cxx index 7bbd5e510b57..95cbf1c42fcd 100644 --- a/sc/qa/extras/scnamedrangeobj.cxx +++ b/sc/qa/extras/scnamedrangeobj.cxx @@ -92,7 +92,7 @@ void ScNamedRangeObj::setUp() { UnoApiTest::setUp(); // create a calc document - loadFromURL(u"ScNamedRangeObj.ods"); + loadFromFile(u"ScNamedRangeObj.ods"); } CPPUNIT_TEST_SUITE_REGISTRATION(ScNamedRangeObj); diff --git a/sc/qa/extras/scnamedrangesobj.cxx b/sc/qa/extras/scnamedrangesobj.cxx index f5415a0b914c..5ae53f42e07c 100644 --- a/sc/qa/extras/scnamedrangesobj.cxx +++ b/sc/qa/extras/scnamedrangesobj.cxx @@ -134,7 +134,7 @@ void ScNamedRangesObj::setUp() { UnoApiTest::setUp(); // create a calc document - loadFromURL(u"ScNamedRangeObj.ods"); + loadFromFile(u"ScNamedRangeObj.ods"); } CPPUNIT_TEST_SUITE_REGISTRATION(ScNamedRangesObj); diff --git a/sc/qa/extras/scoutlineobj.cxx b/sc/qa/extras/scoutlineobj.cxx index 4e20a9214760..fd442599850b 100644 --- a/sc/qa/extras/scoutlineobj.cxx +++ b/sc/qa/extras/scoutlineobj.cxx @@ -62,7 +62,7 @@ void ScOutlineObj::setUp() { UnoApiTest::setUp(); // create a calc document - loadFromURL(u"ScOutlineObj.ods"); + loadFromFile(u"ScOutlineObj.ods"); } CPPUNIT_TEST_SUITE_REGISTRATION(ScOutlineObj); diff --git a/sc/qa/extras/scpdfexport.cxx b/sc/qa/extras/scpdfexport.cxx index ca4a7b762f63..bcca563ec9b3 100644 --- a/sc/qa/extras/scpdfexport.cxx +++ b/sc/qa/extras/scpdfexport.cxx @@ -345,7 +345,7 @@ void ScPDFExportTest::testExportFitToPage_Tdf103516() void ScPDFExportTest::testUnoCommands_Tdf120161() { - loadFromURL(u"tdf120161.ods"); + loadFromFile(u"tdf120161.ods"); // A1:G1 { @@ -374,7 +374,7 @@ void ScPDFExportTest::testUnoCommands_Tdf120161() void ScPDFExportTest::testTdf64703_hiddenPageBreak() { - loadFromURL(u"tdf64703_hiddenPageBreak.ods"); + loadFromFile(u"tdf64703_hiddenPageBreak.ods"); uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY); @@ -396,7 +396,7 @@ void ScPDFExportTest::testTdf143978() return; } - loadFromURL(u"tdf143978.ods"); + loadFromFile(u"tdf143978.ods"); uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY); // A1:A2 @@ -504,7 +504,7 @@ void ScPDFExportTest::testTdf84012() return; } - loadFromURL(u"tdf84012.ods"); + loadFromFile(u"tdf84012.ods"); uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY); // A1 @@ -539,7 +539,7 @@ void ScPDFExportTest::testTdf78897() return; } - loadFromURL(u"tdf78897.xls"); + loadFromFile(u"tdf78897.xls"); uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY); // C3:D3 @@ -569,7 +569,7 @@ void ScPDFExportTest::testTdf78897() // just needs to not crash on export to pdf void ScPDFExportTest::testForcepoint97() { - loadFromURL(u"forcepoint97.xlsx"); + loadFromFile(u"forcepoint97.xlsx"); uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY); // A1:H81 diff --git a/sc/qa/extras/screcordchanges.cxx b/sc/qa/extras/screcordchanges.cxx index 50774a8a0cb2..9e95e37d78da 100644 --- a/sc/qa/extras/screcordchanges.cxx +++ b/sc/qa/extras/screcordchanges.cxx @@ -62,7 +62,7 @@ void ScRecordChangesTest::testSetRecordChanges() void ScRecordChangesTest::testCheckRecordChangesProtection() { // test with protected changes - loadFromURL(u"RecordChangesProtected.ods"); + loadFromFile(u"RecordChangesProtected.ods"); uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xDocSettingsPropSet(xDoc, UNO_QUERY_THROW); diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx index 8b5b3dbaa056..1c4543af959d 100644 --- a/sc/qa/extras/sctablesheetobj.cxx +++ b/sc/qa/extras/sctablesheetobj.cxx @@ -354,7 +354,7 @@ OUString ScTableSheetObj::getFileURL() void ScTableSheetObj::setUp() { UnoApiTest::setUp(); - maFileURL = loadFromURL(u"ScTableSheetObj.ods"); + maFileURL = loadFromFile(u"ScTableSheetObj.ods"); } CPPUNIT_TEST_SUITE_REGISTRATION(ScTableSheetObj); diff --git a/sc/qa/extras/sctablesheetsobj.cxx b/sc/qa/extras/sctablesheetsobj.cxx index 59146a3e4b36..9fcd6d31e14a 100644 --- a/sc/qa/extras/sctablesheetsobj.cxx +++ b/sc/qa/extras/sctablesheetsobj.cxx @@ -141,7 +141,7 @@ void ScTableSheetsObj::setUp() { UnoApiTest::setUp(); // create a calc document - loadFromURL(u"rangenamessrc.ods"); + loadFromFile(u"rangenamessrc.ods"); } CPPUNIT_TEST_SUITE_REGISTRATION(ScTableSheetsObj); diff --git a/sc/qa/extras/vba-macro-test.cxx b/sc/qa/extras/vba-macro-test.cxx index 570d6520a92c..5dc6157b4304 100644 --- a/sc/qa/extras/vba-macro-test.cxx +++ b/sc/qa/extras/vba-macro-test.cxx @@ -56,7 +56,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testSimpleCopyAndPaste) // Range(Cells(4, 3), Cells(6, 3)).Copy // Cells(4, 2).Activate // ActiveCell.PasteSpecial xlValues - loadFromURL(u"SimpleCopyPaste.xlsm"); + loadFromFile(u"SimpleCopyPaste.xlsm"); SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent); @@ -101,7 +101,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testMultiDocumentCopyAndPaste) // Cells(2, 2).Activate // ActiveCell.PasteSpecial xlValues // ... - loadFromURL(u"MultiDocumentCopyPaste.xlsm"); + loadFromFile(u"MultiDocumentCopyPaste.xlsm"); SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent); @@ -122,7 +122,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testMultiDocumentCopyAndPaste) CPPUNIT_TEST_FIXTURE(VBAMacroTest, testSheetAndColumnSelectAndHide) { - loadFromURL(u"SheetAndColumnSelectAndHide.xlsm"); + loadFromFile(u"SheetAndColumnSelectAndHide.xlsm"); SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent); @@ -185,7 +185,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testPrintArea) { // Sets the print area to A1:B5 // ActiveSheet.PageSetup.PrintArea = "$A$1:$B$5" - loadFromURL(u"VariousTestMacros.xlsm"); + loadFromFile(u"VariousTestMacros.xlsm"); uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW); uno::Reference<container::XIndexAccess> xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW); @@ -210,7 +210,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testSelectAllChaged) { // Columns("A:A").Select // Range(Selection, Selection.End(xlToRight)).Select - loadFromURL(u"VariousTestMacros.xlsm"); + loadFromFile(u"VariousTestMacros.xlsm"); SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent); CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); @@ -232,7 +232,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testRangeSelect) { // Range("B2").Select // Range(Selection, Selection.End(xlToRight)).Select - loadFromURL(u"VariousTestMacros.xlsm"); + loadFromFile(u"VariousTestMacros.xlsm"); SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent); CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); @@ -255,7 +255,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testWindowState) // Application.WindowState = xlMinimized // Application.WindowState = xlMaximized // Application.WindowState = xlNormal - loadFromURL(u"VariousTestMacros.xlsm"); + loadFromFile(u"VariousTestMacros.xlsm"); executeMacro("vnd.sun.Star.script:VBAProject.ThisWorkbook.testWindowState?language=Basic&" "location=document"); @@ -266,7 +266,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testScroll) // ActiveWindow.ScrollColumn = 30 // ActiveWindow.ScrollRow = 100 - loadFromURL(u"VariousTestMacros.xlsm"); + loadFromFile(u"VariousTestMacros.xlsm"); SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent); CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); @@ -292,7 +292,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testMacroKeyBinding) { // key_U() -> CTRL+U // key_T() -> CTRL+T - loadFromURL(u"KeyShortcut.xlsm"); + loadFromFile(u"KeyShortcut.xlsm"); uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY); CPPUNIT_ASSERT(xModel.is()); @@ -430,7 +430,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) uno::Sequence<uno::Any> aParams; for (const auto& rTestInfo : testInfo) { - OUString aFileName = loadFromURL(rTestInfo.sFileBaseName); + OUString aFileName = loadFromFile(rTestInfo.sFileBaseName); // process all events such as OnLoad events etc. otherwise they tend // to arrive later at a random time - while processing other StarBasic @@ -551,7 +551,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVbaRangeSort) CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf107885) { - loadFromURL(u"tdf107885.xlsm"); + loadFromFile(u"tdf107885.xlsm"); SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent); @@ -586,7 +586,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf107885) CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf131562) { - loadFromURL(u"tdf131562.xlsm"); + loadFromFile(u"tdf131562.xlsm"); SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent); @@ -607,7 +607,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf131562) CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf52602) { - loadFromURL(u"tdf52602.xls"); + loadFromFile(u"tdf52602.xls"); SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent); @@ -635,7 +635,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf52602) CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf107902) { - loadFromURL(u"tdf107902.xlsm"); + loadFromFile(u"tdf107902.xlsm"); SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent); @@ -663,7 +663,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf107902) CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf90278) { - loadFromURL(u"tdf90278.xls"); + loadFromFile(u"tdf90278.xls"); // Without the fix in place, changing the border weight // would cause a Basic exception/error in the following script. @@ -678,7 +678,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf90278) CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf149531) { - loadFromURL(u"tdf149531.xls"); + loadFromFile(u"tdf149531.xls"); SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent); @@ -701,7 +701,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf149531) CPPUNIT_TEST_FIXTURE(VBAMacroTest, testTdf118247) { - loadFromURL(u"tdf118247.xlsm"); + loadFromFile(u"tdf118247.xlsm"); uno::Any aRet = executeMacro( "vnd.sun.Star.script:VBAProject.Module1.testXlSpecialCellsValuesConstantsEmpty?" @@ -830,7 +830,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVbaPDFExport) CPPUNIT_TEST_FIXTURE(VBAMacroTest, testForEachInSelection) { - loadFromURL(u"ForEachInSelection.ods"); + loadFromFile(u"ForEachInSelection.ods"); SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent); CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); @@ -857,7 +857,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testForEachInSelection) CPPUNIT_TEST_FIXTURE(VBAMacroTest, testNonAsciiMacroIRI) { - loadFromURL(u"ForEachInSelection.ods"); + loadFromFile(u"ForEachInSelection.ods"); SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent); CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); |