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 /canvas/source/opengl | |
| parent | merge dbaccess::StorageInputStream with dbaccess::StorageXMLInputStream (diff) | |
| download | core-954f752cf10fc6a8777af2a6a93e496688464687.tar.gz core-954f752cf10fc6a8777af2a6a93e496688464687.zip | |
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 'canvas/source/opengl')
| -rw-r--r-- | canvas/source/opengl/ogl_spritedevicehelper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index 0ccf5b7df17f..50bf7142e9a4 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -160,7 +160,7 @@ namespace oglcanvas // Map a one-by-one millimeter box to pixel SystemChildWindow* pChildWindow = mxContext->getChildWindow(); const MapMode aOldMapMode( pChildWindow->GetMapMode() ); - pChildWindow->SetMapMode( MapMode(MAP_MM) ); + pChildWindow->SetMapMode( MapMode(MapUnit::MapMM) ); const Size aPixelSize( pChildWindow->LogicToPixel(Size(1,1)) ); pChildWindow->SetMapMode( aOldMapMode ); @@ -175,7 +175,7 @@ namespace oglcanvas // Map the pixel dimensions of the output window to millimeter SystemChildWindow* pChildWindow = mxContext->getChildWindow(); const MapMode aOldMapMode( pChildWindow->GetMapMode() ); - pChildWindow->SetMapMode( MapMode(MAP_MM) ); + pChildWindow->SetMapMode( MapMode(MapUnit::MapMM) ); const Size aLogSize( pChildWindow->PixelToLogic(pChildWindow->GetOutputSizePixel()) ); pChildWindow->SetMapMode( aOldMapMode ); |