This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new b7a60f1  Cleaned up resource files
b7a60f1 is described below

commit b7a60f16418b91699521c3ebe09335b8a01e7cd8
Author: mseidel <msei...@apache.org>
AuthorDate: Fri Aug 20 18:33:58 2021 +0200

    Cleaned up resource files
---
 main/basic/source/classes/sb.src                  | 114 +---------
 main/xmlsecurity/source/dialogs/macrosecurity.src | 265 +++++++++++-----------
 2 files changed, 141 insertions(+), 238 deletions(-)

diff --git a/main/basic/source/classes/sb.src b/main/basic/source/classes/sb.src
index ebcdc8f..41f5f7e 100644
--- a/main/basic/source/classes/sb.src
+++ b/main/basic/source/classes/sb.src
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,19 +7,20 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
+
 #define __RSC
 #ifndef _ERRCODE_HXX //autogen
 #include <tools/errcode.hxx>
@@ -43,17 +44,14 @@ Resource RID_BASIC_START
        };
        String SbERR_BAD_ARGUMENT & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Ung�ltiger 
Prozeduraufruf : Ung�ltiger Prozeduraufruf */
                Text [ en-US ] = "Invalid procedure call." ;
        };
        String SbERR_MATH_OVERFLOW & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? �berlauf : �berlauf */
                Text [ en-US ] = "Overflow." ;
        };
        String SbERR_NO_MEMORY & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Nicht gen�gend Speicher 
: Nicht gen�gend Speicher */
                Text [ en-US ] = "Not enough memory." ;
        };
        String SbERR_ALREADY_DIM & ERRCODE_RES_MASK
@@ -62,7 +60,6 @@ Resource RID_BASIC_START
        };
        String SbERR_OUT_OF_RANGE & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Index au�erhalb des 
definierten Bereichs : Index au�erhalb des definierten Bereichs */
                Text [ en-US ] = "Index out of defined range." ;
        };
        String SbERR_DUPLICATE_DEF & ERRCODE_RES_MASK
@@ -79,12 +76,10 @@ Resource RID_BASIC_START
        };
        String SbERR_CONVERSION & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Datentypen 
unvertr�glich : Datentypen unvertr�glich */
                Text [ en-US ] = "Data type mismatch." ;
        };
        String SbERR_BAD_PARAMETER & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Ung�ltiger Parameter : 
Ung�ltiger Parameter */
                Text [ en-US ] = "Invalid parameter." ;
        };
        String SbERR_USER_ABORT & ERRCODE_RES_MASK
@@ -97,7 +92,6 @@ Resource RID_BASIC_START
        };
        String SbERR_STACK_OVERFLOW & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Nicht gen�gend 
Stapelspeicher : Nicht gen�gend Stapelspeicher */
                Text [ en-US ] = "Not enough stack memory." ;
        };
        String SbERR_PROC_UNDEFINED & ERRCODE_RES_MASK
@@ -130,12 +124,10 @@ Resource RID_BASIC_START
        };
        String SbERR_FILE_ALREADY_OPEN & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Datei bereits ge�ffnet 
: Datei bereits ge�ffnet */
                Text [ en-US ] = "File already open." ;
        };
        String SbERR_IO_ERROR & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Ger�te-E/A-Fehler : 
Ger�te-E/A-Fehler */
                Text [ en-US ] = "Device I/O error." ;
        };
        String SbERR_FILE_EXISTS & ERRCODE_RES_MASK
@@ -144,7 +136,6 @@ Resource RID_BASIC_START
        };
        String SbERR_BAD_RECORD_LENGTH & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Falsche Datensatzl�nge 
: Falsche Datensatzl�nge */
                Text [ en-US ] = "Incorrect record length." ;
        };
        String SbERR_DISK_FULL & ERRCODE_RES_MASK
@@ -153,7 +144,6 @@ Resource RID_BASIC_START
        };
        String SbERR_READ_PAST_EOF & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Lesen �ber das Ende der 
Datei hinaus : Lesen �ber das Ende der Datei hinaus */
                Text [ en-US ] = "Reading exceeds EOF." ;
        };
        String SbERR_BAD_RECORD_NUMBER & ERRCODE_RES_MASK
@@ -166,7 +156,6 @@ Resource RID_BASIC_START
        };
        String SbERR_NO_DEVICE & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Ger�t nicht verf�gbar : 
Ger�t nicht verf�gbar */
                Text [ en-US ] = "Device not available." ;
        };
        String SbERR_ACCESS_DENIED & ERRCODE_RES_MASK
@@ -183,7 +172,6 @@ Resource RID_BASIC_START
        };
        String SbERR_DIFFERENT_DRIVE & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Umbenennen auf 
verschiedenen Laufwerken nicht m�glich : Umbenennen auf verschiedenen 
Laufwerken nicht m�glich */
                Text [ en-US ] = "Renaming on different drives impossible." ;
        };
        String SbERR_ACCESS_ERROR & ERRCODE_RES_MASK
