com::sun::star->css in cppcanvas

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

19 files changed, 126 insertions, 136 deletions

diff --git a/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx
index 031b9e7b5302..209f191e55cd 100644
--- a/cppcanvas/source/inc/canvasgraphichelper.hxx
+++ b/cppcanvas/source/inc/canvasgraphichelper.hxx
@@ -58,16 +58,16 @@ namespace cppcanvas
         protected:
             // for our clients
             // ===============
-            CanvasSharedPtr                                                                 getCanvas() const {  return mpCanvas; }
-            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > getGraphicDevice() const {  return mxGraphicDevice; }
-            const ::com::sun::star::rendering::RenderState&                                 getRenderState() const;
+            CanvasSharedPtr                                                      getCanvas() const {  return mpCanvas; }
+            css::uno::Reference< css::rendering::XGraphicDevice >            getGraphicDevice() const {  return mxGraphicDevice; }
+            const css::rendering::RenderState&                                 getRenderState() const;
 
         private:
-            mutable ::com::sun::star::rendering::RenderState                                maRenderState;
+            mutable css::rendering::RenderState                                 maRenderState;
 
-            boost::optional<basegfx::B2DPolyPolygon>                                        maClipPolyPolygon;
-            CanvasSharedPtr                                                                 mpCanvas;
-            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxGraphicDevice;
+            boost::optional<basegfx::B2DPolyPolygon>                              maClipPolyPolygon;
+            CanvasSharedPtr                                                       mpCanvas;
+            css::uno::Reference< css::rendering::XGraphicDevice >             mxGraphicDevice;
         };
 
     }
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index b4b2b28c3903..118ae6d3fd2a 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -239,10 +239,10 @@ static float GetSwapFloat( SvStream& rSt )
                                  const ActionFactoryParameters&     rParms,
                                  bool                               bIntersect );
 
-            static ::com::sun::star::uno::Reference<
-                ::com::sun::star::rendering::XCanvasFont > createFont( double&                         o_rFontRotation,
-                                                                       const vcl::Font&              rFont,
-                                                                       const ActionFactoryParameters&  rParms );
+            static css::uno::Reference<
+                css::rendering::XCanvasFont > createFont( double&                         o_rFontRotation,
+                                                            const vcl::Font&              rFont,
+                                                            const ActionFactoryParameters&  rParms );
             bool createActions( GDIMetaFile&                    rMtf,
                                 const ActionFactoryParameters&  rParms,
                                 bool                            bSubsettableActions );
@@ -287,7 +287,7 @@ static float GetSwapFloat( SvStream& rSt )
             /// @return how much we should shorten the original polygon.
             double EMFPPlusDrawLineCap(const ::basegfx::B2DPolygon& rPolygon, double fPolyLength,
                     const ::basegfx::B2DPolyPolygon& rLineCap, bool isFilled, bool bStart,
-                    const com::sun::star::rendering::StrokeAttributes& rAttributes,
+                    const css::rendering::StrokeAttributes& rAttributes,
                     const ActionFactoryParameters& rParms, OutDevState& rState);
 
             void EMFPPlusDrawPolygon (const ::basegfx::B2DPolyPolygon& polygon, const ActionFactoryParameters& rParms, OutDevState& rState, const CanvasSharedPtr& rCanvas, sal_uInt32 penIndex);
diff --git a/cppcanvas/source/inc/outdevstate.hxx b/cppcanvas/source/inc/outdevstate.hxx
index 339688a5aca2..e343570a72f2 100644
--- a/cppcanvas/source/inc/outdevstate.hxx
+++ b/cppcanvas/source/inc/outdevstate.hxx
@@ -59,7 +59,7 @@ namespace cppcanvas
 
                 textEmphasisMarkStyle(EMPHASISMARK_NONE),
                 pushFlags(PushFlags::ALL),
