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 | |
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)
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/textitem.cxx | 4 | ||||
-rw-r--r-- | include/svl/poolitem.hxx | 6 | ||||
-rw-r--r-- | include/svtools/unitconv.hxx | 4 | ||||
-rw-r--r-- | svtools/source/misc/unitconv.cxx | 14 |
5 files changed, 12 insertions, 18 deletions
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index dc1e7ef5de17..1dd0a29d790f 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -520,7 +520,7 @@ namespace // conversion twips for the example-window aSize.Height() = - ItemToControl( nHeight, _pPage->GetItemSet().GetPool()->GetMetric( _nFontHeightWhich ), SFX_FUNIT_TWIP ); + ItemToControl( nHeight, _pPage->GetItemSet().GetPool()->GetMetric( _nFontHeightWhich ), FUNIT_TWIP ); } else if ( !_pFontSizeLB->GetText().isEmpty() ) aSize.Height() = PointToTwips( static_cast<long>(_pFontSizeLB->GetValue() / 10) ); diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 50140033e1ba..dd7f4e0e2c65 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -1099,7 +1099,7 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewP if( SFX_MAPUNIT_RELATIVE != eUnit ) nHeight = nNewHeight + ::ItemToControl( (short)nNewProp, eUnit, - SFX_FUNIT_TWIP ); + FUNIT_TWIP ); else if( 100 != nNewProp ) nHeight = sal_uInt32(( nNewHeight * nNewProp ) / 100 ); else @@ -1117,7 +1117,7 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, sal_uInt16 nNewProp, if( SFX_MAPUNIT_RELATIVE != eMetric ) nHeight = nNewHeight + ::ControlToItem( ::ItemToControl((short)nNewProp, eMetric, - SFX_FUNIT_TWIP ), SFX_FUNIT_TWIP, + FUNIT_TWIP ), FUNIT_TWIP, eCoreMetric ); else if( 100 != nNewProp ) nHeight = sal_uInt32(( nNewHeight * nNewProp ) / 100 ); 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 ); 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 ); } |