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/osx | |
| 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/osx')
| -rw-r--r-- | vcl/osx/salframe.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index 662445cea13d..9e00d4054b45 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -1131,9 +1131,9 @@ static Color getColor( NSColor* pSysColor, const Color& rDefault, NSWindow* pWin return aRet; } -static Font getFont( NSFont* pFont, long nDPIY, const Font& rDefault ) +static vcl::Font getFont( NSFont* pFont, long nDPIY, const vcl::Font& rDefault ) { - Font aResult( rDefault ); + vcl::Font aResult( rDefault ); if( pFont ) { aResult.SetName( GetOUString( [pFont familyName] ) ); @@ -1188,7 +1188,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetShadowColor( aShadowColor ); // get the system font settings - Font aAppFont = aStyleSettings.GetAppFont(); + vcl::Font aAppFont = aStyleSettings.GetAppFont(); sal_Int32 nDPIX = 72, nDPIY = 72; getResolution( nDPIX, nDPIY ); aAppFont = getFont( [NSFont systemFontOfSize: 0], nDPIY, aAppFont ); @@ -1200,16 +1200,16 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings ) aStyleSettings.SetHelpFont( aAppFont ); aStyleSettings.SetPushButtonFont( aAppFont ); - Font aTitleFont( getFont( [NSFont titleBarFontOfSize: 0], nDPIY, aAppFont ) ); + vcl::Font aTitleFont( getFont( [NSFont titleBarFontOfSize: 0], nDPIY, aAppFont ) ); aStyleSettings.SetTitleFont( aTitleFont ); aStyleSettings.SetFloatTitleFont( aTitleFont ); - Font aMenuFont( getFont( [NSFont menuFontOfSize: 0], nDPIY, aAppFont ) ); + vcl::Font aMenuFont( getFont( [NSFont menuFontOfSize: 0], nDPIY, aAppFont ) ); aStyleSettings.SetMenuFont( aMenuFont ); aStyleSettings.SetToolFont( aAppFont ); - Font aLabelFont( getFont( [NSFont labelFontOfSize: 0], nDPIY, aAppFont ) ); + vcl::Font aLabelFont( getFont( [NSFont labelFontOfSize: 0], nDPIY, aAppFont ) ); aStyleSettings.SetLabelFont( aLabelFont ); aStyleSettings.SetInfoFont( aLabelFont ); aStyleSettings.SetRadioCheckFont( aLabelFont ); |