-                textDirection(::com::sun::star::rendering::TextDirection::WEAK_LEFT_TO_RIGHT),
+                textDirection(css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT),
                 textAlignment(0), // TODO(Q2): Synchronize with implrenderer
                                   // and possibly new rendering::TextAlignment
                 textReliefStyle(RELIEF_NONE),
@@ -79,44 +79,44 @@ namespace cppcanvas
             {
             }
 
-            ::basegfx::B2DPolyPolygon                                                           clip;
-            ::Rectangle                                                                         clipRect;
-            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >     xClipPoly;
+            ::basegfx::B2DPolyPolygon                                                clip;
+            ::Rectangle                                                              clipRect;
+            css::uno::Reference< css::rendering::XPolyPolygon2D >                xClipPoly;
 
-            ::com::sun::star::uno::Sequence< double >                                           lineColor;
-            ::com::sun::star::uno::Sequence< double >                                           fillColor;
-            ::com::sun::star::uno::Sequence< double >                                           textColor;
-            ::com::sun::star::uno::Sequence< double >                                           textFillColor;
-            ::com::sun::star::uno::Sequence< double >                                           textLineColor;
+            css::uno::Sequence< double >                                           lineColor;
+            css::uno::Sequence< double >                                           fillColor;
+            css::uno::Sequence< double >                                           textColor;
+            css::uno::Sequence< double >                                           textFillColor;
+            css::uno::Sequence< double >                                           textLineColor;
 
             /** Current font.
 
                 @attention Beware, this member can be NULL, and
                 nevertheless text output is generated.
              */
-            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont >        xFont;
-            ::basegfx::B2DHomMatrix                                                             transform;
-            ::basegfx::B2DHomMatrix                                                             mapModeTransform;
-            double                                                                              fontRotation;
-
-            sal_uInt16                                                                          textEmphasisMarkStyle;
-            PushFlags                                                                           pushFlags;
-            sal_Int8                                                                            textDirection;
-            sal_Int8                                                                            textAlignment;
-            sal_Int8                                                                            textReliefStyle;
-            sal_Int8                                                                            textOverlineStyle;
-            sal_Int8                                                                            textUnderlineStyle;
-            sal_Int8                                                                            textStrikeoutStyle;
-            TextAlign                                                                           textReferencePoint;
-
-            bool                                                                                isTextOutlineModeSet;
-            bool                                                                                isTextEffectShadowSet;
-            bool                                                                                isTextWordUnderlineSet;
-
-            bool                                                                                isLineColorSet;
-            bool                                                                                isFillColorSet;
-            bool                                                                                isTextFillColorSet;
-            bool                                                                                isTextLineColorSet;
+            css::uno::Reference< css::rendering::XCanvasFont >                   xFont;
+            ::basegfx::B2DHomMatrix                                                  transform;
+            ::basegfx::B2DHomMatrix                                                  mapModeTransform;
+            double                                                                   fontRotation;
+
+            sal_uInt16                                                               textEmphasisMarkStyle;
+            PushFlags                                                                pushFlags;
+            sal_Int8                                                                 textDirection;
+            sal_Int8                                                                 textAlignment;
+            sal_Int8                                                                 textReliefStyle;
+            sal_Int8                                                                 textOverlineStyle;
+            sal_Int8                                                                 textUnderlineStyle;
+            sal_Int8                                                                 textStrikeoutStyle;
+            TextAlign                                                                textReferencePoint;
+
+            bool                                                                     isTextOutlineModeSet;
+            bool                                                                     isTextEffectShadowSet;
+            bool                                                                     isTextWordUnderlineSet;
+
+            bool                                                                     isLineColorSet;
+            bool                                                                     isFillColorSet;
+            bool                                                                     isTextFillColorSet;
+            bool                                                                     isTextLineColorSet;
         };
     }
 }