@@ -200,12 +188,10 @@ Resource RID_BASIC_START
        };
        String SbERR_BAD_PATTERN & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Zeichenfolgenmuster 
unzul�ssig : Zeichenfolgenmuster unzul�ssig */
                Text [ en-US ] = "Invalid string pattern." ;
        };
        String SBERR_IS_NULL & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Verwendung von Null 
unzul�ssig : Verwendung von Null unzul�ssig */
                Text [ en-US ] = "Use of zero not permitted." ;
        };
        String SbERR_DDE_ERROR & ERRCODE_RES_MASK
@@ -218,7 +204,6 @@ Resource RID_BASIC_START
        };
        String SbERR_DDE_OUTOFCHANNELS & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Keine freien DDE-Kan�le 
: Keine freien DDE-Kan�le */
                Text [ en-US ] = "No DDE channels available." ;
        };
        String SbERR_DDE_NO_RESPONSE & ERRCODE_RES_MASK
@@ -235,17 +220,14 @@ Resource RID_BASIC_START
        };
        String SbERR_DDE_NOTPROCESSED & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Fremdapplikation kann 
DDE-Operation nicht ausf�hren : Fremdapplikation kann DDE-Operation nicht 
ausf�hren */
                Text [ en-US ] = "External application cannot execute DDE 
operation." ;
        };
        String SbERR_DDE_TIMEOUT & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Zeit�berschreitung 
w�hrend des Wartens auf DDE-Antwort : Zeit�berschreitung w�hrend des Wartens 
auf DDE-Antwort */
                Text [ en-US ] = "Timeout while waiting for DDE response." ;
        };
        String SbERR_DDE_USER_INTERRUPT & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Benutzer dr�ckte ESCAPE 
w�hrend der DDE-Operation : Benutzer dr�ckte ESCAPE w�hrend der DDE-Operation */
                Text [ en-US ] = "User pressed ESCAPE during DDE operation." ;
        };
        String SbERR_DDE_BUSY & ERRCODE_RES_MASK
@@ -266,7 +248,6 @@ Resource RID_BASIC_START
        };
        String SbERR_DDE_CONV_CLOSED & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? DDE-Verbindung ist 
unterbrochen oder ge�ndert worden : DDE-Verbindung ist unterbrochen oder 
ge�ndert worden */
                Text [ en-US ] = "DDE connection interrupted or modified." ;
        };
        String SbERR_DDE_NO_CHANNEL & ERRCODE_RES_MASK
@@ -275,7 +256,6 @@ Resource RID_BASIC_START
        };
        String SbERR_DDE_INVALID_LINK & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Ung�ltiges 
DDE-Linkformat : Ung�ltiges DDE-Linkformat */
                Text [ en-US ] = "Invalid DDE link format." ;
        };
        String SbERR_DDE_QUEUE_OVERFLOW & ERRCODE_RES_MASK
@@ -284,52 +264,42 @@ Resource RID_BASIC_START
        };
        String SbERR_DDE_LINK_ALREADY_EST & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Paste Link bereits 
durchgef�hrt : Paste Link bereits durchgef�hrt */
                Text [ en-US ] = "Paste link already performed." ;
        };
        String SbERR_DDE_LINK_INV_TOPIC & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? LinkMode kann wegen 
ung�ltigen Link-Topics nicht gesetzt werden : LinkMode kann wegen ung�ltigen 
Link-Topics nicht gesetzt werden */
                Text [ en-US ] = "Link mode cannot be set due to invalid link 
topic." ;
        };
        String SbERR_DDE_DLL_NOT_FOUND & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? F�r DDE wird DDEML.DLL 
ben�tigt : F�r DDE wird DDEML.DLL ben�tigt */
                Text [ en-US ] = "DDE requires the DDEML.DLL file." ;
        };
        String SbERR_CANNOT_LOAD & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Das Modul kann nicht 
geladen werden, ung�ltiges Format : Das Modul kann nicht geladen werden, 
ung�ltiges Format */
                Text [ en-US ] = "Module cannot be loaded; invalid format." ;
        };
        String SbERR_BAD_INDEX & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Ung�ltiger Objektindex 
: Ung�ltiger Objektindex */
                Text [ en-US ] = "Invalid object index." ;
        };
        String SbERR_NO_ACTIVE_OBJECT & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Objekt ist nicht 
verf�gbar : Objekt ist nicht verf�gbar */
                Text [ en-US ] = "Object is not available." ;
        };
        String SbERR_BAD_PROP_VALUE & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Falscher Wert f�r 
Eigenschaft : Falscher Wert f�r Eigenschaft */
                Text [ en-US ] = "Incorrect property value." ;
        };
        String SbERR_PROP_READONLY & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Eigenschaft ist 
