[Libreoffice-commits] core.git: include/cppcanvas

[Noel Grandin]

 include/cppcanvas/bitmap.hxx       |    3 +--
 include/cppcanvas/canvas.hxx       |    6 +++---
 include/cppcanvas/color.hxx        |    2 +-
 include/cppcanvas/polypolygon.hxx  |    4 ++--
 include/cppcanvas/sprite.hxx       |    4 ++--
 include/cppcanvas/spritecanvas.hxx |    4 ++--
 include/cppcanvas/vclfactory.hxx   |    9 +++------
 7 files changed, 14 insertions(+), 18 deletions(-)

New commits:
commit ab4c54662ed0abd8603a35b3c8173adf0be87b3d
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Oct 20 10:34:21 2015 +0200

    com::sun::star->css in include/cppcanvas
    
    Change-Id: Iffaf661fe915c9b0e3500ae3923fd8300583c512
    Reviewed-on: https://gerrit.libreoffice.org/19484
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/include/cppcanvas/bitmap.hxx b/include/cppcanvas/bitmap.hxx
index eed0607..1e257d4 100644
--- a/include/cppcanvas/bitmap.hxx
+++ b/include/cppcanvas/bitmap.hxx
@@ -61,8 +61,7 @@ namespace cppcanvas
 
         virtual BitmapCanvasSharedPtr       getBitmapCanvas() const = 0;
 
-        virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::rendering::XBitmap >  getUNOBitmap() const = 0;
+        virtual css::uno::Reference< css::rendering::XBitmap >  getUNOBitmap() const = 0;
     };
 
     typedef std::shared_ptr< ::cppcanvas::Bitmap > BitmapSharedPtr;
diff --git a/include/cppcanvas/canvas.hxx b/include/cppcanvas/canvas.hxx
index caba56d..b7d39ca 100644
--- a/include/cppcanvas/canvas.hxx
+++ b/include/cppcanvas/canvas.hxx
@@ -90,9 +90,9 @@ namespace cppcanvas
 
         // this should be considered private. if RTTI gets enabled
         // someday, remove that to a separate interface
-        virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::rendering::XCanvas >          getUNOCanvas() const = 0;
-        virtual ::com::sun::star::rendering::ViewState      getViewState() const = 0;
+        virtual css::uno::Reference<
+            css::rendering::XCanvas >           getUNOCanvas() const = 0;
+        virtual css::rendering::ViewState       getViewState() const = 0;
     };
 
 }
diff --git a/include/cppcanvas/color.hxx b/include/cppcanvas/color.hxx
index e2162030..1fe3106 100644
--- a/include/cppcanvas/color.hxx
+++ b/include/cppcanvas/color.hxx
@@ -39,7 +39,7 @@ namespace cppcanvas
 
         virtual ~Color() {}
 
-        virtual ::com::sun::star::uno::Sequence< double >   getDeviceColor( IntSRGBA aSRGBA ) const = 0;
+        virtual css::uno::Sequence< double >   getDeviceColor( IntSRGBA aSRGBA ) const = 0;
     };
 
     typedef std::shared_ptr< ::cppcanvas::Color > ColorSharedPtr;
diff --git a/include/cppcanvas/polypolygon.hxx b/include/cppcanvas/polypolygon.hxx
index e902a1f..04fae83 100644
--- a/include/cppcanvas/polypolygon.hxx
+++ b/include/cppcanvas/polypolygon.hxx
@@ -69,8 +69,8 @@ namespace cppcanvas
         virtual void                        setStrokeWidth( const double& rStrokeWidth ) = 0;
         virtual double                      getStrokeWidth() const = 0;
 
-        virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const = 0;
+        virtual css::uno::Reference<
+            css::rendering::XPolyPolygon2D > getUNOPolyPolygon() const = 0;
     };
 
     typedef std::shared_ptr< ::cppcanvas::PolyPolygon > PolyPolygonSharedPtr;
diff --git a/include/cppcanvas/sprite.hxx b/include/cppcanvas/sprite.hxx
index 867d13e..e5d4bd8 100644
--- a/include/cppcanvas/sprite.hxx
+++ b/include/cppcanvas/sprite.hxx
@@ -97,8 +97,8 @@ namespace cppcanvas
          */
         virtual void setPriority( double fPriority ) = 0;
 
-        virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::rendering::XSprite > getUNOSprite() const = 0;
+        virtual css::uno::Reference<
+            css::rendering::XSprite > getUNOSprite() const = 0;
     };
 
     typedef std::shared_ptr< ::cppcanvas::Sprite > SpriteSharedPtr;
diff --git a/include/cppcanvas/spritecanvas.hxx b/include/cppcanvas/spritecanvas.hxx
index c4152fb..1c312bf 100644
--- a/include/cppcanvas/spritecanvas.hxx
+++ b/include/cppcanvas/spritecanvas.hxx
@@ -53,8 +53,8 @@ namespace cppcanvas
 
         virtual CustomSpriteSharedPtr   createCustomSprite( const ::basegfx::B2DSize& ) const = 0;
 
-        virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::rendering::XSpriteCanvas >    getUNOSpriteCanvas() const = 0;
+        virtual css::uno::Reference<
+            css::rendering::XSpriteCanvas >    getUNOSpriteCanvas() const = 0;
     };
 
 }
diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx
index a3c5f63..96d33fd 100644
--- a/include/cppcanvas/vclfactory.hxx
+++ b/include/cppcanvas/vclfactory.hxx
@@ -64,14 +64,11 @@ namespace cppcanvas
     class CPPCANVAS_DLLPUBLIC VCLFactory
     {
     public:
-        static CanvasSharedPtr   createCanvas( const ::com::sun::star::uno::Reference<
-                                                          ::com::sun::star::rendering::XCanvas >& xCanvas );
-        static BitmapCanvasSharedPtr   createBitmapCanvas( const ::com::sun::star::uno::Reference<
-                                                          ::com::sun::star::rendering::XBitmapCanvas >& xCanvas );
+        static CanvasSharedPtr   createCanvas( const css::uno::Reference< css::rendering::XCanvas >& xCanvas );
+        static BitmapCanvasSharedPtr   createBitmapCanvas( const css::uno::Reference< css::rendering::XBitmapCanvas >& xCanvas );
 
         static SpriteCanvasSharedPtr   createSpriteCanvas( const vcl::Window& rVCLWindow );
-        static SpriteCanvasSharedPtr   createSpriteCanvas( const ::com::sun::star::uno::Reference<
-                                                               ::com::sun::star::rendering::XSpriteCanvas >& xCanvas );
+        static SpriteCanvasSharedPtr   createSpriteCanvas( const css::uno::Reference< css::rendering::XSpriteCanvas >& xCanvas );
 
         /** Create a bitmap from a VCL Bitmap
          */