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>

5 files changed, 49 insertions, 49 deletions

diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 0745116b07ac..52f96dd84d88 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -218,7 +218,7 @@ CommandLineEvent CheckWebQuery(/* in,out */ OUString& arg, CommandLineEvent curE
         if (!SkipNewline(pPos))
             return curEvt;
 
-        rtl::OStringBuffer aResult(static_cast<unsigned int>(nRead));
+        OStringBuffer aResult(static_cast<unsigned int>(nRead));
         do
         {
             const char* pPos1 = pPos;
diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx
index 29001367bb91..4a702f4420bd 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -46,8 +46,8 @@ namespace {
 
 void writeToStream(std::ofstream& strm, const OUString& rKey, const OUString& rValue)
 {
-    strm << rtl::OUStringToOString(rKey, RTL_TEXTENCODING_UTF8).getStr() << "=";
-    strm << rtl::OUStringToOString(rValue, RTL_TEXTENCODING_UTF8).getStr() << "\n";
+    strm << OUStringToOString(rKey, RTL_TEXTENCODING_UTF8).getStr() << "=";
+    strm << OUStringToOString(rValue, RTL_TEXTENCODING_UTF8).getStr() << "\n";
 }
 
 }
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index d45b6ab12f9d..3ae3c7d57269 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -92,7 +92,7 @@ struct DispatchHolder
 namespace
 {
 
-std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( const rtl::OUString& rUrl, const rtl::OUString& rFactory )
+std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( const OUString& rUrl, const OUString& rFactory )
 {
     // create the list of filters
     OUStringBuffer sQuery(256);
@@ -116,7 +116,7 @@ std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( const rtl::OUStr
     while ( xFilterEnum->hasMoreElements() )
     {
         comphelper::SequenceAsHashMap aFilterProps( xFilterEnum->nextElement() );
-        const rtl::OUString aName( aFilterProps.getUnpackedValueOrDefault( "Name", rtl::OUString() ) );
+        const OUString aName( aFilterProps.getUnpackedValueOrDefault( "Name", OUString() ) );
         if ( !aName.isEmpty() )
         {
             std::shared_ptr<const SfxFilter> pFilter( SfxFilter::GetFilterByName( aName ) );
@@ -132,7 +132,7 @@ std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( const rtl::OUStr
 }
 
 std::shared_ptr<const SfxFilter> impl_getExportFilterFromUrl(
-        const rtl::OUString& rUrl, const rtl::OUString& rFactory)
+        const OUString& rUrl, const OUString& rFactory)
 {
     try
     {
@@ -140,7 +140,7 @@ std::shared_ptr<const SfxFilter> impl_getExportFilterFromUrl(
         const Reference< document::XTypeDetection > xTypeDetector(
             xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.document.TypeDetection", xContext ),
             UNO_QUERY_THROW );
-        const rtl::OUString aTypeName( xTypeDetector->queryTypeByURL( rUrl ) );
+        const OUString aTypeName( xTypeDetector->queryTypeByURL( rUrl ) );
 
         std::shared_ptr<const SfxFilter> pFilter( SfxFilterMatcher( rFactory ).GetFilter4EA( aTypeName, SfxFilterFlags::EXPORT ) );
         if ( !pFilter )
@@ -217,9 +217,9 @@ void scriptCat(const Reference< XModel >& xDoc )
             std::cout << aObjectNames.getLength() << "\n\n";
             for ( sal_Int32 j = 0 ; j < aObjectNames.getLength() ; ++j )
             {
-                rtl::OUString &rObjectName = aObjectNames[j];
+                OUString &rObjectName = aObjectNames[j];
 
-                rtl::OUString aCodeString;
+                OUString aCodeString;
                 try
                 {
                     Any aCode = xContainer->getByName( rObjectName );
diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx
index 0f12544b6a6b..c72ad4b91508 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -69,9 +69,9 @@ public:
         css::uno::Reference< css::uno::XComponentContext > const & xContext)
     { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); }
 
-    static rtl::OUString SAL_CALL static_getImplementationName();
+    static OUString SAL_CALL static_getImplementationName();
 
-    static css::uno::Sequence< rtl::OUString > SAL_CALL
+    static css::uno::Sequence< OUString > SAL_CALL
     static_getSupportedServiceNames();
 
 private:
@@ -81,18 +81,18 @@ private:
 
     virtual ~Provider() {}
 
-    virtual rtl::OUString SAL_CALL getImplementationName() override
+    virtual OUString SAL_CALL getImplementationName() override
     { return static_getImplementationName(); }
 
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override
+    virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
 
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    virtual css::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames() override
     { return static_getSupportedServiceNames(); }
 
     virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
-        css::util::URL const &, rtl::OUString const &, sal_Int32) override;
+        css::util::URL const &, OUString const &, sal_Int32) override;
 
     virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
     SAL_CALL queryDispatches(
@@ -101,18 +101,18 @@ private:
     css::uno::Reference< css::uno::XComponentContext > context_;
 };
 
-rtl::OUString Provider::static_getImplementationName() {
-    return rtl::OUString("com.sun.star.comp.test.deployment.active_native");
+OUString Provider::static_getImplementationName() {
+    return OUString("com.sun.star.comp.test.deployment.active_native");
 }
 
-css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
+css::uno::Sequence< OUString > Provider::static_getSupportedServiceNames()
 {
-    rtl::OUString name("com.sun.star.test.deployment.active_native");
-    return css::uno::Sequence< rtl::OUString >(&name, 1);
+    OUString name("com.sun.star.test.deployment.active_native");
+    return css::uno::Sequence< OUString >(&name, 1);
 }
 
 css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
-    css::util::URL const &, rtl::OUString const &, sal_Int32)
+    css::util::URL const &, OUString const &, sal_Int32)
 {
     css::uno::Reference< css::frame::XDispatch > dispatch;
     if (!(context_->getValueByName(
@@ -156,11 +156,11 @@ public:
         css::uno::Reference< css::uno::XComponentContext > const & xContext)
     { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); }
 
-    static rtl::OUString SAL_CALL static_getImplementationName();
+    static OUString SAL_CALL static_getImplementationName();
 
-    static css::uno::Sequence< rtl::OUString > SAL_CALL
+    static css::uno::Sequence< OUString > SAL_CALL
     static_getSupportedServiceNames()
-    { return css::uno::Sequence< rtl::OUString >(); }
+    { return css::uno::Sequence< OUString >(); }
 
 private:
     explicit Dispatch(
@@ -169,13 +169,13 @@ private:
 
     virtual ~Dispatch() {}
 
-    virtual rtl::OUString SAL_CALL getImplementationName() override
+    virtual OUString SAL_CALL getImplementationName() override
     { return static_getImplementationName(); }
 
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override
+    virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
 
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    virtual css::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames() override
     { return static_getSupportedServiceNames(); }
 
@@ -196,8 +196,8 @@ private:
     css::uno::Reference< css::uno::XComponentContext > context_;
 };
 
-rtl::OUString Dispatch::static_getImplementationName() {
-    return rtl::OUString(
+OUString Dispatch::static_getImplementationName() {
+    return OUString(
         "com.sun.star.comp.test.deployment.active_native_singleton");
 }
 
diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx
index 83b955a00313..ea62f7b0112f 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -66,9 +66,9 @@ public:
         css::uno::Reference< css::uno::XComponentContext > const & xContext)
     { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); }
 
-    static rtl::OUString SAL_CALL static_getImplementationName();
+    static OUString SAL_CALL static_getImplementationName();
 
-    static css::uno::Sequence< rtl::OUString > SAL_CALL
+    static css::uno::Sequence< OUString > SAL_CALL
     static_getSupportedServiceNames();
 
 private:
@@ -78,18 +78,18 @@ private:
 
     virtual ~Provider() {}
 
-    virtual rtl::OUString SAL_CALL getImplementationName() override
+    virtual OUString SAL_CALL getImplementationName() override
     { return static_getImplementationName(); }
 
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override
+    virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
 
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    virtual css::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames() override
     { return static_getSupportedServiceNames(); }
 
     virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
-        css::util::URL const &, rtl::OUString const &, sal_Int32) override;
+        css::util::URL const &, OUString const &, sal_Int32) override;
 
     virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
     SAL_CALL queryDispatches(
@@ -98,18 +98,18 @@ private:
     css::uno::Reference< css::uno::XComponentContext > context_;
 };
 
-rtl::OUString Provider::static_getImplementationName() {
-    return rtl::OUString("com.sun.star.comp.test.deployment.passive_native");
+OUString Provider::static_getImplementationName() {
+    return OUString("com.sun.star.comp.test.deployment.passive_native");
 }
 
-css::uno::Sequence< rtl::OUString > Provider::static_getSupportedServiceNames()
+css::uno::Sequence< OUString > Provider::static_getSupportedServiceNames()
 {
-    rtl::OUString name("com.sun.star.test.deployment.passive_native");
-    return css::uno::Sequence< rtl::OUString >(&name, 1);
+    OUString name("com.sun.star.test.deployment.passive_native");
+    return css::uno::Sequence< OUString >(&name, 1);
 }
 
 css::uno::Reference< css::frame::XDispatch > Provider::queryDispatch(
-    css::util::URL const &, rtl::OUString const &, sal_Int32)
+    css::util::URL const &, OUString const &, sal_Int32)
 {
     css::uno::Reference< css::frame::XDispatch > dispatch;
     if (!(context_->getValueByName(
@@ -153,11 +153,11 @@ public:
         css::uno::Reference< css::uno::XComponentContext > const & xContext)
     { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); }
 
-    static rtl::OUString SAL_CALL static_getImplementationName();
+    static OUString SAL_CALL static_getImplementationName();
 
-    static css::uno::Sequence< rtl::OUString > SAL_CALL
+    static css::uno::Sequence< OUString > SAL_CALL
     static_getSupportedServiceNames()
-    { return css::uno::Sequence< rtl::OUString >(); }
+    { return css::uno::Sequence< OUString >(); }
 
 private:
     explicit Dispatch(
@@ -166,13 +166,13 @@ private:
 
     virtual ~Dispatch() {}
 
-    virtual rtl::OUString SAL_CALL getImplementationName() override
+    virtual OUString SAL_CALL getImplementationName() override
     { return static_getImplementationName(); }
 
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & ServiceName) override
+    virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
     { return cppu::supportsService(this, ServiceName); }
 
-    virtual css::uno::Sequence< rtl::OUString > SAL_CALL
+    virtual css::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames() override
     { return static_getSupportedServiceNames(); }
 
@@ -193,8 +193,8 @@ private:
     css::uno::Reference< css::uno::XComponentContext > context_;
 };
 
-rtl::OUString Dispatch::static_getImplementationName() {
-    return rtl::OUString(
+OUString Dispatch::static_getImplementationName() {
+    return OUString(
         "com.sun.star.comp.test.deployment.passive_native_singleton");
 }