schreibgesch�tzt : Eigenschaft ist schreibgesch�tzt */
                Text [ en-US ] = "This property is read-only." ;
        };
        String SbERR_PROP_WRITEONLY & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Eigenschaft ist 
lesegesch�tzt : Eigenschaft ist lesegesch�tzt */
                Text [ en-US ] = "This property is write only." ;
        };
        String SbERR_INVALID_OBJECT & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Ung�ltige 
Objektreferenz : Ung�ltige Objektreferenz */
                Text [ en-US ] = "Invalid object reference." ;
        };
        String SbERR_NO_METHOD & ERRCODE_RES_MASK
@@ -346,12 +316,10 @@ Resource RID_BASIC_START
        };
        String SbERR_NO_OLE & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? OLE-Automatisierung 
wird von diesem Objekt nicht unterst�tzt : OLE-Automatisierung wird von diesem 
Objekt nicht unterst�tzt */
                Text [ en-US ] = "OLE Automation is not supported by this 
object." ;
        };
        String SbERR_BAD_METHOD & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Objekt unterst�tzt 
diese Eigenschaft oder Methode nicht : Objekt unterst�tzt diese Eigenschaft 
oder Methode nicht */
                Text [ en-US ] = "This property or method is not supported by 
the object." ;
        };
        String SbERR_OLE_ERROR & ERRCODE_RES_MASK
@@ -360,17 +328,14 @@ Resource RID_BASIC_START
        };
        String SbERR_BAD_ACTION & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Diese Aktion wird vom 
angegebenen Objekt nicht unterst�tzt : Diese Aktion wird vom angegebenen Objekt 
nicht unterst�tzt */
                Text [ en-US ] = "This action is not supported by given 
object." ;
        };
        String SbERR_NO_NAMED_ARGS & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Benannte Argumente 
werden vom angegebenen Objekt nicht unterst�tzt : Benannte Argumente werden vom 
angegebenen Objekt nicht unterst�tzt */
                Text [ en-US ] = "Named arguments are not supported by given 
object." ;
        };
        String SbERR_BAD_LOCALE & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Das aktuelle 
Gebietsschema wird vom angegebenen Objekt nicht unterst�tzt : Das aktuelle 
Gebietsschema wird vom angegebenen Objekt nicht unterst�tzt */
                Text [ en-US ] = "The current locale setting is not supported 
by the given object." ;
        };
        String SbERR_NAMED_NOT_FOUND & ERRCODE_RES_MASK
@@ -391,7 +356,6 @@ Resource RID_BASIC_START
        };
        String SbERR_BAD_ORDINAL & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Ordnungszahl ung�ltig : 
Ordnungszahl ung�ltig */
                Text [ en-US ] = "Invalid ordinal number." ;
        };
        String SbERR_DLLPROC_NOT_FOUND & ERRCODE_RES_MASK
@@ -400,7 +364,6 @@ Resource RID_BASIC_START
        };
        String SbERR_BAD_CLIPBD_FORMAT & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Ung�ltiges 
Clipboard-Format : Ung�ltiges Clipboard-Format */
                Text [ en-US ] = "Invalid clipboard format." ;
        };
        String SbERR_PROPERTY_NOT_FOUND & ERRCODE_RES_MASK
@@ -417,12 +380,10 @@ Resource RID_BASIC_START
        };
        String SbERR_BAD_NUMBER_OF_ARGS & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Ung�ltige Anzahl von 
Argumenten : Ung�ltige Anzahl von Argumenten */
                Text [ en-US ] = "Invalid number of arguments." ;
        };
        String SbERR_METHOD_FAILED & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Fehler in Ausf�hrung 
einer Methode : Fehler in Ausf�hrung einer Methode */
                Text [ en-US ] = "Error executing a method." ;
        };
        String SbERR_SETPROP_FAILED & ERRCODE_RES_MASK
@@ -433,7 +394,7 @@ Resource RID_BASIC_START
        {
                Text [ en-US ] = "Unable to determine property." ;
        };
-        // Compiler errors. These are not runtime errors.
+       // Compiler errors. These are not runtime errors.
        String SbERR_UNEXPECTED & ERRCODE_RES_MASK
        {
                Text [ en-US ] = "Unexpected symbol: $(ARG1)." ;
@@ -512,12 +473,10 @@ Resource RID_BASIC_START
        };
        String SbERR_BAD_CHAR_IN_NUMBER & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Ung�ltiges Zeichen in 
Zahl : Ung�ltiges Zeichen in Zahl */
                Text [ en-US ] = "Invalid character in number." ;
        };
        String SbERR_MUST_HAVE_DIMS & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Array mu� dimensioniert 
werden : Array mu� dimensioniert werden */
                Text [ en-US ] = "Array must be dimensioned." ;
        };
        String SbERR_NO_IF & ERRCODE_RES_MASK
