diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index aae08f87d043..d1d6e5a3bec7 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -7,7 +7,6 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: outdev.hxx,v $ - * $Revision: 1.7.20.4 $ * * This file is part of OpenOffice.org. * @@ -80,7 +79,6 @@ class AlphaMask; class FontCharMap; class SalLayout; class ImplLayoutArgs; -class ImplFontHints; class ImplFontAttributes; class VirtualDevice; @@ -545,8 +543,6 @@ public: SAL_DLLPRIVATE static FontEmphasisMark ImplGetEmphasisMarkStyle( const Font& rFont ); SAL_DLLPRIVATE static BOOL ImplIsUnderlineAbove( const Font& ); - SAL_DLLPRIVATE void ImplGetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const; - // tells whether this output device is RTL in an LTR UI or LTR in a RTL UI SAL_DLLPRIVATE bool ImplIsAntiparallel() const ; diff --git a/vcl/inc/vcl/salgdi.hxx b/vcl/inc/vcl/salgdi.hxx index c4c8b36a014c..625742033101 100644 --- a/vcl/inc/vcl/salgdi.hxx +++ b/vcl/inc/vcl/salgdi.hxx @@ -7,7 +7,6 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salgdi.hxx,v $ - * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -237,11 +236,10 @@ public: void ReleaseFonts() { SetFont( NULL, 0 ); } // get the current font's metrics virtual void GetFontMetric( ImplFontMetricData* ) = 0; - virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const = 0; // get kernign pairs of the current font // return only PairCount if (pKernPairs == NULL) - virtual ULONG GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs ) = 0; + virtual ULONG GetKernPairs( ULONG nMaxPairCount, ImplKernPairData* ) = 0; // get the repertoire of the current font virtual ImplFontCharMap* GetImplFontCharMap() const = 0; // graphics must fill supplied font list diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index a6917dd10af9..51aad0790a26 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -7157,14 +7157,6 @@ BOOL OutputDevice::IsFontAvailable( const String& rFontName ) const // ----------------------------------------------------------------------- -void OutputDevice::ImplGetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints &rHints) const -{ - if ( mpGraphics ) - mpGraphics->GetFontHints( rFontAttributes, nSize, rHints ); -} - -// ----------------------------------------------------------------------- - FontMetric OutputDevice::GetFontMetric() const { DBG_TRACE( "OutputDevice::GetFontMetric()" ); diff --git a/vcl/unx/headless/svpgdi.cxx b/vcl/unx/headless/svpgdi.cxx index 5315df2e179b..6c9b3933810d 100644 --- a/vcl/unx/headless/svpgdi.cxx +++ b/vcl/unx/headless/svpgdi.cxx @@ -7,7 +7,6 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: svpgdi.cxx,v $ - * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -588,6 +587,3 @@ bool SvpSalGraphics::supportsOperation( OutDevSupportType ) const return false; } -void SvpSalGraphics::GetFontHints( const ImplFontAttributes& , int , ImplFontHints& ) const -{ -} diff --git a/vcl/unx/headless/svpgdi.hxx b/vcl/unx/headless/svpgdi.hxx index 227d45469eb6..f322d8493cc1 100644 --- a/vcl/unx/headless/svpgdi.hxx +++ b/vcl/unx/headless/svpgdi.hxx @@ -7,7 +7,6 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: svpgdi.hxx,v $ - * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -170,7 +169,7 @@ public: virtual SystemGraphicsData GetGraphicsData() const; virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; - virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const; }; #endif + diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx index 19bb848c63b2..07f32318dbd7 100644 --- a/vcl/unx/headless/svppspgraphics.cxx +++ b/vcl/unx/headless/svppspgraphics.cxx @@ -1366,7 +1366,3 @@ SystemGraphicsData PspGraphics::GetGraphicsData() const return aRes; } -void PspGraphics::GetFontHints( const ImplFontAttributes& , int , ImplFontHints& ) const -{ -} - diff --git a/vcl/unx/headless/svppspgraphics.hxx b/vcl/unx/headless/svppspgraphics.hxx index 75d3c9edf741..fee836dc1f88 100644 --- a/vcl/unx/headless/svppspgraphics.hxx +++ b/vcl/unx/headless/svppspgraphics.hxx @@ -7,7 +7,6 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: svppspgraphics.hxx,v $ - * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -190,7 +189,7 @@ public: virtual SystemGraphicsData GetGraphicsData() const; virtual SystemFontData GetSysFontData( int nFallbacklevel ) const; - virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const; }; #endif // _SVP_PSPGRAPHICS_HXX + diff --git a/vcl/unx/inc/pspgraphics.h b/vcl/unx/inc/pspgraphics.h index 6b9fd8500e9a..15cba0708a69 100644 --- a/vcl/unx/inc/pspgraphics.h +++ b/vcl/unx/inc/pspgraphics.h @@ -103,8 +103,7 @@ public: virtual void SetTextColor( SalColor nSalColor ); virtual USHORT SetFont( ImplFontSelectData*, int nFallbackLevel ); virtual void GetFontMetric( ImplFontMetricData* ); - virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const; - virtual ULONG GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs ); + virtual ULONG GetKernPairs( ULONG nMaxPairs, ImplKernPairData* ); virtual ImplFontCharMap* GetImplFontCharMap() const; virtual void GetDevFontList( ImplDevFontList* ); virtual void GetDevFontSubstList( OutputDevice* ); diff --git a/vcl/unx/inc/salgdi.h b/vcl/unx/inc/salgdi.h index b4d07d397794..05477c317737 100644 --- a/vcl/unx/inc/salgdi.h +++ b/vcl/unx/inc/salgdi.h @@ -7,7 +7,6 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salgdi.h,v $ - * $Revision: 1.49 $ * * This file is part of OpenOffice.org. * @@ -253,8 +252,7 @@ public: virtual void SetTextColor( SalColor nSalColor ); virtual USHORT SetFont( ImplFontSelectData*, int nFallbackLevel ); virtual void GetFontMetric( ImplFontMetricData* ); - virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const; - virtual ULONG GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs ); + virtual ULONG GetKernPairs( ULONG nMaxPairs, ImplKernPairData* ); virtual ImplFontCharMap* GetImplFontCharMap() const; virtual void GetDevFontList( ImplDevFontList* ); virtual void GetDevFontSubstList( OutputDevice* ); diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/source/gdi/pspgraphics.cxx index b89e44afd4e6..12b659fd4e5d 100644 --- a/vcl/unx/source/gdi/pspgraphics.cxx +++ b/vcl/unx/source/gdi/pspgraphics.cxx @@ -885,14 +885,6 @@ void PspGraphics::GetDevFontSubstList( OutputDevice* pOutDev ) } } -void PspGraphics::GetFontHints( const ImplFontAttributes& /*rFontAttributes*/, - int /*nSize*/, ImplFontHints& /*rFontHints*/) const -{ - // psprint just exports the fonts including hints - // the printer is then free to use the hints any way it wants - // AFAIK there is no printer driver that uses the fc-settings for this -} - void PspGraphics::GetFontMetric( ImplFontMetricData *pMetric ) { const psp::PrintFontManager& rMgr = psp::PrintFontManager::get(); diff --git a/vcl/win/inc/salgdi.h b/vcl/win/inc/salgdi.h index 818ea4d89778..e7dd5d4196c4 100644 --- a/vcl/win/inc/salgdi.h +++ b/vcl/win/inc/salgdi.h @@ -7,7 +7,6 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: salgdi.h,v $ - * $Revision: 1.30.20.5 $ * * This file is part of OpenOffice.org. * @@ -286,7 +285,6 @@ public: virtual USHORT SetFont( ImplFontSelectData*, int nFallbackLevel ); // get the current font's etrics virtual void GetFontMetric( ImplFontMetricData* ); - virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nHints, ImplFontHints& rFontHints); // get kernign pairs of the current font // return only PairCount if (pKernPairs == NULL) virtual ULONG GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs ); diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 697156f66b98..d82830a9022f 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -1450,12 +1450,6 @@ USHORT WinSalGraphics::SetFont( ImplFontSelectData* pFont, int nFallbackLevel ) // ----------------------------------------------------------------------- -void WinSalGraphics::GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) -{ -} - -// ----------------------------------------------------------------------- - void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric ) { if ( aSalShlData.mbWNT )