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 /vcl/source/app | |
| 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 'vcl/source/app')
| -rw-r--r-- | vcl/source/app/settings.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/app/svapp.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 6a97396677cc..1cab69d178dc 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -2056,7 +2056,7 @@ const Size& StyleSettings::GetListBoxPreviewDefaultPixelSize() const if(0 == mxData->maListBoxPreviewDefaultPixelSize.Width() || 0 == mxData->maListBoxPreviewDefaultPixelSize.Height()) { const_cast< StyleSettings* >(this)->mxData->maListBoxPreviewDefaultPixelSize = - Application::GetDefaultDevice()->LogicToPixel(mxData->maListBoxPreviewDefaultLogicSize, MAP_APPFONT); + Application::GetDefaultDevice()->LogicToPixel(mxData->maListBoxPreviewDefaultLogicSize, MapUnit::MapAppFont); } return mxData->maListBoxPreviewDefaultPixelSize; diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 98dfacdb2d48..becfa0f9b0e9 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -723,7 +723,7 @@ void Application::SetSettings( const AllSettings& rSettings ) while ( pFrame ) { // restore AppFont cache data - pFrame->mpWindowImpl->mpFrameData->meMapUnit = MAP_PIXEL; + pFrame->mpWindowImpl->mpFrameData->meMapUnit = MapUnit::MapPixel; // call UpdateSettings from ClientWindow in order to prevent updating data twice vcl::Window* pClientWin = pFrame; |