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

30 files changed, 129 insertions, 129 deletions

diff --git a/svgio/inc/svgio/svgreader/svgcharacternode.hxx b/svgio/inc/svgio/svgreader/svgcharacternode.hxx
index ebd9daa8f344..5c0ffaf005ef 100644
--- a/svgio/inc/svgio/svgreader/svgcharacternode.hxx
+++ b/svgio/inc/svgio/svgreader/svgcharacternode.hxx
@@ -49,7 +49,7 @@ namespace svgio
         public:
             SvgTextPositions();
 
-            void parseTextPositionAttributes(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            void parseTextPositionAttributes(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
 
             /// X content
             const SvgNumberVector& getX() const { return maX; }
@@ -144,7 +144,7 @@ namespace svgio
         {
         private:
             /// the string data
-            rtl::OUString           maText;
+            OUString           maText;
 
             /// local helpers
             drawinglayer::primitive2d::TextSimplePortionPrimitive2D* createSimpleTextPrimitive(
@@ -159,17 +159,17 @@ namespace svgio
             SvgCharacterNode(
                 SvgDocument& rDocument,
                 SvgNode* pParent,
-                const rtl::OUString& rText);
+                const OUString& rText);
             virtual ~SvgCharacterNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
             virtual void decomposeText(drawinglayer::primitive2d::Primitive2DSequence& rTarget, SvgTextPosition& rSvgTextPosition) const;
             void whiteSpaceHandling();
             void addGap();
-            void concatenate(const rtl::OUString& rText);
+            void concatenate(const OUString& rText);
 
             /// Text content
-            const rtl::OUString& getText() const { return maText; }
+            const OUString& getText() const { return maText; }
         };
     } // end of namespace svgreader
 } // end of namespace svgio
diff --git a/svgio/inc/svgio/svgreader/svgcirclenode.hxx b/svgio/inc/svgio/svgreader/svgcirclenode.hxx
index bb1f9039fc3b..b58b3a1bfca3 100644
--- a/svgio/inc/svgio/svgreader/svgcirclenode.hxx
+++ b/svgio/inc/svgio/svgreader/svgcirclenode.hxx
@@ -48,7 +48,7 @@ namespace svgio
             virtual ~SvgCircleNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
             virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const;
 
             /// Cx content, set if found in current context
diff --git a/svgio/inc/svgio/svgreader/svgclippathnode.hxx b/svgio/inc/svgio/svgreader/svgclippathnode.hxx
index 1b3b6817bf8c..3cc9dbdabcde 100644
--- a/svgio/inc/svgio/svgreader/svgclippathnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgclippathnode.hxx
@@ -46,7 +46,7 @@ namespace svgio
             virtual ~SvgClipPathNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
             virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const;
 
             /// apply contained clipPath to given geometry
diff --git a/svgio/inc/svgio/svgreader/svgdocument.hxx b/svgio/inc/svgio/svgreader/svgdocument.hxx
index 6a5c31617216..b791d759e48d 100644
--- a/svgio/inc/svgio/svgreader/svgdocument.hxx
+++ b/svgio/inc/svgio/svgreader/svgdocument.hxx
@@ -36,45 +36,45 @@ namespace svgio
             SvgNodeVector           maNodes;
 
             /// the absolute path of the Svg file in progress (if available)
-            const rtl::OUString     maAbsolutePath;
+            const OUString     maAbsolutePath;
 
             /// hash mapper to find nodes by their id
-            typedef boost::unordered_map< const rtl::OUString, const SvgNode*,
-                      rtl::OUStringHash,
-                      ::std::equal_to< ::rtl::OUString > > IdTokenMapper;
-            typedef std::pair< const rtl::OUString, const SvgNode* > IdTokenValueType;
+            typedef boost::unordered_map< const OUString, const SvgNode*,
+                      OUStringHash,
+                      ::std::equal_to< OUString > > IdTokenMapper;
+            typedef std::pair< const OUString, const SvgNode* > IdTokenValueType;
             IdTokenMapper           maIdTokenMapperList;
 
             /// hash mapper to find css styles by their id
-            typedef boost::unordered_map< const rtl::OUString, const SvgStyleAttributes*, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > IdStyleTokenMapper;
-            typedef std::pair< const rtl::OUString, const SvgStyleAttributes* > IdStyleTokenValueType;
+            typedef boost::unordered_map< const OUString, const SvgStyleAttributes*, OUStringHash, ::std::equal_to< OUString > > IdStyleTokenMapper;
+            typedef std::pair< const OUString, const SvgStyleAttributes* > IdStyleTokenValueType;
             IdStyleTokenMapper      maIdStyleTokenMapperList;
 
         public:
-            SvgDocument(const rtl::OUString& rAbsolutePath);
+            SvgDocument(const OUString& rAbsolutePath);
             ~SvgDocument();
 
             /// append anopther root node, ownership changes
             void appendNode(SvgNode* pNode);
 
             /// add/remove nodes with Id to mapper
-            void addSvgNodeToMapper(const rtl::OUString& rStr, const SvgNode& rNode);
-            void removeSvgNodeFromMapper(const rtl::OUString& rStr);
+            void addSvgNodeToMapper(const OUString& rStr, const SvgNode& rNode);
+            void removeSvgNodeFromMapper(const OUString& rStr);
 
             /// find a node by it's Id
             bool hasSvgNodesById() const { return !maIdTokenMapperList.empty(); }
-            const SvgNode* findSvgNodeById(const rtl::OUString& rStr) const;
+            const SvgNode* findSvgNodeById(const OUString& rStr) const;
 
             /// add/remove styles to mapper
-            void addSvgStyleAttributesToMapper(const rtl::OUString& rStr, const SvgStyleAttributes& rSvgStyleAttributes);
+            void addSvgStyleAttributesToMapper(const OUString& rStr, const SvgStyleAttributes& rSvgStyleAttributes);
 
             /// find a style by it's Id
             bool hasSvgStyleAttributesById() const { return !maIdStyleTokenMapperList.empty(); }
-            const SvgStyleAttributes* findSvgStyleAttributesById(const rtl::OUString& rStr) const;
+            const SvgStyleAttributes* findSvgStyleAttributesById(const OUString& rStr) const;
 
             /// data read access
             const SvgNodeVector& getSvgNodeVector() const { return maNodes; }
-            const rtl::OUString& getAbsolutePath() const { return maAbsolutePath; }
+            const OUString& getAbsolutePath() const { return maAbsolutePath; }
         };
     } // end of namespace svgreader
 } // end of namespace svgio
diff --git a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx
index 2bdd56a4a0f1..a94db1bb8d67 100644
--- a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx
+++ b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx
@@ -44,20 +44,20 @@ namespace svgio
             SvgNode*                        mpTarget;
 
             // text collector string stack for css styles
-            std::vector< rtl::OUString >    maCssContents;
+            std::vector< OUString >    maCssContents;
 
         public:
