diff options
| author | Noel Grandin <noel@peralex.com> | 2014-07-30 14:15:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-07-31 11:38:47 +0200 |
| commit | 65803ad94c8652edb84f82202717b1b206407a65 (patch) | |
| tree | c9de76166e6b7ce9f336edf7c927a30eca0977e6 /include/svx/unoapi.hxx | |
| parent | 62da1a834128f5762fa2e6ceb35fa61372ed5949 (diff) | |
fix some dodgy FieldUnit conversions
the FieldUnit enum was being converted in some dodgy ways and
in some places the MapUnit enum values were being used.
Change-Id: Ic9aacb84058d1c14c3a4a79ef6676082df9a7270
Diffstat (limited to 'include/svx/unoapi.hxx')
| -rw-r--r-- | include/svx/unoapi.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx index 74bd154f08cd..07330ac255ba 100644 --- a/include/svx/unoapi.hxx +++ b/include/svx/unoapi.hxx @@ -27,6 +27,7 @@ #include <svtools/grfmgr.hxx> #include <svl/poolitem.hxx> #include <svx/svxdllapi.h> +#include <tools/fldunit.hxx> class SvxShape; class SdrObject; @@ -68,13 +69,13 @@ SVX_DLLPUBLIC bool SvxMapUnitToMeasureUnit( const short nVcl, short& eApi ) thro * Maps the API constant MeasureUnit to a vcl MapUnit enum. * Returns false if conversion is not supported. */ -SVX_DLLPUBLIC bool SvxMeasureUnitToFieldUnit( const short eApi, short& nVcl ) throw(); +SVX_DLLPUBLIC bool SvxMeasureUnitToFieldUnit( const short eApi, FieldUnit& nVcl ) throw(); /** * Maps the vcl MapUnit enum to a API constant MeasureUnit. * Returns false if conversion is not supported. */ -SVX_DLLPUBLIC bool SvxFieldUnitToMeasureUnit( const short nVcl, short& eApi ) throw(); +SVX_DLLPUBLIC bool SvxFieldUnitToMeasureUnit( const FieldUnit nVcl, short& eApi ) throw(); /** * If the given name is a predefined name for the current language it is replaced by |