INTEGRATION: CWS swqbugfixes16 (1.58.274); FILE MERGED

2005/03/01 14:12:55 od 1.58.274.1: #i43593# - undo changes of issue i35920 - the checkboxes aren't visible
together. One is visible for Writer.format.paragraph. The other
is visible for Writer.format.table

1 files changed, 22 insertions, 22 deletions

diff --git a/svx/source/dialog/border.src b/svx/source/dialog/border.src
index 8953c4e33fc5..2be1358c8e67 100644
--- a/svx/source/dialog/border.src
+++ b/svx/source/dialog/border.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: border.src,v $
  *
- *  $Revision: 1.58 $
+ *  $Revision: 1.59 $
  *
- *  last change: $Author: obo $ $Date: 2004-11-18 17:05:39 $
+ *  last change: $Author: vg $ $Date: 2005-03-23 11:58:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,13 +93,13 @@ TabPage RID_SVXPAGE_BORDER
     {
         HelpId = HID_BORDER_CTL_PRESETS ;
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 24 ) ;
+        Pos = MAP_APPFONT ( 12 , 25 ) ;
         Size = MAP_APPFONT ( 61 , 12 ) ;
         TabStop = TRUE ;
     };
     FixedText FT_USERDEF
     {
-        Pos = MAP_APPFONT (12 , 40) ;
+        Pos = MAP_APPFONT (12 , 41) ;
         Size = MAP_APPFONT ( 64, 8) ;
         Text [ de ] = "~Benutzerdefiniert" ;
         Text [ en-US ] = "~User-defined";
@@ -107,15 +107,15 @@ TabPage RID_SVXPAGE_BORDER
     Control WIN_FRAMESEL
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 50 ) ;
-        Size = MAP_APPFONT ( 61 , 64 ) ;
+        Pos = MAP_APPFONT ( 12 , 53 ) ;
+        Size = MAP_APPFONT ( 61 , 65 ) ;
         TabStop = TRUE ;
         Text = "Border control";
     };
     FixedLine FL_SEPARATOR1
     {
         Pos = MAP_APPFONT ( 77 , 14 ) ;
-        Size = MAP_APPFONT ( 4 , 100 ) ;
+        Size = MAP_APPFONT ( 4 , 104 ) ;
         Vert = TRUE ;
     };
     FixedLine FL_LINE
@@ -136,12 +136,12 @@ TabPage RID_SVXPAGE_BORDER
     ListBox LB_LINESTYLE
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 88 , 24 ) ;
-        Size = MAP_APPFONT ( 74 , 64 ) ;
+        Pos = MAP_APPFONT ( 88 , 25 ) ;
+        Size = MAP_APPFONT ( 74 , 66 ) ;
     };
     FixedText FT_COLOR
     {
-        Pos = MAP_APPFONT ( 88, 92 ) ;
+        Pos = MAP_APPFONT ( 88, 95 ) ;
         Size = MAP_APPFONT ( 77, 8 ) ;
         Text [ de ] = "~Farbe" ;
         Text [ en-US ] = "~Color";
@@ -149,7 +149,7 @@ TabPage RID_SVXPAGE_BORDER
     ListBox LB_LINECOLOR
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 88 , 102 ) ;
+        Pos = MAP_APPFONT ( 88 , 106 ) ;
         Size = MAP_APPFONT ( 74 , 68 ) ;
         DropDown = TRUE ;
         DDExtraWidth = TRUE ;
@@ -157,7 +157,7 @@ TabPage RID_SVXPAGE_BORDER
     FixedLine FL_SEPARATOR2
     {
         Pos = MAP_APPFONT ( 166 , 14 ) ;
-        Size = MAP_APPFONT ( 4 , 100 ) ;
+        Size = MAP_APPFONT ( 4 , 104 ) ;
         Vert = TRUE ;
     };
     FixedText FT_LEFT
