diff options
| author | Noel Grandin <noel@peralex.com> | 2014-07-31 10:19:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-07-31 11:38:48 +0200 |
| commit | 7e0e581c162a8836034a47e84d28a638e9aa9744 (patch) | |
| tree | 93c30692cb61c6d5f0731dd080015ffa66cef2fa /include | |
| parent | 65803ad94c8652edb84f82202717b1b206407a65 (diff) | |
cleanup usage of MapUnit enum
some places were using the wrong enum constant, and some places were
unnnecessarily converting to sal_Int16
Change-Id: I754993533c840cd33106820d99af2dc951f26a80
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/unoapi.hxx | 2 | ||||
| -rw-r--r-- | include/xmloff/xmluconv.hxx | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx index 07330ac255ba..076f6295f895 100644 --- a/include/svx/unoapi.hxx +++ b/include/svx/unoapi.hxx @@ -63,7 +63,7 @@ SvxNumBulletItem* SvxGetNumBulletItemByName( SfxItemPool* pPool, const OUString& * Maps the vcl MapUnit enum to a API constant MeasureUnit. * Returns false if conversion is not supported. */ -SVX_DLLPUBLIC bool SvxMapUnitToMeasureUnit( const short nVcl, short& eApi ) throw(); +SVX_DLLPUBLIC bool SvxMapUnitToMeasureUnit( const MapUnit nVcl, short& eApi ) throw(); /** * Maps the API constant MeasureUnit to a vcl MapUnit enum. diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx index 63216feca769..25ef7fcfaa99 100644 --- a/include/xmloff/xmluconv.hxx +++ b/include/xmloff/xmluconv.hxx @@ -39,6 +39,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <tools/fldunit.hxx> +#include <tools/mapunit.hxx> // predeclarations @@ -92,18 +93,18 @@ public: SvXMLUnitConverter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, - sal_Int16 eCoreMeasureUnit, - sal_Int16 eXMLMeasureUnit); + sal_Int16 eCoreMeasureUnit /*css::util::MeasureUnit*/, + sal_Int16 eXMLMeasureUnit /*css::util::MeasureUnit*/); virtual ~SvXMLUnitConverter(); static sal_Int16 GetMeasureUnit(FieldUnit const nFieldUnit); /** sets the default unit for numerical measures */ - void SetCoreMeasureUnit( sal_Int16 const eCoreMeasureUnit ); + void SetCoreMeasureUnit( sal_Int16 const eCoreMeasureUnit /*css::util::MeasureUnit*/); /** sets the default unit for textual measures */ - void SetXMLMeasureUnit( sal_Int16 const eXMLMeasureUnit ); + void SetXMLMeasureUnit( sal_Int16 const eXMLMeasureUnit /*css::util::MeasureUnit*/); /** gets the default unit for textual measures */ sal_Int16 GetXMLMeasureUnit() const; |