diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /svgio | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
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
Diffstat (limited to 'svgio')
62 files changed, 649 insertions, 649 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 diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx index 552db36ea939..e6a4a1982a4e 100644 --- a/svgio/source/svgreader/svgcharacternode.cxx +++ b/svgio/source/svgreader/svgcharacternode.cxx @@ -43,7 +43,7 @@ namespace svgio { } - void SvgTextPositions::parseTextPositionAttributes(const rtl::OUString& /*rTokenName*/, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgTextPositions::parseTextPositionAttributes(const OUString& /*rTokenName*/, SVGToken aSVGToken, const OUString& aContent) { // parse own switch(aSVGToken) @@ -130,8 +130,8 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrSpacing(rtl::OUString::createFromAscii("spacing")); - static rtl::OUString aStrSpacingAndGlyphs(rtl::OUString::createFromAscii("spacingAndGlyphs")); + static OUString aStrSpacing(OUString::createFromAscii("spacing")); + static OUString aStrSpacingAndGlyphs(OUString::createFromAscii("spacingAndGlyphs")); if(aContent.match(aStrSpacing)) { @@ -208,7 +208,7 @@ namespace svgio SvgCharacterNode::SvgCharacterNode( SvgDocument& rDocument, SvgNode* pParent, - const rtl::OUString& rText) + const OUString& rText) : SvgNode(SVGTokenCharacter, rDocument, pParent), maText(rText) { @@ -243,8 +243,8 @@ namespace svgio if(nLength) { // prepare FontAttribute - const rtl::OUString aFontFamily = rSvgStyleAttributes.getFontFamily().empty() ? - rtl::OUString(rtl::OUString::createFromAscii("Times New Roman")) : + const OUString aFontFamily = rSvgStyleAttributes.getFontFamily().empty() ? + OUString(OUString::createFromAscii("Times New Roman")) : rSvgStyleAttributes.getFontFamily()[0]; const ::FontWeight nFontWeight(getVclFontWeight(rSvgStyleAttributes.getFontWeight())); bool bSymbol(false); @@ -257,7 +257,7 @@ namespace svgio const drawinglayer::attribute::FontAttribute aFontAttribute( aFontFamily, - rtl::OUString(), + OUString(), nFontWeight, bSymbol, bVertical, @@ -520,10 +520,10 @@ namespace svgio void SvgCharacterNode::addGap() { - maText += rtl::OUString(sal_Unicode(' ')); + maText += OUString(sal_Unicode(' ')); } - void SvgCharacterNode::concatenate(const rtl::OUString& rText) + void SvgCharacterNode::concatenate(const OUString& rText) { maText += rText; } diff --git a/svgio/source/svgreader/svgcirclenode.cxx b/svgio/source/svgreader/svgcirclenode.cxx index b9ef1f7bd624..4f26ae9abae2 100644 --- a/svgio/source/svgreader/svgcirclenode.cxx +++ b/svgio/source/svgreader/svgcirclenode.cxx @@ -46,13 +46,13 @@ namespace svgio const SvgStyleAttributes* SvgCircleNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("circle")); + static OUString aClassStr(OUString::createFromAscii("circle")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgCircleNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgCircleNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgclippathnode.cxx b/svgio/source/svgreader/svgclippathnode.cxx index 5c271400d5f0..16a126e2dfd3 100644 --- a/svgio/source/svgreader/svgclippathnode.cxx +++ b/svgio/source/svgreader/svgclippathnode.cxx @@ -51,7 +51,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgClipPathNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgClipPathNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgdocument.cxx b/svgio/source/svgreader/svgdocument.cxx index d8c379d8b512..705df546838a 100644 --- a/svgio/source/svgreader/svgdocument.cxx +++ b/svgio/source/svgreader/svgdocument.cxx @@ -25,7 +25,7 @@ namespace svgio { namespace svgreader { - SvgDocument::SvgDocument(const rtl::OUString& rAbsolutePath) + SvgDocument::SvgDocument(const OUString& rAbsolutePath) : maNodes(), maAbsolutePath(rAbsolutePath), maIdTokenMapperList(), @@ -49,7 +49,7 @@ namespace svgio maNodes.push_back(pNode); } - void SvgDocument::addSvgNodeToMapper(const rtl::OUString& rStr, const SvgNode& rNode) + void SvgDocument::addSvgNodeToMapper(const OUString& rStr, const SvgNode& rNode) { if(rStr.getLength()) { @@ -57,7 +57,7 @@ namespace svgio } } - void SvgDocument::removeSvgNodeFromMapper(const rtl::OUString& rStr) + void SvgDocument::removeSvgNodeFromMapper(const OUString& rStr) { if(rStr.getLength()) { @@ -65,7 +65,7 @@ namespace svgio } } - const SvgNode* SvgDocument::findSvgNodeById(const rtl::OUString& rStr) const + const SvgNode* SvgDocument::findSvgNodeById(const OUString& rStr) const { const IdTokenMapper::const_iterator aResult(maIdTokenMapperList.find(rStr)); @@ -79,7 +79,7 @@ namespace svgio } } - void SvgDocument::addSvgStyleAttributesToMapper(const rtl::OUString& rStr, const SvgStyleAttributes& rSvgStyleAttributes) + void SvgDocument::addSvgStyleAttributesToMapper(const OUString& rStr, const SvgStyleAttributes& rSvgStyleAttributes) { if(rStr.getLength()) { @@ -87,7 +87,7 @@ namespace svgio } } - const SvgStyleAttributes* SvgDocument::findSvgStyleAttributesById(const rtl::OUString& rStr) const + const SvgStyleAttributes* SvgDocument::findSvgStyleAttributesById(const OUString& rStr) const { const IdStyleTokenMapper::const_iterator aResult(maIdStyleTokenMapperList.find(rStr)); diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx b/svgio/source/svgreader/svgdocumenthandler.cxx index 29c40b30cd30..3312221bfcaf 100644 --- a/svgio/source/svgreader/svgdocumenthandler.cxx +++ b/svgio/source/svgreader/svgdocumenthandler.cxx @@ -118,7 +118,7 @@ namespace svgio { namespace svgreader { - SvgDocHdl::SvgDocHdl(const rtl::OUString& aAbsolutePath) + SvgDocHdl::SvgDocHdl(const OUString& aAbsolutePath) : maDocument(aAbsolutePath), mpTarget(0), maCssContents() @@ -149,7 +149,7 @@ namespace svgio OSL_ENSURE(!maCssContents.size(), "SvgDocHdl endDocument with active css style stack entry (!)"); } - void SvgDocHdl::startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) { if(aName.getLength()) { @@ -308,7 +308,7 @@ namespace svgio if(pNew->isTextCss()) { - maCssContents.push_back(rtl::OUString()); + maCssContents.push_back(OUString()); } break; } @@ -353,9 +353,9 @@ namespace svgio /// invalid token, ignore #ifdef DBG_UTIL myAssert( - rtl::OUString::createFromAscii("Unknown Base SvgToken <") + + OUString::createFromAscii("Unknown Base SvgToken <") + aName + - rtl::OUString::createFromAscii("> (!)")); + OUString::createFromAscii("> (!)")); #endif break; } @@ -363,7 +363,7 @@ namespace svgio } } - void SvgDocHdl::endElement( const ::rtl::OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) { if(aName.getLength()) { @@ -449,7 +449,7 @@ namespace svgio if(pSvgTitleDescNode && mpTarget) { - const rtl::OUString aText(pSvgTitleDescNode->getText()); + const OUString aText(pSvgTitleDescNode->getText()); if(aText.getLength()) { @@ -487,7 +487,7 @@ namespace svgio } } - void SvgDocHdl::characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) { const sal_uInt32 nLength(aChars.getLength()); @@ -529,11 +529,11 @@ namespace svgio // collect characters for css style if(maCssContents.size()) { - const ::rtl::OUString aTrimmedChars(aChars.trim()); + const OUString aTrimmedChars(aChars.trim()); if(aTrimmedChars.getLength()) { - std::vector< rtl::OUString >::iterator aString(maCssContents.end() - 1); + std::vector< OUString >::iterator aString(maCssContents.end() - 1); (*aString) += aTrimmedChars; } } @@ -562,11 +562,11 @@ namespace svgio } } - void SvgDocHdl::ignorableWhitespace(const ::rtl::OUString& /*aWhitespaces*/) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::ignorableWhitespace(const OUString& /*aWhitespaces*/) throw (xml::sax::SAXException, uno::RuntimeException) { } - void SvgDocHdl::processingInstruction(const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/) throw (xml::sax::SAXException, uno::RuntimeException) + void SvgDocHdl::processingInstruction(const OUString& /*aTarget*/, const OUString& /*aData*/) throw (xml::sax::SAXException, uno::RuntimeException) { } diff --git a/svgio/source/svgreader/svgellipsenode.cxx b/svgio/source/svgreader/svgellipsenode.cxx index f34edb244f4a..12289929dbd8 100644 --- a/svgio/source/svgreader/svgellipsenode.cxx +++ b/svgio/source/svgreader/svgellipsenode.cxx @@ -47,13 +47,13 @@ namespace svgio const SvgStyleAttributes* SvgEllipseNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("ellipse")); + static OUString aClassStr(OUString::createFromAscii("ellipse")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgEllipseNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgEllipseNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svggnode.cxx b/svgio/source/svgreader/svggnode.cxx index df2ad5aed125..80a0fa141d96 100644 --- a/svgio/source/svgreader/svggnode.cxx +++ b/svgio/source/svgreader/svggnode.cxx @@ -45,13 +45,13 @@ namespace svgio const SvgStyleAttributes* SvgGNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("g")); + static OUString aClassStr(OUString::createFromAscii("g")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgGNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgGNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svggradientnode.cxx b/svgio/source/svgreader/svggradientnode.cxx index 74878d1ecb9e..215ce391b460 100644 --- a/svgio/source/svgreader/svggradientnode.cxx +++ b/svgio/source/svgreader/svggradientnode.cxx @@ -69,7 +69,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgGradientNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgGradientNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); @@ -197,9 +197,9 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrPad(rtl::OUString::createFromAscii("pad")); - static rtl::OUString aStrReflect(rtl::OUString::createFromAscii("reflect")); - static rtl::OUString aStrRepeat(rtl::OUString::createFromAscii("repeat")); + static OUString aStrPad(OUString::createFromAscii("pad")); + static OUString aStrReflect(OUString::createFromAscii("reflect")); + static OUString aStrRepeat(OUString::createFromAscii("repeat")); if(aContent.match(aStrPad, 0)) { diff --git a/svgio/source/svgreader/svggradientstopnode.cxx b/svgio/source/svgreader/svggradientstopnode.cxx index cf9b069395d5..f9a9289f3bbc 100644 --- a/svgio/source/svgreader/svggradientstopnode.cxx +++ b/svgio/source/svgreader/svggradientstopnode.cxx @@ -43,7 +43,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgGradientStopNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgGradientStopNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx index 8e933c0f32c5..952472c1cff4 100644 --- a/svgio/source/svgreader/svgimagenode.cxx +++ b/svgio/source/svgreader/svgimagenode.cxx @@ -64,13 +64,13 @@ namespace svgio const SvgStyleAttributes* SvgImageNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("image")); + static OUString aClassStr(OUString::createFromAscii("image")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgImageNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgImageNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); @@ -236,8 +236,8 @@ namespace svgio } else if(maUrl.getLength()) { - const rtl::OUString& rPath = getDocument().getAbsolutePath(); - const rtl::OUString aAbsUrl(rtl::Uri::convertRelToAbs(rPath, maUrl)); + const OUString& rPath = getDocument().getAbsolutePath(); + const OUString aAbsUrl(rtl::Uri::convertRelToAbs(rPath, maUrl)); if(aAbsUrl.getLength()) { diff --git a/svgio/source/svgreader/svglinenode.cxx b/svgio/source/svgreader/svglinenode.cxx index bd8ad988635c..877bd222014d 100644 --- a/svgio/source/svgreader/svglinenode.cxx +++ b/svgio/source/svgreader/svglinenode.cxx @@ -47,13 +47,13 @@ namespace svgio const SvgStyleAttributes* SvgLineNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("line")); + static OUString aClassStr(OUString::createFromAscii("line")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgLineNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgLineNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgmarkernode.cxx b/svgio/source/svgreader/svgmarkernode.cxx index 444ff3266420..5ee664d08e42 100644 --- a/svgio/source/svgreader/svgmarkernode.cxx +++ b/svgio/source/svgreader/svgmarkernode.cxx @@ -50,13 +50,13 @@ namespace svgio const SvgStyleAttributes* SvgMarkerNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("marker")); + static OUString aClassStr(OUString::createFromAscii("marker")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgMarkerNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgMarkerNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); @@ -111,7 +111,7 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrStrokeWidth(rtl::OUString::createFromAscii("strokeWidth")); + static OUString aStrStrokeWidth(OUString::createFromAscii("strokeWidth")); if(aContent.match(aStrStrokeWidth, 0)) { @@ -156,7 +156,7 @@ namespace svgio if(nLen) { - static rtl::OUString aStrAuto(rtl::OUString::createFromAscii("auto")); + static OUString aStrAuto(OUString::createFromAscii("auto")); if(aContent.match(aStrAuto, 0)) { diff --git a/svgio/source/svgreader/svgmasknode.cxx b/svgio/source/svgreader/svgmasknode.cxx index bc1ac3243e85..831cf3990e9c 100644 --- a/svgio/source/svgreader/svgmasknode.cxx +++ b/svgio/source/svgreader/svgmasknode.cxx @@ -58,7 +58,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgMaskNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgMaskNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx index 639aa0cafadb..d00beaf1908f 100644 --- a/svgio/source/svgreader/svgnode.cxx +++ b/svgio/source/svgreader/svgnode.cxx @@ -83,13 +83,13 @@ namespace svgio for(sal_uInt32 a(0); a < nAttributes; a++) { - const ::rtl::OUString aTokenName(xAttribs->getNameByIndex(a)); + const OUString aTokenName(xAttribs->getNameByIndex(a)); parseAttribute(aTokenName, StrToSVGToken(aTokenName), xAttribs->getValueByIndex(a)); } } - void SvgNode::parseAttribute(const rtl::OUString& /*rTokenName*/, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgNode::parseAttribute(const OUString& /*rTokenName*/, SVGToken aSVGToken, const OUString& aContent) { switch(aSVGToken) { @@ -113,8 +113,8 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrDefault(rtl::OUString::createFromAscii("default")); - static rtl::OUString aStrPreserve(rtl::OUString::createFromAscii("preserve")); + static OUString aStrDefault(OUString::createFromAscii("default")); + static OUString aStrPreserve(OUString::createFromAscii("preserve")); if(aContent.match(aStrDefault)) { @@ -193,13 +193,13 @@ namespace svgio if(pStyles) { // check if we have Title or Desc - const rtl::OUString& rTitle = pStyles->getTitle(); - const rtl::OUString& rDesc = pStyles->getDesc(); + const OUString& rTitle = pStyles->getTitle(); + const OUString& rDesc = pStyles->getDesc(); if(rTitle.getLength() || rDesc.getLength()) { // default object name is empty - rtl::OUString aObjectName; + OUString aObjectName; // use path as object name when outmost element if(SVGTokenSvg == getType()) @@ -277,7 +277,7 @@ namespace svgio } } - void SvgNode::setId(const rtl::OUString* pfId) + void SvgNode::setId(const OUString* pfId) { if(mpId) { @@ -288,12 +288,12 @@ namespace svgio if(pfId) { - mpId = new rtl::OUString(*pfId); + mpId = new OUString(*pfId); mrDocument.addSvgNodeToMapper(*mpId, *this); } } - void SvgNode::setClass(const rtl::OUString* pfClass) + void SvgNode::setClass(const OUString* pfClass) { if(mpClass) { @@ -304,7 +304,7 @@ namespace svgio if(pfClass) { - mpClass = new rtl::OUString(*pfClass); + mpClass = new OUString(*pfClass); mrDocument.addSvgNodeToMapper(*mpClass, *this); } } diff --git a/svgio/source/svgreader/svgpathnode.cxx b/svgio/source/svgreader/svgpathnode.cxx index cd66017a5765..a50beefc306c 100644 --- a/svgio/source/svgreader/svgpathnode.cxx +++ b/svgio/source/svgreader/svgpathnode.cxx @@ -45,13 +45,13 @@ namespace svgio const SvgStyleAttributes* SvgPathNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("path")); + static OUString aClassStr(OUString::createFromAscii("path")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgPathNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgPathNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgpatternnode.cxx b/svgio/source/svgreader/svgpatternnode.cxx index 6aa7a7cd63a3..c507bd3ffdf3 100644 --- a/svgio/source/svgreader/svgpatternnode.cxx +++ b/svgio/source/svgreader/svgpatternnode.cxx @@ -64,13 +64,13 @@ namespace svgio const SvgStyleAttributes* SvgPatternNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("pattern")); + static OUString aClassStr(OUString::createFromAscii("pattern")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgPatternNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgPatternNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgpolynode.cxx b/svgio/source/svgreader/svgpolynode.cxx index a814402d46f8..3100fc30a00e 100644 --- a/svgio/source/svgreader/svgpolynode.cxx +++ b/svgio/source/svgreader/svgpolynode.cxx @@ -47,14 +47,14 @@ namespace svgio const SvgStyleAttributes* SvgPolyNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStrA(rtl::OUString::createFromAscii("polygon")); - static rtl::OUString aClassStrB(rtl::OUString::createFromAscii("polyline")); + static OUString aClassStrA(OUString::createFromAscii("polygon")); + static OUString aClassStrB(OUString::createFromAscii("polyline")); maSvgStyleAttributes.checkForCssStyle(mbIsPolyline? aClassStrB : aClassStrA); return &maSvgStyleAttributes; } - void SvgPolyNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgPolyNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgrectnode.cxx b/svgio/source/svgreader/svgrectnode.cxx index e826b8546f03..c3948164e342 100644 --- a/svgio/source/svgreader/svgrectnode.cxx +++ b/svgio/source/svgreader/svgrectnode.cxx @@ -49,13 +49,13 @@ namespace svgio const SvgStyleAttributes* SvgRectNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("rect")); + static OUString aClassStr(OUString::createFromAscii("rect")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgRectNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgRectNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index f5370729d56e..a64e66e0b734 100644 --- a/svgio/source/svgreader/svgstyleattributes.cxx +++ b/svgio/source/svgreader/svgstyleattributes.cxx @@ -171,7 +171,7 @@ namespace svgio return nRetval; } - void SvgStyleAttributes::readStyle(const rtl::OUString& rCandidate) + void SvgStyleAttributes::readStyle(const OUString& rCandidate) { const sal_Int32 nLen(rCandidate.getLength()); sal_Int32 nPos(0); @@ -180,17 +180,17 @@ namespace svgio { const sal_Int32 nInitPos(nPos); skip_char(rCandidate, sal_Unicode(' '), nPos, nLen); - rtl::OUStringBuffer aTokenName; + OUStringBuffer aTokenName; copyString(rCandidate, nPos, aTokenName, nLen); if(aTokenName.getLength()) { 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()); - const rtl::OUString aOUTokenValue(aTokenValue.makeStringAndClear()); + const OUString aOUTokenName(aTokenName.makeStringAndClear()); + const OUString aOUTokenValue(aTokenValue.makeStringAndClear()); parseStyleAttribute(aOUTokenName, StrToSVGToken(aOUTokenName), aOUTokenValue); } @@ -203,7 +203,7 @@ namespace svgio } } - void SvgStyleAttributes::checkForCssStyle(const rtl::OUString& rClassStr) const + void SvgStyleAttributes::checkForCssStyle(const OUString& rClassStr) const { if(!mpCssStyleParent) { @@ -214,7 +214,7 @@ namespace svgio { if(mrOwner.getClass()) { - rtl::OUString aId(rtl::OUString::createFromAscii(".")); + OUString aId(OUString::createFromAscii(".")); aId = aId + *mrOwner.getClass(); pNew = rDocument.findSvgStyleAttributesById(aId); @@ -1216,14 +1216,14 @@ namespace svgio { } - void SvgStyleAttributes::parseStyleAttribute(const rtl::OUString& /*rTokenName*/, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgStyleAttributes::parseStyleAttribute(const OUString& /*rTokenName*/, SVGToken aSVGToken, const OUString& aContent) { switch(aSVGToken) { case SVGTokenFill: { SvgPaint aSvgPaint; - rtl::OUString aURL; + OUString aURL; if(readSvgPaint(aContent, aSvgPaint, aURL)) { @@ -1280,7 +1280,7 @@ namespace svgio case SVGTokenStroke: { SvgPaint aSvgPaint; - rtl::OUString aURL; + OUString aURL; if(readSvgPaint(aContent, aSvgPaint, aURL)) { @@ -1334,9 +1334,9 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrButt(rtl::OUString::createFromAscii("butt")); - static rtl::OUString aStrRound(rtl::OUString::createFromAscii("round")); - static rtl::OUString aStrSquare(rtl::OUString::createFromAscii("square")); + static OUString aStrButt(OUString::createFromAscii("butt")); + static OUString aStrRound(OUString::createFromAscii("round")); + static OUString aStrSquare(OUString::createFromAscii("square")); if(aContent.match(aStrButt)) { @@ -1357,9 +1357,9 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrMiter(rtl::OUString::createFromAscii("miter")); - static rtl::OUString aStrRound(rtl::OUString::createFromAscii("round")); - static rtl::OUString aStrBevel(rtl::OUString::createFromAscii("bevel")); + static OUString aStrMiter(OUString::createFromAscii("miter")); + static OUString aStrRound(OUString::createFromAscii("round")); + static OUString aStrBevel(OUString::createFromAscii("bevel")); if(aContent.match(aStrMiter)) { @@ -1418,7 +1418,7 @@ namespace svgio case SVGTokenStopColor: { SvgPaint aSvgPaint; - rtl::OUString aURL; + OUString aURL; if(readSvgPaint(aContent, aSvgPaint, aURL)) { @@ -1471,17 +1471,17 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrNormal(rtl::OUString::createFromAscii("normal")); - static rtl::OUString aStrWider(rtl::OUString::createFromAscii("wider")); - static rtl::OUString aStrNarrower(rtl::OUString::createFromAscii("narrower")); - static rtl::OUString aStrUltra_condensed(rtl::OUString::createFromAscii("ultra-condensed")); - static rtl::OUString aStrExtra_condensed(rtl::OUString::createFromAscii("extra-condensed")); - static rtl::OUString aStrCondensed(rtl::OUString::createFromAscii("condensed")); - static rtl::OUString aStrSemi_condensed(rtl::OUString::createFromAscii("semi-condensed")); - static rtl::OUString aStrSemi_expanded(rtl::OUString::createFromAscii("semi-expanded")); - static rtl::OUString aStrExpanded(rtl::OUString::createFromAscii("expanded")); - static rtl::OUString aStrExtra_expanded(rtl::OUString::createFromAscii("extra-expanded")); - static rtl::OUString aStrUltra_expanded(rtl::OUString::createFromAscii("ultra-expanded")); + static OUString aStrNormal(OUString::createFromAscii("normal")); + static OUString aStrWider(OUString::createFromAscii("wider")); + static OUString aStrNarrower(OUString::createFromAscii("narrower")); + static OUString aStrUltra_condensed(OUString::createFromAscii("ultra-condensed")); + static OUString aStrExtra_condensed(OUString::createFromAscii("extra-condensed")); + static OUString aStrCondensed(OUString::createFromAscii("condensed")); + static OUString aStrSemi_condensed(OUString::createFromAscii("semi-condensed")); + static OUString aStrSemi_expanded(OUString::createFromAscii("semi-expanded")); + static OUString aStrExpanded(OUString::createFromAscii("expanded")); + static OUString aStrExtra_expanded(OUString::createFromAscii("extra-expanded")); + static OUString aStrUltra_expanded(OUString::createFromAscii("ultra-expanded")); if(aContent.match(aStrNormal)) { @@ -1534,9 +1534,9 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrNormal(rtl::OUString::createFromAscii("normal")); - static rtl::OUString aStrItalic(rtl::OUString::createFromAscii("italic")); - static rtl::OUString aStrOblique(rtl::OUString::createFromAscii("oblique")); + static OUString aStrNormal(OUString::createFromAscii("normal")); + static OUString aStrItalic(OUString::createFromAscii("italic")); + static OUString aStrOblique(OUString::createFromAscii("oblique")); if(aContent.match(aStrNormal)) { @@ -1557,8 +1557,8 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrNormal(rtl::OUString::createFromAscii("normal")); - static rtl::OUString aStrSmallCaps(rtl::OUString::createFromAscii("small-caps")); + static OUString aStrNormal(OUString::createFromAscii("normal")); + static OUString aStrSmallCaps(OUString::createFromAscii("small-caps")); if(aContent.match(aStrNormal)) { @@ -1575,19 +1575,19 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrNormal(rtl::OUString::createFromAscii("normal")); - static rtl::OUString aStrBold(rtl::OUString::createFromAscii("bold")); - static rtl::OUString aStrBolder(rtl::OUString::createFromAscii("bolder")); - static rtl::OUString aStrLighter(rtl::OUString::createFromAscii("lighter")); - static rtl::OUString aStr100(rtl::OUString::createFromAscii("100")); - static rtl::OUString aStr200(rtl::OUString::createFromAscii("200")); - static rtl::OUString aStr300(rtl::OUString::createFromAscii("300")); - static rtl::OUString aStr400(rtl::OUString::createFromAscii("400")); - static rtl::OUString aStr500(rtl::OUString::createFromAscii("500")); - static rtl::OUString aStr600(rtl::OUString::createFromAscii("600")); - static rtl::OUString aStr700(rtl::OUString::createFromAscii("700")); - static rtl::OUString aStr800(rtl::OUString::createFromAscii("800")); - static rtl::OUString aStr900(rtl::OUString::createFromAscii("900")); + static OUString aStrNormal(OUString::createFromAscii("normal")); + static OUString aStrBold(OUString::createFromAscii("bold")); + static OUString aStrBolder(OUString::createFromAscii("bolder")); + static OUString aStrLighter(OUString::createFromAscii("lighter")); + static OUString aStr100(OUString::createFromAscii("100")); + static OUString aStr200(OUString::createFromAscii("200")); + static OUString aStr300(OUString::createFromAscii("300")); + static OUString aStr400(OUString::createFromAscii("400")); + static OUString aStr500(OUString::createFromAscii("500")); + static OUString aStr600(OUString::createFromAscii("600")); + static OUString aStr700(OUString::createFromAscii("700")); + static OUString aStr800(OUString::createFromAscii("800")); + static OUString aStr900(OUString::createFromAscii("900")); if(aContent.match(aStr100)) { @@ -1648,11 +1648,11 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrNone(rtl::OUString::createFromAscii("none")); - static rtl::OUString aStrUnderline(rtl::OUString::createFromAscii("underline")); - static rtl::OUString aStrOverline(rtl::OUString::createFromAscii("overline")); - static rtl::OUString aStrLineThrough(rtl::OUString::createFromAscii("line-through")); - static rtl::OUString aStrBlink(rtl::OUString::createFromAscii("blink")); + static OUString aStrNone(OUString::createFromAscii("none")); + static OUString aStrUnderline(OUString::createFromAscii("underline")); + static OUString aStrOverline(OUString::createFromAscii("overline")); + static OUString aStrLineThrough(OUString::createFromAscii("line-through")); + static OUString aStrBlink(OUString::createFromAscii("blink")); if(aContent.match(aStrNone)) { @@ -1689,9 +1689,9 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrStart(rtl::OUString::createFromAscii("start")); - static rtl::OUString aStrMiddle(rtl::OUString::createFromAscii("middle")); - static rtl::OUString aStrEnd(rtl::OUString::createFromAscii("end")); + static OUString aStrStart(OUString::createFromAscii("start")); + static OUString aStrMiddle(OUString::createFromAscii("middle")); + static OUString aStrEnd(OUString::createFromAscii("end")); if(aContent.match(aStrStart)) { @@ -1712,10 +1712,10 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrLeft(rtl::OUString::createFromAscii("left")); - static rtl::OUString aStrRight(rtl::OUString::createFromAscii("right")); - static rtl::OUString aStrCenter(rtl::OUString::createFromAscii("center")); - static rtl::OUString aStrJustify(rtl::OUString::createFromAscii("justify")); + static OUString aStrLeft(OUString::createFromAscii("left")); + static OUString aStrRight(OUString::createFromAscii("right")); + static OUString aStrCenter(OUString::createFromAscii("center")); + static OUString aStrJustify(OUString::createFromAscii("justify")); if(aContent.match(aStrLeft)) { @@ -1739,7 +1739,7 @@ namespace svgio case SVGTokenColor: { SvgPaint aSvgPaint; - rtl::OUString aURL; + OUString aURL; if(readSvgPaint(aContent, aSvgPaint, aURL)) { @@ -2381,7 +2381,7 @@ namespace svgio return 0; } - const rtl::OUString SvgStyleAttributes::getMarkerStartXLink() const + const OUString SvgStyleAttributes::getMarkerStartXLink() const { if(maMarkerStartXLink.getLength()) { @@ -2395,14 +2395,14 @@ namespace svgio return pSvgStyleAttributes->getMarkerStartXLink(); } - return rtl::OUString(); + return OUString(); } const SvgMarkerNode* SvgStyleAttributes::accessMarkerStartXLink() const { if(!mpMarkerStartXLink) { - const rtl::OUString aMarker(getMarkerStartXLink()); + const OUString aMarker(getMarkerStartXLink()); if(aMarker.getLength()) { @@ -2413,7 +2413,7 @@ namespace svgio return mpMarkerStartXLink; } - const rtl::OUString SvgStyleAttributes::getMarkerMidXLink() const + const OUString SvgStyleAttributes::getMarkerMidXLink() const { if(maMarkerMidXLink.getLength()) { @@ -2427,14 +2427,14 @@ namespace svgio return pSvgStyleAttributes->getMarkerMidXLink(); } - return rtl::OUString(); + return OUString(); } const SvgMarkerNode* SvgStyleAttributes::accessMarkerMidXLink() const { if(!mpMarkerMidXLink) { - const rtl::OUString aMarker(getMarkerMidXLink()); + const OUString aMarker(getMarkerMidXLink()); if(aMarker.getLength()) { @@ -2445,7 +2445,7 @@ namespace svgio return mpMarkerMidXLink; } - const rtl::OUString SvgStyleAttributes::getMarkerEndXLink() const + const OUString SvgStyleAttributes::getMarkerEndXLink() const { if(maMarkerEndXLink.getLength()) { @@ -2459,14 +2459,14 @@ namespace svgio return pSvgStyleAttributes->getMarkerEndXLink(); } - return rtl::OUString(); + return OUString(); } const SvgMarkerNode* SvgStyleAttributes::accessMarkerEndXLink() const { if(!mpMarkerEndXLink) { - const rtl::OUString aMarker(getMarkerEndXLink()); + const OUString aMarker(getMarkerEndXLink()); if(aMarker.getLength()) { diff --git a/svgio/source/svgreader/svgstylenode.cxx b/svgio/source/svgreader/svgstylenode.cxx index 9060ac0b9a7d..13d5085d98cb 100644 --- a/svgio/source/svgreader/svgstylenode.cxx +++ b/svgio/source/svgreader/svgstylenode.cxx @@ -44,7 +44,7 @@ namespace svgio } } - void SvgStyleNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgStyleNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); @@ -56,7 +56,7 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrTextCss(rtl::OUString::createFromAscii("text/css")); + static OUString aStrTextCss(OUString::createFromAscii("text/css")); if(aContent.match(aStrTextCss)) { @@ -72,28 +72,28 @@ namespace svgio } } - void SvgStyleNode::addCssStyleSheet(const rtl::OUString& aContent) + void SvgStyleNode::addCssStyleSheet(const OUString& aContent) { const sal_Int32 nLen(aContent.getLength()); if(nLen) { sal_Int32 nPos(0); - rtl::OUStringBuffer aTokenValue; + OUStringBuffer aTokenValue; while(nPos < nLen) { const sal_Int32 nInitPos(nPos); skip_char(aContent, sal_Unicode(' '), sal_Unicode('#'), nPos, nLen); copyToLimiter(aContent, sal_Unicode('{'), nPos, aTokenValue, nLen); - const rtl::OUString aStyleName = aTokenValue.makeStringAndClear().trim(); + const OUString aStyleName = aTokenValue.makeStringAndClear().trim(); if(aStyleName.getLength() && nPos < nLen) { skip_char(aContent, sal_Unicode(' '), sal_Unicode('{'), nPos, nLen); 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.getLength()) { diff --git a/svgio/source/svgreader/svgsvgnode.cxx b/svgio/source/svgreader/svgsvgnode.cxx index ecf74d9bb4a6..dc4d619290f6 100644 --- a/svgio/source/svgreader/svgsvgnode.cxx +++ b/svgio/source/svgreader/svgsvgnode.cxx @@ -63,7 +63,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgSvgNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgSvgNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgsymbolnode.cxx b/svgio/source/svgreader/svgsymbolnode.cxx index 2c8ec2ef8149..0f780836208b 100644 --- a/svgio/source/svgreader/svgsymbolnode.cxx +++ b/svgio/source/svgreader/svgsymbolnode.cxx @@ -47,7 +47,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgSymbolNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgSymbolNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgtextnode.cxx b/svgio/source/svgreader/svgtextnode.cxx index 8340abd31d98..17cbd901e29d 100644 --- a/svgio/source/svgreader/svgtextnode.cxx +++ b/svgio/source/svgreader/svgtextnode.cxx @@ -49,13 +49,13 @@ namespace svgio const SvgStyleAttributes* SvgTextNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("text")); + static OUString aClassStr(OUString::createFromAscii("text")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgTextNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgTextNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgtextpathnode.cxx b/svgio/source/svgreader/svgtextpathnode.cxx index 4fb8e090cab7..e01c70b495a3 100644 --- a/svgio/source/svgreader/svgtextpathnode.cxx +++ b/svgio/source/svgreader/svgtextpathnode.cxx @@ -155,8 +155,8 @@ namespace svgio if(basegfx::fTools::more(fSnippetWidth, 0.0)) { - const ::rtl::OUString aText(getSource().getText()); - const ::rtl::OUString aTrimmedChars(aText.copy(nIndex, nLength).trim()); + const OUString aText(getSource().getText()); + const OUString aTrimmedChars(aText.copy(nIndex, nLength).trim()); const double fEndPos(mfPosition + fSnippetWidth); if(aTrimmedChars.getLength() && (mfPosition < mfBasegfxPathLength || fEndPos > 0.0)) @@ -269,7 +269,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgTextPathNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgTextPathNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); @@ -302,8 +302,8 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrAlign(rtl::OUString::createFromAscii("align")); - static rtl::OUString aStrStretch(rtl::OUString::createFromAscii("stretch")); + static OUString aStrAlign(OUString::createFromAscii("align")); + static OUString aStrStretch(OUString::createFromAscii("stretch")); if(aContent.match(aStrAlign)) { @@ -320,8 +320,8 @@ namespace svgio { if(aContent.getLength()) { - static rtl::OUString aStrAuto(rtl::OUString::createFromAscii("auto")); - static rtl::OUString aStrExact(rtl::OUString::createFromAscii("exact")); + static OUString aStrAuto(OUString::createFromAscii("auto")); + static OUString aStrExact(OUString::createFromAscii("exact")); if(aContent.match(aStrAuto)) { diff --git a/svgio/source/svgreader/svgtitledescnode.cxx b/svgio/source/svgreader/svgtitledescnode.cxx index 2a5b546980ac..3501c798ac56 100644 --- a/svgio/source/svgreader/svgtitledescnode.cxx +++ b/svgio/source/svgreader/svgtitledescnode.cxx @@ -37,7 +37,7 @@ namespace svgio { } - void SvgTitleDescNode::concatenate(const rtl::OUString& rChars) + void SvgTitleDescNode::concatenate(const OUString& rChars) { maText += rChars; } diff --git a/svgio/source/svgreader/svgtoken.cxx b/svgio/source/svgreader/svgtoken.cxx index 44b20d49f2d6..cbb171b51d14 100644 --- a/svgio/source/svgreader/svgtoken.cxx +++ b/svgio/source/svgreader/svgtoken.cxx @@ -25,145 +25,145 @@ namespace svgio { namespace svgreader { - static rtl::OUString aSVGStrWidth(rtl::OUString::createFromAscii("width")); - static rtl::OUString aSVGStrHeight(rtl::OUString::createFromAscii("height")); - static rtl::OUString aSVGStrViewBox(rtl::OUString::createFromAscii("viewBox")); - static rtl::OUString aSVGStrTransform(rtl::OUString::createFromAscii("transform")); - static rtl::OUString aSVGStrStyle(rtl::OUString::createFromAscii("style")); - static rtl::OUString aSVGStrD(rtl::OUString::createFromAscii("d")); - static rtl::OUString aSVGStrX(rtl::OUString::createFromAscii("x")); - static rtl::OUString aSVGStrY(rtl::OUString::createFromAscii("y")); - static rtl::OUString aSVGStrXmlns(rtl::OUString::createFromAscii("xmlns")); - static rtl::OUString aSVGStrVersion(rtl::OUString::createFromAscii("version")); - static rtl::OUString aSVGStrId(rtl::OUString::createFromAscii("id")); - static rtl::OUString aSVGStrRx(rtl::OUString::createFromAscii("rx")); - static rtl::OUString aSVGStrRy(rtl::OUString::createFromAscii("ry")); - static rtl::OUString aSVGStrPoints(rtl::OUString::createFromAscii("points")); - static rtl::OUString aSVGStrDx(rtl::OUString::createFromAscii("dx")); - static rtl::OUString aSVGStrDy(rtl::OUString::createFromAscii("dy")); - static rtl::OUString aSVGStrRotate(rtl::OUString::createFromAscii("rotate")); - static rtl::OUString aSVGStrTextLength(rtl::OUString::createFromAscii("textLength")); - static rtl::OUString aSVGStrLengthAdjust(rtl::OUString::createFromAscii("lengthAdjust")); - static rtl::OUString aSVGStrFont(rtl::OUString::createFromAscii("font")); - static rtl::OUString aSVGStrFontFamily(rtl::OUString::createFromAscii("font-family")); - static rtl::OUString aSVGStrFontSize(rtl::OUString::createFromAscii("font-size")); - static rtl::OUString aSVGStrFontSizeAdjust(rtl::OUString::createFromAscii("font-size-adjust")); - static rtl::OUString aSVGStrFontStretch(rtl::OUString::createFromAscii("font-stretch")); - static rtl::OUString aSVGStrFontStyle(rtl::OUString::createFromAscii("font-style")); - static rtl::OUString aSVGStrFontVariant(rtl::OUString::createFromAscii("font-variant")); - static rtl::OUString aSVGStrFontWeight(rtl::OUString::createFromAscii("font-weight")); - static rtl::OUString aSVGStrDirection(rtl::OUString::createFromAscii("direction")); - static rtl::OUString aSVGStrLetterSpacing(rtl::OUString::createFromAscii("letter-spacing")); - static rtl::OUString aSVGStrTextDecoration(rtl::OUString::createFromAscii("text-decoration")); - static rtl::OUString aSVGStrUnicodeBidi(rtl::OUString::createFromAscii("unicode-bidi")); - static rtl::OUString aSVGStrWordSpacing(rtl::OUString::createFromAscii("word-spacing")); - static rtl::OUString aSVGStrTspan(rtl::OUString::createFromAscii("tspan")); - static rtl::OUString aSVGStrTref(rtl::OUString::createFromAscii("tref")); - static rtl::OUString aSVGStrTextPath(rtl::OUString::createFromAscii("textPath")); - static rtl::OUString aSVGStrStartOffset(rtl::OUString::createFromAscii("startOffset")); - static rtl::OUString aSVGStrMethod(rtl::OUString::createFromAscii("method")); - static rtl::OUString aSVGStrSpacing(rtl::OUString::createFromAscii("spacing")); - static rtl::OUString aSVGStrTextAlign(rtl::OUString::createFromAscii("text-align")); - static rtl::OUString aSVGStrPathLength(rtl::OUString::createFromAscii("pathLength")); - static rtl::OUString aSVGStrType(rtl::OUString::createFromAscii("type")); - static rtl::OUString aSVGStrClass(rtl::OUString::createFromAscii("class")); - static rtl::OUString aSVGStrTextAnchor(rtl::OUString::createFromAscii("text-anchor")); - static rtl::OUString aSVGStrXmlSpace(rtl::OUString::createFromAscii("xml:space")); - static rtl::OUString aSVGStrColor(rtl::OUString::createFromAscii("color")); - static rtl::OUString aSVGStrClipPathNode(rtl::OUString::createFromAscii("clipPath")); - static rtl::OUString aSVGStrClipPathProperty(rtl::OUString::createFromAscii("clip-path")); - static rtl::OUString aSVGStrMask(rtl::OUString::createFromAscii("mask")); - static rtl::OUString aSVGStrClipPathUnits(rtl::OUString::createFromAscii("clipPathUnits")); - static rtl::OUString aSVGStrMaskUnits(rtl::OUString::createFromAscii("maskUnits")); - static rtl::OUString aSVGStrMaskContentUnits(rtl::OUString::createFromAscii("maskContentUnits")); - static rtl::OUString aSVGStrClipRule(rtl::OUString::createFromAscii("clip-rule")); - static rtl::OUString aSVGStrMarker(rtl::OUString::createFromAscii("marker")); - static rtl::OUString aSVGStrMarkerStart(rtl::OUString::createFromAscii("marker-start")); - static rtl::OUString aSVGStrMarkerMid(rtl::OUString::createFromAscii("marker-mid")); - static rtl::OUString aSVGStrMarkerEnd(rtl::OUString::createFromAscii("marker-end")); - static rtl::OUString aSVGStrRefX(rtl::OUString::createFromAscii("refX")); - static rtl::OUString aSVGStrRefY(rtl::OUString::createFromAscii("refY")); - static rtl::OUString aSVGStrMarkerUnits(rtl::OUString::createFromAscii("markerUnits")); - static rtl::OUString aSVGStrMarkerWidth(rtl::OUString::createFromAscii("markerWidth")); - static rtl::OUString aSVGStrMarkerHeight(rtl::OUString::createFromAscii("markerHeight")); - static rtl::OUString aSVGStrOrient(rtl::OUString::createFromAscii("orient")); - static rtl::OUString aSVGStrPattern(rtl::OUString::createFromAscii("pattern")); - static rtl::OUString aSVGStrPatternUnits(rtl::OUString::createFromAscii("patternUnits")); - static rtl::OUString aSVGStrPatternContentUnits(rtl::OUString::createFromAscii("patternContentUnits")); - static rtl::OUString aSVGStrPatternTransform(rtl::OUString::createFromAscii("patternTransform")); - static rtl::OUString aSVGStrOpacity(rtl::OUString::createFromAscii("opacity")); - static rtl::OUString aSVGStrTitle(rtl::OUString::createFromAscii("title")); - static rtl::OUString aSVGStrDesc(rtl::OUString::createFromAscii("desc")); + static OUString aSVGStrWidth(OUString::createFromAscii("width")); + static OUString aSVGStrHeight(OUString::createFromAscii("height")); + static OUString aSVGStrViewBox(OUString::createFromAscii("viewBox")); + static OUString aSVGStrTransform(OUString::createFromAscii("transform")); + static OUString aSVGStrStyle(OUString::createFromAscii("style")); + static OUString aSVGStrD(OUString::createFromAscii("d")); + static OUString aSVGStrX(OUString::createFromAscii("x")); + static OUString aSVGStrY(OUString::createFromAscii("y")); + static OUString aSVGStrXmlns(OUString::createFromAscii("xmlns")); + static OUString aSVGStrVersion(OUString::createFromAscii("version")); + static OUString aSVGStrId(OUString::createFromAscii("id")); + static OUString aSVGStrRx(OUString::createFromAscii("rx")); + static OUString aSVGStrRy(OUString::createFromAscii("ry")); + static OUString aSVGStrPoints(OUString::createFromAscii("points")); + static OUString aSVGStrDx(OUString::createFromAscii("dx")); + static OUString aSVGStrDy(OUString::createFromAscii("dy")); + static OUString aSVGStrRotate(OUString::createFromAscii("rotate")); + static OUString aSVGStrTextLength(OUString::createFromAscii("textLength")); + static OUString aSVGStrLengthAdjust(OUString::createFromAscii("lengthAdjust")); + static OUString aSVGStrFont(OUString::createFromAscii("font")); + static OUString aSVGStrFontFamily(OUString::createFromAscii("font-family")); + static OUString aSVGStrFontSize(OUString::createFromAscii("font-size")); + static OUString aSVGStrFontSizeAdjust(OUString::createFromAscii("font-size-adjust")); + static OUString aSVGStrFontStretch(OUString::createFromAscii("font-stretch")); + static OUString aSVGStrFontStyle(OUString::createFromAscii("font-style")); + static OUString aSVGStrFontVariant(OUString::createFromAscii("font-variant")); + static OUString aSVGStrFontWeight(OUString::createFromAscii("font-weight")); + static OUString aSVGStrDirection(OUString::createFromAscii("direction")); + static OUString aSVGStrLetterSpacing(OUString::createFromAscii("letter-spacing")); + static OUString aSVGStrTextDecoration(OUString::createFromAscii("text-decoration")); + static OUString aSVGStrUnicodeBidi(OUString::createFromAscii("unicode-bidi")); + static OUString aSVGStrWordSpacing(OUString::createFromAscii("word-spacing")); + static OUString aSVGStrTspan(OUString::createFromAscii("tspan")); + static OUString aSVGStrTref(OUString::createFromAscii("tref")); + static OUString aSVGStrTextPath(OUString::createFromAscii("textPath")); + static OUString aSVGStrStartOffset(OUString::createFromAscii("startOffset")); + static OUString aSVGStrMethod(OUString::createFromAscii("method")); + static OUString aSVGStrSpacing(OUString::createFromAscii("spacing")); + static OUString aSVGStrTextAlign(OUString::createFromAscii("text-align")); + static OUString aSVGStrPathLength(OUString::createFromAscii("pathLength")); + static OUString aSVGStrType(OUString::createFromAscii("type")); + static OUString aSVGStrClass(OUString::createFromAscii("class")); + static OUString aSVGStrTextAnchor(OUString::createFromAscii("text-anchor")); + static OUString aSVGStrXmlSpace(OUString::createFromAscii("xml:space")); + static OUString aSVGStrColor(OUString::createFromAscii("color")); + static OUString aSVGStrClipPathNode(OUString::createFromAscii("clipPath")); + static OUString aSVGStrClipPathProperty(OUString::createFromAscii("clip-path")); + static OUString aSVGStrMask(OUString::createFromAscii("mask")); + static OUString aSVGStrClipPathUnits(OUString::createFromAscii("clipPathUnits")); + static OUString aSVGStrMaskUnits(OUString::createFromAscii("maskUnits")); + static OUString aSVGStrMaskContentUnits(OUString::createFromAscii("maskContentUnits")); + static OUString aSVGStrClipRule(OUString::createFromAscii("clip-rule")); + static OUString aSVGStrMarker(OUString::createFromAscii("marker")); + static OUString aSVGStrMarkerStart(OUString::createFromAscii("marker-start")); + static OUString aSVGStrMarkerMid(OUString::createFromAscii("marker-mid")); + static OUString aSVGStrMarkerEnd(OUString::createFromAscii("marker-end")); + static OUString aSVGStrRefX(OUString::createFromAscii("refX")); + static OUString aSVGStrRefY(OUString::createFromAscii("refY")); + static OUString aSVGStrMarkerUnits(OUString::createFromAscii("markerUnits")); + static OUString aSVGStrMarkerWidth(OUString::createFromAscii("markerWidth")); + static OUString aSVGStrMarkerHeight(OUString::createFromAscii("markerHeight")); + static OUString aSVGStrOrient(OUString::createFromAscii("orient")); + static OUString aSVGStrPattern(OUString::createFromAscii("pattern")); + static OUString aSVGStrPatternUnits(OUString::createFromAscii("patternUnits")); + static OUString aSVGStrPatternContentUnits(OUString::createFromAscii("patternContentUnits")); + static OUString aSVGStrPatternTransform(OUString::createFromAscii("patternTransform")); + static OUString aSVGStrOpacity(OUString::createFromAscii("opacity")); + static OUString aSVGStrTitle(OUString::createFromAscii("title")); + static OUString aSVGStrDesc(OUString::createFromAscii("desc")); - static rtl::OUString aSVGStrPreserveAspectRatio(rtl::OUString::createFromAscii("preserveAspectRatio")); - static rtl::OUString aSVGStrDefer(rtl::OUString::createFromAscii("defer")); - static rtl::OUString aSVGStrNone(rtl::OUString::createFromAscii("none")); - static rtl::OUString aSVGStrXMinYMin(rtl::OUString::createFromAscii("xMinYMin")); - static rtl::OUString aSVGStrXMidYMin(rtl::OUString::createFromAscii("xMidYMin")); - static rtl::OUString aSVGStrXMaxYMin(rtl::OUString::createFromAscii("xMaxYMin")); - static rtl::OUString aSVGStrXMinYMid(rtl::OUString::createFromAscii("xMinYMid")); - static rtl::OUString aSVGStrXMidYMid(rtl::OUString::createFromAscii("xMidYMid")); - static rtl::OUString aSVGStrXMaxYMid(rtl::OUString::createFromAscii("xMaxYMid")); - static rtl::OUString aSVGStrXMinYMax(rtl::OUString::createFromAscii("xMinYMax")); - static rtl::OUString aSVGStrXMidYMax(rtl::OUString::createFromAscii("xMidYMax")); - static rtl::OUString aSVGStrXMaxYMax(rtl::OUString::createFromAscii("xMaxYMax")); - static rtl::OUString aSVGStrMeet(rtl::OUString::createFromAscii("meet")); - static rtl::OUString aSVGStrSlice(rtl::OUString::createFromAscii("slice")); + static OUString aSVGStrPreserveAspectRatio(OUString::createFromAscii("preserveAspectRatio")); + static OUString aSVGStrDefer(OUString::createFromAscii("defer")); + static OUString aSVGStrNone(OUString::createFromAscii("none")); + static OUString aSVGStrXMinYMin(OUString::createFromAscii("xMinYMin")); + static OUString aSVGStrXMidYMin(OUString::createFromAscii("xMidYMin")); + static OUString aSVGStrXMaxYMin(OUString::createFromAscii("xMaxYMin")); + static OUString aSVGStrXMinYMid(OUString::createFromAscii("xMinYMid")); + static OUString aSVGStrXMidYMid(OUString::createFromAscii("xMidYMid")); + static OUString aSVGStrXMaxYMid(OUString::createFromAscii("xMaxYMid")); + static OUString aSVGStrXMinYMax(OUString::createFromAscii("xMinYMax")); + static OUString aSVGStrXMidYMax(OUString::createFromAscii("xMidYMax")); + static OUString aSVGStrXMaxYMax(OUString::createFromAscii("xMaxYMax")); + static OUString aSVGStrMeet(OUString::createFromAscii("meet")); + static OUString aSVGStrSlice(OUString::createFromAscii("slice")); - static rtl::OUString aSVGStrDefs(rtl::OUString::createFromAscii("defs")); - static rtl::OUString aSVGStrG(rtl::OUString::createFromAscii("g")); - static rtl::OUString aSVGStrSvg(rtl::OUString::createFromAscii("svg")); - static rtl::OUString aSVGStrSymbol(rtl::OUString::createFromAscii("symbol")); - static rtl::OUString aSVGStrUse(rtl::OUString::createFromAscii("use")); + static OUString aSVGStrDefs(OUString::createFromAscii("defs")); + static OUString aSVGStrG(OUString::createFromAscii("g")); + static OUString aSVGStrSvg(OUString::createFromAscii("svg")); + static OUString aSVGStrSymbol(OUString::createFromAscii("symbol")); + static OUString aSVGStrUse(OUString::createFromAscii("use")); - static rtl::OUString aSVGStrCircle(rtl::OUString::createFromAscii("circle")); - static rtl::OUString aSVGStrEllipse(rtl::OUString::createFromAscii("ellipse")); - static rtl::OUString aSVGStrLine(rtl::OUString::createFromAscii("line")); - static rtl::OUString aSVGStrPath(rtl::OUString::createFromAscii("path")); - static rtl::OUString aSVGStrPolygon(rtl::OUString::createFromAscii("polygon")); - static rtl::OUString aSVGStrPolyline(rtl::OUString::createFromAscii("polyline")); - static rtl::OUString aSVGStrRect(rtl::OUString::createFromAscii("rect")); - static rtl::OUString aSVGStrImage(rtl::OUString::createFromAscii("image")); + static OUString aSVGStrCircle(OUString::createFromAscii("circle")); + static OUString aSVGStrEllipse(OUString::createFromAscii("ellipse")); + static OUString aSVGStrLine(OUString::createFromAscii("line")); + static OUString aSVGStrPath(OUString::createFromAscii("path")); + static OUString aSVGStrPolygon(OUString::createFromAscii("polygon")); + static OUString aSVGStrPolyline(OUString::createFromAscii("polyline")); + static OUString aSVGStrRect(OUString::createFromAscii("rect")); + static OUString aSVGStrImage(OUString::createFromAscii("image")); - static rtl::OUString aSVGStrLinearGradient(rtl::OUString::createFromAscii("linearGradient")); - static rtl::OUString aSVGStrRadialGradient(rtl::OUString::createFromAscii("radialGradient")); - static rtl::OUString aSVGStrStop(rtl::OUString::createFromAscii("stop")); - static rtl::OUString aSVGStrOffset(rtl::OUString::createFromAscii("offset")); - static rtl::OUString aSVGStrX1(rtl::OUString::createFromAscii("x1")); - static rtl::OUString aSVGStrY1(rtl::OUString::createFromAscii("y1")); - static rtl::OUString aSVGStrX2(rtl::OUString::createFromAscii("x2")); - static rtl::OUString aSVGStrY2(rtl::OUString::createFromAscii("y2")); - static rtl::OUString aSVGStrCx(rtl::OUString::createFromAscii("cx")); - static rtl::OUString aSVGStrCy(rtl::OUString::createFromAscii("cy")); - static rtl::OUString aSVGStrFx(rtl::OUString::createFromAscii("fx")); - static rtl::OUString aSVGStrFy(rtl::OUString::createFromAscii("fy")); - static rtl::OUString aSVGStrR(rtl::OUString::createFromAscii("r")); - static rtl::OUString aSVGStrGradientUnits(rtl::OUString::createFromAscii("gradientUnits")); - static rtl::OUString aSVGStrGradientTransform(rtl::OUString::createFromAscii("gradientTransform")); - static rtl::OUString aSVGStrSpreadMethod(rtl::OUString::createFromAscii("spreadMethod")); - static rtl::OUString aSVGStrXlinkHref(rtl::OUString::createFromAscii("xlink:href")); - static rtl::OUString aSVGStrStopColor(rtl::OUString::createFromAscii("stop-color")); - static rtl::OUString aSVGStrStopOpacity(rtl::OUString::createFromAscii("stop-opacity")); + static OUString aSVGStrLinearGradient(OUString::createFromAscii("linearGradient")); + static OUString aSVGStrRadialGradient(OUString::createFromAscii("radialGradient")); + static OUString aSVGStrStop(OUString::createFromAscii("stop")); + static OUString aSVGStrOffset(OUString::createFromAscii("offset")); + static OUString aSVGStrX1(OUString::createFromAscii("x1")); + static OUString aSVGStrY1(OUString::createFromAscii("y1")); + static OUString aSVGStrX2(OUString::createFromAscii("x2")); + static OUString aSVGStrY2(OUString::createFromAscii("y2")); + static OUString aSVGStrCx(OUString::createFromAscii("cx")); + static OUString aSVGStrCy(OUString::createFromAscii("cy")); + static OUString aSVGStrFx(OUString::createFromAscii("fx")); + static OUString aSVGStrFy(OUString::createFromAscii("fy")); + static OUString aSVGStrR(OUString::createFromAscii("r")); + static OUString aSVGStrGradientUnits(OUString::createFromAscii("gradientUnits")); + static OUString aSVGStrGradientTransform(OUString::createFromAscii("gradientTransform")); + static OUString aSVGStrSpreadMethod(OUString::createFromAscii("spreadMethod")); + static OUString aSVGStrXlinkHref(OUString::createFromAscii("xlink:href")); + static OUString aSVGStrStopColor(OUString::createFromAscii("stop-color")); + static OUString aSVGStrStopOpacity(OUString::createFromAscii("stop-opacity")); - static rtl::OUString aSVGStrFill(rtl::OUString::createFromAscii("fill")); - static rtl::OUString aSVGStrFillOpacity(rtl::OUString::createFromAscii("fill-opacity")); - static rtl::OUString aSVGStrFillRule(rtl::OUString::createFromAscii("fill-rule")); + static OUString aSVGStrFill(OUString::createFromAscii("fill")); + static OUString aSVGStrFillOpacity(OUString::createFromAscii("fill-opacity")); + static OUString aSVGStrFillRule(OUString::createFromAscii("fill-rule")); - static rtl::OUString aSVGStrStroke(rtl::OUString::createFromAscii("stroke")); - static rtl::OUString aSVGStrStrokeDasharray(rtl::OUString::createFromAscii("stroke-dasharray")); - static rtl::OUString aSVGStrStrokeDashoffset(rtl::OUString::createFromAscii("stroke-dashoffset")); - static rtl::OUString aSVGStrStrokeLinecap(rtl::OUString::createFromAscii("stroke-linecap")); - static rtl::OUString aSVGStrStrokeLinejoin(rtl::OUString::createFromAscii("stroke-linejoin")); - static rtl::OUString aSVGStrStrokeMiterlimit(rtl::OUString::createFromAscii("stroke-miterlimit")); - static rtl::OUString aSVGStrStrokeOpacity(rtl::OUString::createFromAscii("stroke-opacity")); - static rtl::OUString aSVGStrStrokeWidth(rtl::OUString::createFromAscii("stroke-width")); + static OUString aSVGStrStroke(OUString::createFromAscii("stroke")); + static OUString aSVGStrStrokeDasharray(OUString::createFromAscii("stroke-dasharray")); + static OUString aSVGStrStrokeDashoffset(OUString::createFromAscii("stroke-dashoffset")); + static OUString aSVGStrStrokeLinecap(OUString::createFromAscii("stroke-linecap")); + static OUString aSVGStrStrokeLinejoin(OUString::createFromAscii("stroke-linejoin")); + static OUString aSVGStrStrokeMiterlimit(OUString::createFromAscii("stroke-miterlimit")); + static OUString aSVGStrStrokeOpacity(OUString::createFromAscii("stroke-opacity")); + static OUString aSVGStrStrokeWidth(OUString::createFromAscii("stroke-width")); - static rtl::OUString aSVGStrText(rtl::OUString::createFromAscii("text")); + static OUString aSVGStrText(OUString::createFromAscii("text")); - SVGToken StrToSVGToken(const rtl::OUString& rStr) + SVGToken StrToSVGToken(const OUString& rStr) { - typedef boost::unordered_map< rtl::OUString, SVGToken, rtl::OUStringHash,::std::equal_to< ::rtl::OUString > > SVGTokenMapper; - typedef std::pair< rtl::OUString, SVGToken > SVGTokenValueType; + typedef boost::unordered_map< OUString, SVGToken, OUStringHash,::std::equal_to< OUString > > SVGTokenMapper; + typedef std::pair< OUString, SVGToken > SVGTokenValueType; static SVGTokenMapper aSVGTokenMapperList; if(aSVGTokenMapperList.empty()) @@ -314,12 +314,12 @@ namespace svgio } } - const rtl::OUString& getStrTitle() + const OUString& getStrTitle() { return aSVGStrTitle; } - const rtl::OUString& getStrDesc() + const OUString& getStrDesc() { return aSVGStrDesc; } diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx index 892221cc527d..8e107a7eaae0 100644 --- a/svgio/source/svgreader/svgtools.cxx +++ b/svgio/source/svgreader/svgtools.cxx @@ -32,9 +32,9 @@ namespace svgio namespace svgreader { #ifdef DBG_UTIL - void myAssert(const rtl::OUString& rMessage) + void myAssert(const OUString& rMessage) { - rtl::OString aMessage2; + OString aMessage2; rMessage.convertToString(&aMessage2, osl_getThreadTextEncoding(), RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR|RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR); OSL_ENSURE(false, aMessage2.getStr()); @@ -42,10 +42,10 @@ namespace svgio #endif // common non-token strings - const rtl::OUString commonStrings::aStrUserSpaceOnUse(rtl::OUString::createFromAscii("userSpaceOnUse")); - const rtl::OUString commonStrings::aStrObjectBoundingBox(rtl::OUString::createFromAscii("objectBoundingBox")); - const rtl::OUString commonStrings::aStrNonzero(rtl::OUString::createFromAscii("nonzero")); - const rtl::OUString commonStrings::aStrEvenOdd(rtl::OUString::createFromAscii("evenodd")); + const OUString commonStrings::aStrUserSpaceOnUse(OUString::createFromAscii("userSpaceOnUse")); + const OUString commonStrings::aStrObjectBoundingBox(OUString::createFromAscii("objectBoundingBox")); + const OUString commonStrings::aStrNonzero(OUString::createFromAscii("nonzero")); + const OUString commonStrings::aStrEvenOdd(OUString::createFromAscii("evenodd")); basegfx::B2DHomMatrix SvgAspectRatio::createLinearMapping(const basegfx::B2DRange& rTarget, const basegfx::B2DRange& rSource) { @@ -250,7 +250,7 @@ namespace svgio return basegfx::fTools::moreOrEqual(mfNumber, 0.0); } - void skip_char(const rtl::OUString& rCandidate, const sal_Unicode& rChar, sal_Int32& nPos, const sal_Int32 nLen) + void skip_char(const OUString& rCandidate, const sal_Unicode& rChar, sal_Int32& nPos, const sal_Int32 nLen) { while(nPos < nLen && rChar == rCandidate[nPos]) { @@ -258,7 +258,7 @@ namespace svgio } } - void skip_char(const rtl::OUString& rCandidate, const sal_Unicode& rCharA, const sal_Unicode& rCharB, 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) { while(nPos < nLen && (rCharA == rCandidate[nPos] || rCharB == rCandidate[nPos])) { @@ -266,7 +266,7 @@ namespace svgio } } - void copySign(const rtl::OUString& rCandidate, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen) + void copySign(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen) { if(nPos < nLen) { @@ -280,7 +280,7 @@ namespace svgio } } - void copyNumber(const rtl::OUString& rCandidate, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen) + void copyNumber(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen) { bool bOnNumber(true); @@ -298,7 +298,7 @@ namespace svgio } } - void copyHex(const rtl::OUString& rCandidate, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen) + void copyHex(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen) { bool bOnHex(true); @@ -318,7 +318,7 @@ namespace svgio } } - void copyString(const rtl::OUString& rCandidate, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen) + void copyString(const OUString& rCandidate, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen) { bool bOnChar(true); @@ -338,7 +338,7 @@ namespace svgio } } - void copyToLimiter(const rtl::OUString& rCandidate, const sal_Unicode& rLimiter, sal_Int32& nPos, rtl::OUStringBuffer& rTarget, const sal_Int32 nLen) + void copyToLimiter(const OUString& rCandidate, const sal_Unicode& rLimiter, sal_Int32& nPos, OUStringBuffer& rTarget, const sal_Int32 nLen) { while(nPos < nLen && rLimiter != rCandidate[nPos]) { @@ -347,11 +347,11 @@ namespace svgio } } - bool readNumber(const rtl::OUString& rCandidate, sal_Int32& nPos, double& fNum, const sal_Int32 nLen) + bool readNumber(const OUString& rCandidate, sal_Int32& nPos, double& fNum, const sal_Int32 nLen) { if(nPos < nLen) { - rtl::OUStringBuffer aNum; + OUStringBuffer aNum; copySign(rCandidate, nPos, aNum, nLen); copyNumber(rCandidate, nPos, aNum, nLen); @@ -367,7 +367,7 @@ namespace svgio // by error. First try if there are numbers after the 'e', // safe current state nPos++; - const rtl::OUStringBuffer aNum2(aNum); + const OUStringBuffer aNum2(aNum); const sal_Int32 nPosAfterE(nPos); aNum.append(aChar); @@ -399,7 +399,7 @@ namespace svgio return false; } - SvgUnit readUnit(const rtl::OUString& rCandidate, sal_Int32& nPos, const sal_Int32 nLen) + SvgUnit readUnit(const OUString& rCandidate, sal_Int32& nPos, const sal_Int32 nLen) { SvgUnit aRetval(Unit_px); @@ -502,7 +502,7 @@ namespace svgio return aRetval; } - bool readNumberAndUnit(const rtl::OUString& rCandidate, sal_Int32& nPos, SvgNumber& aNum, const sal_Int32 nLen) + bool readNumberAndUnit(const OUString& rCandidate, sal_Int32& nPos, SvgNumber& aNum, const sal_Int32 nLen) { double fNum(0.0); @@ -517,7 +517,7 @@ namespace svgio return false; } - bool readAngle(const rtl::OUString& rCandidate, sal_Int32& nPos, double& fAngle, const sal_Int32 nLen) + bool readAngle(const OUString& rCandidate, sal_Int32& nPos, double& fAngle, const sal_Int32 nLen) { if(readNumber(rCandidate, nPos, fAngle, nLen)) { @@ -533,8 +533,8 @@ namespace svgio if(nPos < nLen) { const sal_Unicode aChar(rCandidate[nPos]); - static rtl::OUString aStrGrad(rtl::OUString::createFromAscii("grad")); - static rtl::OUString aStrRad(rtl::OUString::createFromAscii("rad")); + static OUString aStrGrad(OUString::createFromAscii("grad")); + static OUString aStrRad(OUString::createFromAscii("rad")); switch(aChar) { @@ -601,164 +601,164 @@ namespace svgio } } - bool match_colorKeyword(basegfx::BColor& rColor, const rtl::OUString& rName) + bool match_colorKeyword(basegfx::BColor& rColor, const OUString& rName) { - typedef boost::unordered_map< rtl::OUString, Color, - rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > + typedef boost::unordered_map< OUString, Color, + OUStringHash, + ::std::equal_to< OUString > > ColorTokenMapper; - typedef std::pair< rtl::OUString, Color > ColorTokenValueType; + typedef std::pair< OUString, Color > ColorTokenValueType; ColorTokenMapper aColorTokenMapperList; if(aColorTokenMapperList.empty()) { - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("aliceblue"), Color(240, 248, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("antiquewhite"), Color(250, 235, 215))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("aqua"), Color( 0, 255, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("aquamarine"), Color(127, 255, 212))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("azure"), Color(240, 255, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("beige"), Color(245, 245, 220))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("bisque"), Color(255, 228, 196))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("black"), Color( 0, 0, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("blanchedalmond"), Color(255, 235, 205))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("blue"), Color( 0, 0, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("blueviolet"), Color(138, 43, 226))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("brown"), Color(165, 42, 42))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("burlywood"), Color(222, 184, 135))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("cadetblue"), Color( 95, 158, 160))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("chartreuse"), Color(127, 255, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("chocolate"), Color(210, 105, 30))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("coral"), Color(255, 127, 80))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("cornflowerblue"), Color(100, 149, 237))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("cornsilk"), Color(255, 248, 220))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("crimson"), Color(220, 20, 60))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("cyan"), Color( 0, 255, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkblue"), Color( 0, 0, 139))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkcyan"), Color( 0, 139, 139))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkgoldenrod"), Color(184, 134, 11))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkgray"), Color(169, 169, 169))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkgreen"), Color( 0, 100, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkgrey"), Color(169, 169, 169))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkkhaki"), Color(189, 183, 107))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkmagenta"), Color(139, 0, 139))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkolivegreen"), Color( 85, 107, 47))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkorange"), Color(255, 140, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkorchid"), Color(153, 50, 204))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkred"), Color(139, 0, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darksalmon"), Color(233, 150, 122))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkseagreen"), Color(143, 188, 143))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkslateblue"), Color( 72, 61, 139))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkslategray"), Color( 47, 79, 79))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkslategrey"), Color( 47, 79, 79))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkturquoise"), Color( 0, 206, 209))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("darkviolet"), Color(148, 0, 211))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("deeppink"), Color(255, 20, 147))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("deepskyblue"), Color( 0, 191, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("dimgray"), Color(105, 105, 105))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("dimgrey"), Color(105, 105, 105))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("dodgerblue"), Color( 30, 144, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("firebrick"), Color(178, 34, 34))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("floralwhite"), Color(255, 250, 240))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("forestgreen"), Color( 34, 139, 34))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("fuchsia"), Color(255, 0, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("gainsboro"), Color(220, 220, 220))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("ghostwhite"), Color(248, 248, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("gold"), Color(255, 215, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("goldenrod"), Color(218, 165, 32))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("gray"), Color(128, 128, 128))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("grey"), Color(128, 128, 128))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("green"), Color(0, 128, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("greenyellow"), Color(173, 255, 47))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("honeydew"), Color(240, 255, 240))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("hotpink"), Color(255, 105, 180))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("indianred"), Color(205, 92, 92))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("indigo"), Color( 75, 0, 130))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("ivory"), Color(255, 255, 240))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("khaki"), Color(240, 230, 140))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lavender"), Color(230, 230, 250))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lavenderblush"), Color(255, 240, 245))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lawngreen"), Color(124, 252, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lemonchiffon"), Color(255, 250, 205))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightblue"), Color(173, 216, 230))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightcoral"), Color(240, 128, 128))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightcyan"), Color(224, 255, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightgoldenrodyellow"), Color(250, 250, 210))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightgray"), Color(211, 211, 211))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightgreen"), Color(144, 238, 144))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightgrey"), Color(211, 211, 211))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightpink"), Color(255, 182, 193))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightsalmon"), Color(255, 160, 122))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightseagreen"), Color( 32, 178, 170))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightskyblue"), Color(135, 206, 250))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightslategray"), Color(119, 136, 153))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightslategrey"), Color(119, 136, 153))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightsteelblue"), Color(176, 196, 222))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lightyellow"), Color(255, 255, 224))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("lime"), Color( 0, 255, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("limegreen"), Color( 50, 205, 50))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("linen"), Color(250, 240, 230))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("magenta"), Color(255, 0, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("maroon"), Color(128, 0, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumaquamarine"), Color(102, 205, 170))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumblue"), Color( 0, 0, 205))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumorchid"), Color(186, 85, 211))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumpurple"), Color(147, 112, 219))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumseagreen"), Color( 60, 179, 113))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumslateblue"), Color(123, 104, 238))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumspringgreen"), Color( 0, 250, 154))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumturquoise"), Color( 72, 209, 204))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mediumvioletred"), Color(199, 21, 133))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("midnightblue"), Color( 25, 25, 112))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mintcream"), Color(245, 255, 250))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("mistyrose"), Color(255, 228, 225))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("moccasin"), Color(255, 228, 181))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("navajowhite"), Color(255, 222, 173))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("navy"), Color( 0, 0, 128))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("oldlace"), Color(253, 245, 230))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("olive"), Color(128, 128, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("olivedrab"), Color(107, 142, 35))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("orange"), Color(255, 165, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("orangered"), Color(255, 69, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("orchid"), Color(218, 112, 214))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("palegoldenrod"), Color(238, 232, 170))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("palegreen"), Color(152, 251, 152))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("paleturquoise"), Color(175, 238, 238))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("palevioletred"), Color(219, 112, 147))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("papayawhip"), Color(255, 239, 213))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("peachpuff"), Color(255, 218, 185))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("peru"), Color(205, 133, 63))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("pink"), Color(255, 192, 203))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("plum"), Color(221, 160, 221))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("powderblue"), Color(176, 224, 230))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("purple"), Color(128, 0, 128))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("red"), Color(255, 0, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("rosybrown"), Color(188, 143, 143))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("royalblue"), Color( 65, 105, 225))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("saddlebrown"), Color(139, 69, 19))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("salmon"), Color(250, 128, 114))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("sandybrown"), Color(244, 164, 96))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("seagreen"), Color( 46, 139, 87))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("seashell"), Color(255, 245, 238))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("sienna"), Color(160, 82, 45))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("silver"), Color(192, 192, 192))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("skyblue"), Color(135, 206, 235))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("slateblue"), Color(106, 90, 205))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("slategray"), Color(112, 128, 144))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("slategrey"), Color(112, 128, 144))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("snow"), Color(255, 250, 250))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("springgreen"), Color( 0, 255, 127))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("steelblue"), Color( 70, 130, 180))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("tan"), Color(210, 180, 140))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("teal"), Color( 0, 128, 128))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("thistle"), Color(216, 191, 216))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("tomato"), Color(255, 99, 71))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("turquoise"), Color( 64, 224, 208))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("violet"), Color(238, 130, 238))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("wheat"), Color(245, 222, 179))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("white"), Color(255, 255, 255))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("whitesmoke"), Color(245, 245, 245))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("yellow"), Color(255, 255, 0))); - aColorTokenMapperList.insert(ColorTokenValueType(rtl::OUString::createFromAscii("yellowgreen"), Color(154, 205, 50))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("aliceblue"), Color(240, 248, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("antiquewhite"), Color(250, 235, 215))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("aqua"), Color( 0, 255, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("aquamarine"), Color(127, 255, 212))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("azure"), Color(240, 255, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("beige"), Color(245, 245, 220))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("bisque"), Color(255, 228, 196))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("black"), Color( 0, 0, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("blanchedalmond"), Color(255, 235, 205))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("blue"), Color( 0, 0, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("blueviolet"), Color(138, 43, 226))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("brown"), Color(165, 42, 42))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("burlywood"), Color(222, 184, 135))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("cadetblue"), Color( 95, 158, 160))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("chartreuse"), Color(127, 255, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("chocolate"), Color(210, 105, 30))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("coral"), Color(255, 127, 80))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("cornflowerblue"), Color(100, 149, 237))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("cornsilk"), Color(255, 248, 220))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("crimson"), Color(220, 20, 60))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("cyan"), Color( 0, 255, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkblue"), Color( 0, 0, 139))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkcyan"), Color( 0, 139, 139))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkgoldenrod"), Color(184, 134, 11))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkgray"), Color(169, 169, 169))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkgreen"), Color( 0, 100, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkgrey"), Color(169, 169, 169))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkkhaki"), Color(189, 183, 107))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkmagenta"), Color(139, 0, 139))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkolivegreen"), Color( 85, 107, 47))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkorange"), Color(255, 140, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkorchid"), Color(153, 50, 204))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkred"), Color(139, 0, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darksalmon"), Color(233, 150, 122))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkseagreen"), Color(143, 188, 143))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkslateblue"), Color( 72, 61, 139))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkslategray"), Color( 47, 79, 79))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkslategrey"), Color( 47, 79, 79))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkturquoise"), Color( 0, 206, 209))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("darkviolet"), Color(148, 0, 211))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("deeppink"), Color(255, 20, 147))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("deepskyblue"), Color( 0, 191, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("dimgray"), Color(105, 105, 105))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("dimgrey"), Color(105, 105, 105))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("dodgerblue"), Color( 30, 144, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("firebrick"), Color(178, 34, 34))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("floralwhite"), Color(255, 250, 240))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("forestgreen"), Color( 34, 139, 34))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("fuchsia"), Color(255, 0, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("gainsboro"), Color(220, 220, 220))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("ghostwhite"), Color(248, 248, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("gold"), Color(255, 215, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("goldenrod"), Color(218, 165, 32))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("gray"), Color(128, 128, 128))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("grey"), Color(128, 128, 128))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("green"), Color(0, 128, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("greenyellow"), Color(173, 255, 47))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("honeydew"), Color(240, 255, 240))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("hotpink"), Color(255, 105, 180))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("indianred"), Color(205, 92, 92))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("indigo"), Color( 75, 0, 130))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("ivory"), Color(255, 255, 240))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("khaki"), Color(240, 230, 140))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lavender"), Color(230, 230, 250))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lavenderblush"), Color(255, 240, 245))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lawngreen"), Color(124, 252, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lemonchiffon"), Color(255, 250, 205))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightblue"), Color(173, 216, 230))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightcoral"), Color(240, 128, 128))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightcyan"), Color(224, 255, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightgoldenrodyellow"), Color(250, 250, 210))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightgray"), Color(211, 211, 211))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightgreen"), Color(144, 238, 144))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightgrey"), Color(211, 211, 211))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightpink"), Color(255, 182, 193))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightsalmon"), Color(255, 160, 122))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightseagreen"), Color( 32, 178, 170))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightskyblue"), Color(135, 206, 250))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightslategray"), Color(119, 136, 153))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightslategrey"), Color(119, 136, 153))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightsteelblue"), Color(176, 196, 222))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lightyellow"), Color(255, 255, 224))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("lime"), Color( 0, 255, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("limegreen"), Color( 50, 205, 50))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("linen"), Color(250, 240, 230))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("magenta"), Color(255, 0, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("maroon"), Color(128, 0, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumaquamarine"), Color(102, 205, 170))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumblue"), Color( 0, 0, 205))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumorchid"), Color(186, 85, 211))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumpurple"), Color(147, 112, 219))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumseagreen"), Color( 60, 179, 113))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumslateblue"), Color(123, 104, 238))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumspringgreen"), Color( 0, 250, 154))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumturquoise"), Color( 72, 209, 204))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mediumvioletred"), Color(199, 21, 133))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("midnightblue"), Color( 25, 25, 112))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mintcream"), Color(245, 255, 250))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("mistyrose"), Color(255, 228, 225))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("moccasin"), Color(255, 228, 181))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("navajowhite"), Color(255, 222, 173))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("navy"), Color( 0, 0, 128))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("oldlace"), Color(253, 245, 230))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("olive"), Color(128, 128, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("olivedrab"), Color(107, 142, 35))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("orange"), Color(255, 165, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("orangered"), Color(255, 69, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("orchid"), Color(218, 112, 214))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("palegoldenrod"), Color(238, 232, 170))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("palegreen"), Color(152, 251, 152))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("paleturquoise"), Color(175, 238, 238))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("palevioletred"), Color(219, 112, 147))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("papayawhip"), Color(255, 239, 213))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("peachpuff"), Color(255, 218, 185))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("peru"), Color(205, 133, 63))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("pink"), Color(255, 192, 203))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("plum"), Color(221, 160, 221))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("powderblue"), Color(176, 224, 230))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("purple"), Color(128, 0, 128))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("red"), Color(255, 0, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("rosybrown"), Color(188, 143, 143))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("royalblue"), Color( 65, 105, 225))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("saddlebrown"), Color(139, 69, 19))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("salmon"), Color(250, 128, 114))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("sandybrown"), Color(244, 164, 96))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("seagreen"), Color( 46, 139, 87))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("seashell"), Color(255, 245, 238))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("sienna"), Color(160, 82, 45))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("silver"), Color(192, 192, 192))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("skyblue"), Color(135, 206, 235))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("slateblue"), Color(106, 90, 205))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("slategray"), Color(112, 128, 144))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("slategrey"), Color(112, 128, 144))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("snow"), Color(255, 250, 250))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("springgreen"), Color( 0, 255, 127))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("steelblue"), Color( 70, 130, 180))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("tan"), Color(210, 180, 140))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("teal"), Color( 0, 128, 128))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("thistle"), Color(216, 191, 216))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("tomato"), Color(255, 99, 71))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("turquoise"), Color( 64, 224, 208))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("violet"), Color(238, 130, 238))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("wheat"), Color(245, 222, 179))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("white"), Color(255, 255, 255))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("whitesmoke"), Color(245, 245, 245))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("yellow"), Color(255, 255, 0))); + aColorTokenMapperList.insert(ColorTokenValueType(OUString::createFromAscii("yellowgreen"), Color(154, 205, 50))); } const ColorTokenMapper::const_iterator aResult(aColorTokenMapperList.find(rName)); @@ -774,7 +774,7 @@ namespace svgio } } - bool read_color(const rtl::OUString& rCandidate, basegfx::BColor& rColor) + bool read_color(const OUString& rCandidate, basegfx::BColor& rColor) { const sal_Int32 nLen(rCandidate.getLength()); @@ -786,7 +786,7 @@ namespace svgio if(aChar == sal_Unicode('#')) { // hex definition - rtl::OUStringBuffer aNum; + OUStringBuffer aNum; sal_Int32 nPos(1); copyHex(rCandidate, nPos, aNum, nLen); @@ -822,7 +822,7 @@ namespace svgio } else { - static rtl::OUString aStrRgb(rtl::OUString::createFromAscii("rgb")); + static OUString aStrRgb(OUString::createFromAscii("rgb")); if(rCandidate.matchIgnoreAsciiCase(aStrRgb, 0)) { @@ -893,7 +893,7 @@ namespace svgio return false; } - basegfx::B2DRange readViewBox(const rtl::OUString& rCandidate, InfoProvider& rInfoProvider) + basegfx::B2DRange readViewBox(const OUString& rCandidate, InfoProvider& rInfoProvider) { const sal_Int32 nLen(rCandidate.getLength()); @@ -934,7 +934,7 @@ namespace svgio return basegfx::B2DRange(); } - basegfx::B2DHomMatrix readTransform(const rtl::OUString& rCandidate, InfoProvider& rInfoProvider) + basegfx::B2DHomMatrix readTransform(const OUString& rCandidate, InfoProvider& rInfoProvider) { basegfx::B2DHomMatrix aMatrix; const sal_Int32 nLen(rCandidate.getLength()); @@ -948,12 +948,12 @@ namespace svgio { const sal_Unicode aChar(rCandidate[nPos]); const sal_Int32 nInitPos(nPos); - static rtl::OUString aStrMatrix(rtl::OUString::createFromAscii("matrix")); - static rtl::OUString aStrTranslate(rtl::OUString::createFromAscii("translate")); - static rtl::OUString aStrScale(rtl::OUString::createFromAscii("scale")); - static rtl::OUString aStrRotate(rtl::OUString::createFromAscii("rotate")); - static rtl::OUString aStrSkewX(rtl::OUString::createFromAscii("skewX")); - static rtl::OUString aStrSkewY(rtl::OUString::createFromAscii("skewY")); + static OUString aStrMatrix(OUString::createFromAscii("matrix")); + static OUString aStrTranslate(OUString::createFromAscii("translate")); + static OUString aStrScale(OUString::createFromAscii("scale")); + static OUString aStrRotate(OUString::createFromAscii("rotate")); + static OUString aStrSkewX(OUString::createFromAscii("skewX")); + static OUString aStrSkewY(OUString::createFromAscii("skewY")); switch(aChar) { @@ -1139,7 +1139,7 @@ namespace svgio return aMatrix; } - bool readSingleNumber(const rtl::OUString& rCandidate, SvgNumber& aNum) + bool readSingleNumber(const OUString& rCandidate, SvgNumber& aNum) { const sal_Int32 nLen(rCandidate.getLength()); sal_Int32 nPos(0); @@ -1147,9 +1147,9 @@ namespace svgio return readNumberAndUnit(rCandidate, nPos, aNum, nLen); } - bool readLocalUrl(const rtl::OUString& rCandidate, rtl::OUString& rURL) + bool readLocalUrl(const OUString& rCandidate, OUString& rURL) { - static rtl::OUString aStrUrl(rtl::OUString::createFromAscii("url")); + static OUString aStrUrl(OUString::createFromAscii("url")); if(rCandidate.match(aStrUrl, 0)) { @@ -1157,7 +1157,7 @@ namespace svgio sal_Int32 nPos(aStrUrl.getLength()); skip_char(rCandidate, sal_Unicode('('), sal_Unicode('#'), nPos, nLen); - rtl::OUStringBuffer aTokenValue; + OUStringBuffer aTokenValue; copyToLimiter(rCandidate, sal_Unicode(')'), nPos, aTokenValue, nLen); rURL = aTokenValue.makeStringAndClear(); @@ -1167,7 +1167,7 @@ namespace svgio return false; } - bool readSvgPaint(const rtl::OUString& rCandidate, SvgPaint& rSvgPaint, rtl::OUString& rURL) + bool readSvgPaint(const OUString& rCandidate, SvgPaint& rSvgPaint, OUString& rURL) { const sal_Int32 nLen(rCandidate.getLength()); @@ -1182,8 +1182,8 @@ namespace svgio } else { - static rtl::OUString aStrNone(rtl::OUString::createFromAscii("none")); - static rtl::OUString aStrCurrentColor(rtl::OUString::createFromAscii("currentColor")); + static OUString aStrNone(OUString::createFromAscii("none")); + static OUString aStrCurrentColor(OUString::createFromAscii("currentColor")); if(rCandidate.match(aStrNone, 0)) { @@ -1206,7 +1206,7 @@ namespace svgio return false; } - bool readSvgNumberVector(const rtl::OUString& rCandidate, SvgNumberVector& rSvgNumberVector) + bool readSvgNumberVector(const OUString& rCandidate, SvgNumberVector& rSvgNumberVector) { const sal_Int32 nLen(rCandidate.getLength()); rSvgNumberVector.clear(); @@ -1229,7 +1229,7 @@ namespace svgio return false; } - SvgAspectRatio readSvgAspectRatio(const rtl::OUString& rCandidate) + SvgAspectRatio readSvgAspectRatio(const OUString& rCandidate) { const sal_Int32 nLen(rCandidate.getLength()); @@ -1245,7 +1245,7 @@ namespace svgio { const sal_Int32 nInitPos(nPos); skip_char(rCandidate, sal_Unicode(' '), nPos, nLen); - rtl::OUStringBuffer aTokenName; + OUStringBuffer aTokenName; copyString(rCandidate, nPos, aTokenName, nLen); if(aTokenName.getLength()) @@ -1353,7 +1353,7 @@ namespace svgio return SvgAspectRatio(); } - bool readSvgStringVector(const rtl::OUString& rCandidate, SvgStringVector& rSvgStringVector) + bool readSvgStringVector(const OUString& rCandidate, SvgStringVector& rSvgStringVector) { rSvgStringVector.clear(); const sal_Int32 nLen(rCandidate.getLength()); @@ -1361,14 +1361,14 @@ namespace svgio if(nLen) { sal_Int32 nPos(0); - rtl::OUStringBuffer aTokenValue; + OUStringBuffer aTokenValue; skip_char(rCandidate, sal_Unicode(' '), sal_Unicode(','), nPos, nLen); while(nPos < nLen) { copyToLimiter(rCandidate, sal_Unicode(','), nPos, aTokenValue, nLen); skip_char(rCandidate, sal_Unicode(','), sal_Unicode(' '), nPos, nLen); - const rtl::OUString aString = aTokenValue.makeStringAndClear(); + const OUString aString = aTokenValue.makeStringAndClear(); if(aString.getLength()) { @@ -1380,9 +1380,9 @@ namespace svgio return !rSvgStringVector.empty(); } - 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) { - rXLink = rUrl = rMimeType = rData = rtl::OUString(); + rXLink = rUrl = rMimeType = rData = OUString(); if(sal_Unicode('#') == rCandidate[0]) { @@ -1391,14 +1391,14 @@ namespace svgio } else { - static rtl::OUString aStrData(rtl::OUString::createFromAscii("data:")); + static OUString aStrData(OUString::createFromAscii("data:")); if(rCandidate.match(aStrData, 0)) { // embedded data sal_Int32 nPos(aStrData.getLength()); sal_Int32 nLen(rCandidate.getLength()); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; // read mime type skip_char(rCandidate, sal_Unicode(' '), nPos, nLen); @@ -1408,13 +1408,13 @@ namespace svgio if(rMimeType.getLength() && nPos < nLen) { - static rtl::OUString aStrImage(rtl::OUString::createFromAscii("image")); + static OUString aStrImage(OUString::createFromAscii("image")); if(rMimeType.match(aStrImage, 0)) { // image data - rtl::OUString aData(rCandidate.copy(nPos)); - static rtl::OUString aStrBase64(rtl::OUString::createFromAscii("base64")); + OUString aData(rCandidate.copy(nPos)); + static OUString aStrBase64(OUString::createFromAscii("base64")); if(aData.match(aStrBase64, 0)) { @@ -1440,14 +1440,14 @@ namespace svgio } } - rtl::OUString convert(const rtl::OUString& rCandidate, const sal_Unicode& rPattern, const sal_Unicode& rNew, bool bRemove) + OUString convert(const OUString& rCandidate, const sal_Unicode& rPattern, const sal_Unicode& rNew, bool bRemove) { const sal_Int32 nLen(rCandidate.getLength()); if(nLen) { sal_Int32 nPos(0); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; bool bChanged(false); while(nPos < nLen) @@ -1480,14 +1480,14 @@ namespace svgio return rCandidate; } - rtl::OUString consolidateContiguosSpace(const rtl::OUString& rCandidate) + OUString consolidateContiguosSpace(const OUString& rCandidate) { const sal_Int32 nLen(rCandidate.getLength()); if(nLen) { sal_Int32 nPos(0); - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; bool bInsideSpace(false); const sal_Unicode aSpace(' '); @@ -1527,14 +1527,14 @@ namespace svgio return rCandidate; } - rtl::OUString whiteSpaceHandlingDefault(const rtl::OUString& rCandidate) + OUString whiteSpaceHandlingDefault(const OUString& rCandidate) { const sal_Unicode aNewline('\n'); const sal_Unicode aTab('\t'); const sal_Unicode aSpace(' '); // remove all newline characters - rtl::OUString aRetval(convert(rCandidate, aNewline, aNewline, true)); + OUString aRetval(convert(rCandidate, aNewline, aNewline, true)); // convert tab to space aRetval = convert(aRetval, aTab, aSpace, false); @@ -1548,14 +1548,14 @@ namespace svgio return aRetval; } - rtl::OUString whiteSpaceHandlingPreserve(const rtl::OUString& rCandidate) + OUString whiteSpaceHandlingPreserve(const OUString& rCandidate) { const sal_Unicode aNewline('\n'); const sal_Unicode aTab('\t'); const sal_Unicode aSpace(' '); // convert newline to space - rtl::OUString aRetval(convert(rCandidate, aNewline, aSpace, false)); + OUString aRetval(convert(rCandidate, aNewline, aSpace, false)); // convert tab to space aRetval = convert(rCandidate, aTab, aSpace, false); diff --git a/svgio/source/svgreader/svgtrefnode.cxx b/svgio/source/svgreader/svgtrefnode.cxx index 7e4586345908..98563bc01336 100644 --- a/svgio/source/svgreader/svgtrefnode.cxx +++ b/svgio/source/svgreader/svgtrefnode.cxx @@ -44,7 +44,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgTrefNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgTrefNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgtspannode.cxx b/svgio/source/svgreader/svgtspannode.cxx index 177830c770f9..96f521f819f0 100644 --- a/svgio/source/svgreader/svgtspannode.cxx +++ b/svgio/source/svgreader/svgtspannode.cxx @@ -43,7 +43,7 @@ namespace svgio return &maSvgStyleAttributes; } - void SvgTspanNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgTspanNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svgreader/svgusenode.cxx b/svgio/source/svgreader/svgusenode.cxx index d978f39ab352..65a6949595a6 100644 --- a/svgio/source/svgreader/svgusenode.cxx +++ b/svgio/source/svgreader/svgusenode.cxx @@ -48,13 +48,13 @@ namespace svgio const SvgStyleAttributes* SvgUseNode::getSvgStyleAttributes() const { - static rtl::OUString aClassStr(rtl::OUString::createFromAscii("use")); + static OUString aClassStr(OUString::createFromAscii("use")); maSvgStyleAttributes.checkForCssStyle(aClassStr); return &maSvgStyleAttributes; } - void SvgUseNode::parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent) + void SvgUseNode::parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent) { // call parent SvgNode::parseAttribute(rTokenName, aSVGToken, aContent); diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx index 23742d7f0754..126eb43a37a6 100644 --- a/svgio/source/svguno/xsvgparser.cxx +++ b/svgio/source/svguno/xsvgparser.cxx @@ -58,12 +58,12 @@ namespace svgio // XSvgParser virtual uno::Sequence< uno::Reference< ::graphic::XPrimitive2D > > SAL_CALL getDecomposition( const uno::Reference< ::io::XInputStream >& xSVGStream, - const ::rtl::OUString& aAbsolutePath) throw (uno::RuntimeException); + const OUString& aAbsolutePath) throw (uno::RuntimeException); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw(uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService(const rtl::OUString&) throw(uno::RuntimeException); - virtual uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw(uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService(const OUString&) throw(uno::RuntimeException); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(uno::RuntimeException); }; } // end of namespace svgreader } // end of namespace svgio @@ -75,17 +75,17 @@ namespace svgio { namespace svgreader { - uno::Sequence< rtl::OUString > XSvgParser_getSupportedServiceNames() + uno::Sequence< OUString > XSvgParser_getSupportedServiceNames() { - static rtl::OUString aServiceName("com.sun.star.graphic.SvgTools" ); - static uno::Sequence< rtl::OUString > aServiceNames( &aServiceName, 1 ); + static OUString aServiceName("com.sun.star.graphic.SvgTools" ); + static uno::Sequence< OUString > aServiceNames( &aServiceName, 1 ); return( aServiceNames ); } - rtl::OUString XSvgParser_getImplementationName() + OUString XSvgParser_getImplementationName() { - return rtl::OUString( "svgio::svgreader::XSvgParser" ); + return OUString( "svgio::svgreader::XSvgParser" ); } uno::Reference< uno::XInterface > SAL_CALL XSvgParser_createInstance(const uno::Reference< uno::XComponentContext >& context) @@ -113,7 +113,7 @@ namespace svgio uno::Sequence< uno::Reference< ::graphic::XPrimitive2D > > XSvgParser::getDecomposition( const uno::Reference< ::io::XInputStream >& xSVGStream, - const ::rtl::OUString& aAbsolutePath ) throw (uno::RuntimeException) + const OUString& aAbsolutePath ) throw (uno::RuntimeException) { drawinglayer::primitive2d::Primitive2DSequence aRetval; @@ -173,14 +173,14 @@ namespace svgio return aRetval; } - rtl::OUString SAL_CALL XSvgParser::getImplementationName() throw(uno::RuntimeException) + OUString SAL_CALL XSvgParser::getImplementationName() throw(uno::RuntimeException) { return(XSvgParser_getImplementationName()); } - sal_Bool SAL_CALL XSvgParser::supportsService(const rtl::OUString& rServiceName) throw(uno::RuntimeException) + sal_Bool SAL_CALL XSvgParser::supportsService(const OUString& rServiceName) throw(uno::RuntimeException) { - const uno::Sequence< rtl::OUString > aServices(XSvgParser_getSupportedServiceNames()); + const uno::Sequence< OUString > aServices(XSvgParser_getSupportedServiceNames()); for(sal_Int32 nService(0); nService < aServices.getLength(); nService++) { @@ -193,7 +193,7 @@ namespace svgio return sal_False; } - uno::Sequence< rtl::OUString > SAL_CALL XSvgParser::getSupportedServiceNames() throw(uno::RuntimeException) + uno::Sequence< OUString > SAL_CALL XSvgParser::getSupportedServiceNames() throw(uno::RuntimeException) { return XSvgParser_getSupportedServiceNames(); } diff --git a/svgio/source/svguno/xsvgparser.hxx b/svgio/source/svguno/xsvgparser.hxx index 861f322a0f8b..43bcaf1abd99 100644 --- a/svgio/source/svguno/xsvgparser.hxx +++ b/svgio/source/svguno/xsvgparser.hxx @@ -41,9 +41,9 @@ XSvgParser_createInstance( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &); -rtl::OUString SAL_CALL XSvgParser_getImplementationName(); +OUString SAL_CALL XSvgParser_getImplementationName(); -com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL +com::sun::star::uno::Sequence< OUString > SAL_CALL XSvgParser_getSupportedServiceNames(); } } |