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/ui/envelp/envfmt.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/ui/envelp/envfmt.cxx')
| -rw-r--r-- | sw/source/ui/envelp/envfmt.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index a15de6dcc864..733b42cd1718 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -235,7 +235,7 @@ IMPL_LINK( SwEnvFormatPage, ModifyHdl, SpinField&, rEdit, void ) long nRotatedWidth = lHeight; long nRotatedHeight = lWidth; Paper ePaper = SvxPaperInfo::GetSvxPaper( - Size(nRotatedWidth, nRotatedHeight), MAP_TWIP, true); + Size(nRotatedWidth, nRotatedHeight), MapUnit::MapTwip, true); for (size_t i = 0; i < aIDs.size(); ++i) if (aIDs[i] == (sal_uInt16)ePaper) m_pSizeFormatBox->SelectEntryPos(static_cast<sal_Int32>(i)); @@ -517,7 +517,7 @@ void SwEnvFormatPage::Reset(const SfxItemSet* rSet) Paper ePaper = SvxPaperInfo::GetSvxPaper( Size( std::min(rItem.lWidth, rItem.lHeight), - std::max(rItem.lWidth, rItem.lHeight)), MAP_TWIP, true); + std::max(rItem.lWidth, rItem.lHeight)), MapUnit::MapTwip, true); for (size_t i = 0; i < aIDs.size(); ++i) if (aIDs[i] == (sal_uInt16)ePaper) m_pSizeFormatBox->SelectEntryPos(static_cast<sal_Int32>(i)); |