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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/source/ui/unoidl/UnoDocumentSettings.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx index 8b3851b7192e..e792db8d4d30 100644 --- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx +++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx @@ -658,10 +658,10 @@ throw (UnknownPropertyException, PropertyVetoException, sal_Int16 nValue = 0; if( *pValues >>= nValue ) { - short nFieldUnit; + FieldUnit nFieldUnit; if( SvxMeasureUnitToFieldUnit( nValue, nFieldUnit ) ) { - pDoc->SetUIUnit((FieldUnit)nFieldUnit ); + pDoc->SetUIUnit( nFieldUnit ); bOk = true; } } @@ -1065,7 +1065,7 @@ throw (UnknownPropertyException, WrappedTargetException, RuntimeException) case HANDLE_MEASUREUNIT: { short nMeasure; - SvxFieldUnitToMeasureUnit( (const short)pDoc->GetUIUnit(), nMeasure ); + SvxFieldUnitToMeasureUnit( pDoc->GetUIUnit(), nMeasure ); *pValue <<= (sal_Int16)nMeasure; } break; |