diff --git a/cppcanvas/source/inc/tools.hxx b/cppcanvas/source/inc/tools.hxx
index b55f2c8582c1..079f952d4b01 100644
--- a/cppcanvas/source/inc/tools.hxx
+++ b/cppcanvas/source/inc/tools.hxx
@@ -34,14 +34,12 @@ namespace cppcanvas
 {
     namespace tools
     {
-        ::com::sun::star::uno::Sequence< double >
-            intSRGBAToDoubleSequence( const ::com::sun::star::uno::Reference<
-                                              ::com::sun::star::rendering::XGraphicDevice >&,
+        css::uno::Sequence< double >
+            intSRGBAToDoubleSequence( const css::uno::Reference< css::rendering::XGraphicDevice >&,
                                       Color::IntSRGBA );
 
-        Color::IntSRGBA doubleSequenceToIntSRGBA( const ::com::sun::star::uno::Reference<
-                                                          ::com::sun::star::rendering::XGraphicDevice >&    rDevice,
-                                                  const ::com::sun::star::uno::Sequence< double >&              rColor  );
+        Color::IntSRGBA doubleSequenceToIntSRGBA( const css::uno::Reference< css::rendering::XGraphicDevice >&    rDevice,
+                                                  const css::uno::Sequence< double >&              rColor  );
     }
 }
 
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index 1c5ac18e9475..a182f6e2577a 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
@@ -71,13 +71,11 @@ namespace cppcanvas
             using Action::render;
 
         private:
-            virtual bool renderPrimitive( ::com::sun::star::uno::Reference<
-                                     ::com::sun::star::rendering::XCachedPrimitive >& rCachedPrimitive,
-                                 const ::basegfx::B2DHomMatrix&                       rTransformation ) const = 0;
+            virtual bool renderPrimitive( css::uno::Reference< css::rendering::XCachedPrimitive >& rCachedPrimitive,
+                                          const ::basegfx::B2DHomMatrix& rTransformation ) const = 0;
 
             CanvasSharedPtr                                             mpCanvas;
-            mutable ::com::sun::star::uno::Reference<
-                    ::com::sun::star::rendering::XCachedPrimitive >     mxCachedPrimitive;
+            mutable css::uno::Reference< css::rendering::XCachedPrimitive >     mxCachedPrimitive;
             mutable ::basegfx::B2DHomMatrix                             maLastTransformation;
             const bool                                                  mbOnlyRedrawWithSameTransform;
         };
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 394db50a6d2b..4e0a9d1f8a7e 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -140,19 +140,19 @@ namespace
 
         switch(rLineInfo.GetLineCap())
         {
-            default: /* com::sun::star::drawing::LineCap_BUTT */
+            default: /* css::drawing::LineCap_BUTT */
             {
                 o_rStrokeAttributes.StartCapType = rendering::PathCapType::BUTT;
                 o_rStrokeAttributes.EndCapType   = rendering::PathCapType::BUTT;
                 break;
             }
-            case com::sun::star::drawing::LineCap_ROUND:
+            case css::drawing::LineCap_ROUND:
             {
                 o_rStrokeAttributes.StartCapType = rendering::PathCapType::ROUND;
                 o_rStrokeAttributes.EndCapType   = rendering::PathCapType::ROUND;
                 break;
             }
-            case com::sun::star::drawing::LineCap_SQUARE:
+            case css::drawing::LineCap_SQUARE:
             {
                 o_rStrokeAttributes.StartCapType = rendering::PathCapType::SQUARE;
                 o_rStrokeAttributes.EndCapType   = rendering::PathCapType::SQUARE;
diff --git a/cppcanvas/source/mtfrenderer/mtftools.hxx b/cppcanvas/source/mtfrenderer/mtftools.hxx
index 4c0bbec6f0e5..687ef4298ee7 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.hxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.hxx
@@ -53,7 +53,7 @@ namespace cppcanvas
             sets up the transformation and the clip from the
             OutDevState.
          */
-        void initRenderState( ::com::sun::star::rendering::RenderState& renderState,
+        void initRenderState( css::rendering::RenderState& renderState,
                               const ::cppcanvas::internal::OutDevState&         outdevState );
 
         /** Calc output offset relative to baseline
@@ -130,7 +130,7 @@ namespace cppcanvas
 
             @return true, if the clip has changed, false if not
          */
-        bool modifyClip( ::com::sun::star::rendering::RenderState&          o_rRenderState,
+        bool modifyClip( css::rendering::RenderState&                     o_rRenderState,
                          const struct ::cppcanvas::internal::OutDevState&   rOutdevState,
                          const CanvasSharedPtr&                             rCanvas,
                          const ::basegfx::B2DPoint&                         rOffset,
@@ -170,9 +170,9 @@ namespace cppcanvas
 
         /** Transform given bounds to device coordinate system.
          */
-        ::basegfx::B2DRange calcDevicePixelBounds( const ::basegfx::B2DRange&                       rBounds,
-                                                   const ::com::sun::star::rendering::ViewState&    viewState,
-                                                   const ::com::sun::star::rendering::RenderState&  renderState );
+        ::basegfx::B2DRange calcDevicePixelBounds( const ::basegfx::B2DRange&            rBounds,
+                                                   const css::rendering::ViewState&    viewState,
+                                                   const css::rendering::RenderState&  renderState );
 
         /** Generate text underline/strikeout info struct from OutDev
             state.
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx
index b55b72badc89..e76b4ea25af3 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.cxx
@@ -68,7 +68,7 @@ namespace cppcanvas
             private:
                 ::basegfx::B2DPoint                         maPoint;
                 CanvasSharedPtr                             mpCanvas;
-                ::com::sun::star::rendering::RenderState    maState;
+                css::rendering::RenderState               maState;
             };
 
             PointAction::PointAction( const ::basegfx::B2DPoint& rPoint,
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.hxx b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
index 0cc3b64e3932..be27e8af8eb7 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.hxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
@@ -60,7 +60,7 @@ namespace cppcanvas
             ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
                                                          const CanvasSharedPtr&,
                                                          const OutDevState&,
-                                                         const ::com::sun::star::rendering::Texture& );
+                                                         const css::rendering::Texture& );
 
             /// Create line polygon (always stroked, not filled)
             ActionSharedPtr createLinePolyPolyAction( const ::basegfx::B2DPolyPolygon&,
@@ -71,7 +71,7 @@ namespace cppcanvas
             ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
                                                          const CanvasSharedPtr&,
                                                          const OutDevState&,
-                                                         const ::com::sun::star::rendering::StrokeAttributes& );
+                                                         const css::rendering::StrokeAttributes& );
 
             /// For transparent painting of the given polygon (normally, we take the colors always opaque)
             ActionSharedPtr createPolyPolyAction( const ::basegfx::B2DPolyPolygon&,
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.hxx b/cppcanvas/source/uno/uno_mtfrenderer.hxx
index 428e9b37e06d..a026a5095f30 100644
--- a/cppcanvas/source/uno/uno_mtfrenderer.hxx
+++ b/cppcanvas/source/uno/uno_mtfrenderer.hxx
@@ -17,26 +17,26 @@
 #include <cppuhelper/basemutex.hxx>
 #include <vcl/gdimtf.hxx>
 
-typedef cppu::WeakComponentImplHelper<com::sun::star::rendering::XMtfRenderer, com::sun::star::beans::XFastPropertySet> MtfRendererBase;
+typedef cppu::WeakComponentImplHelper<css::rendering::XMtfRenderer, css::beans::XFastPropertySet> MtfRendererBase;
 
 class MtfRenderer : private cppu::BaseMutex, public MtfRendererBase
 {
 public:
-    MtfRenderer (com::sun::star::uno::Sequence<com::sun::star::uno::Any> const& args,
-                 com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&);
+    MtfRenderer (css::uno::Sequence<css::uno::Any> const& args,
+                 css::uno::Reference<css::uno::XComponentContext> const&);
 
     // XMtfRenderer iface
-    void SAL_CALL setMetafile (const ::com::sun::star::uno::Sequence< sal_Int8 >& rMtf) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-    void SAL_CALL draw (double fScaleX, double fScaleY) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    void SAL_CALL setMetafile (const css::uno::Sequence< sal_Int8 >& rMtf) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    void SAL_CALL draw (double fScaleX, double fScaleY) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
     // XFastPropertySet
     // setFastPropertyValue (0, GDIMetaFile*) is used to speedup the rendering
-    virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 /*nHandle*/)  throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ::com::sun::star::uno::Any(); }
-    virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const ::com::sun::star::uno::Any&)  throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+    virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 /*nHandle*/)  throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return css::uno::Any(); }
+    virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const css::uno::Any&)  throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
 private:
     GDIMetaFile* mpMetafile;
