com::sun::star->css in include/drawinglayer

Change-Id: Icc8bf14bd7876df321958bc0ed24a5587213827f
Reviewed-on: https://gerrit.libreoffice.org/19488Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

include/drawinglayer/XShapeDumper.hxx

@@ -46,8 +46,8 @@ class DRAWINGLAYER_DLLPUBLIC XShapeDumper
 
 public:
     XShapeDumper();
-    static OUString dump(com::sun::star::uno::Reference<com::sun::star::drawing::XShapes> xPageShapes, bool bDumpInteropProperties=false);
-    static OUString dump(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xPageShapes, bool bDumpInteropProperties=false);
+    static OUString dump(css::uno::Reference<css::drawing::XShapes> xPageShapes, bool bDumpInteropProperties=false);
+    static OUString dump(css::uno::Reference<css::drawing::XShape> xPageShapes, bool bDumpInteropProperties=false);
 };
 
 #endif

include/drawinglayer/attribute/lineattribute.hxx

@@ -57,7 +57,7 @@ namespace drawinglayer
                 const basegfx::BColor& rColor,
                 double fWidth = 0.0,
                 basegfx::B2DLineJoin aB2DLineJoin = basegfx::B2DLineJoin::Round,
-                com::sun::star::drawing::LineCap aLineCap = com::sun::star::drawing::LineCap_BUTT);
+                css::drawing::LineCap aLineCap = css::drawing::LineCap_BUTT);
             LineAttribute();
             LineAttribute(const LineAttribute& rCandidate);
             LineAttribute& operator=(const LineAttribute& rCandidate);
@@ -73,7 +73,7 @@ namespace drawinglayer
             const basegfx::BColor& getColor() const;
             double getWidth() const;
             basegfx::B2DLineJoin getLineJoin() const;
-            com::sun::star::drawing::LineCap getLineCap() const;
+            css::drawing::LineCap getLineCap() const;
         };
     } // end of namespace attribute
 } // end of namespace drawinglayer

include/drawinglayer/attribute/sdrlineattribute.hxx

@@ -58,7 +58,7 @@ namespace drawinglayer
                 double fWidth,
                 double fTransparence,
                 const basegfx::BColor& rColor,
-                com::sun::star::drawing::LineCap eCap,
+                css::drawing::LineCap eCap,
                 const ::std::vector< double >& rDotDashArray,
                 double fFullDotDashLen);
             SdrLineAttribute();
@@ -79,7 +79,7 @@ namespace drawinglayer
             const basegfx::BColor& getColor() const;
             const ::std::vector< double >& getDotDashArray() const;
             double getFullDotDashLen() const;
-            com::sun::star::drawing::LineCap getCap() const;
+            css::drawing::LineCap getCap() const;
         };
     } // end of namespace attribute
 } // end of namespace drawinglayer

include/drawinglayer/attribute/sdrobjectattribute3d.hxx

