summaryrefslogtreecommitdiff
path: root/include/editeng/pbinitem.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-08-19 09:31:35 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-08-19 11:25:18 +0000
commit396138a6bc7192abe0837b419283860d3331f607 (patch)
treef80818ba86220abb8db205b402429e3d45aa62d1 /include/editeng/pbinitem.hxx
parent8b4705e0e0c76503b1ca61cb567d222f49466fc5 (diff)
Resolves: coverity#705366 Mixing enum types
and coverity#705367 Mixing enum types coverity#705371 Mixing enum types coverity#982694 Mixing enum types coverity#1027717 Mixing enum types coverity#1371228 Mixing enum types coverity#1371242 Mixing enum types coverity#1371280 Mixing enum types coverity#1371310 Mixing enum types MapUnit and SfxMapUnit share the same values and are freely cast from one to the other. Now that commit d30a4298bdb5ba53cd1fe659f2b742f218a2e527 Date: Thu Aug 11 15:02:19 2016 +0200 loplugin:unusedenumconstants in package..svtools removed the SfxMapUnit entries that were directly unused, they don't match anymore and casting from one to the other is dangerous. Why there was two of these anyway escapes me, get rid of SfxMapUnit and just use MapUnit universally Change-Id: I4db5dcd04b59be2f85b62b728f96c90afe00c57e Reviewed-on: https://gerrit.libreoffice.org/28234 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/editeng/pbinitem.hxx')
-rw-r--r--include/editeng/pbinitem.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx
index b439c99b5441..3c390451d671 100644
--- a/include/editeng/pbinitem.hxx
+++ b/include/editeng/pbinitem.hxx
@@ -47,9 +47,9 @@ public:
virtual SfxPoolItem* Create( SvStream &, sal_uInt16 ) const override;
virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = nullptr ) const override;
+ MapUnit eCoreMetric,
+ MapUnit ePresMetric,
+ OUString &rText, const IntlWrapper * = nullptr ) const override;
};
inline SvxPaperBinItem::SvxPaperBinItem( const sal_uInt16 nId, const sal_uInt8 nT )