diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-29 12:44:31 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-29 11:18:10 +0000 |
commit | 95b22704e8452e6360d0acf846e8c967aab146d7 (patch) | |
tree | 267d1bc02e2ba65aef23a19d9bfb7d96a9af9ebf /svgio | |
parent | 457f8fd4d33053510b0e44d210b7febd2f07a4ff (diff) |
com::sun::star->css in starmath,stoc,svgio,svl
Change-Id: If4308b358a55351f6e951ebf055df076ce4ad4ce
Reviewed-on: https://gerrit.libreoffice.org/19667
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svgio')
-rw-r--r-- | svgio/inc/svgio/svgreader/svgdocumenthandler.hxx | 18 | ||||
-rw-r--r-- | svgio/inc/svgio/svgreader/svgnode.hxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svgcharacternode.cxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svgimagenode.cxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svgnode.cxx | 2 | ||||
-rw-r--r-- | svgio/source/svgreader/svgstyleattributes.cxx | 10 | ||||
-rw-r--r-- | svgio/source/svguno/xsvgparser.hxx | 8 |
7 files changed, 21 insertions, 23 deletions
diff --git a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx index 560dee3ef370..bc1d10a27821 100644 --- a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx +++ b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx @@ -30,7 +30,7 @@ namespace svgio { namespace svgreader { - class SvgDocHdl : public cppu::WeakImplHelper< com::sun::star::xml::sax::XDocumentHandler > + class SvgDocHdl : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > { private: // the complete SVG Document @@ -49,14 +49,14 @@ namespace svgio virtual ~SvgDocHdl(); // Methods XDocumentHandler - virtual void SAL_CALL startDocument( ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endDocument( ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - virtual void SAL_CALL endElement( const OUString& aName ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL characters( const OUString& aChars ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; - 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, std::exception) override; + virtual void SAL_CALL startDocument( ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endDocument( ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endElement( const OUString& aName ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; const SvgDocument& getSvgDocument() const { return maDocument; } }; diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgio/svgreader/svgnode.hxx index 043add38cf0d..4111ed3b66a6 100644 --- a/svgio/inc/svgio/svgreader/svgnode.hxx +++ b/svgio/inc/svgio/svgreader/svgnode.hxx @@ -141,7 +141,7 @@ namespace svgio void readLocalCssStyle(const OUString& aContent); /// style helpers - void parseAttributes(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs); + void parseAttributes(const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs); virtual const SvgStyleAttributes* getSvgStyleAttributes() const; virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx index 74d388dc6617..1ad92ee2461f 100644 --- a/svgio/source/svgreader/svgcharacternode.cxx +++ b/svgio/source/svgreader/svgcharacternode.cxx @@ -277,7 +277,7 @@ namespace svgio double fFontHeight(fFontWidth); // prepare locale - ::com::sun::star::lang::Locale aLocale; + css::lang::Locale aLocale; // prepare TextLayouterDevice drawinglayer::primitive2d::TextLayouterDevice aTextLayouterDevice; diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx index 55f62dcfa588..00dafa298c73 100644 --- a/svgio/source/svgreader/svgimagenode.cxx +++ b/svgio/source/svgreader/svgimagenode.cxx @@ -212,7 +212,7 @@ namespace svgio if(!maMimeType.isEmpty() && !maData.isEmpty()) { // use embedded base64 encoded data - ::com::sun::star::uno::Sequence< sal_Int8 > aPass; + css::uno::Sequence< sal_Int8 > aPass; ::sax::Converter::decodeBase64(aPass, maData); if(aPass.hasElements()) diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx index 2ea11be2ad22..623a1e4cdfb3 100644 --- a/svgio/source/svgreader/svgnode.cxx +++ b/svgio/source/svgreader/svgnode.cxx @@ -337,7 +337,7 @@ namespace svgio } } - void SvgNode::parseAttributes(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs) + void SvgNode::parseAttributes(const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs) { // no longer need to pre-sort moving 'style' entries to the back so that // values get overwritten - that was the previous, not complete solution for diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index 00a492bc361b..dd1f942c65b2 100644 --- a/svgio/source/svgreader/svgstyleattributes.cxx +++ b/svgio/source/svgreader/svgstyleattributes.cxx @@ -57,21 +57,21 @@ namespace svgio return basegfx::B2DLineJoin::Miter; } - com::sun::star::drawing::LineCap StrokeLinecapToDrawingLineCap(StrokeLinecap aStrokeLinecap) + css::drawing::LineCap StrokeLinecapToDrawingLineCap(StrokeLinecap aStrokeLinecap) { switch(aStrokeLinecap) { default: /* StrokeLinecap_notset, StrokeLinecap_butt */ { - return com::sun::star::drawing::LineCap_BUTT; + return css::drawing::LineCap_BUTT; } case StrokeLinecap_round: { - return com::sun::star::drawing::LineCap_ROUND; + return css::drawing::LineCap_ROUND; } case StrokeLinecap_square: { - return com::sun::star::drawing::LineCap_SQUARE; + return css::drawing::LineCap_SQUARE; } } } @@ -671,7 +671,7 @@ namespace svgio { // get LineJoin, LineCap and stroke array const basegfx::B2DLineJoin aB2DLineJoin(StrokeLinejoinToB2DLineJoin(getStrokeLinejoin())); - const com::sun::star::drawing::LineCap aLineCap(StrokeLinecapToDrawingLineCap(getStrokeLinecap())); + const css::drawing::LineCap aLineCap(StrokeLinecapToDrawingLineCap(getStrokeLinecap())); ::std::vector< double > aDashArray; if(!getStrokeDasharray().empty()) diff --git a/svgio/source/svguno/xsvgparser.hxx b/svgio/source/svguno/xsvgparser.hxx index 7853b1e2c03c..3c96049f4ba2 100644 --- a/svgio/source/svguno/xsvgparser.hxx +++ b/svgio/source/svguno/xsvgparser.hxx @@ -35,14 +35,12 @@ namespace com { namespace sun { namespace star { namespace svgio { namespace svgreader { -com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL -XSvgParser_createInstance( - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > - const &); +css::uno::Reference< css::uno::XInterface > SAL_CALL +XSvgParser_createInstance( css::uno::Reference< css::uno::XComponentContext > const &); OUString SAL_CALL XSvgParser_getImplementationName(); -com::sun::star::uno::Sequence< OUString > SAL_CALL +css::uno::Sequence< OUString > SAL_CALL XSvgParser_getSupportedServiceNames(); } } |