@@ -53,11 +53,11 @@ namespace drawinglayer
         public:
             // constructors/destructor
             Sdr3DObjectAttribute(
-                ::com::sun::star::drawing::NormalsKind  aNormalsKind,
-                ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionX,
-                ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionY,
-                ::com::sun::star::drawing::TextureKind2 aTextureKind,
-                ::com::sun::star::drawing::TextureMode aTextureMode,
+                css::drawing::NormalsKind  aNormalsKind,
+                css::drawing::TextureProjectionMode aTextureProjectionX,
+                css::drawing::TextureProjectionMode aTextureProjectionY,
+                css::drawing::TextureKind2 aTextureKind,
+                css::drawing::TextureMode aTextureMode,
                 const MaterialAttribute3D& rMaterial,
                 bool bNormalsInvert,
                 bool bDoubleSided,
@@ -74,11 +74,11 @@ namespace drawinglayer
             bool operator==(const Sdr3DObjectAttribute& rCandidate) const;
 
             // data read access
-            ::com::sun::star::drawing::NormalsKind getNormalsKind() const;
-            ::com::sun::star::drawing::TextureProjectionMode getTextureProjectionX() const;
-            ::com::sun::star::drawing::TextureProjectionMode getTextureProjectionY() const;
-            ::com::sun::star::drawing::TextureKind2 getTextureKind() const;
-            ::com::sun::star::drawing::TextureMode getTextureMode() const;
+            css::drawing::NormalsKind getNormalsKind() const;
+            css::drawing::TextureProjectionMode getTextureProjectionX() const;
+            css::drawing::TextureProjectionMode getTextureProjectionY() const;
+            css::drawing::TextureKind2 getTextureKind() const;
+            css::drawing::TextureMode getTextureMode() const;
             const MaterialAttribute3D& getMaterial() const;
             bool getNormalsInvert() const;
             bool getDoubleSided() const;

include/drawinglayer/attribute/sdrsceneattribute3d.hxx

@@ -52,8 +52,8 @@ namespace drawinglayer
             SdrSceneAttribute(
                 double fDistance,
                 double fShadowSlant,
-                ::com::sun::star::drawing::ProjectionMode aProjectionMode,
-                ::com::sun::star::drawing::ShadeMode aShadeMode,
+                css::drawing::ProjectionMode aProjectionMode,
+                css::drawing::ShadeMode aShadeMode,
                 bool bTwoSidedLighting);
             SdrSceneAttribute();
             SdrSceneAttribute(const SdrSceneAttribute& rCandidate);
@@ -68,8 +68,8 @@ namespace drawinglayer
 
             // data read access
             double getShadowSlant() const;
-            ::com::sun::star::drawing::ProjectionMode getProjectionMode() const;
-            ::com::sun::star::drawing::ShadeMode getShadeMode() const;
+            css::drawing::ProjectionMode getProjectionMode() const;
+            css::drawing::ShadeMode getShadeMode() const;
             bool getTwoSidedLighting() const;
         };
     } // end of namespace attribute

include/drawinglayer/geometry/viewinformation2d.hxx

@@ -52,7 +52,7 @@ namespace drawinglayer
             together with UNO API definitions and supports holding a sequence of PropertyValues.
             The most used data is for convenience offered directly using basegfx tooling classes.
             It is an implementation to support the sequence of PropertyValues used in a
-            ::com::sun::star::graphic::XPrimitive2D for C++ implementations working with those
+            css::graphic::XPrimitive2D for C++ implementations working with those
         */
         class DRAWINGLAYER_DLLPUBLIC ViewInformation2D
         {
@@ -96,9 +96,9 @@ namespace drawinglayer
                 const basegfx::B2DHomMatrix& rObjectTransformation,
                 const basegfx::B2DHomMatrix& rViewTransformation,
                 const basegfx::B2DRange& rViewport,
-                const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxDrawPage,
+                const css::uno::Reference< css::drawing::XDrawPage >& rxDrawPage,
                 double fViewTime,
-                const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rExtendedParameters);
+                const css::uno::Sequence< css::beans::PropertyValue >& rExtendedParameters);
 
             /** Constructor: Create a ViewInformation2D
 
@@ -107,7 +107,7 @@ namespace drawinglayer
                 other parameters. This constructor is feeded completely with a sequence of PropertyValues
                 which will be parsed to be able to offer the most used ones in a convenient way.
             */
-            explicit ViewInformation2D(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters);
+            explicit ViewInformation2D(const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters);
 
             /// default (empty) constructor
             ViewInformation2D();
@@ -130,7 +130,7 @@ namespace drawinglayer
             const basegfx::B2DHomMatrix& getViewTransformation() const;
             const basegfx::B2DRange& getViewport() const;
             double getViewTime() const;
-            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& getVisualizedPage() const;
+            const css::uno::Reference< css::drawing::XDrawPage >& getVisualizedPage() const;
 
             /// On-demand prepared Object to View transformation and its inverse for convenience
             const basegfx::B2DHomMatrix& getObjectToViewTransformation() const;
@@ -153,7 +153,7 @@ namespace drawinglayer
                 as PropertyValues. This set completely describes this ViewInformation2D and
                 can be used for complete information transport over UNO API.
             */
