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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/unodraw/unoprov.cxx | 4 | ||||
| -rw-r--r-- | svx/source/xml/xmlxtexp.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 67467f832f4b..7358264c4ec9 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1034,7 +1034,7 @@ bool SvxMapUnitToMeasureUnit( const short eVcl, short& eApi ) throw() Returns false if conversion is not supported. */ -bool SvxMeasureUnitToFieldUnit( const short eApi, short& eVcl ) throw() +bool SvxMeasureUnitToFieldUnit( const short eApi, FieldUnit& eVcl ) throw() { switch( eApi ) { @@ -1060,7 +1060,7 @@ bool SvxMeasureUnitToFieldUnit( const short eApi, short& eVcl ) throw() /** maps the vcl MapUnit enum to a API constant MeasureUnit. Returns false if conversion is not supported. */ -bool SvxFieldUnitToMeasureUnit( const short eVcl, short& eApi ) throw() +bool SvxFieldUnitToMeasureUnit( const FieldUnit eVcl, short& eApi ) throw() { switch( eVcl ) { diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 511d8ec79fd9..475cb2cd9f44 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -151,7 +151,7 @@ SvxXMLXTableExportComponent::SvxXMLXTableExportComponent( const uno::Reference<xml::sax::XDocumentHandler> & rHandler, const uno::Reference<container::XNameContainer >& xTable, uno::Reference<document::XGraphicObjectResolver >& xGrfResolver ) -: SvXMLExport( xContext, "", rFileName, rHandler, NULL, MAP_100TH_MM), +: SvXMLExport( xContext, "", rFileName, rHandler, NULL, FUNIT_100TH_MM), mxTable( xTable ) { |