diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-19 09:31:35 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-19 11:25:18 +0000 |
| commit | 396138a6bc7192abe0837b419283860d3331f607 (patch) | |
| tree | f80818ba86220abb8db205b402429e3d45aa62d1 /sfx2/source/control/ctrlitem.cxx | |
| parent | 8b4705e0e0c76503b1ca61cb567d222f49466fc5 (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 'sfx2/source/control/ctrlitem.cxx')
| -rw-r--r-- | sfx2/source/control/ctrlitem.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index aee8676a5225..29e6eaf28d6a 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -302,7 +302,7 @@ SfxItemState SfxControllerItem::GetItemState } -SfxMapUnit SfxControllerItem::GetCoreMetric() const +MapUnit SfxControllerItem::GetCoreMetric() const /* [Description] @@ -341,7 +341,7 @@ SfxMapUnit SfxControllerItem::GetCoreMetric() const } SAL_INFO( "sfx.control", "W1: Can not find ItemPool!" ); - return SFX_MAPUNIT_100TH_MM; + return MAP_100TH_MM; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |