diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-06 11:28:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-07 08:27:25 +0200 |
| commit | b1b6f163d32f59fd5e750d5814cf04e8bf357907 (patch) | |
| tree | 3960841352bb3ff4c10610ac9f4a2efb10b1c31f | |
| parent | 857ff93895eb0e64922bdb938d2175261c05fcb9 (diff) | |
inline ISurfaceProxySharedPtr typedef
some places were not using the typedef anyhow
Change-Id: Idf92ad63b05101832827113701a85eca48c084c6
| -rw-r--r-- | canvas/source/directx/dx_surfacebitmap.hxx | 2 | ||||
| -rw-r--r-- | canvas/source/tools/surfaceproxymanager.cxx | 2 | ||||
| -rw-r--r-- | include/canvas/rendering/isurfaceproxy.hxx | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/canvas/source/directx/dx_surfacebitmap.hxx b/canvas/source/directx/dx_surfacebitmap.hxx index 85b2c6105749..4c2ced00c6ef 100644 --- a/canvas/source/directx/dx_surfacebitmap.hxx +++ b/canvas/source/directx/dx_surfacebitmap.hxx @@ -104,7 +104,7 @@ namespace dxcanvas // access point to the surface proxy which handles // the hardware-dependent rendering stuff. - canvas::ISurfaceProxySharedPtr mpSurfaceProxy; + std::shared_ptr< canvas::ISurfaceProxy > mpSurfaceProxy; // container for pixel data, we need to use a directx // surface since GDI+ sucks... diff --git a/canvas/source/tools/surfaceproxymanager.cxx b/canvas/source/tools/surfaceproxymanager.cxx index 839a6724874d..3f3eb6baec9b 100644 --- a/canvas/source/tools/surfaceproxymanager.cxx +++ b/canvas/source/tools/surfaceproxymanager.cxx @@ -48,7 +48,7 @@ namespace canvas texture may be distributed to several real hardware surfaces. */ - virtual ISurfaceProxySharedPtr createSurfaceProxy( const IColorBufferSharedPtr& pBuffer ) const SAL_OVERRIDE + virtual std::shared_ptr<ISurfaceProxy> createSurfaceProxy( const IColorBufferSharedPtr& pBuffer ) const SAL_OVERRIDE { // not much to do for now, simply allocate a new surface // proxy from our internal pool and initialize this thing diff --git a/include/canvas/rendering/isurfaceproxy.hxx b/include/canvas/rendering/isurfaceproxy.hxx index 9523ffa40a30..6baf0af61c09 100644 --- a/include/canvas/rendering/isurfaceproxy.hxx +++ b/include/canvas/rendering/isurfaceproxy.hxx @@ -97,8 +97,6 @@ namespace canvas const ::basegfx::B2DPolyPolygon& rClipPoly, const ::basegfx::B2DHomMatrix& rTransform ) = 0; }; - - typedef std::shared_ptr< ISurfaceProxy > ISurfaceProxySharedPtr; } #endif // INCLUDED_CANVAS_RENDERING_ISURFACEPROXY_HXX |