diff options
| author | Eike Rathke <erack@redhat.com> | 2013-01-30 01:42:47 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-01-30 01:49:31 +0100 |
| commit | 8f9cb3dddd2ffe95ebd9934ddafc666a8df854bd (patch) | |
| tree | 52859e9543cd5cb1459f0f64db1a3db42adfd894 | |
| parent | d701e808782f5849f22c112311a9553f08c8d553 (diff) | |
ODFF: write RRI as RRI, not ZGZ
ODF OpenFormula defines the function RRI, the legacy OOo XML format
stored that as ZGZ but that was not changed for the ODFF implementation.
Correctly read/write RRI now but still accept ZGZ to be able to load
existing documents.
See also
http://docs.oasis-open.org/office/v1.2/cs01/OpenDocument-v1.2-cs01-part2.html#RRI
Change-Id: I617eaa37ff483e9a02a218e8432ba918f54bd61a
| -rw-r--r-- | formula/source/core/resource/core_resource.src | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/compiler.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index d21a7373f9ac..f02f8068923e 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -210,7 +210,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_COLUMN { Text = "COLUMN" ; }; String SC_OPCODE_ROW { Text = "ROW" ; }; String SC_OPCODE_TABLE { Text = "SHEET" ; }; - String SC_OPCODE_ZGZ { Text = "ZGZ" ; }; + String SC_OPCODE_ZGZ { Text = "RRI" ; }; String SC_OPCODE_ZW { Text = "FV" ; }; String SC_OPCODE_ZZR { Text = "NPER" ; }; String SC_OPCODE_ZINS { Text = "RATE" ; }; diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index e19eb19860df..ca441c253ffa 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -2469,7 +2469,8 @@ bool ScCompiler::IsOpCode( const String& rName, bool bInArray ) // Renamed old names: { "B", ocB }, // B -> BINOM.DIST.RANGE { "TDIST", ocTDist }, // TDIST -> LEGACY.TDIST - { "EASTERSUNDAY", ocEasterSunday } // EASTERSUNDAY -> ORG.OPENOFFICE.EASTERSUNDAY + { "EASTERSUNDAY", ocEasterSunday }, // EASTERSUNDAY -> ORG.OPENOFFICE.EASTERSUNDAY + { "ZGZ", ocZGZ } // ZGZ -> RRI // Renamed new names: // XXX none currently. Example: //{ "ORG.OPENOFFICE.EASTERSUNDAY", ocEasterSunday } |