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>

7 files changed, 18 insertions, 18 deletions

diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx
index 60132380d04c..9bdd251b93f5 100644
--- a/xmloff/source/core/RDFaExportHelper.cxx
+++ b/xmloff/source/core/RDFaExportHelper.cxx
@@ -155,7 +155,7 @@ RDFaExportHelper::AddRDFa(
                 xContent->getValue());
         }
 
-        ::std::vector<::rtl::OUString> curies;
+        ::std::vector<OUString> curies;
         for (rdf::Statement const& rStatement : rStatements)
         {
             curies.push_back(makeCURIE(&m_rExport, rStatement.Predicate));
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 297ed54a1f6c..059e0fddab70 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -478,12 +478,12 @@ AnimationsExporterImpl::AnimationsExporterImpl( SvXMLExport& rExport, const Refe
 
 
 /** split a uri hierarchy into first segment and rest */
-static bool splitPath(::rtl::OUString const & i_rPath,
-    ::rtl::OUString & o_rDir, ::rtl::OUString& o_rRest)
+static bool splitPath(OUString const & i_rPath,
+    OUString & o_rDir, OUString& o_rRest)
 {
     const sal_Int32 idx(i_rPath.indexOf(u'/'));
     if (idx < 0 || idx >= i_rPath.getLength()) {
-        o_rDir = ::rtl::OUString();
+        o_rDir = OUString();
         o_rRest = i_rPath;
         return true;
     } else if (idx == 0 || idx == i_rPath.getLength() - 1) {
@@ -499,10 +499,10 @@ static bool splitPath(::rtl::OUString const & i_rPath,
 static void lcl_CopyStream(
         uno::Reference<embed::XStorage> const& xSource,
         uno::Reference<embed::XStorage> const& xTarget,
-         ::rtl::OUString const& rPath)
+         OUString const& rPath)
 {
-    ::rtl::OUString dir;
-    ::rtl::OUString rest;
+    OUString dir;
+    OUString rest;
     if (!splitPath(rPath, dir, rest))
         throw uno::RuntimeException();
 
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index ae6556b99b0c..3f7337dd5030 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -99,8 +99,8 @@ OUString AnimationsImport_getImplementationName() throw()
     return OUString( "xmloff::AnimationsImport" );
 }
 
-static ::rtl::OUString
-lcl_GetMediaReference(SvXMLImport const& rImport, ::rtl::OUString const& rURL)
+static OUString
+lcl_GetMediaReference(SvXMLImport const& rImport, OUString const& rURL)
 {
     if (rImport.IsPackageURL(rURL))
         return "vnd.sun.star.Package:" + rURL;
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 7673c9d48756..7e0b4c8edd20 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -418,7 +418,7 @@ void XMLPageMasterExportPropMapper::ContextFilter(
             case CTF_PM_FOOTERFILLBITMAPNAME:
             case CTF_PM_FOOTERFILLTRANSNAME:
             {
-                rtl::OUString aStr;
+                OUString aStr;
 
                 if( (pProp->maValue >>= aStr) && 0 == aStr.getLength() )
                 {
diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx
index 3ccac9f8bc47..ea7556e2c28c 100644
--- a/xmloff/source/style/PageMasterImportContext.cxx
+++ b/xmloff/source/style/PageMasterImportContext.cxx
@@ -163,9 +163,9 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet
     // ones are used when a FillStyle is defined
     if(!m_bIsFillStyleAlreadyConverted && !GetProperties().empty())
     {
-        static ::rtl::OUString s_FillStyle("FillStyle");
-        static ::rtl::OUString s_HeaderFillStyle("HeaderFillStyle");
-        static ::rtl::OUString s_FooterFillStyle("FooterFillStyle");
+        static OUString s_FillStyle("FillStyle");
+        static OUString s_HeaderFillStyle("HeaderFillStyle");
+        static OUString s_FooterFillStyle("FooterFillStyle");
 
         if(doNewDrawingLayerFillStyleDefinitionsExist(s_FillStyle))
         {
@@ -256,7 +256,7 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet
                     case CTF_PM_FOOTERFILLBITMAPNAME:
                     {
                         struct XMLPropertyState& rState = GetProperties()[nIndex];
-                        rtl::OUString sStyleName;
+                        OUString sStyleName;
                         rState.maValue >>= sStyleName;
 
                         // translate the used name from ODF intern to the name used in the Model
@@ -265,7 +265,7 @@ void PageStyleContext::FillPropertySet(const uno::Reference<beans::XPropertySet
                         try
                         {
                             // set property
-                            const rtl::OUString& rPropertyName = rMapper->GetEntryAPIName(rState.mnIndex);
+                            const OUString& rPropertyName = rMapper->GetEntryAPIName(rState.mnIndex);
 
                             if(!xInfo.is())
                             {
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index e9497349546a..3040b7417d9c 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -277,7 +277,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite )
     if(bTakeCareOfDrawingLayerFillStyle)
     {
         // check if new FillStyles are used and if so mark old ones with -1
-        static ::rtl::OUString s_FillStyle("FillStyle");
+        static OUString s_FillStyle("FillStyle");
 
         if(doNewDrawingLayerFillStyleDefinitionsExist(s_FillStyle))
         {
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index c2bc93fc401d..d9394b0347af 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -530,7 +530,7 @@ void XMLTextStyleContext::FillPropertySet(
                 case CTF_FILLBITMAPNAME:
                 {
                     // DrawingLayer FillStyle name needs to be mapped to DisplayName
-                    rtl::OUString sStyleName;
+                    OUString sStyleName;
                     rState.maValue >>= sStyleName;
 
                     // translate the used name from ODF intern to the name used in the Model
@@ -561,7 +561,7 @@ void XMLTextStyleContext::FillPropertySet(
                         }
 
                         // set property
-                        const rtl::OUString& rPropertyName = rPropMapper->GetEntryAPIName(rState.mnIndex);
+                        const OUString& rPropertyName = rPropMapper->GetEntryAPIName(rState.mnIndex);
 
                         if(!xInfo.is())
                         {