@@ -270,7 +270,7 @@ TabPage RID_SVXPAGE_BORDER
 
     FixedText FT_SHADOWPOS
     {
-        Pos = MAP_APPFONT ( 12 , 126 ) ;
+        Pos = MAP_APPFONT ( 12 , 133 ) ;
         Size = MAP_APPFONT ( 74 , 8 ) ;
         Text [ de ] = "~Position" ;
         Text [ en-US ] = "~Position" ;
@@ -280,13 +280,13 @@ TabPage RID_SVXPAGE_BORDER
     {
         HelpId = HID_BORDER_CTL_SHADOWS ;
         Hide = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 136 ) ;
+        Pos = MAP_APPFONT ( 12 , 144 ) ;
         Size = MAP_APPFONT ( 74 , 12 ) ;
         TabStop = TRUE ;
     };
     FixedText FT_SHADOWSIZE
     {
-        Pos = MAP_APPFONT ( 88 , 126 ) ;
+        Pos = MAP_APPFONT ( 88 , 133 ) ;
         Size = MAP_APPFONT ( 60 , 8 ) ;
         Text [ de ] = "~Distanz" ;
         Text [ en-US ] = "Distan~ce";
@@ -294,7 +294,7 @@ TabPage RID_SVXPAGE_BORDER
     MetricField ED_SHADOWSIZE
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 88 , 136 ) ;
+        Pos = MAP_APPFONT ( 88 , 144 ) ;
         Size = MAP_APPFONT ( 40 , 12 ) ;
         Spin = TRUE ;
         Repeat = TRUE ;
@@ -308,7 +308,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     FixedText FT_SHADOWCOLOR
     {
-        Pos = MAP_APPFONT ( 177 , 126 ) ;
+        Pos = MAP_APPFONT ( 177 , 133 ) ;
         Size = MAP_APPFONT ( 60 , 8 ) ;
         Text [ de ] = "Far~be" ;
         Text [ en-US ] = "C~olor" ;
@@ -317,14 +317,14 @@ TabPage RID_SVXPAGE_BORDER
     ListBox LB_SHADOWCOLOR
     {
         Border = TRUE ;
-        Pos = MAP_APPFONT ( 177 , 136 ) ;
+        Pos = MAP_APPFONT ( 177 , 144 ) ;
         Size = MAP_APPFONT ( 74 , 68 ) ;
         DropDown = TRUE ;
         DDExtraWidth = TRUE ;
     };
     FixedLine FL_SHADOW
     {
-        Pos = MAP_APPFONT ( 6 , 118 ) ;
+        Pos = MAP_APPFONT ( 6 , 123 ) ;
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Text [ de ] = "Schatten" ;
         Text [ en-US ] = "Shadow style" ;
@@ -332,7 +332,7 @@ TabPage RID_SVXPAGE_BORDER
     };
     FixedLine FL_PROPERTIES
     {
-        Pos = MAP_APPFONT ( 6 , 152 ) ;
+        Pos = MAP_APPFONT ( 6 , 162 ) ;
         Size = MAP_APPFONT ( 248 , 8 ) ;
         Hide = TRUE;
         Text [ de ] = "Eigenschaften" ;
@@ -340,10 +340,10 @@ TabPage RID_SVXPAGE_BORDER
     };
     CheckBox  CB_MERGEWITHNEXT
     {
-        Pos = MAP_APPFONT ( 12 , 162 ) ;
+        Pos = MAP_APPFONT ( 12 , 173 ) ;
         Size = MAP_APPFONT ( 242 , 10 ) ;
         Hide = TRUE;
-        Text [ de ] = "Mit dem n�chsten Absatz ~verschmelzen" ;
+        Text [ de ] = "Mit dem n�chsten Absatz verschmelzen" ;
         Text [ en-US ] = "~Merge with next paragraph" ;
     };
     CheckBox  CB_MERGEADJACENTBORDERS