Change in core[libreoffice-4-0]: ODFF: write RRI as RRI, not ZGZ

[Eike Rathke (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1922

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/1922/1

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
(cherry picked from commit 8f9cb3dddd2ffe95ebd9934ddafc666a8df854bd)
---
M formula/source/core/resource/core_resource.src
M sc/source/core/tool/compiler.cxx
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 d21a737..f02f806 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -210,7 +210,7 @@
     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 74c2be9..597743a 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2469,7 +2469,8 @@
             // 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 }

-- 
To view, visit https://gerrit.libreoffice.org/1922
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I617eaa37ff483e9a02a218e8432ba918f54bd61a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Eike Rathke <erack at redhat.com>