drop rtl:: and statics

Change-Id: I6108efad77cf1c21dea3826ae149f3750552b0ed

6 files changed, 27 insertions, 27 deletions

diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgio/svgreader/svgnode.hxx
index 6a5217ce4b21..4793ddf3e94b 100644
--- a/svgio/inc/svgio/svgreader/svgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgnode.hxx
@@ -82,7 +82,7 @@ namespace svgio
         // helper to convert a string associated with a token of type SVGTokenDisplay
         // to the enum Display. Empty trings return the default 'Display_inline' with
         // which members should be initialized
-        Display getDisplayFromContent(const rtl::OUString& aContent);
+        Display getDisplayFromContent(const OUString& aContent);
 
         class SvgNode : private boost::noncopyable, public InfoProvider
         {
@@ -122,10 +122,10 @@ namespace svgio
 
         protected:
             /// helper to evtl. link to css style
-            const SvgStyleAttributes* checkForCssStyle(const rtl::OUString& rClassStr, const SvgStyleAttributes& rOriginal) const;
+            const SvgStyleAttributes* checkForCssStyle(const OUString& rClassStr, const SvgStyleAttributes& rOriginal) const;
 
             /// helper for filling the CssStyle vector once dependent on mbCssStyleVectorBuilt
-            void fillCssStyleVector(const rtl::OUString& rClassStr);
+            void fillCssStyleVector(const OUString& rClassStr);
 
         public:
             SvgNode(
@@ -135,7 +135,7 @@ namespace svgio
             virtual ~SvgNode();
 
             /// scan helper to read and interpret a local CssStyle to mpLocalCssStyle
-            void readLocalCssStyle(const rtl::OUString& aContent);
+            void readLocalCssStyle(const OUString& aContent);
 
             /// style helpers
             void parseAttributes(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs);
diff --git a/svgio/source/svgreader/svggradientnode.cxx b/svgio/source/svgreader/svggradientnode.cxx
index 92ea5b5a13f1..d31979bbaf9f 100644
--- a/svgio/source/svgreader/svggradientnode.cxx
+++ b/svgio/source/svgreader/svggradientnode.cxx
@@ -65,8 +65,8 @@ namespace svgio
 
         const SvgStyleAttributes* SvgGradientNode::getSvgStyleAttributes() const
         {
-            static rtl::OUString aClassStrA(rtl::OUString::createFromAscii("linearGradient"));
-            static rtl::OUString aClassStrB(rtl::OUString::createFromAscii("radialGradient"));
+            OUString aClassStrA("linearGradient");
+            OUString aClassStrB("radialGradient");
 
             return checkForCssStyle(
                 SVGTokenLinearGradient == getType() ? aClassStrA : aClassStrB,
diff --git a/svgio/source/svgreader/svggradientstopnode.cxx b/svgio/source/svgreader/svggradientstopnode.cxx
index 6c6d758ee375..a1ce201da260 100644
--- a/svgio/source/svgreader/svggradientstopnode.cxx
+++ b/svgio/source/svgreader/svggradientstopnode.cxx
@@ -38,7 +38,7 @@ namespace svgio
 
         const SvgStyleAttributes* SvgGradientStopNode::getSvgStyleAttributes() const
         {
-            static rtl::OUString aClassStr(rtl::OUString::createFromAscii("stop"));
+            OUString aClassStr("stop");
 
             return checkForCssStyle(aClassStr, maSvgStyleAttributes);
         }
diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx
index 24decd3e4b1a..1652a25ff6f3 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -40,7 +40,7 @@ namespace svgio
             return 0;
         }
 
-        void SvgNode::fillCssStyleVector(const rtl::OUString& rClassStr)
+        void SvgNode::fillCssStyleVector(const OUString& rClassStr)
         {
             OSL_ENSURE(!mbCssStyleVectorBuilt, "OOps, fillCssStyleVector called double ?!?");
             mbCssStyleVectorBuilt = true;
@@ -75,7 +75,7 @@ namespace svgio
                 {
                     // concatenate combined style name during search for CSS style equal to Id
                     // when travelling over node parents
-                    rtl::OUString aConcatenatedStyleName;
+                    OUString aConcatenatedStyleName;
                     const SvgNode* pCurrent = this;
                     const SvgStyleAttributes* pNew = 0;
 
@@ -104,7 +104,7 @@ namespace svgio
                 if(getClass())
                 {
                     // find all referenced CSS styles (a list of entries is allowed)
-                    const rtl::OUString* pClassList = getClass();
+                    const OUString* pClassList = getClass();
                     const sal_Int32 nLen(pClassList->getLength());
                     sal_Int32 nPos(0);
                     const SvgStyleAttributes* pNew = 0;
@@ -113,13 +113,13 @@ namespace svgio
 
                     while(nPos < nLen)
                     {
-                        rtl::OUStringBuffer aTokenValue;
+                        OUStringBuffer aTokenValue;
 
                         copyToLimiter(*pClassList, sal_Unicode(' '), nPos, aTokenValue, nLen);
                         skip_char(*pClassList, sal_Unicode(' '), nPos, nLen);
 
-                        rtl::OUString aId(rtl::OUString::createFromAscii("."));
-                        const rtl::OUString aOUTokenValue(aTokenValue.makeStringAndClear());
+                        OUString aId(OUString::createFromAscii("."));
+                        const OUString aOUTokenValue(aTokenValue.makeStringAndClear());
 
                         // look for CSS style common to token
                         aId = aId + aOUTokenValue;
@@ -154,7 +154,7 @@ namespace svgio
             }
         }
 
-        const SvgStyleAttributes* SvgNode::checkForCssStyle(const rtl::OUString& rClassStr, const SvgStyleAttributes& rOriginal) const
+        const SvgStyleAttributes* SvgNode::checkForCssStyle(const OUString& rClassStr, const SvgStyleAttributes& rOriginal) const
         {
             if(!mbCssStyleVectorBuilt)
             {
@@ -266,7 +266,7 @@ namespace svgio
             }
         }
 
-        void SvgNode::readLocalCssStyle(const rtl::OUString& aContent)
+        void SvgNode::readLocalCssStyle(const OUString& aContent)
         {
             if(!mpLocalCssStyle)
             {
@@ -306,7 +306,7 @@ namespace svgio
             }
         }
 
-        Display getDisplayFromContent(const rtl::OUString& aContent)
+        Display getDisplayFromContent(const OUString& aContent)
         {
             if(aContent.getLength())
             {
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index b48431d3311d..82104ae99d47 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -184,21 +184,21 @@ namespace svgio
                 if(!aTokenName.isEmpty())
                 {
                     skip_char(rCandidate, sal_Unicode(' '), sal_Unicode(':'), nPos, nLen);
-                    rtl::OUStringBuffer aTokenValue;
+                    OUStringBuffer aTokenValue;
                     copyToLimiter(rCandidate, sal_Unicode(';'), nPos, aTokenValue, nLen);
                     skip_char(rCandidate, sal_Unicode(' '), sal_Unicode(';'), nPos, nLen);
-                    const rtl::OUString aOUTokenName(aTokenName.makeStringAndClear());
-                    rtl::OUString aOUTokenValue(aTokenValue.makeStringAndClear());
+                    const OUString aOUTokenName(aTokenName.makeStringAndClear());
+                    OUString aOUTokenValue(aTokenValue.makeStringAndClear());
 
                     // check for '!important' CssStyle mark, currently not supported
                     // but neds to be extracted for correct parsing
-                    static rtl::OUString aTokenImportant(RTL_CONSTASCII_USTRINGPARAM("!important"));
+                    OUString aTokenImportant("!important");
                     const sal_Int32 nIndexTokenImportant(aOUTokenValue.indexOf(aTokenImportant));
 
                     if(-1 != nIndexTokenImportant)
                     {
                         // if there currently just remove it and remove spaces to have the value only
-                        rtl::OUString aNewOUTokenValue;
+                        OUString aNewOUTokenValue;
 
                         if(nIndexTokenImportant > 0)
                         {
diff --git a/svgio/source/svgreader/svgstylenode.cxx b/svgio/source/svgreader/svgstylenode.cxx
index b17c52853db1..e5b965fab705 100644
--- a/svgio/source/svgreader/svgstylenode.cxx
+++ b/svgio/source/svgreader/svgstylenode.cxx
@@ -98,15 +98,15 @@ namespace svgio
                     copyToLimiter(aContent, sal_Unicode('{'), nPos, aTokenValue, nLen);
                     skip_char(aContent, sal_Unicode(' '), sal_Unicode('{'), nPos, nLen);
 
-                    const rtl::OUString aStyleName(aTokenValue.makeStringAndClear().trim());
+                    const OUString aStyleName(aTokenValue.makeStringAndClear().trim());
                     const sal_Int32 nLen2(aStyleName.getLength());
-                    std::vector< rtl::OUString > aStyleNames;
+                    std::vector< OUString > aStyleNames;
 
                     if(nLen2)
                     {
                         // extract names
                         sal_Int32 nPos2(0);
-                        rtl::OUStringBuffer aSingleName;
+                        OUStringBuffer aSingleName;
 
                         while(nPos2 < nLen2)
                         {
@@ -114,7 +114,7 @@ namespace svgio
                             copyToLimiter(aStyleName, sal_Unicode(' '), nPos2, aSingleName, nLen2);
                             skip_char(aStyleName, sal_Unicode(' '), nPos2, nLen2);
 
-                            const rtl::OUString aOUSingleName(aSingleName.makeStringAndClear().trim());
+                            const OUString aOUSingleName(aSingleName.makeStringAndClear().trim());
 
                             if(aOUSingleName.getLength())
                             {
@@ -127,7 +127,7 @@ namespace svgio
                     {
                         copyToLimiter(aContent, sal_Unicode('}'), nPos, aTokenValue, nLen);
                         skip_char(aContent, sal_Unicode(' '), sal_Unicode('}'), nPos, nLen);
-                        const rtl::OUString aStyleContent(aTokenValue.makeStringAndClear().trim());
+                        const OUString aStyleContent(aTokenValue.makeStringAndClear().trim());
 
                         if(!aStyleContent.isEmpty())
                         {
@@ -139,7 +139,7 @@ namespace svgio
                             pNewStyle->readStyle(aStyleContent);
 
                             // concatenate combined style name
-                            rtl::OUString aConcatenatedStyleName;
+                            OUString aConcatenatedStyleName;
 
                             for(sal_uInt32 a(0); a < aStyleNames.size(); a++)
                             {