diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-20 16:41:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-05 06:51:20 +0000 |
| commit | 954f752cf10fc6a8777af2a6a93e496688464687 (patch) | |
| tree | 0fc776cdcb6ad9b1d2b9673ac044bb5b4f496972 /basic/source/runtime/methods1.cxx | |
| parent | c1e18e05a53c1d55afe36a887ca25f74f3f1d32d (diff) | |
convert MapUnit to scoped enum
I left a prefix on the names "Map" so that I would not have to re-arrange
each name too much, since I can't start identifiers with digits like "100thMM"
And remove RSC_EXTRAMAPUNIT, which doesn't seem to be doing anything anymore.
Change-Id: I5187824aa87e30caf5357b51b5384b5ab919d224
Reviewed-on: https://gerrit.libreoffice.org/29096
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basic/source/runtime/methods1.cxx')
| -rw-r--r-- | basic/source/runtime/methods1.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index a60b16d1c79d..8a385c2a3d9b 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -747,7 +747,7 @@ RTLFUNC(TwipsPerPixelX) sal_Int32 nResult = 0; Size aSize( 100,0 ); - MapMode aMap( MAP_TWIP ); + MapMode aMap( MapUnit::MapTwip ); OutputDevice* pDevice = Application::GetDefaultDevice(); if( pDevice ) { @@ -764,7 +764,7 @@ RTLFUNC(TwipsPerPixelY) sal_Int32 nResult = 0; Size aSize( 0,100 ); - MapMode aMap( MAP_TWIP ); + MapMode aMap( MapUnit::MapTwip ); OutputDevice* pDevice = Application::GetDefaultDevice(); if( pDevice ) { @@ -1345,9 +1345,9 @@ static double GetDialogZoomFactor( bool bX, long nValue ) Size aRefSize( nValue, nValue ); Fraction aFracX( 1, 26 ); Fraction aFracY( 1, 24 ); - MapMode aMap( MAP_APPFONT, Point(), aFracX, aFracY ); + MapMode aMap( MapUnit::MapAppFont, Point(), aFracX, aFracY ); Size aScaledSize = pDevice->LogicToPixel( aRefSize, aMap ); - aRefSize = pDevice->LogicToPixel( aRefSize, MapMode(MAP_TWIP) ); + aRefSize = pDevice->LogicToPixel( aRefSize, MapMode(MapUnit::MapTwip) ); double nRef, nScaled; if( bX ) |