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/html/swhtml.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/html/swhtml.cxx')
-rw-r--r-- | sw/source/filter/html/swhtml.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index adf16e459d6a..81b6417e6db4 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -4892,7 +4892,7 @@ void SwHTMLParser::InsertSpacer() { nSize = Application::GetDefaultDevice() ->PixelToLogic( Size(0,nSize), - MapMode(MAP_TWIP) ).Height(); + MapMode(MapUnit::MapTwip) ).Height(); } // einen Absatz-Abstand setzen @@ -4940,7 +4940,7 @@ void SwHTMLParser::InsertSpacer() { nSize = Application::GetDefaultDevice() ->PixelToLogic( Size(nSize,0), - MapMode(MAP_TWIP) ).Width(); + MapMode(MapUnit::MapTwip) ).Width(); } if( !m_pPam->GetPoint()->nContent.GetIndex() ) @@ -4975,7 +4975,7 @@ sal_uInt16 SwHTMLParser::ToTwips( sal_uInt16 nPixel ) if( nPixel && Application::GetDefaultDevice() ) { long nTwips = Application::GetDefaultDevice()->PixelToLogic( - Size( nPixel, nPixel ), MapMode( MAP_TWIP ) ).Width(); + Size( nPixel, nPixel ), MapMode( MapUnit::MapTwip ) ).Width(); return nTwips <= USHRT_MAX ? (sal_uInt16)nTwips : USHRT_MAX; } else |