-            SvgDocHdl(const rtl::OUString& rAbsolutePath);
+            SvgDocHdl(const OUString& rAbsolutePath);
             ~SvgDocHdl();
 
             // Methods XDocumentHandler
             virtual void SAL_CALL startDocument(  ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL endDocument(  ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL endElement( const OUString& aName ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL characters( const OUString& aChars ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
 
             const SvgDocument& getSvgDocument() const { return maDocument; }
diff --git a/svgio/inc/svgio/svgreader/svgellipsenode.hxx b/svgio/inc/svgio/svgreader/svgellipsenode.hxx
index 52d232428fc0..d24576382807 100644
--- a/svgio/inc/svgio/svgreader/svgellipsenode.hxx
+++ b/svgio/inc/svgio/svgreader/svgellipsenode.hxx
@@ -49,7 +49,7 @@ namespace svgio
             virtual ~SvgEllipseNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
             virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const;
 
             /// Cx content, set if found in current context
diff --git a/svgio/inc/svgio/svgreader/svggnode.hxx b/svgio/inc/svgio/svgreader/svggnode.hxx
index 7398ed211e51..0649370689d0 100644
--- a/svgio/inc/svgio/svgreader/svggnode.hxx
+++ b/svgio/inc/svgio/svgreader/svggnode.hxx
@@ -46,7 +46,7 @@ namespace svgio
             virtual ~SvgGNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
             virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const;
 
             /// transform content
diff --git a/svgio/inc/svgio/svgreader/svggradientnode.hxx b/svgio/inc/svgio/svgreader/svggradientnode.hxx
index 4b3e4d2b79ac..b820e5903554 100644
--- a/svgio/inc/svgio/svgreader/svggradientnode.hxx
+++ b/svgio/inc/svgio/svgreader/svggradientnode.hxx
@@ -57,7 +57,7 @@ namespace svgio
             /// link to another gradient used as style. If maXLink
             /// is set, the node can be fetched on demand by using
             // tryToFindLink (buffered)
-            rtl::OUString               maXLink;
+            OUString               maXLink;
             const SvgGradientNode*      mpXLink;
 
             /// link on demand
@@ -71,7 +71,7 @@ namespace svgio
             virtual ~SvgGradientNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
 
             /// collect gradient stop entries
             void collectGradientEntries(drawinglayer::primitive2d::SvgGradientEntryVector& aVector) const;
diff --git a/svgio/inc/svgio/svgreader/svggradientstopnode.hxx b/svgio/inc/svgio/svgreader/svggradientstopnode.hxx
index 8ddbff794e35..7368fa46c210 100644
--- a/svgio/inc/svgio/svgreader/svggradientstopnode.hxx
+++ b/svgio/inc/svgio/svgreader/svggradientstopnode.hxx
@@ -45,7 +45,7 @@ namespace svgio
             virtual ~SvgGradientStopNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
 
             /// offset content
             const SvgNumber getOffset() const { return maOffset; }
diff --git a/svgio/inc/svgio/svgreader/svgimagenode.hxx b/svgio/inc/svgio/svgreader/svgimagenode.hxx
index 11c3cd0bdc05..5e5f037c4ffb 100644
--- a/svgio/inc/svgio/svgreader/svgimagenode.hxx
+++ b/svgio/inc/svgio/svgreader/svgimagenode.hxx
@@ -43,11 +43,11 @@ namespace svgio
             SvgNumber               maWidth;
             SvgNumber               maHeight;
 
-            rtl::OUString           maXLink;        // internal link
-            rtl::OUString           maUrl;          // external link
+            OUString           maXLink;        // internal link
+            OUString           maUrl;          // external link
 
-            rtl::OUString           maMimeType;     // mimetype and
-            rtl::OUString           maData;         // base64 data
+            OUString           maMimeType;     // mimetype and
+            OUString           maData;         // base64 data
 
         public:
             SvgImageNode(
@@ -56,7 +56,7 @@ namespace svgio
             virtual ~SvgImageNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
             virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const;
 
             /// SvgAspectRatio content
@@ -84,7 +84,7 @@ namespace svgio
             void setHeight(const SvgNumber& rHeight = SvgNumber()) { maHeight = rHeight; }
 
             /// XLink access
-            const rtl::OUString& getXLink() const { return maXLink; }
+            const OUString& getXLink() const { return maXLink; }
         };
     } // end of namespace svgreader
 } // end of namespace svgio
diff --git a/svgio/inc/svgio/svgreader/svglinenode.hxx b/svgio/inc/svgio/svgreader/svglinenode.hxx
index e2d5addef069..56fd95409b29 100644
--- a/svgio/inc/svgio/svgreader/svglinenode.hxx
+++ b/svgio/inc/svgio/svgreader/svglinenode.hxx
@@ -49,7 +49,7 @@ namespace svgio
             virtual ~SvgLineNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
             virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const;
 
             /// X1 content, set if found in current context
diff --git a/svgio/inc/svgio/svgreader/svgmarkernode.hxx b/svgio/inc/svgio/svgreader/svgmarkernode.hxx
index 71a3c4944aae..14fa5f14082b 100644
--- a/svgio/inc/svgio/svgreader/svgmarkernode.hxx
+++ b/svgio/inc/svgio/svgreader/svgmarkernode.hxx
@@ -65,7 +65,7 @@ namespace svgio
             virtual ~SvgMarkerNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
 
             /// get marker primitives buffered, uses decomposeSvgNode internally
             const drawinglayer::primitive2d::Primitive2DSequence& getMarkerPrimitives() const;
diff --git a/svgio/inc/svgio/svgreader/svgmasknode.hxx b/svgio/inc/svgio/svgreader/svgmasknode.hxx
index c382b607edcb..a20a9f5bb95b 100644
--- a/svgio/inc/svgio/svgreader/svgmasknode.hxx
+++ b/svgio/inc/svgio/svgreader/svgmasknode.hxx
@@ -51,7 +51,7 @@ namespace svgio
             virtual ~SvgMaskNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
             virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const;
 
             /// apply contained clipPath to given geometry
diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgio/svgreader/svgnode.hxx
index 42c3d7c14e94..1fc1e50deb44 100644
--- a/svgio/inc/svgio/svgreader/svgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgnode.hxx
@@ -68,10 +68,10 @@ namespace svgio
             SvgNodeVector               maChildren;
 
             /// Id svan value
-            rtl::OUString*              mpId;
+            OUString*              mpId;
 
             /// Class svan value
-            rtl::OUString*              mpClass;
+            OUString*              mpClass;
 
             /// XmlSpace value
             XmlSpace                    maXmlSpace;
@@ -85,7 +85,7 @@ namespace svgio
 
             void parseAttributes(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs);
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
             virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const;
 
             /// basic data read access
@@ -100,12 +100,12 @@ namespace svgio
             virtual double getCurrentXHeight() const;
 
             /// Id access
-            const rtl::OUString* getId() const { return mpId; }
-            void setId(const rtl::OUString* pfId = 0);
+            const OUString* getId() const { return mpId; }
+            void setId(const OUString* pfId = 0);
 
             /// Class access
-            const rtl::OUString* getClass() const { return mpClass; }
-            void setClass(const rtl::OUString* pfClass = 0);
+            const OUString* getClass() const { return mpClass; }
+            void setClass(const OUString* pfClass = 0);
 
             /// XmlSpace access
             XmlSpace getXmlSpace() const;
diff --git a/svgio/inc/svgio/svgreader/svgpathnode.hxx b/svgio/inc/svgio/svgreader/svgpathnode.hxx
index c149faed19f9..a9e61d3361f4 100644
--- a/svgio/inc/svgio/svgreader/svgpathnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgpathnode.hxx
@@ -47,7 +47,7 @@ namespace svgio
             virtual ~SvgPathNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
             virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const;
 
             /// path content, set if found in current context
diff --git a/svgio/inc/svgio/svgreader/svgpatternnode.hxx b/svgio/inc/svgio/svgreader/svgpatternnode.hxx
index 888fd3d94fca..e70abce816dd 100644
--- a/svgio/inc/svgio/svgreader/svgpatternnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgpatternnode.hxx
@@ -52,7 +52,7 @@ namespace svgio
             /// link to another pattern used as style. If maXLink
             /// is set, the node can be fetched on demand by using
             // tryToFindLink (buffered)
-            rtl::OUString           maXLink;
+            OUString           maXLink;
             const SvgPatternNode*   mpXLink;
 
             /// link on demand
@@ -65,7 +65,7 @@ namespace svgio
             virtual ~SvgPatternNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
 
             /// global helpers
             void getValuesRelative(double& rfX, double& rfY, double& rfW, double& rfH, const basegfx::B2DRange& rGeoRange, SvgNode& rUser) const;
diff --git a/svgio/inc/svgio/svgreader/svgpolynode.hxx b/svgio/inc/svgio/svgreader/svgpolynode.hxx
index 0ce90960f6dc..f7dfe9d1051a 100644
--- a/svgio/inc/svgio/svgreader/svgpolynode.hxx
+++ b/svgio/inc/svgio/svgreader/svgpolynode.hxx
@@ -51,7 +51,7 @@ namespace svgio
             virtual ~SvgPolyNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
             virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const;
 
             /// type read access
diff --git a/svgio/inc/svgio/svgreader/svgrectnode.hxx b/svgio/inc/svgio/svgreader/svgrectnode.hxx
index 01b46c9c75b1..0665770312ae 100644
--- a/svgio/inc/svgio/svgreader/svgrectnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgrectnode.hxx
@@ -51,7 +51,7 @@ namespace svgio
             virtual ~SvgRectNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
             virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const;
 
             /// x content, set if found in current context
diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
index 81682ab1c243..6de635109810 100644
--- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
+++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
@@ -169,19 +169,19 @@ namespace svgio
             TextAnchor                  maTextAnchor;
             SvgPaint                    maColor;
             SvgNumber                   maOpacity;
-            rtl::OUString               maTitle;
-            rtl::OUString               maDesc;
+            OUString               maTitle;
+            OUString               maDesc;
 
             /// link to content. If set, the node can be fetched on demand
-            rtl::OUString               maClipPathXLink;
-            rtl::OUString               maMaskXLink;
+            OUString               maClipPathXLink;
+            OUString               maMaskXLink;
 
             /// link to markers. If set, the node can be fetched on demand
-            rtl::OUString               maMarkerStartXLink;
+            OUString               maMarkerStartXLink;
             const SvgMarkerNode*        mpMarkerStartXLink;
-            rtl::OUString               maMarkerMidXLink;
+            OUString               maMarkerMidXLink;
             const SvgMarkerNode*        mpMarkerMidXLink;
-            rtl::OUString               maMarkerEndXLink;
+            OUString               maMarkerEndXLink;
             const SvgMarkerNode*        mpMarkerEndXLink;
 
             /// bitfield
@@ -239,7 +239,7 @@ namespace svgio
 
         public:
             /// local attribute scanner
-            void parseStyleAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            void parseStyleAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
 
             /// helper which does the necessary with a given path
             void add_text(
@@ -254,10 +254,10 @@ namespace svgio
                 const basegfx::B2DHomMatrix* pTransform) const;
 
             /// helper to evtl. link to css style
-            void checkForCssStyle(const rtl::OUString& rClassStr) const;
+            void checkForCssStyle(const OUString& rClassStr) const;
 
             /// scan helpers
-            void readStyle(const rtl::OUString& rCandidate);
+            void readStyle(const OUString& rCandidate);
             const SvgStyleAttributes* getParentStyle() const;
 
             SvgStyleAttributes(SvgNode& rOwner);
@@ -376,35 +376,35 @@ namespace svgio
             void setOpacity(const SvgNumber& rOpacity = SvgNumber()) { maOpacity = rOpacity; }
 
             // Title content
-            const rtl::OUString& getTitle() const { return maTitle; }
-            void setTitle(const rtl::OUString& rNew) { maTitle = rNew; }
+            const OUString& getTitle() const { return maTitle; }
+            void setTitle(const OUString& rNew) { maTitle = rNew; }
 
             // Desc content
-            const rtl::OUString& getDesc() const { return maDesc; }
-            void setDesc(const rtl::OUString& rNew) { maDesc = rNew; }
+            const OUString& getDesc() const { return maDesc; }
+            void setDesc(const OUString& rNew) { maDesc = rNew; }
 
             // ClipPathXLink content
-            const rtl::OUString getClipPathXLink() const { return maClipPathXLink; }
-            void setClipPathXLink(const rtl::OUString& rNew) { maClipPathXLink = rNew; }
+            const OUString getClipPathXLink() const { return maClipPathXLink; }
+            void setClipPathXLink(const OUString& rNew) { maClipPathXLink = rNew; }
 
             // MaskXLink content
-            const rtl::OUString getMaskXLink() const { return maMaskXLink; }
-            void setMaskXLink(const rtl::OUString& rNew) { maMaskXLink = rNew; }
+            const OUString getMaskXLink() const { return maMaskXLink; }
+            void setMaskXLink(const OUString& rNew) { maMaskXLink = rNew; }
 
             // MarkerStartXLink content
-            const rtl::OUString getMarkerStartXLink() const;
+            const OUString getMarkerStartXLink() const;
             const SvgMarkerNode* accessMarkerStartXLink() const;
-            void setMarkerStartXLink(const rtl::OUString& rNew) { maMarkerStartXLink = rNew; }
+            void setMarkerStartXLink(const OUString& rNew) { maMarkerStartXLink = rNew; }
 
             // MarkerMidXLink content
-            const rtl::OUString getMarkerMidXLink() const;
+            const OUString getMarkerMidXLink() const;
             const SvgMarkerNode* accessMarkerMidXLink() const;
-            void setMarkerMidXLink(const rtl::OUString& rNew) { maMarkerMidXLink = rNew; }
+            void setMarkerMidXLink(const OUString& rNew) { maMarkerMidXLink = rNew; }
 
             // MarkerEndXLink content
-            const rtl::OUString getMarkerEndXLink() const;
+            const OUString getMarkerEndXLink() const;
             const SvgMarkerNode* accessMarkerEndXLink() const;
-            void setMarkerEndXLink(const rtl::OUString& rNew) { maMarkerEndXLink = rNew; }
+            void setMarkerEndXLink(const OUString& rNew) { maMarkerEndXLink = rNew; }
 
         };
     } // end of namespace svgreader
