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/unodraw/unoshap4.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/unodraw/unoshap4.cxx')
| -rw-r--r-- | svx/source/unodraw/unoshap4.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 97fa794b71a9..4b0232d6074b 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -102,7 +102,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPro { try { - MapUnit aMapUnit( MAP_100TH_MM ); // the API handles with MAP_100TH_MM map mode + MapUnit aMapUnit( MapUnit::Map100thMM ); // the API handles with MapUnit::Map100thMM map mode MapUnit aObjUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( embed::Aspects::MSOLE_CONTENT ) ); aTmp = OutputDevice::LogicToLogic( aTmp, aMapUnit, aObjUnit ); xObj->setVisualAreaSize( embed::Aspects::MSOLE_CONTENT, awt::Size( aTmp.Width(), aTmp.Height() ) ); @@ -266,7 +266,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPro awt::Rectangle aVisArea; if( dynamic_cast<const SdrOle2Obj* >(mpObj.get()) != nullptr) { - MapMode aMapMode( MAP_100TH_MM ); // the API uses this map mode + MapMode aMapMode( MapUnit::Map100thMM ); // the API uses this map mode Size aTmp = static_cast<SdrOle2Obj*>(mpObj.get())->GetOrigObjSize( &aMapMode ); // get the size in the requested map mode aVisArea = awt::Rectangle( 0, 0, aTmp.Width(), aTmp.Height() ); } |