@@ -526,12 +485,10 @@ Resource RID_BASIC_START
        };
        String SbERR_NOT_IN_SUBR & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? $(ARG1) innerhalb einer 
Prozedur unzul�ssig : $(ARG1) innerhalb einer Prozedur unzul�ssig */
                Text [ en-US ] = "$(ARG1) not allowed within a procedure." ;
        };
        String SbERR_NOT_IN_MAIN & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? $(ARG1) au�erhalb einer 
Prozedur unzul�ssig : $(ARG1) au�erhalb einer Prozedur unzul�ssig */
                Text [ en-US ] = "$(ARG1) not allowed outside a procedure." ;
        };
        String SbERR_WRONG_DIMS & ERRCODE_RES_MASK
@@ -548,12 +505,10 @@ Resource RID_BASIC_START
        };
        String SbERR_PROG_TOO_LARGE & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Programm ist zu gro� : 
Programm ist zu gro� */
                Text [ en-US ] = "Program too large." ;
        };
        String SbERR_NO_STRINGS_ARRAYS & ERRCODE_RES_MASK
        {
-               /* ### ACHTUNG: Neuer Text in Resource? Strings oder Arrays 
unzul�ssig : Strings oder Arrays unzul�ssig */
                Text [ en-US ] = "Strings or arrays not permitted." ;
        };
        String ERRCODE_BASIC_EXCEPTION & ERRCODE_RES_MASK
@@ -589,37 +544,25 @@ Resource RID_BASIC_START
                Text [ en-US ] = "$(ARG1)" ;
        };
 };
- // Hinweis: IDS_SBERR_TERMINATED = IDS_SBERR_START+2000.
+// Note: IDS_SBERR_TERMINATED = IDS_SBERR_START+2000.
 String IDS_SBERR_TERMINATED
 {
        Text [ en-US ] = "The macro running has been interrupted" ;
 };
 String IDS_SBERR_STOREREF
 {
-       Text [ en-US ] = "Reference will not be saved: ";
+       Text [ en-US ] = "Reference will not be saved: " ;
 };
 String ERRCODE_BASMGR_LIBLOAD & ERRCODE_RES_MASK
 {
-       /* ### ACHTUNG: Neuer Text in Resource? Fehler beim Laden der 
Bibliothek '$(ARG1)' : Fehler beim Laden der Bibliothek ''$(ARG1)'' */
-       /* ### ACHTUNG: Neuer Text in Resource? Fehler beim Laden der 
Bibliothek '$(ARG1)' : Fehler beim Laden der Bibliothek ''$(ARG1) */
-       /* ### ACHTUNG: Neuer Text in Resource? Fehler beim Laden der 
Bibliothek '$(ARG1)' : Fehler beim Laden der Bibliothek ''$(ARG1) */
-       /* ### ACHTUNG: Neuer Text in Resource? Fehler beim Laden der 
Bibliothek '$(ARG1)' : Fehler beim Laden der Bibliothek ''$(ARG1)'' */
        Text [ en-US ] = "Error loading library '$(ARG1)'." ;
 };
 String ERRCODE_BASMGR_LIBSAVE & ERRCODE_RES_MASK
 {
-       /* ### ACHTUNG: Neuer Text in Resource? Fehler beim Speichern der 
Bibliothek: '$(ARG1)' : Fehler beim Speichern der Bibliothek: ''$(ARG1)'' */
-       /* ### ACHTUNG: Neuer Text in Resource? Fehler beim Speichern der 
Bibliothek: '$(ARG1)' : Fehler beim Speichern der Bibliothek: ''$(ARG1) */
-       /* ### ACHTUNG: Neuer Text in Resource? Fehler beim Speichern der 
Bibliothek: '$(ARG1)' : Fehler beim Speichern der Bibliothek: ''$(ARG1) */
-       /* ### ACHTUNG: Neuer Text in Resource? Fehler beim Speichern der 
Bibliothek: '$(ARG1)' : Fehler beim Speichern der Bibliothek: ''$(ARG1)'' */
        Text [ en-US ] = "Error saving library: '$(ARG1)'." ;
 };
 String ERRCODE_BASMGR_MGROPEN & ERRCODE_RES_MASK
 {
-       /* ### ACHTUNG: Neuer Text in Resource? Das BASIC aus der Datei 
'$(ARG1)' konnte nicht initialisiert werden : Das BASIC aus der Datei 
''$(ARG1)'' konnte nicht initialisiert werden */
-       /* ### ACHTUNG: Neuer Text in Resource? Das BASIC aus der Datei 
'$(ARG1)' konnte nicht initialisiert werden : Das BASIC aus der Datei 
''$(ARG1)'' konnte nicht initialisiert werden */
-       /* ### ACHTUNG: Neuer Text in Resource? Das BASIC aus der Datei 
'$(ARG1)' konnte nicht initialisiert werden : Das BASIC aus der Datei 
''$(ARG1)'' konnte nicht initialisiert werden */
-       /* ### ACHTUNG: Neuer Text in Resource? Das BASIC aus der Datei 
'$(ARG1)' konnte nicht initialisiert werden : Das BASIC aus der Datei 
''$(ARG1)'' konnte nicht initialisiert werden */
        Text [ en-US ] = "The BASIC from the file '$(ARG1)' could not be 
initialized." ;
 };
 String ERRCODE_BASMGR_MGRSAVE & ERRCODE_RES_MASK