diff --git a/svgio/inc/svgio/svgreader/svgstylenode.hxx b/svgio/inc/svgio/svgreader/svgstylenode.hxx
index cd98d4bbd6d0..9762763e1c3e 100644
--- a/svgio/inc/svgio/svgreader/svgstylenode.hxx
+++ b/svgio/inc/svgio/svgreader/svgstylenode.hxx
@@ -44,8 +44,8 @@ namespace svgio
                 SvgNode* pParent);
             virtual ~SvgStyleNode();
 
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
-            void addCssStyleSheet(const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
+            void addCssStyleSheet(const OUString& aContent);
 
             /// textCss access
             bool isTextCss() const { return mbTextCss; }
diff --git a/svgio/inc/svgio/svgreader/svgsvgnode.hxx b/svgio/inc/svgio/svgreader/svgsvgnode.hxx
index f052aeb2c883..02f7e50e25c9 100644
--- a/svgio/inc/svgio/svgreader/svgsvgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgsvgnode.hxx
@@ -50,7 +50,7 @@ namespace svgio
             virtual ~SvgSvgNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
             virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const;
 
             /// InfoProvider support for % values
diff --git a/svgio/inc/svgio/svgreader/svgsymbolnode.hxx b/svgio/inc/svgio/svgreader/svgsymbolnode.hxx
index c03fb288cf13..10a778e1ee56 100644
--- a/svgio/inc/svgio/svgreader/svgsymbolnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgsymbolnode.hxx
@@ -45,7 +45,7 @@ namespace svgio
             virtual ~SvgSymbolNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
 
             /// viewBox content
             const basegfx::B2DRange* getViewBox() const { return mpViewBox; }
diff --git a/svgio/inc/svgio/svgreader/svgtextnode.hxx b/svgio/inc/svgio/svgreader/svgtextnode.hxx
index e34ff0b78b25..9624295578c4 100644
--- a/svgio/inc/svgio/svgreader/svgtextnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgtextnode.hxx
@@ -57,7 +57,7 @@ namespace svgio
             virtual ~SvgTextNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
             virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const;
 
             /// transform content, set if found in current context
diff --git a/svgio/inc/svgio/svgreader/svgtextpathnode.hxx b/svgio/inc/svgio/svgreader/svgtextpathnode.hxx
index d12b63cd0c3f..900f609362db 100644
--- a/svgio/inc/svgio/svgreader/svgtextpathnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgtextpathnode.hxx
@@ -38,7 +38,7 @@ namespace svgio
 
             /// link to path content. If maXLink
             /// is set, the node can be fetched on demand
-            rtl::OUString           maXLink;
+            OUString           maXLink;
 
             /// variable scan values, dependent of given XAttributeList
             SvgNumber               maStartOffset;
@@ -54,7 +54,7 @@ namespace svgio
             virtual ~SvgTextPathNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
             void decomposePathNode(
                 const drawinglayer::primitive2d::Primitive2DSequence& rPathContent,
                 drawinglayer::primitive2d::Primitive2DSequence& rTarget,
diff --git a/svgio/inc/svgio/svgreader/svgtitledescnode.hxx b/svgio/inc/svgio/svgreader/svgtitledescnode.hxx
index d84b06dab1b5..4897553eba36 100644
--- a/svgio/inc/svgio/svgreader/svgtitledescnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgtitledescnode.hxx
@@ -30,7 +30,7 @@ namespace svgio
         {
         private:
             /// contained chars
-            rtl::OUString           maText;
+            OUString           maText;
 
         public:
             SvgTitleDescNode(
@@ -40,10 +40,10 @@ namespace svgio
             virtual ~SvgTitleDescNode();
 
             /// add new chars
-            void concatenate(const rtl::OUString& rChars);
+            void concatenate(const OUString& rChars);
 
             /// x content, set if found in current context
-            const rtl::OUString& getText() const { return maText; }
+            const OUString& getText() const { return maText; }
         };
     } // end of namespace svgreader
 } // end of namespace svgio
diff --git a/svgio/inc/svgio/svgreader/svgtoken.hxx b/svgio/inc/svgio/svgreader/svgtoken.hxx
index e1218620a85d..9e81c9d1697f 100644
--- a/svgio/inc/svgio/svgreader/svgtoken.hxx
+++ b/svgio/inc/svgio/svgreader/svgtoken.hxx
@@ -181,10 +181,10 @@ namespace svgio
             SVGTokenLast
         };
 
