diff options
| author | Mark Page <aptitude@btconnect.com> | 2016-06-09 15:53:20 +0100 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-10 07:25:59 +0000 |
| commit | 99200d7cc2a952f92074934c647db076aae5e48b (patch) | |
| tree | 31fe35cd3e7997f116d64235913c41c958a34ea7 /vcl/win/gdi | |
| parent | fc7e6d8445af39ffc6a753d7104167ee8f376b9c (diff) | |
tdf#96099 Remove various smart pointer typedefs in vcl
Change-Id: I4ac1bb25d3d63f150b42d9e1708efc344bbdb6a7
Reviewed-on: https://gerrit.libreoffice.org/26113
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/win/gdi')
| -rw-r--r-- | vcl/win/gdi/gdiimpl.cxx | 6 | ||||
| -rw-r--r-- | vcl/win/gdi/salbmp.cxx | 2 | ||||
| -rw-r--r-- | vcl/win/gdi/salfont.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx index f9deaf7b2b5e..5af458b78f1c 100644 --- a/vcl/win/gdi/gdiimpl.cxx +++ b/vcl/win/gdi/gdiimpl.cxx @@ -2194,7 +2194,7 @@ bool WinSalGraphicsImpl::tryDrawBitmapGdiPlus(const SalTwoRect& rTR, const SalBi assert(dynamic_cast<const WinSalBitmap*>(&rSrcBitmap)); const WinSalBitmap& rSalBitmap = static_cast< const WinSalBitmap& >(rSrcBitmap); - GdiPlusBmpPtr aARGB(rSalBitmap.ImplGetGdiPlusBitmap()); + std::shared_ptr< Gdiplus::Bitmap > aARGB(rSalBitmap.ImplGetGdiPlusBitmap()); if(aARGB.get()) { @@ -2247,7 +2247,7 @@ bool WinSalGraphicsImpl::drawAlphaBitmap( const WinSalBitmap& rSalBitmap = static_cast< const WinSalBitmap& >(rSrcBitmap); const WinSalBitmap& rSalAlpha = static_cast< const WinSalBitmap& >(rAlphaBmp); - GdiPlusBmpPtr aARGB(rSalBitmap.ImplGetGdiPlusBitmap(&rSalAlpha)); + std::shared_ptr< Gdiplus::Bitmap > aARGB(rSalBitmap.ImplGetGdiPlusBitmap(&rSalAlpha)); if(aARGB.get()) { @@ -2284,7 +2284,7 @@ bool WinSalGraphicsImpl::drawTransformedBitmap( const WinSalBitmap& rSalBitmap = static_cast< const WinSalBitmap& >(rSourceBitmap); const WinSalBitmap* pSalAlpha = static_cast< const WinSalBitmap* >(pAlphaBitmap); - GdiPlusBmpPtr aARGB(rSalBitmap.ImplGetGdiPlusBitmap(pSalAlpha)); + std::shared_ptr< Gdiplus::Bitmap > aARGB(rSalBitmap.ImplGetGdiPlusBitmap(pSalAlpha)); if(aARGB.get()) { diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx index 9b18753dd8d6..b51ec6f9c06b 100644 --- a/vcl/win/gdi/salbmp.cxx +++ b/vcl/win/gdi/salbmp.cxx @@ -214,7 +214,7 @@ void WinSalBitmap::Destroy() mnBitCount = 0; } -GdiPlusBmpPtr WinSalBitmap::ImplGetGdiPlusBitmap(const WinSalBitmap* pAlphaSource) const +std::shared_ptr< Gdiplus::Bitmap > WinSalBitmap::ImplGetGdiPlusBitmap(const WinSalBitmap* pAlphaSource) const { WinSalBitmap* pThat = const_cast< WinSalBitmap* >(this); diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx index ba922479cf97..b19e91972708 100644 --- a/vcl/win/gdi/salfont.cxx +++ b/vcl/win/gdi/salfont.cxx @@ -2505,7 +2505,7 @@ const Ucs2SIntMap* WinSalGraphics::GetFontEncodingVector( const PhysicalFontFace void WinSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, bool bVertical, - Int32Vector& rWidths, + std::vector< sal_Int32 >& rWidths, Ucs2UIntMap& rUnicodeEnc ) { // create matching FontSelectPattern |