tdf#96099 Remove various smart pointer typedefs in canvas

Change-Id: Ied6ec5f7830c53a339de985d173c1dec711ac8f7
Reviewed-on: https://gerrit.libreoffice.org/26092
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

6 files changed, 16 insertions, 27 deletions

diff --git a/include/canvas/rendering/bitmap.hxx b/include/canvas/rendering/bitmap.hxx
index 09e2073cdc54..3a878ce64da9 100755
--- a/include/canvas/rendering/bitmap.hxx
+++ b/include/canvas/rendering/bitmap.hxx
@@ -67,7 +67,7 @@ namespace canvas
             false otherwise
          */
         Bitmap( const ::basegfx::B2IVector&          rSize,
-                const ISurfaceProxyManagerSharedPtr& rMgr,
+                const std::shared_ptr<ISurfaceProxyManager>& rMgr,
                 bool                                 bWithAlpha );
         ~Bitmap();
 
@@ -185,14 +185,14 @@ namespace canvas
                          const css::rendering::ViewState&          viewState,
                          const css::rendering::RenderState&        renderState );
         /// See XCanvas interface
-        ICachedPrimitiveSharedPtr drawPolyPolygon(
+        std::shared_ptr<ICachedPrimitive> drawPolyPolygon(
             const css::uno::Reference<
                   css::rendering::XPolyPolygon2D >&    xPolyPolygon,
             const css::rendering::ViewState&           viewState,
             const css::rendering::RenderState&         renderState );
 
         /// See XCanvas interface
-        ICachedPrimitiveSharedPtr strokePolyPolygon(
+        std::shared_ptr<ICachedPrimitive> strokePolyPolygon(
             const css::uno::Reference<
                   css::rendering::XPolyPolygon2D >&    xPolyPolygon,
             const css::rendering::ViewState&           viewState,
@@ -206,7 +206,7 @@ namespace canvas
             sequence. This is to decouple this interface from the
             client's XBitmap-implementation class.
          */
-        ICachedPrimitiveSharedPtr strokeTexturedPolyPolygon(
+        std::shared_ptr<ICachedPrimitive> strokeTexturedPolyPolygon(
             const css::uno::Reference< css::rendering::XPolyPolygon2D >&    xPolyPolygon,
             const css::rendering::ViewState&                                viewState,
             const css::rendering::RenderState&                              renderState,
@@ -221,7 +221,7 @@ namespace canvas
             sequence. This is to decouple this interface from the
             client's XBitmap-implementation class.
          */
-        ICachedPrimitiveSharedPtr strokeTextureMappedPolyPolygon(
+        std::shared_ptr<ICachedPrimitive> strokeTextureMappedPolyPolygon(
             const css::uno::Reference< css::rendering::XPolyPolygon2D >&    xPolyPolygon,
             const css::rendering::ViewState&                                viewState,
             const css::rendering::RenderState&                              renderState,
@@ -230,7 +230,7 @@ namespace canvas
             const css::uno::Reference< css::geometry::XMapping2D >&         xMapping,
             const css::rendering::StrokeAttributes&                         strokeAttributes );
         /// See XCanvas interface
-        ICachedPrimitiveSharedPtr fillPolyPolygon(
+        std::shared_ptr<ICachedPrimitive> fillPolyPolygon(
             const css::uno::Reference< css::rendering::XPolyPolygon2D >&    xPolyPolygon,
             const css::rendering::ViewState&                                viewState,
             const css::rendering::RenderState&                              renderState );
@@ -242,7 +242,7 @@ namespace canvas
             sequence. This is to decouple this interface from the
             client's XBitmap-implementation class.
          */
-        ICachedPrimitiveSharedPtr fillTexturedPolyPolygon(
+        std::shared_ptr<ICachedPrimitive> fillTexturedPolyPolygon(
             const css::uno::Reference< css::rendering::XPolyPolygon2D >&    xPolyPolygon,
             const css::rendering::ViewState&                                viewState,
             const css::rendering::RenderState&                              renderState,
@@ -256,7 +256,7 @@ namespace canvas
             sequence. This is to decouple this interface from the
             client's XBitmap-implementation class.
          */
-        ICachedPrimitiveSharedPtr fillTextureMappedPolyPolygon(
+        std::shared_ptr<ICachedPrimitive> fillTextureMappedPolyPolygon(
             const css::uno::Reference< css::rendering::XPolyPolygon2D >&    xPolyPolygon,
             const css::rendering::ViewState&                                viewState,
             const css::rendering::RenderState&                              renderState,
@@ -265,25 +265,25 @@ namespace canvas
             const css::uno::Reference< css::geometry::XMapping2D >&         xMapping );
 
         /// See XCanvas interface
-        ICachedPrimitiveSharedPtr drawBitmap(
+        std::shared_ptr<ICachedPrimitive> drawBitmap(
             const css::uno::Reference<
                   css::rendering::XBitmap >&   xBitmap,
             const css::rendering::ViewState&   viewState,
             const css::rendering::RenderState& renderState );
         /// See XCanvas interface
-        ICachedPrimitiveSharedPtr drawBitmap(
+        std::shared_ptr<ICachedPrimitive> drawBitmap(
             const std::shared_ptr<Bitmap>&     rImage,
             const css::rendering::ViewState&   viewState,
             const css::rendering::RenderState& renderState );
 
         /// See XCanvas interface
-        ICachedPrimitiveSharedPtr drawBitmapModulated(
+        std::shared_ptr<ICachedPrimitive> drawBitmapModulated(
             const css::uno::Reference<
                   css::rendering::XBitmap >&       xBitmap,
             const css::rendering::ViewState&       viewState,
             const css::rendering::RenderState&     renderState );
         /// See XCanvas interface
-        ICachedPrimitiveSharedPtr drawBitmapModulated(
+        std::shared_ptr<ICachedPrimitive> drawBitmapModulated(
             const std::shared_ptr<Bitmap>&         rImage,
             const css::rendering::ViewState&       viewState,
             const css::rendering::RenderState&     renderState );
diff --git a/include/canvas/rendering/icachedprimitive.hxx b/include/canvas/rendering/icachedprimitive.hxx
index 2516a7cfee61..2fd279476d3d 100644
--- a/include/canvas/rendering/icachedprimitive.hxx
+++ b/include/canvas/rendering/icachedprimitive.hxx
@@ -51,8 +51,6 @@ namespace canvas
          */
         virtual sal_Int8 redraw( const css::rendering::ViewState& aState ) const = 0;
     };
-
-    typedef std::shared_ptr< ICachedPrimitive > ICachedPrimitiveSharedPtr;
 }
 
 #endif // INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX
diff --git a/include/canvas/rendering/icolorbuffer.hxx b/include/canvas/rendering/icolorbuffer.hxx
index b85ca18a72c8..3a877ad49317 100644
--- a/include/canvas/rendering/icolorbuffer.hxx
+++ b/include/canvas/rendering/icolorbuffer.hxx
@@ -71,8 +71,6 @@ namespace canvas
          */
         virtual Format getFormat() const = 0;
     };
-
-    typedef std::shared_ptr< IColorBuffer > IColorBufferSharedPtr;
 }
 
 #endif // INCLUDED_CANVAS_RENDERING_ICOLORBUFFER_HXX
diff --git a/include/canvas/rendering/irendermodule.hxx b/include/canvas/rendering/irendermodule.hxx
index 01dc94413161..21d03d35d8c7 100644
--- a/include/canvas/rendering/irendermodule.hxx
+++ b/include/canvas/rendering/irendermodule.hxx
@@ -113,13 +113,11 @@ namespace canvas
         virtual bool      isError() = 0;
     };
 
-    typedef std::shared_ptr< IRenderModule > IRenderModuleSharedPtr;
-
     /// Little RAII wrapper for guarding access to IRenderModule interface
     class RenderModuleGuard
     {
     public:
-        explicit RenderModuleGuard( const IRenderModuleSharedPtr& rRenderModule ) :
+        explicit RenderModuleGuard( const std::shared_ptr<IRenderModule>& rRenderModule ) :
             mpRenderModule( rRenderModule )
         {
             mpRenderModule->lock();
@@ -133,7 +131,7 @@ namespace canvas
         RenderModuleGuard(const RenderModuleGuard&) = delete;
         RenderModuleGuard& operator=( const RenderModuleGuard& ) = delete;
     private:
-        const IRenderModuleSharedPtr mpRenderModule;
+        const std::shared_ptr<IRenderModule> mpRenderModule;
     };
 }
 
diff --git a/include/canvas/rendering/isurface.hxx b/include/canvas/rendering/isurface.hxx
index 3f266f94e7b1..68477bc9bee9 100644
--- a/include/canvas/rendering/isurface.hxx
+++ b/include/canvas/rendering/isurface.hxx
@@ -69,8 +69,6 @@ namespace canvas
                              const ::basegfx::B2IRange& rSourceRect,
                              IColorBuffer&              rSource ) = 0;
     };
-
-    typedef std::shared_ptr< ISurface > ISurfaceSharedPtr;
 }
 
 #endif // INCLUDED_CANVAS_RENDERING_ISURFACE_HXX
diff --git a/include/canvas/rendering/isurfaceproxymanager.hxx b/include/canvas/rendering/isurfaceproxymanager.hxx
index c2ba559d4c48..9cd9bcaf9c1b 100644
--- a/include/canvas/rendering/isurfaceproxymanager.hxx
+++ b/include/canvas/rendering/isurfaceproxymanager.hxx
@@ -56,15 +56,12 @@ namespace canvas
             real hardware surfaces.
         */
         virtual std::shared_ptr< ISurfaceProxy > createSurfaceProxy(
-            const IColorBufferSharedPtr& pBuffer ) const = 0;
+            const std::shared_ptr<IColorBuffer>& pBuffer ) const = 0;
     };
 
-    typedef std::shared_ptr< ISurfaceProxyManager > ISurfaceProxyManagerSharedPtr;
-
-
     /** Create a surface proxy for the given render module.
      */
-    CANVASTOOLS_DLLPUBLIC ISurfaceProxyManagerSharedPtr createSurfaceProxyManager( const IRenderModuleSharedPtr& rRenderModule );
+    CANVASTOOLS_DLLPUBLIC std::shared_ptr<ISurfaceProxyManager> createSurfaceProxyManager( const std::shared_ptr<IRenderModule>& rRenderModule );
 }
 
 #endif // INCLUDED_CANVAS_RENDERING_ISURFACEPROXYMANAGER_HXX