-        SVGToken StrToSVGToken(const rtl::OUString& rStr);
+        SVGToken StrToSVGToken(const OUString& rStr);
 
-        const rtl::OUString& getStrTitle();
-        const rtl::OUString& getStrDesc();
+        const OUString& getStrTitle();
+        const OUString& getStrDesc();
     } // end of namespace svgreader
 } // end of namespace svgio
 
diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx b/svgio/inc/svgio/svgreader/svgtools.hxx
index 12c70a49dd28..0dbedf87eac5 100644
--- a/svgio/inc/svgio/svgreader/svgtools.hxx
+++ b/svgio/inc/svgio/svgreader/svgtools.hxx
@@ -34,16 +34,16 @@ namespace svgio
     {
 #ifdef DBG_UTIL
         // error helper
-        void myAssert(const rtl::OUString& rMessage);
+        void myAssert(const OUString& rMessage);
 #endif
 
         // common non-token strings
         struct commonStrings
         {
-            static const rtl::OUString aStrUserSpaceOnUse;
-            static const rtl::OUString aStrObjectBoundingBox;
-            static const rtl::OUString aStrNonzero;
-            static const rtl::OUString aStrEvenOdd;
+            static const OUString aStrUserSpaceOnUse;
+            static const OUString aStrObjectBoundingBox;
+            static const OUString aStrNonzero;
+            static const OUString aStrEvenOdd;
         };
 
         enum SvgUnits
@@ -181,40 +181,40 @@ namespace svgio
             basegfx::B2DHomMatrix createMapping(const basegfx::B2DRange& rTarget, const basegfx::B2DRange& rSource) const;
         };
 
