#99281# new mask color magenta

3 files changed, 47 insertions, 54 deletions

diff --git a/svx/source/dialog/border.src b/svx/source/dialog/border.src
index 67ac584fd89d..54f453a67c1f 100644
--- a/svx/source/dialog/border.src
+++ b/svx/source/dialog/border.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: border.src,v $
  *
- *  $Revision: 1.38 $
+ *  $Revision: 1.39 $
  *
- *  last change: $Author: kz $ $Date: 2002-06-10 15:40:55 $
+ *  last change: $Author: gt $ $Date: 2002-09-02 10:56:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,7 +65,7 @@
  // pragma ----------------------------------------------------------------
 
  // define ---------------------------------------------------------------
-#define STD_MASKCOLOR Color { Red=0xC000; Green=0xC000; Blue=0xC000; }
+#define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; }
  // RID_SVXPAGE_BORDER ---------------------------------------------------
 TabPage RID_SVXPAGE_BORDER
 {
@@ -106,7 +106,7 @@ TabPage RID_SVXPAGE_BORDER
         Text [ portuguese_brazilian ] = "Borda" ;
         Text [ portuguese ] = "Disposi��o de linhas" ;
         Text [ finnish ] = "Viivojen j�rjestys" ;
-        Text [ danish ] = "Ramme" ;
+        Text [ danish ] = "Linjeplacering" ;
         Text [ french ] = "Disposition des lignes" ;
         Text [ swedish ] = "Linjeplacering" ;
         Text [ dutch ] = "Lijnen" ;
@@ -122,7 +122,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ korean ] = "외곽선 미리보기";
         Text[ turkish ] = "�er�eve";
         Text[ language_user1 ] = "EM6April01: Found in Text doc under Format - Page - Borders tab.";
-        Text[ catalan ] = "Marco";
+        Text[ catalan ] = "Marc";
         Text[ thai ] = "จัดเรียงบรรทัด";
     };
     FixedText FT_DEFAULT
@@ -149,8 +149,8 @@ TabPage RID_SVXPAGE_BORDER
         Text[ chinese_traditional ] = "標準(~D)";
         Text[ turkish ] = "~Default";
         Text[ arabic ] = "~Default";
-        Text[ catalan ] = "~Default";
-        Text[ thai ] = "~Default";
+        Text[ catalan ] = "~Est�ndard";
+        Text[ thai ] = "~ค่าเริ่มต้น";
     };
     Control WIN_PRESETS
     {
@@ -184,8 +184,8 @@ TabPage RID_SVXPAGE_BORDER
         Text[ chinese_traditional ] = "使用者自訂(~U)";
         Text[ turkish ] = "~User-defined";
         Text[ arabic ] = "~User-defined";
-        Text[ catalan ] = "~User-defined";
-        Text[ thai ] = "~User-defined";
+        Text[ catalan ] = "Definit per l'~usuari";
+        Text[ thai ] = "ระบุ~ผู้ใช้";
     };
     Control WIN_FRAMESEL
     {
@@ -212,7 +212,7 @@ TabPage RID_SVXPAGE_BORDER
         Text [ portuguese_brazilian ] = "Linhas" ;
         Text [ portuguese ] = "Linha" ;
         Text [ finnish ] = "Viiva" ;
-        Text [ danish ] = "Streg" ;
+        Text [ danish ] = "Linje" ;
         Text [ french ] = "Ligne" ;
         Text [ swedish ] = "Linje" ;
         Text [ dutch ] = "Lijn" ;
@@ -228,7 +228,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ korean ] = "선";
         Text[ turkish ] = "�izgi";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "L�nea";
+        Text[ catalan ] = "L�nia";
         Text[ thai ] = "บรรทัด";
     };
     FixedText FT_STYLE
@@ -289,7 +289,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ turkish ] = "~Color";
         Text[ arabic ] = "~Color";
         Text[ catalan ] = "~Color";
-        Text[ thai ] = "~Color";
+        Text[ thai ] = "~สี";
     };
     ListBox LB_LINECOLOR
     {
@@ -319,7 +319,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ french ] = "� gauche";
         Text[ spanish ] = "~Izquierda";
         Text[ italian ] = "Sinistra";
-        Text[ danish ] = "Venstre";
+        Text[ danish ] = "~Venstre";
         Text[ swedish ] = "~V�nster";
         Text[ polish ] = "Z lewej";
         Text[ portuguese_brazilian ] = "Left";
@@ -330,7 +330,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ arabic ] = "����";
         Text[ turkish ] = "~Sol";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Izquierda";
+        Text[ catalan ] = "Es~querra";
         Text[ finnish ] = "~Vasen:";
         Text[ thai ] = "~ซ้าย";
     };
@@ -363,7 +363,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ french ] = "� droite";
         Text[ spanish ] = "Derecha";
         Text[ italian ] = "Destra";
-        Text[ danish ] = "H�jre";
+        Text[ danish ] = "H�jr~e";
         Text[ swedish ] = "H�g~er";
         Text[ polish ] = "Z prawej";
         Text[ portuguese_brazilian ] = "Right";
@@ -374,7 +374,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ arabic ] = "����";
         Text[ turkish ] = "S~a�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Derecha";
+        Text[ catalan ] = "Dreta";
         Text[ finnish ] = "Oikea";
         Text[ thai ] = "ขวา";
     };
@@ -407,7 +407,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ french ] = "En haut";
         Text[ spanish ] = "Arriba";
         Text[ italian ] = "~Alto";
-        Text[ danish ] = "Top";
+        Text[ danish ] = "T~op";
         Text[ swedish ] = "~Uppe";
         Text[ polish ] = "W g�rze";
         Text[ portuguese_brazilian ] = "Top";
@@ -418,7 +418,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ arabic ] = "����";
         Text[ turkish ] = "~�st";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Arriba";
+        Text[ catalan ] = "Su~perior";
         Text[ finnish ] = "~Yl�osa";
         Text[ thai ] = "~บน";
     };
@@ -451,7 +451,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ french ] = "En bas";
         Text[ spanish ] = "Abajo";
         Text[ italian ] = "~Basso";
-        Text[ danish ] = "Bund";
+        Text[ danish ] = "~Bund";
         Text[ swedish ] = "~Nere";
         Text[ polish ] = "W dole";
         Text[ portuguese_brazilian ] = "Bottom";
@@ -461,7 +461,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ chinese_traditional ] = "下(~B)";
         Text[ arabic ] = "����";
         Text[ turkish ] = "Al~t";
-        Text[ catalan ] = "~Abajo";
+        Text[ catalan ] = "In~ferior";
         Text[ finnish ] = "~Alaosa";
         Text[ thai ] = "~ล่าง";
     };
@@ -494,7 +494,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ french ] = "Synchroniser";
         Text[ spanish ] = "~Sincronizar";
         Text[ italian ] = "Sincronizza";
-        Text[ danish ] = "Synkroniser";
+        Text[ danish ] = "S~ynkroniser";
         Text[ swedish ] = "S~ynkronisera";
         Text[ polish ] = "Synchronizuj";
         Text[ portuguese_brazilian ] = "Synchronize";
@@ -505,7 +505,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ arabic ] = "�����";
         Text[ turkish ] = "~E�itle";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Sincronizar";
+        Text[ catalan ] = "Sincronitza";
         Text[ finnish ] = "Synkronoi";
         Text[ thai ] = "ทำให้ข้อมูลตรงกัน";
     };
@@ -523,7 +523,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ french ] = "�cart avec le contenu";
         Text[ spanish ] = "Distancia al texto";
         Text[ italian ] = "Distanza dal contenuto";
-        Text[ danish ] = "Indstillinger";
+        Text[ danish ] = "Afstand til indhold";
         Text[ swedish ] = "Avst�nd till inneh�ll";
         Text[ polish ] = "Odst�p od zawarto�ci";
         Text[ portuguese_brazilian ] = "Settings";
@@ -534,7 +534,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ arabic ] = "������� ��� ���������";
         Text[ turkish ] = "Ayarlar";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Configuraci�n";
+        Text[ catalan ] = "Espaiat al contingut";
         Text[ finnish ] = "V�lit sis�lt��n";
         Text[ thai ] = "ระยะห่างถึงเนื้อหา";
     };
@@ -566,7 +566,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ korean ] = "위치(~P)";
         Text[ turkish ] = "~Konum";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Posici�n";
+        Text[ catalan ] = "~Posici�";
         Text[ thai ] = "~ตำแหน่ง";
     };
     Control WIN_SHADOWS
@@ -592,7 +592,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ spanish ] = "Distancia";
         Text[ finnish ] = "~Et�isyys";
         Text[ italian ] = "Distan~za";
-        Text[ danish ] = "St�rrelse";
+        Text[ danish ] = "~Afstand";
         Text[ swedish ] = "~Distans";
         Text[ polish ] = "Odleg�o��";
         Text[ portuguese_brazilian ] = "Ta~manho";
@@ -602,7 +602,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ chinese_traditional ] = "間隔(~C)";
         Text[ turkish ] = "~B�y�kl�k";
         Text[ arabic ] = "�����";
-        Text[ catalan ] = "~Tama�o";
+        Text[ catalan ] = "~Mida";
         Text[ thai ] = "ระ~ยะ";
     };
     MetricField ED_SHADOWSIZE
@@ -631,7 +631,7 @@ TabPage RID_SVXPAGE_BORDER
         Text [ portuguese_brazilian ] = "C~or" ;
         Text [ portuguese ] = "C~or" ;
         Text [ finnish ] = "~V�ri" ;
-        Text [ danish ] = "Farve" ;
+        Text [ danish ] = "~Farve" ;
         Text [ french ] = "Couleur" ;
         Text [ swedish ] = "F�~rg" ;
         Text [ dutch ] = "K~leur" ;
@@ -669,7 +669,7 @@ TabPage RID_SVXPAGE_BORDER
         Text [ portuguese_brazilian ] = "Sombra" ;
         Text [ portuguese ] = "Sombras" ;
         Text [ finnish ] = "Varjotyyli" ;
-        Text [ danish ] = "Skygge" ;
+        Text [ danish ] = "Skygger" ;
         Text [ french ] = "Ombre" ;
         Text [ swedish ] = "Skugga" ;
         Text [ dutch ] = "Schaduw" ;
@@ -685,7 +685,7 @@ TabPage RID_SVXPAGE_BORDER
         Text[ korean ] = "음영";
         Text[ turkish ] = "G�lge";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Sombra";
+        Text[ catalan ] = "Estil de l'ombra";
         Text[ thai ] = "ลักษณะการแรเงา";
     };
 #define _PREVIEW_IDLIST_\
@@ -712,7 +712,7 @@ TabPage RID_SVXPAGE_BORDER
     ImageList ILH_PRE_BITMAPS
     {
         ImageBitmap = Bitmap { File = "prh_eview.bmp" ; };
-        MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
+        MaskColor = STD_MASKCOLOR ;
         _PREVIEW_IDLIST_
     };
 #define _SHADOW_IDLIST_             \
@@ -735,18 +735,10 @@ TabPage RID_SVXPAGE_BORDER
     ImageList ILH_SDW_BITMAPS
     {
         ImageBitmap = Bitmap { File = "shh_adow.bmp" ; };
-        MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
+        MaskColor = STD_MASKCOLOR ;
         _SHADOW_IDLIST_
     };
-    Text[ catalan ] = "Borde";
+    Text[ catalan ] = "Borders";
     Text[ thai ] = "เส้นขอบ";
 };
  // **********************************************************************
-
-
-
-
-
-
-
-
diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src
index eaf10b35fc71..19270f54c7fd 100644
--- a/svx/source/dialog/contdlg.src
+++ b/svx/source/dialog/contdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: contdlg.src,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: kz $ $Date: 2002-08-05 21:13:14 $
+ *  last change: $Author: gt $ $Date: 2002-09-02 10:59:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,7 +61,8 @@
  // include ---------------------------------------------------------------
 #include "helpid.hrc"
 #include "contdlg.hrc"
- // pragma ----------------------------------------------------------------
+
+#define MASKCOLOR   MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ;
 
  // RID_SVXDLG_CONTOUR ----------------------------------------------------
 FloatingWindow RID_SVXDLG_CONTOUR
@@ -661,13 +662,13 @@ FloatingWindow RID_SVXDLG_CONTOUR
     ImageList CD_IMAPDLG
     {
         ImageBitmap = Bitmap { File = "cd_imagelist.bmp" ; };
-        MaskColor = Color { Red = 0xc000; Green = 0xc000; Blue = 0xc000; } ;
+        MASKCOLOR
         CONTOURDLG_IDLIST
     };
     ImageList CDH_IMAPDLG
     {
         ImageBitmap = Bitmap { File = "cdh_imagelist.bmp" ; };
-        MaskColor = Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; } ;
+        MASKCOLOR
         CONTOURDLG_IDLIST
     };
 };
diff --git a/svx/source/dialog/ctredlin.src b/svx/source/dialog/ctredlin.src
index fa02e92aec0f..9b9183558a80 100644
--- a/svx/source/dialog/ctredlin.src
+++ b/svx/source/dialog/ctredlin.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ctredlin.src,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: kz $ $Date: 2002-08-05 21:15:39 $
+ *  last change: $Author: gt $ $Date: 2002-09-02 11:04:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,9 +61,9 @@
 
 #include "ctredlin.hrc"
 #include "helpid.hrc"
-#ifndef STD_MASKCOLOR
-#define STD_MASKCOLOR Color { Red=0xC000; Green=0xC000; Blue=0xC000;}
-#endif
+
+#define MASKCOLOR   MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ;
+
 TabPage SID_REDLIN_FILTER_PAGE
 {
     String STR_FILTER
@@ -399,7 +399,7 @@ TabPage SID_REDLIN_FILTER_PAGE
         ButtonImage = Image
         {
             ImageBitmap = Bitmap { File = "time.bmp" ; };
-            MaskColor = STD_MASKCOLOR ;
+            MASKCOLOR
         };
         QuickHelpText = "Datum/Uhrzeit einstellen" ;
         QuickHelpText [ ENGLISH ] = "Set date/time" ;
@@ -502,7 +502,7 @@ TabPage SID_REDLIN_FILTER_PAGE
         ButtonImage = Image
         {
             ImageBitmap = Bitmap { File = "time.bmp" ; };
-            MaskColor = STD_MASKCOLOR ;
+            MASKCOLOR
         };
         QuickHelpText = "Datum/Uhrzeit einstellen" ;
         QuickHelpText [ ENGLISH ] = "Set date/time" ;
@@ -746,7 +746,7 @@ TabPage SID_REDLIN_FILTER_PAGE
     Image IMG_TIME_H
     {
         ImageBitmap = Bitmap { File = "time_h.bmp" ; };
-        MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; };
+        MASKCOLOR
     };
 };
 TabPage SID_REDLIN_VIEW_PAGE