diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-10-04 21:55:58 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-10-06 00:13:38 +0000 |
| commit | 9177329a425cf70b515d1f266132838894fe54c6 (patch) | |
| tree | dd064e9b56019046faa0966d0147c19a7fa2ca3e /vcl/inc/win | |
| parent | 36e1d19af8585bc2f36322ba32acbed46e58c4de (diff) | |
vcl: FontCharMap to use intrusive_ptr ImplFontCharMap
ImplFontCharMap was using it's own reference counting mechanism,
however we can use intrusive_ptr more effectively.
Added a unit test around FontCharMap.
Change-Id: Ifab6ce002fd1df8feb7e017dea3012ff9ea7f18a
Reviewed-on: https://gerrit.libreoffice.org/11804
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl/inc/win')
| -rw-r--r-- | vcl/inc/win/salgdi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 957db9103215..ace973cde206 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -94,7 +94,7 @@ public: const gr_face* GraphiteFace() const; #endif - const ImplFontCharMap* GetImplFontCharMap() const; + const ImplFontCharMapPtr GetImplFontCharMap() const; bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; const Ucs2SIntMap* GetEncodingVector() const { return mpEncodingVector; } void SetEncodingVector( const Ucs2SIntMap* pNewVec ) const @@ -116,7 +116,7 @@ private: #endif mutable bool mbHasArabicSupport; mutable bool mbFontCapabilitiesRead; - mutable ImplFontCharMap* mpUnicodeMap; + mutable ImplFontCharMapPtr mpUnicodeMap; mutable const Ucs2SIntMap* mpEncodingVector; mutable vcl::FontCapabilities maFontCapabilities; @@ -310,7 +310,7 @@ public: // get the current font's metrics virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); // get the repertoire of the current font - virtual const ImplFontCharMap* GetImplFontCharMap() const; + virtual const ImplFontCharMapPtr GetImplFontCharMap() const; // get the layout capabilities of the current font virtual bool GetFontCapabilities(vcl::FontCapabilities &rGetFontCapabilities) const; // graphics must fill supplied font list |