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 16:11:52 +0200 |
| commit | fdc99b23b56414fa126814f9c64554f19f883326 (patch) | |
| tree | 76ad569b09823dcc2ebb5085cd3f1f80fc59c734 /include | |
| parent | 81a4cd506929416de278a94279c4774ad5a7ac95 (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>
(cherry picked from commit 7f4230675c6c78ebea8b6db3f3612e3ef6fb23df)
Diffstat (limited to 'include')
| -rw-r--r-- | include/svl/poolitem.hxx | 6 | ||||
| -rw-r--r-- | include/svtools/unitconv.hxx | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 4cd3c88947e4..518c875d96f1 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -80,12 +80,6 @@ inline ::com::sun::star::uno::Any Bool2Any( bool bValue ) return ::com::sun::star::uno::Any( &bValue, cppu::UnoType<bool>::get() ); } - -enum SfxFieldUnit -{ - SFX_FUNIT_NONE, SFX_FUNIT_TWIP -}; - enum SfxMapUnit { SFX_MAPUNIT_100TH_MM, diff --git a/include/svtools/unitconv.hxx b/include/svtools/unitconv.hxx index e95bb90082b2..33fb8dd06740 100644 --- a/include/svtools/unitconv.hxx +++ b/include/svtools/unitconv.hxx @@ -37,8 +37,8 @@ SVT_DLLPUBLIC void SetFieldUnit( MetricBox& rCtrl, FieldUnit eUnit, bool bA SVT_DLLPUBLIC long CalcToUnit( float nIn, SfxMapUnit eUnit ); SVT_DLLPUBLIC long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFactor ); -SVT_DLLPUBLIC long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl ); -SVT_DLLPUBLIC long ControlToItem( long nIn, SfxFieldUnit eCtrl, SfxMapUnit eItem ); +SVT_DLLPUBLIC long ItemToControl( long nIn, SfxMapUnit eItem, FieldUnit eCtrl ); +SVT_DLLPUBLIC long ControlToItem( long nIn, FieldUnit eCtrl, SfxMapUnit eItem ); SVT_DLLPUBLIC FieldUnit MapToFieldUnit( const SfxMapUnit eUnit ); |