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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/source/filter/xml/xmlexprt.cxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlexprt.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 6e59a8364d09..9c44f8d086ce 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -456,7 +456,7 @@ void ScXMLShapeExport::onExport( const uno::Reference < drawing::XShape >& xShap } } -sal_Int16 ScXMLExport::GetFieldUnit() +sal_Int16 ScXMLExport::GetMeasureUnit() { css::uno::Reference<css::sheet::XGlobalSheetSettings> xProperties = css::sheet::GlobalSheetSettings::create( comphelper::getProcessComponentContext() ); @@ -467,7 +467,7 @@ sal_Int16 ScXMLExport::GetFieldUnit() ScXMLExport::ScXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, OUString const & implementationName, sal_uInt16 nExportFlag) -: SvXMLExport( SvXMLUnitConverter::GetMeasureUnit(GetFieldUnit()), +: SvXMLExport( GetMeasureUnit(), xContext, implementationName, XML_SPREADSHEET, nExportFlag ), pDoc(NULL), nSourceStreamPos(0), diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index a6ed6899a930..d86dd695fb46 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -242,7 +242,7 @@ public: virtual ~ScXMLExport(); - static sal_Int16 GetFieldUnit(); + static sal_Int16 GetMeasureUnit(); inline ScDocument* GetDocument() { return pDoc; } inline const ScDocument* GetDocument() const { return pDoc; } bool IsMatrix (const ScAddress& aCell, |