@@ -635,43 +578,4 @@ String ERRCODE_BASMGR_UNLOADLIB & ERRCODE_RES_MASK
        Text [ en-US ] = "The library could not be removed from memory." ;
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ********************************************************************** EOF
diff --git a/main/xmlsecurity/source/dialogs/macrosecurity.src 
b/main/xmlsecurity/source/dialogs/macrosecurity.src
index 7b19134..9c25c88 100644
--- a/main/xmlsecurity/source/dialogs/macrosecurity.src
+++ b/main/xmlsecurity/source/dialogs/macrosecurity.src
@@ -1,22 +1,22 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
  * regarding copyright ownership.  The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
+ * "License") ; you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
@@ -26,221 +26,220 @@
 
 TabDialog RID_XMLSECTP_MACROSEC
 {
-    HelpID = HID_XMLSEC_TP_MACROSEC;
-       Size = MAP_APPFONT( TD_WIDTH, TD_HEIGHT );
-       OutputSize = TRUE;
-       Closeable = TRUE;
-       Moveable = TRUE;
-       SVLook = TRUE;
+       HelpID = HID_XMLSEC_TP_MACROSEC ;
+       Size = MAP_APPFONT ( TD_WIDTH, TD_HEIGHT ) ;
+       OutputSize = TRUE ;
+       Closeable = TRUE ;
+       Moveable = TRUE ;
+       SVLook = TRUE ;
 
-       Text [ en-US ] = "Macro Security";
+       Text [ en-US ] = "Macro Security" ;
        TabControl 1
        {
-               Pos = MAP_APPFONT( TD_SP_INNERBORDER_LEFT, 
TD_SP_INNERBORDER_TOP );
-               Size = MAP_APPFONT( TP_WIDTH, TP_HEIGHT+RIDDER_HEIGHT );
+               Pos = MAP_APPFONT ( TD_SP_INNERBORDER_LEFT, 
TD_SP_INNERBORDER_TOP ) ;
+               Size = MAP_APPFONT ( TP_WIDTH, TP_HEIGHT+RIDDER_HEIGHT ) ;
                SVLook = TRUE ;
                PageList =
                {
                        PageItem
                        {
-                               Identifier = RID_XMLSECTP_SECLEVEL;
-                               Text [ en-US ] = "Security Level";
+                               Identifier = RID_XMLSECTP_SECLEVEL ;
+                               Text [ en-US ] = "Security Level" ;
                        };
                        PageItem
                        {
-                               Identifier = RID_XMLSECTP_TRUSTSOURCES;
-                               Text [ en-US ] = "Trusted Sources";
+                               Identifier = RID_XMLSECTP_TRUSTSOURCES ;
+                               Text [ en-US ] = "Trusted Sources" ;
                        };
                };
        };
        OKButton BTN_OK
        {
-               Pos = MAP_APPFONT( MS_COL_H, CV_ROW_A );
-               Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT );
+               Pos = MAP_APPFONT ( MS_COL_H, CV_ROW_A ) ;
+               Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
                DefButton = TRUE;
        };
        CancelButton BTN_CANCEL
        {
-               Pos = MAP_APPFONT( MS_COL_F, CV_ROW_A );
-               Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT );
+               Pos = MAP_APPFONT ( MS_COL_F, CV_ROW_A ) ;
+               Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
        };
        HelpButton BTN_HELP
        {
-               Pos = MAP_APPFONT( MS_COL_D, CV_ROW_A );
-               Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT );
+               Pos = MAP_APPFONT ( MS_COL_D, CV_ROW_A ) ;
+               Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
        };
        PushButton BTN_RESET
        {
-               Pos = MAP_APPFONT( MS_COL_B, CV_ROW_A );
-               Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT );
-               Text [ en-US ] = "Reset";
+               Pos = MAP_APPFONT ( MS_COL_B, CV_ROW_A ) ;
+               Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+               Text [ en-US ] = "Reset" ;
        };
 };
 
 TabPage RID_XMLSECTP_SECLEVEL
 {
-    HelpId = HID_XMLSEC_TP_SECLEVEL;
-       Size = MAP_APPFONT( TP_WIDTH, TP_HEIGHT );
-       OutputSize = TRUE;
-       Hide = TRUE;
-       SVLook = TRUE;
+       HelpId = HID_XMLSEC_TP_SECLEVEL ;
+       Size = MAP_APPFONT ( TP_WIDTH, TP_HEIGHT ) ;
+       OutputSize = TRUE ;
+       Hide = TRUE ;
+       SVLook = TRUE ;
        FixedLine FL_SECLEVEL
        {
-               Pos = MAP_APPFONT( SL_COL_0, SL_ROW_0 );
-               Size = MAP_APPFONT( SL_COL_3-SL_COL_0, RSC_CD_FIXEDLINE_HEIGHT 
);
-        Hide = TRUE;
+               Pos = MAP_APPFONT ( SL_COL_0, SL_ROW_0 ) ;
+               Size = MAP_APPFONT ( SL_COL_3-SL_COL_0, RSC_CD_FIXEDLINE_HEIGHT 
) ;
+               Hide = TRUE ;
        };
-    FixedImage FI_SEC_READONLY
-    {
-        Pos = MAP_APPFONT( SL_COL_1 - 7, SL_ROW_0 + 4 );
-        Size = MAP_APPFONT( 6, 6 );
-    };
-    RadioButton RB_VERYHIGH
+       FixedImage FI_SEC_READONLY
        {
-        HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_VERYHIGH";
-        Pos = MAP_APPFONT( SL_COL_1, SL_ROW_0 );
-        Size = MAP_APPFONT( SL_COL_2-SL_COL_1, RSC_BIG_RADIOBUTTON );
+               Pos = MAP_APPFONT ( SL_COL_1 - 7, SL_ROW_0 + 4 ) ;
+               Size = MAP_APPFONT ( 6, 6 ) ;
+       };
+       RadioButton RB_VERYHIGH
+       {
+               HelpID = 
"xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_VERYHIGH" ;
+               Pos = MAP_APPFONT ( SL_COL_1, SL_ROW_0 ) ;
+               Size = MAP_APPFONT ( SL_COL_2-SL_COL_1, RSC_BIG_RADIOBUTTON ) ;
                WordBreak = TRUE;
-        Text [ en-US ] = "~Very high.\nOnly macros from trusted file locations 
are allowed to run. All other macros, regardless whether signed or not, are 
disabled.";
+               Text [ en-US ] = "~Very high.\nOnly macros from trusted file 
locations are allowed to run. All other macros, regardless whether signed or 
not, are disabled." ;
        };
        RadioButton RB_HIGH
        {
-           HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_HIGH";
-        Pos = MAP_APPFONT( SL_COL_1, SL_ROW_1 );
-        Size = MAP_APPFONT( SL_COL_2-SL_COL_1, RSC_BIG_RADIOBUTTON );
-               WordBreak = TRUE;
-        Text [ en-US ] = "H~igh.\nOnly signed macros from trusted sources are 
allowed to run. Unsigned macros are disabled.";
+               HelpID = 
"xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_HIGH" ;
+               Pos = MAP_APPFONT ( SL_COL_1, SL_ROW_1 ) ;
+               Size = MAP_APPFONT ( SL_COL_2-SL_COL_1, RSC_BIG_RADIOBUTTON ) ;
+               WordBreak = TRUE ;
+               Text [ en-US ] = "H~igh.\nOnly signed macros from trusted 
sources are allowed to run. Unsigned macros are disabled." ;
        };
        RadioButton RB_MEDIUM
        {
-           HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_MEDIUM";
-        Pos = MAP_APPFONT( SL_COL_1, SL_ROW_2 );
-        Size = MAP_APPFONT( SL_COL_2-SL_COL_1, RSC_BIG_RADIOBUTTON );
-               WordBreak = TRUE;
-        Text [ en-US ] = "~Medium.\nConfirmation required before executing 
macros from untrusted sources.";
+               HelpID = 
"xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_MEDIUM" ;
+               Pos = MAP_APPFONT ( SL_COL_1, SL_ROW_2 ) ;
+               Size = MAP_APPFONT ( SL_COL_2-SL_COL_1, RSC_BIG_RADIOBUTTON ) ;
+               WordBreak = TRUE ;
+               Text [ en-US ] = "~Medium.\nConfirmation required before 
executing macros from untrusted sources." ;
        };
        RadioButton RB_LOW
        {
-           HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_LOW";
-        Pos = MAP_APPFONT( SL_COL_1, SL_ROW_3 );
-        Size = MAP_APPFONT( SL_COL_2-SL_COL_1, SL_ROW_4-SL_ROW_3 );
-               WordBreak = TRUE;
-        Text [ en-US ] = "~Low (not recommended).\nAll macros will be executed 
without confirmation. Use this setting only if you are certain that all 
documents that will be opened are safe.";
+               HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_LOW" 
;
+               Pos = MAP_APPFONT ( SL_COL_1, SL_ROW_3 ) ;
+               Size = MAP_APPFONT ( SL_COL_2-SL_COL_1, SL_ROW_4-SL_ROW_3 ) ;
+               WordBreak = TRUE ;
+               Text [ en-US ] = "~Low (not recommended).\nAll macros will be 
executed without confirmation. Use this setting only if you are certain that 
all documents that will be opened are safe." ;
        };
 };
 
 TabPage RID_XMLSECTP_TRUSTSOURCES
 {
-    HelpId = HID_XMLSEC_TP_TRUSTSOURCES;
-       Size = MAP_APPFONT( TP_WIDTH, TP_HEIGHT );
-       OutputSize = TRUE;
-       Hide = TRUE;
-       SVLook = TRUE;
+       HelpId = HID_XMLSEC_TP_TRUSTSOURCES ;
+       Size = MAP_APPFONT ( TP_WIDTH, TP_HEIGHT ) ;
+       OutputSize = TRUE ;
+       Hide = TRUE ;
+       SVLook = TRUE ;
        FixedLine FL_TRUSTCERT
        {
-               Pos = MAP_APPFONT( TS_COL_0, TS_ROW_0 );
-        Size = MAP_APPFONT( TS_COL_8-TS_COL_0, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "Trusted certificates";
+               Pos = MAP_APPFONT ( TS_COL_0, TS_ROW_0 ) ;
+               Size = MAP_APPFONT ( TS_COL_8-TS_COL_0, RSC_CD_FIXEDLINE_HEIGHT 
) ;
+               Text [ en-US ] = "Trusted certificates" ;
        };
-    FixedImage FI_TRUSTCERT_RO
-    {
-        Pos = MAP_APPFONT( TS_COL_1 - 7, TS_ROW_1 );
-        Size = MAP_APPFONT( 6, 6 );
-    };
-    Control LB_TRUSTCERT
+       FixedImage FI_TRUSTCERT_RO
        {
-        HelpId = HID_XMLSEC_CTRL_TRUSTSOURCES;
-               Pos = MAP_APPFONT( TS_COL_1, TS_ROW_1 );
-        Size = MAP_APPFONT( TS_COL_7-TS_COL_1, RSC_CD_TABLISTBOX_HEIGHT );
-               SVLook = TRUE;
-               Border = TRUE;
+               Pos = MAP_APPFONT ( TS_COL_1 - 7, TS_ROW_1 ) ;
+               Size = MAP_APPFONT ( 6, 6 ) ;
+       };
+       Control LB_TRUSTCERT
+       {
+               HelpId = HID_XMLSEC_CTRL_TRUSTSOURCES ;
+               Pos = MAP_APPFONT ( TS_COL_1, TS_ROW_1 ) ;
+               Size = MAP_APPFONT ( TS_COL_7-TS_COL_1, 
RSC_CD_TABLISTBOX_HEIGHT ) ;
+               SVLook = TRUE ;
+               Border = TRUE ;
        };
        String STR_HEADERBAR
        {
-        Text [ en-US ] = "Issued to\tIssued by\tExpiration date";
+               Text [ en-US ] = "Issued to\tIssued by\tExpiration date" ;
        };
        PushButton PB_ADD_TRUSTCERT
        {
-           HelpID = 
"xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_ADD_TRUSTCERT";
-        Pos = MAP_APPFONT( TS_COL_2, TS_ROW_2 );
-               Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT );
-               Text [ en-US ] = "Add...";
+               HelpID = 
"xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_ADD_TRUSTCERT" ;
+               Pos = MAP_APPFONT ( TS_COL_2, TS_ROW_2 ) ;
+               Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+               Text [ en-US ] = "Add..." ;
        };
        PushButton PB_VIEW_TRUSTCERT
        {
-           HelpID = 
"xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_VIEW_TRUSTCERT";
-        Pos = MAP_APPFONT( TS_COL_4, TS_ROW_2 );
-               Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT );
-               Text [ en-US ] = "View...";
+               HelpID = 
"xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_VIEW_TRUSTCERT" ;
+               Pos = MAP_APPFONT ( TS_COL_4, TS_ROW_2 ) ;
+               Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+               Text [ en-US ] = "View..." ;
        };
        PushButton PB_REMOVE_TRUSTCERT
        {
-           HelpID = 
"xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_REMOVE_TRUSTCERT";
-        Pos = MAP_APPFONT( TS_COL_6, TS_ROW_2 );
-               Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT );
-               Text [ en-US ] = "Remove";
+               HelpID = 
"xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_REMOVE_TRUSTCERT" ;
+               Pos = MAP_APPFONT ( TS_COL_6, TS_ROW_2 ) ;
+               Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+               Text [ en-US ] = "Remove" ;
        };
        FixedLine FL_TRUSTFILELOC
        {
-        Pos = MAP_APPFONT( TS_COL_0, TS_ROW_3 );
-        Size = MAP_APPFONT( TS_COL_8-TS_COL_0, RSC_CD_FIXEDLINE_HEIGHT );
-               Text [ en-US ] = "Trusted file locations";
+               Pos = MAP_APPFONT ( TS_COL_0, TS_ROW_3 ) ;
+               Size = MAP_APPFONT ( TS_COL_8-TS_COL_0, RSC_CD_FIXEDLINE_HEIGHT 
) ;
+               Text [ en-US ] = "Trusted file locations" ;
        };
        FixedText FI_TRUSTFILELOC
        {
-        Pos = MAP_APPFONT( TS_COL_1, TS_ROW_4 );
-        Size = MAP_APPFONT( TS_COL_7-TS_COL_1, 3*RSC_CD_FIXEDLINE_HEIGHT );
-               WordBreak = TRUE;
-        Text [ en-US ] = "Document macros are always executed if they have 
been opened from one of the following locations.";
-       };
-    FixedImage FI_TRUSTFILE_RO
-    {
-        Pos = MAP_APPFONT( TS_COL_1 - 7, TS_ROW_5 );
-        Size = MAP_APPFONT( 6, 6 );
-    };
-    ListBox LB_TRUSTFILELOC
-       {
-        HelpID = 
"xmlsecurity:ListBox:RID_XMLSECTP_TRUSTSOURCES:LB_TRUSTFILELOC";
-        Pos = MAP_APPFONT( TS_COL_1, TS_ROW_5 );
-        Size = MAP_APPFONT( TS_COL_7-TS_COL_1, TS_ROW_6-TS_ROW_5 );
-               SVLook = TRUE;
-               Border = TRUE;
-               VScroll = TRUE;
-               Sort = TRUE;
+               Pos = MAP_APPFONT ( TS_COL_1, TS_ROW_4 ) ;
+               Size = MAP_APPFONT ( TS_COL_7-TS_COL_1, 
3*RSC_CD_FIXEDLINE_HEIGHT ) ;
+               WordBreak = TRUE ;
+               Text [ en-US ] = "Document macros are always executed if they 
have been opened from one of the following locations." ;
+       };
+       FixedImage FI_TRUSTFILE_RO
+       {
+               Pos = MAP_APPFONT ( TS_COL_1 - 7, TS_ROW_5 ) ;
+               Size = MAP_APPFONT ( 6, 6 ) ;
+       };
+       ListBox LB_TRUSTFILELOC
+       {
+               HelpID = 
"xmlsecurity:ListBox:RID_XMLSECTP_TRUSTSOURCES:LB_TRUSTFILELOC" ;
+               Pos = MAP_APPFONT ( TS_COL_1, TS_ROW_5 ) ;
+               Size = MAP_APPFONT ( TS_COL_7-TS_COL_1, TS_ROW_6-TS_ROW_5 ) ;
+               SVLook = TRUE ;
+               Border = TRUE ;
+               VScroll = TRUE ;
+               Sort = TRUE ;
        };
        PushButton FL_ADD_TRUSTFILELOC
        {
-           HelpID = 
"xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_ADD_TRUSTFILELOC";
-        Pos = MAP_APPFONT( TS_COL_4, TS_ROW_7 );
-               Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT );
-               Text [ en-US ] = "Add...";
+               HelpID = 
"xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_ADD_TRUSTFILELOC" ;
+               Pos = MAP_APPFONT ( TS_COL_4, TS_ROW_7 ) ;
+               Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+               Text [ en-US ] = "Add..." ;
        };
        PushButton FL_REMOVE_TRUSTFILELOC
        {
-           HelpID = 
"xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_REMOVE_TRUSTFILELOC";
-        Pos = MAP_APPFONT( TS_COL_6, TS_ROW_7 );
-               Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT );
-               Text [ en-US ] = "Remove";
+               HelpID = 
"xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_REMOVE_TRUSTFILELOC" ;
+               Pos = MAP_APPFONT ( TS_COL_6, TS_ROW_7 ) ;
+               Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, 
RSC_CD_PUSHBUTTON_HEIGHT ) ;
+               Text [ en-US ] = "Remove" ;
        };
 };
 String RID_XMLSECTP_READONLY_CONFIG_TIP
 {
-    Text [ en-US ] = "This setting is protected by the Administrator";
+       Text [ en-US ] = "This setting is protected by the Administrator" ;
 };
 Image RID_XMLSECTP_LOCK
 {
-    ImageBitmap = Bitmap
-    {
-        File = "lock.png";
-    };
-    MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
+       ImageBitmap = Bitmap
+       {
+               File = "lock.png" ;
+       };
 };
 Image RID_XMLSECTP_LOCK_HC
 {
-    ImageBitmap = Bitmap
-    {
-        File = "lock_hc.png";
-    };
-    MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
+       ImageBitmap = Bitmap
+       {
+               File = "lock_hc.png" ;
+       };
 };
 
+// ********************************************************************** EOF

Reply via email to