diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-16 10:09:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-18 08:54:37 +0200 |
| commit | 60e78fbb806bb45e635ba1de45ceffe187938ac0 (patch) | |
| tree | 17ff5aaa57f4d23e177f1fe423def1691139a4a8 /vcl/source/control/fixed.cxx | |
| parent | 9c818268767d6a1c1bc731ae30c45883bab987e7 (diff) | |
fdo#82577: Handle Font
Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.
Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
Diffstat (limited to 'vcl/source/control/fixed.cxx')
| -rw-r--r-- | vcl/source/control/fixed.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 35f6dab6d574..8d6cb0f8c9a6 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -94,7 +94,7 @@ WinBits FixedText::ImplInitStyle( WinBits nStyle ) return nStyle; } -const Font& FixedText::GetCanonicalFont( const StyleSettings& _rStyle ) const +const vcl::Font& FixedText::GetCanonicalFont( const StyleSettings& _rStyle ) const { return ( GetStyle() & WB_INFO ) ? _rStyle.GetInfoFont() : _rStyle.GetLabelFont(); } @@ -246,7 +246,7 @@ void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); - Font aFont = GetDrawPixelFont( pDev ); + vcl::Font aFont = GetDrawPixelFont( pDev ); pDev->Push(); pDev->SetMapMode(); @@ -497,7 +497,7 @@ WinBits FixedLine::ImplInitStyle( WinBits nStyle ) return nStyle; } -const Font& FixedLine::GetCanonicalFont( const StyleSettings& _rStyle ) const +const vcl::Font& FixedLine::GetCanonicalFont( const StyleSettings& _rStyle ) const { return _rStyle.GetGroupFont(); } @@ -565,7 +565,7 @@ void FixedLine::ImplDraw( bool bLayout ) { long nWidth = GetTextWidth( aText ); Push( PUSH_FONT ); - Font aFont( GetFont() ); + vcl::Font aFont( GetFont() ); aFont.SetOrientation( 900 ); SetFont( aFont ); Point aStartPt( aOutSize.Width()/2, aOutSize.Height()-1 ); |