diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-02-28 16:57:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-01 20:38:55 +0000 |
| commit | b610ea59875a876712b1c57702eae615e424267a (patch) | |
| tree | ea8132eee89bdb2078fb81707d758f20e4bbc307 /vcl/unx/headless | |
| parent | 687456967ede128c0334536a116bba8699420b7e (diff) | |
Get better hints as to what script a font is likely tuned for
Diffstat (limited to 'vcl/unx/headless')
| -rw-r--r-- | vcl/unx/headless/svpgdi.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/headless/svppspgraphics.cxx | 6 | ||||
| -rw-r--r-- | vcl/unx/headless/svppspgraphics.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/headless/svptext.cxx | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/vcl/unx/headless/svpgdi.hxx b/vcl/unx/headless/svpgdi.hxx index 4bd9b3a4b222..b385d3f35b45 100644 --- a/vcl/unx/headless/svpgdi.hxx +++ b/vcl/unx/headless/svpgdi.hxx @@ -90,7 +90,7 @@ public: virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); virtual ULONG GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs ); virtual ImplFontCharMap* GetImplFontCharMap() const; - virtual bool GetImplFontLayoutCapabilities(FontLayoutCapabilities &rGetImplFontLayoutCapabilities) const; + virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; virtual void GetDevFontList( ImplDevFontList* ); virtual void GetDevFontSubstList( OutputDevice* ); virtual bool AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName ); diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx index 07271edfcb15..c45a4e8886d0 100644 --- a/vcl/unx/headless/svppspgraphics.cxx +++ b/vcl/unx/headless/svppspgraphics.cxx @@ -696,11 +696,11 @@ ImplFontCharMap* PspGraphics::GetImplFontCharMap() const return new ImplFontCharMap( aCmapResult ); } -bool PspGraphics::GetImplFontLayoutCapabilities(FontLayoutCapabilities &rGetImplFontLayoutCapabilities) const +bool PspGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const { if (!m_pServerFont[0]) - return NULL; - return !m_pServerFont[0]->GetFontLayoutCapabilities(rGetImplFontLayoutCapabilities); + return false; + return m_pServerFont[0]->GetFontCapabilities(rFontCapabilities); } USHORT PspGraphics::SetFont( ImplFontSelectData *pEntry, int nFallbackLevel ) diff --git a/vcl/unx/headless/svppspgraphics.hxx b/vcl/unx/headless/svppspgraphics.hxx index ca6bbc37d378..676e86b32f20 100644 --- a/vcl/unx/headless/svppspgraphics.hxx +++ b/vcl/unx/headless/svppspgraphics.hxx @@ -109,7 +109,7 @@ public: virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); virtual ULONG GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs ); virtual ImplFontCharMap* GetImplFontCharMap() const; - virtual bool GetImplFontLayoutCapabilities(FontLayoutCapabilities &rGetImplFontLayoutCapabilities) const; + virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const; virtual void GetDevFontList( ImplDevFontList* ); virtual void GetDevFontSubstList( OutputDevice* ); virtual bool AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName ); diff --git a/vcl/unx/headless/svptext.cxx b/vcl/unx/headless/svptext.cxx index 8667e5302df7..6a4685165749 100644 --- a/vcl/unx/headless/svptext.cxx +++ b/vcl/unx/headless/svptext.cxx @@ -282,12 +282,12 @@ ImplFontCharMap* SvpSalGraphics::GetImplFontCharMap() const return new ImplFontCharMap( aCmapResult ); } -bool SvpSalGraphics::GetImplFontLayoutCapabilities(FontLayoutCapabilities &rGetImplFontLayoutCapabilities) const +bool SvpSalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const { if (!m_pServerFont[0]) - return NULL; + return false; - return !m_pServerFont[0]->GetFontLayoutCapabilities( rGetImplFontLayoutCapabilities); + return m_pServerFont[0]->GetFontCapabilities(rFontCapabilities); } // --------------------------------------------------------------------------- |