-        void skip_char(const rtl::OUString& rCandidate, const sal_Unicode& rChar, sal_Int32& nPos, const sal_Int32 nLen);
-        void skip_char(const rtl::OUString& rCandidate, const sal_Unicode& rCharA, const sal_Unicode& rCharB, sal_Int32& nPos, const sal_Int32 nLen);
-        void copySign(const rtl::OUString& rCandidate, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen);
-        void copyNumber(const rtl::OUString& rCandidate, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen);
-        void copyHex(const rtl::OUString& rCandidate, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen);
-        void copyString(const rtl::OUString& rCandidate, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen);
-        void copyToLimiter(const rtl::OUString& rCandidate, const sal_Unicode& rLimiter, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen);
-        bool readNumber(const rtl::OUString& rCandidate, sal_Int32& nPos, double& fNum, const sal_Int32 nLen);
-        SvgUnit readUnit(const rtl::OUString& rCandidate, sal_Int32& nPos, const sal_Int32 nLen);
-        bool readNumberAndUnit(const rtl::OUString& rCandidate, sal_Int32& nPos, SvgNumber& aNum, const sal_Int32 nLen);
-        bool readAngle(const rtl::OUString& rCandidate, sal_Int32& nPos, double& fAngle, const sal_Int32 nLen);
+        void skip_char(const OUString& rCandidate, const sal_Unicode& rChar, sal_Int32& nPos, const sal_Int32 nLen);
+        void skip_char(const OUString& rCandidate, const sal_Unicode& rCharA, const sal_Unicode& rCharB, sal_Int32& nPos, const sal_Int32 nLen);
+        void copySign(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen);
+        void copyNumber(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen);
+        void copyHex(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen);
+        void copyString(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen);
+        void copyToLimiter(const OUString& rCandidate, const sal_Unicode& rLimiter, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen);
+        bool readNumber(const OUString& rCandidate, sal_Int32& nPos, double& fNum, const sal_Int32 nLen);
+        SvgUnit readUnit(const OUString& rCandidate, sal_Int32& nPos, const sal_Int32 nLen);
+        bool readNumberAndUnit(const OUString& rCandidate, sal_Int32& nPos, SvgNumber& aNum, const sal_Int32 nLen);
+        bool readAngle(const OUString& rCandidate, sal_Int32& nPos, double& fAngle, const sal_Int32 nLen);
         sal_Int32 read_hex(const sal_Unicode& rChar);
