summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-08-28 21:09:35 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-08-28 22:39:46 +0200
commit89df4a82bbed0c2e3a4a8be0b995c4400377628c (patch)
tree85e4681bd50619fcc0c179af6d4edaf617fbbe13
parent4b82652c4de94db553dfd7a63801ea81d366315a (diff)
loplugin:returnconstval (macOS)
Remove the spurious "const" that dates back to a poor change in 9177329a425cf70b515d1f266132838894fe54c6 "vcl: FontCharMap to use intrusive_ptr ImplFontCharMap": > --- a/vcl/inc/quartz/salgdi.h > +++ b/vcl/inc/quartz/salgdi.h > @@ -73,7 +73,7 @@ public: > CoreTextStyle* CreateTextStyle( const FontSelectPattern& ) const; > int GetFontTable( const char pTagName[5], unsigned char* ) const; > > - const ImplFontCharMap* GetImplFontCharMap() const; > + const ImplFontCharMapPtr GetImplFontCharMap() const; > bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) > const; > bool HasChar( sal_uInt32 cChar ) const; > Change-Id: I6a533a917ec42513b0783332c35e0a6803504324 Reviewed-on: https://gerrit.libreoffice.org/78235 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--vcl/inc/quartz/salgdi.h2
-rw-r--r--vcl/quartz/salgdi.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 8861cd79b9ad..338878e79529 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -67,7 +67,7 @@ public:
int GetFontTable( uint32_t nTagCode, unsigned char* ) const;
int GetFontTable( const char pTagName[5], unsigned char* ) const;
- const FontCharMapRef GetFontCharMap() const;
+ FontCharMapRef GetFontCharMap() const;
bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
bool HasChar( sal_uInt32 cChar ) const;
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index cf906d32acf3..0d5ecab6a419 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -113,7 +113,7 @@ sal_IntPtr CoreTextFontFace::GetFontId() const
return mnFontId;
}
-const FontCharMapRef CoreTextFontFace::GetFontCharMap() const
+FontCharMapRef CoreTextFontFace::GetFontCharMap() const
{
// return the cached charmap
if( mxCharMap.is() )