-            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& getViewInformationSequence() const;
+            const css::uno::Sequence< css::beans::PropertyValue >& getViewInformationSequence() const;
 
             /** Get the uno::Sequence< beans::PropertyValue > which contains only ViewInformation
                 not offered directly
@@ -163,7 +163,7 @@ namespace drawinglayer
                 incarnations of ViewInformation2D without losing the only with PropertyValues
                 defined data. It does not contain a complete description.
             */
-            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& getExtendedInformationSequence() const;
+            const css::uno::Sequence< css::beans::PropertyValue >& getExtendedInformationSequence() const;
         };
     } // end of namespace geometry
 } // end of namespace drawinglayer

include/drawinglayer/geometry/viewinformation3d.hxx

@@ -50,7 +50,7 @@ namespace drawinglayer
             together with UNO API definitions and supports holding a sequence of PropertyValues.
             The most used data is for convenience offered directly using basegfx tooling classes.
             It is an implementation to support the sequence of PropertyValues used in a
-            ::com::sun::star::graphic::XPrimitive3D for C++ implementations working with those
+            css::graphic::XPrimitive3D for C++ implementations working with those
         */
         class DRAWINGLAYER_DLLPUBLIC ViewInformation3D
         {
@@ -103,7 +103,7 @@ namespace drawinglayer
                 const basegfx::B3DHomMatrix& rProjection,
                 const basegfx::B3DHomMatrix& rDeviceToView,
                 double fViewTime,
-                const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rExtendedParameters);
+                const css::uno::Sequence< css::beans::PropertyValue >& rExtendedParameters);
 
             /** Constructor: Create a ViewInformation3D
 
@@ -112,7 +112,7 @@ namespace drawinglayer
                 other parameters. This constructor is feeded completely with a sequence of PropertyValues
                 which will be parsed to be able to offer the most used ones in a convenient way.
             */
-            explicit ViewInformation3D(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters);
+            explicit ViewInformation3D(const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters);
 
             /// default (empty) constructor
             ViewInformation3D();
@@ -150,7 +150,7 @@ namespace drawinglayer
                 as PropertyValues. This set completely describes this ViewInformation3D and
                 can be used for complete information transport over UNO API.
             */
-            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& getViewInformationSequence() const;
+            const css::uno::Sequence< css::beans::PropertyValue >& getViewInformationSequence() const;
 
             /** Get the uno::Sequence< beans::PropertyValue > which contains only ViewInformation
                 not offered directly
@@ -160,7 +160,7 @@ namespace drawinglayer
                 incarnations of ViewInformation3D without losing the only with PropertyValues
                 defined data. It does not contain a complete description.
             */
-            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& getExtendedInformationSequence() const;
+            const css::uno::Sequence< css::beans::PropertyValue >& getExtendedInformationSequence() const;
         };
     } // end of namespace geometry
 } // end of namespace drawinglayer

include/drawinglayer/primitive2d/baseprimitive2d.hxx