-        bool match_colorKeyword(basegfx::BColor& rColor, const rtl::OUString& rName);
-        bool read_color(const rtl::OUString& rCandidate, basegfx::BColor& rColor);
-        basegfx::B2DRange readViewBox(const rtl::OUString& rCandidate, InfoProvider& rInfoProvider);
-        basegfx::B2DHomMatrix readTransform(const rtl::OUString& rCandidate, InfoProvider& rInfoProvider);
-        bool readSingleNumber(const rtl::OUString& rCandidate, SvgNumber& aNum);
-        bool readLocalUrl(const rtl::OUString& rCandidate, rtl::OUString& rURL);
-        bool readSvgPaint(const rtl::OUString& rCandidate, SvgPaint& rSvgPaint, rtl::OUString& rURL);
-
-        bool readSvgNumberVector(const rtl::OUString& rCandidate, SvgNumberVector& rSvgNumberVector);
+        bool match_colorKeyword(basegfx::BColor& rColor, const OUString& rName);
+        bool read_color(const OUString& rCandidate, basegfx::BColor& rColor);
+        basegfx::B2DRange readViewBox(const OUString& rCandidate, InfoProvider& rInfoProvider);
+        basegfx::B2DHomMatrix readTransform(const OUString& rCandidate, InfoProvider& rInfoProvider);
+        bool readSingleNumber(const OUString& rCandidate, SvgNumber& aNum);
+        bool readLocalUrl(const OUString& rCandidate, OUString& rURL);
+        bool readSvgPaint(const OUString& rCandidate, SvgPaint& rSvgPaint, OUString& rURL);
+
+        bool readSvgNumberVector(const OUString& rCandidate, SvgNumberVector& rSvgNumberVector);
         ::std::vector< double > solveSvgNumberVector(const SvgNumberVector& rInput, const InfoProvider& rInfoProvider, NumberType aNumberType = length);
 
