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>

8 files changed, 17 insertions, 17 deletions

diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 6beb18312a8c..6e7ba8c22cf4 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -184,7 +184,7 @@ namespace dxcanvas
 
             virtual void resize( const ::basegfx::B2IRange& rect );
             virtual ::basegfx::B2IVector getPageSize();
-            virtual ::canvas::ISurfaceSharedPtr createSurface( const ::basegfx::B2IVector& surfaceSize );
+            virtual ::std::shared_ptr<canvas::ISurface> createSurface( const ::basegfx::B2IVector& surfaceSize );
             virtual void beginPrimitive( PrimitiveType eType );
             virtual void endPrimitive();
             virtual void pushVertex( const ::canvas::Vertex& vertex );
@@ -213,7 +213,7 @@ namespace dxcanvas
             COMReference<IDirect3D9>                    mpDirect3D9;
             COMReference<IDirect3DSwapChain9>           mpSwapChain;
             COMReference<IDirect3DVertexBuffer9>        mpVertexBuffer;
-            ::canvas::ISurfaceSharedPtr                 mpTexture;
+            ::std::shared_ptr<canvas::ISurface>                 mpTexture;
             VclPtr<SystemChildWindow>                   mpWindow;
             ::basegfx::B2IVector                        maSize;
             typedef std::vector<canvas::Vertex>         vertexCache_t;