@@ -50,9 +50,9 @@ namespace drawinglayer { namespace geometry {
 
 namespace drawinglayer { namespace primitive2d {
     /// typedefs for basePrimitive2DImplBase, Primitive2DSequence and Primitive2DReference
-    typedef cppu::WeakComponentImplHelper1< ::com::sun::star::graphic::XPrimitive2D > BasePrimitive2DImplBase;
-    typedef ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > Primitive2DReference;
-    typedef ::com::sun::star::uno::Sequence< Primitive2DReference > Primitive2DSequence;
+    typedef cppu::WeakComponentImplHelper1< css::graphic::XPrimitive2D > BasePrimitive2DImplBase;
+    typedef css::uno::Reference< css::graphic::XPrimitive2D > Primitive2DReference;
+    typedef css::uno::Sequence< Primitive2DReference > Primitive2DSequence;
 }}
 
 
@@ -64,7 +64,7 @@ namespace drawinglayer
     {
         /** BasePrimitive2D class
 
-            Baseclass for all C++ implementations of com::sun::star::graphic::XPrimitive2D
+            Baseclass for all C++ implementations of css::graphic::XPrimitive2D
 
             This class is strongly virtual due to the lack of getPrimitiveID() implementation.
             This is by purpose, this base class shall not be incarnated and be used directly as
@@ -174,12 +174,12 @@ namespace drawinglayer
             /** The getDecomposition implementation for UNO API will use getDecomposition from this implementation. It
                 will construct a ViewInformation2D from the ViewParameters for that purpose
              */
-            virtual Primitive2DSequence SAL_CALL getDecomposition( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+            virtual Primitive2DSequence SAL_CALL getDecomposition( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) throw ( css::uno::RuntimeException, std::exception ) override;
 
             /** The getRange implementation for UNO API will use getRange from this implementation. It
                 will construct a ViewInformation2D from the ViewParameters for that purpose
              */
-            virtual ::com::sun::star::geometry::RealRectangle2D SAL_CALL getRange( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+            virtual css::geometry::RealRectangle2D SAL_CALL getRange( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) throw ( css::uno::RuntimeException, std::exception ) override;
         };
     } // end of namespace primitive2d
 } // end of namespace drawinglayer
@@ -193,7 +193,7 @@ namespace drawinglayer
     {
         /** BufferedDecompositionPrimitive2D class
 
-            Baseclass for all C++ implementations of com::sun::star::graphic::XPrimitive2D
+            Baseclass for all C++ implementations of css::graphic::XPrimitive2D
             which want to buffer the decomoposition result
 
             Buffering the decomposition is the most-used buffering and is thus used my most

include/drawinglayer/primitive2d/borderlineprimitive2d.hxx

@@ -77,7 +77,7 @@ namespace drawinglayer
 
             bool isSolidLine() const
             {
-                return mnStyle == com::sun::star::table::BorderLineStyle::SOLID;
+                return mnStyle == css::table::BorderLineStyle::SOLID;
             }
 
             bool isInsideUsed() const

include/drawinglayer/primitive2d/controlprimitive2d.hxx

@@ -44,14 +44,14 @@ namespace drawinglayer
         {
         private:
             /// object's base data
-            basegfx::B2DHomMatrix                                                   maTransform;
-            com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >    mxControlModel;
+            basegfx::B2DHomMatrix                             maTransform;
+            css::uno::Reference< css::awt::XControlModel >    mxControlModel;
 
             /// the created an cached awt::XControl
-            com::sun::star::uno::Reference< com::sun::star::awt::XControl >         mxXControl;
+            css::uno::Reference< css::awt::XControl >         mxXControl;
 
             /// the last used scaling, used from getDecomposition for buffering
-            basegfx::B2DVector                                                      maLastViewScaling;
+            basegfx::B2DVector                                maLastViewScaling;
 
             /** used from getXControl() to create a local awt::XControl which is remembered in mxXControl
                 and from thereon always used and returned by getXControl()
@@ -70,7 +70,7 @@ namespace drawinglayer
             /// constructor
             ControlPrimitive2D(
                 const basegfx::B2DHomMatrix& rTransform,
-                const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >& rxControlModel);
+                const css::uno::Reference< css::awt::XControlModel >& rxControlModel);
 
             /** constructor with an additional XControl as parameter to allow to hand it over at incarnation time
                 if it exists. This will avoid to create a 2nd one on demand in createXControl()
@@ -78,18 +78,18 @@ namespace drawinglayer
              */
             ControlPrimitive2D(
                 const basegfx::B2DHomMatrix& rTransform,
-                const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >& rxControlModel,
-                const com::sun::star::uno::Reference< com::sun::star::awt::XControl >& rxXControl);
+                const css::uno::Reference< css::awt::XControlModel >& rxControlModel,
+                const css::uno::Reference< css::awt::XControl >& rxXControl);
 
             /// data read access
             const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
-            const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >& getControlModel() const { return mxControlModel; }
+            const css::uno::Reference< css::awt::XControlModel >& getControlModel() const { return mxControlModel; }
 
             /** mxControl access. This will on demand create the awt::XControl using createXControl()
                 if it does not exist. It may already have been created or even handed over at
                 incarnation
              */
-            const com::sun::star::uno::Reference< com::sun::star::awt::XControl >& getXControl() const;
+            const css::uno::Reference< css::awt::XControl >& getXControl() const;
 
             /// compare operator
             virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;

include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx

@@ -47,7 +47,7 @@ namespace drawinglayer
                 this will not only be used by the renderers to provide the correct decompose
                 graphic attribute context, but also to completely create the page's sub-content.
              */
-            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > mxDrawPage;
+            const css::uno::Reference< css::drawing::XDrawPage > mxDrawPage;
 
             /// the PageContent
             Primitive2DSequence                         maPageContent;
@@ -70,7 +70,7 @@ namespace drawinglayer
         public:
             /// constructor
             PagePreviewPrimitive2D(
-                const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& rxDrawPage,
+                const css::uno::Reference< css::drawing::XDrawPage >& rxDrawPage,
                 const basegfx::B2DHomMatrix& rTransform,
                 double fContentWidth,
                 double fContentHeight,
@@ -78,7 +78,7 @@ namespace drawinglayer
                 bool bKeepAspectRatio);
 
             /// data read access
-            const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& getXDrawPage() const { return mxDrawPage; }
+            const css::uno::Reference< css::drawing::XDrawPage >& getXDrawPage() const { return mxDrawPage; }
             const Primitive2DSequence& getPageContent() const { return maPageContent; }
             const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
             double getContentWidth() const { return mfContentWidth; }

include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx

@@ -87,7 +87,7 @@ namespace drawinglayer
                 sal_Int32 nTextLength,
                 const ::std::vector< double >& rDXArray,
                 const attribute::FontAttribute& rFontAttribute,
-                const ::com::sun::star::lang::Locale& rLocale,
+                const css::lang::Locale& rLocale,
                 const basegfx::BColor& rFontColor,
                 const Color& rFillColor,
 

include/drawinglayer/primitive2d/textlayoutdevice.hxx

@@ -70,7 +70,7 @@ namespace drawinglayer
                 const attribute::FontAttribute& rFontAttribute,
                 double fFontScaleX,
                 double fFontScaleY,
-                const ::com::sun::star::lang::Locale & rLocale);
+                const css::lang::Locale & rLocale);
 
             double getTextHeight() const;
             double getOverlineHeight() const;