-        SvgAspectRatio readSvgAspectRatio(const rtl::OUString& rCandidate);
+        SvgAspectRatio readSvgAspectRatio(const OUString& rCandidate);
 
-        typedef ::std::vector< rtl::OUString > SvgStringVector;
-        bool readSvgStringVector(const rtl::OUString& rCandidate, SvgStringVector& rSvgStringVector);
+        typedef ::std::vector< OUString > SvgStringVector;
+        bool readSvgStringVector(const OUString& rCandidate, SvgStringVector& rSvgStringVector);
 
-        void readImageLink(const rtl::OUString& rCandidate, rtl::OUString& rXLink, rtl::OUString& rUrl, rtl::OUString& rMimeType, rtl::OUString& rData);
+        void readImageLink(const OUString& rCandidate, OUString& rXLink, OUString& rUrl, OUString& rMimeType, OUString& rData);
 
-        rtl::OUString convert(const rtl::OUString& rCandidate, const sal_Unicode& rPattern, const sal_Unicode& rNew, bool bRemove);
-        rtl::OUString consolidateContiguosSpace(const rtl::OUString& rCandidate);
-        rtl::OUString whiteSpaceHandlingDefault(const rtl::OUString& rCandidate);
-        rtl::OUString whiteSpaceHandlingPreserve(const rtl::OUString& rCandidate);
+        OUString convert(const OUString& rCandidate, const sal_Unicode& rPattern, const sal_Unicode& rNew, bool bRemove);
+        OUString consolidateContiguosSpace(const OUString& rCandidate);
+        OUString whiteSpaceHandlingDefault(const OUString& rCandidate);
+        OUString whiteSpaceHandlingPreserve(const OUString& rCandidate);
 
     } // end of namespace svgreader
 } // end of namespace svgio
diff --git a/svgio/inc/svgio/svgreader/svgtrefnode.hxx b/svgio/inc/svgio/svgreader/svgtrefnode.hxx
index e2442fb7a6f7..d9ab4e70e8dc 100644
--- a/svgio/inc/svgio/svgreader/svgtrefnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgtrefnode.hxx
@@ -38,7 +38,7 @@ namespace svgio
 
             /// link to text content. If maXLink
             /// is set, the node can be fetched on demand
-            rtl::OUString               maXLink;
+            OUString               maXLink;
 
         public:
             SvgTrefNode(
@@ -47,7 +47,7 @@ namespace svgio
             virtual ~SvgTrefNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
 
             /// access to referenced SvgTextNode
             const SvgTextNode* getReferencedSvgTextNode() const;
diff --git a/svgio/inc/svgio/svgreader/svgtspannode.hxx b/svgio/inc/svgio/svgreader/svgtspannode.hxx
index b48c76cd5fc6..2302485a05b5 100644
--- a/svgio/inc/svgio/svgreader/svgtspannode.hxx
+++ b/svgio/inc/svgio/svgreader/svgtspannode.hxx
@@ -46,7 +46,7 @@ namespace svgio
             virtual ~SvgTspanNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
 
             /// access to SvgTextPositions
             const SvgTextPositions& getSvgTextPositions() const { return maSvgTextPositions; }
diff --git a/svgio/inc/svgio/svgreader/svgusenode.hxx b/svgio/inc/svgio/svgreader/svgusenode.hxx
index e53a19e90d07..dffa1a61cfb7 100644
--- a/svgio/inc/svgio/svgreader/svgusenode.hxx
+++ b/svgio/inc/svgio/svgreader/svgusenode.hxx
@@ -44,7 +44,7 @@ namespace svgio
 
             /// link to content. If maXLink is set, the node can be fetched
             // on demand
-            rtl::OUString               maXLink;
+            OUString               maXLink;
 
         public:
             SvgUseNode(
@@ -53,7 +53,7 @@ namespace svgio
             virtual ~SvgUseNode();
 
             virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
-            virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent);
+            virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
             virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const;
 
             /// transform content