[Libreoffice-commits] core.git: sal/osl sal/textenc sax/test sc/inc sc/qa sc/source
Johnny_M
klasse at partyheld.de
Mon Jul 3 10:04:25 UTC 2017
sal/osl/w32/secimpl.hxx | 2
sal/textenc/tcvtarb1.tab | 2
sal/textenc/tcvtest1.tab | 74 ++++++++++++++++++------------------
sal/textenc/tcvtlat1.tab | 32 +++++++--------
sax/test/sax/testwriter.cxx | 16 +++----
sc/inc/document.hxx | 2
sc/inc/helpids.h | 4 -
sc/inc/linkuno.hxx | 2
sc/inc/userdat.hxx | 2
sc/qa/perf/scperfobj.cxx | 2
sc/qa/unit/ucalc_formula.cxx | 2
sc/source/core/data/table1.cxx | 2
sc/source/core/data/table2.cxx | 4 -
sc/source/core/data/validat.cxx | 2
sc/source/core/tool/cellform.cxx | 2
sc/source/core/tool/docoptio.cxx | 4 -
sc/source/core/tool/interpr2.cxx | 10 ++--
sc/source/core/tool/rangelst.cxx | 16 +++----
sc/source/core/tool/rangeutl.cxx | 4 -
sc/source/core/tool/token.cxx | 2
sc/source/filter/dif/difimp.cxx | 2
sc/source/filter/excel/excform.cxx | 2
sc/source/filter/inc/eeparser.hxx | 16 +++----
sc/source/filter/inc/excrecds.hxx | 4 -
sc/source/filter/inc/htmlexp.hxx | 2
sc/source/filter/inc/htmlpars.hxx | 20 ++++-----
sc/source/filter/inc/lotimpop.hxx | 14 +++---
sc/source/filter/inc/root.hxx | 8 +--
sc/source/filter/inc/xcl97rec.hxx | 4 -
sc/source/filter/starcalc/scflt.cxx | 2
sc/source/ui/docshell/arealink.cxx | 2
sc/source/ui/docshell/docfunc.cxx | 4 -
sc/source/ui/docshell/docsh3.cxx | 4 -
sc/source/ui/docshell/docsh4.cxx | 6 +-
sc/source/ui/formdlg/dwfunctr.cxx | 4 -
sc/source/ui/formdlg/formula.cxx | 2
sc/source/ui/inc/gridwin.hxx | 4 -
sc/source/ui/inc/tabview.hxx | 4 -
sc/source/ui/inc/undobase.hxx | 2
sc/source/ui/navipi/content.cxx | 6 +-
sc/source/ui/navipi/navipi.cxx | 6 +-
sc/source/ui/src/scstring.src | 4 -
sc/source/ui/unoobj/chart2uno.cxx | 2
sc/source/ui/unoobj/cursuno.cxx | 6 +-
sc/source/ui/unoobj/datauno.cxx | 42 ++++++++++----------
sc/source/ui/unoobj/fielduno.cxx | 2
sc/source/ui/unoobj/fmtuno.cxx | 6 +-
sc/source/ui/unoobj/linkuno.cxx | 2
sc/source/ui/unoobj/styleuno.cxx | 4 -
sc/source/ui/unoobj/textuno.cxx | 2
sc/source/ui/view/tabview5.cxx | 2
sc/source/ui/view/viewdata.cxx | 2
52 files changed, 189 insertions(+), 189 deletions(-)
New commits:
commit 5034e8217c9844293dc94e5dff0bdc865ad7a91a
Author: Johnny_M <klasse at partyheld.de>
Date: Fri Jun 30 22:49:10 2017 +0200
Translate German comments and debug strings (leftovers in dirs sal to sc)
Translates leftovers found using a custom regex and manually checking
the rest of the affected file.
Additionally:
- A few spelling fixes
Change-Id: I2b83bd11adf520b90bb29c8ea624990759dad3c6
Reviewed-on: https://gerrit.libreoffice.org/39427
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sal/osl/w32/secimpl.hxx b/sal/osl/w32/secimpl.hxx
index 43af57d61cef..ff4121091ac1 100644
--- a/sal/osl/w32/secimpl.hxx
+++ b/sal/osl/w32/secimpl.hxx
@@ -30,7 +30,7 @@ typedef struct {
HANDLE m_hProfile;
HANDLE m_hToken;
sal_Unicode m_User[USER_BUFFER_SIZE];
-/* ts: Erweiterung um Fileserver-login */
+/* ts: extension by fileserver login */
NETRESOURCEW *m_pNetResource;
} oslSecurityImpl;
diff --git a/sal/textenc/tcvtarb1.tab b/sal/textenc/tcvtarb1.tab
index e346a7deff91..ee06e05606ba 100644
--- a/sal/textenc/tcvtarb1.tab
+++ b/sal/textenc/tcvtarb1.tab
@@ -717,7 +717,7 @@ static ImplTextEncodingData const aImplMS1256TextEncodingData
/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme, 0x80-0x9F Control-Caracter wie in Unicode */
/* Convert-Tables: mappings/iso8859/8859-6.txt from 07/27/99 Version 1.0 (based on Unicode 3.0) */
/* Last-Changes from us: */
-/* !!! 0x30-0x39 sind Arabische Zahlen und muessten eigentlich nach 0x0660-0x0669 gemappt werden !!! */
+/* !!! 0x30-0x39 are Arabic numbers and should normally be mapped to 0x0660-0x0669 !!! */
#define ISO88596UNI_START 0xA0
#define ISO88596UNI_END 0xF2
diff --git a/sal/textenc/tcvtest1.tab b/sal/textenc/tcvtest1.tab
index 22a145d110f3..8c045de2d006 100644
--- a/sal/textenc/tcvtest1.tab
+++ b/sal/textenc/tcvtest1.tab
@@ -30,7 +30,7 @@
/* IBM-737 */
/* Dos Standard CharSet for Greek */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/pc/cp737.txt from 04/24/96 Version 2.00 */
/* Last-Changes from us: */
@@ -189,7 +189,7 @@ static ImplTextEncodingData const aImplIBM737TextEncodingData
/* IBM-775 */
/* Dos Standard CharSet for BalticRim */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/pc/cp775.txt from 04/24/96 Version 2.00 */
/* Last-Changes from us: */
@@ -395,7 +395,7 @@ static ImplTextEncodingData const aImplIBM775TextEncodingData
/* IBM-852 */
/* Dos Standard CharSet for Central Europa (Jug., Pol., Tsch., Ung., ...) */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/pc/cp852.txt from 04/24/96 Version 2.00 */
/* Last-Changes from us: */
@@ -601,7 +601,7 @@ static ImplTextEncodingData const aImplIBM852TextEncodingData
/* IBM-855 */
/* Dos Standard CharSet for Cyrillic */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/pc/cp855.txt from 04/24/96 Version 2.00 */
/* Last-Changes from us: */
@@ -737,7 +737,7 @@ static ImplTextEncodingData const aImplIBM855TextEncodingData
/* IBM-857 */
/* Dos Standard CharSet for Turkish */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/pc/cp857.txt from 04/24/96 Version 2.00 */
/* Last-Changes from us: */
@@ -872,7 +872,7 @@ static ImplTextEncodingData const aImplIBM857TextEncodingData
/* IBM-866 */
/* Dos Standard CharSet for CyrillicRussian */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/pc/cp866.txt from 04/24/96 Version 2.00 */
/* Last-Changes from us: */
@@ -1028,7 +1028,7 @@ static ImplTextEncodingData const aImplIBM866TextEncodingData
/* IBM-869 */
/* Dos Standard CharSet for Greek2 */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/pc/cp869.txt from 04/24/96 Version 2.00 */
/* Last-Changes from us: */
@@ -1174,7 +1174,7 @@ static ImplTextEncodingData const aImplIBM869TextEncodingData
/* MS-1250 */
/* Windows CodePage for Eastern European (WinLatin2) */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/windows/cp1250.txt from 04/15/98 Version 2.01 */
/* Last-Changes from us: */
@@ -1375,7 +1375,7 @@ static ImplTextEncodingData const aImplMS1250TextEncodingData
/* MS-1251 */
/* Windows CodePage for Cyrillic */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/windows/cp1251.txt from 04/15/98 Version 2.01 */
/* Last-Changes from us: */
@@ -1510,7 +1510,7 @@ static ImplTextEncodingData const aImplMS1251TextEncodingData
/* MS-1253 */
/* Windows Standard CharSet for Greek */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/windows/cp1253.txt from 04/15/98 Version 2.01 */
/* Last-Changes from us: */
@@ -1648,7 +1648,7 @@ static ImplTextEncodingData const aImplMS1253TextEncodingData
/* MS-1254 */
/* Windows Standard CharSet for Turkish */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/windows/cp1254.txt from 04/15/98 Version 2.01 */
/* Last-Changes from us: */
@@ -1779,7 +1779,7 @@ static ImplTextEncodingData const aImplMS1254TextEncodingData
/* MS-1257 */
/* Windows Standard CharSet for Baltic */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/windows/cp1257.txt from 04/15/98 Version 2.01 */
/* Last-Changes from us: */
@@ -1915,7 +1915,7 @@ static ImplTextEncodingData const aImplMS1257TextEncodingData
/* ISO-8859-2 */
/* Unix Standard for Eastern European (Latin2) */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme, 0x80-0x9F Control-Caracter wie in Unicode */
+/* 1-byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control caracter like in Unicode */
/* Convert-Tables: mappings/iso8859/8859-2.txt from 07/27/99 Version 1.0 (based on Unicode 3.0) */
/* Last-Changes from us: */
@@ -2083,7 +2083,7 @@ static ImplTextEncodingData const aImplISO88592TextEncodingData
/* ISO-8859-3 */
/* Latin3 (Esperanto, Maltese, Turkish) */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme, 0x80-0x9F Control-Caracter wie in Unicode */
+/* 1-byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control caracter like in Unicode */
/* Convert-Tables: mappings/iso8859/8859-3.txt from 07/27/99 Version 1.0 (based on Unicode 3.0) */
/* Last-Changes from us: */
@@ -2244,7 +2244,7 @@ static ImplTextEncodingData const aImplISO88593TextEncodingData
/* ISO-8859-4 */
/* Latin4 (Estonian, Latvian, Lithuanian) */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme, 0x80-0x9F Control-Caracter wie in Unicode */
+/* 1-byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control caracter like in Unicode */
/* Convert-Tables: mappings/iso8859/8859-4.txt from 07/27/99 Version 1.0 (based on Unicode 3.0) */
/* Last-Changes from us: */
@@ -2412,7 +2412,7 @@ static ImplTextEncodingData const aImplISO88594TextEncodingData
/* ISO-8859-5 */
/* Unix Standard for Cyrillic */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme, 0x80-0x9F Control-Caracter wie in Unicode */
+/* 1-byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control caracter like in Unicode */
/* Convert-Tables: mappings/iso8859/8859-5.txt from 07/27/99 Version 1.0 (based on Unicode 3.0) */
/* Last-Changes from us: */
@@ -2510,7 +2510,7 @@ static ImplTextEncodingData const aImplISO88595TextEncodingData
/* ISO-8859-7 */
/* Unix Standard for Greek */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme, 0x80-0x9F Control-Caracter wie in Unicode */
+/* 1-byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control caracter like in Unicode */
/* Convert-Tables: mappings/iso8859/8859-7.txt from 07/27/99 Version 1.0 (based on Unicode 3.0) */
/* Last-Changes from us: */
@@ -2621,7 +2621,7 @@ static ImplTextEncodingData const aImplISO88597TextEncodingData
/* ISO-8859-9 */
/* Latin5 (Turkish) */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme, 0x80-0x9F Control-Caracter wie in Unicode */
+/* 1-byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control caracter like in Unicode */
/* Convert-Tables: mappings/iso8859/8859-9.txt from 07/27/99 Version 1.0 (based on Unicode 3.0) */
/* Last-Changes from us: */
@@ -2721,7 +2721,7 @@ static ImplTextEncodingData const aImplISO88599TextEncodingData
/* ISO-8859-10 */
/* East European */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme, 0x80-0x9F Control-Caracter wie in Unicode */
+/* 1-byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control caracter like in Unicode */
/* Convert-Tables: mappings/iso8859/8859-10.txt from 07/27/99 Version 1.0 (based on Unicode 3.0) */
/* Last-Changes from us: */
@@ -2862,7 +2862,7 @@ static ImplTextEncodingData const aImplISO885910TextEncodingData
/* ISO-8859-13 */
/* East European */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme, 0x80-0x9F Control-Caracter wie in Unicode */
+/* 1-byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control caracter like in Unicode */
/* Convert-Tables: mappings/iso8859/8859-13.txt from 07/27/99 Version 1.0 (based on Unicode 3.0) */
/* Last-Changes from us: */
@@ -3030,8 +3030,8 @@ static ImplTextEncodingData const aImplISO885913TextEncodingData
/* APPLE-CentEuro */
/* Apple CharSet for Eastern Europa (Polish, Czech, Slovak, Hungarian, Estonian, Latvian, Lithuanian) */
-/* 1-Byte, 0x00-0x7F ASCII, jedoch eigentich Sonderzeichen zwischen 0x00-0x1F */
-/* die wir aber nicht beruecksichtigen */
+/* 1-byte, 0x00-0x7F ASCII, but actually control character between 0x00-0x1F */
+/* which we don't consider, though */
/* Convert-Tables: mappings/vendors/apple/centeuro.txt from 02/05/98 */
/* Last-Changes from us: */
@@ -3235,8 +3235,8 @@ static ImplTextEncodingData const aImplAPPLECENTEUROTextEncodingData
/* APPLE-Croatian */
/* Standard Apple CharSet for Croatian */
-/* 1-Byte, 0x00-0x7F ASCII, jedoch eigentich Sonderzeichen zwischen 0x00-0x1F */
-/* die wir aber nicht beruecksichtigen */
+/* 1-byte, 0x00-0x7F ASCII, but actually control character between 0x00-0x1F */
+/* which we don't consider, though */
/* Convert-Tables: mappings/vendors/apple/croatien.txt from 02/05/98 */
/* Last-Changes from us: */
@@ -3383,8 +3383,8 @@ static ImplTextEncodingData const aImplAPPLECROATIANTextEncodingData
/* APPLE-Cyrillic */
/* Apple CharSet for Cyrillic */
-/* 1-Byte, 0x00-0x7F ASCII, jedoch eigentich Sonderzeichen zwischen 0x00-0x1F */
-/* die wir aber nicht beruecksichtigen */
+/* 1-byte, 0x00-0x7F ASCII, but actually control character between 0x00-0x1F */
+/* which we don't consider, though */
/* Convert-Tables: mappings/vendors/apple/cyrillic.txt from 02/15/98 */
/* Last-Changes from us: */
@@ -3518,8 +3518,8 @@ static ImplTextEncodingData const aImplAPPLECYRILLICTextEncodingData
/* APPLE-Greek */
/* Apple CharSet for Greek */
-/* 1-Byte, 0x00-0x7F ASCII, jedoch eigentich Sonderzeichen zwischen 0x00-0x1F */
-/* die wir aber nicht beruecksichtigen */
+/* 1-byte, 0x00-0x7F ASCII, but actually control character between 0x00-0x1F */
+/* which we don't consider, though */
/* Convert-Tables: mappings/vendors/apple/roman.txt from 08/18/98 */
/* Last-Changes from us: */
@@ -3671,9 +3671,9 @@ static ImplTextEncodingData const aImplAPPLEGREEKTextEncodingData
/* ======================================================================= */
/* APPLE-Romanian */
-/* Standard Apple CharSet for Romanien */
-/* 1-Byte, 0x00-0x7F ASCII, jedoch eigentich Sonderzeichen zwischen 0x00-0x1F */
-/* die wir aber nicht beruecksichtigen */
+/* Standard Apple CharSet for Romanian */
+/* 1-byte, 0x00-0x7F ASCII, but actually control character between 0x00-0x1F */
+/* which we don't consider, though */
/* Convert-Tables: mappings/vendors/apple/romanian.txt from 02/05/98 */
/* Last-Changes from us: */
/* 0xAF --> 0x015E (like Java), Apple Definition: 0x0053+0x0326 # LATIN CAPITAL LETTER S + COMBINING COMMA BELOW */
@@ -3826,8 +3826,8 @@ static ImplTextEncodingData const aImplAPPLEROMANIANTextEncodingData
/* APPLE-Turkish */
/* Apple CharSet for Turkish */
-/* 1-Byte, 0x00-0x7F ASCII, jedoch eigentich Sonderzeichen zwischen 0x00-0x1F */
-/* die wir aber nicht beruecksichtigen */
+/* 1-byte, 0x00-0x7F ASCII, but actually control character between 0x00-0x1F */
+/* which we don't consider, though */
/* Convert-Tables: mappings/vendors/apple/turkish.txt from 02/05/98 */
/* Last-Changes from us: */
@@ -3973,8 +3973,8 @@ static ImplTextEncodingData const aImplAPPLETURKISHTextEncodingData
/* APPLE-Ukrainian */
/* Apple CharSet for Ukrainian */
-/* 1-Byte, 0x00-0x7F ASCII, jedoch eigentich Sonderzeichen zwischen 0x00-0x1F */
-/* die wir aber nicht beruecksichtigen */
+/* 1-byte, 0x00-0x7F ASCII, but actually control character between 0x00-0x1F */
+/* which we don't consider, though */
/* Convert-Tables: mappings/vendors/apple/ukraine.txt from 02/05/98 */
/* Last-Changes from us: */
@@ -4109,7 +4109,7 @@ static ImplTextEncodingData const aImplAPPLEUKRAINIANTextEncodingData
/* KOI8_R */
/* Standard Charset for Cyrillic */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: typed per hand */
/* Last-Changes from us: */
@@ -4425,7 +4425,7 @@ static ImplTextEncodingData const aImplKoi8UTextEncodingData
/* PT154 */
/* Asian Cyrillic */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: typed per hand */
/* Last-Changes from us: */
diff --git a/sal/textenc/tcvtlat1.tab b/sal/textenc/tcvtlat1.tab
index ace0c1ced2b8..87b44206a2a4 100644
--- a/sal/textenc/tcvtlat1.tab
+++ b/sal/textenc/tcvtlat1.tab
@@ -31,7 +31,7 @@
/* IBM-437 */
/* Dos Latin US - Standard CharSet for Western Script */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/pc/cp437.txt from 04/24/96 Version 2.00 */
/* Last-Changes from us: */
@@ -205,11 +205,11 @@ static ImplTextEncodingData const aImplIBM437TextEncodingData
/* ======================================================================= */
/* IBM-850 */
-/* Dos Standard CharSet for Western/Europa */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* Dos Standard CharSet for Western/Europe */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/pc/cp850.txt from 04/24/96 Version 2.00 */
/* Last-Changes from us: */
-/* D5 - geaendert auf EURO SIGN and 0x20AC added to D5 */
+/* D5 - changed to EURO SIGN and 0x20AC added to D5 */
/* ----------------------------------------------------------------------- */
@@ -340,7 +340,7 @@ static ImplTextEncodingData const aImplIBM850TextEncodingData
/* IBM-860 */
/* Dos Standard CharSet for Portugiese */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/pc/cp860.txt from 04/24/96 Version 2.00 */
/* Last-Changes from us: */
@@ -513,7 +513,7 @@ static ImplTextEncodingData const aImplIBM860TextEncodingData
/* IBM-861 */
/* Dos Standard CharSet for Icelandic */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/pc/cp861.txt from 04/24/96 Version 2.00 */
/* Last-Changes from us: */
@@ -688,7 +688,7 @@ static ImplTextEncodingData const aImplIBM861TextEncodingData
/* IBM-863 */
/* Dos Standard CharSet for Canada-France */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/pc/cp863.txt from 04/24/96 Version 2.00 */
/* Last-Changes from us: */
@@ -863,7 +863,7 @@ static ImplTextEncodingData const aImplIBM863TextEncodingData
/* IBM-865 */
/* Dos Standard CharSet for Nordic */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme */
+/* 1-byte, 0x00-0x7F ASCII without exception */
/* Convert-Tables: mappings/vendors/micsft/pc/cp865.txt from 04/24/96 Version 2.00 */
/* Last-Changes from us: */
@@ -1037,8 +1037,8 @@ static ImplTextEncodingData const aImplIBM865TextEncodingData
/* ======================================================================= */
/* ISO-8859-14 */
-/* ungefaehr wie Latin1 */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme, 0x80-0x9F Control-Caracter wie in Unicode */
+/* approximately like Latin1 */
+/* 1-byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control caracter like in Unicode */
/* Convert-Tables: mappings/iso8859/8859-14.txt from 07/27/99 Version 1.0 (based on Unicode 3.0) */
/* Last-Changes from us: */
@@ -1165,8 +1165,8 @@ static ImplTextEncodingData const aImplISO885914TextEncodingData
/* ======================================================================= */
/* ISO-8859-15 */
-/* ungefaehr wie Latin1, jedoch mit Euro (ehemaliges CURRENCY-Symbol an A4) */
-/* 1-Byte, 0x00-0x7F ASCII ohne Ausnahme, 0x80-0x9F Control-Caracter wie in Unicode */
+/* approximately like Latin1, but with Euro (former CURRENCY symbol to A4) */
+/* 1-byte, 0x00-0x7F ASCII without exception, 0x80-0x9F control caracter like in Unicode */
/* Convert-Tables: mappings/iso8859/8859-15.txt from 07/27/99 Version 1.0 (based on Unicode 3.0) */
/* Last-Changes from us: */
@@ -1268,8 +1268,8 @@ static ImplTextEncodingData const aImplISO885915TextEncodingData
/* APPLE-Iceland */
/* Apple CharSet for Iceland */
-/* 1-Byte, 0x00-0x7F ASCII, jedoch eigentich Sonderzeichen zwischen 0x00-0x1F */
-/* die wir aber nicht beruecksichtigen */
+/* 1-byte, 0x00-0x7F ASCII, but actually special characters between 0x00-0x1F */
+/* which we don't consider, though */
/* Convert-Tables: mappings/vendors/apple/iceland.txt from 02/05/98 */
/* Last-Changes from us: */
@@ -1408,8 +1408,8 @@ static ImplTextEncodingData const aImplAPPLEICELANDTextEncodingData
/* APPLE-Roman */
/* Standard Apple CharSet for Western */
-/* 1-Byte, 0x00-0x7F ASCII, jedoch eigentich Sonderzeichen zwischen 0x00-0x1F */
-/* die wir aber nicht beruecksichtigen */
+/* 1-byte, 0x00-0x7F ASCII, but actually special characters between 0x00-0x1F */
+/* which we don't consider, though */
/* Convert-Tables: mappings/vendors/apple/roman.txt from 08/18/98 */
/* Last-Changes from us: */
diff --git a/sax/test/sax/testwriter.cxx b/sax/test/sax/testwriter.cxx
index 1bc53ae18495..c6fa083f6d9e 100644
--- a/sax/test/sax/testwriter.cxx
+++ b/sax/test/sax/testwriter.cxx
@@ -440,9 +440,9 @@ void OSaxWriterTest::writeParagraph(
void OSaxWriterTest::testSimple( const Reference< XExtendedDocumentHandler > &r )
{
OUString testParagraph = OUString(
- "Dies ist ein bloeder Test um zu uberpruefen, ob der SAXWriter "
- "wohl Zeilenumbrueche halbwegs richtig macht oder ob er die Zeile "
- "bis zum bitteren Ende schreibt." );
+ "This is a stupid test to check whether the SAXWriter possibly makes "
+ "line breaks halfway correctly or whether it writes the line to the "
+ "bitter end." );
OFileWriter *pw = new OFileWriter("output.xml");
AttributeListImpl *pList = new AttributeListImpl;
@@ -475,7 +475,7 @@ void OSaxWriterTest::testSimple( const Reference< XExtendedDocumentHandler > &r
r->startElement( OUString( "hi") , rList );
r->ignorableWhitespace( OUString() );
- // the enpassant must be converted & -> &
+ // the ampersand must be converted & -> &
r->characters( OUString( "ü") );
// Test added for mib. Tests if errors during conversions occurs
@@ -500,7 +500,7 @@ void OSaxWriterTest::testSimple( const Reference< XExtendedDocumentHandler > &r
r->ignorableWhitespace( OUString() );
- r->comment( OUString( "Dies ist ein Kommentar !") );
+ r->comment( OUString( "This is a comment !") );
r->ignorableWhitespace( OUString() );
r->startElement( OUString( "emptytagtest") , rList );
@@ -613,9 +613,9 @@ void OSaxWriterTest::testPerformance(const Reference< XExtendedDocumentHandler
OUString testParagraph =
OUString(
- "Dies ist ein bloeder Test um zu uberpruefen, ob der SAXWriter "
- "wohl Zeilenumbrueche halbwegs richtig macht oder ob er die Zeile "
- "bis zum bitteren Ende schreibt." );
+ "This is a stupid test to check whether the SAXWriter possibly makes "
+ "line breaks halfway correctly or whether it writes the line to the "
+ "bitter end." );
Reference< XAttributeList > rList( (XAttributeList *) pList , UNO_QUERY );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 0d2ed2a07cb7..e54fb190a96c 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -410,7 +410,7 @@ private:
documents, GRAM_ODFF for ODF 1.2 documents. */
formula::FormulaGrammar::Grammar eStorageGrammar;
- sal_uLong nFormulaCodeInTree; // FormelRPN im Formelbaum
+ sal_uLong nFormulaCodeInTree; // formula RPN in the formula tree
sal_uLong nXMLImportedFormulaCount; // progress count during XML import
sal_uInt16 nInterpretLevel; // >0 if in interpreter
sal_uInt16 nMacroInterpretLevel; // >0 if macro in interpreter
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 379f9abfed2e..0d366b6ad4b5 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -27,7 +27,7 @@
#define HID_INSWIN_FUNC "SC_HID_INSWIN_FUNC"
#define HID_INSWIN_INPUT "SC_HID_INSWIN_INPUT"
-// Hilfe IDs fuer Dokumentfenster --------------------------------------------
+// Help IDs for document window ----------------------------------------------
#define HID_SC_WIN_GRIDWIN "SC_HID_SC_WIN_GRIDWIN"
#define HID_SC_WIN_PREVIEW "SC_HID_SC_WIN_PREVIEW"
@@ -185,7 +185,7 @@
#define HID_MN_FORMAT_ALGN "SC_HID_MN_FORMAT_ALGN"
#define HID_MN_FORMAT_LINESPACE "SC_HID_MN_FORMAT_LINESPACE"
-// Ende Hilfe IDs ------------------------------------------------------------
+// End help IDs ------------------------------------------------------------
#define HID_FUNC_DBANZAHL "SC_HID_FUNC_DBANZAHL"
#define HID_FUNC_DBANZAHL2 "SC_HID_FUNC_DBANZAHL2"
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index f6f0a3e97b86..1570039607f9 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -96,7 +96,7 @@ public:
virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName,
const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
- // aus get/setPropertyValue gerufen:
+ // called from get/setPropertyValue:
OUString getFileName() const;
void setFileName(const OUString& FileName);
OUString getFilter() const;
diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx
index f9b19ac6fdbd..756ddc4876ef 100644
--- a/sc/inc/userdat.hxx
+++ b/sc/inc/userdat.hxx
@@ -26,7 +26,7 @@
#include "global.hxx"
#include "address.hxx"
-// Object-Ids fuer UserData
+// Object IDs for UserData
#define SC_UD_OBJDATA 1
#define SC_UD_IMAPDATA 2
#define SC_UD_MACRODATA 3
diff --git a/sc/qa/perf/scperfobj.cxx b/sc/qa/perf/scperfobj.cxx
index a5adfd0070b3..a026878206b4 100644
--- a/sc/qa/perf/scperfobj.cxx
+++ b/sc/qa/perf/scperfobj.cxx
@@ -322,7 +322,7 @@ void ScPerfObj::testSheetNamedRanges()
// test removeByName
OUString maNameToRemove("namedRange_4999");
bool bHasIt = xNamedRanges->hasByName(maNameToRemove);
- CPPUNIT_ASSERT_MESSAGE("NamedRange initial1 des not exits, can't remove it", bHasIt);
+ CPPUNIT_ASSERT_MESSAGE("NamedRange initial1 does not exist, can't remove it", bHasIt);
if (bHasIt)
{
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index d9c09eaa6a58..81e567fde3bb 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -7897,7 +7897,7 @@ void Test::testIntersectionOpExcel()
m_pDoc->SetGrammar(FormulaGrammar::GRAM_ENGLISH_XL_A1);
- // Choose formular positions that don't intersect with those data ranges.
+ // Choose formula positions that don't intersect with those data ranges.
ScAddress aPos(0,3,0);
m_pDoc->SetString(aPos,"=B2:D2 C1:C3");
CPPUNIT_ASSERT_EQUAL_MESSAGE("A4 intersecting references failed", 1.0, m_pDoc->GetValue(aPos));
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 3009f8ee62b4..464e33d545e5 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -695,7 +695,7 @@ bool ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
--nMaxX;
}
- for (i=0; i<aCol.size(); i++) // Daten testen
+ for (i=0; i<aCol.size(); i++) // test the data
{
if (!aCol[i].IsEmptyBlock( nStartRow, nEndRow )) //TODO: bNotes ??????
{
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 98bcf2068a5c..8677c3f78101 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2049,14 +2049,14 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO
{
long nRotVal = static_cast<const SfxInt32Item&>( pPattern->
GetItem( ATTR_ROTATE_VALUE, pCondSet )).GetValue();
- double nRealOrient = nRotVal * F_PI18000; // 1/100 Grad
+ double nRealOrient = nRotVal * F_PI18000; // 1/100 degree
double nCos = cos( nRealOrient );
double nSin = sin( nRealOrient );
//TODO: limit !!!
//TODO: additional factor for varying PPT X/Y !!!
// for ScRotateDir::Left this gives a negative value,
- // if the Modus is considered
+ // if the mode is considered
nFactor = -fabs( nCos / nSin );
}
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 78b51ea480c4..8099960fd048 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -510,7 +510,7 @@ bool ScValidationData::IsDataValid( ScRefCellValue& rCell, const ScAddress& rPos
bool bOk = true;
switch (eDataMode)
{
- // SC_VALID_ANY schon oben
+ // SC_VALID_ANY already above
case SC_VALID_WHOLE:
case SC_VALID_DECIMAL:
diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index 06019ea20bde..c16c7440b25f 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -63,7 +63,7 @@ void ScCellFormat::GetString( ScRefCellValue& rCell, sal_uLong nFormat, OUString
else
{
// A macro started from the interpreter, which has
- // access to Formular Cells, becomes a CellText, even if
+ // access to Formula Cells, becomes a CellText, even if
// that triggers further interpretation, except if those
// cells are already being interpreted.
// IdleCalc generally doesn't trigger further interpretation,
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index 2a1b23a09b3d..08a03c514bec 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -47,7 +47,7 @@ static sal_uInt16 lcl_GetDefaultTabDist()
return 720; // 1/2"
}
-// ScDocOptions - Dokument-Optionen
+// ScDocOptions - document options
ScDocOptions::ScDocOptions()
{
@@ -136,7 +136,7 @@ void ScDocOptions::SetFormulaWildcardsEnabled( bool bVal )
}
}
-// ScTpCalcItem - Daten fuer die CalcOptions-TabPage
+// ScTpCalcItem - data for the CalcOptions TabPage
ScTpCalcItem::ScTpCalcItem( sal_uInt16 nWhichP, const ScDocOptions& rOpt )
: SfxPoolItem ( nWhichP ),
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index fd80714c2001..277bc19f9869 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -147,7 +147,7 @@ void ScInterpreter::ScGetDay()
void ScInterpreter::ScGetMin()
{
double fTime = GetDouble();
- fTime -= ::rtl::math::approxFloor(fTime); // Datumsanteil weg
+ fTime -= ::rtl::math::approxFloor(fTime); // date part absent
long nVal = (long)::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5) % ::tools::Time::secondPerHour;
PushDouble( (double) (nVal / ::tools::Time::secondPerMinute) );
}
@@ -155,7 +155,7 @@ void ScInterpreter::ScGetMin()
void ScInterpreter::ScGetSec()
{
double fTime = GetDouble();
- fTime -= ::rtl::math::approxFloor(fTime); // Datumsanteil weg
+ fTime -= ::rtl::math::approxFloor(fTime); // date part absent
long nVal = (long)::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5) % ::tools::Time::secondPerMinute;
PushDouble( (double) nVal );
}
@@ -163,7 +163,7 @@ void ScInterpreter::ScGetSec()
void ScInterpreter::ScGetHour()
{
double fTime = GetDouble();
- fTime -= ::rtl::math::approxFloor(fTime); // Datumsanteil weg
+ fTime -= ::rtl::math::approxFloor(fTime); // date part absent
long nVal = (long)::rtl::math::approxFloor(fTime*DATE_TIME_FACTOR+0.5) / ::tools::Time::secondPerHour;
PushDouble((double) nVal);
}
@@ -171,7 +171,7 @@ void ScInterpreter::ScGetHour()
void ScInterpreter::ScGetDateValue()
{
OUString aInputString = GetString().getString();
- sal_uInt32 nFIndex = 0; // damit default Land/Spr.
+ sal_uInt32 nFIndex = 0; // for a default country/language
double fVal;
if (pFormatter->IsNumberFormat(aInputString, nFIndex, fVal))
{
@@ -2778,7 +2778,7 @@ void ScInterpreter::ScDde()
{
pLink = new ScDdeLink( pDok, aAppl, aTopic, aItem, nMode );
mpLinkManager->InsertDDELink( pLink, aAppl, aTopic, aItem );
- if ( mpLinkManager->GetLinks().size() == 1 ) // erster ?
+ if ( mpLinkManager->GetLinks().size() == 1 ) // the first one?
{
SfxBindings* pBindings = pDok->GetViewBindings();
if (pBindings)
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 5ae74f9c0f3d..f475ba16adb4 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -256,7 +256,7 @@ void ScRangeList::Join( const ScRange& r, bool bIsInList )
}
}
- ScRange* pOver = const_cast<ScRange*>(&r); // fies aber wahr wenn bInList
+ ScRange* pOver = const_cast<ScRange*>(&r); // nasty but true when bInList
size_t nOldPos = 0;
if ( bIsInList )
{
@@ -1387,18 +1387,18 @@ int SAL_CALL ScRangePairList_QsortNameCompare( const void* p1, const void* p2 )
return 1;
}
- // gleiche Tabs
+ // equal tabs
if ( rStartPos1.Col() < rStartPos2.Col() )
return -1;
if ( rStartPos1.Col() > rStartPos2.Col() )
return 1;
- // gleiche Cols
+ // equal cols
if ( rStartPos1.Row() < rStartPos2.Row() )
return -1;
if ( rStartPos1.Row() > rStartPos2.Row() )
return 1;
- // erste Ecke gleich, zweite Ecke
+ // first corner equal, second corner
const ScAddress& rEndPos1 = ps1->pPair->GetRange(0).aEnd;
const ScAddress& rEndPos2 = ps2->pPair->GetRange(0).aEnd;
if ( rEndPos1.Tab() == rEndPos2.Tab() )
@@ -1418,12 +1418,12 @@ int SAL_CALL ScRangePairList_QsortNameCompare( const void* p1, const void* p2 )
return 1;
}
- // gleiche Tabs
+ // equal tabs
if ( rEndPos1.Col() < rEndPos2.Col() )
return -1;
if ( rEndPos1.Col() > rEndPos2.Col() )
return 1;
- // gleiche Cols
+ // equal cols
if ( rEndPos1.Row() < rEndPos2.Row() )
return -1;
if ( rEndPos1.Row() > rEndPos2.Row() )
@@ -1447,7 +1447,7 @@ void ScRangePairList::Join( const ScRangePair& r, bool bIsInList )
SCCOL nCol2 = r1.aEnd.Col();
SCROW nRow2 = r1.aEnd.Row();
SCTAB nTab2 = r1.aEnd.Tab();
- ScRangePair* pOver = const_cast<ScRangePair*>(&r); // fies aber wahr wenn bInList
+ ScRangePair* pOver = const_cast<ScRangePair*>(&r); // nasty but true when bInList
size_t nOldPos = 0;
if ( bIsInList )
{
@@ -1484,7 +1484,7 @@ void ScRangePairList::Join( const ScRangePair& r, bool bIsInList )
}
}
else if ( r1.In( rp1 ) )
- { // RangePair p included in RangePair r enthalten, make r the new RangePair
+ { // RangePair p included in RangePair r, make r the new RangePair
*p = r;
bJoined = true;
}
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 872435378244..5a8b069924d6 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -974,7 +974,7 @@ bool ScAreaNameIterator::Next( OUString& rName, ScRange& rRange )
{
for (;;)
{
- if ( bFirstPass ) // erst Bereichsnamen
+ if ( bFirstPass ) // first the area names
{
if ( pRangeName && maRNPos != maRNEnd )
{
@@ -999,7 +999,7 @@ bool ScAreaNameIterator::Next( OUString& rName, ScRange& rRange )
}
}
- if ( !bFirstPass ) // dann DB-Bereiche
+ if ( !bFirstPass ) // then the DB areas
{
if (pDBCollection && maDBPos != maDBEnd)
{
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 2f6a0e49c5db..5b1e193f6738 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -356,7 +356,7 @@ void ScRawToken::SetExternal( const sal_Unicode* pStr )
sal_Int32 nLen = GetStrLen( pStr ) + 1;
if( nLen >= MAXSTRLEN )
nLen = MAXSTRLEN-1;
- // Platz fuer Byte-Parameter lassen!
+ // Leave space for byte parameter!
memcpy( cStr+1, pStr, nLen * sizeof(sal_Unicode) );
cStr[ nLen+1 ] = 0;
}
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 777759148c3d..a46bbd821380 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -215,7 +215,7 @@ ErrCode ScFormatFilterPlugin::ScImportDif(SvStream& rIn, ScDocument* pDoc, const
if( bSyntErrWarn )
- // FIXME: Add proper Warnung!
+ // FIXME: Add proper warning!
return SCWARN_IMPORT_RANGE_OVERFLOW;
else if( bOverflowWarn )
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index f300bddc93ac..eff0af3325cd 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -802,7 +802,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
nColLast = aIn.ReaduInt8();
if( nExtSheet >= 0 )
- // von extern
+ // from external
{
if( rR.pExtSheetBuff->GetScTabIndex( nExtSheet, nTabLast ) )
{
diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx
index 2b19f41672c0..6abe5dfbd8ff 100644
--- a/sc/source/filter/inc/eeparser.hxx
+++ b/sc/source/filter/inc/eeparser.hxx
@@ -39,7 +39,7 @@ struct ScHTMLImage
Point aSpace;
OUString aFilterName;
std::unique_ptr<Graphic>
- pGraphic; // wird von WriteToDocument uebernommen
+ pGraphic; // is taken over by WriteToDocument
sal_Char nDir; // 1==hori, 2==verti, 3==beides
ScHTMLImage() :
@@ -51,17 +51,17 @@ struct ScEEParseEntry
{
SfxItemSet aItemSet;
ESelection aSel; // Selection in EditEngine
- OUString* pValStr; // HTML evtl. SDVAL String
- OUString* pNumStr; // HTML evtl. SDNUM String
- OUString* pName; // HTML evtl. Anchor/RangeName
+ OUString* pValStr; // HTML possibly SDVAL string
+ OUString* pNumStr; // HTML possibly SDNUM string
+ OUString* pName; // HTML possibly anchor/RangeName
OUString aAltText; // HTML IMG ALT Text
- std::vector< std::unique_ptr<ScHTMLImage> > maImageList; // Grafiken in dieser Zelle
- SCCOL nCol; // relativ zum Beginn des Parse
+ std::vector< std::unique_ptr<ScHTMLImage> > maImageList; // graphics in this cell
+ SCCOL nCol; // relative to the beginning of the parse
SCROW nRow;
sal_uInt16 nTab; // HTML TableInTable
sal_uInt16 nTwips; // RTF ColAdjust etc.
- SCCOL nColOverlap; // merged cells wenn >1
- SCROW nRowOverlap; // merged cells wenn >1
+ SCCOL nColOverlap; // merged cells if >1
+ SCROW nRowOverlap; // merged cells if >1
sal_uInt16 nOffset; // HTML PixelOffset
sal_uInt16 nWidth; // HTML PixelWidth
bool bHasGraphic:1; // HTML any image loaded
diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx
index 289444b1f7d6..ff7bd8e12428 100644
--- a/sc/source/filter/inc/excrecds.hxx
+++ b/sc/source/filter/inc/excrecds.hxx
@@ -118,7 +118,7 @@ public:
};
//-------------------------------------------------------------- class ExcBof -
-// Header Record fuer WORKSHEETS
+// Header Record for WORKSHEETS
class ExcBof : public ExcBof_Base
{
@@ -132,7 +132,7 @@ public:
};
//------------------------------------------------------------- class ExcBofW -
-// Header Record fuer WORKBOOKS
+// Header Record for WORKBOOKS
class ExcBofW : public ExcBof_Base
{
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index 2c8a0ed62828..1dec146863c5 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -41,7 +41,7 @@ enum class SvtScriptType;
namespace editeng { class SvxBorderLine; }
struct ScHTMLStyle
-{ // Defaults aus StyleSheet
+{ // Defaults from stylesheet
Color aBackgroundColor;
OUString aFontFamilyName;
sal_uInt32 nFontHeight; // Item-Value
diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx
index 1598f7d5daae..1e701a9eae50 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -31,7 +31,7 @@
#include "rangelst.hxx"
#include "eeparser.hxx"
-const sal_uInt32 SC_HTML_FONTSIZES = 7; // wie Export, HTML-Options
+const sal_uInt32 SC_HTML_FONTSIZES = 7; // like export, HTML options
// Pixel tolerance for SeekOffset and related.
const sal_uInt16 SC_HTML_OFFSET_TOLERANCE_SMALL = 1; // single table
@@ -156,22 +156,22 @@ private:
::std::stack< ScHTMLTableStackEntry* >
aTableStack;
OUString aString;
- ScRangeListRef xLockedList; // je Table
+ ScRangeListRef xLockedList; // per table
OuterMap* pTables;
ScHTMLColOffset maColOffset;
- ScHTMLColOffset* pLocalColOffset; // je Table
- sal_uLong nFirstTableCell; // je Table
+ ScHTMLColOffset* pLocalColOffset; // per table
+ sal_uLong nFirstTableCell; // per table
short nTableLevel;
sal_uInt16 nTable;
sal_uInt16 nMaxTable;
- SCCOL nColCntStart; // erste Col je Table
- SCCOL nMaxCol; // je Table
- sal_uInt16 nTableWidth; // je Table
- sal_uInt16 nColOffset; // aktuell, Pixel
- sal_uInt16 nColOffsetStart; // Startwert je Table, in Pixel
+ SCCOL nColCntStart; // first Col per table
+ SCCOL nMaxCol; // per table
+ sal_uInt16 nTableWidth; // per table
+ sal_uInt16 nColOffset; // current, pixel
+ sal_uInt16 nColOffsetStart; // start value per table, in pixel
sal_uInt16 nOffsetTolerance; // for use with SeekOffset and related
bool bTabInTabCell:1;
- bool bFirstRow:1; // je Table, ob in erster Zeile
+ bool bFirstRow:1; // per table, whether in first row
bool bInCell:1;
bool bInTitle:1;
diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx
index 192871d35002..894a89c26e7a 100644
--- a/sc/source/filter/inc/lotimpop.hxx
+++ b/sc/source/filter/inc/lotimpop.hxx
@@ -35,9 +35,9 @@ struct LotusContext;
class ImportLotus : public ImportTyp
{
private:
- SvStream* pIn; // benoetigt wegen multiplem Read()!
+ SvStream* pIn; // needed due to multiple Read()!
LotusToSc aConv;
- sal_uInt16 nTab; // z.Zt. bearbeitete Tabelle
+ sal_uInt16 nTab; // currently handled table
sal_Int32 nExtTab;
// in WK?-Datei
@@ -56,7 +56,7 @@ private:
void NamedSheet(); // 14000
void RowPresentation( sal_uInt16 nRecLen ); // 2007
- // in FM?-Datei
+ // in FM? file
void Font_Face(); // 174
void Font_Type(); // 176
void Font_Ysize(); // 177
@@ -64,14 +64,14 @@ private:
inline void Read( ScAddress& );
inline void Read( ScRange& );
- // fuer Addresses/Ranges im Format Row(16)/Tab(8)/Col(8)
+ // for addresses/ranges in the format row(16)/tab(8)/col(8)
inline void Read( sal_Char& );
inline void Read( sal_uInt8& );
inline void Read( sal_uInt16& );
inline void Read( sal_Int16& );
- inline void Read( double& ); // 10-Byte-IEEE lesen
+ inline void Read( double& ); // read 10-byte IEEE
inline void Read( LotAttrWK3& );
- void Read( OUString& ); // 0-terminierten String einlesen
+ void Read( OUString& ); // read in 0-terminated string
inline void Skip( const sal_uInt16 nNumBytes );
public:
@@ -80,7 +80,7 @@ public:
virtual ~ImportLotus() override;
ErrCode Read() override;
- ErrCode Read( SvStream& ); // special for *.fm3-Dateien
+ ErrCode Read( SvStream& ); // special for *.fm3 files
};
inline void ImportLotus::Read( ScAddress& rAddr )
diff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx
index 377a62266f64..c304876933ad 100644
--- a/sc/source/filter/inc/root.hxx
+++ b/sc/source/filter/inc/root.hxx
@@ -50,21 +50,21 @@ class XclExpRoot;
// Excel Imp~/Exp~ -
-struct RootData // -> Inkarnation jeweils im ImportExcel-Objekt!
+struct RootData // -> incarnation in each case in the ImportExcel object!
{
- BiffTyp eDateiTyp; // feine Differenzierung
+ BiffTyp eDateiTyp; // fine differentiation
ExtSheetBuffer* pExtSheetBuff;
SharedFormulaBuffer* pShrfmlaBuff;
ExtNameBuff* pExtNameBuff;
ExcelToSc* pFmlaConverter;
- XclImpColRowSettings* pColRowBuff; // Col/Row-Einstellungen 1 Tabelle
+ XclImpColRowSettings* pColRowBuff; // col/row settings 1 table
// Biff8
XclImpAutoFilterBuffer* pAutoFilterBuffer; // ranges for autofilter and advanced filter
ScRangeListTabs* pPrintRanges;
ScRangeListTabs* pPrintTitles;
- // Erweiterungen fuer Export
+ // extensions for export
XclExpChTrTabId* pTabId; // pointer to rec list, do not destroy
XclExpUserBViewList* pUserBViewList; // pointer to rec list, do not destroy
diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx
index 4e55abbcf4a9..2d352456f6ba 100644
--- a/sc/source/filter/inc/xcl97rec.hxx
+++ b/sc/source/filter/inc/xcl97rec.hxx
@@ -281,7 +281,7 @@ public:
};
// --- class ExcBofW8 ------------------------------------------------
-// Header Record fuer WORKBOOKS
+// Header Record for WORKBOOKS
class ExcBofW8 : public ExcBof8_Base
{
@@ -290,7 +290,7 @@ public:
};
// --- class ExcBof8 -------------------------------------------------
-// Header Record fuer WORKSHEETS
+// Header Record for WORKSHEETS
class ExcBof8 : public ExcBof8_Base
{
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 06e572453e96..fe2f22365371 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -945,7 +945,7 @@ Sc10Import::~Sc10Import()
delete pDataBaseCollection;
OSL_ENSURE( pPrgrsBar == nullptr,
- "*Sc10Import::Sc10Import(): Progressbar lebt noch!?" );
+ "*Sc10Import::Sc10Import(): progress bar is still alive!?" );
}
ErrCode Sc10Import::Import()
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index 2b01cddb41c7..425af099b597 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -71,7 +71,7 @@ ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const OUString& rFile,
bInCreate (false),
bDoInsert (true)
{
- OSL_ENSURE(dynamic_cast< const ScDocShell *>( pShell ) != nullptr, "ScAreaLink mit falscher ObjectShell");
+ OSL_ENSURE(dynamic_cast< const ScDocShell *>( pShell ) != nullptr, "ScAreaLink with wrong ObjectShell");
pImpl->m_pDocSh = static_cast< ScDocShell* >( pShell );
SetRefreshHandler( LINK( this, ScAreaLink, RefreshHdl ) );
SetRefreshControl( &pImpl->m_pDocSh->GetDocument().GetRefreshTimerControlAddress() );
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 3e06af5bd726..dd0576f281c3 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1998,7 +1998,7 @@ bool ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
nPaintFlags |= PaintPartFlags::Top;
break;
default:
- OSL_FAIL("Falscher Code beim Einfuegen");
+ OSL_FAIL("Wrong code at inserting");
bSuccess = false;
break;
}
@@ -2502,7 +2502,7 @@ bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
nPaintFlags |= PaintPartFlags::Top;
break;
default:
- OSL_FAIL("Falscher Code beim Loeschen");
+ OSL_FAIL("Wrong code at deleting");
break;
}
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index b20ad11cde30..aeb1b1baf857 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -395,7 +395,7 @@ void ScDocShell::CalcOutputFactor()
nPrtToScreenFactor = nPrinterWidth / (double) nWindowWidth;
else
{
- OSL_FAIL("GetTextSize gibt 0 ??");
+ OSL_FAIL("GetTextSize returns 0 ??");
nPrtToScreenFactor = 1.0;
}
}
@@ -1078,7 +1078,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck
if ( pAct && pAct->GetActionNumber() > nOldActionMax )
pAct->SetComment( rComment );
else
- OSL_FAIL( "MergeDocument: wohin mit dem Kommentar?!?" );
+ OSL_FAIL( "MergeDocument: what to do with the comment?!?" );
}
// adjust references
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 0723f4e06927..6233fa671711 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -204,7 +204,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
}
ScDBData* pDBData = GetDBData( ScRange(aPos), SC_DB_IMPORT, ScGetDBSelection::Keep );
- OSL_ENSURE(pDBData, "Cannot create DB-Daten");
+ OSL_ENSURE(pDBData, "Cannot create DB data");
sTarget = pDBData->GetName();
}
}
@@ -1295,7 +1295,7 @@ void ScDocShell::DoAutoStyle( const ScRange& rRange, const OUString& rStyle )
if (pStyleSheet)
{
OSL_ENSURE(rRange.aStart.Tab() == rRange.aEnd.Tab(),
- "DoAutoStyle mit mehreren Tabellen");
+ "DoAutoStyle with several tables");
SCTAB nTab = rRange.aStart.Tab();
SCCOL nStartCol = rRange.aStart.Col();
SCROW nStartRow = rRange.aStart.Row();
@@ -1322,7 +1322,7 @@ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint )
OUString aNewName = pStyle->GetName();
OUString aOldName = aNewName;
- const SfxStyleSheetModifiedHint* pExtendedHint = dynamic_cast<const SfxStyleSheetModifiedHint*>(&rHint); // Name geaendert?
+ const SfxStyleSheetModifiedHint* pExtendedHint = dynamic_cast<const SfxStyleSheetModifiedHint*>(&rHint); // name changed?
if (pExtendedHint)
aOldName = pExtendedHint->GetOldName();
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 00cf7c2db5b3..8ca99aac6171 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -46,7 +46,7 @@
#*
#* Function: Constructor of ScFunctionWin Class
#*
-#* Input: Sfx- Verknuepfungen, Fenster, Resource
+#* Input: Sfx - links, window, resource
#*
#* Output: ---
#*
@@ -235,7 +235,7 @@ void ScFunctionWin::UpdateFunctionList()
pDesc = pFuncMgr->Next();
}
}
- else // LRU-Liste
+ else // LRU list
{
for (::std::vector<const formula::IFunctionDescription*>::iterator iter=aLRUList.begin();
iter != aLRUList.end(); ++iter)
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index cbaf4dd74165..bdd9d25e2ba0 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -397,7 +397,7 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc )
bool bOtherDoc = (pRefDoc != m_pDoc && pRefDoc->GetDocumentShell()->HasName());
if ( bOtherDoc )
{
- // reference to other document - wie inputhdl.cxx
+ // reference to other document - like inputhdl.cxx
OSL_ENSURE(rRef.aStart.Tab()==rRef.aEnd.Tab(), "nStartTab!=nEndTab");
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index c0c9b83490e2..ec37aa9bd389 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -54,7 +54,7 @@ class SdrHdlList;
class ScTransferObj;
struct SpellCallbackInfo;
- // Maus-Status (nMouseStatus)
+ // mouse status (nMouseStatus)
#define SC_GM_NONE 0
#define SC_GM_TABDOWN 1
@@ -64,7 +64,7 @@ struct SpellCallbackInfo;
#define SC_GM_WATERUNDO 5
#define SC_GM_URLDOWN 6
- // Page-Drag-Modus
+ // page drag mode
#define SC_PD_NONE 0
#define SC_PD_RANGE_L 1
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 9f60f9b6eeb0..2a7e67994b74 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -333,7 +333,7 @@ public:
bool SelMouseButtonDown( const MouseEvent& rMEvt );
ScDrawView* GetScDrawView() { return pDrawView; }
- // gegen CLOKs
+ // against CLOKs
SdrView* GetSdrView() { return pDrawView; }
bool IsMinimized() const { return bMinimized; }
@@ -454,7 +454,7 @@ public:
void ScrollToObject( SdrObject* pDrawObj );
void MakeVisible( const tools::Rectangle& rHMMRect );
- // Zeichnen
+ // Drawing
void PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
ScUpdateMode eMode = ScUpdateMode::All );
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index 7ca09678f1e9..57a89337aa01 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -141,7 +141,7 @@ public:
enum ScMoveUndoMode { SC_UNDO_REFFIRST, SC_UNDO_REFLAST };
-class ScMoveUndo: public ScSimpleUndo // mit Referenzen
+class ScMoveUndo: public ScSimpleUndo // with references
{
public:
ScMoveUndo( ScDocShell* pDocSh,
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index cbca4cecc81b..a05185191a22 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -238,7 +238,7 @@ void ScContentTree::InitRoot( ScContentId nType )
BitmapEx aBitmap(aContentBmps[(int)nType - 1]);
Image aImage(aBitmap);
OUString aName(ScResId(SCSTR_CONTENT_ROOT + (int)nType));
- // wieder an die richtige Position:
+ // back to the correct position:
sal_uInt16 nPos = nRootType != ScContentId::ROOT ? 0 : pPosList[nType]-1;
SvTreeListEntry* pNew = InsertEntry( aName, aImage, aImage, nullptr, false, nPos );
@@ -587,7 +587,7 @@ void ScContentTree::Command( const CommandEvent& rCEvt )
case CommandEventId::ContextMenu:
{
- // Drag-Drop Modus
+ // drag-and-drop mode
ScopedVclPtrInstance<PopupMenu> aPop;
VclBuilder aBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/scalc/ui/dropmenu.ui", "");
@@ -1518,7 +1518,7 @@ void ScContentTree::SetRootType( ScContentId nNew )
}
}
-void ScContentTree::ToggleRoot() // nach Selektion
+void ScContentTree::ToggleRoot() // after selection
{
ScContentId nNew = ScContentId::ROOT;
if ( nRootType == ScContentId::ROOT )
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 138e4deb2df5..c145b0ec9422 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -177,7 +177,7 @@ void ColumnEdit::ExecuteCol()
{
SCROW nRow = xDlg->aEdRow->GetRow();
- EvalText(); // setzt nCol
+ EvalText(); // sets nCol
if ( (nCol > 0) && (nRow > 0) )
xDlg->SetCurrentCell(nCol - 1, nRow - 1);
@@ -316,7 +316,7 @@ IMPL_LINK(ScNavigatorDlg, DocumentSelectHdl, ListBox&, rListBox, void)
IMPL_LINK(ScNavigatorDlg, ToolBoxSelectHdl, ToolBox*, pToolBox, void)
{
sal_uInt16 nSelId = pToolBox->GetCurItemId();
- // Modus umschalten ?
+ // Switch the mode?
if (nSelId == nZoomId || nSelId == nScenarioId)
{
NavListMode eOldMode = eListMode;
@@ -357,7 +357,7 @@ IMPL_LINK(ScNavigatorDlg, ToolBoxSelectHdl, ToolBox*, pToolBox, void)
IMPL_LINK(ScNavigatorDlg, ToolBoxDropdownClickHdl, ToolBox *, pToolBox, void)
{
- // the popup menu of the drop modus has to be called in the
+ // the popup menu of the drop mode has to be called in the
// click (button down) and not in the select (button up)
if (pToolBox->GetCurItemId() == nDragModeId)
{
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index c853dd7732a4..4ca3e92fb35b 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -19,7 +19,7 @@
#include "scres.hrc"
- // Strings fuer Interface-Namen ------------------------------------------
+ // Strings for interface names -------------------------------------------
String SCSTR_LONG_SCDOC_NAME
{
@@ -205,7 +205,7 @@ String SCSTR_VALID_LIST
Text [ en-US ] = "~Entries" ;
};
- // fuer Dialoge:
+ // for dialogues:
String SCSTR_CHARSET_USER
{
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index b2fcb297cf84..5593feed2a74 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -791,7 +791,7 @@ void Chart2Positioner::createPositionMap()
pCol = pCols->begin()->second;
if (mbDummyUpperLeft)
if (pCol->find(0) == pCol->end())
- (*pCol)[ 0 ] = nullptr; // Dummy fuer Beschriftung
+ (*pCol)[ 0 ] = nullptr; // dummy for labeling
nAllRowCount = static_cast<SCSIZE>(pCol->size());
}
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index 21da6fbc7c08..cd8332aefc76 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -208,7 +208,7 @@ void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRo
OSL_ENSURE( rRanges.size() == 1, "Range? Ranges?" );
ScRange aNewRange( *rRanges[ 0 ] );
- aNewRange.PutInOrder(); //! wirklich?
+ aNewRange.PutInOrder(); //! really?
long nEndX = aNewRange.aStart.Col() + nColumns - 1;
long nEndY = aNewRange.aStart.Row() + nRows - 1;
@@ -240,7 +240,7 @@ void SAL_CALL ScCellCursorObj::gotoStartOfUsedArea(sal_Bool bExpand)
ScRange aNewRange( *rRanges[0] );
SCTAB nTab = aNewRange.aStart.Tab();
- SCCOL nUsedX = 0; // Anfang holen
+ SCCOL nUsedX = 0; // fetch the beginning
SCROW nUsedY = 0;
if (!pDocSh->GetDocument().GetDataStart( nTab, nUsedX, nUsedY ))
{
@@ -267,7 +267,7 @@ void SAL_CALL ScCellCursorObj::gotoEndOfUsedArea( sal_Bool bExpand )
ScRange aNewRange( *rRanges[ 0 ]);
SCTAB nTab = aNewRange.aStart.Tab();
- SCCOL nUsedX = 0; // Ende holen
+ SCCOL nUsedX = 0; // fetch the end
SCROW nUsedY = 0;
if (!pDocSh->GetDocument().GetTableArea( nTab, nUsedX, nUsedY ))
{
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 30039fd76fed..32ee2b1590bc 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -253,7 +253,7 @@ void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequ
rParam.nType = ScDbQuery;
break;
default:
- OSL_FAIL("falscher Mode");
+ OSL_FAIL("wrong mode");
rParam.bImport = false;
}
}
@@ -262,11 +262,11 @@ void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequ
void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq, const ScSortParam& rParam )
{
- OSL_ENSURE( rSeq.getLength() == GetPropertyCount(), "falscher Count" );
+ OSL_ENSURE( rSeq.getLength() == GetPropertyCount(), "wrong count" );
beans::PropertyValue* pArray = rSeq.getArray();
- // Uno-Werte zusammensuchen
+ // gather Uno values together
table::CellAddress aOutPos;
aOutPos.Sheet = rParam.nDestTab;
@@ -285,14 +285,14 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq
{
pFieldArray[i].Field = rParam.maKeyState[i].nField;
pFieldArray[i].IsAscending = rParam.maKeyState[i].bAscending;
- pFieldArray[i].FieldType = table::TableSortFieldType_AUTOMATIC; // immer Automatic
+ pFieldArray[i].FieldType = table::TableSortFieldType_AUTOMATIC; // always automatic
pFieldArray[i].IsCaseSensitive = rParam.bCaseSens;
pFieldArray[i].CollatorLocale = rParam.aCollatorLocale;
pFieldArray[i].CollatorAlgorithm = rParam.aCollatorAlgorithm;
}
}
- // Sequence fuellen
+ // fill the sequence
pArray[0].Name = SC_UNONAME_ISSORTCOLUMNS;
pArray[0].Value <<= !rParam.bByRow;
@@ -374,7 +374,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
rParam.maKeyState[i].nField = static_cast<SCCOLROW>( pFieldArray[i].Field );
rParam.maKeyState[i].bAscending = pFieldArray[i].SortAscending;
- // FieldType wird ignoriert
+ // FieldType is ignored
rParam.maKeyState[i].bDoSort = true;
}
for (i=nCount; i<nSortSize; i++)
@@ -400,7 +400,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
rParam.aCollatorLocale = pFieldArray[i].CollatorLocale;
rParam.aCollatorAlgorithm = pFieldArray[i].CollatorAlgorithm;
- // FieldType wird ignoriert
+ // FieldType is ignored
rParam.maKeyState[i].bDoSort = true;
}
for (i=nCount; i<nSortSize; i++)
@@ -612,7 +612,7 @@ void SAL_CALL ScSubTotalDescriptorBase::addNew(
PutData(aParam);
}
-// Flags/Einstellungen als Properties
+// flags/settings as properties
// XEnumerationAccess
@@ -782,17 +782,17 @@ ScSubTotalDescriptor::~ScSubTotalDescriptor()
void ScSubTotalDescriptor::GetData( ScSubTotalParam& rParam ) const
{
- rParam = aStoredParam; // Abfrage fuer Interface
+ rParam = aStoredParam; // query for interface
}
void ScSubTotalDescriptor::PutData( const ScSubTotalParam& rParam )
{
- aStoredParam = rParam; // vom Interface gesetzt
+ aStoredParam = rParam; // set by the interface
}
void ScSubTotalDescriptor::SetParam( const ScSubTotalParam& rNew )
{
- aStoredParam = rNew; // von aussen gesetzt
+ aStoredParam = rNew; // set from outside
}
ScRangeSubTotalDescriptor::ScRangeSubTotalDescriptor(ScDatabaseRangeObj* pPar) :
@@ -979,8 +979,8 @@ uno::Sequence<sheet::TableFilterField> SAL_CALL ScFilterDescriptorBase::getFilte
ScQueryParam aParam;
GetData(aParam);
- SCSIZE nEntries = aParam.GetEntryCount(); // allozierte Eintraege im Param
- SCSIZE nCount = 0; // aktive
+ SCSIZE nEntries = aParam.GetEntryCount(); // allocated entries in Param
+ SCSIZE nCount = 0; // active
while ( nCount < nEntries &&
aParam.GetEntry(nCount).bDoQuery )
++nCount;
@@ -1030,7 +1030,7 @@ uno::Sequence<sheet::TableFilterField> SAL_CALL ScFilterDescriptorBase::getFilte
case SC_TOPPERC: aField.Operator = sheet::FilterOperator_TOP_PERCENT; break;
case SC_BOTPERC: aField.Operator = sheet::FilterOperator_BOTTOM_PERCENT; break;
default:
- OSL_FAIL("Falscher Filter-enum");
+ OSL_FAIL("wrong filter enum");
aField.Operator = sheet::FilterOperator_EMPTY;
}
pAry[i] = aField;
@@ -1245,8 +1245,8 @@ uno::Sequence<sheet::TableFilterField3> SAL_CALL ScFilterDescriptorBase::getFilt
ScQueryParam aParam;
GetData(aParam);
- SCSIZE nEntries = aParam.GetEntryCount(); // allozierte Eintraege im Param
- SCSIZE nCount = 0; // aktive
+ SCSIZE nEntries = aParam.GetEntryCount(); // allocated entries in Param
+ SCSIZE nCount = 0; // active
while ( nCount < nEntries &&
aParam.GetEntry(nCount).bDoQuery )
++nCount;
@@ -1494,17 +1494,17 @@ ScFilterDescriptor::~ScFilterDescriptor()
void ScFilterDescriptor::GetData( ScQueryParam& rParam ) const
{
- rParam = aStoredParam; // Abfrage fuer Interface
+ rParam = aStoredParam; // query for interface
}
void ScFilterDescriptor::PutData( const ScQueryParam& rParam )
{
- aStoredParam = rParam; // vom Interface gesetzt
+ aStoredParam = rParam; // set by the interface
}
void ScFilterDescriptor::SetParam( const ScQueryParam& rNew )
{
- aStoredParam = rNew; // von aussen gesetzt
+ aStoredParam = rNew; // set from outside
}
ScRangeFilterDescriptor::ScRangeFilterDescriptor(ScDocShell* pDocShell, ScDatabaseRangeObj* pPar) :
@@ -2278,7 +2278,7 @@ uno::Sequence<OUString> SAL_CALL ScDatabaseRangesObj::getElementNames()
{
SolarMutexGuard aGuard;
- //! "unbenannt" weglassen ?
+ //! need to omit "unnamed"?
if (pDocShell)
{
@@ -2301,7 +2301,7 @@ sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const OUString& aName )
{
SolarMutexGuard aGuard;
- //! "unbenannt" weglassen ?
+ //! need to omit "unnamed"?
if (pDocShell)
{
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 785de1c51cc3..23b908d4cf1e 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -1118,7 +1118,7 @@ ScEditFieldObj::~ScEditFieldObj()
SvxFieldItem ScEditFieldObj::CreateFieldItem()
{
- OSL_ENSURE( !mpEditSource, "CreateFieldItem mit eingefuegtem Feld" );
+ OSL_ENSURE( !mpEditSource, "CreateFieldItem with inserted field" );
return SvxFieldItem(*getData(), EE_FEATURE_FIELD);
}
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 5f7c71160f03..6ed3b94fbe30 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -140,7 +140,7 @@ ScCondFormatEntryItem::ScCondFormatEntryItem() :
ScTableConditionalFormat::ScTableConditionalFormat(
ScDocument* pDoc, sal_uLong nKey, SCTAB nTab, FormulaGrammar::Grammar eGrammar)
{
- // Eintrag aus dem Dokument lesen...
+ // read the entry from the document...
if ( pDoc && nKey )
{
@@ -331,7 +331,7 @@ void SAL_CALL ScTableConditionalFormat::addNew(
}
else
{
- OSL_FAIL("falsche Property");
+ OSL_FAIL("wrong property");
//! Exception...
}
}
@@ -579,7 +579,7 @@ ScTableValidationObj::ScTableValidationObj(ScDocument* pDoc, sal_uLong nKey,
const formula::FormulaGrammar::Grammar eGrammar) :
aPropSet( lcl_GetValidatePropertyMap() )
{
- // Eintrag aus dem Dokument lesen...
+ // read the entry from the document...
bool bFound = false;
if ( pDoc && nKey )
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 77be3e2b5d04..a9b04fa65cb5 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -1035,7 +1035,7 @@ void ScDDELinkObj::Notify( SfxBroadcaster&, const SfxHint& rHint )
static OUString lcl_BuildDDEName( const OUString& rAppl, const OUString& rTopic, const OUString& rItem )
{
- // Appl|Topic!Item (wie Excel)
+ // Appl|Topic!Item (like Excel)
OUString aRet = rAppl + "|" + rTopic + "!" + rItem;
return aRet;
}
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 33600f6165ee..f8a10d2abb25 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -1052,7 +1052,7 @@ void SAL_CALL ScStyleObj::setParentStyle( const OUString& rParentStyle )
ScDocument& rDoc = pDocShell->GetDocument();
if ( eFamily == SfxStyleFamily::Para )
{
- // update lineheight
+ // update line height
ScopedVclPtrInstance< VirtualDevice > pVDev;
Point aLogic = pVDev->LogicToPixel( Point(1000,1000), MapUnit::MapTwip );
@@ -1628,7 +1628,7 @@ void ScStyleObj::setPropertyValue_Impl( const OUString& rPropertyName, const Sfx
{
bool bBool = false;
*pValue >>= bBool;
- //! sal_Bool-MID fuer ScViewObjectModeItem definieren?
+ //! need to define sal_Bool-MID for ScViewObjectModeItem?
rSet.Put( ScViewObjectModeItem( pEntry->nWID,
bBool ? VOBJ_MODE_SHOW : VOBJ_MODE_HIDE ) );
}
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index ef67bfc77a39..5634752685ea 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -306,7 +306,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCurs
if (!mxUnoText.is())
CreateUnoText_Impl();
return mxUnoText->createTextCursorByRange(aTextPosition);
- //! wie ScCellObj::createTextCursorByRange, wenn SvxUnoTextRange_getReflection verfuegbar
+ //! like ScCellObj::createTextCursorByRange, if SvxUnoTextRange_getReflection available
}
void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData )
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 663b1923af91..ff7ec2978608 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -179,7 +179,7 @@ ScTabView::~ScTabView()
SfxLokHelper::forEachOtherView(pThisViewShell, lRemoveWindows);
}
- aViewData.KillEditView(); // solange GridWin's noch existieren
+ aViewData.KillEditView(); // as long as GridWins still exist
if (pDrawView)
{
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 16f8f2c0480f..ae0247b2cf24 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1193,7 +1193,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
pEditView[eWhich]->SetBackgroundColor( aBackCol );
pEditView[eWhich]->Invalidate(); // needed?
- // needed, wenn position changed
+ // needed, if position changed
}
IMPL_LINK( ScViewData, EditEngineHdl, EditStatus&, rStatus, void )
More information about the Libreoffice-commits
mailing list