shell/source/backends/desktopbe/desktopbackend.cxx | 12
shell/source/backends/kf5be/kf5backend.cxx | 17
shell/source/backends/localebe/localebackend.cxx | 8
shell/source/cmdmail/cmdmailsuppl.cxx | 20
shell/source/sessioninstall/SyncDbusSessionHelper.cxx | 6
shell/source/sessioninstall/SyncDbusSessionHelper.hxx | 4
shell/source/unix/exec/shellexec.cxx | 4
writerperfect/inc/DocumentHandlerForOdg.hxx | 2
writerperfect/inc/DocumentHandlerForOdp.hxx | 2
writerperfect/inc/DocumentHandlerForOds.hxx | 2
writerperfect/inc/DocumentHandlerForOdt.hxx | 2
writerperfect/inc/ImportFilter.hxx | 2
writerperfect/qa/unit/DrawingImportTest.cxx | 17
writerperfect/qa/unit/EPUBExportTest.cxx | 365
+++++-----
writerperfect/qa/unit/ImportTest.cxx | 10
writerperfect/qa/unit/PresentationImportTest.cxx | 17
writerperfect/qa/unit/SpreadsheetImportTest.cxx | 11
writerperfect/qa/unit/TextImportTest.cxx | 15
writerperfect/qa/unit/WPXSvStreamTest.cxx | 2
writerperfect/qa/unit/WpftCalcFilterTest.cxx | 10
writerperfect/qa/unit/WpftDrawFilterTest.cxx | 24
writerperfect/qa/unit/WpftFilterFixture.cxx | 6
writerperfect/qa/unit/WpftImpressFilterTest.cxx | 6
writerperfect/qa/unit/WpftLoader.cxx | 2
writerperfect/qa/unit/WpftWriterFilterTest.cxx | 16
writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 7
writerperfect/source/calc/MWAWCalcImportFilter.cxx | 5
writerperfect/source/calc/NumbersImportFilter.cxx | 5
writerperfect/source/calc/StarOfficeCalcImportFilter.cxx | 5
writerperfect/source/common/DirectoryStream.cxx | 2
writerperfect/source/common/WPFTEncodingDialog.cxx | 8
writerperfect/source/common/WPXSvInputStream.cxx | 2
writerperfect/source/draw/CDRImportFilter.cxx | 5
writerperfect/source/draw/CMXImportFilter.cxx | 5
writerperfect/source/draw/FreehandImportFilter.cxx | 5
writerperfect/source/draw/MSPUBImportFilter.cxx | 5
writerperfect/source/draw/MWAWDrawImportFilter.cxx | 5
writerperfect/source/draw/PageMakerImportFilter.cxx | 5
writerperfect/source/draw/QXPImportFilter.cxx | 5
writerperfect/source/draw/StarOfficeDrawImportFilter.cxx | 5
writerperfect/source/draw/VisioImportFilter.cxx | 5
writerperfect/source/draw/WPGImportFilter.cxx | 5
writerperfect/source/draw/ZMFImportFilter.cxx | 5
writerperfect/source/impress/KeynoteImportFilter.cxx | 5
writerperfect/source/impress/MWAWPresentationImportFilter.cxx | 5
writerperfect/source/impress/StarOfficePresentationImportFilter.cxx | 5
writerperfect/source/writer/AbiWordImportFilter.cxx | 5
writerperfect/source/writer/EBookImportFilter.cxx | 5
writerperfect/source/writer/EPUBExportDialog.cxx | 58 -
writerperfect/source/writer/EPUBExportFilter.cxx | 10
writerperfect/source/writer/EPUBExportUIComponent.cxx | 12
writerperfect/source/writer/EPUBPackage.cxx | 8
writerperfect/source/writer/MSWorksImportFilter.cxx | 5
writerperfect/source/writer/MWAWImportFilter.cxx | 5
writerperfect/source/writer/PagesImportFilter.cxx | 5
writerperfect/source/writer/StarOfficeWriterImportFilter.cxx | 5
writerperfect/source/writer/WordPerfectImportFilter.cxx | 7
writerperfect/source/writer/exp/xmlimp.cxx | 4
58 files changed, 432 insertions(+), 383 deletions(-)
New commits:
commit cb9c3c754c1c13172925974318e853adffda07bc
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed May 15 20:45:51 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu May 16 08:49:38 2024 +0200
loplugin:ostr in writerperfect
Change-Id: I3fddb38d4bac2aeba7533163e7e6779732a5448c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167707
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/writerperfect/inc/DocumentHandlerForOdg.hxx
b/writerperfect/inc/DocumentHandlerForOdg.hxx
index 7784dddcaefa..73f43c20a4f2 100644
--- a/writerperfect/inc/DocumentHandlerForOdg.hxx
+++ b/writerperfect/inc/DocumentHandlerForOdg.hxx
@@ -17,7 +17,7 @@ namespace writerperfect
{
template <> struct DocumentHandlerFor<OdgGenerator>
{
- static OUString name() { return "com.sun.star.comp.Draw.XMLOasisImporter";
}
+ static OUString name() { return
u"com.sun.star.comp.Draw.XMLOasisImporter"_ustr; }
};
}
diff --git a/writerperfect/inc/DocumentHandlerForOdp.hxx
b/writerperfect/inc/DocumentHandlerForOdp.hxx
index 970f129e6f1b..16f9a3cd25bb 100644
--- a/writerperfect/inc/DocumentHandlerForOdp.hxx
+++ b/writerperfect/inc/DocumentHandlerForOdp.hxx
@@ -17,7 +17,7 @@ namespace writerperfect
{
template <> struct DocumentHandlerFor<OdpGenerator>
{
- static OUString name() { return
"com.sun.star.comp.Impress.XMLOasisImporter"; }
+ static OUString name() { return
u"com.sun.star.comp.Impress.XMLOasisImporter"_ustr; }
};
}
diff --git a/writerperfect/inc/DocumentHandlerForOds.hxx
b/writerperfect/inc/DocumentHandlerForOds.hxx
index 226252f097d0..2eac41da6a94 100644
--- a/writerperfect/inc/DocumentHandlerForOds.hxx
+++ b/writerperfect/inc/DocumentHandlerForOds.hxx
@@ -17,7 +17,7 @@ namespace writerperfect
{
template <> struct DocumentHandlerFor<OdsGenerator>
{
- static OUString name() { return "com.sun.star.comp.Calc.XMLOasisImporter";
}
+ static OUString name() { return
u"com.sun.star.comp.Calc.XMLOasisImporter"_ustr; }
};
}
diff --git a/writerperfect/inc/DocumentHandlerForOdt.hxx
b/writerperfect/inc/DocumentHandlerForOdt.hxx
index 49af6f9d597e..bdbd0d15ae57 100644
--- a/writerperfect/inc/DocumentHandlerForOdt.hxx
+++ b/writerperfect/inc/DocumentHandlerForOdt.hxx
@@ -17,7 +17,7 @@ namespace writerperfect
{
template <> struct DocumentHandlerFor<OdtGenerator>
{
- static OUString name() { return
"com.sun.star.comp.Writer.XMLOasisImporter"; }
+ static OUString name() { return
u"com.sun.star.comp.Writer.XMLOasisImporter"_ustr; }
};
}
diff --git a/writerperfect/inc/ImportFilter.hxx
b/writerperfect/inc/ImportFilter.hxx
index 9923b834625b..b12f12be21f1 100644
--- a/writerperfect/inc/ImportFilter.hxx
+++ b/writerperfect/inc/ImportFilter.hxx
@@ -68,7 +68,7 @@ public:
}
css::uno::Reference<css::awt::XWindow> xDialogParent;
- aDescriptor["ParentWindow"] >>= xDialogParent;
+ aDescriptor[u"ParentWindow"_ustr] >>= xDialogParent;
// An XML import service: what we push sax messages to...
css::uno::Reference<XInterface> xInternalFilter
diff --git a/writerperfect/qa/unit/DrawingImportTest.cxx
b/writerperfect/qa/unit/DrawingImportTest.cxx
index 8af2ec8d62b7..ea65c4d79179 100644
--- a/writerperfect/qa/unit/DrawingImportTest.cxx
+++ b/writerperfect/qa/unit/DrawingImportTest.cxx
@@ -67,7 +67,7 @@ bool
DrawingImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUString&
// XServiceInfo
OUString SAL_CALL DrawingImportFilter::getImplementationName()
{
- return "org.libreoffice.comp.Wpft.QA.DrawingImportFilter";
+ return u"org.libreoffice.comp.Wpft.QA.DrawingImportFilter"_ustr;
}
sal_Bool SAL_CALL DrawingImportFilter::supportsService(const OUString&
rServiceName)
@@ -77,7 +77,8 @@ sal_Bool SAL_CALL DrawingImportFilter::supportsService(const
OUString& rServiceN
uno::Sequence<OUString> SAL_CALL
DrawingImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
void DrawingImportFilter::generate(librevenge::RVNGDrawingInterface& rDocument)
@@ -123,8 +124,8 @@ void DrawingImportTest::test()
using namespace css;
rtl::Reference<DrawingImportFilter> xFilter{ new
DrawingImportFilter(m_xContext) };
- writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter,
"private:factory/sdraw",
- m_xDesktop, m_xContext);
+ writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter,
+ u"private:factory/sdraw"_ustr,
m_xDesktop, m_xContext);
uno::Reference<drawing::XDrawPagesSupplier> xDoc(aLoader.getDocument(),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xDoc.is());
@@ -135,9 +136,9 @@ void DrawingImportTest::test()
CPPUNIT_ASSERT(aPage >>= xPageProps);
CPPUNIT_ASSERT(xPageProps.is());
sal_Int32 nProp = 0;
- CPPUNIT_ASSERT(xPageProps->getPropertyValue("Height") >>= nProp);
+ CPPUNIT_ASSERT(xPageProps->getPropertyValue(u"Height"_ustr) >>= nProp);
CPPUNIT_ASSERT_EQUAL(sal_Int32(600), nProp);
- CPPUNIT_ASSERT(xPageProps->getPropertyValue("Width") >>= nProp);
+ CPPUNIT_ASSERT(xPageProps->getPropertyValue(u"Width"_ustr) >>= nProp);
CPPUNIT_ASSERT_EQUAL(sal_Int32(800), nProp);
uno::Reference<drawing::XShapes> xShapes(xPageProps, uno::UNO_QUERY);
CPPUNIT_ASSERT(xShapes.is());
@@ -145,9 +146,9 @@ void DrawingImportTest::test()
uno::Reference<drawing::XShapeDescriptor> xShapeDesc;
CPPUNIT_ASSERT(aShape >>= xShapeDesc);
CPPUNIT_ASSERT(xShapeDesc.is());
- CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.TextShape"),
xShapeDesc->getShapeType());
+ CPPUNIT_ASSERT_EQUAL(u"com.sun.star.drawing.TextShape"_ustr,
xShapeDesc->getShapeType());
uno::Reference<text::XText> xText(xShapeDesc, uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(OUString("My hovercraft is full of eels."),
xText->getString());
+ CPPUNIT_ASSERT_EQUAL(u"My hovercraft is full of eels."_ustr,
xText->getString());
}
CPPUNIT_TEST_SUITE_REGISTRATION(DrawingImportTest);
diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx
b/writerperfect/qa/unit/EPUBExportTest.cxx
index f9780b42ab0b..cb38c64e4d21 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -42,7 +42,7 @@ protected:
public:
EPUBExportTest()
- : UnoApiXmlTest("/writerperfect/qa/unit/data/writer/epubexport/")
+ : UnoApiXmlTest(u"/writerperfect/qa/unit/data/writer/epubexport/"_ustr)
{
}
@@ -71,11 +71,11 @@ void EPUBExportTest::createDoc(std::u16string_view rFile,
loadFromFile(rFile);
uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY);
utl::MediaDescriptor aMediaDescriptor;
- aMediaDescriptor["FilterName"] <<= OUString("EPUB");
+ aMediaDescriptor[u"FilterName"_ustr] <<= u"EPUB"_ustr;
if (maFilterOptions.isEmpty())
- aMediaDescriptor["FilterData"] <<= rFilterData;
+ aMediaDescriptor[u"FilterData"_ustr] <<= rFilterData;
else
- aMediaDescriptor["FilterOptions"] <<= maFilterOptions;
+ aMediaDescriptor[u"FilterOptions"_ustr] <<= maFilterOptions;
xStorable->storeToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
mxZipFile
= packages::zip::ZipFileAccess::createWithURL(mxComponentContext,
maTempFile.GetURL());
@@ -135,10 +135,10 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testOutlineLevel)
createDoc(u"outline-level.fodt", {});
// Make sure that the output is split into two.
- CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/sections/section0001.xhtml"));
+
CPPUNIT_ASSERT(mxZipFile->hasByName(u"OEBPS/sections/section0001.xhtml"_ustr));
// This failed, output was a single section.
- CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/sections/section0002.xhtml"));
- CPPUNIT_ASSERT(!mxZipFile->hasByName("OEBPS/sections/section0003.xhtml"));
+
CPPUNIT_ASSERT(mxZipFile->hasByName(u"OEBPS/sections/section0002.xhtml"_ustr));
+
CPPUNIT_ASSERT(!mxZipFile->hasByName(u"OEBPS/sections/section0003.xhtml"_ustr));
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testMimetype)
@@ -156,9 +156,9 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testMimetype)
// This failed: actual data was some garbage, not the uncompressed mime
type.
CPPUNIT_ASSERT_EQUAL(aExpected, aActual);
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/content.opf");
+ xmlDocUniquePtr mpXmlDoc = parseExport(u"OEBPS/content.opf"_ustr);
// Default is EPUB3.
- assertXPath(mpXmlDoc, "/opf:package"_ostr, "version"_ostr, "3.0");
+ assertXPath(mpXmlDoc, "/opf:package"_ostr, "version"_ostr, u"3.0"_ustr);
// This was just "libepubgen/x.y.z", i.e. the LO version was missing.
OUString aGenerator = getXPath(
@@ -174,7 +174,7 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testMimetype)
// We got back what we expected.
uno::Reference<lang::XServiceInfo> xServiceInfo(xFilter, uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(aServiceName, xServiceInfo->getImplementationName());
-
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.document.ExportFilter"));
+
CPPUNIT_ASSERT(xServiceInfo->supportsService(u"com.sun.star.document.ExportFilter"_ustr));
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testEPUB2)
@@ -184,9 +184,9 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testEPUB2)
{ "EPUBVersion", uno::Any(static_cast<sal_Int32>(20)) } }));
createDoc(u"hello.fodt", aFilterData);
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/content.opf");
+ xmlDocUniquePtr mpXmlDoc = parseExport(u"OEBPS/content.opf"_ustr);
// This was 3.0, EPUBVersion filter option was ignored and we always
emitted EPUB3.
- assertXPath(mpXmlDoc, "/opf:package"_ostr, "version"_ostr, "2.0");
+ assertXPath(mpXmlDoc, "/opf:package"_ostr, "version"_ostr, u"2.0"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testEPUBFixedLayout)
@@ -197,11 +197,11 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testEPUBFixedLayout)
uno::Any(static_cast<sal_Int32>(libepubgen::EPUB_LAYOUT_METHOD_FIXED)) } }));
createDoc(u"hello.fodt", aFilterData);
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/content.opf");
+ xmlDocUniquePtr mpXmlDoc = parseExport(u"OEBPS/content.opf"_ustr);
// This was missing, EPUBLayoutMethod filter option was ignored and we
always emitted reflowable layout.
assertXPathContent(mpXmlDoc,
"/opf:package/opf:metadata/opf:meta[@property='rendition:layout']"_ostr,
- "pre-paginated");
+ u"pre-paginated"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testEPUBFixedLayoutOption)
@@ -211,10 +211,10 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest,
testEPUBFixedLayoutOption)
createDoc(u"hello.fodt", {});
// This failed, fixed layout was only working via the FilterData map.
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/content.opf");
+ xmlDocUniquePtr mpXmlDoc = parseExport(u"OEBPS/content.opf"_ustr);
assertXPathContent(mpXmlDoc,
"/opf:package/opf:metadata/opf:meta[@property='rendition:layout']"_ostr,
- "pre-paginated");
+ u"pre-paginated"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testEPUBFixedLayoutImplicitBreak)
@@ -225,17 +225,17 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest,
testEPUBFixedLayoutImplicitBreak)
uno::Any(static_cast<sal_Int32>(libepubgen::EPUB_LAYOUT_METHOD_FIXED)) } }));
createDoc(u"fxl-2page.fodt", aFilterData);
- CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/sections/section0001.xhtml"));
+
CPPUNIT_ASSERT(mxZipFile->hasByName(u"OEBPS/sections/section0001.xhtml"_ustr));
// This was missing, implicit page break (as calculated by the layout) was
lost on export.
- CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/sections/section0002.xhtml"));
- CPPUNIT_ASSERT(!mxZipFile->hasByName("OEBPS/sections/section0003.xhtml"));
+
CPPUNIT_ASSERT(mxZipFile->hasByName(u"OEBPS/sections/section0002.xhtml"_ustr));
+
CPPUNIT_ASSERT(!mxZipFile->hasByName(u"OEBPS/sections/section0003.xhtml"_ustr));
// Make sure that fixed layout has chapter names in the navigation
// document.
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/toc.xhtml");
+ xmlDocUniquePtr mpXmlDoc = parseExport(u"OEBPS/toc.xhtml"_ustr);
// This was 'Page 1' instead.
- assertXPathContent(mpXmlDoc, "//xhtml:li[1]/xhtml:a"_ostr, "First
chapter");
- assertXPathContent(mpXmlDoc, "//xhtml:li[2]/xhtml:a"_ostr, "Second
chapter");
+ assertXPathContent(mpXmlDoc, "//xhtml:li[1]/xhtml:a"_ostr, u"First
chapter"_ustr);
+ assertXPathContent(mpXmlDoc, "//xhtml:li[2]/xhtml:a"_ostr, u"Second
chapter"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testPageBreakSplit)
@@ -247,95 +247,95 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testPageBreakSplit)
createDoc(u"2pages.fodt", aFilterData);
// Make sure that the output is split into two.
- CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/sections/section0001.xhtml"));
+
CPPUNIT_ASSERT(mxZipFile->hasByName(u"OEBPS/sections/section0001.xhtml"_ustr));
// This failed, output was a single section.
- CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/sections/section0002.xhtml"));
- CPPUNIT_ASSERT(!mxZipFile->hasByName("OEBPS/sections/section0003.xhtml"));
+
CPPUNIT_ASSERT(mxZipFile->hasByName(u"OEBPS/sections/section0002.xhtml"_ustr));
+
CPPUNIT_ASSERT(!mxZipFile->hasByName(u"OEBPS/sections/section0003.xhtml"_ustr));
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testSpanAutostyle)
{
createDoc(u"span-autostyle.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
- assertXPath(mpXmlDoc, "//xhtml:p/xhtml:span[1]"_ostr, "class"_ostr,
"span0");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
+ assertXPath(mpXmlDoc, "//xhtml:p/xhtml:span[1]"_ostr, "class"_ostr,
u"span0"_ustr);
// This failed, it was still span1, i.e. the bold and the italic formatting
// did not differ.
- assertXPath(mpXmlDoc, "//xhtml:p/xhtml:span[2]"_ostr, "class"_ostr,
"span1");
- assertXPath(mpXmlDoc, "//xhtml:p/xhtml:span[3]"_ostr, "class"_ostr,
"span2");
+ assertXPath(mpXmlDoc, "//xhtml:p/xhtml:span[2]"_ostr, "class"_ostr,
u"span1"_ustr);
+ assertXPath(mpXmlDoc, "//xhtml:p/xhtml:span[3]"_ostr, "class"_ostr,
u"span2"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testParaAutostyleCharProps)
{
createDoc(u"para-autostyle-char-props.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
// This failed, para-level char props were not exported.
- assertXPath(mpXmlDoc, "//xhtml:p[1]/xhtml:span"_ostr, "class"_ostr,
"span0");
- assertXPath(mpXmlDoc, "//xhtml:p[2]/xhtml:span"_ostr, "class"_ostr,
"span1");
+ assertXPath(mpXmlDoc, "//xhtml:p[1]/xhtml:span"_ostr, "class"_ostr,
u"span0"_ustr);
+ assertXPath(mpXmlDoc, "//xhtml:p[2]/xhtml:span"_ostr, "class"_ostr,
u"span1"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testMeta)
{
createDoc(u"meta.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/content.opf");
+ xmlDocUniquePtr mpXmlDoc = parseExport(u"OEBPS/content.opf"_ustr);
// This was "Unknown Author", <meta:initial-creator> was not handled.
- assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:creator"_ostr,
"A U Thor");
- assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:title"_ostr,
"Title");
- assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:language"_ostr,
"hu");
+ assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:creator"_ostr,
u"A U Thor"_ustr);
+ assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:title"_ostr,
u"Title"_ustr);
+ assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:language"_ostr,
u"hu"_ustr);
assertXPathContent(mpXmlDoc,
"/opf:package/opf:metadata/opf:meta[@property='dcterms:modified']"_ostr,
- "2017-09-27T09:51:19Z");
+ u"2017-09-27T09:51:19Z"_ustr);
// Make sure that cover image next to the source document is picked up.
assertXPath(mpXmlDoc,
"/opf:package/opf:manifest/opf:item[@href='images/image0001.png']"_ostr,
- "properties"_ostr, "cover-image");
+ "properties"_ostr, u"cover-image"_ustr);
assertXPath(mpXmlDoc,
"/opf:package/opf:manifest/opf:item[@href='images/image0001.png']"_ostr,
- "media-type"_ostr, "image/png");
- CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/images/image0001.png"));
+ "media-type"_ostr, u"image/png"_ustr);
+ CPPUNIT_ASSERT(mxZipFile->hasByName(u"OEBPS/images/image0001.png"_ustr));
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testMetaXMP)
{
createDoc(u"meta-xmp.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/content.opf");
+ xmlDocUniquePtr mpXmlDoc = parseExport(u"OEBPS/content.opf"_ustr);
// These were the libepubgen default values, metadata from a matching .xmp
file was not picked up.
assertXPathContent(mpXmlDoc,
"/opf:package/opf:metadata/dc:identifier"_ostr,
- "deadbeef-e394-4cd6-9b83-7172794612e5");
+ u"deadbeef-e394-4cd6-9b83-7172794612e5"_ustr);
assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:title"_ostr,
- "unknown title from xmp");
+ u"unknown title from xmp"_ustr);
assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:creator"_ostr,
- "unknown author from xmp");
- assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:language"_ostr,
"nl");
+ u"unknown author from xmp"_ustr);
+ assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:language"_ostr,
u"nl"_ustr);
assertXPathContent(mpXmlDoc,
"/opf:package/opf:metadata/opf:meta[@property='dcterms:modified']"_ostr,
- "2016-11-20T17:16:07Z");
+ u"2016-11-20T17:16:07Z"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testMetaAPI)
{
uno::Sequence<beans::PropertyValue>
aFilterData(comphelper::InitPropertySequence(
- { { "RVNGIdentifier",
uno::Any(OUString("deadc0de-e394-4cd6-9b83-7172794612e5")) },
- { "RVNGTitle", uno::Any(OUString("unknown title from api")) },
- { "RVNGInitialCreator", uno::Any(OUString("unknown author from
api")) },
- { "RVNGLanguage", uno::Any(OUString("hu")) },
- { "RVNGDate", uno::Any(OUString("2015-11-20T17:16:07Z")) } }));
+ { { "RVNGIdentifier",
uno::Any(u"deadc0de-e394-4cd6-9b83-7172794612e5"_ustr) },
+ { "RVNGTitle", uno::Any(u"unknown title from api"_ustr) },
+ { "RVNGInitialCreator", uno::Any(u"unknown author from api"_ustr) },
+ { "RVNGLanguage", uno::Any(u"hu"_ustr) },
+ { "RVNGDate", uno::Any(u"2015-11-20T17:16:07Z"_ustr) } }));
createDoc(u"meta-xmp.fodt", aFilterData);
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/content.opf");
+ xmlDocUniquePtr mpXmlDoc = parseExport(u"OEBPS/content.opf"_ustr);
// These were values from XMP (deadbeef, etc.), not from API.
assertXPathContent(mpXmlDoc,
"/opf:package/opf:metadata/dc:identifier"_ostr,
- "deadc0de-e394-4cd6-9b83-7172794612e5");
+ u"deadc0de-e394-4cd6-9b83-7172794612e5"_ustr);
assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:title"_ostr,
- "unknown title from api");
+ u"unknown title from api"_ustr);
assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:creator"_ostr,
- "unknown author from api");
- assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:language"_ostr,
"hu");
+ u"unknown author from api"_ustr);
+ assertXPathContent(mpXmlDoc, "/opf:package/opf:metadata/dc:language"_ostr,
u"hu"_ustr);
assertXPathContent(mpXmlDoc,
"/opf:package/opf:metadata/opf:meta[@property='dcterms:modified']"_ostr,
- "2015-11-20T17:16:07Z");
+ u"2015-11-20T17:16:07Z"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testCoverImage)
@@ -344,42 +344,42 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testCoverImage)
uno::Sequence<beans::PropertyValue> aFilterData(
comphelper::InitPropertySequence({ { "RVNGCoverImage",
uno::Any(aCoverURL) } }));
createDoc(u"hello.fodt", aFilterData);
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/content.opf");
+ xmlDocUniquePtr mpXmlDoc = parseExport(u"OEBPS/content.opf"_ustr);
// Make sure that the explicitly set cover image is used.
// This failed, as the image was not part of the package.
assertXPath(mpXmlDoc,
"/opf:package/opf:manifest/opf:item[@href='images/image0001.png']"_ostr,
- "properties"_ostr, "cover-image");
+ "properties"_ostr, u"cover-image"_ustr);
assertXPath(mpXmlDoc,
"/opf:package/opf:manifest/opf:item[@href='images/image0001.png']"_ostr,
- "media-type"_ostr, "image/png");
- CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/images/image0001.png"));
+ "media-type"_ostr, u"image/png"_ustr);
+ CPPUNIT_ASSERT(mxZipFile->hasByName(u"OEBPS/images/image0001.png"_ustr));
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testParaNamedstyle)
{
createDoc(u"para-namedstyle.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
- assertXPath(mpXmlDoc, "//xhtml:p[1]"_ostr, "class"_ostr, "para0");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
+ assertXPath(mpXmlDoc, "//xhtml:p[1]"_ostr, "class"_ostr, u"para0"_ustr);
// This failed, paragraph properties from style were not exported.
- assertXPath(mpXmlDoc, "//xhtml:p[2]"_ostr, "class"_ostr, "para1");
+ assertXPath(mpXmlDoc, "//xhtml:p[2]"_ostr, "class"_ostr, u"para1"_ustr);
// Test character properties from named paragraph style.
- assertXPath(mpXmlDoc, "//xhtml:p[1]/xhtml:span"_ostr, "class"_ostr,
"span0");
+ assertXPath(mpXmlDoc, "//xhtml:p[1]/xhtml:span"_ostr, "class"_ostr,
u"span0"_ustr);
// This failed, character properties from paragraph style were not
exported.
- assertXPath(mpXmlDoc, "//xhtml:p[2]/xhtml:span"_ostr, "class"_ostr,
"span1");
+ assertXPath(mpXmlDoc, "//xhtml:p[2]/xhtml:span"_ostr, "class"_ostr,
u"span1"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testCharNamedstyle)
{
createDoc(u"char-namedstyle.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
// Test character properties from named text style.
- assertXPath(mpXmlDoc, "//xhtml:p/xhtml:span[1]"_ostr, "class"_ostr,
"span0");
+ assertXPath(mpXmlDoc, "//xhtml:p/xhtml:span[1]"_ostr, "class"_ostr,
u"span0"_ustr);
// This failed, character properties from text style were not exported.
- assertXPath(mpXmlDoc, "//xhtml:p/xhtml:span[2]"_ostr, "class"_ostr,
"span1");
+ assertXPath(mpXmlDoc, "//xhtml:p/xhtml:span[2]"_ostr, "class"_ostr,
u"span1"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testNamedStyleInheritance)
@@ -387,14 +387,15 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest,
testNamedStyleInheritance)
createDoc(u"named-style-inheritance.fodt", {});
// Find the CSS rule for the blue text.
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
- std::map<OUString, std::vector<OUString>> aCssDoc =
parseCss("OEBPS/styles/stylesheet.css");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
+ std::map<OUString, std::vector<OUString>> aCssDoc
+ = parseCss(u"OEBPS/styles/stylesheet.css"_ustr);
OUString aBlue = getXPath(mpXmlDoc, "//xhtml:p[2]/xhtml:span[2]"_ostr,
"class"_ostr);
- CPPUNIT_ASSERT_EQUAL(OUString("#0000ff"), EPUBExportTest::getCss(aCssDoc,
aBlue, u"color"));
+ CPPUNIT_ASSERT_EQUAL(u"#0000ff"_ustr, EPUBExportTest::getCss(aCssDoc,
aBlue, u"color"));
// This failed, the span only had the properties from its style, but not
// from the style's parent(s).
- CPPUNIT_ASSERT_EQUAL(OUString("'Liberation Mono'"),
+ CPPUNIT_ASSERT_EQUAL(u"'Liberation Mono'"_ustr,
EPUBExportTest::getCss(aCssDoc, aBlue,
u"font-family"));
}
@@ -403,16 +404,17 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testNestedSpan)
createDoc(u"nested-span.fodt", {});
// Check textural content of nested span.
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
- std::map<OUString, std::vector<OUString>> aCssDoc =
parseCss("OEBPS/styles/stylesheet.css");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
+ std::map<OUString, std::vector<OUString>> aCssDoc
+ = parseCss(u"OEBPS/styles/stylesheet.css"_ustr);
// This crashed, span had no content.
- assertXPathContent(mpXmlDoc, "//xhtml:p/xhtml:span[2]"_ostr, "red");
+ assertXPathContent(mpXmlDoc, "//xhtml:p/xhtml:span[2]"_ostr, u"red"_ustr);
// Check formatting of nested span.
OUString aRed = getXPath(mpXmlDoc, "//xhtml:p/xhtml:span[2]"_ostr,
"class"_ostr);
// This failed, direct formatting on top of named style was lost.
- CPPUNIT_ASSERT_EQUAL(OUString("#ff0000"), EPUBExportTest::getCss(aCssDoc,
aRed, u"color"));
- CPPUNIT_ASSERT_EQUAL(OUString("'Liberation Mono'"),
+ CPPUNIT_ASSERT_EQUAL(u"#ff0000"_ustr, EPUBExportTest::getCss(aCssDoc,
aRed, u"color"));
+ CPPUNIT_ASSERT_EQUAL(u"'Liberation Mono'"_ustr,
EPUBExportTest::getCss(aCssDoc, aRed,
u"font-family"));
}
@@ -420,7 +422,7 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testLineBreak)
{
createDoc(u"line-break.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
// This was 0, line break was not handled.
assertXPath(mpXmlDoc, "//xhtml:p[1]/xhtml:span/xhtml:br"_ostr, 1);
// This was 0, line break inside span was not handled.
@@ -431,11 +433,11 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testEscape)
{
createDoc(u"escape.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
// This was lost.
assertXPathContent(mpXmlDoc, "//xhtml:p[1]/xhtml:span[1]"_ostr,
OUString::fromUtf8("\xc2\xa0"));
// Make sure escaping happens only once.
- assertXPathContent(mpXmlDoc, "//xhtml:p[1]/xhtml:span[2]"_ostr, "a&b");
+ assertXPathContent(mpXmlDoc, "//xhtml:p[1]/xhtml:span[2]"_ostr,
u"a&b"_ustr);
// This was also lost.
assertXPathContent(
mpXmlDoc, "//xhtml:p[1]/xhtml:span[3]"_ostr,
@@ -447,43 +449,42 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testParaCharProps)
{
createDoc(u"para-char-props.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
- std::map<OUString, std::vector<OUString>> aCssDoc =
parseCss("OEBPS/styles/stylesheet.css");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
+ std::map<OUString, std::vector<OUString>> aCssDoc
+ = parseCss(u"OEBPS/styles/stylesheet.css"_ustr);
// Check formatting of the middle span.
OUString aMiddle = getXPath(mpXmlDoc, "//xhtml:p/xhtml:span[2]"_ostr,
"class"_ostr);
- CPPUNIT_ASSERT_EQUAL(OUString("italic"),
- EPUBExportTest::getCss(aCssDoc, aMiddle,
u"font-style"));
+ CPPUNIT_ASSERT_EQUAL(u"italic"_ustr, EPUBExportTest::getCss(aCssDoc,
aMiddle, u"font-style"));
// Direct para formatting was lost, only direct char formatting was
// written, so this failed.
- CPPUNIT_ASSERT_EQUAL(OUString("bold"),
- EPUBExportTest::getCss(aCssDoc, aMiddle,
u"font-weight"));
+ CPPUNIT_ASSERT_EQUAL(u"bold"_ustr, EPUBExportTest::getCss(aCssDoc,
aMiddle, u"font-weight"));
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testSection)
{
createDoc(u"section.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
// This was "After.", i.e. in-section content was ignored.
- assertXPathContent(mpXmlDoc, "//xhtml:p[2]/xhtml:span"_ostr, "In
section.");
+ assertXPathContent(mpXmlDoc, "//xhtml:p[2]/xhtml:span"_ostr, u"In
section."_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testList)
{
createDoc(u"list.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
// This was "C", i.e. in-list content was ignored.
- assertXPathContent(mpXmlDoc, "//xhtml:p[2]/xhtml:span"_ostr, "B");
+ assertXPathContent(mpXmlDoc, "//xhtml:p[2]/xhtml:span"_ostr, u"B"_ustr);
// Test nested list content.
- assertXPathContent(mpXmlDoc, "//xhtml:p[6]/xhtml:span"_ostr, "F");
+ assertXPathContent(mpXmlDoc, "//xhtml:p[6]/xhtml:span"_ostr, u"F"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testImage)
{
createDoc(u"image.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
assertXPath(mpXmlDoc, "//xhtml:p/xhtml:img"_ostr, 1);
}
@@ -491,12 +492,13 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testImageBorder)
{
createDoc(u"image-border.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
- std::map<OUString, std::vector<OUString>> aCssDoc =
parseCss("OEBPS/styles/stylesheet.css");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
+ std::map<OUString, std::vector<OUString>> aCssDoc
+ = parseCss(u"OEBPS/styles/stylesheet.css"_ustr);
OUString aClass = getXPath(mpXmlDoc, "//xhtml:img"_ostr, "class"_ostr);
// This failed, image had no border.
- CPPUNIT_ASSERT_EQUAL(OUString("0.99pt dashed #ed1c24"),
+ CPPUNIT_ASSERT_EQUAL(u"0.99pt dashed #ed1c24"_ustr,
EPUBExportTest::getCss(aCssDoc, aClass, u"border"));
}
@@ -504,7 +506,7 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testImageNospan)
{
createDoc(u"image-nospan.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
// Image outside a span was lost.
assertXPath(mpXmlDoc, "//xhtml:p/xhtml:img"_ostr, 1);
}
@@ -513,7 +515,7 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testTable)
{
createDoc(u"table.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
assertXPath(mpXmlDoc, "//xhtml:table/xhtml:tbody/xhtml:tr/xhtml:td"_ostr,
4);
}
@@ -521,23 +523,24 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testTableRowSpan)
{
createDoc(u"table-row-span.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
// This failed, row span wasn't exported.
assertXPath(mpXmlDoc,
"//xhtml:table/xhtml:tbody/xhtml:tr[1]/xhtml:td[1]"_ostr, "rowspan"_ostr,
- "2");
+ u"2"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testTableCellBorder)
{
createDoc(u"table-cell-border.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
- std::map<OUString, std::vector<OUString>> aCssDoc =
parseCss("OEBPS/styles/stylesheet.css");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
+ std::map<OUString, std::vector<OUString>> aCssDoc
+ = parseCss(u"OEBPS/styles/stylesheet.css"_ustr);
OUString aClass = getXPath(mpXmlDoc,
"//xhtml:table/xhtml:tbody/xhtml:tr[1]/xhtml:td[1]"_ostr,
"class"_ostr);
// This failed, cell border wasn't exported.
- CPPUNIT_ASSERT_EQUAL(OUString("0.05pt solid #000000"),
+ CPPUNIT_ASSERT_EQUAL(u"0.05pt solid #000000"_ustr,
EPUBExportTest::getCss(aCssDoc, aClass,
u"border-left"));
}
@@ -545,8 +548,9 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testTableCellWidth)
{
createDoc(u"table-cell-width.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
- std::map<OUString, std::vector<OUString>> aCssDoc =
parseCss("OEBPS/styles/stylesheet.css");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
+ std::map<OUString, std::vector<OUString>> aCssDoc
+ = parseCss(u"OEBPS/styles/stylesheet.css"_ustr);
OUString aClass1 = getXPath(mpXmlDoc,
"//xhtml:table/xhtml:tbody/xhtml:tr[1]/xhtml:td[1]"_ostr,
"class"_ostr);
OUString aClass2 = getXPath(mpXmlDoc,
"//xhtml:table/xhtml:tbody/xhtml:tr[1]/xhtml:td[2]"_ostr,
@@ -564,8 +568,9 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testTableRowHeight)
{
createDoc(u"table-row-height.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
- std::map<OUString, std::vector<OUString>> aCssDoc =
parseCss("OEBPS/styles/stylesheet.css");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
+ std::map<OUString, std::vector<OUString>> aCssDoc
+ = parseCss(u"OEBPS/styles/stylesheet.css"_ustr);
OUString aClass1
= getXPath(mpXmlDoc, "//xhtml:table/xhtml:tbody/xhtml:tr[1]"_ostr,
"class"_ostr);
OUString aClass2
@@ -579,16 +584,17 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testLink)
{
createDoc(u"link.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
- assertXPathContent(mpXmlDoc, "//xhtml:p/xhtml:a/xhtml:span"_ostr,
"https://libreoffice.org/";);
- assertXPath(mpXmlDoc, "//xhtml:p/xhtml:a"_ostr, "href"_ostr,
"https://libreoffice.org/";);
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
+ assertXPathContent(mpXmlDoc, "//xhtml:p/xhtml:a/xhtml:span"_ostr,
+ u"https://libreoffice.org/"_ustr);
+ assertXPath(mpXmlDoc, "//xhtml:p/xhtml:a"_ostr, "href"_ostr,
u"https://libreoffice.org/"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testLinkInvalid)
{
createDoc(u"link-invalid.odt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
// This was 1, invalid relative link was not filtered out.
assertXPath(mpXmlDoc, "//xhtml:p/xhtml:a"_ostr, 0);
}
@@ -597,10 +603,11 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testLinkCharFormat)
{
createDoc(u"link-charformat.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
// <span> was lost, link text having a char format was missing.
- assertXPathContent(mpXmlDoc, "//xhtml:p/xhtml:a/xhtml:span"_ostr,
"https://libreoffice.org/";);
- assertXPath(mpXmlDoc, "//xhtml:p/xhtml:a"_ostr, "href"_ostr,
"https://libreoffice.org/";);
+ assertXPathContent(mpXmlDoc, "//xhtml:p/xhtml:a/xhtml:span"_ostr,
+ u"https://libreoffice.org/"_ustr);
+ assertXPath(mpXmlDoc, "//xhtml:p/xhtml:a"_ostr, "href"_ostr,
u"https://libreoffice.org/"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testLinkNamedCharFormat)
@@ -608,47 +615,50 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest,
testLinkNamedCharFormat)
// Character properties from named character style on hyperlink was lost.
createDoc(u"link-namedcharformat.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
- std::map<OUString, std::vector<OUString>> aCssDoc =
parseCss("OEBPS/styles/stylesheet.css");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
+ std::map<OUString, std::vector<OUString>> aCssDoc
+ = parseCss(u"OEBPS/styles/stylesheet.css"_ustr);
// This failed, there was no span inside the hyperlink.
- assertXPathContent(mpXmlDoc, "//xhtml:p/xhtml:a/xhtml:span"_ostr,
"http://libreoffice.org";);
- assertXPath(mpXmlDoc, "//xhtml:p/xhtml:a"_ostr, "href"_ostr,
"http://libreoffice.org/";);
+ assertXPathContent(mpXmlDoc, "//xhtml:p/xhtml:a/xhtml:span"_ostr,
+ u"http://libreoffice.org"_ustr);
+ assertXPath(mpXmlDoc, "//xhtml:p/xhtml:a"_ostr, "href"_ostr,
u"http://libreoffice.org/"_ustr);
OUString aClass = getXPath(mpXmlDoc, "//xhtml:p/xhtml:a/xhtml:span"_ostr,
"class"_ostr);
- CPPUNIT_ASSERT_EQUAL(OUString("#ff0000"), EPUBExportTest::getCss(aCssDoc,
aClass, u"color"));
+ CPPUNIT_ASSERT_EQUAL(u"#ff0000"_ustr, EPUBExportTest::getCss(aCssDoc,
aClass, u"color"));
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testTableWidth)
{
createDoc(u"table-width.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
- std::map<OUString, std::vector<OUString>> aCssDoc =
parseCss("OEBPS/styles/stylesheet.css");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
+ std::map<OUString, std::vector<OUString>> aCssDoc
+ = parseCss(u"OEBPS/styles/stylesheet.css"_ustr);
OUString aClass = getXPath(mpXmlDoc, "//xhtml:table"_ostr, "class"_ostr);
// This failed, relative total width of table was lost.
- CPPUNIT_ASSERT_EQUAL(OUString("50%"), EPUBExportTest::getCss(aCssDoc,
aClass, u"width"));
+ CPPUNIT_ASSERT_EQUAL(u"50%"_ustr, EPUBExportTest::getCss(aCssDoc, aClass,
u"width"));
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testTextBox)
{
createDoc(u"text-box.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
- std::map<OUString, std::vector<OUString>> aCssDoc =
parseCss("OEBPS/styles/stylesheet.css");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
+ std::map<OUString, std::vector<OUString>> aCssDoc
+ = parseCss(u"OEBPS/styles/stylesheet.css"_ustr);
// This failed, image with caption was lost.
- assertXPath(mpXmlDoc, "//xhtml:img"_ostr, "class"_ostr, "frame1");
+ assertXPath(mpXmlDoc, "//xhtml:img"_ostr, "class"_ostr, u"frame1"_ustr);
// Expected spans:
// 1) break after the image
// 2) "Illustration "
// 3) The sequence field, this was missing (was ": foo" instead).
- assertXPathContent(mpXmlDoc, "//xhtml:div/xhtml:p/xhtml:span[3]"_ostr,
"1");
+ assertXPathContent(mpXmlDoc, "//xhtml:div/xhtml:p/xhtml:span[3]"_ostr,
u"1"_ustr);
OUString aClass = getXPath(mpXmlDoc,
"//xhtml:div/xhtml:p/xhtml:span[3]"_ostr, "class"_ostr);
// This failed, the 3rd span was not italic.
- CPPUNIT_ASSERT_EQUAL(OUString("italic"),
- EPUBExportTest::getCss(aCssDoc, aClass,
u"font-style"));
+ CPPUNIT_ASSERT_EQUAL(u"italic"_ustr, EPUBExportTest::getCss(aCssDoc,
aClass, u"font-style"));
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testFontEmbedding)
@@ -658,22 +668,23 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testFontEmbedding)
// Make sure that the params of defineEmbeddedFont() are all handled.
// librevenge:name
- std::map<OUString, std::vector<OUString>> aCssDoc =
parseCss("OEBPS/styles/stylesheet.css");
+ std::map<OUString, std::vector<OUString>> aCssDoc
+ = parseCss(u"OEBPS/styles/stylesheet.css"_ustr);
// 'SketchFlow Print' or ''SketchFlow Print1'
- CPPUNIT_ASSERT(EPUBExportTest::getCss(aCssDoc, "font-face", u"font-family")
+ CPPUNIT_ASSERT(EPUBExportTest::getCss(aCssDoc, u"font-face"_ustr,
u"font-family")
.startsWith("'SketchFlow Print"));
// librevenge:mime-type
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/content.opf");
+ xmlDocUniquePtr mpXmlDoc = parseExport(u"OEBPS/content.opf"_ustr);
assertXPath(mpXmlDoc,
"/opf:package/opf:manifest/opf:item[@href='fonts/font0001.otf']"_ostr,
- "media-type"_ostr, "application/vnd.ms-opentype");
+ "media-type"_ostr, u"application/vnd.ms-opentype"_ustr);
// office:binary-data
- CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/fonts/font0001.otf"));
+ CPPUNIT_ASSERT(mxZipFile->hasByName(u"OEBPS/fonts/font0001.otf"_ustr));
// librevenge:font-style
- CPPUNIT_ASSERT_EQUAL(OUString("normal"),
- EPUBExportTest::getCss(aCssDoc, "font-face",
u"font-style"));
+ CPPUNIT_ASSERT_EQUAL(u"normal"_ustr,
+ EPUBExportTest::getCss(aCssDoc, u"font-face"_ustr,
u"font-style"));
// librevenge:font-weight
- CPPUNIT_ASSERT_EQUAL(OUString("normal"),
- EPUBExportTest::getCss(aCssDoc, "font-face",
u"font-weight"));
+ CPPUNIT_ASSERT_EQUAL(u"normal"_ustr,
+ EPUBExportTest::getCss(aCssDoc, u"font-face"_ustr,
u"font-weight"));
#endif
}
@@ -681,7 +692,7 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testImageLink)
{
createDoc(u"image-link.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
// This failed, image was missing.
assertXPath(mpXmlDoc, "//xhtml:p/xhtml:a/xhtml:img"_ostr, 1);
}
@@ -690,30 +701,31 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testFootnote)
{
createDoc(u"footnote.fodt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
// These were missing, footnote was lost.
- assertXPath(mpXmlDoc, "//xhtml:body/xhtml:p/xhtml:sup/xhtml:a"_ostr,
"type"_ostr, "noteref");
- assertXPath(mpXmlDoc, "//xhtml:body/xhtml:aside"_ostr, "type"_ostr,
"footnote");
+ assertXPath(mpXmlDoc, "//xhtml:body/xhtml:p/xhtml:sup/xhtml:a"_ostr,
"type"_ostr,
+ u"noteref"_ustr);
+ assertXPath(mpXmlDoc, "//xhtml:body/xhtml:aside"_ostr, "type"_ostr,
u"footnote"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testPopup)
{
createDoc(u"popup.odt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
// Test image popup anchor.
- assertXPath(mpXmlDoc, "//xhtml:body/xhtml:p[1]/xhtml:a"_ostr, "type"_ostr,
"noteref");
+ assertXPath(mpXmlDoc, "//xhtml:body/xhtml:p[1]/xhtml:a"_ostr, "type"_ostr,
u"noteref"_ustr);
assertXPath(mpXmlDoc, "//xhtml:body/xhtml:p[1]/xhtml:a/xhtml:img"_ostr, 1);
// Test image popup content.
- assertXPath(mpXmlDoc, "//xhtml:body/xhtml:aside[1]"_ostr, "type"_ostr,
"footnote");
+ assertXPath(mpXmlDoc, "//xhtml:body/xhtml:aside[1]"_ostr, "type"_ostr,
u"footnote"_ustr);
assertXPath(mpXmlDoc, "//xhtml:body/xhtml:aside[1]/xhtml:img"_ostr, 1);
// Test text popup anchor.
assertXPath(mpXmlDoc, "//xhtml:body/xhtml:p[2]/xhtml:span/xhtml:a"_ostr,
"type"_ostr,
- "noteref");
- assertXPathContent(mpXmlDoc,
"//xhtml:body/xhtml:p[2]/xhtml:span/xhtml:a"_ostr, "link");
+ u"noteref"_ustr);
+ assertXPathContent(mpXmlDoc,
"//xhtml:body/xhtml:p[2]/xhtml:span/xhtml:a"_ostr, u"link"_ustr);
// Test text popup content.
- assertXPath(mpXmlDoc, "//xhtml:body/xhtml:aside[2]"_ostr, "type"_ostr,
"footnote");
+ assertXPath(mpXmlDoc, "//xhtml:body/xhtml:aside[2]"_ostr, "type"_ostr,
u"footnote"_ustr);
assertXPath(mpXmlDoc, "//xhtml:body/xhtml:aside[2]/xhtml:img"_ostr, 1);
}
@@ -723,9 +735,9 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testPopupMedia)
// default media directory, not in the document directory.
createDoc(u"popup-media.odt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
// Test image popup anchor. This failed, number of XPath nodes was 0.
- assertXPath(mpXmlDoc, "//xhtml:body/xhtml:p[1]/xhtml:a"_ostr, "type"_ostr,
"noteref");
+ assertXPath(mpXmlDoc, "//xhtml:body/xhtml:p[1]/xhtml:a"_ostr, "type"_ostr,
u"noteref"_ustr);
assertXPath(mpXmlDoc, "//xhtml:body/xhtml:p[1]/xhtml:a/xhtml:img"_ostr, 1);
}
@@ -738,7 +750,7 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testPopupAPI)
createDoc(u"popup-api.odt", aFilterData);
// We have a non-empty anchor image.
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
OUString aAnchor
= getXPath(mpXmlDoc, "//xhtml:body/xhtml:p[1]/xhtml:a/xhtml:img"_ostr,
"src"_ostr);
CPPUNIT_ASSERT(!aAnchor.isEmpty());
@@ -757,15 +769,15 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testPageSize)
createDoc(u"hello.fodt", aFilterData);
// This failed, viewport was empty, so page size was lost.
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
// 21,59cm x 27.94cm (letter).
assertXPath(mpXmlDoc,
"/xhtml:html/xhtml:head/xhtml:meta[@name='viewport']"_ostr,
- "content"_ostr, "width=816, height=1056");
+ "content"_ostr, u"width=816, height=1056"_ustr);
- mpXmlDoc = parseExport("OEBPS/images/image0001.svg");
+ mpXmlDoc = parseExport(u"OEBPS/images/image0001.svg"_ustr);
// This was 288mm, logic->logic conversion input was a pixel value.
- assertXPath(mpXmlDoc, "/svg:svg"_ostr, "width"_ostr, "216mm");
- assertXPath(mpXmlDoc, "/svg:svg"_ostr, "height"_ostr, "279mm");
+ assertXPath(mpXmlDoc, "/svg:svg"_ostr, "width"_ostr, u"216mm"_ustr);
+ assertXPath(mpXmlDoc, "/svg:svg"_ostr, "height"_ostr, u"279mm"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testSVG)
@@ -775,9 +787,9 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testSVG)
uno::Any(static_cast<sal_Int32>(libepubgen::EPUB_LAYOUT_METHOD_FIXED)) } }));
createDoc(u"hello.fodt", aFilterData);
- CPPUNIT_ASSERT(mxZipFile->hasByName("OEBPS/images/image0001.svg"));
+ CPPUNIT_ASSERT(mxZipFile->hasByName(u"OEBPS/images/image0001.svg"_ustr));
uno::Reference<io::XInputStream> xInputStream(
- mxZipFile->getByName("OEBPS/images/image0001.svg"), uno::UNO_QUERY);
+ mxZipFile->getByName(u"OEBPS/images/image0001.svg"_ustr),
uno::UNO_QUERY);
std::unique_ptr<SvStream>
pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
SvMemoryStream aMemoryStream;
@@ -792,7 +804,7 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest, testSVG)
// This failed, we used the xlink attribute namespace, but we did not
// define its URL.
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/images/image0001.svg");
+ xmlDocUniquePtr mpXmlDoc = parseExport(u"OEBPS/images/image0001.svg"_ustr);
assertXPathNSDef(mpXmlDoc, "/svg:svg"_ostr, u"xlink",
u"http://www.w3.org/1999/xlink";);
}
@@ -800,28 +812,30 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest,
testTdf115623SingleWritingMode)
{
// Simple page that has single writing mode should work.
createDoc(u"tdf115623-single-writing-mode.odt", {});
- std::map<OUString, std::vector<OUString>> aCssDoc =
parseCss("OEBPS/styles/stylesheet.css");
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
+ std::map<OUString, std::vector<OUString>> aCssDoc
+ = parseCss(u"OEBPS/styles/stylesheet.css"_ustr);
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
OUString aClass = getXPath(mpXmlDoc, "//xhtml:body"_ostr, "class"_ostr);
- CPPUNIT_ASSERT_EQUAL(OUString("vertical-rl"),
+ CPPUNIT_ASSERT_EQUAL(u"vertical-rl"_ustr,
EPUBExportTest::getCss(aCssDoc, aClass,
u"writing-mode"));
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testTdf115623SplitByChapter)
{
createDoc(u"tdf115623-split-by-chapter.odt", {});
- std::map<OUString, std::vector<OUString>> aCssDoc =
parseCss("OEBPS/styles/stylesheet.css");
+ std::map<OUString, std::vector<OUString>> aCssDoc
+ = parseCss(u"OEBPS/styles/stylesheet.css"_ustr);
{
- xmlDocUniquePtr mpXmlDoc =
parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
OUString aClass = getXPath(mpXmlDoc, "//xhtml:body"_ostr,
"class"_ostr);
- CPPUNIT_ASSERT_EQUAL(OUString("vertical-rl"),
+ CPPUNIT_ASSERT_EQUAL(u"vertical-rl"_ustr,
EPUBExportTest::getCss(aCssDoc, aClass,
u"writing-mode"));
}
// Split HTML should keep the same writing-mode.
{
- xmlDocUniquePtr mpXmlDoc =
parseExport("OEBPS/sections/section0002.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0002.xhtml"_ustr);
OUString aClass = getXPath(mpXmlDoc, "//xhtml:body"_ostr,
"class"_ostr);
- CPPUNIT_ASSERT_EQUAL(OUString("vertical-rl"),
+ CPPUNIT_ASSERT_EQUAL(u"vertical-rl"_ustr,
EPUBExportTest::getCss(aCssDoc, aClass,
u"writing-mode"));
}
}
@@ -829,18 +843,19 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest,
testTdf115623SplitByChapter)
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testTdf115623ManyPageSpans)
{
createDoc(u"tdf115623-many-pagespans.odt", {});
- std::map<OUString, std::vector<OUString>> aCssDoc =
parseCss("OEBPS/styles/stylesheet.css");
+ std::map<OUString, std::vector<OUString>> aCssDoc
+ = parseCss(u"OEBPS/styles/stylesheet.css"_ustr);
// Two pages should have different writing modes.
{
- xmlDocUniquePtr mpXmlDoc =
parseExport("OEBPS/sections/section0001.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
OUString aClass = getXPath(mpXmlDoc, "//xhtml:body"_ostr,
"class"_ostr);
- CPPUNIT_ASSERT_EQUAL(OUString("vertical-rl"),
+ CPPUNIT_ASSERT_EQUAL(u"vertical-rl"_ustr,
EPUBExportTest::getCss(aCssDoc, aClass,
u"writing-mode"));
}
{
- xmlDocUniquePtr mpXmlDoc =
parseExport("OEBPS/sections/section0002.xhtml");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0002.xhtml"_ustr);
OUString aClass = getXPath(mpXmlDoc, "//xhtml:body"_ostr,
"class"_ostr);
- CPPUNIT_ASSERT_EQUAL(OUString("horizontal-tb"),
+ CPPUNIT_ASSERT_EQUAL(u"horizontal-tb"_ustr,
EPUBExportTest::getCss(aCssDoc, aClass,
u"writing-mode"));
}
}
@@ -848,9 +863,11 @@ CPPUNIT_TEST_FIXTURE(EPUBExportTest,
testTdf115623ManyPageSpans)
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testSimpleRuby)
{
createDoc(u"simple-ruby.odt", {});
- xmlDocUniquePtr mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml");
- assertXPathContent(mpXmlDoc,
"//xhtml:body/xhtml:p/xhtml:ruby/xhtml:span"_ostr, "base text");
- assertXPathContent(mpXmlDoc,
"//xhtml:body/xhtml:p/xhtml:ruby/xhtml:rt"_ostr, "ruby text");
+ xmlDocUniquePtr mpXmlDoc =
parseExport(u"OEBPS/sections/section0001.xhtml"_ustr);
+ assertXPathContent(mpXmlDoc,
"//xhtml:body/xhtml:p/xhtml:ruby/xhtml:span"_ostr,
+ u"base text"_ustr);
+ assertXPathContent(mpXmlDoc,
"//xhtml:body/xhtml:p/xhtml:ruby/xhtml:rt"_ostr,
+ u"ruby text"_ustr);
}
CPPUNIT_TEST_FIXTURE(EPUBExportTest, testAbi11105)
diff --git a/writerperfect/qa/unit/ImportTest.cxx
b/writerperfect/qa/unit/ImportTest.cxx
index d441b89aecd2..5191126acef0 100644
--- a/writerperfect/qa/unit/ImportTest.cxx
+++ b/writerperfect/qa/unit/ImportTest.cxx
@@ -66,9 +66,9 @@ void ImportTest::setUp()
{
writerperfect::test::WpftFilterFixture::setUp();
- m_xFilterFactory.set(
-
m_xFactory->createInstanceWithContext("com.sun.star.document.FilterFactory",
m_xContext),
- UNO_QUERY);
+ m_xFilterFactory.set(m_xFactory->createInstanceWithContext(
+ u"com.sun.star.document.FilterFactory"_ustr,
m_xContext),
+ UNO_QUERY);
assert(m_xFilterFactory.is());
}
@@ -84,13 +84,13 @@ void ImportTest::testWK3WithFM3()
uno::Reference<beans::XPropertySet>
xCellProps(xSheet->getCellByPosition(1, 1), UNO_QUERY);
CPPUNIT_ASSERT(xCellProps.is());
Color nCharColor;
- CPPUNIT_ASSERT(xCellProps->getPropertyValue("CharColor") >>= nCharColor);
+ CPPUNIT_ASSERT(xCellProps->getPropertyValue(u"CharColor"_ustr) >>=
nCharColor);
CPPUNIT_ASSERT_EQUAL(COL_LIGHTBLUE, nCharColor); // blue text
}
WpftLoader ImportTest::createCalcLoader(std::u16string_view rFile) const
{
- return createLoader(makeUrl(rFile), "private:factory/scalc");
+ return createLoader(makeUrl(rFile), u"private:factory/scalc"_ustr);
}
WpftLoader ImportTest::createLoader(const OUString& rUrl, const OUString&
rFactoryUrl) const
diff --git a/writerperfect/qa/unit/PresentationImportTest.cxx
b/writerperfect/qa/unit/PresentationImportTest.cxx
index 0c29c72695df..ed1d7a8bec5c 100644
--- a/writerperfect/qa/unit/PresentationImportTest.cxx
+++ b/writerperfect/qa/unit/PresentationImportTest.cxx
@@ -67,7 +67,7 @@ bool
PresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUSt
// XServiceInfo
OUString SAL_CALL PresentationImportFilter::getImplementationName()
{
- return "org.libreoffice.comp.Wpft.QA.PresentationImportFilter";
+ return u"org.libreoffice.comp.Wpft.QA.PresentationImportFilter"_ustr;
}
sal_Bool SAL_CALL PresentationImportFilter::supportsService(const OUString&
rServiceName)
@@ -77,7 +77,8 @@ sal_Bool SAL_CALL
PresentationImportFilter::supportsService(const OUString& rSer
uno::Sequence<OUString> SAL_CALL
PresentationImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
void PresentationImportFilter::generate(librevenge::RVNGPresentationInterface&
rDocument)
@@ -123,8 +124,8 @@ void PresentationImportTest::test()
using namespace css;
rtl::Reference<PresentationImportFilter> xFilter{ new
PresentationImportFilter(m_xContext) };
- writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter,
"private:factory/simpress",
- m_xDesktop, m_xContext);
+ writerperfect::test::WpftLoader aLoader(
+ createDummyInput(), xFilter, u"private:factory/simpress"_ustr,
m_xDesktop, m_xContext);
uno::Reference<drawing::XDrawPagesSupplier> xDoc(aLoader.getDocument(),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xDoc.is());
@@ -135,9 +136,9 @@ void PresentationImportTest::test()
CPPUNIT_ASSERT(aPage >>= xPageProps);
CPPUNIT_ASSERT(xPageProps.is());
sal_Int32 nProp = 0;
- CPPUNIT_ASSERT(xPageProps->getPropertyValue("Height") >>= nProp);
+ CPPUNIT_ASSERT(xPageProps->getPropertyValue(u"Height"_ustr) >>= nProp);
CPPUNIT_ASSERT_EQUAL(sal_Int32(600), nProp);
- CPPUNIT_ASSERT(xPageProps->getPropertyValue("Width") >>= nProp);
+ CPPUNIT_ASSERT(xPageProps->getPropertyValue(u"Width"_ustr) >>= nProp);
CPPUNIT_ASSERT_EQUAL(sal_Int32(800), nProp);
uno::Reference<drawing::XShapes> xShapes(xPageProps, uno::UNO_QUERY);
CPPUNIT_ASSERT(xShapes.is());
@@ -145,9 +146,9 @@ void PresentationImportTest::test()
uno::Reference<drawing::XShapeDescriptor> xShapeDesc;
CPPUNIT_ASSERT(aShape >>= xShapeDesc);
CPPUNIT_ASSERT(xShapeDesc.is());
- CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.TextShape"),
xShapeDesc->getShapeType());
+ CPPUNIT_ASSERT_EQUAL(u"com.sun.star.drawing.TextShape"_ustr,
xShapeDesc->getShapeType());
uno::Reference<text::XText> xText(xShapeDesc, uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(OUString("My hovercraft is full of eels."),
xText->getString());
+ CPPUNIT_ASSERT_EQUAL(u"My hovercraft is full of eels."_ustr,
xText->getString());
}
CPPUNIT_TEST_SUITE_REGISTRATION(PresentationImportTest);
diff --git a/writerperfect/qa/unit/SpreadsheetImportTest.cxx
b/writerperfect/qa/unit/SpreadsheetImportTest.cxx
index 3c5de090ce1c..1e3b21bc933b 100644
--- a/writerperfect/qa/unit/SpreadsheetImportTest.cxx
+++ b/writerperfect/qa/unit/SpreadsheetImportTest.cxx
@@ -65,7 +65,7 @@ bool
SpreadsheetImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUStr
// XServiceInfo
OUString SAL_CALL SpreadsheetImportFilter::getImplementationName()
{
- return "org.libreoffice.comp.Wpft.QA.SpreadsheetImportFilter";
+ return u"org.libreoffice.comp.Wpft.QA.SpreadsheetImportFilter"_ustr;
}
sal_Bool SAL_CALL SpreadsheetImportFilter::supportsService(const OUString&
rServiceName)
@@ -75,7 +75,8 @@ sal_Bool SAL_CALL
SpreadsheetImportFilter::supportsService(const OUString& rServ
uno::Sequence<OUString> SAL_CALL
SpreadsheetImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
void SpreadsheetImportFilter::generate(librevenge::RVNGSpreadsheetInterface&
rDocument)
@@ -117,8 +118,8 @@ void SpreadsheetImportTest::test()
using namespace css;
rtl::Reference<SpreadsheetImportFilter> xFilter{ new
SpreadsheetImportFilter(m_xContext) };
- writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter,
"private:factory/scalc",
- m_xDesktop, m_xContext);
+ writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter,
+ u"private:factory/scalc"_ustr,
m_xDesktop, m_xContext);
uno::Reference<sheet::XSpreadsheetDocument> xDoc(aLoader.getDocument(),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xDoc.is());
@@ -129,7 +130,7 @@ void SpreadsheetImportTest::test()
uno::Reference<table::XCell> xCell = xSheet->getCellByPosition(0, 0);
CPPUNIT_ASSERT(xCell.is());
CPPUNIT_ASSERT_EQUAL(table::CellContentType_TEXT, xCell->getType());
- CPPUNIT_ASSERT_EQUAL(OUString("My hovercraft is full of eels."),
xCell->getFormula());
+ CPPUNIT_ASSERT_EQUAL(u"My hovercraft is full of eels."_ustr,
xCell->getFormula());
}
CPPUNIT_TEST_SUITE_REGISTRATION(SpreadsheetImportTest);
diff --git a/writerperfect/qa/unit/TextImportTest.cxx
b/writerperfect/qa/unit/TextImportTest.cxx
index c1ff7ad75ff2..cef8cbe4f1f1 100644
--- a/writerperfect/qa/unit/TextImportTest.cxx
+++ b/writerperfect/qa/unit/TextImportTest.cxx
@@ -65,7 +65,7 @@ bool
TextImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUString& rT
// XServiceInfo
OUString SAL_CALL TextImportFilter::getImplementationName()
{
- return "org.libreoffice.comp.Wpft.QA.TextImportFilter";
+ return u"org.libreoffice.comp.Wpft.QA.TextImportFilter"_ustr;
}
sal_Bool SAL_CALL TextImportFilter::supportsService(const OUString&
rServiceName)
@@ -75,7 +75,8 @@ sal_Bool SAL_CALL TextImportFilter::supportsService(const
OUString& rServiceName
uno::Sequence<OUString> SAL_CALL TextImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
void TextImportFilter::generate(librevenge::RVNGTextInterface& rDocument)
@@ -111,8 +112,8 @@ void TextImportTest::test()
using namespace css;
rtl::Reference<TextImportFilter> xFilter{ new TextImportFilter(m_xContext)
};
- writerperfect::test::WpftLoader aLoader(createDummyInput(), xFilter,
"private:factory/swriter",
- m_xDesktop, m_xContext);
+ writerperfect::test::WpftLoader aLoader(
+ createDummyInput(), xFilter, u"private:factory/swriter"_ustr,
m_xDesktop, m_xContext);
uno::Reference<text::XTextDocument> xDoc(aLoader.getDocument(),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xDoc.is());
@@ -130,11 +131,11 @@ void TextImportTest::test()
uno::Reference<beans::XPropertySet>
xPortionProps(xPortions->nextElement(), uno::UNO_QUERY);
CPPUNIT_ASSERT(xPortionProps.is());
OUString aPortionType;
- CPPUNIT_ASSERT(xPortionProps->getPropertyValue("TextPortionType") >>=
aPortionType);
- CPPUNIT_ASSERT_EQUAL(OUString("Text"), aPortionType);
+ CPPUNIT_ASSERT(xPortionProps->getPropertyValue(u"TextPortionType"_ustr)
>>= aPortionType);
+ CPPUNIT_ASSERT_EQUAL(u"Text"_ustr, aPortionType);
uno::Reference<text::XTextRange> xPortion(xPortionProps, uno::UNO_QUERY);
CPPUNIT_ASSERT(xPortion.is());
- CPPUNIT_ASSERT_EQUAL(OUString("My hovercraft is full of eels."),
xPortion->getString());
+ CPPUNIT_ASSERT_EQUAL(u"My hovercraft is full of eels."_ustr,
xPortion->getString());
CPPUNIT_ASSERT(!xPortions->hasMoreElements());
CPPUNIT_ASSERT(!xParas->hasMoreElements());
}
diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx
b/writerperfect/qa/unit/WPXSvStreamTest.cxx
index 7936664f2569..117f5e167e88 100644
--- a/writerperfect/qa/unit/WPXSvStreamTest.cxx
+++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx
@@ -91,7 +91,7 @@ shared_ptr<RVNGInputStream> lcl_createStreamForURL(const
OUString& rURL)
css::uno::UNO_SET_THROW);
const Reference<ucb::XSimpleFileAccess> xFileAccess(
xContext->getServiceManager()->createInstanceWithContext(
- "com.sun.star.ucb.SimpleFileAccess", xContext),
+ u"com.sun.star.ucb.SimpleFileAccess"_ustr, xContext),
UNO_QUERY_THROW);
const Reference<io::XInputStream>
xInputStream(xFileAccess->openFileRead(rURL),
css::uno::UNO_SET_THROW);
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index 22d1d4f95dd2..d776ca2ed48d 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -24,7 +24,7 @@ public:
};
WpftCalcFilterTest::WpftCalcFilterTest()
- : writerperfect::test::WpftFilterTestBase("private:factory/scalc")
+ : writerperfect::test::WpftFilterTestBase(u"private:factory/scalc"_ustr)
{
}
@@ -44,13 +44,13 @@ void WpftCalcFilterTest::test()
{ "QuattroPro.wb1", REQUIRE_WPS_VERSION(0, 4, 8) },
};
- doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter",
+ doTest(u"com.sun.star.comp.Calc.MWAWCalcImportFilter"_ustr,
u"/writerperfect/qa/unit/data/calc/libmwaw/", aMWAWOptional);
- doTest("com.sun.star.comp.Calc.MSWorksCalcImportFilter",
+ doTest(u"com.sun.star.comp.Calc.MSWorksCalcImportFilter"_ustr,
u"/writerperfect/qa/unit/data/calc/libwps/", aWpsOptional);
- doTest("org.libreoffice.comp.Calc.NumbersImportFilter",
+ doTest(u"org.libreoffice.comp.Calc.NumbersImportFilter"_ustr,
u"/writerperfect/qa/unit/data/calc/libetonyek/", aEtonyekOptional);
- doTest("org.libreoffice.comp.Calc.StarOfficeCalcImportFilter",
+ doTest(u"org.libreoffice.comp.Calc.StarOfficeCalcImportFilter"_ustr,
u"/writerperfect/qa/unit/data/calc/libstaroffice/");
}
diff --git a/writerperfect/qa/unit/WpftDrawFilterTest.cxx
b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
index 78168cdb9ce0..5fb00d6024f2 100644
--- a/writerperfect/qa/unit/WpftDrawFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
@@ -24,7 +24,7 @@ public:
};
WpftDrawFilterTest::WpftDrawFilterTest()
- : writerperfect::test::WpftFilterTestBase("private:factory/sdraw")
+ : writerperfect::test::WpftFilterTestBase(u"private:factory/sdraw"_ustr)
{
}
@@ -53,23 +53,25 @@ void WpftDrawFilterTest::test()
{ "Draw_3.1.sda", REQUIRE_STAROFFICE_VERSION(0, 0, 1) },
};
- doTest("com.sun.star.comp.Draw.CDRImportFilter",
u"/writerperfect/qa/unit/data/draw/libcdr/");
- doTest("com.sun.star.comp.Draw.CMXImportFilter",
+ doTest(u"com.sun.star.comp.Draw.CDRImportFilter"_ustr,
+ u"/writerperfect/qa/unit/data/draw/libcdr/");
+ doTest(u"com.sun.star.comp.Draw.CMXImportFilter"_ustr,
u"/writerperfect/qa/unit/data/draw/libcdr-cmx/");
- doTest("com.sun.star.comp.Draw.FreehandImportFilter",
+ doTest(u"com.sun.star.comp.Draw.FreehandImportFilter"_ustr,
u"/writerperfect/qa/unit/data/draw/libfreehand/");
- doTest("com.sun.star.comp.Draw.MSPUBImportFilter",
+ doTest(u"com.sun.star.comp.Draw.MSPUBImportFilter"_ustr,
u"/writerperfect/qa/unit/data/draw/libmspub/");
- doTest("com.sun.star.comp.Draw.MWAWDrawImportFilter",
+ doTest(u"com.sun.star.comp.Draw.MWAWDrawImportFilter"_ustr,
u"/writerperfect/qa/unit/data/draw/libmwaw/", aMWAWOptional);
- doTest("com.sun.star.comp.Draw.VisioImportFilter",
+ doTest(u"com.sun.star.comp.Draw.VisioImportFilter"_ustr,
u"/writerperfect/qa/unit/data/draw/libvisio/");
- doTest("com.sun.star.comp.Draw.WPGImportFilter",
u"/writerperfect/qa/unit/data/draw/libwpg/");
- doTest("org.libreoffice.comp.Draw.PageMakerImportFilter",
+ doTest(u"com.sun.star.comp.Draw.WPGImportFilter"_ustr,
+ u"/writerperfect/qa/unit/data/draw/libwpg/");
+ doTest(u"org.libreoffice.comp.Draw.PageMakerImportFilter"_ustr,
u"/writerperfect/qa/unit/data/draw/libpagemaker/");
- doTest("org.libreoffice.comp.Draw.StarOfficeDrawImportFilter",
+ doTest(u"org.libreoffice.comp.Draw.StarOfficeDrawImportFilter"_ustr,
u"/writerperfect/qa/unit/data/draw/libstaroffice/",
aStarOfficeOptional);
- doTest("org.libreoffice.comp.Draw.ZMFImportFilter",
+ doTest(u"org.libreoffice.comp.Draw.ZMFImportFilter"_ustr,
u"/writerperfect/qa/unit/data/draw/libzmf/");
}
diff --git a/writerperfect/qa/unit/WpftFilterFixture.cxx
b/writerperfect/qa/unit/WpftFilterFixture.cxx
index 142ff22c36be..0931f6777820 100644
--- a/writerperfect/qa/unit/WpftFilterFixture.cxx
+++ b/writerperfect/qa/unit/WpftFilterFixture.cxx
@@ -25,9 +25,9 @@ void WpftFilterFixture::setUp()
m_xDesktop = frame::theDesktop::get(m_xContext);
- m_xTypeDetection.set(
-
m_xFactory->createInstanceWithContext("com.sun.star.document.TypeDetection",
m_xContext),
- uno::UNO_QUERY_THROW);
+ m_xTypeDetection.set(m_xFactory->createInstanceWithContext(
+ u"com.sun.star.document.TypeDetection"_ustr,
m_xContext),
+ uno::UNO_QUERY_THROW);
m_xTypeMap.set(m_xTypeDetection, uno::UNO_QUERY_THROW);
}
}
diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
index 9ff60296b2b6..db087f582c5c 100644
--- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
@@ -24,7 +24,7 @@ public:
};
WpftImpressFilterTest::WpftImpressFilterTest()
- : writerperfect::test::WpftFilterTestBase("private:factory/simpress")
+ : writerperfect::test::WpftFilterTestBase(u"private:factory/simpress"_ustr)
{
}
@@ -48,9 +48,9 @@ void WpftImpressFilterTest::test()
{ "PowerPoint_7.ppt", REQUIRE_MWAW_VERSION(0, 3, 11) },
};
- doTest("org.libreoffice.comp.Impress.KeynoteImportFilter",
+ doTest(u"org.libreoffice.comp.Impress.KeynoteImportFilter"_ustr,
u"/writerperfect/qa/unit/data/impress/libetonyek/",
aEtonyekOptional);
- doTest("com.sun.star.comp.Impress.MWAWPresentationImportFilter",
+ doTest(u"com.sun.star.comp.Impress.MWAWPresentationImportFilter"_ustr,
u"/writerperfect/qa/unit/data/impress/libmwaw/", aMWAWOptional);
}
diff --git a/writerperfect/qa/unit/WpftLoader.cxx
b/writerperfect/qa/unit/WpftLoader.cxx
index a27557a54a6f..bbacb128e19d 100644
--- a/writerperfect/qa/unit/WpftLoader.cxx
+++ b/writerperfect/qa/unit/WpftLoader.cxx
@@ -87,7 +87,7 @@ const css::uno::Reference<css::lang::XComponent>&
WpftLoader::getDocument() cons
bool WpftLoader::impl_load()
{
// create an empty frame
- m_xDoc.set(m_xDesktop->loadComponentFromURL(m_aFactoryURL, "_blank", 0,
+ m_xDoc.set(m_xDesktop->loadComponentFromURL(m_aFactoryURL, u"_blank"_ustr,
0,
uno::Sequence<beans::PropertyValue>()),
uno::UNO_SET_THROW);
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 78d24dc99b17..0bbe163814de 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -24,7 +24,7 @@ public:
};
WpftWriterFilterTest::WpftWriterFilterTest()
- : writerperfect::test::WpftFilterTestBase("private:factory/swriter")
+ : writerperfect::test::WpftFilterTestBase(u"private:factory/swriter"_ustr)
{
}
@@ -57,19 +57,19 @@ void WpftWriterFilterTest::test()
{ "Write_3.1.wri", REQUIRE_WPS_VERSION(0, 4, 2) },
};
- doTest("com.sun.star.comp.Writer.AbiWordImportFilter",
+ doTest(u"com.sun.star.comp.Writer.AbiWordImportFilter"_ustr,
u"/writerperfect/qa/unit/data/writer/libabw/");
- doTest("org.libreoffice.comp.Writer.EBookImportFilter",
+ doTest(u"org.libreoffice.comp.Writer.EBookImportFilter"_ustr,
u"/writerperfect/qa/unit/data/writer/libe-book/", aEBookOptional);
- doTest("com.sun.star.comp.Writer.MSWorksImportFilter",
+ doTest(u"com.sun.star.comp.Writer.MSWorksImportFilter"_ustr,
u"/writerperfect/qa/unit/data/writer/libwps/", aWpsOptional);
- doTest("com.sun.star.comp.Writer.MWAWImportFilter",
+ doTest(u"com.sun.star.comp.Writer.MWAWImportFilter"_ustr,
u"/writerperfect/qa/unit/data/writer/libmwaw/", aMWAWOptional);
- doTest("org.libreoffice.comp.Writer.PagesImportFilter",
+ doTest(u"org.libreoffice.comp.Writer.PagesImportFilter"_ustr,
u"/writerperfect/qa/unit/data/writer/libetonyek/",
aEtonyekOptional);
- doTest("org.libreoffice.comp.Writer.StarOfficeWriterImportFilter",
+ doTest(u"org.libreoffice.comp.Writer.StarOfficeWriterImportFilter"_ustr,
u"/writerperfect/qa/unit/data/writer/libstaroffice/",
aStarOfficeOptional);
- doTest("com.sun.star.comp.Writer.WordPerfectImportFilter",
+ doTest(u"com.sun.star.comp.Writer.WordPerfectImportFilter"_ustr,
u"/writerperfect/qa/unit/data/writer/libwpd/");
}
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index bc13f9fc74b5..3ad0ef2bbeda 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -49,7 +49,7 @@ getResultSet(const css::uno::Reference<css::ucb::XContent>&
xPackageContent)
ucbhelper::Content packageContent(xPackageContent,
uno::Reference<ucb::XCommandEnvironment>(),
comphelper::getProcessComponentContext());
- uno::Sequence<OUString> lPropNames{ "Title" };
+ uno::Sequence<OUString> lPropNames{ u"Title"_ustr };
uno::Reference<sdbc::XResultSet> xResultSet(
packageContent.createCursor(lPropNames,
ucbhelper::INCLUDE_DOCUMENTS_ONLY));
return xResultSet;
@@ -452,7 +452,7 @@ void
MSWorksCalcImportFilter::doRegisterHandlers(OdsGenerator&) {}
// XServiceInfo
OUString SAL_CALL MSWorksCalcImportFilter::getImplementationName()
{
- return "com.sun.star.comp.Calc.MSWorksCalcImportFilter";
+ return u"com.sun.star.comp.Calc.MSWorksCalcImportFilter"_ustr;
}
sal_Bool SAL_CALL MSWorksCalcImportFilter::supportsService(const OUString&
rServiceName)
@@ -462,7 +462,8 @@ sal_Bool SAL_CALL
MSWorksCalcImportFilter::supportsService(const OUString& rServ
css::uno::Sequence<OUString> SAL_CALL
MSWorksCalcImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.cxx
b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
index 186084b17746..e07c013732c0 100644
--- a/writerperfect/source/calc/MWAWCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
@@ -101,7 +101,7 @@ void MWAWCalcImportFilter::doRegisterHandlers(OdsGenerator&
rGenerator)
// XServiceInfo
OUString SAL_CALL MWAWCalcImportFilter::getImplementationName()
{
- return "com.sun.star.comp.Calc.MWAWCalcImportFilter";
+ return u"com.sun.star.comp.Calc.MWAWCalcImportFilter"_ustr;
}
sal_Bool SAL_CALL MWAWCalcImportFilter::supportsService(const OUString&
rServiceName)
@@ -111,7 +111,8 @@ sal_Bool SAL_CALL
MWAWCalcImportFilter::supportsService(const OUString& rService
css::uno::Sequence<OUString> SAL_CALL
MWAWCalcImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/calc/NumbersImportFilter.cxx
b/writerperfect/source/calc/NumbersImportFilter.cxx
index 813684361a01..7357c37b8b0a 100644
--- a/writerperfect/source/calc/NumbersImportFilter.cxx
+++ b/writerperfect/source/calc/NumbersImportFilter.cxx
@@ -42,7 +42,7 @@ void NumbersImportFilter::doRegisterHandlers(OdsGenerator&) {}
// XServiceInfo
OUString SAL_CALL NumbersImportFilter::getImplementationName()
{
- return "org.libreoffice.comp.Calc.NumbersImportFilter";
+ return u"org.libreoffice.comp.Calc.NumbersImportFilter"_ustr;
}
sal_Bool SAL_CALL NumbersImportFilter::supportsService(const OUString&
rServiceName)
@@ -52,7 +52,8 @@ sal_Bool SAL_CALL NumbersImportFilter::supportsService(const
OUString& rServiceN
css::uno::Sequence<OUString> SAL_CALL
NumbersImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
index de7e30e44d5c..8ec634875e37 100644
--- a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
+++ b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx
@@ -76,7 +76,7 @@ void
StarOfficeCalcImportFilter::doRegisterHandlers(OdsGenerator& rGenerator)
// XServiceInfo
OUString SAL_CALL StarOfficeCalcImportFilter::getImplementationName()
{
- return "org.libreoffice.comp.Calc.StarOfficeCalcImportFilter";
+ return u"org.libreoffice.comp.Calc.StarOfficeCalcImportFilter"_ustr;
}
sal_Bool SAL_CALL StarOfficeCalcImportFilter::supportsService(const OUString&
rServiceName)
@@ -86,7 +86,8 @@ sal_Bool SAL_CALL
StarOfficeCalcImportFilter::supportsService(const OUString& rS
Sequence<OUString> SAL_CALL
StarOfficeCalcImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/common/DirectoryStream.cxx
b/writerperfect/source/common/DirectoryStream.cxx
index 9664fbee9750..9238a4f3ab51 100644
--- a/writerperfect/source/common/DirectoryStream.cxx
+++ b/writerperfect/source/common/DirectoryStream.cxx
@@ -54,7 +54,7 @@ uno::Reference<io::XInputStream>
findStream(ucbhelper::Content& rContent, std::u
{
uno::Reference<io::XInputStream> xInputStream;
- uno::Sequence<OUString> lPropNames{ "Title" };
+ uno::Sequence<OUString> lPropNames{ u"Title"_ustr };
try
{
const uno::Reference<sdbc::XResultSet> xResultSet(
diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx
b/writerperfect/source/common/WPFTEncodingDialog.cxx
index d9fc0d9c1970..8a8fd6255ea6 100644
--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx
@@ -92,11 +92,11 @@ OUString getEncoding(const weld::ComboBox& box) { return
box.get_active_id(); }
WPFTEncodingDialog::WPFTEncodingDialog(weld::Window* pParent, const OUString&
title,
const OUString& encoding)
- : GenericDialogController(pParent,
"writerperfect/ui/wpftencodingdialog.ui",
- "WPFTEncodingDialog")
+ : GenericDialogController(pParent,
u"writerperfect/ui/wpftencodingdialog.ui"_ustr,
+ u"WPFTEncodingDialog"_ustr)
, m_userHasCancelled(false)
- , m_xLbCharset(m_xBuilder->weld_combo_box("comboboxtext"))
- , m_xBtnCancel(m_xBuilder->weld_button("cancel"))
+ , m_xLbCharset(m_xBuilder->weld_combo_box(u"comboboxtext"_ustr))
+ , m_xBtnCancel(m_xBuilder->weld_button(u"cancel"_ustr))
{
m_xBtnCancel->connect_clicked(LINK(this, WPFTEncodingDialog, CancelHdl));
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx
b/writerperfect/source/common/WPXSvInputStream.cxx
index ee975584edcf..a43acba44cc6 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -702,7 +702,7 @@ bool WPXSvInputStream::isZip()
UNO_SET_THROW);
const Reference<packages::zip::XZipFileAccess2> xZip(
xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
- "com.sun.star.packages.zip.ZipFileAccess", { Any(mxStream)
}, xContext),
+ u"com.sun.star.packages.zip.ZipFileAccess"_ustr, {
Any(mxStream) }, xContext),
UNO_QUERY_THROW);
mpZipStorage.reset(new ZipStorageImpl(xZip));
}
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx
b/writerperfect/source/draw/CDRImportFilter.cxx
index 34b490326168..823ef3a3e814 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -37,7 +37,7 @@ bool
CDRImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OUStri
// XServiceInfo
OUString SAL_CALL CDRImportFilter::getImplementationName()
{
- return "com.sun.star.comp.Draw.CDRImportFilter";
+ return u"com.sun.star.comp.Draw.CDRImportFilter"_ustr;
}
sal_Bool SAL_CALL CDRImportFilter::supportsService(const OUString&
rServiceName)
@@ -47,7 +47,8 @@ sal_Bool SAL_CALL CDRImportFilter::supportsService(const
OUString& rServiceName)
css::uno::Sequence<OUString> SAL_CALL
CDRImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx
b/writerperfect/source/draw/CMXImportFilter.cxx
index 23aab816af11..6fd0bfe00f33 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -37,7 +37,7 @@ bool
CMXImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OUStri
// XServiceInfo
OUString SAL_CALL CMXImportFilter::getImplementationName()
{
- return "com.sun.star.comp.Draw.CMXImportFilter";
+ return u"com.sun.star.comp.Draw.CMXImportFilter"_ustr;
}
sal_Bool SAL_CALL CMXImportFilter::supportsService(const OUString&
rServiceName)
@@ -47,7 +47,8 @@ sal_Bool SAL_CALL CMXImportFilter::supportsService(const
OUString& rServiceName)
css::uno::Sequence<OUString> SAL_CALL
CMXImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/draw/FreehandImportFilter.cxx
b/writerperfect/source/draw/FreehandImportFilter.cxx
index 68dd7b56b823..938f36de5645 100644
--- a/writerperfect/source/draw/FreehandImportFilter.cxx
+++ b/writerperfect/source/draw/FreehandImportFilter.cxx
@@ -33,7 +33,7 @@ bool
FreehandImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, O
// XServiceInfo
OUString SAL_CALL FreehandImportFilter::getImplementationName()
{
- return "com.sun.star.comp.Draw.FreehandImportFilter";
+ return u"com.sun.star.comp.Draw.FreehandImportFilter"_ustr;
}
sal_Bool SAL_CALL FreehandImportFilter::supportsService(const OUString&
rServiceName)
@@ -43,7 +43,8 @@ sal_Bool SAL_CALL FreehandImportFilter::supportsService(const
OUString& rService
css::uno::Sequence<OUString> SAL_CALL
FreehandImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx
b/writerperfect/source/draw/MSPUBImportFilter.cxx
index ba34cd2f19a7..b4c89f20853c 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.cxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.cxx
@@ -33,7 +33,7 @@ bool
MSPUBImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OUSt
// XServiceInfo
OUString SAL_CALL MSPUBImportFilter::getImplementationName()
{
- return "com.sun.star.comp.Draw.MSPUBImportFilter";
+ return u"com.sun.star.comp.Draw.MSPUBImportFilter"_ustr;
}
sal_Bool SAL_CALL MSPUBImportFilter::supportsService(const OUString&
rServiceName)
@@ -43,7 +43,8 @@ sal_Bool SAL_CALL MSPUBImportFilter::supportsService(const
OUString& rServiceNam
css::uno::Sequence<OUString> SAL_CALL
MSPUBImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx
b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
index 000debdcbd84..5292d2362c1e 100644
--- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx
+++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
@@ -93,7 +93,7 @@ void MWAWDrawImportFilter::doRegisterHandlers(OdgGenerator&
rGenerator)
// XServiceInfo
OUString SAL_CALL MWAWDrawImportFilter::getImplementationName()
{
- return "com.sun.star.comp.Draw.MWAWDrawImportFilter";
+ return u"com.sun.star.comp.Draw.MWAWDrawImportFilter"_ustr;
}
sal_Bool SAL_CALL MWAWDrawImportFilter::supportsService(const OUString&
rServiceName)
@@ -103,7 +103,8 @@ sal_Bool SAL_CALL
MWAWDrawImportFilter::supportsService(const OUString& rService
css::uno::Sequence<OUString> SAL_CALL
MWAWDrawImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/draw/PageMakerImportFilter.cxx
b/writerperfect/source/draw/PageMakerImportFilter.cxx
index 5f5379de94d9..b7d207c0e731 100644
--- a/writerperfect/source/draw/PageMakerImportFilter.cxx
+++ b/writerperfect/source/draw/PageMakerImportFilter.cxx
@@ -33,7 +33,7 @@ bool
PageMakerImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput,
// XServiceInfo
OUString SAL_CALL PageMakerImportFilter::getImplementationName()
{
- return "org.libreoffice.comp.Draw.PageMakerImportFilter";
+ return u"org.libreoffice.comp.Draw.PageMakerImportFilter"_ustr;
}
sal_Bool SAL_CALL PageMakerImportFilter::supportsService(const OUString&
rServiceName)
@@ -43,7 +43,8 @@ sal_Bool SAL_CALL
PageMakerImportFilter::supportsService(const OUString& rServic
css::uno::Sequence<OUString> SAL_CALL
PageMakerImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/draw/QXPImportFilter.cxx
b/writerperfect/source/draw/QXPImportFilter.cxx
index c644ad470c69..2a5ae0742310 100644
--- a/writerperfect/source/draw/QXPImportFilter.cxx
+++ b/writerperfect/source/draw/QXPImportFilter.cxx
@@ -37,7 +37,7 @@ bool
QXPImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OUStri
// XServiceInfo
OUString SAL_CALL QXPImportFilter::getImplementationName()
{
- return "org.libreoffice.comp.Draw.QXPImportFilter";
+ return u"org.libreoffice.comp.Draw.QXPImportFilter"_ustr;
}
sal_Bool SAL_CALL QXPImportFilter::supportsService(const OUString&
rServiceName)
@@ -47,7 +47,8 @@ sal_Bool SAL_CALL QXPImportFilter::supportsService(const
OUString& rServiceName)
Sequence<OUString> SAL_CALL QXPImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
index 1c335bfc46d5..0ad11f33ac76 100644
--- a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
+++ b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx
@@ -78,7 +78,7 @@ void
StarOfficeDrawImportFilter::doRegisterHandlers(OdgGenerator& rGenerator)
// XServiceInfo
OUString SAL_CALL StarOfficeDrawImportFilter::getImplementationName()
{
- return "org.libreoffice.comp.Draw.StarOfficeDrawImportFilter";
+ return u"org.libreoffice.comp.Draw.StarOfficeDrawImportFilter"_ustr;
}
sal_Bool SAL_CALL StarOfficeDrawImportFilter::supportsService(const OUString&
rServiceName)
@@ -88,7 +88,8 @@ sal_Bool SAL_CALL
StarOfficeDrawImportFilter::supportsService(const OUString& rS
Sequence<OUString> SAL_CALL
StarOfficeDrawImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/draw/VisioImportFilter.cxx
b/writerperfect/source/draw/VisioImportFilter.cxx
index 33b23aae4c08..04631240aff8 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -33,7 +33,7 @@ bool
VisioImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OUSt
// XServiceInfo
OUString SAL_CALL VisioImportFilter::getImplementationName()
{
- return "com.sun.star.comp.Draw.VisioImportFilter";
+ return u"com.sun.star.comp.Draw.VisioImportFilter"_ustr;
}
sal_Bool SAL_CALL VisioImportFilter::supportsService(const OUString&
rServiceName)
@@ -43,7 +43,8 @@ sal_Bool SAL_CALL VisioImportFilter::supportsService(const
OUString& rServiceNam
css::uno::Sequence<OUString> SAL_CALL
VisioImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/draw/WPGImportFilter.cxx
b/writerperfect/source/draw/WPGImportFilter.cxx
index 10411ea3bb0b..03b6d19bc453 100644
--- a/writerperfect/source/draw/WPGImportFilter.cxx
+++ b/writerperfect/source/draw/WPGImportFilter.cxx
@@ -39,7 +39,7 @@ bool
WPGImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OUStri
// XServiceInfo
OUString SAL_CALL WPGImportFilter::getImplementationName()
{
- return "com.sun.star.comp.Draw.WPGImportFilter";
+ return u"com.sun.star.comp.Draw.WPGImportFilter"_ustr;
}
sal_Bool SAL_CALL WPGImportFilter::supportsService(const OUString&
rServiceName)
@@ -49,7 +49,8 @@ sal_Bool SAL_CALL WPGImportFilter::supportsService(const
OUString& rServiceName)
css::uno::Sequence<OUString> SAL_CALL
WPGImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/draw/ZMFImportFilter.cxx
b/writerperfect/source/draw/ZMFImportFilter.cxx
index 0d1f16c977ef..15e8719b7bb7 100644
--- a/writerperfect/source/draw/ZMFImportFilter.cxx
+++ b/writerperfect/source/draw/ZMFImportFilter.cxx
@@ -37,7 +37,7 @@ bool
ZMFImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OUStri
// XServiceInfo
OUString SAL_CALL ZMFImportFilter::getImplementationName()
{
- return "org.libreoffice.comp.Draw.ZMFImportFilter";
+ return u"org.libreoffice.comp.Draw.ZMFImportFilter"_ustr;
}
sal_Bool SAL_CALL ZMFImportFilter::supportsService(const OUString&
rServiceName)
@@ -47,7 +47,8 @@ sal_Bool SAL_CALL ZMFImportFilter::supportsService(const
OUString& rServiceName)
Sequence<OUString> SAL_CALL ZMFImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx
b/writerperfect/source/impress/KeynoteImportFilter.cxx
index c2fb11012391..6e63cec53482 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.cxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.cxx
@@ -224,7 +224,7 @@
KeynoteImportFilter::detect(css::uno::Sequence<css::beans::PropertyValue>& Descr
// XServiceInfo
OUString SAL_CALL KeynoteImportFilter::getImplementationName()
{
- return "org.libreoffice.comp.Impress.KeynoteImportFilter";
+ return u"org.libreoffice.comp.Impress.KeynoteImportFilter"_ustr;
}
sal_Bool SAL_CALL KeynoteImportFilter::supportsService(const OUString&
rServiceName)
@@ -234,7 +234,8 @@ sal_Bool SAL_CALL
KeynoteImportFilter::supportsService(const OUString& rServiceN
css::uno::Sequence<OUString> SAL_CALL
KeynoteImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
index c5de6984ab42..6f7648066909 100644
--- a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
+++ b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
@@ -83,7 +83,7 @@ void
MWAWPresentationImportFilter::doRegisterHandlers(OdpGenerator& rGenerator)
// XServiceInfo
OUString SAL_CALL MWAWPresentationImportFilter::getImplementationName()
{
- return "com.sun.star.comp.Impress.MWAWPresentationImportFilter";
+ return u"com.sun.star.comp.Impress.MWAWPresentationImportFilter"_ustr;
}
sal_Bool SAL_CALL MWAWPresentationImportFilter::supportsService(const
OUString& rServiceName)
{
@@ -91,7 +91,8 @@ sal_Bool SAL_CALL
MWAWPresentationImportFilter::supportsService(const OUString&
}
css::uno::Sequence<OUString> SAL_CALL
MWAWPresentationImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git
a/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx
b/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx
index 4f60f57e3d6c..7249d1e1fcc2 100644
--- a/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx
+++ b/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx
@@ -79,7 +79,7 @@ void
StarOfficePresentationImportFilter::doRegisterHandlers(OdpGenerator& rGener
// XServiceInfo
OUString SAL_CALL StarOfficePresentationImportFilter::getImplementationName()
{
- return "org.libreoffice.comp.Impress.StarOfficePresentationImportFilter";
+ return
u"org.libreoffice.comp.Impress.StarOfficePresentationImportFilter"_ustr;
}
sal_Bool SAL_CALL StarOfficePresentationImportFilter::supportsService(const
OUString& rServiceName)
@@ -89,7 +89,8 @@ sal_Bool SAL_CALL
StarOfficePresentationImportFilter::supportsService(const OUSt
Sequence<OUString> SAL_CALL
StarOfficePresentationImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/writer/AbiWordImportFilter.cxx
b/writerperfect/source/writer/AbiWordImportFilter.cxx
index 0661604bc14e..167d336b791c 100644
--- a/writerperfect/source/writer/AbiWordImportFilter.cxx
+++ b/writerperfect/source/writer/AbiWordImportFilter.cxx
@@ -35,7 +35,7 @@ bool
AbiWordImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OU
// XServiceInfo
OUString SAL_CALL AbiWordImportFilter::getImplementationName()
{
- return "com.sun.star.comp.Writer.AbiWordImportFilter";
+ return u"com.sun.star.comp.Writer.AbiWordImportFilter"_ustr;
}
sal_Bool SAL_CALL AbiWordImportFilter::supportsService(const OUString&
rServiceName)
@@ -45,7 +45,8 @@ sal_Bool SAL_CALL AbiWordImportFilter::supportsService(const
OUString& rServiceN
css::uno::Sequence<OUString> SAL_CALL
AbiWordImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/writer/EBookImportFilter.cxx
b/writerperfect/source/writer/EBookImportFilter.cxx
index 3c53f2d9e9df..a4f5cdeebeb0 100644
--- a/writerperfect/source/writer/EBookImportFilter.cxx
+++ b/writerperfect/source/writer/EBookImportFilter.cxx
@@ -91,7 +91,7 @@ bool
EBookImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OUSt
// XServiceInfo
OUString SAL_CALL EBookImportFilter::getImplementationName()
{
- return "org.libreoffice.comp.Writer.EBookImportFilter";
+ return u"org.libreoffice.comp.Writer.EBookImportFilter"_ustr;
}
sal_Bool SAL_CALL EBookImportFilter::supportsService(const OUString&
rServiceName)
@@ -101,7 +101,8 @@ sal_Bool SAL_CALL EBookImportFilter::supportsService(const
OUString& rServiceNam
css::uno::Sequence<OUString> SAL_CALL
EBookImportFilter::getSupportedServiceNames()
{
- return { "com.sun.star.document.ImportFilter",
"com.sun.star.document.ExtendedTypeDetection" };
+ return { u"com.sun.star.document.ImportFilter"_ustr,
+ u"com.sun.star.document.ExtendedTypeDetection"_ustr };
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/writerperfect/source/writer/EPUBExportDialog.cxx
b/writerperfect/source/writer/EPUBExportDialog.cxx
index ecea590ac831..e83e40dcff37 100644
--- a/writerperfect/source/writer/EPUBExportDialog.cxx
+++ b/writerperfect/source/writer/EPUBExportDialog.cxx
@@ -76,29 +76,29 @@ EPUBExportDialog::EPUBExportDialog(weld::Window* pParent,
comphelper::SequenceAsHashMap& rFilterData,
uno::Reference<uno::XComponentContext>
xContext,
css::uno::Reference<css::lang::XComponent>
xDocument)
- : GenericDialogController(pParent, "writerperfect/ui/exportepub.ui",
"EpubDialog")
+ : GenericDialogController(pParent, u"writerperfect/ui/exportepub.ui"_ustr,
u"EpubDialog"_ustr)
, m_xContext(std::move(xContext))
, m_rFilterData(rFilterData)
, m_xSourceDocument(std::move(xDocument))
- , m_xVersion(m_xBuilder->weld_combo_box("versionlb"))
- , m_xSplit(m_xBuilder->weld_combo_box("splitlb"))
- , m_xLayout(m_xBuilder->weld_combo_box("layoutlb"))
- , m_xCoverPath(m_xBuilder->weld_entry("coverpath"))
- , m_xCoverButton(m_xBuilder->weld_button("coverbutton"))
- , m_xMediaDir(m_xBuilder->weld_entry("mediadir"))
- , m_xMediaButton(m_xBuilder->weld_button("mediabutton"))
- , m_xOKButton(m_xBuilder->weld_button("ok"))
- , m_xIdentifier(m_xBuilder->weld_entry("identifier"))
- , m_xTitle(m_xBuilder->weld_entry("title"))
- , m_xInitialCreator(m_xBuilder->weld_entry("author"))
- , m_xLanguage(m_xBuilder->weld_entry("language"))
- , m_xDate(m_xBuilder->weld_entry("date"))
- , m_xCustomizeFrame(m_xBuilder->weld_frame("customize"))
+ , m_xVersion(m_xBuilder->weld_combo_box(u"versionlb"_ustr))
+ , m_xSplit(m_xBuilder->weld_combo_box(u"splitlb"_ustr))
+ , m_xLayout(m_xBuilder->weld_combo_box(u"layoutlb"_ustr))
+ , m_xCoverPath(m_xBuilder->weld_entry(u"coverpath"_ustr))
+ , m_xCoverButton(m_xBuilder->weld_button(u"coverbutton"_ustr))
+ , m_xMediaDir(m_xBuilder->weld_entry(u"mediadir"_ustr))
+ , m_xMediaButton(m_xBuilder->weld_button(u"mediabutton"_ustr))
-e
... etc. - the rest is truncated
