vcl/generic/print/genpspgraphics.cxx | 2 +- vcl/headless/svptext.cxx | 2 +- vcl/inc/generic/genpspgraphics.h | 2 +- vcl/inc/headless/svpgdi.hxx | 2 +- vcl/inc/quartz/salgdi.h | 4 ++-- vcl/inc/salgdi.hxx | 2 +- vcl/inc/unx/salgdi.h | 2 +- vcl/inc/win/salgdi.h | 4 ++-- vcl/quartz/salgdi.cxx | 2 +- vcl/source/outdev/font.cxx | 2 +- vcl/unx/generic/gdi/salgdi3.cxx | 2 +- vcl/win/source/gdi/salgdi3.cxx | 6 +++--- 12 files changed, 16 insertions(+), 16 deletions(-)
New commits: commit 4a96ee8eb29dd04ca553cbf150117789eeea1c9c Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Mon Sep 15 19:58:17 2014 +1000 vcl: Rename GetImplFontCapabilities() The data structure is not ImplFontCapabilities but FontCapabilities, therefore the function name is very misleading. Change-Id: I90f074902af4b4bee79cd445036dc24797836ac1 Reviewed-on: https://gerrit.libreoffice.org/11454 Reviewed-by: Chris Sherlock <chris.sherloc...@gmail.com> Tested-by: Chris Sherlock <chris.sherloc...@gmail.com> diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index c09da8f..c8f1015 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -786,7 +786,7 @@ const ImplFontCharMap* GenPspGraphics::GetImplFontCharMap() const return pIFCMap; } -bool GenPspGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const +bool GenPspGraphics::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const { if (!m_pServerFont[0]) return false; diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx index 49b1464..3f2384c 100644 --- a/vcl/headless/svptext.cxx +++ b/vcl/headless/svptext.cxx @@ -240,7 +240,7 @@ const ImplFontCharMap* SvpSalGraphics::GetImplFontCharMap() const return pIFCMap; } -bool SvpSalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const +bool SvpSalGraphics::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const { if (!m_pServerFont[0]) return false; diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h index 9cc4766..5eb3477 100644 --- a/vcl/inc/generic/genpspgraphics.h +++ b/vcl/inc/generic/genpspgraphics.h @@ -90,7 +90,7 @@ public: virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE; virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE; virtual const ImplFontCharMap* GetImplFontCharMap() const SAL_OVERRIDE; - virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE; + virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE; virtual void GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE; // graphics must drop any cached font info virtual void ClearDevFontCache() SAL_OVERRIDE; diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 800ab1a..57e3ce8 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -157,7 +157,7 @@ public: virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE; virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE; virtual const ImplFontCharMap* GetImplFontCharMap() const SAL_OVERRIDE; - virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE; + virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE; virtual void GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE; virtual void ClearDevFontCache() SAL_OVERRIDE; virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE; diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 57dec5b..1fdacb3 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -75,7 +75,7 @@ public: int GetFontTable( const char pTagName[5], unsigned char* ) const; const ImplFontCharMap* GetImplFontCharMap() const; - bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; + bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; bool HasChar( sal_uInt32 cChar ) const; void ReadOs2Table() const; @@ -332,7 +332,7 @@ public: virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE; // get the repertoire of the current font virtual const ImplFontCharMap* GetImplFontCharMap() const SAL_OVERRIDE; - virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE; + virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE; // graphics must fill supplied font list virtual void GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE; // graphics must drop any cached font info diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 8ef2638..82222ac 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -235,7 +235,7 @@ public: GetImplFontCharMap() const = 0; // get the layout capabilities of the current font - virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const = 0; + virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const = 0; // graphics must fill supplied font list virtual void GetDevFontList( PhysicalFontCollection* ) = 0; diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 7c799f4..500b277 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -230,7 +230,7 @@ public: virtual sal_uInt16 SetFont( FontSelectPattern*, int nFallbackLevel ) SAL_OVERRIDE; virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ) SAL_OVERRIDE; virtual const ImplFontCharMap* GetImplFontCharMap() const SAL_OVERRIDE; - virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE; + virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const SAL_OVERRIDE; virtual void GetDevFontList( PhysicalFontCollection* ) SAL_OVERRIDE; virtual void ClearDevFontCache() SAL_OVERRIDE; virtual bool AddTempDevFont( PhysicalFontCollection*, const OUString& rFileURL, const OUString& rFontName ) SAL_OVERRIDE; diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index dac4d6e..7b05d24 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -95,7 +95,7 @@ public: #endif const ImplFontCharMap* GetImplFontCharMap() const; - bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; + bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; const Ucs2SIntMap* GetEncodingVector() const { return mpEncodingVector; } void SetEncodingVector( const Ucs2SIntMap* pNewVec ) const { @@ -312,7 +312,7 @@ public: // get the repertoire of the current font virtual const ImplFontCharMap* GetImplFontCharMap() const; // get the layout capabilities of the current font - virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rGetFontCapabilities) const; + virtual bool GetFontCapabilities(vcl::FontCapabilities &rGetFontCapabilities) const; // graphics must fill supplied font list virtual void GetDevFontList( PhysicalFontCollection* ); // graphics must drop any cached font info diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 3a0f937..dda82ef 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -497,7 +497,7 @@ const ImplFontCharMap* AquaSalGraphics::GetImplFontCharMap() const return mpFontData->GetImplFontCharMap(); } -bool AquaSalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const +bool AquaSalGraphics::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const { if( !mpFontData ) return false; diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index bf2680f..df15630 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -252,7 +252,7 @@ bool OutputDevice::GetFontCapabilities( FontCapabilities& rFontCapabilities ) co if( !mpFontEntry ) return false; - return mpGraphics->GetImplFontCapabilities(rFontCapabilities); + return mpGraphics->GetFontCapabilities(rFontCapabilities); } SystemFontData OutputDevice::GetSysFontData(int nFallbacklevel) const diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 943385e..13d550e 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -440,7 +440,7 @@ const ImplFontCharMap* X11SalGraphics::GetImplFontCharMap() const return pIFCMap; } -bool X11SalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rGetImplFontCapabilities) const +bool X11SalGraphics::GetFontCapabilities(vcl::FontCapabilities &rGetImplFontCapabilities) const { if (!mpServerFont[0]) return false; diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index e21e7e9..7986777 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -1231,7 +1231,7 @@ const ImplFontCharMap* ImplWinFontData::GetImplFontCharMap() const return mpUnicodeMap; } -bool ImplWinFontData::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const +bool ImplWinFontData::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const { rFontCapabilities = maFontCapabilities; return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty(); @@ -1704,11 +1704,11 @@ const ImplFontCharMap* WinSalGraphics::GetImplFontCharMap() const return mpWinFontData[0]->GetImplFontCharMap(); } -bool WinSalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const +bool WinSalGraphics::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const { if( !mpWinFontData[0] ) return false; - return mpWinFontData[0]->GetImplFontCapabilities(rFontCapabilities); + return mpWinFontData[0]->GetFontCapabilities(rFontCapabilities); } int CALLBACK SalEnumFontsProcExA( const ENUMLOGFONTEXA* pLogFont, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits