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 /sw/source/filter/ww8/ww8par4.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 'sw/source/filter/ww8/ww8par4.cxx')
-rw-r--r-- | sw/source/filter/ww8/ww8par4.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx index cbecacd75432..7f88b578b634 100644 --- a/sw/source/filter/ww8/ww8par4.cxx +++ b/sw/source/filter/ww8/ww8par4.cxx @@ -164,7 +164,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp, return false; } - rWMF.SetPrefMapMode( MapMode( MAP_100TH_MM ) ); + rWMF.SetPrefMapMode( MapMode( MapUnit::Map100thMM ) ); // Scale MetaFile to new size and save new size to MetaFile Size aOldSiz( rWMF.GetPrefSize() ); @@ -270,7 +270,7 @@ SwFrameFormat* SwWW8ImplReader::ImportOle(const Graphic* pGrf, pTempSet->Put( aAnchor ); const Size aSizeTwip = OutputDevice::LogicToLogic( - aGraph.GetPrefSize(), aGraph.GetPrefMapMode(), MAP_TWIP ); + aGraph.GetPrefSize(), aGraph.GetPrefMapMode(), MapUnit::MapTwip ); pTempSet->Put( SwFormatFrameSize( ATT_FIX_SIZE, aSizeTwip.Width(), aSizeTwip.Height() ) ); @@ -319,7 +319,7 @@ bool SwWW8ImplReader::ImportOleWMF(tools::SvRef<SotStorage> xSrc1,GDIMetaFile &r aFinalSize.Width() = rX; aFinalSize.Height() = rY; aFinalSize = OutputDevice::LogicToLogic( - aFinalSize, MAP_TWIP, rWMF.GetPrefMapMode() ); + aFinalSize, MapUnit::MapTwip, rWMF.GetPrefMapMode() ); aOrigSize = rWMF.GetPrefSize(); Fraction aScaleX(aFinalSize.Width(),aOrigSize.Width()); Fraction aScaleY(aFinalSize.Height(),aOrigSize.Height()); @@ -354,7 +354,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, { rGraph = *pGrf; const Size aSizeTwip = OutputDevice::LogicToLogic( - rGraph.GetPrefSize(), rGraph.GetPrefMapMode(), MAP_TWIP ); + rGraph.GetPrefSize(), rGraph.GetPrefMapMode(), MapUnit::MapTwip ); nX = aSizeTwip.Width(); nY = aSizeTwip.Height(); } @@ -368,7 +368,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph, { // 03-META stream is not available. Maybe it's a 03-PICT? const Size aSizeTwip = OutputDevice::LogicToLogic( - rGraph.GetPrefSize(), rGraph.GetPrefMapMode(), MAP_TWIP ); + rGraph.GetPrefSize(), rGraph.GetPrefMapMode(), MapUnit::MapTwip ); nX = aSizeTwip.Width(); nY = aSizeTwip.Height(); // PICT: no WMF available -> Graphic instead of OLE |