[Libreoffice-commits] core.git: formula/source include/formula sc/source

[Laurent Charrière]

 formula/source/core/resource/core_resource.src |    8 ++++----
 include/formula/compiler.hrc                   |    2 +-
 include/formula/opcode.hxx                     |    2 +-
 sc/source/ui/src/scfuncs.src                   |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f7f8d82a25b0c55bcd2225ca0cac1d93c676f544
Author: Laurent Charrière <lcharriere at gmail.com>
Date:   Tue Jan 13 10:50:24 2015 +0100

    fdo#85818: rename SC_OPCODE_GGT to SC_OPCODE_GCD
    
    Change-Id: I65a79d4e88f82cb76d9b6ab39f06a11acd4f3e41
    Reviewed-on: https://gerrit.libreoffice.org/13895
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index 2a548b3..93d08f2 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -159,7 +159,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
     String SC_OPCODE_TRUNC { Text = "TRUNC" ; };
     String SC_OPCODE_LOG { Text = "LOG" ; };
     String SC_OPCODE_POWER { Text = "POWER" ; };
-    String SC_OPCODE_GGT { Text = "GCD" ; };
+    String SC_OPCODE_GCD { Text = "GCD" ; };
     String SC_OPCODE_LCM { Text = "LCM" ; };
     String SC_OPCODE_MOD { Text = "MOD" ; };
     String SC_OPCODE_SUM_PRODUCT { Text = "SUMPRODUCT" ; };
@@ -567,7 +567,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
     String SC_OPCODE_TRUNC { Text = "TRUNC" ; };
     String SC_OPCODE_LOG { Text = "LOG" ; };
     String SC_OPCODE_POWER { Text = "POWER" ; };
-    String SC_OPCODE_GGT { Text = "GCD" ; };
+    String SC_OPCODE_GCD { Text = "GCD" ; };
     String SC_OPCODE_LCM { Text = "LCM" ; };
     String SC_OPCODE_MOD { Text = "MOD" ; };
     String SC_OPCODE_SUM_PRODUCT { Text = "SUMPRODUCT" ; };
@@ -977,7 +977,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
     String SC_OPCODE_TRUNC { Text = "TRUNC" ; };
     String SC_OPCODE_LOG { Text = "LOG" ; };
     String SC_OPCODE_POWER { Text = "POWER" ; };
-    String SC_OPCODE_GGT { Text = "GCD" ; };
+    String SC_OPCODE_GCD { Text = "GCD" ; };
     String SC_OPCODE_LCM { Text = "LCM" ; };
     String SC_OPCODE_MOD { Text = "MOD" ; };
     String SC_OPCODE_SUM_PRODUCT { Text = "SUMPRODUCT" ; };
@@ -1722,7 +1722,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
     {
         Text [ en-US ] = "POWER" ;
     };
-    String SC_OPCODE_GGT
+    String SC_OPCODE_GCD
     {
         Text [ en-US ] = "GCD" ;
     };
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index c69f4fa..fc47ae8 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -208,7 +208,7 @@
 #define SC_OPCODE_TRUNC             207
 #define SC_OPCODE_LOG               208
 #define SC_OPCODE_POWER             209
-#define SC_OPCODE_GGT               210
+#define SC_OPCODE_GCD               210
 #define SC_OPCODE_LCM               211
 #define SC_OPCODE_MOD               212
 #define SC_OPCODE_SUM_PRODUCT       213
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 9b7867e..724667f 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -200,7 +200,7 @@ enum OpCode : sal_uInt16
         ocTrunc             = SC_OPCODE_TRUNC,
         ocLog               = SC_OPCODE_LOG,
         ocPower             = SC_OPCODE_POWER,
-        ocGCD               = SC_OPCODE_GGT,
+        ocGCD               = SC_OPCODE_GCD,
         ocLCM               = SC_OPCODE_LCM,
         ocMod               = SC_OPCODE_MOD,
         ocSumProduct        = SC_OPCODE_SUM_PRODUCT,
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 8c041d5..0c0b310 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -4636,7 +4636,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
         };
     };
      // -=*# Resource for function GCD #*=-
-    Resource SC_OPCODE_GGT
+    Resource SC_OPCODE_GCD
     {
         String 1 // Description
         {