[Libreoffice-commits] core.git: formula/source include/formula sc/source
Laurent Charrière
lcharriere at gmail.com
Wed Jan 14 11:54:27 PST 2015
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 3fe6a6b3ca3bc0c7d46fabf66f11f1ef6b4cd4cc
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Tue Jan 13 10:46:38 2015 +0100
fdo#85818: rename SC_OPCODE_KGV to SC_OPCODE_LCM
Change-Id: I4a49a00a8cc74c7ff0752ef0bffbf855fecb232c
Reviewed-on: https://gerrit.libreoffice.org/13894
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 9d22494..2a548b3 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -160,7 +160,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_LOG { Text = "LOG" ; };
String SC_OPCODE_POWER { Text = "POWER" ; };
String SC_OPCODE_GGT { Text = "GCD" ; };
- String SC_OPCODE_KGV { Text = "LCM" ; };
+ String SC_OPCODE_LCM { Text = "LCM" ; };
String SC_OPCODE_MOD { Text = "MOD" ; };
String SC_OPCODE_SUM_PRODUCT { Text = "SUMPRODUCT" ; };
String SC_OPCODE_SUM_SQ { Text = "SUMSQ" ; };
@@ -568,7 +568,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_LOG { Text = "LOG" ; };
String SC_OPCODE_POWER { Text = "POWER" ; };
String SC_OPCODE_GGT { Text = "GCD" ; };
- String SC_OPCODE_KGV { Text = "LCM" ; };
+ String SC_OPCODE_LCM { Text = "LCM" ; };
String SC_OPCODE_MOD { Text = "MOD" ; };
String SC_OPCODE_SUM_PRODUCT { Text = "SUMPRODUCT" ; };
String SC_OPCODE_SUM_SQ { Text = "SUMSQ" ; };
@@ -978,7 +978,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_LOG { Text = "LOG" ; };
String SC_OPCODE_POWER { Text = "POWER" ; };
String SC_OPCODE_GGT { Text = "GCD" ; };
- String SC_OPCODE_KGV { Text = "LCM" ; };
+ String SC_OPCODE_LCM { Text = "LCM" ; };
String SC_OPCODE_MOD { Text = "MOD" ; };
String SC_OPCODE_SUM_PRODUCT { Text = "SUMPRODUCT" ; };
String SC_OPCODE_SUM_SQ { Text = "SUMSQ" ; };
@@ -1726,7 +1726,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "GCD" ;
};
- String SC_OPCODE_KGV
+ String SC_OPCODE_LCM
{
Text [ en-US ] = "LCM" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 6ace741..c69f4fa 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -209,7 +209,7 @@
#define SC_OPCODE_LOG 208
#define SC_OPCODE_POWER 209
#define SC_OPCODE_GGT 210
-#define SC_OPCODE_KGV 211
+#define SC_OPCODE_LCM 211
#define SC_OPCODE_MOD 212
#define SC_OPCODE_SUM_PRODUCT 213
#define SC_OPCODE_SUM_SQ 214
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 039aaaa..9b7867e 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -201,7 +201,7 @@ enum OpCode : sal_uInt16
ocLog = SC_OPCODE_LOG,
ocPower = SC_OPCODE_POWER,
ocGCD = SC_OPCODE_GGT,
- ocLCM = SC_OPCODE_KGV,
+ ocLCM = SC_OPCODE_LCM,
ocMod = SC_OPCODE_MOD,
ocSumProduct = SC_OPCODE_SUM_PRODUCT,
ocSumSQ = SC_OPCODE_SUM_SQ,
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 64c4780..8c041d5 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -4660,7 +4660,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS1
};
};
// -=*# Resource for function LCM #*=-
- Resource SC_OPCODE_KGV
+ Resource SC_OPCODE_LCM
{
String 1 // Description
{
More information about the Libreoffice-commits
mailing list