diff options
| -rw-r--r-- | include/svx/unoapi.hxx | 2 | ||||
| -rw-r--r-- | include/xmloff/xmluconv.hxx | 9 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExport.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 2 | ||||
| -rw-r--r-- | svx/source/unodraw/unoprov.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/core/xmluconv.cxx | 8 |
6 files changed, 14 insertions, 13 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; diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index ffcf04796434..b200d0b928a7 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -217,8 +217,8 @@ ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext, OUStrin ,m_bAllreadyFilled(false) { setExportFlags( EXPORT_OASIS | nExportFlag); - GetMM100UnitConverter().SetCoreMeasureUnit(MAP_100TH_MM); - GetMM100UnitConverter().SetXMLMeasureUnit(MAP_CM); + GetMM100UnitConverter().SetCoreMeasureUnit(css::util::MeasureUnit::MM_100TH); + GetMM100UnitConverter().SetXMLMeasureUnit(css::util::MeasureUnit::CM); // (getExportFlags() & EXPORT_CONTENT) != 0 ? : XML_N_OOO _GetNamespaceMap().Add( GetXMLToken(XML_NP_OFFICE), GetXMLToken(XML_N_OFFICE ), XML_NAMESPACE_OFFICE ); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 6c1661be179f..82281ddaef13 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1316,7 +1316,7 @@ uno::Any SAL_CALL SdXImpressDocument::getPropertyValue( const OUString& Property break; sal_Int16 nMeasureUnit = 0; - SvxMapUnitToMeasureUnit( (const short)pEmbeddedObj->GetMapUnit(), nMeasureUnit ); + SvxMapUnitToMeasureUnit( pEmbeddedObj->GetMapUnit(), nMeasureUnit ); aAny <<= (sal_Int16)nMeasureUnit; } break; diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 7358264c4ec9..8d0cc2b2aa03 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1008,7 +1008,7 @@ sal_Bool SvxMeasureUnitToMapUnit( const short eApi, int& eVcl ) throw() /** maps the vcl MapUnit enum to a API constant MeasureUnit. Returns false if conversion is not supported. */ -bool SvxMapUnitToMeasureUnit( const short eVcl, short& eApi ) throw() +bool SvxMapUnitToMeasureUnit( const MapUnit eVcl, short& eApi ) throw() { switch( eVcl ) { diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index c441566b3546..5f3eb01c780c 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -59,8 +59,8 @@ const sal_Int8 XML_MAXDIGITSCOUNT_TIME = 11; struct SvXMLUnitConverter::Impl { - sal_Int16 m_eCoreMeasureUnit; - sal_Int16 m_eXMLMeasureUnit; + sal_Int16 m_eCoreMeasureUnit; /*css::util::MeasureUnit*/ + sal_Int16 m_eXMLMeasureUnit; /*css::util::MeasureUnit*/ util::Date m_aNullDate; mutable uno::Reference< text::XNumberingTypeInfo > m_xNumTypeInfo; mutable uno::Reference< i18n::XCharacterClassification > m_xCharClass; @@ -97,12 +97,12 @@ SvXMLUnitConverter::getNumTypeInfo() const return m_pImpl->m_xNumTypeInfo; } -void SvXMLUnitConverter::SetCoreMeasureUnit(sal_Int16 const eCoreMeasureUnit) +void SvXMLUnitConverter::SetCoreMeasureUnit(sal_Int16 const eCoreMeasureUnit/*css::util::MeasureUnit*/) { m_pImpl->m_eCoreMeasureUnit = eCoreMeasureUnit; } -void SvXMLUnitConverter::SetXMLMeasureUnit(sal_Int16 const eXMLMeasureUnit) +void SvXMLUnitConverter::SetXMLMeasureUnit(sal_Int16 const eXMLMeasureUnit/*css::util::MeasureUnit*/) { m_pImpl->m_eXMLMeasureUnit = eXMLMeasureUnit; } |