strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#i64508# cleanup empty GetFontOptions() changes

Browse source
This commit is contained in:
hdu 2010-02-12 13:19:22 +01:00
parent 565680d257
commit 2e95ccf659
12 changed files with 5 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vcl/inc/vcl/outdev.hxx
View file

@ -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 ;

4
vcl/inc/vcl/salgdi.hxx
View file

@ -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

8
vcl/source/gdi/outdev3.cxx
View file

@ -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()" );

4
vcl/unx/headless/svpgdi.cxx
View file

@ -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
{
}

3
vcl/unx/headless/svpgdi.hxx
View file

@ -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

4
vcl/unx/headless/svppspgraphics.cxx
View file

@ -1366,7 +1366,3 @@ SystemGraphicsData PspGraphics::GetGraphicsData() const
return aRes;
}
void PspGraphics::GetFontHints( const ImplFontAttributes& , int , ImplFontHints& ) const
{
}

3
vcl/unx/headless/svppspgraphics.hxx
View file

@ -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

3
vcl/unx/inc/pspgraphics.h
View file

@ -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* );

4
vcl/unx/inc/salgdi.h
View file

@ -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* );

8
vcl/unx/source/gdi/pspgraphics.cxx
View file

@ -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();

2
vcl/win/inc/salgdi.h
View file

@ -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 );

6
vcl/win/source/gdi/salgdi3.cxx
View file

@ -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 )