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/window/toolbox.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/window/toolbox.cxx')
-rw-r--r-- | vcl/source/window/toolbox.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index a477e304ae16..91059ff9fe5c 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -1436,7 +1436,7 @@ void ToolBox::ImplInitSettings( bool bFont, if ( bFont ) { - Font aFont = rStyleSettings.GetToolFont(); + vcl::Font aFont = rStyleSettings.GetToolFont(); if ( IsControlFont() ) aFont.Merge( GetControlFont() ); SetZoomedPointFont( aFont ); @@ -3008,8 +3008,8 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint, // during configuration mode visible windows will be drawn in a special way if ( mbCustomizeMode && pItem->mbShowWindow ) { - Font aOldFont = GetFont(); - Color aOldTextColor = GetTextColor(); + vcl::Font aOldFont = GetFont(); + Color aOldTextColor = GetTextColor(); SetZoomedPointFont( rStyleSettings.GetAppFont() ); SetLineColor( Color( COL_BLACK ) ); @@ -3160,13 +3160,13 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint, long nTextOffY = nOffY; // rotate text when vertically docked - Font aOldFont = GetFont(); + vcl::Font aOldFont = GetFont(); if( pItem->mbVisibleText && !ImplIsFloatingMode() && ((meAlign == WINDOWALIGN_LEFT) || (meAlign == WINDOWALIGN_RIGHT)) ) { bRotate = true; - Font aRotateFont = aOldFont; + vcl::Font aRotateFont = aOldFont; aRotateFont.SetOrientation( 2700 ); // center horizontally |