From 6f50961e69406a17d6ec998956a6b33208b1001b Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue, 23 Oct 2018 12:06:00 +0200
Subject: remove more rtl::OUString and OString prefixes
which seem to have snuck back in since the great rounds of removals.
Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1
Reviewed-on: https://gerrit.libreoffice.org/62229
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
writerperfect/inc/DocumentHandlerFor.hxx | 2 +-
writerperfect/inc/DocumentHandlerForOdg.hxx | 5 +-
writerperfect/inc/DocumentHandlerForOdp.hxx | 5 +-
writerperfect/inc/DocumentHandlerForOds.hxx | 5 +-
writerperfect/inc/DocumentHandlerForOdt.hxx | 5 +-
writerperfect/qa/unit/DrawingImportTest.cxx | 22 +++---
writerperfect/qa/unit/ImportTest.cxx | 15 ++--
writerperfect/qa/unit/PresentationImportTest.cxx | 23 +++----
writerperfect/qa/unit/SpreadsheetImportTest.cxx | 19 +++--
writerperfect/qa/unit/TextImportTest.cxx | 23 +++----
writerperfect/qa/unit/WPXSvStreamTest.cxx | 2 +-
writerperfect/qa/unit/WpftFilterTestBase.cxx | 6 +-
writerperfect/qa/unit/WpftFilterTestBase.hxx | 10 +--
writerperfect/qa/unit/WpftLoader.cxx | 12 ++--
writerperfect/qa/unit/WpftLoader.hxx | 13 ++--
.../source/calc/MSWorksCalcImportFilter.cxx | 16 ++---
writerperfect/source/common/DirectoryStream.cxx | 7 +-
writerperfect/source/common/WPXSvInputStream.cxx | 80 +++++++++++-----------
writerperfect/source/writer/EBookImportFilter.cxx | 2 +-
19 files changed, 125 insertions(+), 147 deletions(-)
(limited to 'writerperfect')
diff --git a/writerperfect/inc/DocumentHandlerFor.hxx b/writerperfect/inc/DocumentHandlerFor.hxx
index dabd4ffcc5ef..0f31b85fd176 100644
--- a/writerperfect/inc/DocumentHandlerFor.hxx
+++ b/writerperfect/inc/DocumentHandlerFor.hxx
@@ -16,7 +16,7 @@ namespace writerperfect
*/
template <class Generator> struct DocumentHandlerFor
{
- // static const rtl::OUString name();
+ // static const OUString name();
};
}
diff --git a/writerperfect/inc/DocumentHandlerForOdg.hxx b/writerperfect/inc/DocumentHandlerForOdg.hxx
index 96cb288f6ba7..1fba93194948 100644
--- a/writerperfect/inc/DocumentHandlerForOdg.hxx
+++ b/writerperfect/inc/DocumentHandlerForOdg.hxx
@@ -16,10 +16,7 @@ namespace writerperfect
{
template <> struct DocumentHandlerFor<OdgGenerator>
{
- static const rtl::OUString name()
- {
- return rtl::OUString("com.sun.star.comp.Draw.XMLOasisImporter");
- }
+ static const OUString name() { return OUString("com.sun.star.comp.Draw.XMLOasisImporter"); }
};
}
diff --git a/writerperfect/inc/DocumentHandlerForOdp.hxx b/writerperfect/inc/DocumentHandlerForOdp.hxx
index 0ca91c65bd06..d7a3aaf9f28b 100644
--- a/writerperfect/inc/DocumentHandlerForOdp.hxx
+++ b/writerperfect/inc/DocumentHandlerForOdp.hxx
@@ -16,10 +16,7 @@ namespace writerperfect
{
template <> struct DocumentHandlerFor<OdpGenerator>
{
- static const rtl::OUString name()
- {
- return rtl::OUString("com.sun.star.comp.Impress.XMLOasisImporter");
- }
+ static const OUString name() { return OUString("com.sun.star.comp.Impress.XMLOasisImporter"); }
};
}
diff --git a/writerperfect/inc/DocumentHandlerForOds.hxx b/writerperfect/inc/DocumentHandlerForOds.hxx
index 60f96d2332cd..9b789d628e11 100644
--- a/writerperfect/inc/DocumentHandlerForOds.hxx
+++ b/writerperfect/inc/DocumentHandlerForOds.hxx
@@ -16,10 +16,7 @@ namespace writerperfect
{
template <> struct DocumentHandlerFor<OdsGenerator>
{
- static const rtl::OUString name()
- {
- return rtl::OUString("com.sun.star.comp.Calc.XMLOasisImporter");
- }
+ static const OUString name() { return OUString("com.sun.star.comp.Calc.XMLOasisImporter"); }
};
}
diff --git a/writerperfect/inc/DocumentHandlerForOdt.hxx b/writerperfect/inc/DocumentHandlerForOdt.hxx
index e933644b534d..d1abe81d9bb6 100644
--- a/writerperfect/inc/DocumentHandlerForOdt.hxx
+++ b/writerperfect/inc/DocumentHandlerForOdt.hxx
@@ -16,10 +16,7 @@ namespace writerperfect
{
template <> struct DocumentHandlerFor<OdtGenerator>
{
- static const rtl::OUString name()
- {
- return rtl::OUString("com.sun.star.comp.Writer.XMLOasisImporter");
- }
+ static const OUString name() { return OUString("com.sun.star.comp.Writer.XMLOasisImporter"); }
};
}
diff --git a/writerperfect/qa/unit/DrawingImportTest.cxx b/writerperfect/qa/unit/DrawingImportTest.cxx
index 5e71bf3e9b4f..4e1300d496c3 100644
--- a/writerperfect/qa/unit/DrawingImportTest.cxx
+++ b/writerperfect/qa/unit/DrawingImportTest.cxx
@@ -38,13 +38,12 @@ public:
}
// XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) override;
- virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
private:
- virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput,
- rtl::OUString& rTypeName) override;
+ virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, OUString& rTypeName) override;
virtual bool doImportDocument(weld::Window* pWindow, librevenge::RVNGInputStream& rInput,
OdgGenerator& rGenerator,
utl::MediaDescriptor& rDescriptor) override;
@@ -59,24 +58,24 @@ bool DrawingImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputS
return true;
}
-bool DrawingImportFilter::doDetectFormat(librevenge::RVNGInputStream&, rtl::OUString& rTypeName)
+bool DrawingImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUString& rTypeName)
{
rTypeName = "WpftDummyDrawing";
return true;
}
// XServiceInfo
-rtl::OUString SAL_CALL DrawingImportFilter::getImplementationName()
+OUString SAL_CALL DrawingImportFilter::getImplementationName()
{
return OUString("org.libreoffice.comp.Wpft.QA.DrawingImportFilter");
}
-sal_Bool SAL_CALL DrawingImportFilter::supportsService(const rtl::OUString& rServiceName)
+sal_Bool SAL_CALL DrawingImportFilter::supportsService(const OUString& rServiceName)
{
return cppu::supportsService(this, rServiceName);
}
-uno::Sequence<rtl::OUString> SAL_CALL DrawingImportFilter::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL DrawingImportFilter::getSupportedServiceNames()
{
return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" };
}
@@ -146,10 +145,9 @@ void DrawingImportTest::test()
uno::Reference<drawing::XShapeDescriptor> xShapeDesc;
CPPUNIT_ASSERT(aShape >>= xShapeDesc);
CPPUNIT_ASSERT(xShapeDesc.is());
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("com.sun.star.drawing.TextShape"),
- xShapeDesc->getShapeType());
+ CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.TextShape"), xShapeDesc->getShapeType());
uno::Reference<text::XText> xText(xShapeDesc, uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("My hovercraft is full of eels."), xText->getString());
+ CPPUNIT_ASSERT_EQUAL(OUString("My hovercraft is full of eels."), xText->getString());
}
CPPUNIT_TEST_SUITE_REGISTRATION(DrawingImportTest);
diff --git a/writerperfect/qa/unit/ImportTest.cxx b/writerperfect/qa/unit/ImportTest.cxx
index 3168ac6aade3..3a7b9c2293f0 100644
--- a/writerperfect/qa/unit/ImportTest.cxx
+++ b/writerperfect/qa/unit/ImportTest.cxx
@@ -47,11 +47,11 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
- WpftLoader createCalcLoader(const rtl::OUString& rFile) const;
+ WpftLoader createCalcLoader(const OUString& rFile) const;
- WpftLoader createLoader(const rtl::OUString& rUrl, const rtl::OUString& rFactoryUrl) const;
+ WpftLoader createLoader(const OUString& rUrl, const OUString& rFactoryUrl) const;
- rtl::OUString makeUrl(const rtl::OUString& rFile) const;
+ OUString makeUrl(const OUString& rFile) const;
private:
uno::Reference<lang::XMultiServiceFactory> m_xFilterFactory;
@@ -83,13 +83,12 @@ void ImportTest::testWK3WithFM3()
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x0000ff), nCharColor); // blue text
}
-WpftLoader ImportTest::createCalcLoader(const rtl::OUString& rFile) const
+WpftLoader ImportTest::createCalcLoader(const OUString& rFile) const
{
return createLoader(makeUrl(rFile), "private:factory/scalc");
}
-WpftLoader ImportTest::createLoader(const rtl::OUString& rUrl,
- const rtl::OUString& rFactoryUrl) const
+WpftLoader ImportTest::createLoader(const OUString& rUrl, const OUString& rFactoryUrl) const
{
utl::MediaDescriptor aDesc;
aDesc[utl::MediaDescriptor::PROP_URL()] <<= rUrl;
@@ -97,7 +96,7 @@ WpftLoader ImportTest::createLoader(const rtl::OUString& rUrl,
uno::Sequence<beans::PropertyValue> lDesc(aDesc.getAsConstPropertyValueList());
m_xTypeDetection->queryTypeByDescriptor(lDesc, true);
aDesc = lDesc;
- rtl::OUString sFilter;
+ OUString sFilter;
aDesc[utl::MediaDescriptor::PROP_FILTERNAME()] >>= sFilter;
CPPUNIT_ASSERT(!sFilter.isEmpty());
const uno::Reference<document::XFilter> xFilter(m_xFilterFactory->createInstance(sFilter),
@@ -106,7 +105,7 @@ WpftLoader ImportTest::createLoader(const rtl::OUString& rUrl,
return WpftLoader(rUrl, xFilter, rFactoryUrl, m_xDesktop, m_xTypeMap, m_xContext);
}
-rtl::OUString ImportTest::makeUrl(const rtl::OUString& rFile) const
+OUString ImportTest::makeUrl(const OUString& rFile) const
{
return const_cast<ImportTest*>(this)->m_directories.getURLFromSrc("/" TEST_DIR "/" + rFile);
}
diff --git a/writerperfect/qa/unit/PresentationImportTest.cxx b/writerperfect/qa/unit/PresentationImportTest.cxx
index 8fc5a65d3141..4b2a65296545 100644
--- a/writerperfect/qa/unit/PresentationImportTest.cxx
+++ b/writerperfect/qa/unit/PresentationImportTest.cxx
@@ -38,13 +38,12 @@ public:
}
// XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) override;
- virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
private:
- virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput,
- rtl::OUString& rTypeName) override;
+ virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, OUString& rTypeName) override;
virtual bool doImportDocument(weld::Window* pWindow, librevenge::RVNGInputStream& rInput,
OdpGenerator& rGenerator,
utl::MediaDescriptor& rDescriptor) override;
@@ -59,25 +58,24 @@ bool PresentationImportFilter::doImportDocument(weld::Window*, librevenge::RVNGI
return true;
}
-bool PresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream&,
- rtl::OUString& rTypeName)
+bool PresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUString& rTypeName)
{
rTypeName = "WpftDummyPresentation";
return true;
}
// XServiceInfo
-rtl::OUString SAL_CALL PresentationImportFilter::getImplementationName()
+OUString SAL_CALL PresentationImportFilter::getImplementationName()
{
return OUString("org.libreoffice.comp.Wpft.QA.PresentationImportFilter");
}
-sal_Bool SAL_CALL PresentationImportFilter::supportsService(const rtl::OUString& rServiceName)
+sal_Bool SAL_CALL PresentationImportFilter::supportsService(const OUString& rServiceName)
{
return cppu::supportsService(this, rServiceName);
}
-uno::Sequence<rtl::OUString> SAL_CALL PresentationImportFilter::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL PresentationImportFilter::getSupportedServiceNames()
{
return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" };
}
@@ -147,10 +145,9 @@ void PresentationImportTest::test()
uno::Reference<drawing::XShapeDescriptor> xShapeDesc;
CPPUNIT_ASSERT(aShape >>= xShapeDesc);
CPPUNIT_ASSERT(xShapeDesc.is());
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("com.sun.star.drawing.TextShape"),
- xShapeDesc->getShapeType());
+ CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.TextShape"), xShapeDesc->getShapeType());
uno::Reference<text::XText> xText(xShapeDesc, uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("My hovercraft is full of eels."), xText->getString());
+ CPPUNIT_ASSERT_EQUAL(OUString("My hovercraft is full of eels."), xText->getString());
}
CPPUNIT_TEST_SUITE_REGISTRATION(PresentationImportTest);
diff --git a/writerperfect/qa/unit/SpreadsheetImportTest.cxx b/writerperfect/qa/unit/SpreadsheetImportTest.cxx
index 66b1623b39f4..e5ad7a3fcc1e 100644
--- a/writerperfect/qa/unit/SpreadsheetImportTest.cxx
+++ b/writerperfect/qa/unit/SpreadsheetImportTest.cxx
@@ -37,13 +37,12 @@ public:
}
// XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) override;
- virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
private:
- virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput,
- rtl::OUString& rTypeName) override;
+ virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, OUString& rTypeName) override;
virtual bool doImportDocument(weld::Window* pWindow, librevenge::RVNGInputStream& rInput,
OdsGenerator& rGenerator,
utl::MediaDescriptor& rDescriptor) override;
@@ -58,24 +57,24 @@ bool SpreadsheetImportFilter::doImportDocument(weld::Window*, librevenge::RVNGIn
return true;
}
-bool SpreadsheetImportFilter::doDetectFormat(librevenge::RVNGInputStream&, rtl::OUString& rTypeName)
+bool SpreadsheetImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUString& rTypeName)
{
rTypeName = "WpftDummySpreadsheet";
return true;
}
// XServiceInfo
-rtl::OUString SAL_CALL SpreadsheetImportFilter::getImplementationName()
+OUString SAL_CALL SpreadsheetImportFilter::getImplementationName()
{
return OUString("org.libreoffice.comp.Wpft.QA.SpreadsheetImportFilter");
}
-sal_Bool SAL_CALL SpreadsheetImportFilter::supportsService(const rtl::OUString& rServiceName)
+sal_Bool SAL_CALL SpreadsheetImportFilter::supportsService(const OUString& rServiceName)
{
return cppu::supportsService(this, rServiceName);
}
-uno::Sequence<rtl::OUString> SAL_CALL SpreadsheetImportFilter::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL SpreadsheetImportFilter::getSupportedServiceNames()
{
return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" };
}
@@ -131,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(rtl::OUString("My hovercraft is full of eels."), xCell->getFormula());
+ CPPUNIT_ASSERT_EQUAL(OUString("My hovercraft is full of eels."), xCell->getFormula());
}
CPPUNIT_TEST_SUITE_REGISTRATION(SpreadsheetImportTest);
diff --git a/writerperfect/qa/unit/TextImportTest.cxx b/writerperfect/qa/unit/TextImportTest.cxx
index de085a2f33b0..b9a3953fc8d2 100644
--- a/writerperfect/qa/unit/TextImportTest.cxx
+++ b/writerperfect/qa/unit/TextImportTest.cxx
@@ -36,13 +36,12 @@ public:
}
// XServiceInfo
- virtual rtl::OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) override;
- virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
private:
- virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput,
- rtl::OUString& rTypeName) override;
+ virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, OUString& rTypeName) override;
virtual bool doImportDocument(weld::Window* pWindow, librevenge::RVNGInputStream& rInput,
OdtGenerator& rGenerator,
utl::MediaDescriptor& rDescriptor) override;
@@ -57,24 +56,24 @@ bool TextImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputStre
return true;
}
-bool TextImportFilter::doDetectFormat(librevenge::RVNGInputStream&, rtl::OUString& rTypeName)
+bool TextImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUString& rTypeName)
{
rTypeName = "WpftDummyText";
return true;
}
// XServiceInfo
-rtl::OUString SAL_CALL TextImportFilter::getImplementationName()
+OUString SAL_CALL TextImportFilter::getImplementationName()
{
return OUString("org.libreoffice.comp.Wpft.QA.TextImportFilter");
}
-sal_Bool SAL_CALL TextImportFilter::supportsService(const rtl::OUString& rServiceName)
+sal_Bool SAL_CALL TextImportFilter::supportsService(const OUString& rServiceName)
{
return cppu::supportsService(this, rServiceName);
}
-uno::Sequence<rtl::OUString> SAL_CALL TextImportFilter::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL TextImportFilter::getSupportedServiceNames()
{
return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" };
}
@@ -130,12 +129,12 @@ void TextImportTest::test()
CPPUNIT_ASSERT(xPortions->hasMoreElements());
uno::Reference<beans::XPropertySet> xPortionProps(xPortions->nextElement(), uno::UNO_QUERY);
CPPUNIT_ASSERT(xPortionProps.is());
- rtl::OUString aPortionType;
+ OUString aPortionType;
CPPUNIT_ASSERT(xPortionProps->getPropertyValue("TextPortionType") >>= aPortionType);
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("Text"), aPortionType);
+ CPPUNIT_ASSERT_EQUAL(OUString("Text"), aPortionType);
uno::Reference<text::XTextRange> xPortion(xPortionProps, uno::UNO_QUERY);
CPPUNIT_ASSERT(xPortion.is());
- CPPUNIT_ASSERT_EQUAL(rtl::OUString("My hovercraft is full of eels."), xPortion->getString());
+ CPPUNIT_ASSERT_EQUAL(OUString("My hovercraft is full of eels."), 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 773458179145..d7c42ee7d3b0 100644
--- a/writerperfect/qa/unit/WPXSvStreamTest.cxx
+++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx
@@ -83,7 +83,7 @@ shared_ptr<RVNGInputStream> lcl_createStream()
return pInputStream;
}
-const shared_ptr<RVNGInputStream> lcl_createStreamForURL(const rtl::OUString& rURL)
+const shared_ptr<RVNGInputStream> lcl_createStreamForURL(const OUString& rURL)
{
using uno::Reference;
using uno::UNO_QUERY_THROW;
diff --git a/writerperfect/qa/unit/WpftFilterTestBase.cxx b/writerperfect/qa/unit/WpftFilterTestBase.cxx
index 301d9a1348ab..ea6ad5a89612 100644
--- a/writerperfect/qa/unit/WpftFilterTestBase.cxx
+++ b/writerperfect/qa/unit/WpftFilterTestBase.cxx
@@ -21,7 +21,7 @@ namespace writerperfect
{
namespace test
{
-WpftFilterTestBase::WpftFilterTestBase(const rtl::OUString& rFactoryURL)
+WpftFilterTestBase::WpftFilterTestBase(const OUString& rFactoryURL)
: ::test::FiltersTest()
, WpftFilterFixture()
, m_aFactoryURL(rFactoryURL)
@@ -45,13 +45,13 @@ bool WpftFilterTestBase::load(const OUString&, const OUString& rURL, const OUStr
return aLoader.getDocument().is();
}
-void WpftFilterTestBase::doTest(const rtl::OUString& rFilter, const rtl::OUString& rPath)
+void WpftFilterTestBase::doTest(const OUString& rFilter, const OUString& rPath)
{
m_xFilter.set(m_xFactory->createInstanceWithContext(rFilter, m_xContext), uno::UNO_QUERY_THROW);
testDir(OUString(), m_directories.getURLFromSrc(rPath));
}
-void WpftFilterTestBase::doTest(const rtl::OUString& rFilter, const rtl::OUString& rPath,
+void WpftFilterTestBase::doTest(const OUString& rFilter, const OUString& rPath,
const WpftOptionalMap_t& rOptionalMap)
{
m_xFilter.set(m_xFactory->createInstanceWithContext(rFilter, m_xContext), uno::UNO_QUERY_THROW);
diff --git a/writerperfect/qa/unit/WpftFilterTestBase.hxx b/writerperfect/qa/unit/WpftFilterTestBase.hxx
index 481d169d1663..509ebcb6d9f1 100644
--- a/writerperfect/qa/unit/WpftFilterTestBase.hxx
+++ b/writerperfect/qa/unit/WpftFilterTestBase.hxx
@@ -40,17 +40,17 @@ namespace writerperfect
{
namespace test
{
-typedef std::unordered_map<rtl::OUString, bool> WpftOptionalMap_t;
+typedef std::unordered_map<OUString, bool> WpftOptionalMap_t;
class WPFTQAHELPER_DLLPUBLIC WpftFilterTestBase : public ::test::FiltersTest,
public WpftFilterFixture
{
public:
- explicit WpftFilterTestBase(const rtl::OUString& rFactoryURL);
+ explicit WpftFilterTestBase(const OUString& rFactoryURL);
protected:
- void doTest(const rtl::OUString& rFilter, const rtl::OUString& rPath);
- void doTest(const rtl::OUString& rFilter, const rtl::OUString& rPath,
+ void doTest(const OUString& rFilter, const OUString& rPath);
+ void doTest(const OUString& rFilter, const OUString& rPath,
const WpftOptionalMap_t& rOptionalMap);
private:
@@ -58,7 +58,7 @@ private:
SotClipboardFormatId, unsigned int) override;
private:
- const rtl::OUString m_aFactoryURL;
+ const OUString m_aFactoryURL;
css::uno::Reference<css::document::XFilter> m_xFilter;
const WpftOptionalMap_t* m_pOptionalMap;
};
diff --git a/writerperfect/qa/unit/WpftLoader.cxx b/writerperfect/qa/unit/WpftLoader.cxx
index b89353d5c568..bae64e0aa651 100644
--- a/writerperfect/qa/unit/WpftLoader.cxx
+++ b/writerperfect/qa/unit/WpftLoader.cxx
@@ -42,9 +42,9 @@ namespace writerperfect
{
namespace test
{
-WpftLoader::WpftLoader(const rtl::OUString& rURL,
+WpftLoader::WpftLoader(const OUString& rURL,
const css::uno::Reference<css::document::XFilter>& rxFilter,
- const rtl::OUString& rFactoryURL,
+ const OUString& rFactoryURL,
const css::uno::Reference<css::frame::XDesktop2>& rxDesktop,
const css::uno::Reference<css::container::XNameAccess>& rxTypeMap,
const css::uno::Reference<css::uno::XComponentContext>& rxContext)
@@ -61,7 +61,7 @@ WpftLoader::WpftLoader(const rtl::OUString& rURL,
WpftLoader::WpftLoader(const css::uno::Reference<css::io::XInputStream>& rxInputStream,
const css::uno::Reference<css::document::XFilter>& rxFilter,
- const rtl::OUString& rFactoryURL,
+ const OUString& rFactoryURL,
const css::uno::Reference<css::frame::XDesktop2>& rxDesktop,
const css::uno::Reference<css::uno::XComponentContext>& rxContext)
: m_xInputStream(rxInputStream)
@@ -146,7 +146,7 @@ bool WpftLoader::impl_load()
const uno::Reference<document::XExtendedFilterDetection> xDetector(m_xFilter,
uno::UNO_QUERY_THROW);
- const rtl::OUString aTypeName(xDetector->detect(aDescriptor));
+ const OUString aTypeName(xDetector->detect(aDescriptor));
if (aTypeName.isEmpty())
throw lang::IllegalArgumentException();
@@ -179,7 +179,7 @@ void WpftLoader::impl_dispose()
}
void WpftLoader::impl_detectFilterName(uno::Sequence<beans::PropertyValue>& rDescriptor,
- const rtl::OUString& rTypeName)
+ const OUString& rTypeName)
{
const sal_Int32 nDescriptorLen = rDescriptor.getLength();
@@ -194,7 +194,7 @@ void WpftLoader::impl_detectFilterName(uno::Sequence<beans::PropertyValue>& rDes
{
for (sal_Int32 n = 0; aTypes.getLength() != n; ++n)
{
- rtl::OUString aFilterName;
+ OUString aFilterName;
if (("PreferredFilter" == aTypes[n].Name) && (aTypes[n].Value >>= aFilterName))
{
rDescriptor.realloc(nDescriptorLen + 1);
diff --git a/writerperfect/qa/unit/WpftLoader.hxx b/writerperfect/qa/unit/WpftLoader.hxx
index d76fb76ea52f..ccd8f9294175 100644
--- a/writerperfect/qa/unit/WpftLoader.hxx
+++ b/writerperfect/qa/unit/WpftLoader.hxx
@@ -63,15 +63,14 @@ namespace test
class WPFTQAHELPER_DLLPUBLIC WpftLoader
{
public:
- WpftLoader(const rtl::OUString& rURL,
- const css::uno::Reference<css::document::XFilter>& rxFilter,
- const rtl::OUString& rFactoryURL,
+ WpftLoader(const OUString& rURL, const css::uno::Reference<css::document::XFilter>& rxFilter,
+ const OUString& rFactoryURL,
const css::uno::Reference<css::frame::XDesktop2>& rxDesktop,
const css::uno::Reference<css::container::XNameAccess>& rxTypeMap,
const css::uno::Reference<css::uno::XComponentContext>& rxContext);
WpftLoader(const css::uno::Reference<css::io::XInputStream>& rxInputStream,
const css::uno::Reference<css::document::XFilter>& rxFilter,
- const rtl::OUString& rFactoryURL,
+ const OUString& rFactoryURL,
const css::uno::Reference<css::frame::XDesktop2>& rxDesktop,
const css::uno::Reference<css::uno::XComponentContext>& rxContext);
~WpftLoader();
@@ -83,12 +82,12 @@ private:
void impl_dispose();
void impl_detectFilterName(css::uno::Sequence<css::beans::PropertyValue>& rDescriptor,
- const rtl::OUString& rTypeName);
+ const OUString& rTypeName);
private:
- const rtl::OUString m_aURL;
+ const OUString m_aURL;
const css::uno::Reference<css::io::XInputStream> m_xInputStream;
- const rtl::OUString m_aFactoryURL;
+ const OUString m_aFactoryURL;
const css::uno::Reference<css::document::XFilter> m_xFilter;
const css::uno::Reference<css::frame::XDesktop2> m_xDesktop;
const css::uno::Reference<css::container::XNameAccess> m_xTypeMap;
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index ef8ff59ea013..86d21ec8a6e2 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -76,7 +76,7 @@ public:
}
//! add a file
- void addFile(rtl::OUString const& path, std::string const& shortName)
+ void addFile(OUString const& path, std::string const& shortName)
{
m_nameToPathMap[shortName] = path;
}
@@ -108,7 +108,7 @@ public:
if (m_nameToPathMap.size() < id)
return nullptr;
- std::map<std::string, rtl::OUString>::const_iterator it = m_nameToPathMap.begin();
+ std::map<std::string, OUString>::const_iterator it = m_nameToPathMap.begin();
std::advance(it, id);
return it->first.c_str();
}
@@ -134,7 +134,7 @@ public:
OUString lPath = m_nameToPathMap.find(name)->second;
do
{
- const rtl::OUString aTitle(xRow->getString(1));
+ const OUString aTitle(xRow->getString(1));
if (aTitle != lPath)
continue;
@@ -169,7 +169,7 @@ private:
/// the main container
uno::Reference<ucb::XContent> m_xContent;
/// the map short name to path
- std::map<std::string, rtl::OUString> m_nameToPathMap;
+ std::map<std::string, OUString> m_nameToPathMap;
FolderStream(const FolderStream&) = delete;
FolderStream& operator=(const FolderStream&) = delete;
};
@@ -336,8 +336,8 @@ MSWorksCalcImportFilter::filter(const css::uno::Sequence<css::beans::PropertyVal
const css::uno::Reference<container::XChild> xChild(xContent, uno::UNO_QUERY);
if (xChild.is())
{
- rtl::OUString sWM3Name;
- rtl::OUString sFM3Name;
+ OUString sWM3Name;
+ OUString sFM3Name;
const css::uno::Reference<ucb::XContent> xPackageContent(xChild->getParent(),
uno::UNO_QUERY);
uno::Reference<sdbc::XResultSet> xResultSet
@@ -351,12 +351,12 @@ MSWorksCalcImportFilter::filter(const css::uno::Sequence<css::beans::PropertyVal
sWM3Name = aTmpUrl.getName(INetURLObject::LAST_SEGMENT, true,
INetURLObject::DecodeMechanism::WithCharset);
aTmpUrl.setExtension("FM3");
- const rtl::OUString& sTestFM3Name
+ const OUString& sTestFM3Name
= aTmpUrl.getName(INetURLObject::LAST_SEGMENT, true,
INetURLObject::DecodeMechanism::WithCharset);
do
{
- const rtl::OUString& aTitle(xRow->getString(1));
+ const OUString& aTitle(xRow->getString(1));
if (aTitle.equalsIgnoreAsciiCase(sTestFM3Name))
sFM3Name = aTitle;
} while (xResultSet->next() && sFM3Name.isEmpty());
diff --git a/writerperfect/source/common/DirectoryStream.cxx b/writerperfect/source/common/DirectoryStream.cxx
index eeb449db0e9a..7f3e1b165da6 100644
--- a/writerperfect/source/common/DirectoryStream.cxx
+++ b/writerperfect/source/common/DirectoryStream.cxx
@@ -51,8 +51,7 @@ namespace writerperfect
{
namespace
{
-uno::Reference<io::XInputStream> findStream(ucbhelper::Content& rContent,
- const rtl::OUString& rName)
+uno::Reference<io::XInputStream> findStream(ucbhelper::Content& rContent, const OUString& rName)
{
uno::Reference<io::XInputStream> xInputStream;
@@ -68,7 +67,7 @@ uno::Reference<io::XInputStream> findStream(ucbhelper::Content& rContent,
const uno::Reference<sdbc::XRow> xRow(xResultSet, uno::UNO_QUERY_THROW);
do
{
- const rtl::OUString aTitle(xRow->getString(1));
+ const OUString aTitle(xRow->getString(1));
if (aTitle == rName)
{
const uno::Reference<ucb::XContent> xSubContent(xContentAccess->queryContent());
@@ -195,7 +194,7 @@ librevenge::RVNGInputStream* DirectoryStream::getSubStreamByName(const char* con
ucbhelper::Content aContent(m_pImpl->xContent, uno::Reference<ucb::XCommandEnvironment>(),
comphelper::getProcessComponentContext());
const uno::Reference<io::XInputStream> xInputStream(
- findStream(aContent, rtl::OUString::createFromAscii(pName)));
+ findStream(aContent, OUString::createFromAscii(pName)));
if (xInputStream.is())
return new WPXSvInputStream(xInputStream);
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index c0ac94ae3e18..771345a8c925 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -83,7 +83,7 @@ typedef struct
namespace
{
-rtl::OUString lcl_normalizeSubStreamPath(const rtl::OUString& rPath)
+OUString lcl_normalizeSubStreamPath(const OUString& rPath)
{
// accept paths which begin by '/'
// TODO: maybe this should to a full normalization
@@ -95,7 +95,7 @@ rtl::OUString lcl_normalizeSubStreamPath(const rtl::OUString& rPath)
namespace
{
-const rtl::OUString concatPath(const rtl::OUString& lhs, const rtl::OUString& rhs)
+const OUString concatPath(const OUString& lhs, const OUString& rhs)
{
if (lhs.isEmpty())
return rhs;
@@ -104,26 +104,26 @@ const rtl::OUString concatPath(const rtl::OUString& lhs, const rtl::OUString& rh
struct OLEStreamData
{
- OLEStreamData(const rtl::OString& rName, const rtl::OString& rvngName);
+ OLEStreamData(const OString& rName, const OString& rvngName);
SotStorageStreamRefWrapper stream;
/** Name of the stream.
*
- * This is not @c rtl::OUString, because we need to be able to
+ * This is not @c OUString, because we need to be able to
* produce const char* from it.
*/
- rtl::OString const name;
+ OString const name;
/** librevenge name of the stream.
*
- * This is not @c rtl::OUString, because we need to be able to
+ * This is not @c OUString, because we need to be able to
* produce const char* from it.
*/
- rtl::OString const RVNGname;
+ OString const RVNGname;
};
-typedef std::unordered_map<rtl::OUString, std::size_t> NameMap_t;
-typedef std::unordered_map<rtl::OUString, SotStorageRefWrapper> OLEStorageMap_t;
+typedef std::unordered_map<OUString, std::size_t> NameMap_t;
+typedef std::unordered_map<OUString, SotStorageRefWrapper> OLEStorageMap_t;
/** Representation of an OLE2 storage.
*
@@ -147,13 +147,13 @@ struct OLEStorageImpl
void initialize(std::unique_ptr<SvStream> pStream);
- tools::SvRef<SotStorageStream> getStream(const rtl::OUString& rPath);
+ tools::SvRef<SotStorageStream> getStream(const OUString& rPath);
tools::SvRef<SotStorageStream> const& getStream(std::size_t nId);
private:
- void traverse(const tools::SvRef<SotStorage>& rStorage, const rtl::OUString& rPath);
+ void traverse(const tools::SvRef<SotStorage>& rStorage, const OUString& rPath);
- tools::SvRef<SotStorageStream> createStream(const rtl::OUString& rPath);
+ tools::SvRef<SotStorageStream> createStream(const OUString& rPath);
public:
SotStorageRefWrapper mxRootStorage; //< root storage of the OLE2
@@ -163,7 +163,7 @@ public:
bool mbInitialized;
};
-OLEStreamData::OLEStreamData(const rtl::OString& rName, const rtl::OString& rvngName)
+OLEStreamData::OLEStreamData(const OString& rName, const OString& rvngName)
: stream()
, name(rName)
, RVNGname(rvngName)
@@ -191,9 +191,9 @@ void OLEStorageImpl::initialize(std::unique_ptr<SvStream> pStream)
mbInitialized = true;
}
-tools::SvRef<SotStorageStream> OLEStorageImpl::getStream(const rtl::OUString& rPath)
+tools::SvRef<SotStorageStream> OLEStorageImpl::getStream(const OUString& rPath)
{
- const rtl::OUString aPath(lcl_normalizeSubStreamPath(rPath));
+ const OUString aPath(lcl_normalizeSubStreamPath(rPath));
NameMap_t::iterator aIt = maNameMap.find(aPath);
// For the while don't return stream in this situation.
@@ -203,8 +203,8 @@ tools::SvRef<SotStorageStream> OLEStorageImpl::getStream(const rtl::OUString& rP
return tools::SvRef<SotStorageStream>();
if (!maStreams[aIt->second].stream.ref.is())
- maStreams[aIt->second].stream.ref = createStream(
- rtl::OStringToOUString(maStreams[aIt->second].name, RTL_TEXTENCODING_UTF8));
+ maStreams[aIt->second].stream.ref
+ = createStream(OStringToOUString(maStreams[aIt->second].name, RTL_TEXTENCODING_UTF8));
return maStreams[aIt->second].stream.ref;
}
@@ -213,12 +213,12 @@ tools::SvRef<SotStorageStream> const& OLEStorageImpl::getStream(const std::size_
{
if (!maStreams[nId].stream.ref.is())
maStreams[nId].stream.ref
- = createStream(rtl::OStringToOUString(maStreams[nId].name, RTL_TEXTENCODING_UTF8));
+ = createStream(OStringToOUString(maStreams[nId].name, RTL_TEXTENCODING_UTF8));
return maStreams[nId].stream.ref;
}
-void OLEStorageImpl::traverse(const tools::SvRef<SotStorage>& rStorage, const rtl::OUString& rPath)
+void OLEStorageImpl::traverse(const tools::SvRef<SotStorage>& rStorage, const OUString& rPath)
{
SvStorageInfoList infos;
@@ -228,18 +228,18 @@ void OLEStorageImpl::traverse(const tools::SvRef<SotStorage>& rStorage, const rt
{
if (info.IsStream())
{
- rtl::OUString baseName = info.GetName(), rvngName = baseName;
+ OUString baseName = info.GetName(), rvngName = baseName;
// librevenge::RVNGOLEStream ignores the first character when is a control code, so ...
if (!rvngName.isEmpty() && rvngName.toChar() < 32)
rvngName = rvngName.copy(1);
maStreams.emplace_back(
- rtl::OUStringToOString(concatPath(rPath, baseName), RTL_TEXTENCODING_UTF8),
- rtl::OUStringToOString(concatPath(rPath, rvngName), RTL_TEXTENCODING_UTF8));
+ OUStringToOString(concatPath(rPath, baseName), RTL_TEXTENCODING_UTF8),
+ OUStringToOString(concatPath(rPath, rvngName), RTL_TEXTENCODING_UTF8));
maNameMap[concatPath(rPath, rvngName)] = maStreams.size() - 1;
}
else if (info.IsStorage())
{
- const rtl::OUString aPath = concatPath(rPath, info.GetName());
+ const OUString aPath = concatPath(rPath, info.GetName());
SotStorageRefWrapper aStorage;
aStorage.ref = rStorage->OpenSotStorage(info.GetName(), StreamMode::STD_READ);
maStorageMap[aPath] = aStorage;
@@ -255,15 +255,15 @@ void OLEStorageImpl::traverse(const tools::SvRef<SotStorage>& rStorage, const rt
}
}
-tools::SvRef<SotStorageStream> OLEStorageImpl::createStream(const rtl::OUString& rPath)
+tools::SvRef<SotStorageStream> OLEStorageImpl::createStream(const OUString& rPath)
{
const sal_Int32 nDelim = rPath.lastIndexOf(u'/');
if (-1 == nDelim)
return mxRootStorage.ref->OpenSotStream(rPath, StreamMode::STD_READ);
- const rtl::OUString aDir = rPath.copy(0, nDelim);
- const rtl::OUString aName = rPath.copy(nDelim + 1);
+ const OUString aDir = rPath.copy(0, nDelim);
+ const OUString aName = rPath.copy(nDelim + 1);
const OLEStorageMap_t::const_iterator aIt = maStorageMap.find(aDir);
@@ -278,16 +278,16 @@ namespace
{
struct ZipStreamData
{
- explicit ZipStreamData(const rtl::OString& rName);
+ explicit ZipStreamData(const OString& rName);
Reference<XInputStream> xStream;
/** Name of the stream.
*
- * This is not @c rtl::OUString, because we need to be able to
+ * This is not @c OUString, because we need to be able to
* produce const char* from it.
*/
- rtl::OString const aName;
+ OString const aName;
};
/** Representation of a Zip storage.
@@ -307,13 +307,13 @@ struct ZipStorageImpl
*/
void initialize();
- Reference<XInputStream> getStream(const rtl::OUString& rPath);
+ Reference<XInputStream> getStream(const OUString& rPath);
Reference<XInputStream> const& getStream(std::size_t nId);
private:
void traverse(const Reference<container::XNameAccess>& rxEnum);
- Reference<XInputStream> createStream(const rtl::OUString& rPath);
+ Reference<XInputStream> createStream(const OUString& rPath);
public:
Reference<container::XNameAccess> mxContainer; //< root of the Zip
@@ -322,7 +322,7 @@ public:
bool mbInitialized;
};
-ZipStreamData::ZipStreamData(const rtl::OString& rName)
+ZipStreamData::ZipStreamData(const OString& rName)
: xStream()
, aName(rName)
{
@@ -344,9 +344,9 @@ void ZipStorageImpl::initialize()
mbInitialized = true;
}
-Reference<XInputStream> ZipStorageImpl::getStream(const rtl::OUString& rPath)
+Reference<XInputStream> ZipStorageImpl::getStream(const OUString& rPath)
{
- const rtl::OUString aPath(lcl_normalizeSubStreamPath(rPath));
+ const OUString aPath(lcl_normalizeSubStreamPath(rPath));
NameMap_t::iterator aIt = maNameMap.find(aPath);
// For the while don't return stream in this situation.
@@ -365,14 +365,14 @@ Reference<XInputStream> const& ZipStorageImpl::getStream(const std::size_t nId)
{
if (!maStreams[nId].xStream.is())
maStreams[nId].xStream
- = createStream(rtl::OStringToOUString(maStreams[nId].aName, RTL_TEXTENCODING_UTF8));
+ = createStream(OStringToOUString(maStreams[nId].aName, RTL_TEXTENCODING_UTF8));
return maStreams[nId].xStream;
}
void ZipStorageImpl::traverse(const Reference<container::XNameAccess>& rxContainer)
{
- const Sequence<rtl::OUString> lNames = rxContainer->getElementNames();
+ const Sequence<OUString> lNames = rxContainer->getElementNames();
maStreams.reserve(lNames.getLength());
@@ -380,13 +380,13 @@ void ZipStorageImpl::traverse(const Reference<container::XNameAccess>& rxContain
{
if (!lNames[n].endsWith("/")) // skip dirs
{
- maStreams.emplace_back(rtl::OUStringToOString(lNames[n], RTL_TEXTENCODING_UTF8));
+ maStreams.emplace_back(OUStringToOString(lNames[n], RTL_TEXTENCODING_UTF8));
maNameMap[lNames[n]] = maStreams.size() - 1;
}
}
}
-Reference<XInputStream> ZipStorageImpl::createStream(const rtl::OUString& rPath)
+Reference<XInputStream> ZipStorageImpl::createStream(const OUString& rPath)
{
Reference<XInputStream> xStream;
@@ -632,7 +632,7 @@ bool WPXSvInputStreamImpl::existsSubStream(const char* const name)
PositionHolder pos(mxSeekable);
mxSeekable->seek(0);
- const rtl::OUString aName(rtl::OStringToOUString(rtl::OString(name), RTL_TEXTENCODING_UTF8));
+ const OUString aName(OStringToOUString(OString(name), RTL_TEXTENCODING_UTF8));
if (isOLE())
{
@@ -662,7 +662,7 @@ librevenge::RVNGInputStream* WPXSvInputStreamImpl::getSubStreamByName(const char
PositionHolder pos(mxSeekable);
mxSeekable->seek(0);
- const rtl::OUString aName(rtl::OStringToOUString(rtl::OString(name), RTL_TEXTENCODING_UTF8));
+ const OUString aName(OStringToOUString(OString(name), RTL_TEXTENCODING_UTF8));
if (isOLE())
{
diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx
index 4c80c6cf075e..852c71aebdf1 100644
--- a/writerperfect/source/writer/EBookImportFilter.cxx
+++ b/writerperfect/source/writer/EBookImportFilter.cxx
@@ -27,7 +27,7 @@ bool EBookImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputStr
OdtGenerator& rGenerator,
utl::MediaDescriptor& rDescriptor)
{
- rtl::OUString aFilterName;
+ OUString aFilterName;
rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] >>= aFilterName;
assert(!aFilterName.isEmpty());
--
cgit