[Libreoffice-commits] core.git: formula/source include/formula sc/source
Laurent Charrière
lcharriere at gmail.com
Wed Jan 14 11:52:15 PST 2015
formula/source/core/resource/core_resource.src | 8 ++++----
include/formula/compiler.hrc | 2 +-
include/formula/opcode.hxx | 2 +-
sc/source/core/inc/interpre.hxx | 2 +-
sc/source/core/tool/interpr1.cxx | 2 +-
sc/source/core/tool/interpr4.cxx | 2 +-
sc/source/filter/excel/xlformula.cxx | 2 +-
sc/source/filter/lotus/lotform.cxx | 4 ++--
sc/source/filter/qpro/qproform.cxx | 2 +-
sc/source/ui/src/scfuncs.src | 2 +-
10 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 975832d885ca5d185e91a975b157bf06bf9a7a0e
Author: Laurent Charrière <lcharriere at gmail.com>
Date: Mon Jan 12 17:58:29 2015 +0100
sc: rename ocPropper et al. to ocProper et al.
Change-Id: I245ad8f7418bed707953ecf80c71de07e0cc00d1
Reviewed-on: https://gerrit.libreoffice.org/13888
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 2f79b48..3dfec5c 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -122,7 +122,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_CODE { Text = "CODE" ; };
String SC_OPCODE_TRIM { Text = "TRIM" ; };
String SC_OPCODE_UPPER { Text = "UPPER" ; };
- String SC_OPCODE_PROPPER { Text = "PROPER" ; };
+ String SC_OPCODE_PROPER { Text = "PROPER" ; };
String SC_OPCODE_LOWER { Text = "LOWER" ; };
String SC_OPCODE_LEN { Text = "LEN" ; };
String SC_OPCODE_T { Text = "T" ; };
@@ -530,7 +530,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_CODE { Text = "CODE" ; };
String SC_OPCODE_TRIM { Text = "TRIM" ; };
String SC_OPCODE_UPPER { Text = "UPPER" ; };
- String SC_OPCODE_PROPPER { Text = "PROPER" ; };
+ String SC_OPCODE_PROPER { Text = "PROPER" ; };
String SC_OPCODE_LOWER { Text = "LOWER" ; };
String SC_OPCODE_LEN { Text = "LEN" ; };
String SC_OPCODE_T { Text = "T" ; };
@@ -940,7 +940,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_CODE { Text = "CODE" ; };
String SC_OPCODE_TRIM { Text = "TRIM" ; };
String SC_OPCODE_UPPER { Text = "UPPER" ; };
- String SC_OPCODE_PROPPER { Text = "PROPER" ; };
+ String SC_OPCODE_PROPER { Text = "PROPER" ; };
String SC_OPCODE_LOWER { Text = "LOWER" ; };
String SC_OPCODE_LEN { Text = "LEN" ; };
String SC_OPCODE_T { Text = "T" ; };
@@ -1570,7 +1570,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "UPPER" ;
};
- String SC_OPCODE_PROPPER
+ String SC_OPCODE_PROPER
{
Text [ en-US ] = "PROPER" ;
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index e645fcb..9578a2a 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -166,7 +166,7 @@
#define SC_OPCODE_CODE 133
#define SC_OPCODE_TRIM 134
#define SC_OPCODE_UPPER 135
-#define SC_OPCODE_PROPPER 136
+#define SC_OPCODE_PROPER 136
#define SC_OPCODE_LOWER 137
#define SC_OPCODE_LEN 138
#define SC_OPCODE_T 139 /* miscellaneous, part 21 */
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 57aa6a1..25da573 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -158,7 +158,7 @@ enum OpCode : sal_uInt16
ocCode = SC_OPCODE_CODE,
ocTrim = SC_OPCODE_TRIM,
ocUpper = SC_OPCODE_UPPER,
- ocPropper = SC_OPCODE_PROPPER,
+ ocProper = SC_OPCODE_PROPER,
ocLower = SC_OPCODE_LOWER,
ocLen = SC_OPCODE_LEN,
ocT = SC_OPCODE_T,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 6c7cd09..e3b85a3 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -478,7 +478,7 @@ void ScN();
void ScCode();
void ScTrim();
void ScUpper();
-void ScPropper();
+void ScProper();
void ScLower();
void ScLen();
void ScT();
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 7d5975d..77dfcad 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2883,7 +2883,7 @@ void ScInterpreter::ScUpper()
PushString(aString);
}
-void ScInterpreter::ScPropper()
+void ScInterpreter::ScProper()
{
//2do: what to do with I18N-CJK ?!?
OUStringBuffer aStr(GetString().getString());
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index d1620fe..311f86d 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3962,7 +3962,7 @@ StackVar ScInterpreter::Interpret()
case ocCode : ScCode(); break;
case ocTrim : ScTrim(); break;
case ocUpper : ScUpper(); break;
- case ocPropper : ScPropper(); break;
+ case ocProper : ScProper(); break;
case ocLower : ScLower(); break;
case ocLen : ScLen(); break;
case ocT : ScT(); break;
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 5869f96..cd019cf 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -171,7 +171,7 @@ static const XclFunctionInfo saFuncTable_2[] =
{ ocChar, 111, 1, 1, V, { VR }, 0, 0 },
{ ocLower, 112, 1, 1, V, { VR }, 0, 0 },
{ ocUpper, 113, 1, 1, V, { VR }, 0, 0 },
- { ocPropper, 114, 1, 1, V, { VR }, 0, 0 },
+ { ocProper, 114, 1, 1, V, { VR }, 0, 0 },
{ ocLeft, 115, 1, 2, V, { VR }, 0, 0 },
{ ocRight, 116, 1, 2, V, { VR }, 0, 0 },
{ ocExact, 117, 2, 2, V, { VR }, 0, 0 },
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 5feee26..a4ef34e 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -1033,7 +1033,7 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex )
ocLeft, // 104 Left()
ocRight, // 105 Right()
ocReplace, // 106 Replace()
- ocPropper, // 107 Proper()
+ ocProper, // 107 Proper()
ocNoName, // 108 Cell()
ocTrim, // 109 Trim()
ocClean, // 110 Clean()
@@ -1562,7 +1562,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
ocLeft, // 104 Left()
ocRight, // 105 Right()
ocReplace, // 106 Replace()
- ocPropper, // 107 Proper()
+ ocProper, // 107 Proper()
ocNoName, // 108 Cell()
ocTrim, // 109 Trim()
ocClean, // 110 Clean()
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index 14bf6c1..ab1c80d 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -479,7 +479,7 @@ static const struct
{ ocLeft, FT_FuncFix2 },
{ ocRight, FT_FuncFix2 },
{ ocReplace, FT_FuncFix4 },
- { ocPropper, FT_FuncFix1 },
+ { ocProper, FT_FuncFix1 },
{ ocCell, FT_FuncFix2 },
{ ocTrim, FT_FuncFix1 },
{ ocClean, FT_FuncFix1 },
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index b5e8fdc..b6b3c98 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -10931,7 +10931,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
};
// -=*# Resource for function PROPER #*=-
- Resource SC_OPCODE_PROPPER
+ Resource SC_OPCODE_PROPER
{
String 1 // Description
{
More information about the Libreoffice-commits
mailing list