diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-06-08 13:50:37 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-06-08 13:44:11 +0000 |
| commit | 7f4230675c6c78ebea8b6db3f3612e3ef6fb23df (patch) | |
| tree | e57aee541754d2107f6175bf461f567b86ef8333 /svtools | |
| parent | ca96e9a8c20b9fc60bf82e6f510e5469de01103a (diff) | |
tdf#90804 remove SfxFieldUnit enum
b78d881520f2eb658180e2c90ffee3d30a80f0ae removed unused values
from SfxFieldUnit enum. This broke the mapping between SfxFieldUnit
and FieldUnit. In fact SfxFieldUnit was redundant.
Change-Id: I13c7e7d708c6eeab0de192f4cd110b0a23989a31
Reviewed-on: https://gerrit.libreoffice.org/16150
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/misc/unitconv.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx index f9b3a884663f..190cb0f8d05b 100644 --- a/svtools/source/misc/unitconv.cxx +++ b/svtools/source/misc/unitconv.cxx @@ -185,7 +185,7 @@ long CalcToUnit( float nIn, SfxMapUnit eUnit ) -long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl ) +long ItemToControl( long nIn, SfxMapUnit eItem, FieldUnit eCtrl ) { long nOut = 0; @@ -199,13 +199,13 @@ long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl ) nIn /= 10; else if ( eItem == SFX_MAPUNIT_100TH_MM ) nIn /= 100; - nOut = TransformMetric( nIn, FUNIT_MM, (FieldUnit)eCtrl ); + nOut = TransformMetric( nIn, FUNIT_MM, eCtrl ); } break; case SFX_MAPUNIT_CM: { - nOut = TransformMetric( nIn, FUNIT_CM, (FieldUnit)eCtrl ); + nOut = TransformMetric( nIn, FUNIT_CM, eCtrl ); } break; @@ -220,19 +220,19 @@ long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl ) nIn /= 100; else if ( eItem == SFX_MAPUNIT_1000TH_INCH ) nIn /= 1000; - nOut = TransformMetric( nIn, FUNIT_INCH, (FieldUnit)eCtrl ); + nOut = TransformMetric( nIn, FUNIT_INCH, eCtrl ); } break; case SFX_MAPUNIT_POINT: { - nOut = TransformMetric( nIn, FUNIT_POINT, (FieldUnit)eCtrl ); + nOut = TransformMetric( nIn, FUNIT_POINT, eCtrl ); } break; case SFX_MAPUNIT_TWIP: { - nOut = TransformMetric( nIn, FUNIT_TWIP, (FieldUnit)eCtrl ); + nOut = TransformMetric( nIn, FUNIT_TWIP, eCtrl ); } break; default: ;//prevent warning @@ -242,7 +242,7 @@ long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl ) -long ControlToItem( long nIn, SfxFieldUnit eCtrl, SfxMapUnit eItem ) +long ControlToItem( long nIn, FieldUnit eCtrl, SfxMapUnit eItem ) { return ItemToControl( nIn, eItem, eCtrl ); } |