summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--formula/source/core/api/FormulaCompiler.cxx2
-rw-r--r--formula/source/core/resource/core_resource.src12
-rw-r--r--include/formula/compiler.hrc2
-rw-r--r--include/formula/opcode.hxx2
-rw-r--r--sc/source/core/inc/interpre.hxx2
-rw-r--r--sc/source/core/tool/interpr2.cxx2
-rw-r--r--sc/source/core/tool/interpr4.cxx2
-rw-r--r--sc/source/filter/excel/xlformula.cxx2
-rw-r--r--sc/source/ui/src/scfuncs.src4
9 files changed, 15 insertions, 15 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 86ac30a09442..7354cfc59484 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1338,7 +1338,7 @@ void FormulaCompiler::Factor()
// Don't use SetExclusiveRecalcModeOnLoad() which would
// override ModeAlways, use
// AddRecalcMode(ScRecalcMode::ONLOAD) instead.
- case ocConvert :
+ case ocConvertOOo :
case ocDde:
case ocMacro:
case ocExternal:
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index d130204c1156..b1f09ddcaf84 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -421,7 +421,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_DDE { Text = "DDE" ; };
String SC_OPCODE_BASE { Text = "BASE" ; };
String SC_OPCODE_DECIMAL { Text = "DECIMAL" ; };
- String SC_OPCODE_CONVERT { Text = "ORG.OPENOFFICE.CONVERT" ; };
+ String SC_OPCODE_CONVERT_OOO { Text = "ORG.OPENOFFICE.CONVERT" ; };
String SC_OPCODE_ROMAN { Text = "ROMAN" ; };
String SC_OPCODE_ARABIC { Text = "ARABIC" ; };
String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; };
@@ -859,7 +859,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_DDE { Text = "DDE" ; };
String SC_OPCODE_BASE { Text = "_xlfn.BASE" ; };
String SC_OPCODE_DECIMAL { Text = "_xlfn.DECIMAL" ; };
- String SC_OPCODE_CONVERT { Text = "_xlfn.ORG.OPENOFFICE.CONVERT" ; };
+ String SC_OPCODE_CONVERT_OOO { Text = "_xlfn.ORG.OPENOFFICE.CONVERT" ; };
String SC_OPCODE_ROMAN { Text = "ROMAN" ; };
String SC_OPCODE_ARABIC { Text = "_xlfn.ARABIC" ; };
String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; };
@@ -1301,7 +1301,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF
String SC_OPCODE_DDE { Text = "DDE" ; };
String SC_OPCODE_BASE { Text = "BASE" ; };
String SC_OPCODE_DECIMAL { Text = "DECIMAL" ; };
- String SC_OPCODE_CONVERT { Text = "CONVERT" ; };
+ String SC_OPCODE_CONVERT_OOO { Text = "CONVERT" ; };
String SC_OPCODE_ROMAN { Text = "ROMAN" ; };
String SC_OPCODE_ARABIC { Text = "ARABIC" ; };
String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; };
@@ -1743,7 +1743,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_API
String SC_OPCODE_DDE { Text = "DDE" ; };
String SC_OPCODE_BASE { Text = "BASE" ; };
String SC_OPCODE_DECIMAL { Text = "DECIMAL" ; };
- String SC_OPCODE_CONVERT { Text = "CONVERT" ; };
+ String SC_OPCODE_CONVERT_OOO { Text = "CONVERT" ; };
String SC_OPCODE_ROMAN { Text = "ROMAN" ; };
String SC_OPCODE_ARABIC { Text = "ARABIC" ; };
String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; };
@@ -2184,7 +2184,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_DDE { Text = "DDE" ; };
String SC_OPCODE_BASE { Text = "BASE" ; };
String SC_OPCODE_DECIMAL { Text = "DECIMAL" ; };
- String SC_OPCODE_CONVERT { Text = "CONVERT" ; };
+ String SC_OPCODE_CONVERT_OOO { Text = "CONVERT" ; };
String SC_OPCODE_ROMAN { Text = "ROMAN" ; };
String SC_OPCODE_ARABIC { Text = "ARABIC" ; };
String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; };
@@ -3748,7 +3748,7 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = "DECIMAL" ;
};
- String SC_OPCODE_CONVERT
+ String SC_OPCODE_CONVERT_OOO
{
Text [ en-US ] = "CONVERT";
};
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 915cea41fc14..92627cd24ad7 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -390,7 +390,7 @@
#define SC_OPCODE_VAR_P_A 379
#define SC_OPCODE_EASTERSUNDAY 380
#define SC_OPCODE_DECIMAL 381
-#define SC_OPCODE_CONVERT 382
+#define SC_OPCODE_CONVERT_OOO 382
#define SC_OPCODE_ROMAN 383
#define SC_OPCODE_MIRR 384
#define SC_OPCODE_CELL 385
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index bfc7ac6323fb..13c85fb100c3 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -485,7 +485,7 @@ enum OpCode : sal_uInt16
ocVarPA = SC_OPCODE_VAR_P_A,
ocEasterSunday = SC_OPCODE_EASTERSUNDAY,
ocDecimal = SC_OPCODE_DECIMAL,
- ocConvert = SC_OPCODE_CONVERT,
+ ocConvertOOo = SC_OPCODE_CONVERT_OOO,
ocRoman = SC_OPCODE_ROMAN,
ocHyperLink = SC_OPCODE_HYPERLINK,
ocGetPivotData = SC_OPCODE_GET_PIVOT_DATA,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 6dcab800ba56..e26aa5a64b6e 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -729,7 +729,7 @@ void ScStyle();
void ScDde();
void ScBase();
void ScDecimal();
-void ScConvert();
+void ScConvertOOo();
void ScEuroConvert();
// financial functions
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 3d7c036cd505..455ac73f28a3 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2954,7 +2954,7 @@ void ScInterpreter::ScDecimal()
}
}
-void ScInterpreter::ScConvert()
+void ScInterpreter::ScConvertOOo()
{ // Value, FromUnit, ToUnit
if ( MustHaveParamCount( GetByte(), 3 ) )
{
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 49bc50faa641..8c4dd5cc6bda 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4289,7 +4289,7 @@ StackVar ScInterpreter::Interpret()
case ocDde : ScDde(); break;
case ocBase : ScBase(); break;
case ocDecimal : ScDecimal(); break;
- case ocConvert : ScConvert(); break;
+ case ocConvertOOo : ScConvertOOo(); break;
case ocEuroConvert : ScEuroConvert(); break;
case ocRoman : ScRoman(); break;
case ocArabic : ScArabic(); break;
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 6e6635e02977..1dc696e1c9cd 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -624,7 +624,7 @@ static const XclFunctionInfo saFuncTable_OOoLO[] =
EXC_FUNCENTRY_OOO_IBR( ocCurrent, 0, 0, 0, "CURRENT" ), // was written wrongly, read it
EXC_FUNCENTRY_OOO( ocStyle, 1, 3, 0, "ORG.OPENOFFICE.STYLE" ),
EXC_FUNCENTRY_OOO_IBR( ocStyle, 1, 3, 0, "STYLE" ), // was written wrongly, read it
- EXC_FUNCENTRY_OOO( ocConvert, 3, 3, 0, "ORG.OPENOFFICE.CONVERT" ),
+ EXC_FUNCENTRY_OOO( ocConvertOOo, 3, 3, 0, "ORG.OPENOFFICE.CONVERT" ),
EXC_FUNCENTRY_OOO( ocColor, 3, 4, 0, "ORG.LIBREOFFICE.COLOR" ),
EXC_FUNCENTRY_OOO( ocRawSubtract, 2, MX, 0, "ORG.LIBREOFFICE.RAWSUBTRACT" ),
EXC_FUNCENTRY_OOO( ocWeeknumOOo, 2, 2, 0, "ORG.LIBREOFFICE.WEEKNUM_OOO" ),
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index af30bb5967ff..0774875c8727 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -12397,8 +12397,8 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
Text [ en-US ] = "The base number for conversion must be in the range 2 - 36." ;
};
};
- // -=*# Resource for function CONVERT #*=-
- Resource SC_OPCODE_CONVERT
+ // -=*# Resource for function CONVERT_OOO #*=-
+ Resource SC_OPCODE_CONVERT_OOO
{
String 1 // Description
{
generated by cgit (git 2.34.1) at 2024-08-12 04:26:27 +0000