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/inc/win | |
| 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/inc/win')
| -rw-r--r-- | vcl/inc/win/salbmp.h | 5 | ||||
| -rw-r--r-- | vcl/inc/win/salgdi.h | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h index 0a698e5eae46..5b24aca02f14 100644 --- a/vcl/inc/win/salbmp.h +++ b/vcl/inc/win/salbmp.h @@ -31,7 +31,6 @@ class BitmapColor; class BitmapPalette; class SalGraphics; namespace Gdiplus { class Bitmap; } -typedef std::shared_ptr< Gdiplus::Bitmap > GdiPlusBmpPtr; class WinSalBitmap : public SalBitmap { @@ -50,7 +49,7 @@ private: // evtl. buffered GdiPlusBmp. This is needed since the GdiPlusBmp is a single // instance and remembered only on the content-WinSalBitmap, not on the // alpha-WinSalBitmap. - GdiPlusBmpPtr maGdiPlusBitmap; + std::shared_ptr< Gdiplus::Bitmap > maGdiPlusBitmap; const WinSalBitmap* mpAssociatedAlpha; sal_uInt16 mnBitCount; @@ -63,7 +62,7 @@ public: HGLOBAL ImplGethDIB() const { return mhDIB; } HBITMAP ImplGethDDB() const { return mhDDB; } - GdiPlusBmpPtr ImplGetGdiPlusBitmap(const WinSalBitmap* pAlphaSource = 0) const; + std::shared_ptr< Gdiplus::Bitmap > ImplGetGdiPlusBitmap(const WinSalBitmap* pAlphaSource = 0) const; static HGLOBAL ImplCreateDIB( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ); static HANDLE ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB ); diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 4ae6278a7172..d87cbbd2d635 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -136,8 +136,7 @@ private: void ReadGsubTable( HDC ) const; - typedef std::unordered_set<sal_UCS4> UcsHashSet; - mutable UcsHashSet maGsubTable; + mutable std::unordered_set<sal_UCS4> maGsubTable; mutable bool mbGsubRead; public: bool HasGSUBstitutions( HDC ) const; @@ -442,7 +441,7 @@ public: virtual void FreeEmbedFontData( const void* pData, long nDataLen ) override; virtual void GetGlyphWidths( const PhysicalFontFace*, bool bVertical, - Int32Vector& rWidths, + std::vector< sal_Int32 >& rWidths, Ucs2UIntMap& rUnicodeEnc ) override; int GetMinKashidaWidth(); |