chart2/qa/extras/PivotChartTest.cxx | 4
chart2/qa/extras/chart2_trendcalculators.cxx | 2
chart2/qa/extras/chart2dump/chart2dump.cxx | 22 -
chart2/qa/extras/chart2export.cxx | 100 ++---
chart2/qa/extras/chart2export2.cxx | 144
++++----
chart2/qa/extras/chart2export3.cxx | 92 ++---
chart2/qa/extras/chart2geometry.cxx | 28 -
chart2/qa/extras/chart2import.cxx | 172
+++++-----
chart2/qa/extras/chart2import2.cxx | 80 ++--
chart2/qa/extras/uichart.cxx | 20 -
chart2/qa/extras/xshape/chart2xshape.cxx | 24 -
cppcanvas/qa/extras/emfplus/emfplus.cxx | 2
dbaccess/qa/extras/macros-test.cxx | 2
dbaccess/qa/unit/firebird.cxx | 4
emfio/qa/cppunit/emf/EmfImportTest.cxx | 2
filter/qa/pdf.cxx | 2
filter/qa/unit/svg.cxx | 14
filter/qa/unit/textfilterdetect.cxx | 20 -
framework/qa/cppunit/dispatchtest.cxx | 2
include/test/unoapi_test.hxx | 2
lotuswordpro/qa/cppunit/import_test.cxx | 6
oox/qa/unit/drawingml.cxx | 44 +-
oox/qa/unit/export.cxx | 80 ++--
oox/qa/unit/mathml.cxx | 4
oox/qa/unit/mcgr.cxx | 10
oox/qa/unit/shape.cxx | 34 -
oox/qa/unit/vml.cxx | 16
oox/qa/unit/wpc_drawing_canvas.cxx | 24 -
sc/qa/extras/htmlexporttest.cxx | 4
sc/qa/extras/macros-test.cxx | 2
sc/qa/extras/new_cond_format.cxx | 2
sc/qa/extras/scannotationobj.cxx | 2
sc/qa/extras/scannotationsobj.cxx | 2
sc/qa/extras/sccellcursorobj.cxx | 2
sc/qa/extras/sccellrangeobj.cxx | 2
sc/qa/extras/scdatabaserangeobj.cxx | 2
sc/qa/extras/scdatapilotfieldobj.cxx | 2
sc/qa/extras/scdatapilottableobj.cxx | 2
sc/qa/extras/scmodelobj.cxx | 2
sc/qa/extras/scnamedrangeobj.cxx | 2
sc/qa/extras/scnamedrangesobj.cxx | 2
sc/qa/extras/scoutlineobj.cxx | 2
sc/qa/extras/scpdfexport.cxx | 12
sc/qa/extras/screcordchanges.cxx | 2
sc/qa/extras/sctablesheetobj.cxx | 2
sc/qa/extras/sctablesheetsobj.cxx | 2
sc/qa/extras/vba-macro-test.cxx | 38 +-
sc/qa/perf/scperfobj.cxx | 34 -
sc/qa/unit/SparklineImportExportTest.cxx | 12
sc/qa/unit/ThemeImportExportTest.cxx | 14
sc/qa/unit/anchor.cxx | 16
sc/qa/unit/cond_format_merge.cxx | 2
sc/qa/unit/copy_paste_test.cxx | 22 -
sc/qa/unit/helper/qahelper.cxx | 4
sc/qa/unit/jumbosheets-test.cxx | 16
sc/qa/unit/subsequent_filters_test2.cxx | 2
sc/qa/unit/tiledrendering/tiledrendering.cxx | 4
sccomp/qa/unit/SwarmSolverTest.cxx | 10
sd/qa/filter/eppt/eppt.cxx | 4
sd/qa/unit/HtmlExportTest.cxx | 4
sd/qa/unit/PNGExportTests.cxx | 32 -
sd/qa/unit/SVGExportTests.cxx | 16
sd/qa/unit/SdrPdfImportTest.cxx | 4
sd/qa/unit/ThemeTest.cxx | 2
sd/qa/unit/import-tests.cxx | 2
sd/qa/unit/import-tests2.cxx | 2
sd/qa/unit/layout-tests.cxx | 2
sd/qa/unit/sdmodeltestbase.hxx | 4
sd/qa/unit/tiledrendering/LOKitSearchTest.cxx | 2
sd/qa/unit/tiledrendering/tiledrendering.cxx | 2
sfx2/qa/cppunit/test_misc.cxx | 2
sfx2/qa/cppunit/view.cxx | 2
slideshow/qa/engine/engine.cxx | 2
starmath/qa/cppunit/test_import.cxx | 2
starmath/qa/extras/mmlimport-test.cxx | 26 -
svx/qa/unit/classicshapes.cxx | 6
svx/qa/unit/core.cxx | 2
svx/qa/unit/customshapes.cxx | 90 ++---
svx/qa/unit/gluepointTest.cxx | 2
svx/qa/unit/sdr.cxx | 8
svx/qa/unit/svdraw.cxx | 22 -
svx/qa/unit/table.cxx | 2
svx/qa/unit/unodraw.cxx | 4
svx/qa/unit/xml.cxx | 2
sw/qa/core/fields/fields.cxx | 8
sw/qa/core/macros-test.cxx | 10
sw/qa/extras/htmlexport/htmlexport.cxx | 4
sw/qa/extras/ooxmlexport/ooxmlexport20.cxx | 4
test/source/unoapi_test.cxx | 2
vcl/qa/cppunit/gen/gen.cxx | 2
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 6
vcl/qa/cppunit/pdfexport/pdfexport2.cxx | 8
writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx | 2
writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx | 12
writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx | 16
writerfilter/qa/cppunittests/dmapper/DomainMapperTableManager.cxx | 2
writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx | 26 -
writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx | 38 +-
writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx | 10
writerfilter/qa/cppunittests/dmapper/SdtHelper.cxx | 12
writerfilter/qa/cppunittests/dmapper/SettingsTable.cxx | 6
writerfilter/qa/cppunittests/dmapper/TableManager.cxx | 2
writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx | 4
writerfilter/qa/cppunittests/ooxml/ooxml.cxx | 4
writerfilter/qa/cppunittests/rtftok/rtfdispatchflag.cxx | 6
writerfilter/qa/cppunittests/rtftok/rtfdispatchsymbol.cxx | 4
writerfilter/qa/cppunittests/rtftok/rtfdispatchvalue.cxx | 4
writerfilter/qa/cppunittests/rtftok/rtfdocumentimpl.cxx | 8
writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx | 4
writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx | 2
writerfilter/qa/cppunittests/rtftok/rtftokenizer.cxx | 2
writerperfect/qa/unit/EPUBExportTest.cxx | 2
xmloff/qa/unit/draw.cxx | 30 -
xmloff/qa/unit/style.cxx | 30 -
xmloff/qa/unit/text.cxx | 42 +-
xmloff/qa/unit/text/txtprmap.cxx | 2
xmlsecurity/qa/unit/signing/signing.cxx | 50 +-
xmlsecurity/qa/unit/signing/signing2.cxx | 2
118 files changed, 896 insertions(+), 896 deletions(-)
New commits:
commit 496386d34ba5f55a6a7724929e83374f6a4a9eef
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Jan 3 11:49:02 2024 +0600
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Jan 10 13:26:43 2024 +0100
UnoApiTest::loadFromURL -> UnoApiTest::loadFromFile
The old name was misleading (it doesn't take an URL, but a filename);
also, now it's easier to grep for it - doesn't get mixed with
vcl::graphic::loadFromURL.
Change-Id: Ib88d2194200a6a54d2326971e0306ba39f0c7025
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161578
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161888
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/chart2/qa/extras/PivotChartTest.cxx
b/chart2/qa/extras/PivotChartTest.cxx
index 682dba753d11..d6a87ec057a9 100644
--- a/chart2/qa/extras/PivotChartTest.cxx
+++ b/chart2/qa/extras/PivotChartTest.cxx
@@ -317,7 +317,7 @@ void PivotChartTest::testRoundtrip()
std::vector<double> aReference2 { 101879.458079, 178636.929704,
314626.484864 };
- loadFromURL(u"ods/PivotChartRoundTrip.ods");
+ loadFromFile(u"ods/PivotChartRoundTrip.ods");
xChartDoc = getPivotChartDocFromSheet(1, mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -372,7 +372,7 @@ void PivotChartTest::testChangePivotTable()
uno::Sequence<uno::Any> xSequence;
Reference<chart2::XChartDocument> xChartDoc;
- loadFromURL(u"ods/PivotTableExample.ods");
+ loadFromFile(u"ods/PivotTableExample.ods");
// Check we have the Pivot Table
OUString sPivotTableName("DataPilot1");
diff --git a/chart2/qa/extras/chart2_trendcalculators.cxx
b/chart2/qa/extras/chart2_trendcalculators.cxx
index 263201daad7c..8639015d6299 100644
--- a/chart2/qa/extras/chart2_trendcalculators.cxx
+++ b/chart2/qa/extras/chart2_trendcalculators.cxx
@@ -60,7 +60,7 @@ private:
void Chart2TrendCalculators::setUp()
{
ChartTest::setUp();
- loadFromURL(u"ods/trend_calculators.ods");
+ loadFromFile(u"ods/trend_calculators.ods");
}
void Chart2TrendCalculators::tearDown()
diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx
b/chart2/qa/extras/chart2dump/chart2dump.cxx
index 339a69bb80bd..d13d768c032f 100644
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -269,7 +269,7 @@ DECLARE_DUMP_TEST(ChartDataTest, Chart2DumpTest, false)
for (const OUString& aTestFile : aTestFiles)
{
setTestFileName(aTestFile);
- loadFromURL(getTestFileName());
+ loadFromFile(getTestFileName());
uno::Reference< chart::XChartDocument > xChartDoc
(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
// Check title
@@ -382,7 +382,7 @@ DECLARE_DUMP_TEST(LegendTest, Chart2DumpTest, false)
for (const OUString& aTestFile : aTestFiles)
{
setTestFileName(aTestFile);
- loadFromURL(getTestFileName());
+ loadFromFile(getTestFileName());
uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_SET_THROW);
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage =
xDrawPageSupplier->getDrawPage();
@@ -476,7 +476,7 @@ DECLARE_DUMP_TEST(GridTest, Chart2DumpTest, false)
for (const OUString& sTestFile : aTestFiles)
{
setTestFileName(sTestFile);
- loadFromURL(getTestFileName());
+ loadFromFile(getTestFileName());
uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage =
xDrawPageSupplier->getDrawPage();
@@ -548,7 +548,7 @@ DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false)
for (const OUString& sTestFile : aTestFiles)
{
setTestFileName(sTestFile);
- loadFromURL(getTestFileName());
+ loadFromFile(getTestFileName());
uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_SET_THROW);
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage =
xDrawPageSupplier->getDrawPage();
@@ -621,7 +621,7 @@ DECLARE_DUMP_TEST(AxisLabelTest, Chart2DumpTest, false)
for (const OUString& sTestFile : aTestFiles)
{
setTestFileName(sTestFile);
- loadFromURL(getTestFileName());
+ loadFromFile(getTestFileName());
uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_SET_THROW);
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage =
xDrawPageSupplier->getDrawPage();
@@ -704,7 +704,7 @@ DECLARE_DUMP_TEST(ColumnBarChartTest, Chart2DumpTest, false)
for (const OUString& sTestFile : aTestFiles)
{
setTestFileName(sTestFile);
- loadFromURL(getTestFileName());
+ loadFromFile(getTestFileName());
uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage =
xDrawPageSupplier->getDrawPage();
@@ -774,7 +774,7 @@ DECLARE_DUMP_TEST(ChartWallTest, Chart2DumpTest, false)
for (const OUString& sTestFile : aTestFiles)
{
setTestFileName(sTestFile);
- loadFromURL(getTestFileName());
+ loadFromFile(getTestFileName());
uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_SET_THROW);
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage =
xDrawPageSupplier->getDrawPage();
@@ -839,7 +839,7 @@ DECLARE_DUMP_TEST(PieChartTest, Chart2DumpTest, false)
for (const OUString& sTestFile : aTestFiles)
{
setTestFileName(sTestFile);
- loadFromURL(getTestFileName());
+ loadFromFile(getTestFileName());
uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage =
xDrawPageSupplier->getDrawPage();
@@ -912,7 +912,7 @@ DECLARE_DUMP_TEST(AreaChartTest, Chart2DumpTest, false)
for (const OUString& sTestFile : aTestFiles)
{
setTestFileName(sTestFile);
- loadFromURL(getTestFileName());
+ loadFromFile(getTestFileName());
uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage =
xDrawPageSupplier->getDrawPage();
@@ -985,7 +985,7 @@ DECLARE_DUMP_TEST(PointLineChartTest, Chart2DumpTest, false)
for (const OUString& sTestFile : aTestFiles)
{
setTestFileName(sTestFile);
- loadFromURL(getTestFileName());
+ loadFromFile(getTestFileName());
uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
uno::Reference<drawing::XDrawPageSupplier>
xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage =
xDrawPageSupplier->getDrawPage();
@@ -1077,7 +1077,7 @@ DECLARE_DUMP_TEST(PointLineChartTest, Chart2DumpTest,
false)
DECLARE_DUMP_TEST( PivotChartDataButtonTest, Chart2DumpTest, false )
{
setTestFileName( "pivotchart_data_button.ods" );
- loadFromURL(getTestFileName());
+ loadFromFile(getTestFileName());
// Check that we have pivot chart in the document
uno::Reference<table::XTablePivotCharts> xTablePivotCharts =
getTablePivotChartsFromSheet( 1, mxComponent );
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index b92c933970cc..6958876b1d7d 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -196,7 +196,7 @@ void checkTrendlinesInChart(uno::Reference<
chart2::XChartDocument > const & xCh
// improve the test
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarXLSX)
{
- loadFromURL(u"ods/error_bar.ods");
+ loadFromFile(u"ods/error_bar.ods");
{
// make sure the ODS import was successful
uno::Reference< chart2::XChartDocument > xChartDoc =
getChartDocFromSheet( 0, mxComponent );
@@ -232,7 +232,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarPropXLSX)
{
- loadFromURL(u"xlsx/testErrorBarProp.xlsx");
+ loadFromFile(u"xlsx/testErrorBarProp.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -255,7 +255,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendline)
// Validation fails with
// Error: tag name "chart:symbol-image" is not allowed. Possible tag names
are: <label-separator>
skipValidation();
- loadFromURL(u"ods/trendline.ods");
+ loadFromFile(u"ods/trendline.ods");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
saveAndReload("calc8");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
@@ -263,7 +263,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendline)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendlineOOXML)
{
- loadFromURL(u"ods/trendline.ods");
+ loadFromFile(u"ods/trendline.ods");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
saveAndReload("Calc Office Open XML");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
@@ -271,7 +271,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendlineOOXML)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendlineXLS)
{
- loadFromURL(u"ods/trendline.ods");
+ loadFromFile(u"ods/trendline.ods");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
saveAndReload("MS Excel 97");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
@@ -279,7 +279,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendlineXLS)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testMovingAverage)
{
- loadFromURL(u"ods/moving-type.ods");
+ loadFromFile(u"ods/moving-type.ods");
saveAndReload("calc8");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(
0, mxComponent);
@@ -314,7 +314,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testStockChart)
* an attribute val of index should start from 1 and not from 0.
* Which was problem area.
*/
- loadFromURL(u"docx/testStockChart.docx");
+ loadFromFile(u"docx/testStockChart.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
@@ -330,7 +330,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testStockChart)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarChart)
{
- loadFromURL(u"docx/testBarChart.docx");
+ loadFromFile(u"docx/testBarChart.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -342,7 +342,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testCrosses)
{
// test crosses val="autoZero" with DOCX
{
- loadFromURL(u"docx/Bar_horizontal_cone.docx");
+ loadFromFile(u"docx/Bar_horizontal_cone.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
@@ -350,7 +350,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testCrosses)
}
// tdf#142351: test crossesAt val="-50" with XLSX
{
- loadFromURL(u"xlsx/tdf142351.xlsx");
+ loadFromFile(u"xlsx/tdf142351.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -361,7 +361,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testCrosses)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterChartTextXValues)
{
- loadFromURL(u"docx/scatter-chart-text-x-values.docx");
+ loadFromFile(u"docx/scatter-chart-text-x-values.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -410,7 +410,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testScatterChartTextXValues)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterXAxisValues)
{
- loadFromURL(u"odt/tdf114657.odt");
+ loadFromFile(u"odt/tdf114657.odt");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
@@ -425,7 +425,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testScatterXAxisValues)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterXAxisCategories)
{
- loadFromURL(u"odt/tdf131143.odt");
+ loadFromFile(u"odt/tdf131143.odt");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
@@ -437,7 +437,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testScatterXAxisCategories)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartDataTable)
{
- loadFromURL(u"docx/testChartDataTable.docx");
+ loadFromFile(u"docx/testChartDataTable.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
@@ -449,7 +449,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartDataTable)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartExternalData)
{
- loadFromURL(u"docx/testMultipleChart.docx");
+ loadFromFile(u"docx/testMultipleChart.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
@@ -463,7 +463,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testEmbeddingsGrabBag)
// after saving file.
// This test case tests whether embeddings files grabbagged properly in
correct object.
- loadFromURL(u"docx/testMultiplechartembeddings.docx" );
+ loadFromFile(u"docx/testMultiplechartembeddings.docx" );
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xTextDocumentPropertySet(xTextDocument,
uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aGrabBag(0);
@@ -498,7 +498,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testEmbeddingsGrabBag)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAreaChartLoad)
{
- loadFromURL(u"docx/testAreaChartLoad.docx");
+ loadFromFile(u"docx/testAreaChartLoad.docx");
// FIXME: validation error in OOXML export: Errors: 1
skipValidation();
@@ -512,7 +512,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAreaChartLoad)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testUpDownBars)
{
- loadFromURL(u"docx/UpDownBars.docx");
+ loadFromFile(u"docx/UpDownBars.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -521,7 +521,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testUpDownBars)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDoughnutChart)
{
- loadFromURL(u"docx/doughnutChart.docx");
+ loadFromFile(u"docx/doughnutChart.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -531,7 +531,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDoughnutChart)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDisplayUnits)
{
- loadFromURL(u"docx/DisplayUnits.docx");
+ loadFromFile(u"docx/DisplayUnits.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -541,7 +541,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDisplayUnits)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo74115WallGradientFill)
{
- loadFromURL(u"docx/fdo74115_WallGradientFill.docx");
+ loadFromFile(u"docx/fdo74115_WallGradientFill.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -551,7 +551,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testFdo74115WallGradientFill)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo74115WallBitmapFill)
{
- loadFromURL(u"docx/fdo74115_WallBitmapFill.docx");
+ loadFromFile(u"docx/fdo74115_WallBitmapFill.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -560,7 +560,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testFdo74115WallBitmapFill)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartWallLineStyle)
{
- loadFromURL(u"odt/testPieChartWallLineStyle.odt");
+ loadFromFile(u"odt/testPieChartWallLineStyle.odt");
// FIXME: validation error in OOXML export: Errors: 9
skipValidation();
@@ -575,7 +575,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testPieChartWallLineStyle)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo78290LineChartMarkerX)
{
- loadFromURL(u"docx/fdo78290_Line_Chart_Marker_x.docx");
+ loadFromFile(u"docx/fdo78290_Line_Chart_Marker_x.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -587,7 +587,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testFdo78290LineChartMarkerX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo78290ScatterChartMarkerX)
{
- loadFromURL(u"docx/fdo78290_Scatter_Chart_Marker_x.docx");
+ loadFromFile(u"docx/fdo78290_Scatter_Chart_Marker_x.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -600,7 +600,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testFdo78290ScatterChartMarkerX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo78290CombinationChartMarkerX)
{
- loadFromURL(u"docx/fdo78290_Combination_Chart_Marker_x.docx");
+ loadFromFile(u"docx/fdo78290_Combination_Chart_Marker_x.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -611,7 +611,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testFdo78290CombinationChartMarkerX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTdf126115IndividualMarker)
{
// Check individual marker properties.
- loadFromURL(u"xlsx/tdf126115.xlsx");
+ loadFromFile(u"xlsx/tdf126115.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -662,7 +662,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testAxisNumberFormatODS)
} aTest;
- loadFromURL(u"ods/axis-numformats-linked.ods");
+ loadFromFile(u"ods/axis-numformats-linked.ods");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
aTest.check(xChartDoc);
@@ -718,7 +718,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testAxisNumberFormatXLS)
} aTest;
- loadFromURL(u"xls/axis_sourceformatting.xls" );
+ loadFromFile(u"xls/axis_sourceformatting.xls" );
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet( 0,
mxComponent );
aTest.check( xChartDoc, true, util::NumberFormat::PERCENT );
@@ -817,7 +817,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testDataLabelBordersDOCX)
} aTest;
- loadFromURL(u"docx/data-label-borders.docx");
+ loadFromFile(u"docx/data-label-borders.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
@@ -848,7 +848,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testDataLabelBordersDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabel3DChartDOCX)
{
- loadFromURL(u"docx/3d-bar-label.docx");
+ loadFromFile(u"docx/3d-bar-label.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -868,7 +868,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testDataLabel3DChartDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelBarChartDOCX)
{
- loadFromURL(u"docx/bar-chart-labels.docx");
+ loadFromFile(u"docx/bar-chart-labels.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -884,7 +884,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testDataLabelBarChartDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelClusteredBarChartDOCX)
{
- loadFromURL(u"docx/clustered-bar-chart-labels.docx");
+ loadFromFile(u"docx/clustered-bar-chart-labels.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -902,7 +902,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testDataLabelClusteredBarChartDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelRadarChartDOCX)
{
- loadFromURL(u"docx/radar-chart-labels.docx");
+ loadFromFile(u"docx/radar-chart-labels.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -918,7 +918,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testDataLabelRadarChartDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelDoughnutChartDOCX)
{
- loadFromURL(u"docx/doughnut-chart-labels.docx");
+ loadFromFile(u"docx/doughnut-chart-labels.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -937,7 +937,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testDataLabelDoughnutChartDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelAreaChartDOCX)
{
- loadFromURL(u"docx/area-chart-labels.docx");
+ loadFromFile(u"docx/area-chart-labels.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -960,7 +960,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testDataLabelDefaultLineChartDOCX)
// label position (2010 does). Make sure its default data label position
// is RIGHT when exporting.
- loadFromURL(u"docx/line-chart-label-default-placement.docx");
+ loadFromFile(u"docx/line-chart-label-default-placement.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -979,7 +979,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testDataLabelDefaultLineChartDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testIndividualDataLabelProps)
{
- loadFromURL(u"xlsx/tdf122915.xlsx");
+ loadFromFile(u"xlsx/tdf122915.xlsx");
// FIXME: validation error in OOXML export: Errors: 1
skipValidation();
@@ -995,7 +995,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testIndividualDataLabelProps)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarChartRotation)
{
- loadFromURL(u"docx/barChartRotation.docx");
+ loadFromFile(u"docx/barChartRotation.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1011,7 +1011,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testShapeFollowedByChart)
docPr Id is being repeated, ECMA 20.4.2.5 says that the
docPr Id should be unique, ensuring the same here.
*/
- loadFromURL(u"docx/FDO74430.docx");
+ loadFromFile(u"docx/FDO74430.docx");
// FIXME: validation error in OOXML export: Errors: 5
skipValidation();
@@ -1028,7 +1028,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testShapeFollowedByChart)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartDataLabels)
{
- loadFromURL(u"docx/PieChartDataLabels.docx");
+ loadFromFile(u"docx/PieChartDataLabels.docx");
// FIXME: validation error in OOXML export: Errors: 19
skipValidation();
@@ -1041,7 +1041,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testPieChartDataLabels)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testSeriesIdxOrder)
{
- loadFromURL(u"docx/testSeriesIdxOrder.docx");
+ loadFromFile(u"docx/testSeriesIdxOrder.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1051,7 +1051,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testSeriesIdxOrder)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterPlotLabels)
{
- loadFromURL(u"odt/scatter-plot-labels.odt");
+ loadFromFile(u"odt/scatter-plot-labels.odt");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1083,7 +1083,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testScatterPlotLabels)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarDataRangeODS)
{
- loadFromURL(u"ods/ErrorBarRange.ods");
+ loadFromFile(u"ods/ErrorBarRange.ods");
saveAndReload("calc8");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(
0, mxComponent );
@@ -1112,7 +1112,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testErrorBarDataRangeODS)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartCrash)
{
- loadFromURL(u"docx/FDO75975.docx");
+ loadFromFile(u"docx/FDO75975.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1120,7 +1120,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartCrash)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartRotation)
{
- loadFromURL(u"docx/pieChartRotation.docx");
+ loadFromFile(u"docx/pieChartRotation.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1134,7 +1134,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testEmbeddingsOleObjectGrabBag)
// after saving file.
// This test case tests whether embeddings files grabbagged properly in
correct object.
- loadFromURL(u"docx/testchartoleobjectembeddings.docx" );
+ loadFromFile(u"docx/testchartoleobjectembeddings.docx" );
uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xTextDocumentPropertySet(xTextDocument,
uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aGrabBag(0);
@@ -1205,7 +1205,7 @@ void checkSheetForGapWidthAndOverlap(uno::Reference<
chart2::XChartDocument > co
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testGapWidthXLSX)
{
- loadFromURL(u"xlsx/gapWidth.xlsx");
+ loadFromFile(u"xlsx/gapWidth.xlsx");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(
0, mxComponent );
checkSheetForGapWidthAndOverlap(xChartDoc, 120, -60);
@@ -1224,7 +1224,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testGapWidthXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testSmoothedLines)
{
- loadFromURL(u"ods/smoothedLines.ods");
+ loadFromFile(u"ods/smoothedLines.ods");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1233,7 +1233,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testSmoothedLines)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testLabelStringODS)
{
- loadFromURL(u"ods/labelString.ods");
+ loadFromFile(u"ods/labelString.ods");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(
0, mxComponent );
Reference< chart2::data::XDataSequence > xLabelSeq =
diff --git a/chart2/qa/extras/chart2export2.cxx
b/chart2/qa/extras/chart2export2.cxx
index f17e35c1b24d..f5378dc9444c 100644
--- a/chart2/qa/extras/chart2export2.cxx
+++ b/chart2/qa/extras/chart2export2.cxx
@@ -31,7 +31,7 @@ public:
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testSetSeriesToSecondaryAxisXLSX)
{
- loadFromURL(u"xlsx/add_series_secondary_axis.xlsx");
+ loadFromFile(u"xlsx/add_series_secondary_axis.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
// Second series
Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xChartDoc,
1);
@@ -52,7 +52,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testSetSeriesToSecondaryAxisXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCombinedChartSecondaryAxisXLSX)
{
// Original file was created with MS Office
- loadFromURL(u"xlsx/combined_chart_secondary_axis.xlsx");
+ loadFromFile(u"xlsx/combined_chart_secondary_axis.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -80,7 +80,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testCombinedChartSecondaryAxisXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCombinedChartSecondaryAxisODS)
{
// Original file was created with LibreOffice
- loadFromURL(u"ods/combined_chart_secondary_axis.ods");
+ loadFromFile(u"ods/combined_chart_secondary_axis.ods");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -114,7 +114,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testCrossBetweenXLSX)
// Original files were created with MS Office
{
- loadFromURL(u"xlsx/tdf127777.xlsx");
+ loadFromFile(u"xlsx/tdf127777.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -122,7 +122,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testCrossBetweenXLSX)
"val"_ostr, "between");
}
{
- loadFromURL(u"xlsx/tdf132076.xlsx");
+ loadFromFile(u"xlsx/tdf132076.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -134,7 +134,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testCrossBetweenXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenWithDeletedAxis)
{
// Original file was created with MS Office (the category axis is deleted
in the file)
- loadFromURL(u"xlsx/tdf128633.xlsx");
+ loadFromFile(u"xlsx/tdf128633.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -145,7 +145,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testCrossBetweenWithDeletedAxis)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenODS)
{
// Original file was created with LibreOffice
- loadFromURL(u"ods/test_CrossBetween.ods");
+ loadFromFile(u"ods/test_CrossBetween.ods");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -155,7 +155,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenODS)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testAxisTitleRotationXLSX)
{
- loadFromURL(u"xlsx/axis_title_rotation.xlsx");
+ loadFromFile(u"xlsx/axis_title_rotation.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -167,7 +167,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testAxisTitleRotationXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testAxisTitlePositionDOCX)
{
- loadFromURL(u"docx/testAxisTitlePosition.docx");
+ loadFromFile(u"docx/testAxisTitlePosition.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -204,7 +204,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testAxisTitlePositionDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testAxisCrossBetweenDOCX)
{
- loadFromURL(u"odt/axis-position.odt");
+ loadFromFile(u"odt/axis-position.odt");
// FIXME: validation error in OOXML export: Errors: 3
skipValidation();
@@ -216,7 +216,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testAxisCrossBetweenDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testPieChartDataPointExplosionXLSX)
{
- loadFromURL(u"xlsx/pie_chart_datapoint_explosion.xlsx");
+ loadFromFile(u"xlsx/pie_chart_datapoint_explosion.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -227,7 +227,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testPieChartDataPointExplosionXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomDataLabel)
{
- loadFromURL(u"pptx/tdf115107.pptx");
+ loadFromFile(u"pptx/tdf115107.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0,
0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -351,7 +351,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataSeriesName)
{
// ODF
{
- loadFromURL(u"ods/ser_labels.ods");
+ loadFromFile(u"ods/ser_labels.ods");
saveAndReload("calc8");
uno::Reference<chart2::XChartDocument> xChartDoc =
getChartDocFromSheet(0, mxComponent);
uno::Reference<chart2::XDataSeries>
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -365,7 +365,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataSeriesName)
// OOXML
{
- loadFromURL(u"xlsx/ser_labels.xlsx");
+ loadFromFile(u"xlsx/ser_labels.xlsx");
saveAndReload("Calc Office Open XML");
uno::Reference<chart2::XChartDocument> xChartDoc =
getChartDocFromSheet(0, mxComponent);
uno::Reference<chart2::XDataSeries>
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -383,7 +383,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testCustomPositionofDataLabel)
// FIXME: validation error in OOXML export: Errors: 1
skipValidation();
- loadFromURL(u"xlsx/testCustomPosDataLabels.xlsx");
+ loadFromFile(u"xlsx/testCustomPosDataLabels.xlsx");
{
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
@@ -409,7 +409,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testCustomPositionofDataLabel)
CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.0742140311063737, nY, 1e-7);
}
- loadFromURL(u"docx/testTdf108110.docx");
+ loadFromFile(u"docx/testTdf108110.docx");
{
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
@@ -435,7 +435,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testCustomPositionofDataLabel)
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.172648731408574, nY, 1e-7);
}
- loadFromURL(u"ods/tdf136024.ods");
+ loadFromFile(u"ods/tdf136024.ods");
{
saveAndReload("calc8");
// tdf#136024: test custom position of pie chart data label after an
ods export
@@ -457,7 +457,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testCustomPositionofDataLabel)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomDataLabelMultipleSeries)
{
- loadFromURL(u"pptx/tdf115107-2.pptx");
+ loadFromFile(u"pptx/tdf115107-2.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0,
0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -522,7 +522,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLeaderLines)
// FIXME: validation error in OOXML export: Errors: 2
skipValidation();
- loadFromURL(u"xlsx/testTdf90749.xlsx");
+ loadFromFile(u"xlsx/testTdf90749.xlsx");
{
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
@@ -536,7 +536,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLeaderLines)
"c15:showLeaderLines"_ostr,
"val"_ostr, "0");
}
- loadFromURL(u"docx/MSO_Custom_Leader_Line.docx");
+ loadFromFile(u"docx/MSO_Custom_Leader_Line.docx");
{
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
@@ -551,7 +551,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLeaderLines)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testNumberFormatExportPPTX)
{
- loadFromURL(u"pptx/tdf115859.pptx");
+ loadFromFile(u"pptx/tdf115859.pptx");
save("Impress MS PowerPoint 2007 XML");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -564,7 +564,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testNumberFormatExportPPTX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLabelSeparatorExportDOCX)
{
- loadFromURL(u"docx/testLabelSeparator.docx");
+ loadFromFile(u"docx/testLabelSeparator.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -589,7 +589,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testLabelSeparatorExportDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesColorFillPPTX)
{
- loadFromURL(u"pptx/testChartTitlePropertiesColorFill.pptx");
+ loadFromFile(u"pptx/testChartTitlePropertiesColorFill.pptx");
save("Impress MS PowerPoint 2007 XML");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -600,7 +600,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testChartTitlePropertiesColorFillPPTX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testChartTitlePropertiesGradientFillPPTX)
{
- loadFromURL(u"pptx/testChartTitlePropertiesGradientFill.pptx");
+ loadFromFile(u"pptx/testChartTitlePropertiesGradientFill.pptx");
save("Impress MS PowerPoint 2007 XML");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -615,7 +615,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testChartTitlePropertiesGradientFillPPTX
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesBitmapFillPPTX)
{
- loadFromURL(u"pptx/testChartTitlePropertiesBitmapFill.pptx");
+ loadFromFile(u"pptx/testChartTitlePropertiesBitmapFill.pptx");
save("Impress MS PowerPoint 2007 XML");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -626,7 +626,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testChartTitlePropertiesBitmapFillPPTX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testxAxisLabelsRotation)
{
- loadFromURL(u"xlsx/xAxisLabelsRotation.xlsx");
+ loadFromFile(u"xlsx/xAxisLabelsRotation.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc1 = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc1);
@@ -638,7 +638,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testxAxisLabelsRotation)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testMultipleCategoryAxisLablesXLSX)
{
- loadFromURL(u"ods/multilevelcat.ods");
+ loadFromFile(u"ods/multilevelcat.ods");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -672,7 +672,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testMultipleCategoryAxisLablesXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testMultipleCategoryAxisLablesDOCX)
{
- loadFromURL(u"odt/multilevelcat.odt");
+ loadFromFile(u"odt/multilevelcat.odt");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -706,7 +706,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testMultipleCategoryAxisLablesDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf116163)
{
- loadFromURL(u"pptx/tdf116163.pptx");
+ loadFromFile(u"pptx/tdf116163.pptx");
save("Impress MS PowerPoint 2007 XML");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -717,7 +717,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf116163)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf111824)
{
- loadFromURL(u"xlsx/tdf111824.xlsx");
+ loadFromFile(u"xlsx/tdf111824.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -732,7 +732,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf111824)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, test3DAreaChartZAxis)
{
- loadFromURL(u"xlsx/test3DAreaChartZAxis.xlsx");
+ loadFromFile(u"xlsx/test3DAreaChartZAxis.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -747,7 +747,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
test3DAreaChartZAxis)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf119029)
{
- loadFromURL(u"odp/tdf119029.odp");
+ loadFromFile(u"odp/tdf119029.odp");
// Only use "chart", without number, because the number depends on the
previous tests
save("Impress MS PowerPoint 2007 XML");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml");
@@ -760,7 +760,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf119029)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf108022)
{
- loadFromURL(u"odt/tdf108022.odt");
+ loadFromFile(u"odt/tdf108022.odt");
saveAndReload("Office Open XML Text");
// assert we really have two charts
@@ -772,7 +772,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf108022)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf121744)
{
- loadFromURL(u"docx/tdf121744.docx");
+ loadFromFile(u"docx/tdf121744.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -790,7 +790,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf121744)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf121189)
{
- loadFromURL(u"odp/tdf121189.odp");
+ loadFromFile(u"odp/tdf121189.odp");
saveAndReload("Impress Office Open XML");
uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent,
uno::UNO_QUERY_THROW);
@@ -804,7 +804,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf121189)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf122031)
{
//Checks pie chart data label format.
- loadFromURL(u"xlsx/tdf122031.xlsx");
+ loadFromFile(u"xlsx/tdf122031.xlsx");
// FIXME: validation error in OOXML export: Errors: 1
skipValidation();
@@ -828,7 +828,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf122031)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf115012)
{
- loadFromURL(u"xlsx/tdf115012.xlsx");
+ loadFromFile(u"xlsx/tdf115012.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -838,7 +838,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf115012)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134118)
{
- loadFromURL(u"xlsx/tdf134118.xlsx");
+ loadFromFile(u"xlsx/tdf134118.xlsx");
// FIXME: validation error in OOXML export: Errors: 1
skipValidation();
@@ -852,7 +852,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134118)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf123206_customLabelText)
{
- loadFromURL(u"docx/tdf123206.docx");
+ loadFromFile(u"docx/tdf123206.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -872,7 +872,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testTdf123206_customLabelText)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomLabelText)
{
- loadFromURL(u"docx/testCustomlabeltext.docx");
+ loadFromFile(u"docx/testCustomlabeltext.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -911,7 +911,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomLabelText)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDeletedLegendEntries)
{
- loadFromURL(u"xlsx/deleted_legend_entry.xlsx");
+ loadFromFile(u"xlsx/deleted_legend_entry.xlsx");
{
saveAndReload("Calc Office Open XML");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
@@ -924,7 +924,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testDeletedLegendEntries)
CPPUNIT_ASSERT(!bShowLegendEntry);
}
- loadFromURL(u"xlsx/deleted_legend_entry2.xlsx");
+ loadFromFile(u"xlsx/deleted_legend_entry2.xlsx");
{
saveAndReload("Calc Office Open XML");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
@@ -950,7 +950,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testDeletedLegendEntries)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf60316)
{
- loadFromURL(u"pptx/tdf60316.pptx");
+ loadFromFile(u"pptx/tdf60316.pptx");
save("Impress MS PowerPoint 2007 XML");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -962,7 +962,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf60316)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf130225)
{
- loadFromURL(u"docx/piechart_deleted_legend_entry.docx");
+ loadFromFile(u"docx/piechart_deleted_legend_entry.docx");
saveAndReload("Office Open XML Text");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -977,7 +977,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf130225)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf59857)
{
- loadFromURL(u"ods/tdf59857.ods");
+ loadFromFile(u"ods/tdf59857.ods");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -992,7 +992,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf59857)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf126076)
{
- loadFromURL(u"xlsx/auto_marker_excel10.xlsx");
+ loadFromFile(u"xlsx/auto_marker_excel10.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1008,7 +1008,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf126076)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf75330)
{
- loadFromURL(u"ods/legend_overlay.ods");
+ loadFromFile(u"ods/legend_overlay.ods");
saveAndReload("calc8");
{
uno::Reference<chart2::XChartDocument> xChart2Doc =
getChartDocFromSheet(0, mxComponent);
@@ -1033,7 +1033,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf75330)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf127792)
{
- loadFromURL(u"docx/MSO_axis_position.docx");
+ loadFromFile(u"docx/MSO_axis_position.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1048,7 +1048,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf127792)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf131979)
{
- loadFromURL(u"ods/tdf131115.ods");
+ loadFromFile(u"ods/tdf131115.ods");
{
saveAndReload("calc8");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
@@ -1064,7 +1064,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf131979)
!blinknumberformattosource);
}
- loadFromURL(u"ods/tdf131979.ods");
+ loadFromFile(u"ods/tdf131979.ods");
{
saveAndReload("calc8");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
@@ -1087,7 +1087,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132076)
skipValidation();
{
- loadFromURL(u"ods/tdf132076.ods");
+ loadFromFile(u"ods/tdf132076.ods");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1097,7 +1097,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132076)
"sourceLinked"_ostr, "0");
}
{
- loadFromURL(u"xlsx/tdf132076.xlsx");
+ loadFromFile(u"xlsx/tdf132076.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1110,7 +1110,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132076)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf125812)
{
- loadFromURL(u"odp/ellipticalGradientFill.odp");
+ loadFromFile(u"odp/ellipticalGradientFill.odp");
save("Impress MS PowerPoint 2007 XML");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1132,7 +1132,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf125812)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133190)
{
- loadFromURL(u"xlsx/tdf133190_tdf133191.xlsx");
+ loadFromFile(u"xlsx/tdf133190_tdf133191.xlsx");
// FIXME: validation error in OOXML export: Errors: 1
skipValidation();
@@ -1154,7 +1154,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133190)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133191)
{
- loadFromURL(u"xlsx/tdf133190_tdf133191.xlsx");
+ loadFromFile(u"xlsx/tdf133190_tdf133191.xlsx");
// FIXME: validation error in OOXML export: Errors: 1
skipValidation();
@@ -1172,7 +1172,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133191)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132594)
{
- loadFromURL(u"xlsx/chart_pie2007.xlsx");
+ loadFromFile(u"xlsx/chart_pie2007.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1182,7 +1182,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132594)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134255)
{
- loadFromURL(u"docx/tdf134255.docx");
+ loadFromFile(u"docx/tdf134255.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1209,7 +1209,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134255)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134977)
{
- loadFromURL(u"xlsx/custom_data_label.xlsx");
+ loadFromFile(u"xlsx/custom_data_label.xlsx");
//import test
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
@@ -1239,7 +1239,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134977)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf123647)
{
- loadFromURL(u"xlsx/empty_chart.xlsx");
+ loadFromFile(u"xlsx/empty_chart.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1249,7 +1249,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf123647)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf136267)
{
- loadFromURL(u"xlsx/tdf136267.xlsx");
+ loadFromFile(u"xlsx/tdf136267.xlsx");
// FIXME: validation error in OOXML export: Errors: 2
skipValidation();
@@ -1266,7 +1266,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf136267)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataLabelPlacementPieChart)
{
- loadFromURL(u"xlsx/tdf134978.xlsx");
+ loadFromFile(u"xlsx/tdf134978.xlsx");
saveAndReload("calc8");
uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0,
0, mxComponent),
UNO_QUERY_THROW);
@@ -1282,7 +1282,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testDataLabelPlacementPieChart)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf137917)
{
- loadFromURL(u"xlsx/tdf137917.xlsx");
+ loadFromFile(u"xlsx/tdf137917.xlsx");
// FIXME: validation error in OOXML export: Errors: 1
skipValidation();
@@ -1305,7 +1305,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf137917)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138204)
{
- loadFromURL(u"xlsx/tdf138204.xlsx");
+ loadFromFile(u"xlsx/tdf138204.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1378,7 +1378,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138204)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138181)
{
- loadFromURL(u"xlsx/piechart_deleted_legendentry.xlsx");
+ loadFromFile(u"xlsx/piechart_deleted_legendentry.xlsx");
Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0,
mxComponent),
UNO_QUERY_THROW);
Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc,
UNO_QUERY_THROW);
@@ -1404,7 +1404,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138181)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomShapeText)
{
- loadFromURL(u"ods/tdf72776.ods");
+ loadFromFile(u"ods/tdf72776.ods");
saveAndReload("calc8");
Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0,
mxComponent),
UNO_QUERY_THROW);
@@ -1420,7 +1420,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testCustomShapeText)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testuserShapesXLSX)
{
- loadFromURL(u"xlsx/tdf128621.xlsx");
+ loadFromFile(u"xlsx/tdf128621.xlsx");
saveAndReload("Calc Office Open XML");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
@@ -1448,7 +1448,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testuserShapesXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testuserShapesDOCX)
{
- loadFromURL(u"docx/tdf143130.docx");
+ loadFromFile(u"docx/tdf143130.docx");
saveAndReload("Office Open XML Text");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
@@ -1476,7 +1476,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testuserShapesDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testGraphicBlipXLSX)
{
- loadFromURL(u"xlsx/tdf143127.xlsx");
+ loadFromFile(u"xlsx/tdf143127.xlsx");
saveAndReload("Calc Office Open XML");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
@@ -1504,7 +1504,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testGraphicBlipXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testNameRangeXLSX)
{
- loadFromURL(u"xlsx/chart_with_name_range.xlsx");
+ loadFromFile(u"xlsx/chart_with_name_range.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1520,7 +1520,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testNameRangeXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf143942)
{
- loadFromURL(u"xlsx/tdf143942.xlsx");
+ loadFromFile(u"xlsx/tdf143942.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1590,7 +1590,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf143942)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDateCategoriesPPTX)
{
- loadFromURL(u"pptx/bnc889755.pptx");
+ loadFromFile(u"pptx/bnc889755.pptx");
// FIXME: validation error in OOXML export: Errors: 1
skipValidation();
@@ -1632,7 +1632,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testDateCategoriesPPTX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataTableImportExport)
{
- loadFromURL(u"xlsx/ChartDataTable.xlsx");
+ loadFromFile(u"xlsx/ChartDataTable.xlsx");
{
uno::Reference<chart2::XChartDocument> xChartDoc =
getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
diff --git a/chart2/qa/extras/chart2export3.cxx
b/chart2/qa/extras/chart2export3.cxx
index e06568f5f1e8..59416198ce0f 100644
--- a/chart2/qa/extras/chart2export3.cxx
+++ b/chart2/qa/extras/chart2export3.cxx
@@ -30,7 +30,7 @@ public:
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf108107)
{
- loadFromURL(u"xlsx/tdf108107.xlsx");
+ loadFromFile(u"xlsx/tdf108107.xlsx");
// FIXME: validation error in OOXML export: Errors: 1
skipValidation();
@@ -45,7 +45,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf108107)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf114139)
{
- loadFromURL(u"xlsx/tdf114139.xlsx");
+ loadFromFile(u"xlsx/tdf114139.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -58,7 +58,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf114139)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf64224)
{
- loadFromURL(u"ods/tdf64224.ods");
+ loadFromFile(u"ods/tdf64224.ods");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -70,7 +70,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf64224)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesColorFillDOCX)
{
- loadFromURL(u"docx/testChartTitlePropertiesColorFill.docx");
+ loadFromFile(u"docx/testChartTitlePropertiesColorFill.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -80,7 +80,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testChartTitlePropertiesColorFillDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testChartTitlePropertiesGradientFillDOCX)
{
- loadFromURL(u"docx/testChartTitlePropertiesGradientFill.docx");
+ loadFromFile(u"docx/testChartTitlePropertiesGradientFill.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -91,7 +91,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testChartTitlePropertiesGradientFillDOCX
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesBitmapFillDOCX)
{
- loadFromURL(u"docx/testChartTitlePropertiesBitmapFill.docx");
+ loadFromFile(u"docx/testChartTitlePropertiesBitmapFill.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -103,7 +103,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testChartTitlePropertiesBitmapFillDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testColorGradientWithTransparencyDOCX)
{
// Test color gradient (two color) with gradient transparency
- loadFromURL(u"docx/testColorGradientWithTransparency.docx");
+ loadFromFile(u"docx/testColorGradientWithTransparency.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -116,7 +116,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testColorGradientWithTransparencyDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testColorGradientWithTransparencyODS)
{
// Test color gradient (two color) with simple transparency
- loadFromURL(u"ods/testColorGradientWithTransparency.ods");
+ loadFromFile(u"ods/testColorGradientWithTransparency.ods");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -129,7 +129,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testColorGradientWithTransparencyODS)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testColorGradientStopXLSX)
{
// Test color gradient (two color) stop of the first color
- loadFromURL(u"xlsx/tdf128619.xlsx");
+ loadFromFile(u"xlsx/tdf128619.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -141,7 +141,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testColorGradientStopXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testRadialColorGradientDOCX)
{
- loadFromURL(u"docx/tdf128794.docx");
+ loadFromFile(u"docx/tdf128794.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -153,7 +153,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testRadialColorGradientDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartDataPointPropDOCX)
{
- loadFromURL(u"docx/testBarChartDataPointPropDOCX.docx");
+ loadFromFile(u"docx/testBarChartDataPointPropDOCX.docx");
save("Office Open XML Text");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -172,7 +172,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testBarChartDataPointPropDOCX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testFdo83058dlblPos)
{
- loadFromURL(u"docx/fdo83058_dlblPos.docx");
+ loadFromFile(u"docx/fdo83058_dlblPos.docx");
// FIXME: validation error in OOXML export: Errors: 1
skipValidation();
@@ -188,7 +188,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testFdo83058dlblPos)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAutoTitleDelXLSX)
{
- loadFromURL(u"xlsx/autotitledel_2007.xlsx");
+ loadFromFile(u"xlsx/autotitledel_2007.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -197,7 +197,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testAutoTitleDelXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDispBlanksAsXLSX)
{
- loadFromURL(u"xlsx/dispBlanksAs_2007.xlsx");
+ loadFromFile(u"xlsx/dispBlanksAs_2007.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -206,7 +206,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testDispBlanksAsXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testMarkerColorXLSX)
{
- loadFromURL(u"xlsx/markerColor.xlsx");
+ loadFromFile(u"xlsx/markerColor.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -215,7 +215,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testMarkerColorXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testRoundedCornersXLSX)
{
- loadFromURL(u"xlsx/markerColor.xlsx");
+ loadFromFile(u"xlsx/markerColor.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -224,7 +224,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testRoundedCornersXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAxisNumberFormatXLSX)
{
- loadFromURL(u"ods/axis_number_format.ods");
+ loadFromFile(u"ods/axis_number_format.ods");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -241,7 +241,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testDataPointLabelNumberFormatXLSX)
// FIXME: validation error in OOXML export: Errors: 1
skipValidation();
- loadFromURL(u"ods/tdf123774.ods");
+ loadFromFile(u"ods/tdf123774.ods");
{
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
@@ -253,7 +253,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testDataPointLabelNumberFormatXLSX)
assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt"_ostr,
"sourceLinked"_ostr, "0");
}
- loadFromURL(u"xlsx/tdf130986.xlsx");
+ loadFromFile(u"xlsx/tdf130986.xlsx");
{
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
@@ -266,7 +266,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testDataPointLabelNumberFormatXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataLabelDefaultValuesXLSX)
{
- loadFromURL(u"xlsx/data_label.xlsx");
+ loadFromFile(u"xlsx/data_label.xlsx");
Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0,
mxComponent);
Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xDoc, 0);
Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW);
@@ -284,7 +284,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testDataLabelDefaultValuesXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataLabelFillColor)
{
- loadFromURL(u"xlsx/data_labels_fill_color.xlsx");
+ loadFromFile(u"xlsx/data_labels_fill_color.xlsx");
Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0,
mxComponent);
Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xDoc, 0);
Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW);
@@ -300,7 +300,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testDataLabelFillColor)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTitleOverlayXLSX)
{
- loadFromURL(u"xlsx/chart_title.xlsx");
+ loadFromFile(u"xlsx/chart_title.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -309,7 +309,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testTitleOverlayXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testInvertIfNegativeXLSX)
{
- loadFromURL(u"xlsx/bar_chart_simple.xlsx");
+ loadFromFile(u"xlsx/bar_chart_simple.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -318,7 +318,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testInvertIfNegativeXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBubble3DXLSX)
{
- loadFromURL(u"xlsx/bubble_chart_simple.xlsx");
+ loadFromFile(u"xlsx/bubble_chart_simple.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -329,7 +329,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBubble3DXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testNoMarkerXLSX)
{
- loadFromURL(u"xlsx/no_marker.xlsx");
+ loadFromFile(u"xlsx/no_marker.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -340,7 +340,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testNoMarkerXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTitleManualLayoutXLSX)
{
- loadFromURL(u"xlsx/title_manual_layout.xlsx");
+ loadFromFile(u"xlsx/title_manual_layout.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -364,7 +364,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testTitleManualLayoutXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testPlotAreaManualLayoutXLSX)
{
- loadFromURL(u"xlsx/plot_area_manual_layout.xlsx");
+ loadFromFile(u"xlsx/plot_area_manual_layout.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -398,7 +398,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testPlotAreaManualLayoutXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testLegendManualLayoutXLSX)
{
- loadFromURL(u"xlsx/legend_manual_layout.xlsx");
+ loadFromFile(u"xlsx/legend_manual_layout.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -435,7 +435,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testLegendManualLayoutXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartSubTitle)
{
- loadFromURL(u"ods/testChartSubTitle.ods");
+ loadFromFile(u"ods/testChartSubTitle.ods");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -450,7 +450,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartSubTitle)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartMainWithSubTitle)
{
- loadFromURL(u"ods/testChartMainWithSubTitle.ods");
+ loadFromFile(u"ods/testChartMainWithSubTitle.ods");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -466,7 +466,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testChartMainWithSubTitle)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAutoTitleDeleted)
{
- loadFromURL(u"xlsx/testAutoTitleDeleted.xlsx");
+ loadFromFile(u"xlsx/testAutoTitleDeleted.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -475,7 +475,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testAutoTitleDeleted)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesColorFillXLSX)
{
- loadFromURL(u"xlsx/testChartTitlePropertiesColorFill.xlsx");
+ loadFromFile(u"xlsx/testChartTitlePropertiesColorFill.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -485,7 +485,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testChartTitlePropertiesColorFillXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testChartTitlePropertiesGradientFillXLSX)
{
- loadFromURL(u"xlsx/testChartTitlePropertiesGradientFill.xlsx");
+ loadFromFile(u"xlsx/testChartTitlePropertiesGradientFill.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -496,7 +496,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testChartTitlePropertiesGradientFillXLSX
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesBitmapFillXLSX)
{
- loadFromURL(u"xlsx/testChartTitlePropertiesBitmapFill.xlsx");
+ loadFromFile(u"xlsx/testChartTitlePropertiesBitmapFill.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -506,7 +506,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testChartTitlePropertiesBitmapFillXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartDataPointPropXLSX)
{
- loadFromURL(u"xlsx/testBarChartDataPointPropXLSX.xlsx");
+ loadFromFile(u"xlsx/testBarChartDataPointPropXLSX.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -563,7 +563,7 @@ void checkSheetForGapWidthAndOverlap(uno::Reference<
chart2::XChartDocument > co
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataseriesOverlapStackedChartXLSX)
{
- loadFromURL(u"xlsx/testDataseriesOverlapStackedChart.xlsx");
+ loadFromFile(u"xlsx/testDataseriesOverlapStackedChart.xlsx");
// test the overlap value of a simple Stacked Column Chart
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(
0, mxComponent );
@@ -584,7 +584,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testDataseriesOverlapStackedChartXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAxisCharacterPropertiesXLSX)
{
- loadFromURL(u"xlsx/axis_character_properties.xlsx");
+ loadFromFile(u"xlsx/axis_character_properties.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -602,7 +602,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testAxisCharacterPropertiesXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTitleCharacterPropertiesXLSX)
{
- loadFromURL(u"xlsx/title_character_properties.xlsx");
+ loadFromFile(u"xlsx/title_character_properties.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -616,7 +616,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testTitleCharacterPropertiesXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testPlotVisOnlyXLSX)
{
- loadFromURL(u"xlsx/hidden_cells.xlsx");
+ loadFromFile(u"xlsx/hidden_cells.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -626,7 +626,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testPlotVisOnlyXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartVaryColorsXLSX)
{
- loadFromURL(u"xlsx/tdf90876.xlsx");
+ loadFromFile(u"xlsx/tdf90876.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -636,7 +636,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testBarChartVaryColorsXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf96161)
{
- loadFromURL(u"ods/tdf96161.ods");
+ loadFromFile(u"ods/tdf96161.ods");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -646,7 +646,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf96161)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTableOnPage3)
{
- loadFromURL(u"docx/TableOnPage3.docx");
+ loadFromFile(u"docx/TableOnPage3.docx");
// FIXME: validation error in OOXML export: Errors: 2
skipValidation();
@@ -666,7 +666,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTableOnPage3)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testMultipleAxisXLSX)
{
- loadFromURL(u"ods/multiple_axis.ods");
+ loadFromFile(u"ods/multiple_axis.ods");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -682,7 +682,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testMultipleAxisXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testSecondaryAxisXLSX)
{
- loadFromURL(u"ods/secondary_axis.ods");
+ loadFromFile(u"ods/secondary_axis.ods");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -699,7 +699,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testSecondaryAxisXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartSecondaryAxisXLSX)
{
- loadFromURL(u"xlsx/testSecondaryAxis.xlsx");
+ loadFromFile(u"xlsx/testSecondaryAxis.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -719,7 +719,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testBarChartSecondaryAxisXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf148142)
{
// The document contains a line chart with "Between tick marks" X axis
position.
- loadFromURL(u"ods/tdf148142.ods");
+ loadFromFile(u"ods/tdf148142.ods");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
Reference<chart2::XAxis> xAxis = getAxisFromDoc(xChartDoc, 0, 0, 0);
diff --git a/chart2/qa/extras/chart2geometry.cxx
b/chart2/qa/extras/chart2geometry.cxx
index 52e0ff414c63..c7de713df1b2 100644
--- a/chart2/qa/extras/chart2geometry.cxx
+++ b/chart2/qa/extras/chart2geometry.cxx
@@ -75,7 +75,7 @@ static OString OU2O(std::u16string_view sOUSource)
void Chart2GeometryTest::testTdf135184RoundLineCap()
{
// It tests chart area, data series line and regression-curve line.
- loadFromURL(u"xlsx/tdf135184RoundLineCap.xlsx");
+ loadFromFile(u"xlsx/tdf135184RoundLineCap.xlsx");
save("calc8");
xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -104,7 +104,7 @@ void Chart2GeometryTest::testTdf135184RoundLineCap()
void Chart2GeometryTest::testTdf135184RoundLineCap2()
{
// It tests legend, data series sector and title.
- loadFromURL(u"xlsx/tdf135184RoundLineCap2.xlsx");
+ loadFromFile(u"xlsx/tdf135184RoundLineCap2.xlsx");
save("calc8");
xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -135,7 +135,7 @@ void Chart2GeometryTest::testTdf135184RoundLineCap2()
void Chart2GeometryTest::testTdf135184RoundLineCap3()
{
// It tests chart area, data series line and regression-curve line.
- loadFromURL(u"xlsx/tdf135184RoundLineCap.xlsx");
+ loadFromFile(u"xlsx/tdf135184RoundLineCap.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -153,7 +153,7 @@ void Chart2GeometryTest::testTdf135184RoundLineCap3()
void Chart2GeometryTest::testTdf135184RoundLineCap4()
{
// It tests legend, data series sector and title.
- loadFromURL(u"xlsx/tdf135184RoundLineCap2.xlsx");
+ loadFromFile(u"xlsx/tdf135184RoundLineCap2.xlsx");
save("Calc Office Open XML");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml");
CPPUNIT_ASSERT(pXmlDoc);
@@ -170,7 +170,7 @@ void
Chart2GeometryTest::testTdf128345ChartArea_CG_TS_export()
{
// chart area with color gradient and solid transparency
// Without the patch the transparency was lost in saved pptx file.
- loadFromURL(u"odp/tdf128345_ChartArea_CG_TS.odp");
+ loadFromFile(u"odp/tdf128345_ChartArea_CG_TS.odp");
// MCGR: Similar to testTdf128345Legend_CS_TG_axial_export:
// Checked that it works with the existing import file,
@@ -202,7 +202,7 @@ void
Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import()
// but will change with ODF MCGR im/export again. We will need to
// update the *.odp input file. Disable unclear values for now and
// adapt when ODF im/export for MCGR is integrated
- loadFromURL(u"pptx/tdf128345_ChartArea_CG_TS.pptx");
+ loadFromFile(u"pptx/tdf128345_ChartArea_CG_TS.pptx");
// Find transparency gradient name
save("impress8");
@@ -237,7 +237,7 @@ void
Chart2GeometryTest::testTdf128345ChartWall_CS_TG_export()
{
// chart wall with solid color and transparency gradient
// Without the patch the transparency was lost.
- loadFromURL(u"odp/tdf128345_ChartWall_CS_TG.odp");
+ loadFromFile(u"odp/tdf128345_ChartWall_CS_TG.odp");
// Make sure the chart has a gradient with transparency in gradient stops
in saved pptx file.
save("Impress MS PowerPoint 2007 XML");
@@ -256,7 +256,7 @@ void
Chart2GeometryTest::testTdf128345ChartWall_CS_TG_import()
{
// This works on the file, which was exported from file
tdf128345_ChartWall_CS_TG.odp to pptx.
// Make sure chart wall has transparency when pptx document is resaved as
odp.
- loadFromURL(u"pptx/tdf128345_ChartWall_CS_TG.pptx");
+ loadFromFile(u"pptx/tdf128345_ChartWall_CS_TG.pptx");
// Find transparency gradient name
save("impress8");
@@ -289,7 +289,7 @@ void
Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_export()
{
// legend with solid color and transparency gradient
// Without the patch the transparency was lost.
- loadFromURL(u"odp/tdf128345_Legend_CS_TG_axial.odp");
+ loadFromFile(u"odp/tdf128345_Legend_CS_TG_axial.odp");
// Make sure the chart has a gradient with transparency in gradient stops
in saved pptx file.
save("Impress MS PowerPoint 2007 XML");
@@ -318,7 +318,7 @@ void
Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_import()
{
// This works on the file, which was exported from file
tdf128345_Legend_CS_TG_axial.odp to pptx.
// Error was, that in case of axial not the middle value was taken but
start and end value.
- loadFromURL(u"pptx/tdf128345_Legend_CS_TG_axial.pptx");
+ loadFromFile(u"pptx/tdf128345_Legend_CS_TG_axial.pptx");
// Find transparency gradient name
save("impress8");
@@ -351,7 +351,7 @@ void Chart2GeometryTest::testTdf135366LabelOnSeries()
{
// Error was, that the fill and line properties of a <chart:data-label>
were not
// imported at all. Here they should be at the series.
- loadFromURL(u"ods/tdf135366_data_label_series.ods");
+ loadFromFile(u"ods/tdf135366_data_label_series.ods");
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
Reference<chart2::XDataSeries> xDataSeries =
getDataSeriesFromDoc(xChartDoc, 0);
@@ -389,7 +389,7 @@ void Chart2GeometryTest::testTdf135366LabelOnPoint()
{
// Error was, that the fill and line properties of a <chart:data-label>
were not
// imported at all. Here they should be at point 2.
- loadFromURL(u"odt/tdf135366_data_label_point.odt");
+ loadFromFile(u"odt/tdf135366_data_label_point.odt");
uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
Reference<chart2::XDataSeries> xDataSeries =
getDataSeriesFromDoc(xChartDoc, 0);
@@ -436,7 +436,7 @@ void Chart2GeometryTest::testTdf135366LabelExport()
// Error was, that line and fill properties were not exported as
// graphic-properties of a <chart:data-label> element, but only
// as loext chart-properties of the <chart:data-point> element.
- loadFromURL(u"odt/tdf135366_data_label_export.odt");
+ loadFromFile(u"odt/tdf135366_data_label_export.odt");
// FIXME: Error: unexpected attribute "loext:label-stroke-color"
skipValidation();
@@ -468,7 +468,7 @@ void Chart2GeometryTest::testTdf135366_CustomLabelText()
// although the used <chart:data-label> element exists since ODF 1.2.
const SvtSaveOptions::ODFDefaultVersion
nCurrentODFVersion(GetODFDefaultVersion());
SetODFDefaultVersion(SvtSaveOptions::ODFVER_012);
- loadFromURL(u"pptx/tdf135366_CustomLabelText.pptx");
+ loadFromFile(u"pptx/tdf135366_CustomLabelText.pptx");
save("impress8");
xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml");
CPPUNIT_ASSERT(pXmlDoc);
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index b219baccad74..f7324c94754f 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -50,7 +50,7 @@ protected:
// split method up into smaller chunks for more detailed tests
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFdo60083)
{
- loadFromURL(u"ods/fdo60083.ods");
+ loadFromFile(u"ods/fdo60083.ods");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(
0, mxComponent );
CPPUNIT_ASSERT(xChartDoc.is());
@@ -99,7 +99,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFdo60083)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testErrorBarRange)
{
- loadFromURL(u"ods/error_bar_range.ods");
+ loadFromFile(u"ods/error_bar_range.ods");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(
0, mxComponent );
CPPUNIT_ASSERT(xChartDoc.is());
@@ -128,7 +128,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testErrorBarRange)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testErrorBarFormatting)
{
- loadFromURL(u"ods/error_bar_properties.ods");
+ loadFromFile(u"ods/error_bar_properties.ods");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(
0, mxComponent );
CPPUNIT_ASSERT(xChartDoc.is());
@@ -169,7 +169,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testSteppedLines)
chart2::CurveStyle_STEP_CENTER_Y
};
- loadFromURL(u"ods/stepped_lines.ods");
+ loadFromFile(u"ods/stepped_lines.ods");
for(sal_Int32 nSheet = 0; nSheet < MAXSHEET; ++nSheet)
{
uno::Reference< chart2::XChartDocument > xChart2Doc =
getChartDocFromSheet( nSheet, mxComponent );
@@ -197,7 +197,7 @@ static uno::Sequence < OUString >
getChartColumnDescriptions( uno::Reference< ch
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODSChartSeries)
{
- loadFromURL(u"ods/chart.ods");
+ loadFromFile(u"ods/chart.ods");
uno::Reference< chart::XChartDocument > xChart1Doc (
getChartCompFromSheet( 0, 0, mxComponent ), UNO_QUERY_THROW);
uno::Sequence < OUString > seriesList = getChartColumnDescriptions(
xChart1Doc);
CPPUNIT_ASSERT_EQUAL(OUString("Col 1"), seriesList[0]);
@@ -208,7 +208,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODSChartSeries)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testXLSXChartSeries)
{
- loadFromURL(u"xlsx/chart.xlsx");
+ loadFromFile(u"xlsx/chart.xlsx");
uno::Reference< chart::XChartDocument > xChart1Doc (
getChartCompFromSheet( 0, 0, mxComponent ), UNO_QUERY_THROW);
uno::Sequence < OUString > seriesList =
getChartColumnDescriptions(xChart1Doc );
CPPUNIT_ASSERT_EQUAL(OUString("Col 1"), seriesList[0]);
@@ -219,7 +219,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testXLSXChartSeries)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testXLSChartSeries)
{
- loadFromURL(u"xls/chart.xls");
+ loadFromFile(u"xls/chart.xls");
uno::Reference< chart::XChartDocument > xChart1Doc (
getChartCompFromSheet( 0, 0, mxComponent ), UNO_QUERY_THROW);
uno::Sequence < OUString > seriesList =
getChartColumnDescriptions(xChart1Doc );
CPPUNIT_ASSERT_EQUAL(OUString("Col 1"), seriesList[0]);
@@ -230,7 +230,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testXLSChartSeries)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODTChartSeries)
{
- loadFromURL(u"odt/chart.odt");
+ loadFromFile(u"odt/chart.odt");
uno::Sequence< OUString > seriesList =
getWriterChartColumnDescriptions(mxComponent);
CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]);
CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[1]);
@@ -240,7 +240,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODTChartSeries)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDOCChartSeries)
{
- loadFromURL(u"doc/chart.doc");
+ loadFromFile(u"doc/chart.doc");
uno::Sequence< OUString > seriesList =
getWriterChartColumnDescriptions(mxComponent);
CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]);
CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[1]);
@@ -249,7 +249,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDOCChartSeries)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDOCXChartSeries)
{
- loadFromURL(u"docx/chart.docx");
+ loadFromFile(u"docx/chart.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -265,7 +265,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDOCXChartSeries)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDOCXChartEmptySeries)
{
- loadFromURL(u"docx/tdf125337.docx");
+ loadFromFile(u"docx/tdf125337.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -291,7 +291,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testDOCXChartEmptySeries)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf81396)
{
- loadFromURL(u"xlsx/tdf81396.xlsx");
+ loadFromFile(u"xlsx/tdf81396.xlsx");
Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0,
mxComponent),
UNO_QUERY_THROW);
@@ -308,7 +308,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf81396)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXChartErrorBars)
{
- loadFromURL(u"pptx/tdf127720.pptx");
+ loadFromFile(u"pptx/tdf127720.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0,
0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -321,7 +321,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testPPTXChartErrorBars)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDOCXChartValuesSize)
{
- loadFromURL(u"docx/bubblechart.docx" );
+ loadFromFile(u"docx/bubblechart.docx" );
Reference<chart2::XChartDocument> xChartDoc( getChartDocFromWriter(0),
uno::UNO_QUERY );
CPPUNIT_ASSERT( xChartDoc.is() );
@@ -343,7 +343,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testDOCXChartValuesSize)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTChartSeries)
{
//test chart series names for ppt
- loadFromURL(u"ppt/chart.ppt");
+ loadFromFile(u"ppt/chart.ppt");
uno::Sequence < OUString > seriesList =
getImpressChartColumnDescriptions(0, 0);
CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]);
@@ -355,7 +355,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTChartSeries)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXChartSeries)
{
//test chart series names for pptx
- loadFromURL(u"pptx/chart.pptx");
+ loadFromFile(u"pptx/chart.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0,
0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -372,7 +372,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXChartSeries)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXSparseChartSeries)
{
//test chart series sparse data for pptx
- loadFromURL(u"pptx/sparse-chart.pptx");
+ loadFromFile(u"pptx/sparse-chart.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0,
0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -398,7 +398,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testPPTXHiddenDataSeries)
* detect and skip those hidden series on import (since we don't support
* hidden columns for internal data table yet).
*/
- loadFromURL(u"pptx/stacked-bar-chart-hidden-series.pptx");
+ loadFromFile(u"pptx/stacked-bar-chart-hidden-series.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0,
0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -437,7 +437,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testPPTXHiddenDataSeries)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXPercentageNumberFormats)
{
- loadFromURL(u"pptx/percentage-number-formats.pptx");
+ loadFromFile(u"pptx/percentage-number-formats.pptx");
// 1st chart
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0,
0), uno::UNO_QUERY);
@@ -503,7 +503,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testPPTXPercentageNumberFormats)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPieChartLabelsNumFormat)
{
- loadFromURL(u"xlsx/tdfPieNumFormat.xlsx");
+ loadFromFile(u"xlsx/tdfPieNumFormat.xlsx");
uno::Reference< chart::XChartDocument > xChartDoc(getChartCompFromSheet(0,
0, mxComponent), UNO_QUERY_THROW);
CPPUNIT_ASSERT(xChartDoc.is());
// test data point labels format
@@ -515,7 +515,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testPieChartLabelsNumFormat)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXStackedNonStackedYAxis)
{
- loadFromURL(u"pptx/stacked-non-stacked-mix-y-axis.pptx");
+ loadFromFile(u"pptx/stacked-non-stacked-mix-y-axis.pptx");
// 1st chart is a normal stacked column.
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0,
0), uno::UNO_QUERY);
@@ -575,7 +575,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testPPTXStackedNonStackedYAxis)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODPChartSeries)
{
//test chart series names for odp
- loadFromURL(u"odp/chart.odp");
+ loadFromFile(u"odp/chart.odp");
uno::Sequence < OUString > seriesList =
getImpressChartColumnDescriptions(0, 0);
CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]);
CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[1]);
@@ -585,7 +585,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODPChartSeries)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testBnc864396)
{
- loadFromURL(u"pptx/bnc864396.pptx");
+ loadFromFile(u"pptx/bnc864396.pptx");
uno::Reference< chart2::XChartDocument >
xChartDoc(getChartDocFromDrawImpress(0,0), uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT(xChartDoc->hasInternalDataProvider());
@@ -601,7 +601,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testBnc864396)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testBnc889755)
{
- loadFromURL(u"pptx/bnc889755.pptx");
+ loadFromFile(u"pptx/bnc889755.pptx");
uno::Reference<chart2::XChartDocument>
xChartDoc(getChartDocFromDrawImpress(0, 5), uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT(xChartDoc->hasInternalDataProvider());
@@ -642,7 +642,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testBnc889755)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testBnc882383)
{
- loadFromURL(u"pptx/bnc882383.pptx");
+ loadFromFile(u"pptx/bnc882383.pptx");
uno::Reference<chart2::XChartDocument>
xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY_THROW);
uno::Reference<chart2::XDataSeries>
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
CPPUNIT_ASSERT(xDataSeries.is());
@@ -655,7 +655,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testBnc882383)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTransparencyGradientValue)
{
- loadFromURL(u"xlsx/tdf128732.xlsx");
+ loadFromFile(u"xlsx/tdf128732.xlsx");
uno::Reference< chart2::XChartDocument > xChartDoc =
getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
uno::Reference<chart2::XDataSeries>
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -684,7 +684,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testTransparencyGradientValue)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testSimpleStrictXLSX)
{
- loadFromURL(u"xlsx/strict_chart.xlsx");
+ loadFromFile(u"xlsx/strict_chart.xlsx");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(
0, mxComponent );
CPPUNIT_ASSERT(xChartDoc.is());
@@ -696,7 +696,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testSimpleStrictXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDelayedCellImport)
{
// chart range referencing content on later sheets
- loadFromURL(u"xlsx/fdo70609.xlsx");
+ loadFromFile(u"xlsx/fdo70609.xlsx");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(
0, mxComponent );
Reference< chart2::data::XDataSequence > xDataSeq =
getDataSequenceFromDocByRole(xChartDoc, u"values-x");
@@ -707,7 +707,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testDelayedCellImport)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFlatODSStackedColumnChart)
{
- loadFromURL(u"fods/stacked-column-chart.fods");
+ loadFromFile(u"fods/stacked-column-chart.fods");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -724,7 +724,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testFlatODSStackedColumnChart)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFdo78080)
{
- loadFromURL(u"xlsx/fdo78080.xlsx");
+ loadFromFile(u"xlsx/fdo78080.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -735,7 +735,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFdo78080)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf127811)
{
- loadFromURL(u"pptx/tdf127811.pptx");
+ loadFromFile(u"pptx/tdf127811.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0,
0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -755,7 +755,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf127811)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf86624)
{
// manually placed legends
- loadFromURL(u"ods/tdf86624.ods");
+ loadFromFile(u"ods/tdf86624.ods");
uno::Reference< chart2::XChartDocument > xChart2Doc =
getChartDocFromSheet(0, mxComponent);
uno::Reference< chart::XChartDocument > xChartDoc (xChart2Doc,
uno::UNO_QUERY);
uno::Reference<drawing::XShape> xLegend = xChartDoc->getLegend();
@@ -766,7 +766,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf86624)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf105517)
{
- loadFromURL(u"pptx/tdf105517.pptx");
+ loadFromFile(u"pptx/tdf105517.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0,
0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -794,7 +794,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf105517)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf106217)
{
- loadFromURL(u"pptx/tdf106217.pptx");
+ loadFromFile(u"pptx/tdf106217.pptx");
uno::Reference< chart::XChartDocument > xChartDoc =
getChartDocFromDrawImpress(0, 0);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -817,7 +817,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf106217)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf108021)
{
// Tdf108021 : To check TextBreak value is true.
- loadFromURL(u"ods/tdf108021.ods");
+ loadFromFile(u"ods/tdf108021.ods");
uno::Reference< chart::XDiagram > mxDiagram;
uno::Reference< beans::XPropertySet > xAxisProp;
bool bTextBreak = false;
@@ -835,7 +835,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf108021)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf100084)
{
// The test file was created with IBM Cognos, make sure there is a diagram.
- loadFromURL(u"xlsx/tdf100084.xlsx");
+ loadFromFile(u"xlsx/tdf100084.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
Reference<beans::XPropertySet> xDiagram(xChartDoc->getFirstDiagram(),
UNO_QUERY);
@@ -844,7 +844,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf100084)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf124817)
{
- loadFromURL(u"xlsx/tdf124817.xlsx");
+ loadFromFile(u"xlsx/tdf124817.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -875,7 +875,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf124817)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf126033)
{
- loadFromURL(u"xlsx/tdf126033.xlsx");
+ loadFromFile(u"xlsx/tdf126033.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -892,7 +892,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf126033)
void Chart2ImportTest::testTransparentBackground(std::u16string_view filename)
{
- loadFromURL(filename);
+ loadFromFile(filename);
uno::Reference< chart2::XChartDocument > xChartDoc =
getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -920,7 +920,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFdo54361_1)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutoBackgroundXLSX)
{
- loadFromURL(u"xlsx/chart-auto-background.xlsx");
+ loadFromFile(u"xlsx/chart-auto-background.xlsx");
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -937,7 +937,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testAutoBackgroundXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutoChartAreaBorderPropXLSX)
{
- loadFromURL(u"xlsx/chart-area-style-border.xlsx");
+ loadFromFile(u"xlsx/chart-area-style-border.xlsx");
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -957,7 +957,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testAutoChartAreaBorderPropXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutoChartAreaBorderPropPPTX)
{
- loadFromURL(u"pptx/tdf150176.pptx");
+ loadFromFile(u"pptx/tdf150176.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0,
0), uno::UNO_QUERY);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -971,7 +971,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testAutoChartAreaBorderPropPPTX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testChartAreaStyleBackgroundXLSX)
{
- loadFromURL(u"xlsx/chart-area-style-background.xlsx");
+ loadFromFile(u"xlsx/chart-area-style-background.xlsx");
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
-e
... etc. - the rest is truncated
