From 1946794ae09ba732022fe6a74ea45e304ab70b84 Mon Sep 17 00:00:00 2001
From: Luboš Luňák <l.lunak@suse.cz>
Date: Sun, 7 Apr 2013 12:06:47 +0200
Subject: mass removal of rtl:: prefixes for O(U)String*

Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
---
 drawinglayer/inc/drawinglayer/XShapeDumper.hxx         |  2 +-
 .../inc/drawinglayer/primitive2d/mediaprimitive2d.hxx  |  6 +++---
 .../drawinglayer/primitive2d/objectinfoprimitive2d.hxx | 18 +++++++++---------
 .../primitive2d/texthierarchyprimitive2d.hxx           |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'drawinglayer/inc')

diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
index a7d1d8d61b16..a1cd59948362 100644
--- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
+++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
@@ -65,7 +65,7 @@ class DRAWINGLAYER_DLLPUBLIC XShapeDumper
 
 public:
     XShapeDumper();
-    rtl::OUString dump(com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> xPageShapes);
+    OUString dump(com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> xPageShapes);
 
 };
 #endif
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx
index 32cbe2e59a02..df75569ecb64 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/mediaprimitive2d.hxx
@@ -49,7 +49,7 @@ namespace drawinglayer
             basegfx::B2DHomMatrix                       maTransform;
 
             /// the content definition
-            rtl::OUString                               maURL;
+            OUString                               maURL;
 
             /// style: background color
             basegfx::BColor                             maBackgroundColor;
@@ -67,14 +67,14 @@ namespace drawinglayer
             /// constructor
             MediaPrimitive2D(
                 const basegfx::B2DHomMatrix& rTransform,
-                const rtl::OUString& rURL,
+                const OUString& rURL,
                 const basegfx::BColor& rBackgroundColor,
                 sal_uInt32 nDiscreteBorder,
                 const Graphic &rSnapshot);
 
             /// data read access
             const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
-            const rtl::OUString& getURL() const { return maURL; }
+            const OUString& getURL() const { return maURL; }
             const basegfx::BColor& getBackgroundColor() const { return maBackgroundColor; }
             sal_uInt32 getDiscreteBorder() const { return mnDiscreteBorder; }
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
index 230a7399ff1d..ec5452773751 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx
@@ -39,22 +39,22 @@ namespace drawinglayer
         class DRAWINGLAYER_DLLPUBLIC ObjectInfoPrimitive2D : public GroupPrimitive2D
         {
         private:
-            rtl::OUString                           maName;
-            rtl::OUString                           maTitle;
-            rtl::OUString                           maDesc;
+            OUString                           maName;
+            OUString                           maTitle;
+            OUString                           maDesc;
 
         public:
             /// constructor
             ObjectInfoPrimitive2D(
                 const Primitive2DSequence& rChildren,
-                const rtl::OUString& rName,
-                const rtl::OUString& rTitle,
-                const rtl::OUString& rDesc);
+                const OUString& rName,
+                const OUString& rTitle,
+                const OUString& rDesc);
 
             /// data read access
-            const rtl::OUString& getName() const { return maName; }
-            const rtl::OUString& getTitle() const { return maTitle; }
-            const rtl::OUString& getDesc() const { return maDesc; }
+            const OUString& getName() const { return maName; }
+            const OUString& getTitle() const { return maTitle; }
+            const OUString& getDesc() const { return maDesc; }
 
             /// compare operator
             virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
index b1b450c13bce..e9fb01f094ff 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx
@@ -154,18 +154,18 @@ namespace drawinglayer
         {
         private:
             FieldType                               meType;
-            rtl::OUString                           maString;
+            OUString                           maString;
 
         public:
             /// constructor
             TextHierarchyFieldPrimitive2D(
                 const Primitive2DSequence& rChildren,
                 const FieldType& rFieldType,
-                const rtl::OUString& rString);
+                const OUString& rString);
 
             /// data read access
             FieldType getType() const { return meType; }
-            const rtl::OUString& getString() const { return maString; }
+            const OUString& getString() const { return maString; }
 
             /// compare operator
             virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
-- 
cgit