@@ -130,7 +130,7 @@ namespace drawinglayer
             double fFontScaleX,
             double fFontScaleY,
             double fFontRotation,
-            const ::com::sun::star::lang::Locale & rLocale);
+            const css::lang::Locale & rLocale);
 
         /** Generate FontAttribute DataSet derived from the given VCL-Font.
             The FontScaling with fFontScaleY, fFontScaleX relationship (see

include/drawinglayer/primitive2d/textprimitive2d.hxx

@@ -120,7 +120,7 @@ namespace drawinglayer
             attribute::FontAttribute                maFontAttribute;
 
             /// The Locale for the text
-            ::com::sun::star::lang::Locale          maLocale;
+            css::lang::Locale                      maLocale;
 
             /// font color
             basegfx::BColor                         maFontColor;
@@ -132,7 +132,7 @@ namespace drawinglayer
             long                                    mnWidthToFill;      // the width to fill
 
             /// The fill color of the text
-            Color                         maTextFillColor;
+            Color                                   maTextFillColor;
 
         protected:
             /// local decomposition.
@@ -147,7 +147,7 @@ namespace drawinglayer
                 sal_Int32 nTextLength,
                 const ::std::vector< double >& rDXArray,
                 const attribute::FontAttribute& rFontAttribute,
-                const ::com::sun::star::lang::Locale& rLocale,
+                const css::lang::Locale& rLocale,
                 const basegfx::BColor& rFontColor,
                 bool bFilled = false,
                 long nWidthToFill = 0,
@@ -166,7 +166,7 @@ namespace drawinglayer
             sal_Int32 getTextLength() const { return mnTextLength; }
             const ::std::vector< double >& getDXArray() const { return maDXArray; }
             const attribute::FontAttribute& getFontAttribute() const { return maFontAttribute; }
-            const ::com::sun::star::lang::Locale& getLocale() const { return  maLocale; }
+            const css::lang::Locale& getLocale() const { return  maLocale; }
             const basegfx::BColor& getFontColor() const { return maFontColor; }
             const Color& getTextFillColor() const { return maTextFillColor; }
             bool isFilled() const { return mbFilled; }
@@ -183,7 +183,7 @@ namespace drawinglayer
         };
 
         /// small helper to have a compare operator for Locale
-        bool DRAWINGLAYER_DLLPUBLIC LocalesAreEqual(const ::com::sun::star::lang::Locale& rA, const ::com::sun::star::lang::Locale& rB);
+        bool DRAWINGLAYER_DLLPUBLIC LocalesAreEqual(const css::lang::Locale& rA, const css::lang::Locale& rB);
 
     } // end of namespace primitive2d
 } // end of namespace drawinglayer

include/drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx

@@ -74,7 +74,7 @@ namespace drawinglayer
         private:
             sal_Unicode                             maStrikeoutChar;
             attribute::FontAttribute                maFontAttribute;
-            ::com::sun::star::lang::Locale          maLocale;
+            css::lang::Locale                       maLocale;
 
         protected:
             /// local decomposition.
@@ -88,12 +88,12 @@ namespace drawinglayer
                 const basegfx::BColor& rFontColor,
                 sal_Unicode aStrikeoutChar,
                 const attribute::FontAttribute& rFontAttribute,
-                const ::com::sun::star::lang::Locale& rLocale);
+                const css::lang::Locale& rLocale);
 
             /// data read access
             sal_Unicode getStrikeoutChar() const { return maStrikeoutChar; }
             const attribute::FontAttribute& getFontAttribute() const { return maFontAttribute; }
-            const ::com::sun::star::lang::Locale& getLocale() const { return maLocale; }
+            const css::lang::Locale& getLocale() const { return maLocale; }
 
             /// compare operator
             virtual bool operator==( const BasePrimitive2D& rPrimitive ) const override;

include/drawinglayer/primitive3d/baseprimitive3d.hxx

@@ -50,9 +50,9 @@ namespace drawinglayer { namespace geometry {
 
 namespace drawinglayer { namespace primitive3d {
     /// typedefs for basePrimitive3DImplBase, Primitive3DSequence and Primitive3DReference
-    typedef cppu::WeakComponentImplHelper1< ::com::sun::star::graphic::XPrimitive3D > BasePrimitive3DImplBase;
-    typedef ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive3D > Primitive3DReference;
-    typedef ::com::sun::star::uno::Sequence< Primitive3DReference > Primitive3DSequence;
+    typedef cppu::WeakComponentImplHelper1< css::graphic::XPrimitive3D > BasePrimitive3DImplBase;
+    typedef css::uno::Reference< css::graphic::XPrimitive3D > Primitive3DReference;
+    typedef css::uno::Sequence< Primitive3DReference > Primitive3DSequence;
 }}
 
 
@@ -64,7 +64,7 @@ namespace drawinglayer
     {
         /** BasePrimitive3D class
 
-            Baseclass for all C++ implementations of com::sun::star::graphic::XPrimitive2D
+            Baseclass for all C++ implementations of css::graphic::XPrimitive2D
 
             The description/functionality is identical with the 2D case in baseprimitive2d.hxx,
             please see there for detailed information.
@@ -117,12 +117,12 @@ namespace drawinglayer
             /** The getDecomposition implementation for UNO API will use getDecomposition from this implementation. It
                 will get the ViewInformation from the ViewParameters for that purpose
              */