-    com::sun::star::uno::Reference<com::sun::star::rendering::XBitmapCanvas> mxCanvas;
+    css::uno::Reference<css::rendering::XBitmapCanvas> mxCanvas;
 };
 
 #endif
diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx
index 939803bbf9f9..f0e1aaee2bed 100644
--- a/cppcanvas/source/wrapper/implbitmap.hxx
+++ b/cppcanvas/source/wrapper/implbitmap.hxx
@@ -41,8 +41,7 @@ namespace cppcanvas
         public:
 
             ImplBitmap( const CanvasSharedPtr& rParentCanvas,
-                        const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::rendering::XBitmap >& rBitmap );
+                        const css::uno::Reference< css::rendering::XBitmap >& rBitmap );
 
             virtual ~ImplBitmap();
 
@@ -53,15 +52,14 @@ namespace cppcanvas
             virtual BitmapCanvasSharedPtr                       getBitmapCanvas() const SAL_OVERRIDE;
 
             // Bitmap implementation
-            virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::rendering::XBitmap >  getUNOBitmap() const SAL_OVERRIDE;
+            virtual css::uno::Reference< css::rendering::XBitmap >  getUNOBitmap() const SAL_OVERRIDE;
 
         private:
             ImplBitmap(const ImplBitmap&) SAL_DELETED_FUNCTION;
             ImplBitmap& operator=( const ImplBitmap& ) SAL_DELETED_FUNCTION;
 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >  mxBitmap;
