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 /svl | |
| 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 'svl')
| -rw-r--r-- | svl/source/inc/poolio.hxx | 2 | ||||
| -rw-r--r-- | svl/source/items/itempool.cxx | 2 | ||||
| -rw-r--r-- | svl/source/items/poolitem.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index 75ba7334079c..b1cf78f8e15b 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -138,7 +138,7 @@ struct SfxItemPool_Impl , nStoringEnd(0) , nMajorVer(0) , nMinorVer(0) - , eDefMetric(MAP_CM) + , eDefMetric(MapUnit::MapCM) , bInSetItem(false) , bStreaming(false) , mbPersistentRefCounts(false) diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 3fc63112f6be..891fa316c73e 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -176,7 +176,7 @@ SfxItemPool::SfxItemPool pItemInfos(pInfo), pImpl( new SfxItemPool_Impl( this, rName, nStartWhich, nEndWhich ) ) { - pImpl->eDefMetric = MAP_TWIP; + pImpl->eDefMetric = MapUnit::MapTwip; pImpl->nVersion = 0; pImpl->bStreaming = false; pImpl->nLoadingVersion = 0; diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index d6bfea432055..0032ac6c5ad0 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -195,7 +195,7 @@ void SfxPoolItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); xmlTextWriterWriteAttribute(pWriter, BAD_CAST("typeName"), BAD_CAST(typeid(*this).name())); OUString rText; - if (GetPresentation( SfxItemPresentation::Complete, MAP_100TH_MM, MAP_100TH_MM, rText)) + if (GetPresentation( SfxItemPresentation::Complete, MapUnit::Map100thMM, MapUnit::Map100thMM, rText)) xmlTextWriterWriteAttribute(pWriter, BAD_CAST("presentation"), BAD_CAST(rText.getStr())); xmlTextWriterEndElement(pWriter); } |