-            virtual Primitive3DSequence SAL_CALL getDecomposition( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+            virtual Primitive3DSequence SAL_CALL getDecomposition( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) throw ( css::uno::RuntimeException, std::exception ) override;
 
             /** the getRange default implementation will use getDecomposition to create the range information from merging
                 getRange results from the single local decomposition primitives.
              */
-            virtual ::com::sun::star::geometry::RealRectangle3D SAL_CALL getRange( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rViewParameters ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+            virtual css::geometry::RealRectangle3D SAL_CALL getRange( const css::uno::Sequence< css::beans::PropertyValue >& rViewParameters ) throw ( css::uno::RuntimeException, std::exception ) override;
         };
     } // end of namespace primitive3d
 } // end of namespace drawinglayer
@@ -136,7 +136,7 @@ namespace drawinglayer
     {
         /** BufferedDecompositionPrimitive3D class
 
-            Baseclass for all C++ implementations of com::sun::star::graphic::XPrimitive2D
+            Baseclass for all C++ implementations of css::graphic::XPrimitive2D
 
             The description/functionality is identical with the 2D case in baseprimitive2d.hxx,
             please see there for detailed information

include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx

@@ -56,7 +56,7 @@ namespace drawinglayer
             double                                      mfDegreeStepWidth;
             double                                      mfMiterMinimumAngle;
             basegfx::B2DLineJoin                        maLineJoin;
-            com::sun::star::drawing::LineCap            maLineCap;
+            css::drawing::LineCap                       maLineCap;
 
         protected:
             /** access methods to maLast3DDecomposition. The usage of this methods may allow
@@ -76,7 +76,7 @@ namespace drawinglayer
                 const basegfx::BColor& rBColor,
                 double fRadius,
                 basegfx::B2DLineJoin aLineJoin,
-                com::sun::star::drawing::LineCap aLineCap,
+                css::drawing::LineCap aLineCap,
                 double fDegreeStepWidth = 10.0 * F_PI180,
                 double fMiterMinimumAngle = 15.0 * F_PI180);
 
@@ -85,7 +85,7 @@ namespace drawinglayer
             double getDegreeStepWidth() const { return mfDegreeStepWidth; }
             double getMiterMinimumAngle() const { return mfMiterMinimumAngle; }
             basegfx::B2DLineJoin getLineJoin() const { return maLineJoin; }
-            com::sun::star::drawing::LineCap getLineCap() const { return maLineCap; }
+            css::drawing::LineCap getLineCap() const { return maLineCap; }
 
             /// compare operator
             virtual bool operator==(const BasePrimitive3D& rPrimitive) const override;

include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx

@@ -58,8 +58,8 @@ namespace drawinglayer
 
         // #i98314#
         void DRAWINGLAYER_DLLPUBLIC applyTextureTo3DGeometry(
-            ::com::sun::star::drawing::TextureProjectionMode eModeX,
-            ::com::sun::star::drawing::TextureProjectionMode eModeY,
+            css::drawing::TextureProjectionMode eModeX,
+            css::drawing::TextureProjectionMode eModeY,
             ::std::vector< basegfx::B3DPolyPolygon >& rFill,
             const basegfx::B3DRange& rRange,
             const basegfx::B2DVector& rTextureSize);

include/drawinglayer/processor2d/baseprocessor2d.hxx

@@ -60,7 +60,7 @@ namespace drawinglayer
             to the corresponding API implementation (an uno::Sequence< beans::PropertyValue >)
             and recursively calls the method process(..) at the primitive with the decomposition
             derived from that primitive. This is the preparation to handle unknown implementations
-            of the com::sun::star::graphic::XPrimitive2D interface in the future.
+            of the css::graphic::XPrimitive2D interface in the future.
 
             So, to implement a basic processor, it is necessary to override and implement the
             processBasePrimitive2D(..) method. A minimal renderer has to support the

include/drawinglayer/processor2d/canvasprocessor.hxx

@@ -59,7 +59,7 @@ namespace drawinglayer
     {
         /** canvasProcessor2D class
 
-            A basic implementation of a renderer for com::sun::star::rendering::XCanvas
+            A basic implementation of a renderer for css::rendering::XCanvas
             as a target
          */
         class DRAWINGLAYER_DLLPUBLIC canvasProcessor2D : public BaseProcessor2D
@@ -67,9 +67,9 @@ namespace drawinglayer
         private:
             // the (current) destination OutDev and canvas
             VclPtr<OutputDevice>                                    mpOutputDevice;
-            com::sun::star::uno::Reference< com::sun::star::rendering::XCanvas >    mxCanvas;
-            com::sun::star::rendering::ViewState                    maViewState;
-            com::sun::star::rendering::RenderState                  maRenderState;
+            css::uno::Reference< css::rendering::XCanvas >          mxCanvas;
+            css::rendering::ViewState                               maViewState;
+            css::rendering::RenderState                             maRenderState;
 
             // the modifiedColorPrimitive stack
             basegfx::BColorModifierStack                            maBColorModifierStack;