[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-6' - basic/source formula/source sc/source sw/source
Caolán McNamara
caolanm at redhat.com
Tue Mar 13 20:10:40 UTC 2018
basic/source/classes/sb.src | 1 -
formula/source/core/resource/core_resource.src | 21 ++++++++++-----------
sc/source/ui/src/scerrors.src | 3 ---
sw/source/ui/app/error.src | 3 ---
4 files changed, 10 insertions(+), 18 deletions(-)
New commits:
commit 0f36da93f6f58bf5fe8e6390133240e0f0476b55
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 26 11:16:31 2018 +0000
tdf#115866 comments inside StringArray blocks drop translations
Change-Id: I422d87bd51e581eebafe961d308923a27c004f42
Reviewed-on: https://gerrit.libreoffice.org/50353
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Eike Rathke <erack at redhat.com>
(cherry picked from commit ba9572cb7a5e9e5bde8175e56f9b684919bfd2cb)
Reviewed-on: https://gerrit.libreoffice.org/50770
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/basic/source/classes/sb.src b/basic/source/classes/sb.src
index 634dcab034bd..edd98d3ad072 100644
--- a/basic/source/classes/sb.src
+++ b/basic/source/classes/sb.src
@@ -117,7 +117,6 @@ StringArray RID_BASIC_START
< "Error executing a method." ; ERRCODE_BASIC_METHOD_FAILED & ERRCODE_RES_MASK ; >;
< "Unable to set property." ; ERRCODE_BASIC_SETPROP_FAILED & ERRCODE_RES_MASK ; >;
< "Unable to determine property." ; ERRCODE_BASIC_GETPROP_FAILED & ERRCODE_RES_MASK ; >;
- // Compiler errors. These are not runtime errors.
< "Unexpected symbol: $(ARG1)." ; ERRCODE_BASIC_UNEXPECTED & ERRCODE_RES_MASK ; >;
< "Expected: $(ARG1)." ; ERRCODE_BASIC_EXPECTED & ERRCODE_RES_MASK ; >;
< "Symbol expected." ; ERRCODE_BASIC_SYMBOL_EXPECTED & ERRCODE_RES_MASK ; >;
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index 4861720ec0f5..cd2ba7a761e1 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -37,7 +37,6 @@ StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
< "CHOOSE" ; SC_OPCODE_CHOOSE; >;
< "(" ; SC_OPCODE_OPEN; >;
< ")" ; SC_OPCODE_CLOSE; >;
- // SC_OPCODE_TABLE_REF_... not supported in ODFF
< "{" ; SC_OPCODE_ARRAY_OPEN; >;
< "}" ; SC_OPCODE_ARRAY_CLOSE; >;
< "|" ; SC_OPCODE_ARRAY_ROW_SEP; >;
@@ -273,7 +272,7 @@ StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
< "LOOKUP" ; SC_OPCODE_LOOKUP; >;
< "VLOOKUP" ; SC_OPCODE_V_LOOKUP; >;
< "HLOOKUP" ; SC_OPCODE_H_LOOKUP; >;
- < "ORG.OPENOFFICE.MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >; // legacy for range list (union)
+ < "ORG.OPENOFFICE.MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >;
< "OFFSET" ; SC_OPCODE_OFFSET; >;
< "INDEX" ; SC_OPCODE_INDEX; >;
< "AREAS" ; SC_OPCODE_AREAS; >;
@@ -715,7 +714,7 @@ StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
< "LOOKUP" ; SC_OPCODE_LOOKUP; >;
< "VLOOKUP" ; SC_OPCODE_V_LOOKUP; >;
< "HLOOKUP" ; SC_OPCODE_H_LOOKUP; >;
- < "_xlfn.ORG.OPENOFFICE.MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >; // legacy for range list (union)
+ < "_xlfn.ORG.OPENOFFICE.MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >;
< "OFFSET" ; SC_OPCODE_OFFSET; >;
< "INDEX" ; SC_OPCODE_INDEX; >;
< "AREAS" ; SC_OPCODE_AREAS; >;
@@ -1115,7 +1114,7 @@ StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF
< "DDB" ; SC_OPCODE_DDB; >;
< "DB" ; SC_OPCODE_DB; >;
< "VDB" ; SC_OPCODE_VBD; >;
- < "DURATION" ; SC_OPCODE_PDURATION; >; // wrong but ODF1.1, keep it.
+ < "DURATION" ; SC_OPCODE_PDURATION; >;
< "SLN" ; SC_OPCODE_SLN; >;
< "PMT" ; SC_OPCODE_PMT; >;
< "COLUMNS" ; SC_OPCODE_COLUMNS; >;
@@ -1160,7 +1159,7 @@ StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF
< "LOOKUP" ; SC_OPCODE_LOOKUP; >;
< "VLOOKUP" ; SC_OPCODE_V_LOOKUP; >;
< "HLOOKUP" ; SC_OPCODE_H_LOOKUP; >;
- < "MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >; // legacy for range list (union)
+ < "MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >;
< "OFFSET" ; SC_OPCODE_OFFSET; >;
< "INDEX" ; SC_OPCODE_INDEX; >;
< "AREAS" ; SC_OPCODE_AREAS; >;
@@ -1310,7 +1309,7 @@ StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH_PODF
< "DDE" ; SC_OPCODE_DDE; >;
< "BASE" ; SC_OPCODE_BASE; >;
< "DECIMAL" ; SC_OPCODE_DECIMAL; >;
- < "CONVERT" ; SC_OPCODE_CONVERT_OOO; >; // wrong but ODF1.1, keep it
+ < "CONVERT" ; SC_OPCODE_CONVERT_OOO; >;
< "ROMAN" ; SC_OPCODE_ROMAN; >;
< "ARABIC" ; SC_OPCODE_ARABIC; >;
< "HYPERLINK" ; SC_OPCODE_HYPERLINK; >;
@@ -1606,9 +1605,9 @@ StringArray RID_STRLIST_FUNCTION_NAMES_ENGLISH_API
< "LOOKUP" ; SC_OPCODE_LOOKUP; >;
< "VLOOKUP" ; SC_OPCODE_V_LOOKUP; >;
< "HLOOKUP" ; SC_OPCODE_H_LOOKUP; >;
- < "MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >; // legacy for range list (union)
+ < "MULTIRANGE" ; SC_OPCODE_MULTI_AREA; >;
< "OFFSET" ; SC_OPCODE_OFFSET; >;
- < "INDEX" ; SC_OPCODE_INDEX; >; // ?? erstes Zeichen = I ??
+ < "INDEX" ; SC_OPCODE_INDEX; >;
< "AREAS" ; SC_OPCODE_AREAS; >;
< "DOLLAR" ; SC_OPCODE_CURRENCY; >;
< "REPLACE" ; SC_OPCODE_REPLACE; >;
@@ -2261,7 +2260,7 @@ StringArray RID_STRLIST_FUNCTION_NAMES
< "XOR" ; SC_OPCODE_XOR ; >;
< "NOT" ; SC_OPCODE_NOT ; >;
< "NEG" ; SC_OPCODE_NEG ; >;
- < "PI" ; SC_OPCODE_PI ; >; // ???
+ < "PI" ; SC_OPCODE_PI ; >;
< "RAND" ; SC_OPCODE_RANDOM ; >;
< "TRUE" ; SC_OPCODE_TRUE ; >;
< "FALSE" ; SC_OPCODE_FALSE ; >;
@@ -2470,9 +2469,9 @@ StringArray RID_STRLIST_FUNCTION_NAMES
< "LOOKUP" ; SC_OPCODE_LOOKUP ; >;
< "VLOOKUP" ; SC_OPCODE_V_LOOKUP ; >;
< "HLOOKUP" ; SC_OPCODE_H_LOOKUP ; >;
- < "MULTIRANGE" ; SC_OPCODE_MULTI_AREA ; >; // legacy for range list (union)
+ < "MULTIRANGE" ; SC_OPCODE_MULTI_AREA ; >;
< "OFFSET" ; SC_OPCODE_OFFSET ; >;
- < "INDEX" ; SC_OPCODE_INDEX ; >; // ?? erstes Zeichen = I ??
+ < "INDEX" ; SC_OPCODE_INDEX ; >;
< "AREAS" ; SC_OPCODE_AREAS ; >;
< "DOLLAR" ; SC_OPCODE_CURRENCY ; >;
< "REPLACE" ; SC_OPCODE_REPLACE ; >;
diff --git a/sc/source/ui/src/scerrors.src b/sc/source/ui/src/scerrors.src
index f9ad6237b843..402bbe9764f3 100644
--- a/sc/source/ui/src/scerrors.src
+++ b/sc/source/ui/src/scerrors.src
@@ -23,7 +23,6 @@ StringArray RID_ERRHDLSC
{
ItemList [ en-US ] =
{
- // ERRORS -----------------------------------------------------
< "Impossible to connect to the file." ;
SCERR_IMPORT_CONNECT & ERRCODE_RES_MASK ; >;
< "File could not be opened." ;
@@ -53,7 +52,6 @@ StringArray RID_ERRHDLSC
< "File format error found at $(ARG1)(row,col)." ;
SCERR_IMPORT_FORMAT_ROWCOL & ERRCODE_RES_MASK ; >;
- // Export ----------------------------------------------------
< "Connection to the file could not be established." ;
SCERR_EXPORT_CONNECT & ERRCODE_RES_MASK ; >;
< "Data could not be written." ;
@@ -65,7 +63,6 @@ StringArray RID_ERRHDLSC
< "Cell $(ARG1) contains a string that is longer in the selected target character set \"$(ARG2)\" than the given field width." ;
SCERR_EXPORT_FIELDWIDTH & ERRCODE_RES_MASK ; >;
- // WARNINGS ---------------------------------------------------
< "Only the active sheet was saved." ;
SCWARN_EXPORT_ASCII & ERRCODE_RES_MASK ; >;
< "The maximum number of rows has been exceeded. Excess rows were not imported!" ;
diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src
index bca00c9503dc..ef271d2f0b64 100644
--- a/sw/source/ui/app/error.src
+++ b/sw/source/ui/app/error.src
@@ -43,7 +43,6 @@ StringArray RID_SW_ERRHDL
{
ItemList [ en-US ] =
{
- // Import-Errors
< "File format error found." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_FILE_FORMAT_ERROR ) ; >;
< "Error reading file." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_READ_ERROR ) ; >;
< "Input file error." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SW6_INPUT_FILE ) ; >;
@@ -56,11 +55,9 @@ StringArray RID_SW_ERRHDL
< "File has been written in a newer version." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_NEW_VERSION ) ; >;
< "This is not a valid WinWord97 file."; ERR_CODE ( ERRCODE_CLASS_READ , ERR_WW8_NO_WW8_FILE_ERR ) ; >;
< "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col)."; ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_FILE_ROWCOL ) ; >;
- // Export-Errors
< "Error writing file." ; ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_WRITE_ERROR ) ; >;
< "Wrong AutoText document version." ; ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_OLD_GLOSSARY ) ; >;
< "Error in writing sub-document $(ARG1)."; ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_WRITE_ERROR_FILE ) ; >;
- // Import-/Export-Errors
< "Internal error in %PRODUCTNAME Writer file format." ; ERR_CODE ( ERRCODE_CLASS_READ , ERR_SWG_INTERNAL_ERROR ) ; >;
< "Internal error in %PRODUCTNAME Writer file format." ; ERR_CODE ( ERRCODE_CLASS_WRITE , ERR_SWG_INTERNAL_ERROR ) ; >;
< "$(ARG1) has changed." ; ERR_CODE ( ERRCODE_CLASS_LOCKING , ERR_TXTBLOCK_NEWFILE_ERROR ) ; >;
More information about the Libreoffice-commits
mailing list