@@ -521,7 +521,7 @@ namespace dxcanvas
             ::basegfx::B2IVector aPageSize(maPageSize);
             while(true)
             {
-                mpTexture = ::canvas::ISurfaceSharedPtr(
+                mpTexture = ::std::shared_ptr<canvas::ISurface>(
                     new DXSurface(*this,aPageSize));
                 if(mpTexture->isValid())
                     break;
@@ -984,13 +984,13 @@ namespace dxcanvas
         // DXRenderModule::createSurface
 
 
-        ::canvas::ISurfaceSharedPtr DXRenderModule::createSurface( const ::basegfx::B2IVector& surfaceSize )
+        ::std::shared_ptr<canvas::ISurface> DXRenderModule::createSurface( const ::basegfx::B2IVector& surfaceSize )
         {
             // TODO(P2): get rid of those fine-grained locking
             ::osl::MutexGuard aGuard( maMutex );
 
             if(isDisposed())
-                return ::canvas::ISurfaceSharedPtr();
+                return ::std::shared_ptr<canvas::ISurface>();
 
             const ::basegfx::B2IVector& rPageSize( getPageSize() );
             ::basegfx::B2ISize aSize(surfaceSize);
@@ -1002,7 +1002,7 @@ namespace dxcanvas
             if(mpTexture.use_count() == 1)
                 return mpTexture;
 
-            return ::canvas::ISurfaceSharedPtr( new DXSurface(*this,aSize) );
+            return ::std::shared_ptr<canvas::ISurface>( new DXSurface(*this,aSize) );
         }
 
 
diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx
index e56237a7ac98..026a6634a606 100644
--- a/canvas/source/directx/dx_canvascustomsprite.cxx
+++ b/canvas/source/directx/dx_canvascustomsprite.cxx
@@ -40,7 +40,7 @@ namespace dxcanvas
     CanvasCustomSprite::CanvasCustomSprite( const css::geometry::RealSize2D&   rSpriteSize,
                                             const SpriteCanvasRef&                          rRefDevice,
                                             const IDXRenderModuleSharedPtr&                 rRenderModule,
-                                            const ::canvas::ISurfaceProxyManagerSharedPtr&  rSurfaceProxy,
+                                            const ::std::shared_ptr<canvas::ISurfaceProxyManager>&  rSurfaceProxy,
                                             bool                                            bShowSpriteBounds ) :
         mpSpriteCanvas( rRefDevice ),
         mpSurface()
diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx
index 06e4b98fee98..c53c84616788 100644
--- a/canvas/source/directx/dx_canvascustomsprite.hxx
+++ b/canvas/source/directx/dx_canvascustomsprite.hxx
@@ -99,7 +99,7 @@ namespace dxcanvas
         CanvasCustomSprite( const css::geometry::RealSize2D&   rSpriteSize,
                             const SpriteCanvasRef&                          rRefDevice,
                             const IDXRenderModuleSharedPtr&                 rRenderModule,
-                            const ::canvas::ISurfaceProxyManagerSharedPtr&  rSurfaceProxy,
+                            const ::std::shared_ptr<canvas::ISurfaceProxyManager>&  rSurfaceProxy,
                             bool                                            bShowSpriteBounds );
 
         virtual void disposeThis() override;
diff --git a/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx
index 3803671f034b..a36f3aac8643 100644
--- a/canvas/source/directx/dx_spritecanvashelper.cxx
+++ b/canvas/source/directx/dx_spritecanvashelper.cxx
@@ -79,7 +79,7 @@ namespace dxcanvas
     void SpriteCanvasHelper::init( SpriteCanvas&                                    rParent,
                                    ::canvas::SpriteRedrawManager&                   rManager,
                                    const IDXRenderModuleSharedPtr&                  rRenderModule,
-                                   const ::canvas::ISurfaceProxyManagerSharedPtr&   rSurfaceProxy,
+                                   const ::std::shared_ptr<canvas::ISurfaceProxyManager>&   rSurfaceProxy,
                                    const DXSurfaceBitmapSharedPtr&                  rBackBuffer,
                                    const ::basegfx::B2ISize&                        rOutputOffset )
     {
diff --git a/canvas/source/directx/dx_spritecanvashelper.hxx b/canvas/source/directx/dx_spritecanvashelper.hxx
index 1b7314202316..d3f48ab0cfa9 100644
--- a/canvas/source/directx/dx_spritecanvashelper.hxx
+++ b/canvas/source/directx/dx_spritecanvashelper.hxx
@@ -46,7 +46,7 @@ namespace dxcanvas
         void init( SpriteCanvas&                                    rParent,
                    ::canvas::SpriteRedrawManager&                   rManager,
                    const IDXRenderModuleSharedPtr&                  rRenderModule,
-                   const ::canvas::ISurfaceProxyManagerSharedPtr&   rSurfaceProxy,
+                   const ::std::shared_ptr<canvas::ISurfaceProxyManager>&   rSurfaceProxy,
                    const DXSurfaceBitmapSharedPtr&                  rBackBuffer,
                    const ::basegfx::B2ISize&                        rOutputOffset );
 
@@ -134,7 +134,7 @@ namespace dxcanvas
         /// DX device, handling all low-level rendering
         IDXRenderModuleSharedPtr                        mpRenderModule;
 
-        ::canvas::ISurfaceProxyManagerSharedPtr         mpSurfaceProxy;
+        ::std::shared_ptr<canvas::ISurfaceProxyManager>         mpSurfaceProxy;
 
         /// Backbuffer, contains the static canvas render output
         DXSurfaceBitmapSharedPtr                        mpBackBuffer;
diff --git a/canvas/source/directx/dx_spritedevicehelper.hxx b/canvas/source/directx/dx_spritedevicehelper.hxx
index 5716e5c788ae..6f3608e62f1d 100644
--- a/canvas/source/directx/dx_spritedevicehelper.hxx
+++ b/canvas/source/directx/dx_spritedevicehelper.hxx
@@ -68,7 +68,7 @@ namespace dxcanvas
 
         const IDXRenderModuleSharedPtr& getRenderModule() const { return mpRenderModule; }
         const DXSurfaceBitmapSharedPtr& getBackBuffer() const { return mpBackBuffer; }
-        const ::canvas::ISurfaceProxyManagerSharedPtr &getSurfaceProxy() const { return mpSurfaceProxyManager; }
+        const ::std::shared_ptr<canvas::ISurfaceProxyManager> &getSurfaceProxy() const { return mpSurfaceProxyManager; }
 
         css::uno::Any isAccelerated() const;
 
@@ -89,7 +89,7 @@ namespace dxcanvas
         DXSurfaceBitmapSharedPtr                mpBackBuffer;
 
         /// Instance passing out HW textures
-        ::canvas::ISurfaceProxyManagerSharedPtr mpSurfaceProxyManager;
+        ::std::shared_ptr<canvas::ISurfaceProxyManager> mpSurfaceProxyManager;
 
         /// Our encapsulation interface to DirectX
         IDXRenderModuleSharedPtr                mpRenderModule;
diff --git a/canvas/source/directx/dx_surfacebitmap.cxx b/canvas/source/directx/dx_surfacebitmap.cxx
index fac6d9e0d68b..df2962f531d3 100644
--- a/canvas/source/directx/dx_surfacebitmap.cxx
+++ b/canvas/source/directx/dx_surfacebitmap.cxx
@@ -183,7 +183,7 @@ namespace dxcanvas
 
 
     DXSurfaceBitmap::DXSurfaceBitmap( const ::basegfx::B2IVector&                   rSize,
-                                      const canvas::ISurfaceProxyManagerSharedPtr&  rMgr,
+                                      const std::shared_ptr<canvas::ISurfaceProxyManager>&  rMgr,
                                       const IDXRenderModuleSharedPtr&               rRenderModule,
                                       bool                                          bWithAlpha ) :
         mpGdiPlusUser( GDIPlusUser::createInstance() ),
diff --git a/canvas/source/directx/dx_surfacebitmap.hxx b/canvas/source/directx/dx_surfacebitmap.hxx
index 4c2ced00c6ef..85c067c595ba 100644
--- a/canvas/source/directx/dx_surfacebitmap.hxx
+++ b/canvas/source/directx/dx_surfacebitmap.hxx
@@ -33,7 +33,7 @@ namespace dxcanvas
     {
     public:
         DXSurfaceBitmap( const ::basegfx::B2IVector&                    rSize,
-                         const canvas::ISurfaceProxyManagerSharedPtr&   rMgr,
+                         const std::shared_ptr<canvas::ISurfaceProxyManager>&   rMgr,
                          const IDXRenderModuleSharedPtr&                rRenderModule,
                          bool                                           bWithAlpha );
 
@@ -100,7 +100,7 @@ namespace dxcanvas
 
         // pointer to the surface manager, needed in case clients
         // want to resize the bitmap.
-        canvas::ISurfaceProxyManagerSharedPtr mpSurfaceManager;
+        std::shared_ptr<canvas::ISurfaceProxyManager> mpSurfaceManager;
 
         // access point to the surface proxy which handles
         // the hardware-dependent rendering stuff.
@@ -118,7 +118,7 @@ namespace dxcanvas
         GraphicsSharedPtr mpGraphics;
 
         // internal implementation of the iColorBuffer interface
-        canvas::IColorBufferSharedPtr mpColorBuffer;
+        std::shared_ptr<canvas::IColorBuffer> mpColorBuffer;
 
         // indicates whether the associated surface needs
         // to refresh its contents or not. in other words,