-            BitmapCanvasSharedPtr                                                                   mpBitmapCanvas;
+            const css::uno::Reference< css::rendering::XBitmap >  mxBitmap;
+            BitmapCanvasSharedPtr                                     mpBitmapCanvas;
          };
     }
 }
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index 8c0be601a62d..32cf790a5d05 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
@@ -38,8 +38,7 @@ namespace cppcanvas
         class ImplBitmapCanvas : public virtual BitmapCanvas, protected virtual ImplCanvas
         {
         public:
-            explicit ImplBitmapCanvas( const ::com::sun::star::uno::Reference<
-                                  ::com::sun::star::rendering::XBitmapCanvas >& rCanvas );
+            explicit ImplBitmapCanvas( const css::uno::Reference< css::rendering::XBitmapCanvas >& rCanvas );
             virtual ~ImplBitmapCanvas();
 
             virtual ::basegfx::B2ISize      getSize() const SAL_OVERRIDE;
@@ -52,8 +51,8 @@ namespace cppcanvas
         private:
             ImplBitmapCanvas& operator=( const ImplBitmapCanvas& ) SAL_DELETED_FUNCTION;
 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas >    mxBitmapCanvas;
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >          mxBitmap;
+            const css::uno::Reference< css::rendering::XBitmapCanvas >    mxBitmapCanvas;
+            const css::uno::Reference< css::rendering::XBitmap >          mxBitmap;
         };
     }
 }
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index 86535fc06ba4..0099f02a3f7e 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -50,8 +50,7 @@ namespace cppcanvas
         class ImplCanvas : public virtual Canvas
         {
         public:
-            explicit ImplCanvas( const ::com::sun::star::uno::Reference<
-                            ::com::sun::star::rendering::XCanvas >& rCanvas );
+            explicit ImplCanvas( const css::uno::Reference< css::rendering::XCanvas >& rCanvas );
             virtual ~ImplCanvas();
 
             virtual void                             setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) SAL_OVERRIDE;
