formula/source/core/resource/core_resource.src | 2 +-
sc/source/core/tool/compiler.cxx | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 8f9cb3dddd2ffe95ebd9934ddafc666a8df854bd
Author: Eike Rathke <er...@redhat.com>
Date: Wed Jan 30 01:42:47 2013 +0100
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
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 @@ 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 e19eb19..ca441c2 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 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
