diff options
Diffstat (limited to 'vcl/source/font')
-rw-r--r-- | vcl/source/font/PhysicalFontFace.cxx | 4 | ||||
-rw-r--r-- | vcl/source/font/fontattributes.cxx | 10 | ||||
-rw-r--r-- | vcl/source/font/fontselect.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/vcl/source/font/PhysicalFontFace.cxx b/vcl/source/font/PhysicalFontFace.cxx index c5194fb1a72c..9540604f137f 100644 --- a/vcl/source/font/PhysicalFontFace.cxx +++ b/vcl/source/font/PhysicalFontFace.cxx @@ -26,8 +26,8 @@ #include "PhysicalFontFace.hxx" -PhysicalFontFace::PhysicalFontFace( const ImplFontAttributes& rDFA ) - : ImplFontAttributes( rDFA ) +PhysicalFontFace::PhysicalFontFace( const FontAttributes& rDFA ) + : FontAttributes( rDFA ) , mnWidth(0) , mnHeight(0) { diff --git a/vcl/source/font/fontattributes.cxx b/vcl/source/font/fontattributes.cxx index d823748ff941..be3ab68bbaa1 100644 --- a/vcl/source/font/fontattributes.cxx +++ b/vcl/source/font/fontattributes.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star::uno; using namespace ::rtl; using namespace ::utl; -bool ImplFontAttributes::CompareDeviceIndependentFontAttributes(const ImplFontAttributes& rOther) const +bool FontAttributes::CompareDeviceIndependentFontAttributes(const FontAttributes& rOther) const { if (maFamilyName != rOther.maFamilyName) return false; @@ -92,7 +92,7 @@ bool ImplFontAttributes::CompareDeviceIndependentFontAttributes(const ImplFontAt return true; } -ImplFontAttributes::ImplFontAttributes() +FontAttributes::FontAttributes() : mnWidth ( 0 ) , mnOrientation( 0 ) , mnAscent( 0 ) @@ -135,7 +135,7 @@ ImplFontAttributes::ImplFontAttributes() // empty } -ImplFontAttributes::ImplFontAttributes( const FontSelectPattern& rFontSelData ) +FontAttributes::FontAttributes( const FontSelectPattern& rFontSelData ) : mnWidth ( rFontSelData.mnWidth ) , mnOrientation( (short)(rFontSelData.mnOrientation) ) , mnAscent( 0 ) @@ -194,7 +194,7 @@ ImplFontAttributes::ImplFontAttributes( const FontSelectPattern& rFontSelData ) } -void ImplFontAttributes::ImplInitTextLineSize( const OutputDevice* pDev ) +void FontAttributes::ImplInitTextLineSize( const OutputDevice* pDev ) { long nDescent = mnDescent; if ( nDescent <= 0 ) @@ -295,7 +295,7 @@ void ImplFontAttributes::ImplInitTextLineSize( const OutputDevice* pDev ) } -void ImplFontAttributes::ImplInitAboveTextLineSize() +void FontAttributes::ImplInitAboveTextLineSize() { long nIntLeading = mnIntLeading; // TODO: assess usage of nLeading below (changed in extleading CWS) diff --git a/vcl/source/font/fontselect.cxx b/vcl/source/font/fontselect.cxx index 53fd49121351..641e3c6ea0b3 100644 --- a/vcl/source/font/fontselect.cxx +++ b/vcl/source/font/fontselect.cxx @@ -109,7 +109,7 @@ FontSelectPatternAttributes::FontSelectPatternAttributes( const vcl::Font& rFont #ifdef WNT FontSelectPatternAttributes::FontSelectPatternAttributes( const PhysicalFontFace& rFontData, const Size& rSize, float fExactHeight, int nOrientation, bool bVertical ) - : ImplFontAttributes( rFontData ) + : FontAttributes( rFontData ) , mnWidth( rSize.Width() ) , mnHeight( rSize.Height() ) , mfExactHeight( fExactHeight ) |