diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-09-01 10:42:34 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-02 08:09:19 +0000 |
commit | f352ee156c1f184b3aded8dc0ea3eeb68bfbca10 (patch) | |
tree | 986a61461f9087a7cf842da091d6235b350abebb /vcl/inc/impfontmetricdata.hxx | |
parent | 175c49baef5d8dd3f7a28fec5a3dce956303dc42 (diff) |
boost::intrusive_ptr->tools::SvRef
Change-Id: I4c913dc62efe3f3747e78670f4efb0216d95c4ad
Reviewed-on: https://gerrit.libreoffice.org/28585
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/inc/impfontmetricdata.hxx')
-rw-r--r-- | vcl/inc/impfontmetricdata.hxx | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx index 7a59fd774771..7251778c8a5c 100644 --- a/vcl/inc/impfontmetricdata.hxx +++ b/vcl/inc/impfontmetricdata.hxx @@ -21,18 +21,16 @@ #define INCLUDED_VCL_INC_IMPFONTMETRICDATA_HXX #include <vcl/dllapi.h> - +#include <tools/ref.hxx> #include "fontattributes.hxx" -#include <boost/intrusive_ptr.hpp> - class ImplFontMetricData; -typedef boost::intrusive_ptr< ImplFontMetricData > ImplFontMetricDataPtr; +typedef tools::SvRef<ImplFontMetricData> ImplFontMetricDataRef; class OutputDevice; class FontSelectPattern; -class ImplFontMetricData : public FontAttributes +class ImplFontMetricData : public FontAttributes, public SvRefBase { public: explicit ImplFontMetricData( const FontSelectPattern& ); @@ -102,11 +100,6 @@ public: void ImplInitAboveTextLineSize(); private: - friend void intrusive_ptr_add_ref(ImplFontMetricData* pImplFontMetricData); - friend void intrusive_ptr_release(ImplFontMetricData* pImplFontMetricData); - - long mnRefCount; - // font instance attributes from the font request long mnWidth; // Reference Width short mnOrientation; // Rotation in 1/10 degrees @@ -155,17 +148,6 @@ private: }; -inline void intrusive_ptr_add_ref(ImplFontMetricData* pImplFontMetricData) -{ - ++pImplFontMetricData->mnRefCount; -} - -inline void intrusive_ptr_release(ImplFontMetricData* pImplFontMetricData) -{ - if (--pImplFontMetricData->mnRefCount == 0) - delete pImplFontMetricData; -} - #endif // INCLUDED_VCL_INC_IMPFONTMETRICDATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |