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/quartz | |
| 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/quartz')
| -rw-r--r-- | vcl/quartz/ctfonts.cxx | 2 | ||||
| -rw-r--r-- | vcl/quartz/salgdi.cxx | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 5bd6e7ba2a18..bd2ab4f87482 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -117,7 +117,7 @@ CoreTextStyle::~CoreTextStyle() CFRelease( mpStyleDict ); } -void CoreTextStyle::GetFontMetric( ImplFontMetricDataPtr& rxFontMetric ) const +void CoreTextStyle::GetFontMetric( ImplFontMetricDataRef& rxFontMetric ) const { // get the matching CoreText font handle // TODO: is it worth it to cache the CTFontRef in SetFont() and reuse it here? diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index c28290a99828..0d39e962e70e 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -90,14 +90,14 @@ sal_IntPtr CoreTextFontFace::GetFontId() const static unsigned GetUShort( const unsigned char* p ){return((p[0]<<8)+p[1]);} -const FontCharMapPtr CoreTextFontFace::GetFontCharMap() const +const FontCharMapRef CoreTextFontFace::GetFontCharMap() const { // return the cached charmap if( mxCharMap ) return mxCharMap; // set the default charmap - FontCharMapPtr pCharMap( new FontCharMap() ); + FontCharMapRef pCharMap( new FontCharMap() ); mxCharMap = pCharMap; // get the CMAP byte size @@ -120,7 +120,7 @@ const FontCharMapPtr CoreTextFontFace::GetFontCharMap() const CmapResult aCmapResult; if( ParseCMAP( &aBuffer[0], nRawLength, aCmapResult ) ) { - FontCharMapPtr xDefFontCharMap( new FontCharMap(aCmapResult) ); + FontCharMapRef xDefFontCharMap( new FontCharMap(aCmapResult) ); // create the matching charmap mxCharMap = xDefFontCharMap; } @@ -307,7 +307,7 @@ void AquaSalGraphics::SetTextColor( SalColor nSalColor ) // SAL_ DEBUG(std::hex << nSalColor << std::dec << "={" << maTextColor.GetRed() << ", " << maTextColor.GetGreen() << ", " << maTextColor.GetBlue() << ", " << maTextColor.GetAlpha() << "}"); } -void AquaSalGraphics::GetFontMetric( ImplFontMetricDataPtr& rxFontMetric, int /*nFallbackLevel*/ ) +void AquaSalGraphics::GetFontMetric( ImplFontMetricDataRef& rxFontMetric, int /*nFallbackLevel*/ ) { mpTextStyle->GetFontMetric( rxFontMetric ); } @@ -454,11 +454,11 @@ SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs& /*rArgs*/, int /*nFal return pSalLayout; } -const FontCharMapPtr AquaSalGraphics::GetFontCharMap() const +const FontCharMapRef AquaSalGraphics::GetFontCharMap() const { if( !mpFontData ) { - FontCharMapPtr xFontCharMap( new FontCharMap() ); + FontCharMapRef xFontCharMap( new FontCharMap() ); return xFontCharMap; } @@ -740,7 +740,7 @@ void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bV free( const_cast<TTSimpleGlyphMetrics *>(pGlyphMetrics) ); } - FontCharMapPtr xFCMap = mpFontData->GetFontCharMap(); + FontCharMapRef xFCMap = mpFontData->GetFontCharMap(); SAL_WARN_IF( !xFCMap || !xFCMap->GetCharCount(), "vcl", "no charmap" ); // get unicode<->glyph encoding |