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 /svx/source/svdraw/svdmodel.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 'svx/source/svdraw/svdmodel.cxx')
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 4bfb71beba97..dab3a8659519 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -937,20 +937,20 @@ void SdrModel::ImpSetUIUnit() // normalize on meters resp. inch switch (eObjUnit) { - case MAP_100TH_MM : nUIUnitKomma+=5; break; - case MAP_10TH_MM : nUIUnitKomma+=4; break; - case MAP_MM : nUIUnitKomma+=3; break; - case MAP_CM : nUIUnitKomma+=2; break; - case MAP_1000TH_INCH: nUIUnitKomma+=3; break; - case MAP_100TH_INCH : nUIUnitKomma+=2; break; - case MAP_10TH_INCH : nUIUnitKomma+=1; break; - case MAP_INCH : nUIUnitKomma+=0; break; - case MAP_POINT : nDiv=72; break; // 1Pt = 1/72" - case MAP_TWIP : nDiv=144; nUIUnitKomma++; break; // 1Twip = 1/1440" - case MAP_PIXEL : break; - case MAP_SYSFONT : break; - case MAP_APPFONT : break; - case MAP_RELATIVE : break; + case MapUnit::Map100thMM : nUIUnitKomma+=5; break; + case MapUnit::Map10thMM : nUIUnitKomma+=4; break; + case MapUnit::MapMM : nUIUnitKomma+=3; break; + case MapUnit::MapCM : nUIUnitKomma+=2; break; + case MapUnit::Map1000thInch: nUIUnitKomma+=3; break; + case MapUnit::Map100thInch : nUIUnitKomma+=2; break; + case MapUnit::Map10thInch : nUIUnitKomma+=1; break; + case MapUnit::MapInch : nUIUnitKomma+=0; break; + case MapUnit::MapPoint : nDiv=72; break; // 1Pt = 1/72" + case MapUnit::MapTwip : nDiv=144; nUIUnitKomma++; break; // 1Twip = 1/1440" + case MapUnit::MapPixel : break; + case MapUnit::MapSysFont : break; + case MapUnit::MapAppFont : break; + case MapUnit::MapRelative : break; default: break; } // switch |