diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-28 17:56:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-29 16:42:33 +0100 |
| commit | 042033f1e6da22616cb76c8d950c20c9efecbad5 (patch) | |
| tree | 26b3f1f42d067506f44550b410f3fb9640616a5b /sd | |
| parent | ccfd8e9d09f9ac0a0ea92d0f378391006faaf934 (diff) | |
loplugin:stringviewparam: operator +
Change-Id: I044dd21b63d7eb03224675584fa143009c6b6008
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108418
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sd')
31 files changed, 458 insertions, 443 deletions
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index e18a1492ea4b..ba88b47b6005 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -28,6 +28,7 @@ #include <vector> #include <memory> +#include <string_view> #include "sddllapi.h" #include "pres.hxx" @@ -267,7 +268,7 @@ public: SAL_DLLPRIVATE virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum) override; SAL_DLLPRIVATE void RemoveUnnecessaryMasterPages( SdPage* pMaster=nullptr, bool bOnlyDuplicatePages=false, bool bUndo=true ); - void SetMasterPage(sal_uInt16 nSdPageNum, const OUString& rLayoutName, + void SetMasterPage(sal_uInt16 nSdPageNum, std::u16string_view rLayoutName, SdDrawDocument* pSourceDoc, bool bMaster, bool bCheckMasters); SdDrawDocument* OpenBookmarkDoc(const OUString& rBookmarkFile); @@ -594,7 +595,8 @@ public: */ SdStyleSheetPool* GetSdStyleSheetPool() const; - SAL_DLLPRIVATE void UpdatePageRelativeURLs(const OUString& rOldName, const OUString& rNewName); + SAL_DLLPRIVATE void UpdatePageRelativeURLs( + const OUString& rOldName, std::u16string_view rNewName); SAL_DLLPRIVATE static void SetCalcFieldValueHdl( ::Outliner* pOutliner); diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index a70fbf61be8a..56398c331cfd 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/office/XAnnotation.hpp> #include <memory> +#include <string_view> #include <vector> #include <editeng/flditem.hxx> #include <svx/svdobj.hxx> @@ -268,7 +269,7 @@ public: const OUString& GetName() const; OUString const & GetRealName() const { return FmFormPage::GetName(); }; - void SetPresentationLayout(const OUString& rLayoutName, + void SetPresentationLayout(std::u16string_view rLayoutName, bool bReplaceStyleSheets = true, bool bSetMasterPage = true, bool bReverseOrder = false); diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index 3f60309813a2..6512ff74d9cc 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -27,6 +27,7 @@ #include <cppuhelper/implbase.hxx> #include <vcl/font.hxx> #include <map> +#include <string_view> #include <vector> #include "stlfamily.hxx" @@ -55,10 +56,10 @@ public: void SetActualStyleSheet(SfxStyleSheetBase* pActStyleSheet) { mpActualStyleSheet = pActStyleSheet; } SfxStyleSheetBase* GetActualStyleSheet() { return mpActualStyleSheet; } - SfxStyleSheetBase* GetTitleSheet(const OUString& rLayoutName); + SfxStyleSheetBase* GetTitleSheet(std::u16string_view rLayoutName); // Caller has to delete the list - void CreateOutlineSheetList(const OUString& rLayoutName, std::vector<SfxStyleSheetBase*> &rOutlineStyles); + void CreateOutlineSheetList(std::u16string_view rLayoutName, std::vector<SfxStyleSheetBase*> &rOutlineStyles); /** creates all layout style sheets for the given layout name if they don't exist yet. @@ -68,15 +69,15 @@ public: had to be created. This is used to assert errors in documents when styles are missing. */ - SD_DLLPUBLIC void CreateLayoutStyleSheets(const OUString& rLayoutName, bool bCheck = false ); - static void CreateLayoutSheetNames(const OUString& rLayoutName, std::vector<OUString> &aNameList); - void CreateLayoutSheetList(const OUString& rLayoutName, SdStyleSheetVector& rLayoutSheets); - void CopyLayoutSheets(const OUString& rLayoutName, SdStyleSheetPool& rSourcePool, StyleSheetCopyResultVector& rCreatedSheets); + SD_DLLPUBLIC void CreateLayoutStyleSheets(std::u16string_view rLayoutName, bool bCheck = false ); + static void CreateLayoutSheetNames(std::u16string_view rLayoutName, std::vector<OUString> &aNameList); + void CreateLayoutSheetList(std::u16string_view rLayoutName, SdStyleSheetVector& rLayoutSheets); + void CopyLayoutSheets(std::u16string_view rLayoutName, SdStyleSheetPool& rSourcePool, StyleSheetCopyResultVector& rCreatedSheets); void CopyGraphicSheets(SdStyleSheetPool& rSourcePool); void CopyCellSheets(SdStyleSheetPool& rSourcePool); void CopyTableStyles(SdStyleSheetPool const & rSourcePool); void CopyCellSheets(SdStyleSheetPool& rSourcePool, StyleSheetCopyResultVector& rCreatedSheets); - void RenameAndCopyGraphicSheets(SdStyleSheetPool& rSourcePool, StyleSheetCopyResultVector& rCreatedSheets, OUString const &rRenameSuffix); + void RenameAndCopyGraphicSheets(SdStyleSheetPool& rSourcePool, StyleSheetCopyResultVector& rCreatedSheets, std::u16string_view rRenameSuffix); void CreatePseudosIfNecessary(); void UpdateStdNames(); @@ -119,7 +120,7 @@ public: private: void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily ); void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, StyleSheetCopyResultVector& rCreatedSheets ); - void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, StyleSheetCopyResultVector& rCreatedSheets, const OUString &rRenameSuffix ); + void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, StyleSheetCopyResultVector& rCreatedSheets, std::u16string_view rRenameSuffix ); virtual SfxStyleSheetBase* Create(const OUString& rName, SfxStyleFamily eFamily, SfxStyleSearchBits nMask) override; diff --git a/sd/qa/unit/HtmlExportTest.cxx b/sd/qa/unit/HtmlExportTest.cxx index 551433c13843..dc7a2d73b381 100644 --- a/sd/qa/unit/HtmlExportTest.cxx +++ b/sd/qa/unit/HtmlExportTest.cxx @@ -31,7 +31,7 @@ public: void testHTMLExport() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/HtmlExportTestDocument.odp"), ODP); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/HtmlExportTestDocument.odp"), ODP); htmlDocUniquePtr htmlDoc = exportAndParseHtml(xDocShRef); assertXPath(htmlDoc, "/html", 1); diff --git a/sd/qa/unit/SVGExportTests.cxx b/sd/qa/unit/SVGExportTests.cxx index 35adb1ea0684..5e0d7757ae4c 100644 --- a/sd/qa/unit/SVGExportTests.cxx +++ b/sd/qa/unit/SVGExportTests.cxx @@ -7,6 +7,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <sal/config.h> + +#include <string_view> + #include <test/bootstrapfixture.hxx> #include <sal/macros.h> @@ -35,7 +39,7 @@ protected: xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("svg"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0")); } - void load(const OUString& pDir, const char* pName) + void load(std::u16string_view pDir, const char* pName) { return loadURL(m_directories.getURLFromSrc(pDir) + OUString::createFromAscii(pName), pName); } @@ -82,7 +86,7 @@ public: void executeExport(const char* pName) { - load( "/sd/qa/unit/data/odp/", pName ); + load( u"/sd/qa/unit/data/odp/", pName ); save(); } diff --git a/sd/qa/unit/SdrPdfImportTest.cxx b/sd/qa/unit/SdrPdfImportTest.cxx index f5e24fd19ede..afbb02594e21 100644 --- a/sd/qa/unit/SdrPdfImportTest.cxx +++ b/sd/qa/unit/SdrPdfImportTest.cxx @@ -84,7 +84,7 @@ CPPUNIT_TEST_FIXTURE(SdrPdfImportTest, testImportSimpleText) unsetenv("LO_IMPORT_USE_PDFIUM"); }); - mxComponent = loadFromDesktop(m_directories.getURLFromSrc("sd/qa/unit/data/SimplePDF.pdf")); + mxComponent = loadFromDesktop(m_directories.getURLFromSrc(u"sd/qa/unit/data/SimplePDF.pdf")); auto pImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get()); sd::ViewShell* pViewShell = pImpressDocument->GetDocShell()->GetViewShell(); CPPUNIT_ASSERT(pViewShell); @@ -170,7 +170,7 @@ CPPUNIT_TEST_FIXTURE(SdrPdfImportTest, testAnnotationsImportExport) auto pPdfiumLibrary = vcl::pdf::PDFiumLibrary::get(); mxComponent - = loadFromDesktop(m_directories.getURLFromSrc("sd/qa/unit/data/PdfWithAnnotation.pdf")); + = loadFromDesktop(m_directories.getURLFromSrc(u"sd/qa/unit/data/PdfWithAnnotation.pdf")); auto pImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get()); sd::ViewShell* pViewShell = pImpressDocument->GetDocShell()->GetViewShell(); CPPUNIT_ASSERT(pViewShell); diff --git a/sd/qa/unit/activex-controls-tests.cxx b/sd/qa/unit/activex-controls-tests.cxx index 4903d25b04e2..8d595a8b1451 100644 --- a/sd/qa/unit/activex-controls-tests.cxx +++ b/sd/qa/unit/activex-controls-tests.cxx @@ -63,7 +63,7 @@ public: void SdActiveXControlsTest::testBackgroundColor() { // Check whether all system colors are imported correctly - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/control_background_color.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/control_background_color.pptx"), PPTX); const std::vector<sal_Int32> vBackgroundColors = { @@ -111,7 +111,7 @@ void SdActiveXControlsTest::testBackgroundColor() void SdActiveXControlsTest::testLabelProperties() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/activex_label.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/activex_label.pptx"), PPTX); // First control has default properties uno::Reference< drawing::XControlShape > xControlShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); @@ -191,7 +191,7 @@ void SdActiveXControlsTest::testLabelProperties() void SdActiveXControlsTest::testTextBoxProperties() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/activex_textbox.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/activex_textbox.pptx"), PPTX); // First control has default properties uno::Reference< drawing::XControlShape > xControlShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); @@ -328,7 +328,7 @@ void SdActiveXControlsTest::testTextBoxProperties() void SdActiveXControlsTest::testSpinButtonProperties() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/activex_spinbutton.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/activex_spinbutton.pptx"), PPTX); // First control has default properties uno::Reference< drawing::XControlShape > xControlShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); @@ -420,7 +420,7 @@ void SdActiveXControlsTest::testSpinButtonProperties() void SdActiveXControlsTest::testCommandButtonProperties() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/activex_commandbutton.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/activex_commandbutton.pptx"), PPTX); // First control has default properties uno::Reference< drawing::XControlShape > xControlShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); @@ -491,7 +491,7 @@ void SdActiveXControlsTest::testCommandButtonProperties() void SdActiveXControlsTest::testScrollBarProperties() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/activex_scrollbar.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/activex_scrollbar.pptx"), PPTX); // First control has default properties uno::Reference< drawing::XControlShape > xControlShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); @@ -599,7 +599,7 @@ void SdActiveXControlsTest::testScrollBarProperties() void SdActiveXControlsTest::testCheckBoxProperties() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/activex_checkbox.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/activex_checkbox.pptx"), PPTX); // First control has default properties uno::Reference< drawing::XControlShape > xControlShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); @@ -692,7 +692,7 @@ void SdActiveXControlsTest::testCheckBoxProperties() void SdActiveXControlsTest::testOptionButtonProperties() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/activex_optionbutton.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/activex_optionbutton.pptx"), PPTX); // First control has default properties uno::Reference< drawing::XControlShape > xControlShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); @@ -775,7 +775,7 @@ void SdActiveXControlsTest::testOptionButtonProperties() void SdActiveXControlsTest::testComboBoxProperties() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/activex_combobox.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/activex_combobox.pptx"), PPTX); // First control has default properties uno::Reference< drawing::XControlShape > xControlShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); @@ -889,7 +889,7 @@ void SdActiveXControlsTest::testComboBoxProperties() void SdActiveXControlsTest::testListBoxProperties() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/activex_listbox.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/activex_listbox.pptx"), PPTX); // First control has default properties uno::Reference< drawing::XControlShape > xControlShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); @@ -977,7 +977,7 @@ void SdActiveXControlsTest::testListBoxProperties() void SdActiveXControlsTest::testToggleButtonProperties() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/activex_togglebutton.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/activex_togglebutton.pptx"), PPTX); // First control has default properties uno::Reference< drawing::XControlShape > xControlShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); @@ -1061,7 +1061,7 @@ void SdActiveXControlsTest::testToggleButtonProperties() void SdActiveXControlsTest::testPictureProperties() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/activex_picture.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/activex_picture.pptx"), PPTX); // Different controls has different image positioning @@ -1131,7 +1131,7 @@ void SdActiveXControlsTest::testPictureProperties() void SdActiveXControlsTest::testFontProperties() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/activex_fontproperties.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/activex_fontproperties.pptx"), PPTX); // Different controls has different font properties diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx index 27f2c65c78d5..f796823fc426 100644 --- a/sd/qa/unit/dialogs-test.cxx +++ b/sd/qa/unit/dialogs-test.cxx @@ -591,7 +591,7 @@ void SdDialogsTest::openAnyDialog() /// to dump if (true) { - processDialogBatchFile("sd/qa/unit/data/dialogs-test.txt"); + processDialogBatchFile(u"sd/qa/unit/data/dialogs-test.txt"); } /// example how to dump all known dialogs diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index ca100c003967..ba04f02911be 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -209,7 +209,7 @@ void checkFontAttributes( const SdrTextObj* pObj, ItemValue nVal) void SdOOXMLExportTest1::testTdf127237() { - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf127237.pptx"), PPTX ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf127237.pptx"), PPTX ); xDocShRef = saveAndReload(xDocShRef.get(), ODP); const SdrPage* pPage = GetPage(1, xDocShRef); @@ -229,7 +229,7 @@ void SdOOXMLExportTest1::testTdf127237() void SdOOXMLExportTest1::testBnc887230() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bnc887230.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bnc887230.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -245,7 +245,7 @@ void SdOOXMLExportTest1::testBnc887230() void SdOOXMLExportTest1::testBnc870233_1() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bnc870233_1.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bnc870233_1.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -271,7 +271,7 @@ void SdOOXMLExportTest1::testBnc870233_1() void SdOOXMLExportTest1::testBnc870233_2() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bnc870233_2.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bnc870233_2.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -308,7 +308,7 @@ void SdOOXMLExportTest1::testBnc870233_2() void SdOOXMLExportTest1::testN828390_4() { bool bPassed = false; - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/n828390_4.odp"), ODP ); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/n828390_4.odp"), ODP ); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); @@ -343,7 +343,7 @@ void SdOOXMLExportTest1::testN828390_4() void SdOOXMLExportTest1::testN828390_5() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/n828390_5.odp"), ODP ); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/n828390_5.odp"), ODP ); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); @@ -362,7 +362,7 @@ void SdOOXMLExportTest1::testN828390_5() void SdOOXMLExportTest1::testFdo71961() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/fdo71961.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/fdo71961.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -390,7 +390,7 @@ void SdOOXMLExportTest1::testFdo71961() void SdOOXMLExportTest1::testN828390() { bool bPassed = false; - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/n828390.pptx"), PPTX ); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/n828390.pptx"), PPTX ); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); @@ -416,7 +416,7 @@ void SdOOXMLExportTest1::testN828390() void SdOOXMLExportTest1::testBnc880763() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bnc880763.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bnc880763.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -439,7 +439,7 @@ void SdOOXMLExportTest1::testBnc880763() void SdOOXMLExportTest1::testBnc862510_5() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bnc862510_5.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bnc862510_5.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -462,7 +462,7 @@ void SdOOXMLExportTest1::testBnc862510_5() // not written into the file. void SdOOXMLExportTest1::testBnc822347_EmptyBullet() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/bnc822347_EmptyBullet.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/bnc822347_EmptyBullet.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX); SdDrawDocument* pDoc = xDocShRef->GetDoc(); @@ -491,7 +491,7 @@ void SdOOXMLExportTest1::testBnc822347_EmptyBullet() //Bullets not having any text following them are not getting exported to pptx correctly. void SdOOXMLExportTest1::testFdo90607() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/fdo90607.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/fdo90607.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -505,7 +505,7 @@ void SdOOXMLExportTest1::testFdo90607() void SdOOXMLExportTest1::testFdo83751() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/fdo83751.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/fdo83751.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); SdDrawDocument *pDoc = xDocShRef->GetDoc(); @@ -522,7 +522,7 @@ void SdOOXMLExportTest1::testFdo83751() void SdOOXMLExportTest1::testFdo79731() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/fdo79731.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/fdo79731.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); SdDrawDocument *pDoc = xDocShRef->GetDoc(); CPPUNIT_ASSERT(pDoc); @@ -536,7 +536,7 @@ void SdOOXMLExportTest1::testTableCellFillProperties() batch->commit(); // Load the original file - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/Table_with_Cell_Fill.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/Table_with_Cell_Fill.odp"), ODP); // Export the document and import again for a check uno::Reference< lang::XComponent > xComponent = xDocShRef->GetModel(); @@ -580,7 +580,7 @@ void SdOOXMLExportTest1::testTableCellFillProperties() void SdOOXMLExportTest1::testBulletStartNumber() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/n90255.pptx"), PPTX ); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/n90255.pptx"), PPTX ); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -595,7 +595,7 @@ void SdOOXMLExportTest1::testBulletStartNumber() void SdOOXMLExportTest1::testLineStyle() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/lineStyle.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/lineStyle.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -611,7 +611,7 @@ void SdOOXMLExportTest1::testLineStyle() void SdOOXMLExportTest1::testRightToLeftParaghraph() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/rightToLeftParagraph.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/rightToLeftParagraph.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); @@ -629,7 +629,7 @@ void SdOOXMLExportTest1::testRightToLeftParaghraph() void SdOOXMLExportTest1::testTextboxWithHyperlink() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/hyperlinktest.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/hyperlinktest.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); @@ -655,7 +655,7 @@ void SdOOXMLExportTest1::testTextboxWithHyperlink() void SdOOXMLExportTest1::testTdf136911() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/tdf136911.ppt"), PPT); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/ppt/tdf136911.ppt"), PPT); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); @@ -681,7 +681,7 @@ void SdOOXMLExportTest1::testTdf136911() void SdOOXMLExportTest1::testBulletColor() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bulletColor.pptx"), PPTX ); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bulletColor.pptx"), PPTX ); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); @@ -700,7 +700,7 @@ void SdOOXMLExportTest1::testBulletColor() void SdOOXMLExportTest1::testBulletCharAndFont() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/odp/bulletCharAndFont.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/bulletCharAndFont.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); @@ -727,7 +727,7 @@ void SdOOXMLExportTest1::testBulletCharAndFont() void SdOOXMLExportTest1::testBulletMarginAndIndentation() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bulletMarginAndIndent.pptx"), PPTX ); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bulletMarginAndIndent.pptx"), PPTX ); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -747,7 +747,7 @@ void SdOOXMLExportTest1::testBulletMarginAndIndentation() void SdOOXMLExportTest1::testParaMarginAndindentation() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/paraMarginAndIndentation.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/paraMarginAndIndentation.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); @@ -769,7 +769,7 @@ void SdOOXMLExportTest1::testParaMarginAndindentation() void SdOOXMLExportTest1::testCellLeftAndRightMargin() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/n90223.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/n90223.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); sal_Int32 nLeftMargin, nRightMargin; @@ -800,7 +800,7 @@ void SdOOXMLExportTest1::testCellLeftAndRightMargin() void SdOOXMLExportTest1::testMergedCells() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/cellspan.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/cellspan.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -817,7 +817,7 @@ void SdOOXMLExportTest1::testMergedCells() void SdOOXMLExportTest1::testTableCellBorder() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/n90190.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/n90190.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -863,7 +863,7 @@ void SdOOXMLExportTest1::testTableCellBorder() void SdOOXMLExportTest1::testTdf111884() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf111884.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf111884.pptx"), PPTX); xDocShRef = saveAndReload(xDocShRef.get(), PPTX); const SdrPage *pPage = GetPage(1, xDocShRef); @@ -879,7 +879,7 @@ void SdOOXMLExportTest1::testTdf111884() void SdOOXMLExportTest1::testTdf112633() { // Load document and export it to a temporary file - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf112633.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112633.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -906,7 +906,7 @@ void SdOOXMLExportTest1::testTdf112633() void SdOOXMLExportTest1::testTdf128952() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf128952.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf128952.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -921,7 +921,7 @@ void SdOOXMLExportTest1::testTdf128952() void SdOOXMLExportTest1::testTdf127090() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf127090.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf127090.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -934,7 +934,7 @@ void SdOOXMLExportTest1::testTdf127090() void SdOOXMLExportTest1::testCustomXml() { // Load document and export it to a temporary file - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/customxml.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/customxml.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -956,7 +956,7 @@ void SdOOXMLExportTest1::testTdf94238() { // Load document and export it to a temporary file. ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf94238.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf94238.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); uno::Reference<drawing::XDrawPagesSupplier> xDoc(xDocShRef->GetDoc()->getUnoModel(), @@ -994,7 +994,7 @@ void SdOOXMLExportTest1::testPictureTransparency() { // Load document and export it to a temporary file. ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/image_transparency.odp"), ODP); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/image_transparency.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); uno::Reference<drawing::XDrawPagesSupplier> xDoc(xDocShRef->GetDoc()->getUnoModel(), @@ -1017,7 +1017,7 @@ void SdOOXMLExportTest1::testPictureTransparency() void SdOOXMLExportTest1::testTdf125554() { ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf125554.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf125554.pptx"), PPTX); xDocShRef = saveAndReload(xDocShRef.get(), PPTX); uno::Reference<beans::XPropertySet> xShape = getShapeFromPage(0, 0, xDocShRef); @@ -1035,7 +1035,7 @@ void SdOOXMLExportTest1::testRoundtripOwnLineStyles() { // Load odp document and read the LineDash values. ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/LineStylesOwn.odp"), ODP); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/LineStylesOwn.odp"), ODP); uno::Reference<drawing::XDrawPagesSupplier> xDocodp(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY); CPPUNIT_ASSERT(xDocodp.is()); uno::Reference<drawing::XDrawPage> xPageodp(xDocodp->getDrawPages()->getByIndex(0), uno::UNO_QUERY); @@ -1077,7 +1077,7 @@ void SdOOXMLExportTest1::testRoundtripPrstDash() { // load and save document, compare prstDash values in saved document with original. ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/presetDashDot.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/presetDashDot.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -1127,7 +1127,7 @@ void SdOOXMLExportTest1::testDashOnHairline() { // load and save document, make sure the custDash has 11 child elements. ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf127267DashOnHairline.odp"), ODP); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf127267DashOnHairline.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1139,7 +1139,7 @@ void SdOOXMLExportTest1::testDashOnHairline() void SdOOXMLExportTest1::testCustomshapeBitmapfillSrcrect() { ::sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("sd/qa/unit/data/pptx/customshape-bitmapfill-srcrect.pptx"), + m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/customshape-bitmapfill-srcrect.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -1162,7 +1162,7 @@ void SdOOXMLExportTest1::testCustomshapeBitmapfillSrcrect() void SdOOXMLExportTest1::testTdf100348FontworkBitmapFill() { ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf100348_FontworkBitmapFill.odp"), ODP); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf100348_FontworkBitmapFill.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1178,7 +1178,7 @@ void SdOOXMLExportTest1::testTdf100348FontworkBitmapFill() void SdOOXMLExportTest1::testTdf100348FontworkGradientGlow() { ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf100348_FontworkGradientGlow.odp"), ODP); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf100348_FontworkGradientGlow.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1195,7 +1195,7 @@ void SdOOXMLExportTest1::testTdf100348FontworkGradientGlow() void SdOOXMLExportTest1::testTdf128345FullTransparentGradient() { ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf128345_FullTransparentGradient.odp"), ODP); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf128345_FullTransparentGradient.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1208,7 +1208,7 @@ void SdOOXMLExportTest1::testTdf128345FullTransparentGradient() void SdOOXMLExportTest1::testTdf128345GradientLinear() { ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf128345_GradientLinear.odp"), ODP); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf128345_GradientLinear.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1229,7 +1229,7 @@ void SdOOXMLExportTest1::testTdf128345GradientLinear() void SdOOXMLExportTest1::testTdf128345GradientRadial() { ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf128345_GradientRadial.odp"), ODP); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf128345_GradientRadial.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1250,7 +1250,7 @@ void SdOOXMLExportTest1::testTdf128345GradientAxial() // Without the patch, symmetric linear gradient with full transparence outside and // full opak in the middle were imported as full transparent. ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf128345_GradientAxial.odp"), ODP); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf128345_GradientAxial.odp"), ODP); xDocShRef = saveAndReload(xDocShRef.get(), PPTX); uno::Reference<beans::XPropertySet> xShapePropSet(getShapeFromPage(0, 0, xDocShRef)); @@ -1266,7 +1266,7 @@ void SdOOXMLExportTest1::testTdf128345GradientAxial() void SdOOXMLExportTest1::testTdf134969TransparencyOnColorGradient() { ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf134969_TransparencyOnColorGradient.odp"), ODP); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf134969_TransparencyOnColorGradient.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index 569a0559901d..b38678f62a61 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -366,7 +366,7 @@ public: void SdOOXMLExportTest2::testTdf93883() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf93883.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf93883.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); uno::Reference<text::XTextRange> const xParagraph( getParagraphFromShape( 0, xShape ) ); @@ -377,7 +377,7 @@ void SdOOXMLExportTest2::testTdf93883() void SdOOXMLExportTest2::testBnc822341() { // Check import / export of embedded text document - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/bnc822341.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/bnc822341.odp"), ODP); utl::TempFile tempFile1; xDocShRef = saveAndReload( xDocShRef.get(), PPTX, &tempFile1 ); @@ -447,7 +447,7 @@ void SdOOXMLExportTest2::testBnc822341() void SdOOXMLExportTest2::testMathObject() { // Check import / export of math object - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/math.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/math.odp"), ODP); utl::TempFile tempFile1; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile1); @@ -494,7 +494,7 @@ void SdOOXMLExportTest2::testMathObject() void SdOOXMLExportTest2::testMathObjectPPT2010() { // Check import / export of math object - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/Math.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/Math.pptx"), PPTX); utl::TempFile tempFile1; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile1); @@ -521,7 +521,7 @@ void SdOOXMLExportTest2::testMathObjectPPT2010() void SdOOXMLExportTest2::testTdf119015() { ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf119015.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf119015.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); const SdrPage* pPage = GetPage(1, xDocShRef); @@ -544,7 +544,7 @@ void SdOOXMLExportTest2::testTdf119015() void SdOOXMLExportTest2::testTdf123090() { ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf123090.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf123090.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); const SdrPage* pPage = GetPage(1, xDocShRef); @@ -571,7 +571,7 @@ void SdOOXMLExportTest2::testTdf123090() void SdOOXMLExportTest2::testTdf126324() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf126324.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf126324.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference<drawing::XDrawPagesSupplier> xDoc(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY); @@ -590,7 +590,7 @@ void SdOOXMLExportTest2::testTdf119187() { std::vector< sd::DrawDocShellRef > xDocShRef; // load document - xDocShRef.push_back(loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf119187.pptx"), PPTX)); + xDocShRef.push_back(loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf119187.pptx"), PPTX)); // load resaved document xDocShRef.push_back(saveAndReload( xDocShRef.at(0).get(), PPTX )); @@ -613,7 +613,7 @@ void SdOOXMLExportTest2::testTdf119187() void SdOOXMLExportTest2::testTdf80224() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf80224.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf80224.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); @@ -630,7 +630,7 @@ void SdOOXMLExportTest2::testTdf91378() { //Check For Import and Export Both - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf91378.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf91378.pptx"), PPTX); for( sal_uInt32 i=0;i<2;i++) { SdDrawDocument *pDoc = xDocShRef->GetDoc(); @@ -689,7 +689,7 @@ static bool checkTransitionOnPage(uno::Reference<drawing::XDrawPagesSupplier> co void SdOOXMLExportTest2::testExportTransitionsPPTX() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/AllTransitions.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/AllTransitions.odp"), ODP); xDocShRef = saveAndReload(xDocShRef.get(), PPTX); uno::Reference<drawing::XDrawPagesSupplier> xDoc(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW); @@ -738,7 +738,7 @@ void SdOOXMLExportTest2::testExportTransitionsPPTX() void SdOOXMLExportTest2::testPresetShapesExport() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/preset-shapes-export.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/preset-shapes-export.odp"), ODP); const char *sShapeTypeAndValues[] = { "wedgeEllipseCallout", @@ -822,7 +822,7 @@ void SdOOXMLExportTest2::testTdf92527() // We draw a diamond in an empty document. A newly created diamond shape does not have // CustomShapeGeometry - Path - Segments property, and previously DrawingML exporter // did not export custom shapes which did not have CustomShapeGeometry - Path - Segments property. - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/empty.fodp"), FODG ); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/empty.fodp"), FODG ); uno::Reference<css::lang::XMultiServiceFactory> xFactory(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY); uno::Reference<drawing::XShape> xShape1(xFactory->createInstance("com.sun.star.drawing.CustomShape"), uno::UNO_QUERY); uno::Reference<drawing::XDrawPagesSupplier> xDoc1(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW); @@ -899,7 +899,7 @@ void matchNumberFormat( int nPage, uno::Reference< text::XTextField > const & xF void SdOOXMLExportTest2::testDatetimeFieldNumberFormat() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/numfmt.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/numfmt.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); @@ -913,7 +913,7 @@ void SdOOXMLExportTest2::testDatetimeFieldNumberFormat() void SdOOXMLExportTest2::testDatetimeFieldNumberFormatPPTX() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/numfmt.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/numfmt.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); @@ -927,7 +927,7 @@ void SdOOXMLExportTest2::testDatetimeFieldNumberFormatPPTX() void SdOOXMLExportTest2::testSlideNumberField() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/slidenum_field.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/slidenum_field.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); @@ -939,7 +939,7 @@ void SdOOXMLExportTest2::testSlideNumberField() void SdOOXMLExportTest2::testSlideNumberFieldPPTX() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/slidenum_field.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/slidenum_field.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); @@ -951,7 +951,7 @@ void SdOOXMLExportTest2::testSlideNumberFieldPPTX() void SdOOXMLExportTest2::testSlideCountField() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/slidecount_field.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/slidecount_field.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); @@ -963,7 +963,7 @@ void SdOOXMLExportTest2::testSlideCountField() void SdOOXMLExportTest2::testSlideNameField() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/slidename_field.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/slidename_field.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); @@ -975,7 +975,7 @@ void SdOOXMLExportTest2::testSlideNameField() void SdOOXMLExportTest2::testExtFileField() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/extfile_field.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/extfile_field.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); @@ -1008,7 +1008,7 @@ void SdOOXMLExportTest2::testExtFileField() void SdOOXMLExportTest2::testAuthorField() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/author_field.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/author_field.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); @@ -1020,7 +1020,7 @@ void SdOOXMLExportTest2::testAuthorField() void SdOOXMLExportTest2::testTdf99224() { - sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf99224.odp"), ODP); + sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf99224.odp"), ODP); xShell = saveAndReload(xShell.get(), PPTX); uno::Reference<drawing::XDrawPage> xPage = getPage(0, xShell); // This was 0: the image with text was lost on export. @@ -1030,7 +1030,7 @@ void SdOOXMLExportTest2::testTdf99224() void SdOOXMLExportTest2::testTdf92076() { - sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf92076.odp"), ODP); + sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf92076.odp"), ODP); xShell = saveAndReload(xShell.get(), PPTX); uno::Reference<drawing::XDrawPage> xPage = getPage(0, xShell); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), xPage->getCount()); @@ -1039,7 +1039,7 @@ void SdOOXMLExportTest2::testTdf92076() void SdOOXMLExportTest2::testTdf59046() { - sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf59046.odp"), ODP); + sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf59046.odp"), ODP); utl::TempFile tempFile; xShell = saveAndReload(xShell.get(), PPTX, &tempFile); xShell->DoClose(); @@ -1049,7 +1049,7 @@ void SdOOXMLExportTest2::testTdf59046() void SdOOXMLExportTest2::testTdf133502() { - sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf133502.odp"), ODP); + sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf133502.odp"), ODP); utl::TempFile tempFile; xShell = saveAndReload(xShell.get(), PPTX, &tempFile); xShell->DoClose(); @@ -1065,7 +1065,7 @@ void SdOOXMLExportTest2::testTdf133502() void SdOOXMLExportTest2::testTdf105739() { // Gradient was lost during saving to ODP - sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf105739.pptx"), PPTX); + sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf105739.pptx"), PPTX); utl::TempFile tempFile; xShell = saveAndReload(xShell.get(), ODP, &tempFile); uno::Reference<drawing::XDrawPage> xPage = getPage(0, xShell); @@ -1095,7 +1095,7 @@ void SdOOXMLExportTest2::testTdf105739() void SdOOXMLExportTest2::testPageBitmapWithTransparency() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/page_transparent_bitmap.pptx"), PPTX ); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/page_transparent_bitmap.pptx"), PPTX ); xDocShRef = saveAndReload( xDocShRef.get(), ODP ); uno::Reference< drawing::XDrawPagesSupplier > xDoc( @@ -1120,7 +1120,7 @@ void SdOOXMLExportTest2::testPageBitmapWithTransparency() void SdOOXMLExportTest2::testPptmContentType() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptm/macro.pptm"), PPTM); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptm/macro.pptm"), PPTM); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTM, &tempFile); @@ -1136,7 +1136,7 @@ void SdOOXMLExportTest2::testPptmContentType() void SdOOXMLExportTest2::testTdf111798() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf111798.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf111798.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1193,7 +1193,7 @@ void SdOOXMLExportTest2::testTdf111798() void SdOOXMLExportTest2::testPptmVBAStream() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptm/macro.pptm"), PPTM); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptm/macro.pptm"), PPTM); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTM, &tempFile); @@ -1206,7 +1206,7 @@ void SdOOXMLExportTest2::testPptmVBAStream() void SdOOXMLExportTest2::testTdf111863() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf111863.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf111863.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1219,7 +1219,7 @@ void SdOOXMLExportTest2::testTdf111863() void SdOOXMLExportTest2::testTdf111518() { - sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf111518.pptx"), PPTX); + sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf111518.pptx"), PPTX); utl::TempFile tempFile; tempFile.EnableKillingFile(false); xShell = saveAndReload(xShell.get(), PPTX, &tempFile); @@ -1235,7 +1235,7 @@ void SdOOXMLExportTest2::testTdf111518() void SdOOXMLExportTest2::testTdf100387() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf100387.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf100387.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1264,7 +1264,7 @@ void SdOOXMLExportTest2::testTdf100387() // tdf#126746 Add support for Line Caps import and export void SdOOXMLExportTest2::testClosingShapesAndLineCaps() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/closed-shapes.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/closed-shapes.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1299,7 +1299,7 @@ void SdOOXMLExportTest2::testClosingShapesAndLineCaps() void SdOOXMLExportTest2::testRotateFlip() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/rotate_flip.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/rotate_flip.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1345,7 +1345,7 @@ void SdOOXMLExportTest2::testRotateFlip() void SdOOXMLExportTest2::testTdf106867() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf106867.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf106867.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -1375,7 +1375,7 @@ void SdOOXMLExportTest2::testTdf106867() void SdOOXMLExportTest2::testTdf112280() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf112280.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112280.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1388,7 +1388,7 @@ void SdOOXMLExportTest2::testTdf112280() void SdOOXMLExportTest2::testTdf112088() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf112088.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112088.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1400,7 +1400,7 @@ void SdOOXMLExportTest2::testTdf112088() void SdOOXMLExportTest2::testTdf112333() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf112333.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112333.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1429,7 +1429,7 @@ void SdOOXMLExportTest2::testTdf112333() void SdOOXMLExportTest2::testTdf112552() { // Background fill was not displayed, but it was because of the wrong geometry - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf112552.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf112552.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -1444,7 +1444,7 @@ void SdOOXMLExportTest2::testTdf112552() void SdOOXMLExportTest2::testTdf112557() { // Subtitle shape should be skipped by export. - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf112557.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf112557.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -1455,7 +1455,7 @@ void SdOOXMLExportTest2::testTdf112557() void SdOOXMLExportTest2::testTdf128049() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf128049.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf128049.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -1469,7 +1469,7 @@ void SdOOXMLExportTest2::testTdf128049() void SdOOXMLExportTest2::testTdf106026() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf106026.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf106026.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -1494,7 +1494,7 @@ void SdOOXMLExportTest2::testTdf106026() void SdOOXMLExportTest2::testTdf112334() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf112334.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112334.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1507,7 +1507,7 @@ void SdOOXMLExportTest2::testTdf112334() void SdOOXMLExportTest2::testTdf112089() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf112089.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112089.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1521,7 +1521,7 @@ void SdOOXMLExportTest2::testTdf112089() void SdOOXMLExportTest2::testTdf112086() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf112086.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf112086.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1544,7 +1544,7 @@ void SdOOXMLExportTest2::testTdf112086() void SdOOXMLExportTest2::testTdf112647() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf112647.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf112647.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); uno::Reference<text::XTextRange> xParagraph( getParagraphFromShape( 0, xShape ) ); @@ -1559,7 +1559,7 @@ void SdOOXMLExportTest2::testTdf112647() void SdOOXMLExportTest2::testGroupRotation() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/group_rotation.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/group_rotation.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1572,7 +1572,7 @@ void SdOOXMLExportTest2::testGroupRotation() void SdOOXMLExportTest2::testTdf104788() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf104788.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf104788.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1589,7 +1589,7 @@ void SdOOXMLExportTest2::testTdf104788() void SdOOXMLExportTest2::testSmartartRotation2() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-rotation2.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/smartart-rotation2.pptx"), PPTX); // clear SmartArt data to check how group shapes with double-rotated children are exported, not smartart uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); @@ -1612,7 +1612,7 @@ void SdOOXMLExportTest2::testSmartartRotation2() void SdOOXMLExportTest2::testTdf91999_rotateShape() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf91999_rotateShape.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf91999_rotateShape.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1628,7 +1628,7 @@ void SdOOXMLExportTest2::testTdf91999_rotateShape() void SdOOXMLExportTest2::testTdf114845_rotateShape() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf114845_rotateShape.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf114845_rotateShape.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1644,7 +1644,7 @@ void SdOOXMLExportTest2::testTdf114845_rotateShape() void SdOOXMLExportTest2::testGroupsPosition() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/group.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/group.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1658,7 +1658,7 @@ void SdOOXMLExportTest2::testGroupsPosition() void SdOOXMLExportTest2::testGroupsRotatedPosition() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/group-rot.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/group-rot.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1670,7 +1670,7 @@ void SdOOXMLExportTest2::testGroupsRotatedPosition() void SdOOXMLExportTest2::testAccentColor() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/accent-color.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/accent-color.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1687,7 +1687,7 @@ void SdOOXMLExportTest2::testAccentColor() void SdOOXMLExportTest2::testThemeColors() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf84205.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf84205.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1699,7 +1699,7 @@ void SdOOXMLExportTest2::testThemeColors() void SdOOXMLExportTest2::testTdf114848() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf114848.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf114848.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1712,7 +1712,7 @@ void SdOOXMLExportTest2::testTdf114848() void SdOOXMLExportTest2::testTdf68759() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf68759.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf68759.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1732,7 +1732,7 @@ void SdOOXMLExportTest2::testTdf68759() void SdOOXMLExportTest2::testTdf127901() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf127901.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf127901.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1751,7 +1751,7 @@ void SdOOXMLExportTest2::testTdf127901() void SdOOXMLExportTest2::testTdf48735() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf48735.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf48735.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1765,7 +1765,7 @@ void SdOOXMLExportTest2::testTdf48735() void SdOOXMLExportTest2::testTdf90626() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf90626.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf90626.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -1779,7 +1779,7 @@ void SdOOXMLExportTest2::testTdf90626() void SdOOXMLExportTest2::testTdf107608() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf107608.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf107608.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -1804,7 +1804,7 @@ void SdOOXMLExportTest2::testTdf107608() void SdOOXMLExportTest2::testTdf111786() { // Export line transparency with the color - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf111786.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf111786.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -1824,7 +1824,7 @@ void SdOOXMLExportTest2::testTdf111786() void SdOOXMLExportTest2::testFontScale() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/font-scale.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/font-scale.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); @@ -1839,7 +1839,7 @@ void SdOOXMLExportTest2::testFontScale() void SdOOXMLExportTest2::testShapeAutofitPPTX() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/testShapeAutofit.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/testShapeAutofit.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); @@ -1853,7 +1853,7 @@ void SdOOXMLExportTest2::testShapeAutofitPPTX() void SdOOXMLExportTest2::testLegacyShapeAutofitPPTX() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/testLegacyShapeAutofit.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/testLegacyShapeAutofit.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); @@ -1869,7 +1869,7 @@ void SdOOXMLExportTest2::testLegacyShapeAutofitPPTX() void SdOOXMLExportTest2::testTdf115394() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf115394.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf115394.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); double fTransitionDuration; @@ -1903,7 +1903,7 @@ void SdOOXMLExportTest2::testTdf115394() void SdOOXMLExportTest2::testTdf115394Zero() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf115394-zero.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf115394-zero.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); double fTransitionDuration; @@ -1917,7 +1917,7 @@ void SdOOXMLExportTest2::testTdf115394Zero() void SdOOXMLExportTest2::testTdf115005() { - sd::DrawDocShellRef xDocShRefOriginal = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf115005.odp"), ODP); + sd::DrawDocShellRef xDocShRefOriginal = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf115005.odp"), ODP); utl::TempFile tempFile; sd::DrawDocShellRef xDocShRefResaved = saveAndReload(xDocShRefOriginal.get(), ODP, &tempFile); @@ -1937,7 +1937,7 @@ void SdOOXMLExportTest2::testTdf115005() int SdOOXMLExportTest2::testTdf115005_FallBack_Images(bool bAddReplacementImages) { - sd::DrawDocShellRef xDocShRefOriginal = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf115005_no_fallback_images.odp"), ODP); + sd::DrawDocShellRef xDocShRefOriginal = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf115005_no_fallback_images.odp"), ODP); // check if fallback images were not created if AddReplacementImages=true/false // set AddReplacementImages @@ -1986,7 +1986,7 @@ void SdOOXMLExportTest2::testTdf115005_FallBack_Images_Off() void SdOOXMLExportTest2::testTdf118806() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf118806.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf118806.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -1998,7 +1998,7 @@ void SdOOXMLExportTest2::testTdf118806() void SdOOXMLExportTest2::testTdf130058() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf130058.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf130058.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2030,7 +2030,7 @@ void SdOOXMLExportTest2::testTdf130058() void SdOOXMLExportTest2::testTdf111789() { // Shadow properties were not exported for text shapes. - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf111789.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf111789.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2073,7 +2073,7 @@ void SdOOXMLExportTest2::testTdf111789() void SdOOXMLExportTest2::testTdf104792() { ::sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf104792-smart-art-animation.pptx"), PPTX); + m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf104792-smart-art-animation.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2085,7 +2085,7 @@ void SdOOXMLExportTest2::testTdf104792() void SdOOXMLExportTest2::testTdf90627() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf90627.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf90627.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2098,7 +2098,7 @@ void SdOOXMLExportTest2::testTdf90627() void SdOOXMLExportTest2::testTdf104786() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf104786.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf104786.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2111,7 +2111,7 @@ void SdOOXMLExportTest2::testTdf104786() void SdOOXMLExportTest2::testTdf118783() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf118783.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf118783.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -2124,7 +2124,7 @@ void SdOOXMLExportTest2::testTdf118783() void SdOOXMLExportTest2::testTdf104789() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf104789.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf104789.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2137,7 +2137,7 @@ void SdOOXMLExportTest2::testTdf104789() void SdOOXMLExportTest2::testOpenDocumentAsReadOnly() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/open-as-read-only.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/open-as-read-only.pptx"), PPTX); CPPUNIT_ASSERT(xDocShRef->IsSecurityOptOpenReadOnly()); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2147,7 +2147,7 @@ void SdOOXMLExportTest2::testOpenDocumentAsReadOnly() void SdOOXMLExportTest2::testTdf118835() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf118835.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf118835.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2175,7 +2175,7 @@ void SdOOXMLExportTest2::testTdf118835() void SdOOXMLExportTest2::testTdf118768() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf118768-brake.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf118768-brake.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2194,7 +2194,7 @@ void SdOOXMLExportTest2::testTdf118768() void SdOOXMLExportTest2::testTdf118836() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf118836.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf118836.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2264,7 +2264,7 @@ static bool getScaleXValue(const uno::Reference<beans::XPropertySet>& xSet) void SdOOXMLExportTest2::testTdf116350TextEffects() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc( "sd/qa/unit/data/pptx/tdf116350-texteffects.pptx" ), PPTX ); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc( u"sd/qa/unit/data/pptx/tdf116350-texteffects.pptx" ), PPTX ); // Default angle for ArchUp uno::Reference<beans::XPropertySet> xShape0( getShapeFromPage( 0, 0, xDocShRef ) ); @@ -2304,7 +2304,7 @@ void SdOOXMLExportTest2::testTdf116350TextEffects() void SdOOXMLExportTest2::testTdf128096() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf128096.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf128096.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef->DoClose(); @@ -2318,7 +2318,7 @@ void SdOOXMLExportTest2::testTdf128096() } void SdOOXMLExportTest2::testTdf120573() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc( "sd/qa/unit/data/pptx/tdf120573.pptx" ), PPTX ); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc( u"sd/qa/unit/data/pptx/tdf120573.pptx" ), PPTX ); utl::TempFile tempFile; xDocShRef = saveAndReload( xDocShRef.get(), PPTX, &tempFile ); @@ -2341,7 +2341,7 @@ void SdOOXMLExportTest2::testTdf120573() void SdOOXMLExportTest2::testTdf118825() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf118825-motionpath.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf118825-motionpath.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); @@ -2356,7 +2356,7 @@ void SdOOXMLExportTest2::testTdf118825() void SdOOXMLExportTest2::testTdf119118() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc( "sd/qa/unit/data/pptx/tdf119118.pptx" ), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc( u"sd/qa/unit/data/pptx/tdf119118.pptx" ), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); @@ -2367,7 +2367,7 @@ void SdOOXMLExportTest2::testTdf119118() void SdOOXMLExportTest2::testTdf99213() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc( "sd/qa/unit/data/odp/tdf99213-target-missing.odp" ), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc( u"sd/qa/unit/data/odp/tdf99213-target-missing.odp" ), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xmlDocUniquePtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); @@ -2403,7 +2403,7 @@ void SdOOXMLExportTest2::testTdf44223() { utl::TempFile tempFile; ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf44223.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf44223.pptx"), PPTX); xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); std::unique_ptr<SvStream> const pStream1(parseExportStream(tempFile, "ppt/media/audio1.wav")); @@ -2444,7 +2444,8 @@ void SdOOXMLExportTest2::testTdf44223() void SdOOXMLExportTest2::testSmartArtPreserve() { ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-preserve.pptx"), PPTX); + = loadURL( + m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/smartart-preserve.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2489,7 +2490,7 @@ void SdOOXMLExportTest2::testSmartArtPreserve() void SdOOXMLExportTest2::testTdf125346() { // There are two themes in the test document, make sure we use the right theme - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf125346.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf125346.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2511,7 +2512,7 @@ void SdOOXMLExportTest2::testTdf125346_2() { // There are two themes in the test document, make sure we use the right theme // Test more slides with different themes - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf125346_2.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf125346_2.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2561,7 +2562,7 @@ void SdOOXMLExportTest2::testTdf125360() { // Check whether the changed fill transparency is exported correctly. // Color is defined by shape style - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf125360.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf125360.pptx"), PPTX); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); @@ -2583,7 +2584,7 @@ void SdOOXMLExportTest2::testTdf125360_1() { // Check whether the changed fill transparency is exported correctly. // Color is defined by color scheme - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf125360_1.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf125360_1.pptx"), PPTX); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); @@ -2605,7 +2606,7 @@ void SdOOXMLExportTest2::testTdf125360_2() { // Check whether the changed fill transparency is exported correctly. // Color is defined by color scheme with a transparency - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf125360_2.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf125360_2.pptx"), PPTX); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); @@ -2629,7 +2630,7 @@ void SdOOXMLExportTest2::testTdf125360_2() void SdOOXMLExportTest2::testTdf125551() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf125551.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf125551.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2644,7 +2645,7 @@ void SdOOXMLExportTest2::testTdf125551() void SdOOXMLExportTest2::testTdf136830() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf136830.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf136830.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2667,7 +2668,7 @@ void SdOOXMLExportTest2::testTdf136830() void SdOOXMLExportTest2::testTdf100348_convert_Fontwork2TextWarp() { ::sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf100348_Fontwork2TextWarp.odp"), ODP); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf100348_Fontwork2TextWarp.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2722,7 +2723,7 @@ void SdOOXMLExportTest2::testTdf100348_convert_Fontwork2TextWarp() void SdOOXMLExportTest2::testTdf1225573_FontWorkScaleX() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf125573_FontWorkScaleX.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf125573_FontWorkScaleX.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2751,7 +2752,7 @@ void SdOOXMLExportTest2::testTdf1225573_FontWorkScaleX() void SdOOXMLExportTest2::testTdf126234() { - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf126234.pptx"), PPTX ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf126234.pptx"), PPTX ); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2770,7 +2771,7 @@ void SdOOXMLExportTest2::testTdf126234() void SdOOXMLExportTest2::testTdf126741() { - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf126741.pptx"), PPTX ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf126741.pptx"), PPTX ); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2803,7 +2804,7 @@ void SdOOXMLExportTest2::testTdf99497_keepAppearanceOfCircleKind() // slide 1 ARC -> arc, slide 2 CUT -> chord, slide 3 SECTION -> pie // Adjustment values need to exist and their values need to correspond to the // original angles. Shape 'arc' needs to be unfilled. - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf99497_CircleKind.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf99497_CircleKind.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -2837,7 +2838,7 @@ void SdOOXMLExportTest2::testTdf99497_keepAppearanceOfCircleKind() void SdOOXMLExportTest2::testTdf127372() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf127372.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf127372.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); awt::Gradient aTransparenceGradient; @@ -2848,7 +2849,7 @@ void SdOOXMLExportTest2::testTdf127372() void SdOOXMLExportTest2::testTdf127379() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf127379.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf127379.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference< drawing::XDrawPagesSupplier > xDoc( xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW ); @@ -2874,7 +2875,7 @@ void SdOOXMLExportTest2::testTdf127379() void SdOOXMLExportTest2::testTdf98603() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf98603.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf98603.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); uno::Reference<text::XTextRange> const xParagraph(getParagraphFromShape(0, xShape)); @@ -2888,7 +2889,7 @@ void SdOOXMLExportTest2::testTdf98603() void SdOOXMLExportTest2::testTdf128213() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf128213.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf128213.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload( xDocShRef.get(), PPTX, &tempFile ); @@ -2898,7 +2899,7 @@ void SdOOXMLExportTest2::testTdf128213() void SdOOXMLExportTest2::testTdf79082() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf79082.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf79082.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload( xDocShRef.get(), PPTX, &tempFile ); @@ -2954,7 +2955,7 @@ void SdOOXMLExportTest2::testTdf79082() void SdOOXMLExportTest2::testTdf129372() { //Without the fix in place, it would crash at import time - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf129372.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf129372.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef.get() ); @@ -2965,7 +2966,7 @@ void SdOOXMLExportTest2::testTdf129372() void SdOOXMLExportTest2::testShapeGlowEffect() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("sd/qa/unit/data/pptx/shape-glow-effect.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/shape-glow-effect.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); sal_Int32 nRadius = -1; @@ -2981,14 +2982,14 @@ void SdOOXMLExportTest2::testShapeGlowEffect() void SdOOXMLExportTest2::testTdf119087() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf119087.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf119087.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); // This would fail both on export validation, and reloading the saved pptx file. } void SdOOXMLExportTest2::testTdf131554() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf131554.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf131554.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference<drawing::XShape> xShape(getShapeFromPage(1, 0, xDocShRef), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(5622), xShape->getPosition().X); @@ -2997,7 +2998,7 @@ void SdOOXMLExportTest2::testTdf131554() void SdOOXMLExportTest2::testTdf132282() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf132282.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf132282.pptx"), PPTX); xDocShRef = saveAndReload( xDocShRef.get(), PPTX ); uno::Reference<drawing::XShape> xShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); // Without the fix in place, the position would be 0,0, height = 1 and width = 1 @@ -3009,7 +3010,7 @@ void SdOOXMLExportTest2::testTdf132282() void SdOOXMLExportTest2::testTdf132201EffectOrder() { - auto xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/effectOrder.pptx"), + auto xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/effectOrder.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -3029,7 +3030,7 @@ void SdOOXMLExportTest2::testTdf132201EffectOrder() void SdOOXMLExportTest2::testShapeSoftEdgeEffect() { auto xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/shape-soft-edges.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/shape-soft-edges.pptx"), PPTX); xDocShRef = saveAndReload(xDocShRef.get(), PPTX); auto xShapeProps(getShapeFromPage(0, 0, xDocShRef)); sal_Int32 nRadius = -1; @@ -3040,7 +3041,7 @@ void SdOOXMLExportTest2::testShapeSoftEdgeEffect() void SdOOXMLExportTest2::testShapeShadowBlurEffect() { auto xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/shape-blur-effect.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/shape-blur-effect.pptx"), PPTX); xDocShRef = saveAndReload(xDocShRef.get(), PPTX); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); bool bHasShadow = false; @@ -3054,7 +3055,7 @@ void SdOOXMLExportTest2::testShapeShadowBlurEffect() void SdOOXMLExportTest2::testTdf119223() { auto xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf119223.odp"), ODP); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf119223.odp"), ODP); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx index 39700d4ab7cf..56227498f2e5 100644 --- a/sd/qa/unit/export-tests.cxx +++ b/sd/qa/unit/export-tests.cxx @@ -186,7 +186,7 @@ void SdExportTest::testBackgroundImage() // Check if Slide background image is imported from PPTX and exported to PPTX, PPT and ODP correctly OUString bgImageName; - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/n821567.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/n821567.pptx"), PPTX); // Check that imported background image from PPTX exists { @@ -279,7 +279,7 @@ void checkFontAttributes( const SdrTextObj* pObj, ItemValue nVal) void SdExportTest::testTransparentBackground() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/transparent_background.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/transparent_background.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), ODP ); const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -295,7 +295,7 @@ void SdExportTest::testTransparentBackground() void SdExportTest::testMediaEmbedding() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/media_embedding.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/media_embedding.odp"), ODP); const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -310,7 +310,7 @@ void SdExportTest::testMediaEmbedding() void SdExportTest::testFdo84043() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/fdo84043.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/fdo84043.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), ODP ); // the bug was duplicate attributes, causing crash in a build with asserts @@ -323,7 +323,7 @@ void SdExportTest::testFdo84043() void SdExportTest::testTdf97630() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/fit-to-size.fodp"), FODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/fit-to-size.fodp"), FODP); { uno::Reference<drawing::XDrawPagesSupplier> xDPS(xDocShRef->GetModel(), uno::UNO_QUERY); @@ -414,7 +414,7 @@ void SdExportTest::testSwappedOutImageExport() for( size_t nExportFormat = 0; nExportFormat < SAL_N_ELEMENTS(vFormats); ++nExportFormat ) { // Load the original file with one image - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/document_with_two_images.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/document_with_two_images.odp"), ODP); const OString sFailedMessage = OStringLiteral("Failed on filter: ") + aFileFormats[vFormats[nExportFormat]].pFilterName; // Export the document and import again for a check @@ -472,7 +472,7 @@ void SdExportTest::testSwappedOutImageExport() void SdExportTest::testOOoXMLAnimations() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/sxi/ooo41061-1.sxi"), SXI); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/sxi/ooo41061-1.sxi"), SXI); uno::Reference<lang::XComponent> xComponent = xDocShRef->GetModel(); uno::Reference<frame::XStorable> xStorable(xComponent, uno::UNO_QUERY); @@ -494,7 +494,7 @@ void SdExportTest::testOOoXMLAnimations() void SdExportTest::testBnc480256() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bnc480256.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bnc480256.pptx"), PPTX); // In the document, there are two tables with table background properties. // Make sure colors are set properly for individual cells. @@ -548,7 +548,7 @@ void SdExportTest::testBnc480256() void SdExportTest::testUnknownAttributes() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/unknown-attribute.fodp"), FODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/unknown-attribute.fodp"), FODP); uno::Reference<lang::XComponent> xComponent = xDocShRef->GetModel(); uno::Reference<frame::XStorable> xStorable(xComponent, uno::UNO_QUERY); @@ -570,7 +570,7 @@ void SdExportTest::testUnknownAttributes() void SdExportTest::testTdf80020() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf80020.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf80020.odp"), ODP); { uno::Reference<style::XStyleFamiliesSupplier> xStyleFamiliesSupplier(xDocShRef->GetModel(), uno::UNO_QUERY); uno::Reference<container::XNameAccess> xStyleFamilies = xStyleFamiliesSupplier->getStyleFamilies(); @@ -600,7 +600,7 @@ void SdExportTest::testLinkedGraphicRT() for( size_t nExportFormat = 0; nExportFormat < SAL_N_ELEMENTS(vFormats); ++nExportFormat ) { // Load the original file with one image - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/document_with_linked_graphic.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/document_with_linked_graphic.odp"), ODP); // Export the document and import again for a check uno::Reference< lang::XComponent > xComponent = xDocShRef->GetModel(); @@ -656,7 +656,7 @@ void SdExportTest::testLinkedGraphicRT() void SdExportTest::testTdf79082() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/tdf79082.ppt"), PPT); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/ppt/tdf79082.ppt"), PPT); utl::TempFile tempFile; tempFile.EnableKillingFile(); xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile); @@ -711,7 +711,7 @@ void SdExportTest::testImageWithSpecialID() for( size_t nExportFormat = 0; nExportFormat < SAL_N_ELEMENTS(vFormats); ++nExportFormat ) { // Load the original file - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/images_with_special_IDs.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/images_with_special_IDs.odp"), ODP); const OString sFailedMessage = OStringLiteral("Failed on filter: ") + aFileFormats[vFormats[nExportFormat]].pFilterName; // Export the document and import again for a check @@ -769,7 +769,7 @@ void SdExportTest::testImageWithSpecialID() void SdExportTest::testTdf62176() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/Tdf62176.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/Tdf62176.odp"), ODP); uno::Reference<drawing::XDrawPage> xPage( getPage( 0, xDocShRef ) ); //there should be only *one* shape @@ -815,7 +815,7 @@ void SdExportTest::testTdf62176() void SdExportTest::testEmbeddedPdf() { #if HAVE_FEATURE_PDFIUM - sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/embedded-pdf.odp"), ODP); + sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/embedded-pdf.odp"), ODP); xShell = saveAndReload( xShell.get(), ODP ); uno::Reference<drawing::XDrawPage> xPage = getPage(0, xShell); uno::Reference<beans::XPropertySet> xShape(xPage->getByIndex(0), uno::UNO_QUERY); @@ -828,7 +828,7 @@ void SdExportTest::testEmbeddedPdf() void SdExportTest::testEmbeddedText() { - sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/objectwithtext.fodg"), FODG); + sd::DrawDocShellRef xShell = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/objectwithtext.fodg"), FODG); xShell = saveAndReload( xShell.get(), ODG ); uno::Reference<drawing::XDrawPage> xPage = getPage(0, xShell); @@ -859,7 +859,7 @@ void SdExportTest::testEmbeddedText() void SdExportTest::testTransparenText() { sd::DrawDocShellRef xShell - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/transparent-text.fodg"), FODG); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/transparent-text.fodg"), FODG); xShell = saveAndReload(xShell.get(), ODG); uno::Reference<drawing::XDrawPage> xPage = getPage(0, xShell); @@ -879,7 +879,7 @@ void SdExportTest::testTransparenText() void SdExportTest::testDefaultSubscripts() { sd::DrawDocShellRef xShell - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/tdf80194_defaultSubscripts.fodg"), FODG); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/tdf80194_defaultSubscripts.fodg"), FODG); xShell = saveAndReload(xShell.get(), ODG); uno::Reference<drawing::XDrawPage> xPage = getPage(0, xShell); @@ -894,7 +894,7 @@ void SdExportTest::testDefaultSubscripts() void SdExportTest::testTdf98477() { utl::TempFile tempFile; - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf98477grow.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf98477grow.pptx"), PPTX); xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile); @@ -905,7 +905,7 @@ void SdExportTest::testTdf98477() void SdExportTest::testAuthorField() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/author_fixed.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/author_fixed.odp"), ODP); xDocShRef = saveAndReload( xDocShRef.get(), ODP ); @@ -923,7 +923,7 @@ void SdExportTest::testAuthorField() void SdExportTest::testTdf50499() { utl::TempFile tempFile; - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf50499.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf50499.pptx"), PPTX); xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile); @@ -937,7 +937,7 @@ void SdExportTest::testTdf50499() void SdExportTest::testTdf100926() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf100926_ODP.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf100926_ODP.pptx"), PPTX); xDocShRef = saveAndReload(xDocShRef.get(), ODP); @@ -966,7 +966,7 @@ void SdExportTest::testTdf100926() void SdExportTest::testPageWithTransparentBackground() { - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/odp/page_transparent_background.odp"), ODP ); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/page_transparent_background.odp"), ODP ); xDocShRef = saveAndReload( xDocShRef.get(), ODP ); uno::Reference< drawing::XDrawPagesSupplier > xDoc( @@ -991,7 +991,7 @@ void SdExportTest::testPageWithTransparentBackground() void SdExportTest::testTextRotation() { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/shape-text-rotate.pptx"), PPTX); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/shape-text-rotate.pptx"), PPTX); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile); @@ -1013,7 +1013,7 @@ void SdExportTest::testTextRotation() void SdExportTest::testTdf115394PPT() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/ppt/tdf115394.ppt"), PPT); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/ppt/tdf115394.ppt"), PPT); // Export the document and import again for a check uno::Reference< lang::XComponent > xComponent = xDocShRef->GetModel(); @@ -1052,7 +1052,7 @@ void SdExportTest::testBulletsAsImage() { for (sal_Int32 nExportFormat : {ODP, PPTX, PPT}) { - ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/BulletsAsImage.odp"), ODP); + ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/BulletsAsImage.odp"), ODP); const OString sFailedMessageBase = OStringLiteral("Failed on filter '") + aFileFormats[nExportFormat].pFilterName + "': "; uno::Reference< lang::XComponent > xComponent = xDocShRef->GetModel(); @@ -1141,7 +1141,7 @@ void SdExportTest::testBulletsAsImage() void SdExportTest::testTdf113822() { utl::TempFile tempFile; - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf113822underline.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf113822underline.pptx"), PPTX); // Was unable to export iterate container (tdf#99213). xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); @@ -1164,7 +1164,7 @@ void SdExportTest::testTdf113822() void SdExportTest::testTdf113818() { utl::TempFile tempFile; - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf113818-swivel.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf113818-swivel.pptx"), PPTX); xDocShRef = saveAndReload(xDocShRef.get(), PPT); xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile); xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile); @@ -1178,7 +1178,7 @@ void SdExportTest::testTdf113818() void SdExportTest::testTdf119629() { utl::TempFile tempFile; - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/ppt/tdf119629.ppt"), PPT); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/ppt/tdf119629.ppt"), PPT); xDocShRef = saveAndReload(xDocShRef.get(), PPT); xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile); @@ -1199,7 +1199,7 @@ void SdExportTest::testTdf119629() void SdExportTest::testTdf123557() { utl::TempFile tempFile; - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/trigger.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/trigger.pptx"), PPTX); xDocShRef = saveAndReload(xDocShRef.get(), PPTX); xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile); xmlDocUniquePtr pXmlDoc = parseExport(tempFile, "content.xml"); @@ -1219,7 +1219,7 @@ void SdExportTest::testTdf123557() void SdExportTest::testTdf126761() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/tdf126761.ppt"), PPT); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/ppt/tdf126761.ppt"), PPT); xDocShRef = saveAndReload( xDocShRef.get(), ODP ); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); @@ -1240,7 +1240,7 @@ void SdExportTest::testTdf126761() void SdExportTest::testGlow() { - auto xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odg/glow.odg"), ODG); + auto xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odg/glow.odg"), ODG); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), ODG, &tempFile); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); @@ -1281,7 +1281,8 @@ void SdExportTest::testGlow() void SdExportTest::testSoftEdges() { - auto xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odg/softedges.odg"), ODG); + auto xDocShRef + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odg/softedges.odg"), ODG); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), ODG, &tempFile); auto xShapeProps(getShapeFromPage(0, 0, xDocShRef)); @@ -1308,7 +1309,7 @@ void SdExportTest::testSoftEdges() void SdExportTest::testShadowBlur() { - auto xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odg/shadow-blur.odg"), ODG); + auto xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odg/shadow-blur.odg"), ODG); utl::TempFile tempFile; xDocShRef = saveAndReload(xDocShRef.get(), ODG, &tempFile); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); @@ -1332,7 +1333,7 @@ void SdExportTest::testShadowBlur() void SdExportTest::testRhbz1870501() { //Without the fix in place, it would crash at export time - ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/odg/rhbz1870501.odg"), ODG); + ::sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/odg/rhbz1870501.odg"), ODG); xDocShRef = saveAndReload( xDocShRef.get(), ODG ); } diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx index 707f8c85110e..33bbe48e56f9 100644 --- a/sd/qa/unit/filters-test.cxx +++ b/sd/qa/unit/filters-test.cxx @@ -69,23 +69,23 @@ void SdFiltersTest::testCVEs() { #ifndef DISABLE_CVE_TESTS testDir("MS PowerPoint 97", - m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/"), + m_directories.getURLFromSrc(u"/sd/qa/unit/data/ppt/"), "sdfilt"); testDir("Impress Office Open XML", - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/"), + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/"), "", (SfxFilterFlags::IMPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::STARONEFILTER)); testDir("impress8", - m_directories.getURLFromSrc("/sd/qa/unit/data/odp/"), + m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/"), "sdfilt"); testDir("draw8", - m_directories.getURLFromSrc("/sd/qa/unit/data/odg/"), + m_directories.getURLFromSrc(u"/sd/qa/unit/data/odg/"), "sdfilt"); testDir("CGM - Computer Graphics Metafile", - m_directories.getURLFromSrc("/sd/qa/unit/data/cgm/"), + m_directories.getURLFromSrc(u"/sd/qa/unit/data/cgm/"), "icg"); #endif } diff --git a/sd/qa/unit/import-tests-smartart.cxx b/sd/qa/unit/import-tests-smartart.cxx index 369e51ae83f3..d63c21f7f5bb 100644 --- a/sd/qa/unit/import-tests-smartart.cxx +++ b/sd/qa/unit/import-tests-smartart.cxx @@ -173,7 +173,7 @@ public: void SdImportTestSmartArt::testBase() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart1.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/smartart1.pptx"), PPTX); uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_EQUAL(sal_Int32(6), xShapeGroup->getCount()); @@ -221,8 +221,8 @@ void SdImportTestSmartArt::testBase() void SdImportTestSmartArt::testChildren() { - sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-children.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL( + m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/smartart-children.pptx"), PPTX); uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xShapeGroup->getCount()); @@ -261,7 +261,7 @@ void SdImportTestSmartArt::testChildren() void SdImportTestSmartArt::testText() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-text.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/smartart-text.pptx"), PPTX); uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); uno::Reference<drawing::XShapes> xShapeGroup2(xShapeGroup->getByIndex(1), uno::UNO_QUERY_THROW); @@ -278,7 +278,7 @@ void SdImportTestSmartArt::testText() void SdImportTestSmartArt::testCnt() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-cnt.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/smartart-cnt.pptx"), PPTX); uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); sal_Int32 nCount = xShapeGroup->getCount(); @@ -297,7 +297,7 @@ void SdImportTestSmartArt::testCnt() void SdImportTestSmartArt::testDir() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-dir.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/smartart-dir.pptx"), PPTX); uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xShapeGroup->getCount()); @@ -311,8 +311,8 @@ void SdImportTestSmartArt::testDir() void SdImportTestSmartArt::testMaxDepth() { - sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-maxdepth.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL( + m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/smartart-maxdepth.pptx"), PPTX); uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xShapeGroup->getCount()); @@ -332,8 +332,8 @@ void SdImportTestSmartArt::testMaxDepth() void SdImportTestSmartArt::testRotation() { - sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-rotation.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL( + m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/smartart-rotation.pptx"), PPTX); uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); @@ -354,7 +354,7 @@ void SdImportTestSmartArt::testRotation() void SdImportTestSmartArt::testTextAutoRotation() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-autoTxRot.pptx"), PPTX); + m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/smartart-autoTxRot.pptx"), PPTX); auto testText = [&](int pageNo, sal_Int32 txtNo, const OUString& expTx, sal_Int32 expShRot, sal_Int32 expTxRot) { @@ -454,7 +454,7 @@ void SdImportTestSmartArt::testPyramid() void SdImportTestSmartArt::testChevron() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-chevron.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/smartart-chevron.pptx"), PPTX); uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xShapeGroup->getCount()); @@ -481,7 +481,7 @@ void SdImportTestSmartArt::testChevron() void SdImportTestSmartArt::testCycle() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-cycle.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-cycle.pptx"), PPTX); uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); CPPUNIT_ASSERT(xGroup.is()); @@ -539,7 +539,7 @@ void SdImportTestSmartArt::testMultidirectional() // similar document as cycle, but arrows are pointing in both directions sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-multidirectional.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-multidirectional.pptx"), PPTX); uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); CPPUNIT_ASSERT(xGroup.is()); @@ -578,7 +578,7 @@ void SdImportTestSmartArt::testSegmentedCycle() void SdImportTestSmartArt::testBaseRtoL() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-rightoleftblockdiagram.pptx"), + m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/smartart-rightoleftblockdiagram.pptx"), PPTX); uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); @@ -628,7 +628,8 @@ void SdImportTestSmartArt::testBaseRtoL() void SdImportTestSmartArt::testVerticalBoxList() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-vertical-box-list.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-vertical-box-list.pptx"), + PPTX); uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); // Without the accompanying fix in place, this test would have failed with @@ -664,7 +665,7 @@ void SdImportTestSmartArt::testVerticalBoxList() void SdImportTestSmartArt::testVerticalBracketList() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/vertical-bracket-list.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/vertical-bracket-list.pptx"), PPTX); uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), xShapeGroup->getCount()); @@ -681,7 +682,7 @@ void SdImportTestSmartArt::testVerticalBracketList() void SdImportTestSmartArt::testTableList() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/table-list.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/table-list.pptx"), PPTX); uno::Reference<drawing::XShapes> xShapeGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); CPPUNIT_ASSERT(xShapeGroup.is()); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(4), xShapeGroup->getCount()); @@ -713,7 +714,7 @@ void SdImportTestSmartArt::testTableList() void SdImportTestSmartArt::testAccentProcess() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-accent-process.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-accent-process.pptx"), PPTX); uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); CPPUNIT_ASSERT(xGroup.is()); // 3 children: first pair, connector, second pair. @@ -803,9 +804,10 @@ void SdImportTestSmartArt::testAccentProcess() void SdImportTestSmartArt::testContinuousBlockProcess() { - sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-continuous-block-process.pptx"), - PPTX); + sd::DrawDocShellRef xDocShRef + = loadURL(m_directories.getURLFromSrc( + u"/sd/qa/unit/data/pptx/smartart-continuous-block-process.pptx"), + PPTX); uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); CPPUNIT_ASSERT(xGroup.is()); // 3 children: diagram background, background arrow, foreground. @@ -834,7 +836,7 @@ void SdImportTestSmartArt::testOrgChart() { // Simple org chart with 1 manager and 1 employee only. sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-org-chart.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-org-chart.pptx"), PPTX); uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); CPPUNIT_ASSERT(xGroup.is()); @@ -959,7 +961,7 @@ void SdImportTestSmartArt::testOrgChart() void SdImportTestSmartArt::testCycleMatrix() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-cycle-matrix.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-cycle-matrix.pptx"), PPTX); uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); CPPUNIT_ASSERT(xGroup.is()); @@ -1050,7 +1052,7 @@ void SdImportTestSmartArt::testCycleMatrix() void SdImportTestSmartArt::testPictureStrip() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-picture-strip.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-picture-strip.pptx"), PPTX); uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); CPPUNIT_ASSERT(xGroup.is()); @@ -1131,7 +1133,7 @@ void SdImportTestSmartArt::testPictureStrip() void SdImportTestSmartArt::testInteropGrabBag() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-interopgrabbag.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-interopgrabbag.pptx"), PPTX); uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); CPPUNIT_ASSERT(xGroup.is()); @@ -1151,7 +1153,7 @@ void SdImportTestSmartArt::testInteropGrabBag() void SdImportTestSmartArt::testBackground() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-background.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-background.pptx"), PPTX); uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); CPPUNIT_ASSERT(xGroup.is()); @@ -1189,7 +1191,7 @@ void SdImportTestSmartArt::testBackgroundDrawingmlFallback() sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc( - "/sd/qa/unit/data/pptx/smartart-background-drawingml-fallback.pptx"), + u"/sd/qa/unit/data/pptx/smartart-background-drawingml-fallback.pptx"), PPTX); uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); CPPUNIT_ASSERT(xGroup.is()); @@ -1225,7 +1227,7 @@ void SdImportTestSmartArt::testBackgroundDrawingmlFallback() void SdImportTestSmartArt::testCenterCycle() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-center-cycle.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-center-cycle.pptx"), PPTX); uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); CPPUNIT_ASSERT(xGroup.is()); @@ -1253,7 +1255,7 @@ void SdImportTestSmartArt::testCenterCycle() void SdImportTestSmartArt::testFontSize() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-font-size.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-font-size.pptx"), PPTX); uno::Reference<drawing::XShapes> xGroup1(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xShape1(xGroup1->getByIndex(1), uno::UNO_QUERY); @@ -1283,7 +1285,7 @@ void SdImportTestSmartArt::testFontSize() void SdImportTestSmartArt::testVerticalBlockList() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-vertical-block-list.pptx"), + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-vertical-block-list.pptx"), PPTX); uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); CPPUNIT_ASSERT(xGroup.is()); @@ -1329,7 +1331,7 @@ void SdImportTestSmartArt::testVerticalBlockList() void SdImportTestSmartArt::testMissingBulletAndIndent() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-missing-bullet.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-missing-bullet.pptx"), PPTX); uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); uno::Reference<drawing::XShapes> xGroup1(xGroup->getByIndex(2), uno::UNO_QUERY); uno::Reference<drawing::XShapes> xGroup2(xGroup1->getByIndex(0), uno::UNO_QUERY); @@ -1362,7 +1364,7 @@ void SdImportTestSmartArt::testMissingBulletAndIndent() void SdImportTestSmartArt::testBulletList() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-bullet-list.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-bullet-list.pptx"), PPTX); uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); CPPUNIT_ASSERT(xGroup.is()); @@ -1390,7 +1392,7 @@ void SdImportTestSmartArt::testBulletList() void SdImportTestSmartArt::testRecursion() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-recursion.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-recursion.pptx"), PPTX); uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); uno::Reference<drawing::XShapes> xGroup1(xGroup->getByIndex(1), uno::UNO_QUERY); @@ -1438,7 +1440,7 @@ void SdImportTestSmartArt::testDataFollow() // they should be layouted differently - one horizontally and one vertically sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-data-follow.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-data-follow.pptx"), PPTX); uno::Reference<drawing::XShapes> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); @@ -1478,7 +1480,7 @@ void SdImportTestSmartArt::testDataFollow() void SdImportTestSmartArt::testOrgChart2() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-org-chart2.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-org-chart2.pptx"), PPTX); uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); uno::Reference<drawing::XShape> xShapeC1 = findChildShapeByText(xGroup, "C1"); @@ -1520,7 +1522,7 @@ void SdImportTestSmartArt::testOrgChart2() void SdImportTestSmartArt::testTdf131553() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf131553.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf131553.pptx"), PPTX); uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); const SdrPage* pPage = GetPage(1, xDocShRef); @@ -1536,7 +1538,7 @@ void SdImportTestSmartArt::testTdf131553() void SdImportTestSmartArt::testFillColorList() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/fill-color-list.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/fill-color-list.pptx"), PPTX); uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); uno::Reference<drawing::XShape> xShape = getChildShape(getChildShape(xGroup, 1), 0); uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY_THROW); @@ -1571,7 +1573,7 @@ void SdImportTestSmartArt::testFillColorList() void SdImportTestSmartArt::testTdf134221() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-tdf134221.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-tdf134221.pptx"), PPTX); xDocShRef = saveAndReload(xDocShRef.get(), PPTX); uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); uno::Reference<drawing::XShape> xShapeB = findChildShapeByText(xGroup, "B"); @@ -1587,7 +1589,7 @@ void SdImportTestSmartArt::testTdf134221() void SdImportTestSmartArt::testLinearRule() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-linear-rule.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-linear-rule.pptx"), PPTX); uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); // Last child, then first child inside that. @@ -1625,7 +1627,7 @@ void SdImportTestSmartArt::testLinearRule() void SdImportTestSmartArt::testLinearRuleVert() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-linear-rule-vert.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-linear-rule-vert.pptx"), PPTX); uno::Reference<drawing::XShape> xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); // Get the P1 shape. @@ -1646,7 +1648,7 @@ void SdImportTestSmartArt::testLinearRuleVert() void SdImportTestSmartArt::testAutofitSync() { sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-autofit-sync.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-autofit-sync.pptx"), PPTX); uno::Reference<drawing::XShape> xDiagram(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); uno::Reference<drawing::XShape> xMiddle = getChildShape(xDiagram, 2); @@ -1687,7 +1689,7 @@ void SdImportTestSmartArt::testSnakeRows() // Load a smartart which contains a snake algorithm. // The expected layout of the 6 children is a 3x2 grid. sd::DrawDocShellRef xDocShRef = loadURL( - m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-snake-rows.pptx"), PPTX); + m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/smartart-snake-rows.pptx"), PPTX); uno::Reference<drawing::XShapes> xDiagram(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); // Collect position of the background and the real child shapes. First row and background has diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index bf8681502682..eefda64a9cd9 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -411,18 +411,18 @@ void SdImportTest::testDocumentLayout() { int const nUpdateMe = -1; // index of test we want to update; supposedly only when the test is created - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc( "/sd/qa/unit/data/" ) + OUString::createFromAscii( aFilesToCompare[i].pInput ), aFilesToCompare[i].nFormat ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc( u"/sd/qa/unit/data/" ) + OUString::createFromAscii( aFilesToCompare[i].pInput ), aFilesToCompare[i].nFormat ); if( aFilesToCompare[i].nExportType >= 0 ) xDocShRef = saveAndReload( xDocShRef.get(), aFilesToCompare[i].nExportType ); compareWithShapesDump( xDocShRef, - OUString(m_directories.getPathFromSrc( "/sd/qa/unit/data/" ) + OUString::createFromAscii( aFilesToCompare[i].pDump )), + OUString(m_directories.getPathFromSrc( u"/sd/qa/unit/data/" ) + OUString::createFromAscii( aFilesToCompare[i].pDump )), i == nUpdateMe ); } } void SdImportTest::testSmoketest() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/smoketest.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/smoketest.pptx"), PPTX); SdDrawDocument *pDoc = xDocShRef->GetDoc(); CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != nullptr ); @@ -441,7 +441,7 @@ void SdImportTest::testSmoketest() void SdImportTest::testN759180() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/n759180.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/n759180.pptx"), PPTX); const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -470,7 +470,7 @@ void SdImportTest::testN759180() void SdImportTest::testN862510_1() { - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/n862510_1.pptx"), PPTX ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/n862510_1.pptx"), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); { @@ -492,7 +492,7 @@ void SdImportTest::testN862510_1() void SdImportTest::testN862510_2() { - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/n862510_2.pptx"), PPTX ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/n862510_2.pptx"), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); { @@ -509,7 +509,7 @@ void SdImportTest::testN862510_2() void SdImportTest::testN862510_4() { - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/n862510_4.pptx"), PPTX ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/n862510_4.pptx"), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); { @@ -531,7 +531,7 @@ void SdImportTest::testN862510_4() void SdImportTest::testN828390_2() { - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/n828390_2.pptx"), PPTX ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/n828390_2.pptx"), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); SdrObject *pObj = pPage->GetObj(0); @@ -546,7 +546,7 @@ void SdImportTest::testN828390_2() void SdImportTest::testN828390_3() { - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/n828390_3.pptx"), PPTX ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/n828390_3.pptx"), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); SdrObject *pObj = pPage->GetObj(0); @@ -567,7 +567,7 @@ void SdImportTest::testN828390_3() void SdImportTest::testMasterPageStyleParent() { - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/odp/masterpage_style_parent.odp"), ODP ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/masterpage_style_parent.odp"), ODP ); SdDrawDocument *pDoc = xDocShRef->GetDoc(); CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != nullptr ); @@ -603,7 +603,7 @@ void SdImportTest::testMasterPageStyleParent() void SdImportTest::testGradientAngle() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odg/gradient-angle.fodg"), FODG); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odg/gradient-angle.fodg"), FODG); uno::Reference<lang::XMultiServiceFactory> const xDoc( xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY); @@ -661,7 +661,7 @@ void SdImportTest::testGradientAngle() void SdImportTest::testN778859() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/n778859.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/n778859.pptx"), PPTX); const SdrPage *pPage = GetPage( 1, xDocShRef ); { @@ -677,7 +677,7 @@ void SdImportTest::testN778859() void SdImportTest::testFdo68594() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/fdo68594.ppt"), PPT); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/ppt/fdo68594.ppt"), PPT); const SdrPage *pPage = &(GetPage( 1, xDocShRef )->TRG_GetMasterPage()); SdrObject *pObj = pPage->GetObj(1); @@ -693,7 +693,7 @@ void SdImportTest::testFdo68594() void SdImportTest::testPlaceholderPriority() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/placeholder-priority.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/ppt/placeholder-priority.pptx"), PPTX); const SdrPage* pPage = GetPage( 1, xDocShRef ); CPPUNIT_ASSERT_EQUAL_MESSAGE("Missing placeholder", sal_uInt32(2), sal_uInt32(pPage->GetObjCount())); @@ -712,7 +712,7 @@ void SdImportTest::testPlaceholderPriority() void SdImportTest::testPptCrop() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/crop.ppt"), PPT); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/ppt/crop.ppt"), PPT); uno::Reference<beans::XPropertySet> xPropertySet( getShapeFromPage(/*nShape=*/1, /*nPage=*/0, xDocShRef)); @@ -729,7 +729,7 @@ void SdImportTest::testPptCrop() void SdImportTest::testFdo72998() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/cshapes.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/cshapes.pptx"), PPTX); const SdrPage *pPage = GetPage( 1, xDocShRef ); { @@ -749,7 +749,7 @@ void SdImportTest::testFdo72998() void SdImportTest::testFdo77027() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/fdo77027.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/fdo77027.odp"), ODP); const SdrPage *pPage = GetPage( 1, xDocShRef ); { @@ -770,7 +770,7 @@ void SdImportTest::testFdo77027() void SdImportTest::testTdf97808() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/tdf97808.fodp"), FODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/tdf97808.fodp"), FODP); uno::Reference<style::XStyleFamiliesSupplier> xStyleFamiliesSupplier( xDocShRef->GetModel(), uno::UNO_QUERY); @@ -799,7 +799,7 @@ void SdImportTest::testTdf97808() } void SdImportTest::testFillStyleNone() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/tdf123841.odg"), ODG); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/tdf123841.odg"), ODG); const SdrPage* pPage = GetPage(1, xDocShRef); const SdrObject* pObj = pPage->GetObj(0); @@ -813,7 +813,7 @@ void SdImportTest::testFillStyleNone() void SdImportTest::testFdo64512() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/fdo64512.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/fdo64512.odp"), ODP); uno::Reference< drawing::XDrawPagesSupplier > xDoc( xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW ); @@ -858,7 +858,7 @@ void SdImportTest::testFdo71075() { double values[] = { 12.0, 13.0, 14.0 }; css::uno::Any aAny; - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/fdo71075.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/fdo71075.odp"), ODP); uno::Reference< beans::XPropertySet > xPropSet( getShapeFromPage( 0, 0, xDocShRef ) ); aAny = xPropSet->getPropertyValue( "Model" ); @@ -893,7 +893,7 @@ void SdImportTest::testFdo71075() void SdImportTest::testStrictOOXML() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/strict_ooxml.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/strict_ooxml.pptx"), PPTX); SdDrawDocument *pDoc = xDocShRef->GetDoc(); CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != nullptr ); @@ -904,7 +904,7 @@ void SdImportTest::testStrictOOXML() void SdImportTest::testBnc870237() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bnc870237.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bnc870237.pptx"), PPTX); const SdrPage *pPage = GetPage( 1, xDocShRef ); // Simulate a:ext inside dsp:txXfrm with changing the lower distance @@ -921,7 +921,7 @@ void SdImportTest::testBnc870237() void SdImportTest::testCreationDate() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/fdo71434.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/fdo71434.pptx"), PPTX); uno::Reference<document::XDocumentPropertiesSupplier> xDocumentPropertiesSupplier(xDocShRef->GetModel(), uno::UNO_QUERY); uno::Reference<document::XDocumentProperties> xDocumentProperties = xDocumentPropertiesSupplier->getDocumentProperties(); util::DateTime aDate = xDocumentProperties->getCreationDate(); @@ -934,7 +934,7 @@ void SdImportTest::testCreationDate() void SdImportTest::testMultiColTexts() { - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/multicol.pptx"), PPTX ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/multicol.pptx"), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); sdr::table::SdrTableObj *pTableObj = dynamic_cast<sdr::table::SdrTableObj*>(pPage->GetObj(0)); @@ -962,7 +962,7 @@ void SdImportTest::testMultiColTexts() void SdImportTest::testPredefinedTableStyle() { // 073A0DAA-6AF3-43AB-8588-CEC1D06C72B9 (Medium Style 2) - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/predefined-table-style.pptx"), PPTX ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/predefined-table-style.pptx"), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); sdr::table::SdrTableObj *pTableObj = dynamic_cast<sdr::table::SdrTableObj*>(pPage->GetObj(0)); @@ -989,7 +989,7 @@ void SdImportTest::testPredefinedTableStyle() void SdImportTest::testBnc887225() { - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bnc887225.pptx"), PPTX ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bnc887225.pptx"), PPTX ); // In the document, lastRow and lastCol table properties are used. // Make sure styles are set properly for individual cells. @@ -1036,7 +1036,7 @@ void SdImportTest::testBnc584721_1() { // Title text shape on the master page contained wrong text. - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bnc584721_1_2.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bnc584721_1_2.pptx"), PPTX); const SdrPage *pPage = &(GetPage( 1, xDocShRef )->TRG_GetMasterPage()); SdrObject *pObj = pPage->GetObj(0); @@ -1051,7 +1051,7 @@ void SdImportTest::testBnc584721_2() { // Import created an extra/unneeded outliner shape on the master slide next to the imported title shape. - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bnc584721_1_2.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bnc584721_1_2.pptx"), PPTX); const SdrPage *pPage = &(GetPage( 1, xDocShRef )->TRG_GetMasterPage()); CPPUNIT_ASSERT_EQUAL(size_t(1), pPage->GetObjCount()); @@ -1061,7 +1061,7 @@ void SdImportTest::testBnc584721_2() void SdImportTest::testBnc591147() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bnc591147.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bnc591147.pptx"), PPTX); // In the document, there are two slides with media files. uno::Reference< drawing::XDrawPagesSupplier > xDoc( @@ -1099,7 +1099,7 @@ void SdImportTest::testBnc584721_4() { // Black text was imported as white because of wrong caching mechanism - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bnc584721_4.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bnc584721_4.pptx"), PPTX); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 1, 1, xDocShRef ) ); // Get first paragraph of the text @@ -1121,7 +1121,7 @@ void SdImportTest::testBnc904423() { // Here the problem was that different fill properties were applied in wrong order on the shape // Right order: 1) master slide fill style, 2) theme, 3) direct formatting - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/bnc904423.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/bnc904423.pptx"), PPTX); const SdrPage *pPage = GetPage( 1, xDocShRef ); // First shape's background color is defined on master slide @@ -1170,7 +1170,7 @@ void SdImportTest::testShapeLineStyle() { // Here the problem was that different line properties were applied in wrong order on the shape // Right order: 1) master slide line style, 2) theme, 3) direct formatting - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/ShapeLineProperties.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/ShapeLineProperties.pptx"), PPTX); const SdrPage *pPage = GetPage( 1, xDocShRef ); // First shape's line style is defined on master slide @@ -1232,7 +1232,7 @@ void SdImportTest::testShapeLineStyle() void SdImportTest::testTableBorderLineStyle() { - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tableBorderLineStyle.pptx"), PPTX ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tableBorderLineStyle.pptx"), PPTX ); // TODO: If you are working on improvement of table border line style // support, then expect this unit test to fail. @@ -1278,7 +1278,7 @@ void SdImportTest::testTableBorderLineStyle() void SdImportTest::testBnc862510_6() { // Black text was imported instead of gray - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bnc862510_6.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bnc862510_6.pptx"), PPTX); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); // Get first paragraph of the text @@ -1299,7 +1299,7 @@ void SdImportTest::testBnc862510_6() void SdImportTest::testBnc862510_7() { // Title shape's text was aligned to left instead of center. - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bnc862510_7.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bnc862510_7.pptx"), PPTX); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); // Get first paragraph @@ -1336,7 +1336,7 @@ void SdImportTest::testBnc862510_7() void SdImportTest::testPDFImportShared() { comphelper::LibreOfficeKit::setActive(); - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pdf/multipage.pdf"), PDF); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pdf/multipage.pdf"), PDF); SdDrawDocument *pDoc = xDocShRef->GetDoc(); CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != nullptr ); @@ -1437,7 +1437,7 @@ void SdImportTest::testPDFImportSkipImages() void SdImportTest::testBulletSuffix() { - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/n83889.pptx"), PPTX ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/n83889.pptx"), PPTX ); // check suffix of the char bullet const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -1453,7 +1453,7 @@ void SdImportTest::testBulletSuffix() void SdImportTest::testBnc910045() { // Problem with table style which defines cell color with fill style - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/bnc910045.pptx"), PPTX ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/bnc910045.pptx"), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); sdr::table::SdrTableObj *pTableObj = dynamic_cast<sdr::table::SdrTableObj*>(pPage->GetObj(0)); @@ -1471,7 +1471,7 @@ void SdImportTest::testBnc910045() void SdImportTest::testRowHeight() { - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/n80340.pptx"), PPTX ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/n80340.pptx"), PPTX ); const SdrPage *pPage = GetPage( 1, xDocShRef ); sdr::table::SdrTableObj *pTableObj = dynamic_cast<sdr::table::SdrTableObj*>(pPage->GetObj(0)); @@ -1486,7 +1486,7 @@ void SdImportTest::testRowHeight() xDocShRef->DoClose(); - sd::DrawDocShellRef xDocShRef2 = loadURL( m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tablescale.pptx"), PPTX ); + sd::DrawDocShellRef xDocShRef2 = loadURL( m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tablescale.pptx"), PPTX ); const SdrPage *pPage2 = GetPage( 1, xDocShRef2 ); sdr::table::SdrTableObj *pTableObj2 = dynamic_cast<sdr::table::SdrTableObj*>(pPage2->GetObj(0)); @@ -1508,7 +1508,7 @@ void SdImportTest::testRowHeight() void SdImportTest::testTdf93830() { // Text shape offset was ignored - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf93830.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf93830.pptx"), PPTX); uno::Reference< drawing::XDrawPage > xPage( getPage( 0, xDocShRef ) ); // Get the first text box from group shape @@ -1525,7 +1525,7 @@ void SdImportTest::testTdf93830() void SdImportTest::testTdf127129() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf127129.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf127129.pptx"), PPTX); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); uno::Reference< text::XTextRange > xParagraph( getParagraphFromShape( 0, xShape ) ); uno::Reference< text::XTextRange > xRun( getRunFromParagraph( 0, xParagraph ) ); @@ -1545,7 +1545,7 @@ void SdImportTest::testTdf127129() void SdImportTest::testTdf93097() { // Throwing metadata import aborted the filter, check that metadata is now imported. - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf93097.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf93097.pptx"), PPTX); uno::Reference<document::XDocumentPropertiesSupplier> xDocumentPropertiesSupplier(xDocShRef->GetModel(), uno::UNO_QUERY); uno::Reference<document::XDocumentProperties> xDocumentProperties = xDocumentPropertiesSupplier->getDocumentProperties(); CPPUNIT_ASSERT_EQUAL(OUString("ss"), xDocumentProperties->getTitle()); @@ -1554,7 +1554,7 @@ void SdImportTest::testTdf93097() void SdImportTest::testTdf62255() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf62255.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf62255.pptx"), PPTX); const SdrPage *pPage = GetPage( 1, xDocShRef ); sdr::table::SdrTableObj *pTableObj; @@ -1580,7 +1580,7 @@ void SdImportTest::testTdf62255() void SdImportTest::testTdf113163() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf113163.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf113163.pptx"), PPTX); uno::Reference < uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); uno::Reference< drawing::XGraphicExportFilter > xGraphicExporter = drawing::GraphicExportFilter::create(xContext); @@ -1631,7 +1631,7 @@ void SdImportTest::testTdf113163() void SdImportTest::testTdf93124() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/tdf93124.ppt"), PPT); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/ppt/tdf93124.ppt"), PPT); uno::Reference < uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); uno::Reference< drawing::XGraphicExportFilter > xGraphicExporter = drawing::GraphicExportFilter::create(xContext); @@ -1746,7 +1746,7 @@ void SdImportTest::testTdf99729() void SdImportTest::testTdf89927() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf89927.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf89927.pptx"), PPTX); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); uno::Reference< text::XTextRange > xParagraph( getParagraphFromShape( 0, xShape ) ); uno::Reference< text::XTextRange > xRun( getRunFromParagraph( 0, xParagraph ) ); @@ -1761,7 +1761,7 @@ void SdImportTest::testTdf89927() void SdImportTest::testTdf93868() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf93868.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf93868.pptx"), PPTX); const SdrPage *pPage = &(GetPage( 1, xDocShRef )->TRG_GetMasterPage()); CPPUNIT_ASSERT_EQUAL(size_t(5), pPage->GetObjCount()); @@ -1773,7 +1773,7 @@ void SdImportTest::testTdf93868() void SdImportTest::testTdf95932() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf95932.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf95932.pptx"), PPTX); const SdrPage *pPage = GetPage( 1, xDocShRef ); SdrObject *const pObj = pPage->GetObj(2); @@ -1791,7 +1791,7 @@ void SdImportTest::testTdf95932() void SdImportTest::testTdf99030() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf99030.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf99030.pptx"), PPTX); uno::Reference< drawing::XMasterPagesSupplier > xDoc( xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW ); @@ -1814,7 +1814,7 @@ void SdImportTest::testTdf99030() void SdImportTest::testTdf49561() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/tdf49561.ppt"), PPT); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/ppt/tdf49561.ppt"), PPT); uno::Reference< drawing::XMasterPagesSupplier > xDoc( xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW ); @@ -1840,7 +1840,7 @@ void SdImportTest::testTdf49561() void SdImportTest::testTdf103473() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf103473.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf103473.pptx"), PPTX); const SdrPage *pPage = GetPage(1, xDocShRef); SdrTextObj *const pObj = dynamic_cast<SdrTextObj *const>(pPage->GetObj(0)); @@ -1856,7 +1856,7 @@ void SdImportTest::testTdf103473() void SdImportTest::testAoo124143() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odg/ooo124143-1.odg"), ODG); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odg/ooo124143-1.odg"), ODG); uno::Reference<beans::XPropertySet> const xImage(getShapeFromPage(0, 0, xDocShRef)); uno::Reference<drawing::XGluePointsSupplier> const xGPS(xImage, uno::UNO_QUERY); @@ -1900,7 +1900,7 @@ void SdImportTest::testAoo124143() void SdImportTest::testTdf103567() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf103567.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf103567.odp"), ODP); for (int i = 0; i < 4; ++i) { uno::Reference<beans::XPropertySet> const xShape(getShapeFromPage(i, 0, xDocShRef)); @@ -1943,7 +1943,7 @@ void SdImportTest::testTdf103567() void SdImportTest::testTdf103792() { // Title text shape on the actual slide contained no text neither a placeholder text. - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf103792.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf103792.pptx"), PPTX); const SdrPage *pPage = GetPage(1, xDocShRef); CPPUNIT_ASSERT_MESSAGE("No page found", pPage != nullptr); @@ -1961,7 +1961,7 @@ void SdImportTest::testTdf103792() void SdImportTest::testTdf103876() { // Title text shape's placeholder text did not inherit the corresponding text properties - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf103876.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf103876.pptx"), PPTX); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); // Check paragraph alignment @@ -1979,7 +1979,7 @@ void SdImportTest::testTdf103876() void SdImportTest::testTdf79007() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf79007.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf79007.pptx"), PPTX); uno::Reference<beans::XPropertySet> xShape1(getShapeFromPage(0, 0, xDocShRef)); CPPUNIT_ASSERT_MESSAGE("Not a shape", xShape1.is()); @@ -2034,7 +2034,7 @@ void SdImportTest::testTdf79007() void SdImportTest::testTdf129686() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf129686.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf129686.pptx"), PPTX); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 0, 0, xDocShRef ) ); // Get first paragraph of the text @@ -2055,7 +2055,7 @@ void SdImportTest::testTdf129686() void SdImportTest::testTdf104015() { // Shape fill, line and effect properties were not inherited from master slide shape - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf104015.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf104015.pptx"), PPTX); const SdrPage *pPage = GetPage( 1, xDocShRef ); CPPUNIT_ASSERT_MESSAGE("No page found", pPage != nullptr); @@ -2093,7 +2093,7 @@ void SdImportTest::testTdf104015() void SdImportTest::testTdf104201() { // Group shape properties did not overwrite the child shapes' fill - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf104201.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf104201.pptx"), PPTX); const SdrPage *pPage = GetPage(1, xDocShRef); CPPUNIT_ASSERT_MESSAGE("No page found", pPage != nullptr); @@ -2126,7 +2126,7 @@ void SdImportTest::testTdf104201() void SdImportTest::testTdf103477() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf103477.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf103477.pptx"), PPTX); const SdrPage *pPage = GetPage( 1, xDocShRef ); @@ -2143,7 +2143,7 @@ void SdImportTest::testTdf103477() void SdImportTest::testTdf105150() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf105150.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf105150.pptx"), PPTX); const SdrPage* pPage = GetPage(1, xDocShRef); const SdrObject* pObj = pPage->GetObj(1); auto& rFillStyleItem = dynamic_cast<const XFillStyleItem&>(pObj->GetMergedItem(XATTR_FILLSTYLE)); @@ -2156,7 +2156,7 @@ void SdImportTest::testTdf105150() void SdImportTest::testTdf123684() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf123684.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf123684.pptx"), PPTX); const SdrPage* pPage = GetPage(1, xDocShRef); const SdrObject* pObj = pPage->GetObj(0); auto& rFillStyleItem @@ -2169,7 +2169,7 @@ void SdImportTest::testTdf123684() void SdImportTest::testTdf105150PPT() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/ppt/tdf105150.ppt"), PPT); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/ppt/tdf105150.ppt"), PPT); const SdrPage* pPage = GetPage(1, xDocShRef); const SdrObject* pObj = pPage->GetObj(1); // This was drawing::FillStyle_NONE, the shape's mso_fillBackground was @@ -2182,7 +2182,7 @@ void SdImportTest::testTdf105150PPT() void SdImportTest::testTdf104445() { // Extra bullets were added to the first shape - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf104445.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf104445.pptx"), PPTX); // First shape should not have bullet { @@ -2287,7 +2287,7 @@ bool SdImportTest::checkPattern(sd::DrawDocShellRef const & rDocRef, int nShapeN */ void SdImportTest::testPatternImport() { - sd::DrawDocShellRef xDocRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/ppt/FillPatterns.ppt"), PPT); + sd::DrawDocShellRef xDocRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/ppt/FillPatterns.ppt"), PPT); std::vector<sal_uInt8> aExpectedPattern1 = { 1,0,0,0,0,0,0,0, @@ -2564,7 +2564,7 @@ void SdImportTest::testPatternImport() void SdImportTest::testTdf100926() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf100926.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf100926.pptx"), PPTX); const SdrPage* pPage = GetPage(1, xDocShRef); CPPUNIT_ASSERT(pPage != nullptr); @@ -2590,7 +2590,7 @@ void SdImportTest::testTdf100926() void SdImportTest::testTdf89064() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf89064.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf89064.pptx"), PPTX); uno::Reference< presentation::XPresentationPage > xPage (getPage(0, xDocShRef), uno::UNO_QUERY_THROW); uno::Reference< drawing::XDrawPage > xNotesPage (xPage->getNotesPage(), uno::UNO_SET_THROW); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), xNotesPage->getCount()); @@ -2602,7 +2602,7 @@ void SdImportTest::testTdf108925() { // Test document contains bulleting with too small bullet size (1%) which breaks the lower constraint // So it should be converted to the lowest allowed value (25%). - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odp/tdf108925.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odp/tdf108925.odp"), ODP); const SdrPage *pPage = GetPage(1, xDocShRef); SdrTextObj *pTxtObj = dynamic_cast<SdrTextObj *>(pPage->GetObj(0)); CPPUNIT_ASSERT_MESSAGE("No text object", pTxtObj != nullptr); @@ -2617,7 +2617,7 @@ void SdImportTest::testTdf108925() void SdImportTest::testTdf109067() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf109067.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf109067.pptx"), PPTX); uno::Reference< beans::XPropertySet > xShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_SET_THROW); awt::Gradient gradient; CPPUNIT_ASSERT(xShape->getPropertyValue("FillGradient") >>= gradient); @@ -2628,7 +2628,7 @@ void SdImportTest::testTdf109067() void SdImportTest::testTdf109187() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf109187.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf109187.pptx"), PPTX); uno::Reference< beans::XPropertySet > xArrow1(getShapeFromPage(0, 0, xDocShRef), uno::UNO_SET_THROW); awt::Gradient aGradient1; CPPUNIT_ASSERT(xArrow1->getPropertyValue("FillGradient") >>= aGradient1); @@ -2643,7 +2643,7 @@ void SdImportTest::testTdf109187() void SdImportTest::testTdf108926() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf108926.ppt"), PPT); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf108926.ppt"), PPT); uno::Reference< presentation::XPresentationPage > xPage (getPage(0, xDocShRef), uno::UNO_QUERY_THROW); uno::Reference< drawing::XDrawPage > xNotesPage (xPage->getNotesPage(), uno::UNO_SET_THROW); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), xNotesPage->getCount()); @@ -2660,7 +2660,7 @@ void SdImportTest::testTdf108926() void SdImportTest::testTdf100065() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf100065.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf100065.pptx"), PPTX); uno::Reference< container::XIndexAccess > xGroupShape1(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY_THROW); uno::Reference< beans::XPropertySet > xShape1(xGroupShape1->getByIndex(1), uno::UNO_QUERY_THROW); @@ -2679,7 +2679,7 @@ void SdImportTest::testTdf100065() void SdImportTest::testTdf90626() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf90626.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf90626.pptx"), PPTX); const SdrPage *pPage = GetPage(1, xDocShRef); SdrTextObj *pTxtObj = dynamic_cast<SdrTextObj *>(pPage->GetObj(1)); CPPUNIT_ASSERT_MESSAGE("No text object", pTxtObj != nullptr); @@ -2696,7 +2696,7 @@ void SdImportTest::testTdf90626() void SdImportTest::testTdf138148() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf138148.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf138148.pptx"), PPTX); const SdrPage *pPage = GetPage(1, xDocShRef); SdrTextObj *pTxtObj = dynamic_cast<SdrTextObj *>(pPage->GetObj(0)); CPPUNIT_ASSERT_MESSAGE("No text object", pTxtObj != nullptr); @@ -2720,7 +2720,7 @@ void SdImportTest::testTdf114488() { // This doc has two images - one WMF and the other PNG (fallback image). // When loading this doc, the WMF image should be preferred over the PNG image. - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/odg/tdf114488.fodg"), FODG); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/odg/tdf114488.fodg"), FODG); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_SET_THROW); uno::Reference<graphic::XGraphic> xGraphic; xShape->getPropertyValue("Graphic") >>= xGraphic; @@ -2733,7 +2733,7 @@ void SdImportTest::testTdf114488() void SdImportTest::testTdf134174() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf134174.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf134174.pptx"), PPTX); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef), uno::UNO_SET_THROW); CPPUNIT_ASSERT(xShape.is()); @@ -2750,7 +2750,7 @@ void SdImportTest::testTdf134174() void SdImportTest::testTdf114913() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf114913.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf114913.pptx"), PPTX); SdrTextObj *pTxtObj = dynamic_cast<SdrTextObj *>(GetPage(1, xDocShRef)->GetObj(1)); CPPUNIT_ASSERT_MESSAGE("No text object", pTxtObj != nullptr); const SvxNumBulletItem *pItem = pTxtObj->GetOutlinerParaObject()->GetTextObject().GetParaAttribs(0).GetItem(EE_PARA_NUMBULLET); @@ -2763,7 +2763,7 @@ void SdImportTest::testTdf114913() void SdImportTest::testTdf114821() { css::uno::Any aAny; - sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc( "/sd/qa/unit/data/pptx/tdf114821.pptx" ), PPTX ); + sd::DrawDocShellRef xDocShRef = loadURL( m_directories.getURLFromSrc( u"/sd/qa/unit/data/pptx/tdf114821.pptx" ), PPTX ); uno::Reference< beans::XPropertySet > xPropSet( getShapeFromPage( 0, 0, xDocShRef ) ); aAny = xPropSet->getPropertyValue( "Model" ); @@ -2809,7 +2809,7 @@ void SdImportTest::testTdf114821() void SdImportTest::testTdf115394() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf115394.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf115394.pptx"), PPTX); double fTransitionDuration; // Slow in MS formats @@ -2841,7 +2841,7 @@ void SdImportTest::testTdf115394() void SdImportTest::testTdf115394PPT() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/tdf115394.ppt"), PPT); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/ppt/tdf115394.ppt"), PPT); double fTransitionDuration; // Fast @@ -2865,7 +2865,7 @@ void SdImportTest::testTdf115394PPT() void SdImportTest::testTdf51340() { // Line spacing was not inherited from upper levels (slide layout, master slide) - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf51340.pptx"), PPTX); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf51340.pptx"), PPTX); uno::Reference< beans::XPropertySet > xShape( getShapeFromPage( 1, 0, xDocShRef ) ); // First paragraph has a 90% line spacing set on master slide @@ -2904,7 +2904,7 @@ void SdImportTest::testTdf116899() { // This is a PPT created in Impress and roundtripped in PP, the key times become [1, -1] in PP, // a time of -1 (-1000) in PPT means key times have to be distributed evenly between 0 and 1 - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/tdf116899.ppt"), PPT); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/ppt/tdf116899.ppt"), PPT); uno::Reference< drawing::XDrawPagesSupplier > xDoc( xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW ); @@ -2927,7 +2927,7 @@ void SdImportTest::testTdf116899() void SdImportTest::testTdf77747() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/tdf77747.ppt"), PPT); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/ppt/tdf77747.ppt"), PPT); CPPUNIT_ASSERT(xDocShRef.is()); SdrTextObj *pTxtObj = dynamic_cast<SdrTextObj *>(GetPage(1, xDocShRef)->GetObj(0)); CPPUNIT_ASSERT_MESSAGE("No text object", pTxtObj != nullptr); @@ -2942,7 +2942,7 @@ void SdImportTest::testTdf77747() void SdImportTest::testTdf116266() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf116266.odp"), ODP); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf116266.odp"), ODP); SdDrawDocument *pDoc = xDocShRef->GetDoc(); sfx2::LinkManager* rLinkManager = pDoc->GetLinkManager(); // The document contains one SVG stored as a link. @@ -2955,7 +2955,7 @@ void SdImportTest::testTdf120028() { // Check that the table shape has 4 columns. ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf120028.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf120028.pptx"), PPTX); uno::Reference<drawing::XDrawPagesSupplier> xDoc(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY); CPPUNIT_ASSERT(xDoc.is()); @@ -2991,7 +2991,7 @@ void SdImportTest::testTdf120028b() { // Check that the table shape has 4 columns. ::sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf120028b.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf120028b.pptx"), PPTX); uno::Reference<drawing::XDrawPagesSupplier> xDoc(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY); CPPUNIT_ASSERT(xDoc.is()); @@ -3027,7 +3027,7 @@ void SdImportTest::testTdf120028b() void SdImportTest::testDescriptionImport() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/altdescription.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/altdescription.pptx"), PPTX); uno::Reference<beans::XPropertySet> xPropertySet( getShapeFromPage(/*nShape=*/2, /*nPage=*/0, xDocShRef)); @@ -3068,7 +3068,7 @@ void SdImportTest::testTdf83247() void SdImportTest::testTdf47365() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/loopNoPause.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/loopNoPause.pptx"), PPTX); uno::Reference<presentation::XPresentationSupplier> xPresentationSupplier( xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW); uno::Reference<beans::XPropertySet> xPresentationProps(xPresentationSupplier->getPresentation(), @@ -3090,7 +3090,7 @@ void SdImportTest::testTdf122899() // Error was, that the path coordinates of a mso_sptArc shape were read as sal_Int16 // although they are unsigned 16 bit. This leads to wrong positions of start and end // point and results to a huge shape width in the test document. - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/ppt/tdf122899_Arc_90_to_91_clockwise.ppt"), PPT); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/ppt/tdf122899_Arc_90_to_91_clockwise.ppt"), PPT); uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier( xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("Could not get XDrawPagesSupplier", xDrawPagesSupplier.is()); @@ -3112,7 +3112,7 @@ void SdImportTest::testTdf122899() void SdImportTest::testOOXTheme() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/ooxtheme.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/ooxtheme.pptx"), PPTX); uno::Reference<beans::XPropertySet> xPropSet(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW); uno::Sequence<beans::PropertyValue> aGrabBag; @@ -3137,7 +3137,7 @@ void SdImportTest::testOOXTheme() void SdImportTest::testCropToShape() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/crop-to-shape.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/crop-to-shape.pptx"), PPTX); uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier( xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("Could not get XDrawPagesSupplier", xDrawPagesSupplier.is()); @@ -3159,7 +3159,7 @@ void SdImportTest::testCropToShape() void SdImportTest::testTdf127964() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf127964.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf127964.pptx"), PPTX); const SdrPage* pPage = GetPage(1, xDocShRef); const SdrObject* pObj = pPage->GetObj(0); auto& rFillStyleItem @@ -3180,7 +3180,7 @@ void SdImportTest::testTdf127964() void SdImportTest::testTdf106638() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf106638.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf106638.pptx"), PPTX); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); uno::Reference<text::XTextRange> const xPara(getParagraphFromShape(1, xShape)); uno::Reference<text::XText> xText= xPara->getText(); @@ -3201,7 +3201,7 @@ void SdImportTest::testTdf106638() void SdImportTest::testTdf128684() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf128684.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf128684.pptx"), PPTX); uno::Reference<drawing::XDrawPagesSupplier> xDoc(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY); CPPUNIT_ASSERT(xDoc.is()); @@ -3227,7 +3227,7 @@ void SdImportTest::testTdf128684() void SdImportTest::testTdf113198() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf113198.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf113198.pptx"), PPTX); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); sal_Int16 nParaAdjust = -1; @@ -3238,7 +3238,7 @@ void SdImportTest::testTdf113198() void SdImportTest::testTdf49856() { - sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/ppt/tdf49856.ppt"), PPT); + sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/ppt/tdf49856.ppt"), PPT); const SdrPage *pPage = GetPage(1, xDocShRef); SdrTextObj *pTxtObj = dynamic_cast<SdrTextObj *>(pPage->GetObj(1)); CPPUNIT_ASSERT_MESSAGE("No text object", pTxtObj != nullptr); @@ -3255,7 +3255,8 @@ void SdImportTest::testTdf49856() void SdImportTest::testShapeGlowEffectPPTXImpoer() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/shape-glow-effect.pptx"), PPTX); + = loadURL( + m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/shape-glow-effect.pptx"), PPTX); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); sal_Int32 nRadius = -1; @@ -3272,7 +3273,7 @@ void SdImportTest::testShapeGlowEffectPPTXImpoer() void SdImportTest::testShapeBlurPPTXImport() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/shape-blur-effect.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/shape-blur-effect.pptx"), PPTX); uno::Reference<beans::XPropertySet> xShape(getShapeFromPage(0, 0, xDocShRef)); bool bHasShadow = false; diff --git a/sd/qa/unit/layout-tests.cxx b/sd/qa/unit/layout-tests.cxx index 5fe1a5a4b6de..7498f24227ac 100644 --- a/sd/qa/unit/layout-tests.cxx +++ b/sd/qa/unit/layout-tests.cxx @@ -27,7 +27,7 @@ public: void SdLayoutTest::testTdf104722() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf104722.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tdf104722.pptx"), PPTX); std::shared_ptr<GDIMetaFile> xMetaFile = xDocShRef->GetPreviewMetaFile(); MetafileXmlDump dumper; @@ -48,7 +48,7 @@ void SdLayoutTest::testTdf104722() void SdLayoutTest::testTdf136949() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf136949.odp"), ODP); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf136949.odp"), ODP); std::shared_ptr<GDIMetaFile> xMetaFile = xDocShRef->GetPreviewMetaFile(); MetafileXmlDump dumper; @@ -68,7 +68,7 @@ void SdLayoutTest::testTdf136949() void SdLayoutTest::testTdf128212() { sd::DrawDocShellRef xDocShRef - = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf128212.pptx"), PPTX); + = loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf128212.pptx"), PPTX); std::shared_ptr<GDIMetaFile> xMetaFile = xDocShRef->GetPreviewMetaFile(); MetafileXmlDump dumper; diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx index 52c3b55513be..078c9b19a19b 100644 --- a/sd/qa/unit/misc-tests.cxx +++ b/sd/qa/unit/misc-tests.cxx @@ -200,7 +200,7 @@ void SdMiscTest::testTdf96206() { // Copying/pasting slide referring to a non-default master with a text duplicated the master - sd::DrawDocShellRef xDocSh = Load(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf96206.odp"), ODP); + sd::DrawDocShellRef xDocSh = Load(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf96206.odp"), ODP); sd::ViewShell *pViewShell = xDocSh->GetViewShell(); auto pSSVS = sd::slidesorter::SlideSorterViewShell::GetSlideSorter(pViewShell->GetViewShellBase()); auto& rSSController = pSSVS->GetSlideSorter().GetController(); @@ -217,7 +217,7 @@ void SdMiscTest::testTdf96206() void SdMiscTest::testTdf96708() { - sd::DrawDocShellRef xDocSh = Load(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf96708.odp"), ODP); + sd::DrawDocShellRef xDocSh = Load(m_directories.getURLFromSrc(u"/sd/qa/unit/data/odp/tdf96708.odp"), ODP); sd::ViewShell *pViewShell = xDocSh->GetViewShell(); auto pSSVS = sd::slidesorter::SlideSorterViewShell::GetSlideSorter(pViewShell->GetViewShellBase()); auto& rSSController = pSSVS->GetSlideSorter().GetController(); @@ -242,7 +242,7 @@ void SdMiscTest::testTdf96708() void SdMiscTest::testTdf99396() { // Load the document and select the table. - sd::DrawDocShellRef xDocSh = Load(m_directories.getURLFromSrc("/sd/qa/unit/data/tdf99396.odp"), ODP); + sd::DrawDocShellRef xDocSh = Load(m_directories.getURLFromSrc(u"/sd/qa/unit/data/tdf99396.odp"), ODP); sd::ViewShell *pViewShell = xDocSh->GetViewShell(); SdPage* pPage = pViewShell->GetActualPage(); SdrObject* pObject = pPage->GetObj(0); @@ -266,7 +266,7 @@ void SdMiscTest::testTdf99396() void SdMiscTest::testTdf99396TextEdit() { // Load the document and select the table. - sd::DrawDocShellRef xDocSh = Load(m_directories.getURLFromSrc("/sd/qa/unit/data/tdf99396.odp"), ODP); + sd::DrawDocShellRef xDocSh = Load(m_directories.getURLFromSrc(u"/sd/qa/unit/data/tdf99396.odp"), ODP); sd::ViewShell* pViewShell = xDocSh->GetViewShell(); SdPage* pPage = pViewShell->GetActualPage(); auto pTableObject = dynamic_cast<sdr::table::SdrTableObj*>(pPage->GetObj(0)); @@ -458,7 +458,7 @@ void SdMiscTest::testTdf120527() uno::Reference<container::XNameContainer> xBitmaps( xFactory->createInstance("com.sun.star.drawing.BitmapTable"), uno::UNO_QUERY); CPPUNIT_ASSERT(xBitmaps.is()); - OUString aGraphicURL = m_directories.getURLFromSrc("/sd/qa/unit/data/tdf120527.jpg"); + OUString aGraphicURL = m_directories.getURLFromSrc(u"/sd/qa/unit/data/tdf120527.jpg"); xBitmaps->insertByName("test", uno::makeAny(aGraphicURL)); // Create a graphic. @@ -505,7 +505,7 @@ void SdMiscTest::testTdf101242_ODF_add_settings() // only in the ODF attributes draw:display and draw:protected. The resaved document // should still have the ODF attributes and in addition the config items in settings.xml. // "Load" is needed for to handle layers, simple "loadURL" does not work. - sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc("/sd/qa/unit/data/tdf101242_ODF.odg"), ODG); + sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc(u"/sd/qa/unit/data/tdf101242_ODF.odg"), ODG); CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocShRef.is()); // Saving including items in settings.xml @@ -555,7 +555,7 @@ void SdMiscTest::testTdf101242_ODF_no_settings() // Loads a document, which has the visible/printable/locked information for layers // only in the ODF attributes draw:display and draw:protected. The resave document // should have only the ODF attributes and no config items in settings.xml. - sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc("/sd/qa/unit/data/tdf101242_ODF.odg"), ODG); + sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc(u"/sd/qa/unit/data/tdf101242_ODF.odg"), ODG); CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocShRef.is()); // Saving without items in settings.xml @@ -597,7 +597,7 @@ void SdMiscTest::testTdf101242_settings_keep() // only in the config items in settings.xml. That is the case for all old documents. // The resaved document should have the ODF attributes draw:display and draw:protected // and should still have these config items in settings.xml. - sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc("/sd/qa/unit/data/tdf101242_settings.odg"), ODG); + sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc(u"/sd/qa/unit/data/tdf101242_settings.odg"), ODG); CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocShRef.is()); // Saving including items in settings.xml @@ -648,7 +648,7 @@ void SdMiscTest::testTdf101242_settings_remove() // only in the config items in settings.xml. That is the case for all old documents. // The resaved document should have only the ODF attributes draw:display and draw:protected // and should have no config items in settings.xml. - sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc("/sd/qa/unit/data/tdf101242_settings.odg"), ODG); + sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc(u"/sd/qa/unit/data/tdf101242_settings.odg"), ODG); CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocShRef.is()); // Saving without config items in settings.xml @@ -693,7 +693,7 @@ void SdMiscTest::testTdf119392() officecfg::Office::Common::Misc::WriteLayerStateAsConfigItem::set(true, batch); batch->commit(); - sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc("sd/qa/unit/data/tdf119392_InsertLayer.odg"), ODG); + sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc(u"sd/qa/unit/data/tdf119392_InsertLayer.odg"), ODG); CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocShRef.is()); // Insert layer "-P-", not visible, printable, not locked SdrView* pView = xDocShRef -> GetViewShell()->GetView(); @@ -738,7 +738,7 @@ void SdMiscTest::testTdf67248() // The document tdf67248.odg has been created with a German UI. It has a user layer named "Background". // On opening the user layer must still exists. The error was, that it was merged into the standard // layer "background". - sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc("sd/qa/unit/data/tdf67248.odg"), ODG); + sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc(u"sd/qa/unit/data/tdf67248.odg"), ODG); CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocShRef.is()); SdrLayerAdmin& rLayerAdmin = xDocShRef->GetDoc()->GetLayerAdmin(); CPPUNIT_ASSERT_EQUAL( sal_uInt16(6), rLayerAdmin.GetLayerCount()); @@ -748,7 +748,7 @@ void SdMiscTest::testTdf67248() void SdMiscTest::testTdf119956() { - sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc("sd/qa/unit/data/tdf119956.odg"), ODG); + sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc(u"sd/qa/unit/data/tdf119956.odg"), ODG); CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocShRef.is()); sd::GraphicViewShell* pGraphicViewShell = static_cast<sd::GraphicViewShell*>(xDocShRef -> GetViewShell()); CPPUNIT_ASSERT(pGraphicViewShell); @@ -787,7 +787,7 @@ void SdMiscTest::testTdf119956() void SdMiscTest::testTdf98839_ShearVFlipH() { // Loads a document with a sheared shape and mirrors it - sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc("sd/qa/unit/data/tdf98839_ShearVFlipH.odg"), ODG); + sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc(u"sd/qa/unit/data/tdf98839_ShearVFlipH.odg"), ODG); sd::GraphicViewShell* pViewShell = static_cast<sd::GraphicViewShell*>(xDocShRef->GetViewShell()); SdPage* pPage = pViewShell->GetActualPage(); SdrObjCustomShape* pShape = static_cast<SdrObjCustomShape*>(pPage->GetObj(0)); @@ -811,7 +811,7 @@ void SdMiscTest::testTdf98839_ShearVFlipH() void SdMiscTest::testTdf130988() { - sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc("sd/qa/unit/data/tdf130988_3D_create_lathe.odg"), ODG); + sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc(u"sd/qa/unit/data/tdf130988_3D_create_lathe.odg"), ODG); //emulate command .uno:ConvertInto3DLathe sd::ViewShell* pViewShell = xDocShRef->GetViewShell(); @@ -832,7 +832,7 @@ void SdMiscTest::testTdf130988() void SdMiscTest::testTdf131033() { - sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc("sd/qa/unit/data/tdf131033_3D_SceneSizeIn2d.odg"), ODG); + sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc(u"sd/qa/unit/data/tdf131033_3D_SceneSizeIn2d.odg"), ODG); // The document contains a polygon, so that emulate command .uno:ConvertInto3DLathe // by direct call of ConvertMarkedObjTo3D works. @@ -857,7 +857,7 @@ void SdMiscTest::testTdf129898LayerDrawnInSlideshow() { // Versions LO 6.2 to 6.4 have produced files, where the layer DrawnInSlideshow has // got visible=false and printable=false attributes. Those files should be repaired now. - sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc("sd/qa/unit/data/tdf129898_faulty_DrawnInSlideshow.odp"), ODP); + sd::DrawDocShellRef xDocShRef = Load(m_directories.getURLFromSrc(u"sd/qa/unit/data/tdf129898_faulty_DrawnInSlideshow.odp"), ODP); CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocShRef.is()); // Verify model diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx index f2dd51b58b20..4b715d029bbd 100644 --- a/sd/qa/unit/sdmodeltestbase.hxx +++ b/sd/qa/unit/sdmodeltestbase.hxx @@ -341,7 +341,7 @@ protected: OUStringToOString(aString, RTL_TEXTENCODING_UTF8).getStr(), static_cast<int>(aString.getLength()), OUStringToOString( - m_directories.getPathFromSrc("/sd/qa/unit/data/tolerance.xml"), + m_directories.getPathFromSrc(u"/sd/qa/unit/data/tolerance.xml"), RTL_TEXTENCODING_UTF8).getStr()); } } diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx index 2b4dc6c10c51..56165d350009 100644 --- a/sd/qa/unit/uiimpress.cxx +++ b/sd/qa/unit/uiimpress.cxx @@ -85,7 +85,7 @@ void SdUiImpressTest::checkCurrentPageNumber(sal_uInt16 nNum) CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf111522) { // Load the document and create two new windows. - mxComponent = loadFromDesktop(m_directories.getURLFromSrc("sd/qa/unit/data/tdf111522.odp")); + mxComponent = loadFromDesktop(m_directories.getURLFromSrc(u"sd/qa/unit/data/tdf111522.odp")); auto pImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get()); sd::ViewShell* pViewShell = pImpressDocument->GetDocShell()->GetViewShell(); pViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_NEWWINDOW, SfxCallMode::SYNCHRON); @@ -148,7 +148,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf111522) CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf126197) { // Load the document and create two new windows. - mxComponent = loadFromDesktop(m_directories.getURLFromSrc("sd/qa/unit/data/tdf126197.odp")); + mxComponent = loadFromDesktop(m_directories.getURLFromSrc(u"sd/qa/unit/data/tdf126197.odp")); auto pImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get()); sd::ViewShell* pViewShell = pImpressDocument->GetDocShell()->GetViewShell(); pViewShell->GetViewFrame()->GetDispatcher()->Execute(SID_NEWWINDOW, SfxCallMode::SYNCHRON); @@ -183,7 +183,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf128651) // extrusion on/off, shadow on/off, changes on line or fill attributes. // All these actions do not change the snap rectangle. mxComponent = loadFromDesktop( - m_directories.getURLFromSrc("sd/qa/unit/data/tdf128651_CustomShapeUndo.odp")); + m_directories.getURLFromSrc(u"sd/qa/unit/data/tdf128651_CustomShapeUndo.odp")); auto pXImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get()); sd::ViewShell* pViewShell = pXImpressDocument->GetDocShell()->GetViewShell(); SdPage* pActualPage = pViewShell->GetActualPage(); @@ -292,7 +292,7 @@ void dispatchCommand(const uno::Reference<lang::XComponent>& xComponent, const O CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testPageFillColor) { // Load the document and create two new windows. - mxComponent = loadFromDesktop(m_directories.getURLFromSrc("sd/qa/unit/data/tdf126197.odp")); + mxComponent = loadFromDesktop(m_directories.getURLFromSrc(u"sd/qa/unit/data/tdf126197.odp")); auto pImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get()); sd::ViewShell* pViewShell = pImpressDocument->GetDocShell()->GetViewShell(); @@ -318,7 +318,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testPageFillColor) CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testPageFillGradient) { // Load the document and create two new windows. - mxComponent = loadFromDesktop(m_directories.getURLFromSrc("sd/qa/unit/data/tdf126197.odp")); + mxComponent = loadFromDesktop(m_directories.getURLFromSrc(u"sd/qa/unit/data/tdf126197.odp")); auto pImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get()); sd::ViewShell* pViewShell = pImpressDocument->GetDocShell()->GetViewShell(); @@ -350,7 +350,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf134053) { // Error was, that dashes and dots were longer than in MS Office. mxComponent = loadFromDesktop( - m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf134053_dashdot.pptx")); + m_directories.getURLFromSrc(u"sd/qa/unit/data/pptx/tdf134053_dashdot.pptx")); auto pXImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get()); sd::ViewShell* pViewShell = pXImpressDocument->GetDocShell()->GetViewShell(); SdPage* pActualPage = pViewShell->GetActualPage(); @@ -392,7 +392,7 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf134053) CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testSpellOnlineParameter) { - mxComponent = loadFromDesktop(m_directories.getURLFromSrc("sd/qa/unit/data/empty.fodp")); + mxComponent = loadFromDesktop(m_directories.getURLFromSrc(u"sd/qa/unit/data/empty.fodp")); auto pImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get()); bool bSet = pImpressDocument->GetDoc()->GetOnlineSpell(); diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 566909a4240a..1603e9b8d9e8 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -264,9 +264,9 @@ void SdDrawDocument::UpdatePageObjectsInNotes(sal_uInt16 nStartPos) } } -void SdDrawDocument::UpdatePageRelativeURLs(const OUString& rOldName, const OUString& rNewName) +void SdDrawDocument::UpdatePageRelativeURLs(const OUString& rOldName, std::u16string_view rNewName) { - if (rNewName.isEmpty()) + if (rNewName.empty()) return; SfxItemPool& rPool(GetPool()); diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index a09abf0ecf57..e48117625dfe 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -1367,7 +1367,7 @@ static OUString createNewMasterPageLayoutName(const SdDrawDocument& rDoc) } void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, - const OUString& rLayoutName, + std::u16string_view rLayoutName, SdDrawDocument* pSourceDoc, bool bMaster, bool bCheckMasters) @@ -1408,7 +1408,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, bool bLayoutReloaded = false; // Was ex. layout reloaded? // LayoutName, Page and Notes page - if (rLayoutName.isEmpty()) + if (rLayoutName.empty()) { // No LayoutName: take first MasterPage pMaster = pSourceDoc->GetMasterSdPage(0, PageKind::Standard); @@ -1416,7 +1416,8 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum, } else { - OUString aSearchFor = rLayoutName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE; + OUString aSearchFor + = OUString::Concat(rLayoutName) + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE; for (sal_uInt16 nMP = 0; nMP < pSourceDoc->GetMasterPageCount(); ++nMP) { diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 142b40a6bb25..6680bdde7fc6 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -72,7 +72,7 @@ using namespace ::com::sun::star::office; |* \************************************************************************/ -void SdPage::SetPresentationLayout(const OUString& rLayoutName, +void SdPage::SetPresentationLayout(std::u16string_view rLayoutName, bool bReplaceStyleSheets, bool bSetMasterPage, bool bReverseOrder) @@ -81,7 +81,7 @@ void SdPage::SetPresentationLayout(const OUString& rLayoutName, |* Name of the layout of the page \********************************************************************/ OUString aOldLayoutName(maLayoutName); // memorize - maLayoutName = rLayoutName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE; + maLayoutName = OUString::Concat(rLayoutName) + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE; /********************************************************************* |* search and replace master page if necessary diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index eab931cf0971..f1ff79ac566d 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -134,9 +134,9 @@ SfxStyleSheetBase* SdStyleSheetPool::Create(const OUString& rName, SfxStyleFamil return new SdStyleSheet(rName, *this, eFamily, _nMask); } -SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const OUString& rLayoutName) +SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(std::u16string_view rLayoutName) { - OUString aName = rLayoutName + SD_LT_SEPARATOR STR_LAYOUT_TITLE; + OUString aName = OUString::Concat(rLayoutName) + SD_LT_SEPARATOR STR_LAYOUT_TITLE; SfxStyleSheetBase* pResult = Find(aName, SfxStyleFamily::Page); return pResult; } @@ -148,9 +148,9 @@ SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const OUString& rLayoutName) |* \************************************************************************/ -void SdStyleSheetPool::CreateOutlineSheetList (const OUString& rLayoutName, std::vector<SfxStyleSheetBase*> &rOutlineStyles) +void SdStyleSheetPool::CreateOutlineSheetList (std::u16string_view rLayoutName, std::vector<SfxStyleSheetBase*> &rOutlineStyles) { - OUString aName = rLayoutName + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE; + OUString aName = OUString::Concat(rLayoutName) + SD_LT_SEPARATOR STR_LAYOUT_OUTLINE; for (sal_Int32 nSheet = 1; nSheet < 10; nSheet++) { @@ -168,7 +168,7 @@ void SdStyleSheetPool::CreateOutlineSheetList (const OUString& rLayoutName, std: |* \************************************************************************/ -void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool bCheck /*= sal_False*/ ) +void SdStyleSheetPool::CreateLayoutStyleSheets(std::u16string_view rLayoutName, bool bCheck /*= sal_False*/ ) { const SfxStyleSearchBits nUsedMask = SfxStyleSearchBits::All & ~SfxStyleSearchBits::UserDefined; @@ -176,7 +176,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool SfxStyleSheetBase* pSheet = nullptr; - OUString aPrefix(rLayoutName + SD_LT_SEPARATOR); + OUString aPrefix(OUString::Concat(rLayoutName) + SD_LT_SEPARATOR); vcl::Font aLatinFont, aCJKFont, aCTLFont; @@ -578,7 +578,7 @@ void SdStyleSheetPool::CopyCellSheets(SdStyleSheetPool& rSourcePool, StyleSheetC CopySheets( rSourcePool, SfxStyleFamily::Frame, rCreatedSheets ); } -void SdStyleSheetPool::RenameAndCopyGraphicSheets(SdStyleSheetPool& rSourcePool, StyleSheetCopyResultVector& rCreatedSheets, OUString const &rRenameSuffix) +void SdStyleSheetPool::RenameAndCopyGraphicSheets(SdStyleSheetPool& rSourcePool, StyleSheetCopyResultVector& rCreatedSheets, std::u16string_view rRenameSuffix) { CopySheets( rSourcePool, SfxStyleFamily::Para, rCreatedSheets, rRenameSuffix ); } @@ -591,7 +591,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, StyleSheetCopyResultVector& rCreatedSheets) { - CopySheets(rSourcePool, eFamily, rCreatedSheets, ""); + CopySheets(rSourcePool, eFamily, rCreatedSheets, u""); } namespace @@ -611,7 +611,7 @@ struct HasFamilyPredicate : svl::StyleSheetPredicate } -void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, StyleSheetCopyResultVector& rCreatedSheets, const OUString& rRenameSuffix) +void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, StyleSheetCopyResultVector& rCreatedSheets, std::u16string_view rRenameSuffix) { std::vector< std::pair< rtl::Reference< SfxStyleSheetBase >, OUString > > aNewStyles; std::vector< std::pair< OUString, OUString > > aRenamedList; @@ -636,7 +636,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily // if we have a rename suffix, try to find a new name pExistingSheet = GetStyleSheetByPositionInIndex(aSheetsWithName.front()); - if (!rRenameSuffix.isEmpty() && + if (!rRenameSuffix.empty() && !pExistingSheet->GetItemSet().Equals(pSheet->GetItemSet(), false)) { // we have found a sheet with the same name, but different contents. Try to find a new name. @@ -689,7 +689,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily // set parents on newly added stylesheets for( auto& rStyle : aNewStyles ) { - if( !rRenameSuffix.isEmpty() ) + if( !rRenameSuffix.empty() ) { SfxStyleSheet *pParent = lcl_findStyle(rCreatedSheets, lcl_findRenamedStyleName(aRenamedList, rStyle.second)); if( pParent ) @@ -716,7 +716,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily |* \************************************************************************/ -void SdStyleSheetPool::CopyLayoutSheets(const OUString& rLayoutName, SdStyleSheetPool& rSourcePool, StyleSheetCopyResultVector& rCreatedSheets) +void SdStyleSheetPool::CopyLayoutSheets(std::u16string_view rLayoutName, SdStyleSheetPool& rSourcePool, StyleSheetCopyResultVector& rCreatedSheets) { SfxStyleSheetBase* pSheet = nullptr; @@ -776,9 +776,9 @@ void SdStyleSheetPool::CopyLayoutSheets(const OUString& rLayoutName, SdStyleShee |* \************************************************************************/ -void SdStyleSheetPool::CreateLayoutSheetNames(const OUString& rLayoutName, std::vector<OUString> &aNameList) +void SdStyleSheetPool::CreateLayoutSheetNames(std::u16string_view rLayoutName, std::vector<OUString> &aNameList) { - OUString aPrefix(rLayoutName + SD_LT_SEPARATOR); + OUString aPrefix(OUString::Concat(rLayoutName) + SD_LT_SEPARATOR); for (sal_Int32 nLevel = 1; nLevel < 10; nLevel++) aNameList.emplace_back(aPrefix + STR_LAYOUT_OUTLINE " " + OUString::number( nLevel ) ); @@ -797,9 +797,9 @@ void SdStyleSheetPool::CreateLayoutSheetNames(const OUString& rLayoutName, std:: |* \************************************************************************/ -void SdStyleSheetPool::CreateLayoutSheetList(const OUString& rLayoutName, SdStyleSheetVector& rLayoutSheets ) +void SdStyleSheetPool::CreateLayoutSheetList(std::u16string_view rLayoutName, SdStyleSheetVector& rLayoutSheets ) { - OUString aLayoutNameWithSep(rLayoutName + SD_LT_SEPARATOR); + OUString aLayoutNameWithSep(OUString::Concat(rLayoutName) + SD_LT_SEPARATOR); SfxStyleSheetIterator aIter(this, SfxStyleFamily::Page); SfxStyleSheetBase* pSheet = aIter.First(); diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index c734bf10f0f5..ce4e103edc91 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -454,7 +454,7 @@ bool PowerPointExport::exportDocument() ::oox::ole::VbaProject* PowerPointExport::implCreateVbaProject() const { - return new ::oox::ole::VbaProject(getComponentContext(), getModel(), "Impress"); + return new ::oox::ole::VbaProject(getComponentContext(), getModel(), u"Impress"); } void PowerPointExport::ImplWriteBackground(const FSHelperPtr& pFS, const Reference< XPropertySet >& rXPropSet) diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 85a37b6b7d1d..88f2cd68220c 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -2752,7 +2752,7 @@ OUString HtmlExport::ColorToHTMLString( Color aColor ) OUString HtmlExport::CreateHTMLCircleArea( sal_uLong nRadius, sal_uLong nCenterX, sal_uLong nCenterY, - const OUString& rHRef ) + std::u16string_view rHRef ) { OUString aStr( "<area shape=\"circle\" alt=\"\" coords=\"" + @@ -2801,7 +2801,7 @@ OUString HtmlExport::CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPo // create area for a rectangle; we expect pixel coordinates OUString HtmlExport::CreateHTMLRectArea( const ::tools::Rectangle& rRect, - const OUString& rHRef ) + std::u16string_view rHRef ) { OUString aStr( "<area shape=\"rect\" alt=\"\" coords=\"" + @@ -2836,7 +2836,7 @@ OUString HtmlExport::CreatePageURL( sal_uInt16 nPgNum ) return maHTMLFiles[nPgNum]; } -bool HtmlExport::CopyScript( const OUString& rPath, const OUString& rSource, const OUString& rDest, bool bUnix /* = false */ ) +bool HtmlExport::CopyScript( std::u16string_view rPath, const OUString& rSource, const OUString& rDest, bool bUnix /* = false */ ) { INetURLObject aURL( SvtPathOptions().GetConfigPath() ); OUStringBuffer aScriptBuf; @@ -3026,7 +3026,7 @@ bool HtmlExport::CopyFile( const OUString& rSourceFile, const OUString& rDestFil } } -bool HtmlExport::checkFileExists( Reference< css::ucb::XSimpleFileAccess3 > const & xFileAccess, OUString const & aFileName ) +bool HtmlExport::checkFileExists( Reference< css::ucb::XSimpleFileAccess3 > const & xFileAccess, std::u16string_view aFileName ) { try { diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 2c07ab2358b8..4a7602e93863 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -163,7 +163,7 @@ class HtmlExport final bool CreateImageNumberFile(); bool checkForExistingFiles(); - bool checkFileExists( css::uno::Reference< css::ucb::XSimpleFileAccess3 > const & xFileAccess, OUString const & aFileName ); + bool checkFileExists( css::uno::Reference< css::ucb::XSimpleFileAccess3 > const & xFileAccess, std::u16string_view aFileName ); OUString const & getDocumentTitle(); bool SavePresentation(); @@ -182,16 +182,16 @@ class HtmlExport final OUString CreateTextForNotesPage( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor ); static OUString CreateHTMLCircleArea( sal_uLong nRadius, sal_uLong nCenterX, - sal_uLong nCenterY, const OUString& rHRef ); + sal_uLong nCenterY, std::u16string_view rHRef ); static OUString CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPoly, Size aShift, double fFactor, const OUString& rHRef ); static OUString CreateHTMLRectArea( const ::tools::Rectangle& rRect, - const OUString& rHRef ); + std::u16string_view rHRef ); OUString CreatePageURL( sal_uInt16 nPgNum ); OUString InsertSound( const OUString& rSoundFile ); bool CopyFile( const OUString& rSourceFile, const OUString& rDestFile ); - bool CopyScript( const OUString& rPath, const OUString& rSource, const OUString& rDest, bool bUnix = false ); + bool CopyScript( std::u16string_view rPath, const OUString& rSource, const OUString& rDest, bool bUnix = false ); void InitProgress( sal_uInt16 nProgrCount ); void ResetProgress(); diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 6a9f2fd29aaf..2d283e3ae41b 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -152,7 +152,7 @@ SdPublishingDesign::SdPublishingDesign() , m_bUseAttribs(true) , m_bUseColor(true) { - FilterConfigItem aFilterConfigItem("Office.Common/Filter/Graphic/Export/JPG"); + FilterConfigItem aFilterConfigItem(u"Office.Common/Filter/Graphic/Export/JPG"); sal_Int32 nCompression = aFilterConfigItem.ReadInt32( KEY_QUALITY, 75 ); m_aCompression = OUString::number(nCompression) + "%"; diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index dfe5bc3f46d3..5b343b64288a 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -316,12 +316,12 @@ void DrawDocShell::GetState(SfxItemSet &rSet) if(bImpress) { bVisible = sfx2::SfxNotebookBar::StateMethod(mpViewShell->GetFrame()->GetBindings(), - "modules/simpress/ui/"); + u"modules/simpress/ui/"); } else { bVisible = sfx2::SfxNotebookBar::StateMethod(mpViewShell->GetFrame()->GetBindings(), - "modules/sdraw/ui/"); + u"modules/sdraw/ui/"); } rSet.Put( SfxBoolItem( SID_NOTEBOOKBAR, bVisible ) ); } diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index 08fab9f247d3..c3a848712f51 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -390,7 +390,7 @@ SdPage* DocumentHelper::AddMasterPage ( */ void DocumentHelper::AssignMasterPageToPage ( SdPage const * pMasterPage, - const OUString& rsBaseLayoutName, + std::u16string_view rsBaseLayoutName, SdPage* pPage) { // Leave early when the parameters are invalid. diff --git a/sd/source/ui/sidebar/DocumentHelper.hxx b/sd/source/ui/sidebar/DocumentHelper.hxx index 5f34f66718b2..b1488795a403 100644 --- a/sd/source/ui/sidebar/DocumentHelper.hxx +++ b/sd/source/ui/sidebar/DocumentHelper.hxx @@ -22,6 +22,7 @@ #include <rtl/ustring.hxx> #include <memory> +#include <string_view> #include <vector> class SdDrawDocument; @@ -97,7 +98,7 @@ private: */ static void AssignMasterPageToPage ( SdPage const * pMasterPage, - const OUString& rsBaseLayoutName, + std::u16string_view rsBaseLayoutName, SdPage* pPage); }; diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index fb66f4fabc59..4856e4e1dea3 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -117,7 +117,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::PropertyValue >& lDes nBase = 1; else if ( aTypeName == "pcd_Photo_CD_Base16" ) nBase = 0; - FilterConfigItem aFilterConfigItem( "Office.Common/Filter/Graphic/Import/PCD" ); + FilterConfigItem aFilterConfigItem( u"Office.Common/Filter/Graphic/Import/PCD" ); aFilterConfigItem.WriteInt32( "Resolution" , nBase ); } diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 7f1986c35030..eb91e49ab928 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -319,7 +319,7 @@ private: ImplSVEvent * mnPendingSetValidCall; ToolBarRules maToolBarRules; - static OUString GetToolBarResourceName (const OUString& rsBaseName); + static OUString GetToolBarResourceName (std::u16string_view rsBaseName); bool CheckPlugInMode (std::u16string_view rsName) const; DECL_LINK(UpdateCallback, void *, void); @@ -859,9 +859,9 @@ IMPL_LINK_NOARG(ToolBarManager::Implementation, SetValidCallback, void*, void) } OUString ToolBarManager::Implementation::GetToolBarResourceName ( - const OUString& rsBaseName) + std::u16string_view rsBaseName) { - return "private:resource/toolbar/" + rsBaseName; + return OUString::Concat("private:resource/toolbar/") + rsBaseName; } bool ToolBarManager::Implementation::CheckPlugInMode (std::u16string_view rsName) const |