diff options
author | Eike Rathke <erack@redhat.com> | 2013-01-24 23:17:00 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2013-01-25 00:23:36 +0100 |
commit | 1162738c6fbd8505ffa27b28118318cc522a5368 (patch) | |
tree | 803682d645811b0451f29667275fbf87be9a3673 /sc/source/filter/inc/formulabase.hxx | |
parent | 2823789bec0c029d9714aff0ed65923e23177ef9 (diff) |
resolved fdo#59819 write correct OOXML function name mapping
OOXML export so far used the internal English PODF symbols that worked
only by accident. As soon as function names or operators differed it was
plain wrong. Use the existing OOXML mapping instead that also the import
uses.
For example, in OOXML the IFNA function is stored as _xlfn.IFNA, Excel
2013 could not read the IFNA that we wrote.
Also, do not write a <definedName> element in OOXML for new functions
that in the binary format are written as macro calls and need a defined
name entry.
Change-Id: Ib6de1f8b65d0634c2d78229ddb4922778a33923b
Diffstat (limited to 'sc/source/filter/inc/formulabase.hxx')
-rw-r--r-- | sc/source/filter/inc/formulabase.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index 8fbe09d60679..082f3c604965 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -539,7 +539,8 @@ struct FunctionProviderImpl; class FunctionProvider // not derived from WorkbookHelper to make it usable in file dumpers { public: - explicit FunctionProvider( FilterType eFilter, BiffType eBiff, bool bImportFilter ); + explicit FunctionProvider( FilterType eFilter, BiffType eBiff, bool bImportFilter, + bool bCallerKnowsAboutMacroExport ); virtual ~FunctionProvider(); /** Returns the function info for an OOXML function name, or 0 on error. */ @@ -580,7 +581,8 @@ class OpCodeProvider : public FunctionProvider // not derived from WorkbookHelpe public: explicit OpCodeProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxModelFactory, - FilterType eFilter, BiffType eBiff, bool bImportFilter ); + FilterType eFilter, BiffType eBiff, bool bImportFilter, + bool bCallerKnowsAboutMacroExport = false ); virtual ~OpCodeProvider(); /** Returns the structure containing all token op-codes for operators and |