diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-20 00:54:36 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-09-20 00:54:52 +0300 |
| commit | 25f935bfb44b87271eb11e719c4d1fb8624bdd02 (patch) | |
| tree | 8dd499945234e89ad6f3eb46966ee899147542d4 /vcl/aqua/source/window/salframe.cxx | |
| parent | 591e23d03c27e2658889d913626fdcb2837d9064 (diff) | |
64-bit fixes
Change-Id: I268ccab01e030535f04ef1256dc702b07cbc6611
Diffstat (limited to 'vcl/aqua/source/window/salframe.cxx')
| -rw-r--r-- | vcl/aqua/source/window/salframe.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index b427e2e20165..924210d56911 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -1199,7 +1199,7 @@ static Color getColor( NSColor* pSysColor, const Color& rDefault, NSWindow* pWin NSColor* pRBGColor = [pSysColor colorUsingColorSpaceName: NSDeviceRGBColorSpace device: [pWin deviceDescription]]; if( pRBGColor ) { - float r = 0, g = 0, b = 0, a = 0; + CGFloat r = 0, g = 0, b = 0, a = 0; [pRBGColor getRed: &r green: &g blue: &b alpha: &a]; aRet = Color( int(r*255.999), int(g*255.999), int(b*255.999) ); /* @@ -1227,7 +1227,7 @@ static Font getFont( NSFont* pFont, long nDPIY, const Font& rDefault ) return aResult; } -void AquaSalFrame::getResolution( long& o_rDPIX, long& o_rDPIY ) +void AquaSalFrame::getResolution( sal_Int32& o_rDPIX, sal_Int32& o_rDPIY ) { if( ! mpGraphics ) { @@ -1271,7 +1271,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings ) // get the system font settings Font aAppFont = aStyleSettings.GetAppFont(); - long nDPIX = 72, nDPIY = 72; + sal_Int32 nDPIX = 72, nDPIY = 72; getResolution( nDPIX, nDPIY ); aAppFont = getFont( [NSFont systemFontOfSize: 0], nDPIY, aAppFont ); |