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 /sd/source/ui/view/sdview4.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 'sd/source/ui/view/sdview4.cxx')
| -rw-r--r-- | sd/source/ui/view/sdview4.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 6ad4b1d7901c..756f2fff2963 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -173,7 +173,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, // create new object Size aSize; - if ( rGraphic.GetPrefMapMode().GetMapUnit() == MAP_PIXEL ) + if ( rGraphic.GetPrefMapMode().GetMapUnit() == MapUnit::MapPixel ) { ::OutputDevice* pOutDev = nullptr; if( mpViewSh ) @@ -183,13 +183,13 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, pOutDev = Application::GetDefaultDevice(); if( pOutDev ) - aSize = pOutDev->PixelToLogic( rGraphic.GetPrefSize(), MAP_100TH_MM ); + aSize = pOutDev->PixelToLogic( rGraphic.GetPrefSize(), MapUnit::Map100thMM ); } else { aSize = OutputDevice::LogicToLogic( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode(), - MapMode( MAP_100TH_MM ) ); + MapMode( MapUnit::Map100thMM ) ); } pNewGrafObj = new SdrGrafObj( rGraphic, Rectangle( rPos, aSize ) ); @@ -489,9 +489,9 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Idle *, void) ::sd::Window* pWin = mpViewSh->GetActiveWindow(); if( pWin ) - aPrefSize = pWin->PixelToLogic( aPrefSize, MAP_100TH_MM ); + aPrefSize = pWin->PixelToLogic( aPrefSize, MapUnit::Map100thMM ); else - aPrefSize = Application::GetDefaultDevice()->PixelToLogic( aPrefSize, MAP_100TH_MM ); + aPrefSize = Application::GetDefaultDevice()->PixelToLogic( aPrefSize, MapUnit::Map100thMM ); } else aPrefSize = Size( 5000, 5000 ); |