@@ -69,10 +68,10 @@ namespace cppcanvas
 
             virtual void                             clear() const SAL_OVERRIDE;
 
-            virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::rendering::XCanvas >      getUNOCanvas() const SAL_OVERRIDE;
+            virtual css::uno::Reference<
+                css::rendering::XCanvas >          getUNOCanvas() const SAL_OVERRIDE;
 
-            virtual ::com::sun::star::rendering::ViewState  getViewState() const SAL_OVERRIDE;
+            virtual css::rendering::ViewState      getViewState() const SAL_OVERRIDE;
 
             // take compiler-provided default copy constructor
             //ImplCanvas(const ImplCanvas&);
@@ -80,9 +79,9 @@ namespace cppcanvas
         private:
             ImplCanvas& operator=( const ImplCanvas& ) SAL_DELETED_FUNCTION;
 
-            mutable ::com::sun::star::rendering::ViewState                                  maViewState;
-            boost::optional<basegfx::B2DPolyPolygon>                                        maClipPolyPolygon;
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >  mxCanvas;
+            mutable css::rendering::ViewState                       maViewState;
+            boost::optional<basegfx::B2DPolyPolygon>                  maClipPolyPolygon;
+            const css::uno::Reference< css::rendering::XCanvas >  mxCanvas;
         };
 
     }
diff --git a/cppcanvas/source/wrapper/implcolor.hxx b/cppcanvas/source/wrapper/implcolor.hxx
index 4c45844d8d56..883080f29b10 100644
--- a/cppcanvas/source/wrapper/implcolor.hxx
+++ b/cppcanvas/source/wrapper/implcolor.hxx
@@ -37,15 +37,15 @@ namespace cppcanvas
         class ImplColor : public Color
         {
         public:
-            explicit ImplColor( const ::com::sun::star::uno::Reference<
-                               ::com::sun::star::rendering::XGraphicDevice >& rDevice );
+            explicit ImplColor( const css::uno::Reference<
+                               css::rendering::XGraphicDevice >& rDevice );
             virtual ~ImplColor();
 
-            virtual IntSRGBA                                    getIntSRGBA( ::com::sun::star::uno::Sequence< double >& rDeviceColor ) const SAL_OVERRIDE;
-            virtual ::com::sun::star::uno::Sequence< double >   getDeviceColor( IntSRGBA aSRGBA ) const SAL_OVERRIDE;
+            virtual IntSRGBA                                    getIntSRGBA( css::uno::Sequence< double >& rDeviceColor ) const SAL_OVERRIDE;
+            virtual css::uno::Sequence< double >   getDeviceColor( IntSRGBA aSRGBA ) const SAL_OVERRIDE;
 
         private:
-            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice > mxDevice;
+            css::uno::Reference< css::rendering::XGraphicDevice > mxDevice;
         };
 
     }
diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx
index 8720a9f46ca7..a698908ac751 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.hxx
@@ -38,10 +38,10 @@ namespace cppcanvas
         class ImplCustomSprite : public virtual CustomSprite, protected virtual ImplSprite
         {
         public:
-            ImplCustomSprite( const ::com::sun::star::uno::Reference<
-                                      ::com::sun::star::rendering::XSpriteCanvas >&     rParentCanvas,
-                              const ::com::sun::star::uno::Reference<
-                                      ::com::sun::star::rendering::XCustomSprite >&     rSprite,
+            ImplCustomSprite( const css::uno::Reference<
+                                      css::rendering::XSpriteCanvas >&                    rParentCanvas,
+                              const css::uno::Reference<
+                                      css::rendering::XCustomSprite >&                    rSprite,
                               const ImplSpriteCanvas::TransformationArbiterSharedPtr&       rTransformArbiter );
             virtual ~ImplCustomSprite();
 
@@ -51,8 +51,8 @@ namespace cppcanvas
             ImplCustomSprite(const ImplCustomSprite&) SAL_DELETED_FUNCTION;
             ImplCustomSprite& operator=( const ImplCustomSprite& ) SAL_DELETED_FUNCTION;
 
-            mutable CanvasSharedPtr                                                                         mpLastCanvas;
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite >    mxCustomSprite;
+            mutable CanvasSharedPtr                                           mpLastCanvas;
+            const css::uno::Reference< css::rendering::XCustomSprite >    mxCustomSprite;
         };
     }
 }
diff --git a/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx
index 227e7da83f99..89904a5a1b44 100644
--- a/cppcanvas/source/wrapper/implfont.hxx
+++ b/cppcanvas/source/wrapper/implfont.hxx
@@ -44,22 +44,20 @@ namespace cppcanvas
         class ImplFont : public Font
         {
         public:
-            ImplFont( const ::com::sun::star::uno::Reference<
-                          ::com::sun::star::rendering::XCanvas >& rCanvas,
+            ImplFont( const css::uno::Reference< css::rendering::XCanvas >& rCanvas,
                       const OUString& rFontName,
                       const double& rCellSize );
 
             virtual ~ImplFont();
 
             virtual OUString getName() const SAL_OVERRIDE;
-            virtual double          getCellSize() const SAL_OVERRIDE;
+            virtual double   getCellSize() const SAL_OVERRIDE;
 
-            virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::rendering::XCanvasFont > getUNOFont() const SAL_OVERRIDE;
+            virtual css::uno::Reference< css::rendering::XCanvasFont > getUNOFont() const SAL_OVERRIDE;
 
         private:
-            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas >        mxCanvas;
-            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont >    mxFont;
+            css::uno::Reference< css::rendering::XCanvas >        mxCanvas;
+            css::uno::Reference< css::rendering::XCanvasFont >    mxFont;
         };
     }
 }
diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx
index 16cd744a0e8d..9558c4b55001 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.hxx
@@ -43,8 +43,8 @@ namespace cppcanvas
         {
         public:
             ImplPolyPolygon( const CanvasSharedPtr& rParentCanvas,
-                             const ::com::sun::star::uno::Reference<
-                                 ::com::sun::star::rendering::XPolyPolygon2D >& rPolyPoly );
+                             const css::uno::Reference<
+                                 css::rendering::XPolyPolygon2D >& rPolyPoly );
 
             virtual ~ImplPolyPolygon();
 
@@ -61,21 +61,21 @@ namespace cppcanvas
 
             virtual bool            draw() const SAL_OVERRIDE;
 
-            virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const SAL_OVERRIDE;
+            virtual css::uno::Reference<
+                css::rendering::XPolyPolygon2D > getUNOPolyPolygon() const SAL_OVERRIDE;
 
         private:
             ImplPolyPolygon(const ImplPolyPolygon&) SAL_DELETED_FUNCTION;
             ImplPolyPolygon& operator= ( const ImplPolyPolygon& ) SAL_DELETED_FUNCTION;
 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >   mxPolyPoly;
+            const css::uno::Reference< css::rendering::XPolyPolygon2D >   mxPolyPoly;
 
-            ::com::sun::star::rendering::StrokeAttributes                                           maStrokeAttributes;
+            css::rendering::StrokeAttributes                                maStrokeAttributes;
 
-            ::com::sun::star::uno::Sequence< double >                                                       maFillColor;
-            ::com::sun::star::uno::Sequence< double >                                                       maStrokeColor;
-            bool                                                                                            mbFillColorSet;
-            bool                                                                                            mbStrokeColorSet;
+            css::uno::Sequence< double >                                    maFillColor;
+            css::uno::Sequence< double >                                    maStrokeColor;
+            bool                                                              mbFillColorSet;
+            bool                                                              mbStrokeColorSet;
         };
 
     }
diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx
index e7ff8dd5b283..876f4391e35f 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.hxx
@@ -37,10 +37,10 @@ namespace cppcanvas
         class ImplSprite : public virtual Sprite
         {
         public:
-            ImplSprite( const ::com::sun::star::uno::Reference<
-                                  ::com::sun::star::rendering::XSpriteCanvas >&     rParentCanvas,
-                        const ::com::sun::star::uno::Reference<
-                                  ::com::sun::star::rendering::XSprite >&       rSprite,
+            ImplSprite( const css::uno::Reference<
+                                  css::rendering::XSpriteCanvas >&                    rParentCanvas,
+                        const css::uno::Reference<
+                                  css::rendering::XSprite >&                          rSprite,
                         const ImplSpriteCanvas::TransformationArbiterSharedPtr&         rTransformArbiter );
             virtual ~ImplSprite();
 
@@ -57,17 +57,17 @@ namespace cppcanvas
 
             virtual void setPriority( double fPriority ) SAL_OVERRIDE;
 
-            virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::rendering::XSprite >  getUNOSprite() const SAL_OVERRIDE;
+            virtual css::uno::Reference<
+                css::rendering::XSprite >  getUNOSprite() const SAL_OVERRIDE;
 
         private:
             ImplSprite(const ImplSprite&) SAL_DELETED_FUNCTION;
             ImplSprite& operator=( const ImplSprite& ) SAL_DELETED_FUNCTION;
 
-            ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >         mxGraphicDevice;
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >          mxSprite;
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite >  mxAnimatedSprite;
-            ImplSpriteCanvas::TransformationArbiterSharedPtr                                        mpTransformArbiter;
+            css::uno::Reference< css::rendering::XGraphicDevice >         mxGraphicDevice;
+            const css::uno::Reference< css::rendering::XSprite >          mxSprite;
+            const css::uno::Reference< css::rendering::XAnimatedSprite >  mxAnimatedSprite;
+            ImplSpriteCanvas::TransformationArbiterSharedPtr                  mpTransformArbiter;
         };
     }
 }
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx
index 76652d323ceb..69f63dfb6dca 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.hxx
@@ -39,8 +39,8 @@ namespace cppcanvas
         class ImplSpriteCanvas : public virtual SpriteCanvas, protected virtual ImplCanvas
         {
         public:
-            ImplSpriteCanvas( const ::com::sun::star::uno::Reference<
-                                  ::com::sun::star::rendering::XSpriteCanvas >& rCanvas );
+            ImplSpriteCanvas( const css::uno::Reference<
+                                  css::rendering::XSpriteCanvas >& rCanvas );
             ImplSpriteCanvas(const ImplSpriteCanvas&);
 
             virtual ~ImplSpriteCanvas();
@@ -54,8 +54,8 @@ namespace cppcanvas
 
             virtual CanvasSharedPtr         clone() const SAL_OVERRIDE;
 
-            virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::rendering::XSpriteCanvas >    getUNOSpriteCanvas() const SAL_OVERRIDE;
+            virtual css::uno::Reference<
+                css::rendering::XSpriteCanvas >    getUNOSpriteCanvas() const SAL_OVERRIDE;
 
             /** This class passes the view transformation
                 to child sprites
@@ -82,8 +82,8 @@ namespace cppcanvas
         private:
             ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ) SAL_DELETED_FUNCTION;
 
-            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas >    mxSpriteCanvas;
-            TransformationArbiterSharedPtr                                                          mpTransformArbiter;
+            const css::uno::Reference< css::rendering::XSpriteCanvas >    mxSpriteCanvas;
+            TransformationArbiterSharedPtr                                    mpTransformArbiter;
         };
     }
 }