summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/source/ui/chrdlg/ccoll.cxx9
-rw-r--r--sw/source/ui/chrdlg/ccoll.hrc6
-rw-r--r--sw/source/ui/chrdlg/ccoll.src8
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx10
-rw-r--r--sw/source/ui/chrdlg/chardlg.hrc20
-rw-r--r--sw/source/ui/chrdlg/chardlg.src12
-rw-r--r--sw/source/ui/config/optdlg.hrc46
-rw-r--r--sw/source/ui/config/optdlg.src38
-rw-r--r--sw/source/ui/config/optload.cxx24
-rw-r--r--sw/source/ui/config/optload.hrc14
-rw-r--r--sw/source/ui/config/optload.src14
-rw-r--r--sw/source/ui/config/optpage.cxx82
-rw-r--r--sw/source/ui/config/redlopt.hrc8
-rw-r--r--sw/source/ui/config/redlopt.src8
14 files changed, 150 insertions, 149 deletions
diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx
index f3a437086a1f..24ff9e1a145d 100644
--- a/sw/source/ui/chrdlg/ccoll.cxx
+++ b/sw/source/ui/chrdlg/ccoll.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ccoll.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: os $ $Date: 2001-02-09 07:43:05 $
+ * last change: $Author: fme $ $Date: 2001-06-01 10:35:45 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -154,7 +154,7 @@ Page: Ctor
SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet)
: SfxTabPage(pParent, SW_RES(TP_CONDCOLL), rSet),
- aConditionGB( this, ResId( GB_CONDITION )),
+ aConditionFL( this, ResId( FL_CONDITION )),
aConditionCB( this, ResId( CB_CONDITION ) ),
aContextFT ( this, ResId( FT_CONTEXT ) ),
aUsedFT ( this, ResId( FT_USED ) ),
@@ -522,6 +522,9 @@ const CommandStruct* SwCondCollItem::GetCmds()
/*************************************************************************
$Log: not supported by cvs2svn $
+ Revision 1.2 2001/02/09 07:43:05 os
+ TabPage size changed
+
Revision 1.1.1.1 2000/09/18 17:14:32 hr
initial import
diff --git a/sw/source/ui/chrdlg/ccoll.hrc b/sw/source/ui/chrdlg/ccoll.hrc
index a327ff50dfd1..35d3d3f25c60 100644
--- a/sw/source/ui/chrdlg/ccoll.hrc
+++ b/sw/source/ui/chrdlg/ccoll.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: ccoll.hrc,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:32 $
+ * last change: $Author: fme $ $Date: 2001-06-01 10:35:45 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,7 +65,7 @@
// #define ******************************************************************
#define CB_CONDITION 1
-#define GB_CONDITION 2
+#define FL_CONDITION 2
#define FT_CONTEXT 3
#define FT_USED 4
#define TB_CONDCOLLS 5
diff --git a/sw/source/ui/chrdlg/ccoll.src b/sw/source/ui/chrdlg/ccoll.src
index ec9038c5cbef..76cf4855176d 100644
--- a/sw/source/ui/chrdlg/ccoll.src
+++ b/sw/source/ui/chrdlg/ccoll.src
@@ -2,9 +2,9 @@
*
* $RCSfile: ccoll.src,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: kz $ $Date: 2001-05-30 20:03:05 $
+ * last change: $Author: fme $ $Date: 2001-06-01 10:35:45 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -71,10 +71,10 @@ TabPage TP_CONDCOLL
HelpID = HID_COND_COLL ;
Size = MAP_APPFONT ( 260 , 185 ) ;
Hide = TRUE ;
- GroupBox GB_CONDITION
+ FixedLine FL_CONDITION
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 179 ) ;
+ Size = MAP_APPFONT ( 248 , 8 ) ;
Text = "Optionen" ;
Text [ English ] = "Settings" ;
Text[ english_us ] = "Options";
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 14e0b32c99ec..57d1fc84f2de 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: chardlg.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: os $ $Date: 2001-05-15 09:59:57 $
+ * last change: $Author: fme $ $Date: 2001-06-01 10:35:45 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -236,7 +236,7 @@ void SwCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
SwCharURLPage::SwCharURLPage( Window* pParent,
const SfxItemSet& rCoreSet ) :
SfxTabPage( pParent, SW_RES( TP_CHAR_URL ), rCoreSet ),
- aURLGB ( this, SW_RES(GB_URL)),
+ aURLFL ( this, SW_RES(FL_URL)),
aURLFT( this, SW_RES(FT_URL )),
aURLED( this, SW_RES(ED_URL )),
aTextFT( this, SW_RES(FT_TEXT )),
@@ -245,7 +245,7 @@ SwCharURLPage::SwCharURLPage( Window* pParent,
aNameED( this, SW_RES(ED_NAME)),
aTargetFrmFT( this, SW_RES(FT_TARGET )),
aTargetFrmLB( this, SW_RES(LB_TARGET )),
- aStyleGB( this, SW_RES(GB_STYLE )),
+ aStyleFL( this, SW_RES(FL_STYLE )),
aVisitedFT( this, SW_RES(FT_VISITED )),
aVisitedLB( this, SW_RES(LB_VISITED )),
aNotVisitedFT( this, SW_RES(FT_NOT_VISITED)),
@@ -267,7 +267,7 @@ SwCharURLPage::SwCharURLPage( Window* pParent,
USHORT nHtmlMode = ((const SfxUInt16Item*)pItem)->GetValue();
if(HTMLMODE_ON & nHtmlMode)
{
- aStyleGB.Hide();
+ aStyleFL.Hide();
aVisitedFT.Hide();
aVisitedLB.Hide();
aNotVisitedFT.Hide();
diff --git a/sw/source/ui/chrdlg/chardlg.hrc b/sw/source/ui/chrdlg/chardlg.hrc
index 1a03e2a6d322..778d11f1fa34 100644
--- a/sw/source/ui/chrdlg/chardlg.hrc
+++ b/sw/source/ui/chrdlg/chardlg.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: chardlg.hrc,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:32 $
+ * last change: $Author: fme $ $Date: 2001-06-01 10:35:45 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -73,8 +73,8 @@
#define LANG_FT 13
#define LANG_LB 14
#define EXAMPLE_WN 15
-#define EXAMPLE_GB 16
-#define CASEMAP_GB 17
+#define EXAMPLE_FL 16
+#define CASEMAP_FL 17
#define NONE_RB 20
#define CAPS_RB 21
#define LOWERCASE_RB 22
@@ -95,16 +95,16 @@
#define STRIKE_FT 37
#define STRIKE_LB 38
#define STRIKE_CB 39
-#define EFFECT_GB 41
-#define POS_GB 42
-#define POSEXT_GB 43
-#define KERN_GB 45
+#define EFFECT_FL 41
+#define POS_FL 42
+#define POSEXT_FL 43
+#define KERN_FL 45
#define FONTTYPE_FT 46
-#define GB_URL 50
+#define FL_URL 50
#define FT_URL 51
#define ED_URL 52
-#define GB_STYLE 53
+#define FL_STYLE 53
#define FT_VISITED 55
#define LB_VISITED 56
#define FT_NOT_VISITED 57
diff --git a/sw/source/ui/chrdlg/chardlg.src b/sw/source/ui/chrdlg/chardlg.src
index 8c8d079d327b..eeb320e415df 100644
--- a/sw/source/ui/chrdlg/chardlg.src
+++ b/sw/source/ui/chrdlg/chardlg.src
@@ -2,9 +2,9 @@
*
* $RCSfile: chardlg.src,v $
*
- * $Revision: 1.23 $
+ * $Revision: 1.24 $
*
- * last change: $Author: kz $ $Date: 2001-05-30 20:04:40 $
+ * last change: $Author: fme $ $Date: 2001-06-01 10:35:45 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -350,10 +350,10 @@ TabPage TP_CHAR_URL
SVLook = TRUE ;
Size = MAP_APPFONT ( 260 , 185 ) ;
Hide = TRUE ;
- GroupBox GB_URL
+ FixedLine FL_URL
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 97 ) ;
+ Size = MAP_APPFONT ( 248 , 8 ) ;
Text = "Hyperlink" ;
Text [ English ] = "Hyperlink" ;
Text [ english_us ] = "Hyperlink" ;
@@ -585,10 +585,10 @@ TabPage TP_CHAR_URL
Text[ catalan ] = "~Acontecimientos...";
Text[ finnish ] = "~Tapahtumat";
};
- GroupBox GB_STYLE
+ FixedLine FL_STYLE
{
Pos = MAP_APPFONT ( 6 , 104 ) ;
- Size = MAP_APPFONT ( 248 , 43 ) ;
+ Size = MAP_APPFONT ( 248 , 8 ) ;
Text = "Zeichenvorlagen" ;
Text [ English ] = "Character styles" ;
Text [ dutch ] = "Tekenopmaakprofielen" ;
diff --git a/sw/source/ui/config/optdlg.hrc b/sw/source/ui/config/optdlg.hrc
index 8acc5b10f1f1..a3d9468aed5e 100644
--- a/sw/source/ui/config/optdlg.hrc
+++ b/sw/source/ui/config/optdlg.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: optdlg.hrc,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: os $ $Date: 2001-05-11 10:37:19 $
+ * last change: $Author: fme $ $Date: 2001-06-01 10:39:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -60,10 +60,10 @@
************************************************************************/
/* TabPage Ansicht*/
-#define GB_DISP 1
-#define GB_NOPRINT 2
-#define GB_WINDOW 3
-#define GB_BACK 4
+#define FL_DISP 1
+#define FL_NOPRINT 2
+#define FL_WINDOW 3
+#define FL_BACK 4
#define CB_GRF 1
#define CB_TBL 2
@@ -86,11 +86,11 @@
#define CB_IDX_ENTRY 19
#define CB_FOOTBACK 20
#define CB_FLDBACK 21
-#define GB_LINE 22
+#define FL_LINE 22
#define CB_POSTIT 23
#define CB_BIGHANDLE 25
-#define GB_SETTINGS 26
+#define FL_SETTINGS 26
#define LB_METRIC 27
#define FT_METRIC 28
@@ -105,7 +105,7 @@
#define CB_TEST8 32
#define CB_TEST9 33
#define CB_TEST10 34
-#define GB_TEST 35
+#define FL_TEST 35
#define CB_HIDDEN_PARA 36 //Mittendrin, damit die HelpIds zum FPII kompatibel bleiben
#define CB_SMOOTH_SCROLL 37
@@ -120,10 +120,8 @@
#define CB_INDEX 44
#define LB_COLOR 50
-#define GB_1 51
#define WIN_COLOR 52
#define ED_COLORNAME 53
-#define GB_2 54
#define BT_EDIT 55
#define BT_NEW 56
#define BT_DELETE 57
@@ -141,10 +139,10 @@
#define CB_SINGLEJOBS 68
#define CB_CTRLFLD 69
#define CB_PAPERFROMSETUP 70
-#define GRP_1 71
-#define GRP_2 72
-#define GRP_3 73
-#define GRP_4 74
+#define FL_1 71
+#define FL_2 72
+#define FL_3 73
+#define FL_4 74
#define FT_FAX 76
#define CB_BACKGROUND 79
@@ -171,7 +169,7 @@
#define LB_LABEL 97
#define FT_IDX 98
#define LB_IDX 99
-#define GB_STDCHR 100
+#define FL_STDCHR 100
#define PB_STANDARD 101
#define CB_DOCONLY 102
#define ST_SCRIPT_WESTERN 103
@@ -184,10 +182,10 @@
#define CB_BORDER 104
#define CB_NUMFORMATTING 105
#define CB_NUMALIGNMENT 106
-#define GB_TABLE 107
-#define GB_TABLE_INSERT 108
+#define FL_TABLE 107
+#define FL_TABLE_INSERT 108
#define CB_NUMFMT_FORMATTING 109
-#define GB_MOVE 110
+#define FL_MOVE 110
#define FT_ROWMOVE 111
#define MF_ROWMOVE 112
#define FT_COLMOVE 113
@@ -206,7 +204,7 @@
#define FT_VAR 126
#define FT_MOVE 128
-#define GB_COLOR 130
+#define FL_COLOR 130
#define FT_SGML 131
#define LB_SGML 132
#define FT_COMMENT 133
@@ -217,18 +215,18 @@
#define LB_UNKNOWN 138
#define FL_TABLE_SEPARATOR 139
-#define GB_SHDWCRSFLAG 1
+#define FL_SHDWCRSFLAG 1
#define CB_SHDWCRSONOFF 2
-#define GB_SHDWCRSMODE 3
+#define FL_SHDWCRSMODE 3
#define FT_SHDWCRSFILLMODE 4
#define RB_SHDWCRSFILLMARGIN 5
#define RB_SHDWCRSFILLINDENT 6
#define RB_SHDWCRSFILLTAB 7
#define RB_SHDWCRSFILLSPACE 8
-#define GB_SHDWCRSCOLOR 9
+#define FL_SHDWCRSCOLOR 9
#define FT_SHDWCRSCOLOR 10
#define LB_SHDWCRSCOLOR 11
#define CB_ALLOW_IN_PROT 12
-#define GB_CRSR_OPT 13
+#define FL_CRSR_OPT 13
#define FL_SEPARATOR_SHDW 14
diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src
index 1292fd8d216c..cf59625eee8e 100644
--- a/sw/source/ui/config/optdlg.src
+++ b/sw/source/ui/config/optdlg.src
@@ -2,9 +2,9 @@
*
* $RCSfile: optdlg.src,v $
*
- * $Revision: 1.31 $
+ * $Revision: 1.32 $
*
- * last change: $Author: os $ $Date: 2001-05-29 10:54:46 $
+ * last change: $Author: fme $ $Date: 2001-06-01 10:39:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -81,7 +81,7 @@ TabPage TP_CONTENT_OPT
SVLook = TRUE ;
Size = MAP_APPFONT ( 260 , 185 ) ;
Hide = TRUE ;
- FixedLine GB_LINE
+ FixedLine FL_LINE
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 120 , 8 ) ;
@@ -278,7 +278,7 @@ TabPage TP_CONTENT_OPT
Text[ finnish ] = "Isot oh~jainpisteet";
Text[ catalan ] = "Large control points";
};
- FixedLine GB_WINDOW
+ FixedLine FL_WINDOW
{
Pos = MAP_APPFONT ( 130 , 3 ) ;
Size = MAP_APPFONT ( 124 , 8 ) ;
@@ -460,7 +460,7 @@ TabPage TP_CONTENT_OPT
Text[ finnish ] = "~Tasainen vieritys";
Text[ catalan ] = "Desplazamiento ~suave";
};
- FixedLine GB_DISP
+ FixedLine FL_DISP
{
Pos = MAP_APPFONT ( 6 , 95 ) ;
Size = MAP_APPFONT ( 120 , 8 ) ;
@@ -635,7 +635,7 @@ TabPage TP_CONTENT_OPT
Text[ finnish ] = "~Huomautukset";
Text[ catalan ] = "~Notas";
};
- FixedLine GB_BACK
+ FixedLine FL_BACK
{
Pos = MAP_APPFONT ( 130 , 95 ) ;
Size = MAP_APPFONT ( 124 , 8 ) ;
@@ -778,7 +778,7 @@ TabPage TP_CONTENT_OPT
Text[ finnish ] = "~Kentt";
Text[ catalan ] = "~Campos";
};
- FixedLine GB_SETTINGS
+ FixedLine FL_SETTINGS
{
Pos = MAP_APPFONT ( 130 , 122 ) ;
Size = MAP_APPFONT ( 124 , 8 ) ;
@@ -855,7 +855,7 @@ TabPage TP_OPTPRINT_PAGE
HelpID = HID_OPTPRINT_PAGE ;
Size = MAP_APPFONT ( 260 , 185 ) ;
Hide = TRUE ;
- FixedLine GRP_1
+ FixedLine FL_1
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 78 , 8 ) ;
@@ -1064,7 +1064,7 @@ TabPage TP_OPTPRINT_PAGE
Pos = MAP_APPFONT ( 85 , 10 ) ;
Size = MAP_APPFONT ( 4 , 82 ) ;
};
- FixedLine GRP_2
+ FixedLine FL_2
{
Pos = MAP_APPFONT ( 90 , 3 ) ;
Size = MAP_APPFONT ( 78 , 8 ) ;
@@ -1334,7 +1334,7 @@ TabPage TP_OPTPRINT_PAGE
Pos = MAP_APPFONT ( 169 , 10 ) ;
Size = MAP_APPFONT ( 4 , 82 ) ;
};
- FixedLine GRP_3
+ FixedLine FL_3
{
Pos = MAP_APPFONT ( 174 , 3 ) ;
Size = MAP_APPFONT ( 80 , 8 ) ;
@@ -1364,7 +1364,7 @@ TabPage TP_OPTPRINT_PAGE
Text[ language_user1 ] = " ";
Text[ catalan ] = "Notas";
};
- FixedLine GRP_4
+ FixedLine FL_4
{
Pos = MAP_APPFONT ( 6 , 95 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
@@ -1522,7 +1522,7 @@ TabPage TP_STD_FONT
HelpID = HID_STD_FONT ;
Size = MAP_APPFONT ( 260 , 185 ) ;
Hide = TRUE ;
- FixedLine GB_STDCHR
+ FixedLine FL_STDCHR
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
@@ -1855,7 +1855,7 @@ TabPage TP_OPTTABLE_PAGE
HelpID = HID_OPTTABLE_PAGE ;
Size = MAP_APPFONT ( 260 , 185 ) ;
Hide = TRUE ;
- FixedLine GB_TABLE
+ FixedLine FL_TABLE
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 120 , 8 ) ;
@@ -2003,7 +2003,7 @@ TabPage TP_OPTTABLE_PAGE
Pos = MAP_APPFONT ( 126 , 10 ) ;
Size = MAP_APPFONT ( 4 , 56 ) ;
};
- FixedLine GB_TABLE_INSERT
+ FixedLine FL_TABLE_INSERT
{
Pos = MAP_APPFONT ( 130 , 3 ) ;
Size = MAP_APPFONT ( 124 , 8 ) ;
@@ -2118,7 +2118,7 @@ TabPage TP_OPTTABLE_PAGE
Text[ finnish ] = "Tasaus";
Text[ catalan ] = "~Alineacin";
};
- FixedLine GB_MOVE
+ FixedLine FL_MOVE
{
Pos = MAP_APPFONT ( 6 , 69 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
@@ -2585,7 +2585,7 @@ TabPage TP_OPTSRCVIEW
SVLook = TRUE ;
Size = MAP_APPFONT ( 260 , 185 ) ;
Hide = TRUE ;
- FixedLine GB_COLOR
+ FixedLine FL_COLOR
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
@@ -2766,7 +2766,7 @@ TabPage TP_OPTSHDWCRSR
Size = MAP_APPFONT ( 260 , 185 ) ;
Hide = TRUE ;
//_----------------------------
- FixedLine GB_NOPRINT
+ FixedLine FL_NOPRINT
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 118 , 8 ) ;
@@ -3032,7 +3032,7 @@ TabPage TP_OPTSHDWCRSR
Pos = MAP_APPFONT ( 125 , 10 ) ;
Size = MAP_APPFONT ( 4 , 97 ) ;
};
- FixedLine GB_SHDWCRSFLAG
+ FixedLine FL_SHDWCRSFLAG
{
Pos = MAP_APPFONT ( 130 , 3 ) ;
Size = MAP_APPFONT ( 124 , 8 ) ;
@@ -3268,7 +3268,7 @@ TabPage TP_OPTSHDWCRSR
Size = MAP_APPFONT ( 75 , 80 ) ;
DropDown = TRUE ;
};
- FixedLine GB_CRSR_OPT
+ FixedLine FL_CRSR_OPT
{
Pos = MAP_APPFONT ( 130 , 110 ) ;
Size = MAP_APPFONT ( 124 , 8 ) ;
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 66decc2c44ca..0b315253d268 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: optload.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: os $ $Date: 2001-05-09 08:15:35 $
+ * last change: $Author: fme $ $Date: 2001-06-01 10:39:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -130,7 +130,7 @@
* --------------------------------------------------*/
SwLoadOptPage::SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage(pParent, SW_RES(TP_OPTLOAD_PAGE), rSet),
- aUpdateGB (this, ResId(GB_UPDATE )),
+ aUpdateFL (this, ResId(FL_UPDATE )),
aLinkFT (this, ResId(FT_LINK )),
aAlwaysRB (this, ResId(RB_ALWAYS )),
aRequestRB (this, ResId(RB_REQUEST )),
@@ -138,11 +138,11 @@ SwLoadOptPage::SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ) :
aFieldFT (this, ResId(FT_FIELD )),
aAutoUpdateFields(this, ResId(CB_AUTO_UPDATE_FIELDS )),
aAutoUpdateCharts(this, ResId(CB_AUTO_UPDATE_CHARTS )),
- aCaptionGB (this, ResId(GB_CAPTION )),
+ aCaptionFL (this, ResId(FL_CAPTION )),
aCaptionCB (this, ResId(CB_CAPTION )),
aCaptionFT (this, ResId(TXT_OPTIONS )),
aCaptionPB (this, ResId(PB_OPTIONS )),
- aSettingsGB ( this, SW_RES( GB_SETTINGS ) ),
+ aSettingsFL ( this, SW_RES( FL_SETTINGS ) ),
aMetricLB ( this, SW_RES( LB_METRIC ) ),
aMetricFT ( this, SW_RES( FT_METRIC ) ),
aTabFT ( this, SW_RES( FT_TAB ) ),
@@ -150,7 +150,7 @@ SwLoadOptPage::SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ) :
aMergeDistCB(this, ResId(CB_MERGE_PARA_DIST )),
aMergeDistPageStartCB(this, ResId(CB_MERGE_PARA_DIST_PAGESTART )),
aTabAlignment(this, ResId(CB_TAB_ALIGNMENT )),
- aCompatGB (this, ResId(GB_COMPAT )),
+ aCompatFL (this, ResId(FL_COMPAT )),
pWrtShell (0),
nLastTab(0),
nOldLinkMode(MANUAL),
@@ -334,7 +334,7 @@ void __EXPORT SwLoadOptPage::Reset( const SfxItemSet& rSet)
aMergeDistCB.Enable(pWrtShell != 0);
aMergeDistPageStartCB.Enable(pWrtShell != 0);
aTabAlignment.Enable(pWrtShell != 0);
- aCompatGB.Enable(pWrtShell != 0);
+ aCompatFL.Enable(pWrtShell != 0);
switch (nOldLinkMode)
{
@@ -381,20 +381,20 @@ void __EXPORT SwLoadOptPage::Reset( const SfxItemSet& rSet)
//hide some controls in HTML
if(bHTMLMode)
{
- aCaptionGB.Hide();
+ aCaptionFL.Hide();
aCaptionCB.Hide();
aCaptionFT.Hide();
aCaptionPB.Hide();
- long nDiff = aSettingsGB.GetPosPixel().Y() - aCaptionGB.GetPosPixel().Y();
+ long nDiff = aSettingsFL.GetPosPixel().Y() - aCaptionFL.GetPosPixel().Y();
Window* aCntrlArr[] = {
- &aSettingsGB,
+ &aSettingsFL,
&aMetricFT,
&aMetricLB,
&aTabFT,
&aTabMF,
- &aCompatGB,
+ &aCompatFL,
&aMergeDistCB,
&aMergeDistPageStartCB,
0};
@@ -481,7 +481,7 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet )
aLbLevel (this, SW_RES(LB_LEVEL )),
aFtDelim (this, SW_RES(FT_SEPARATOR )),
aEdDelim (this, SW_RES(ED_SEPARATOR )),
- aSettingsGroup (this, SW_RES(GRP_SETTINGS )),
+ aSettingsGroupFL (this, SW_RES(FL_SETTINGS_2 )),
sSWTable (SW_RES(STR_TABLE )),
sSWFrame (SW_RES(STR_FRAME )),
diff --git a/sw/source/ui/config/optload.hrc b/sw/source/ui/config/optload.hrc
index b63e392ef180..f967876e40a6 100644
--- a/sw/source/ui/config/optload.hrc
+++ b/sw/source/ui/config/optload.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: optload.hrc,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: os $ $Date: 2001-05-04 12:05:45 $
+ * last change: $Author: fme $ $Date: 2001-06-01 10:39:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -59,19 +59,20 @@
*
************************************************************************/
-#define GB_UPDATE 1
+#define FL_UPDATE 1
#define RB_ALWAYS 2
#define RB_REQUEST 3
#define RB_NEVER 4
#define CB_MERGE_PARA_DIST 6
-#define GB_COMPAT 7
+#define FL_COMPAT 7
#define CB_AUTO_UPDATE_FIELDS 8
#define CB_AUTO_UPDATE_CHARTS 9
#define FT_UPDATE_LINKS 10
#define CB_MERGE_PARA_DIST_PAGESTART 14
-#define GB_SETTINGS 15
+#define FL_SETTINGS_2 14
+#define FL_SETTINGS 15
#define CB_TAB_ALIGNMENT 16
#define FT_TAB 17
@@ -83,7 +84,7 @@
#define CB_CAPTION 23
#define PB_OPTIONS 24
#define TXT_OPTIONS 25
-#define GB_CAPTION 26
+#define FL_CAPTION 26
#define CLB_OBJECTS 1
#define STR_TABLE 2
@@ -100,7 +101,6 @@
#define TXT_POS 11
#define BOX_POS 12
#define TXT_SAMPLE 13
-#define GRP_SETTINGS 14
#define STR_BEGINNING 15
#define STR_END 16
#define STR_ABOVE 17
diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src
index 966f735c1c97..ade3edf48eaf 100644
--- a/sw/source/ui/config/optload.src
+++ b/sw/source/ui/config/optload.src
@@ -2,9 +2,9 @@
*
* $RCSfile: optload.src,v $
*
- * $Revision: 1.23 $
+ * $Revision: 1.24 $
*
- * last change: $Author: os $ $Date: 2001-05-29 10:54:46 $
+ * last change: $Author: fme $ $Date: 2001-06-01 10:39:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -75,7 +75,7 @@ TabPage TP_OPTLOAD_PAGE
HelpID = HID_OPTLOAD_PAGE ;
Size = MAP_APPFONT ( 260 , 185 ) ;
Hide = TRUE ;
- FixedLine GB_UPDATE
+ FixedLine FL_UPDATE
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
@@ -297,7 +297,7 @@ TabPage TP_OPTLOAD_PAGE
Text[ arabic ] = " ";
Text[ catalan ] = "Actualizar ~diagramas automticamente";
};
- FixedLine GB_CAPTION
+ FixedLine FL_CAPTION
{
Pos = MAP_APPFONT ( 6 , 68 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
@@ -389,7 +389,7 @@ TabPage TP_OPTLOAD_PAGE
Size = MAP_APPFONT ( 12 , 12 ) ;
Text = "..." ;
};
- FixedLine GB_SETTINGS
+ FixedLine FL_SETTINGS
{
Pos = MAP_APPFONT ( 6 , 97 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
@@ -498,7 +498,7 @@ TabPage TP_OPTLOAD_PAGE
First = 50 ;
Last = 9999 ;
};
- FixedLine GB_COMPAT
+ FixedLine FL_COMPAT
{
Pos = MAP_APPFONT ( 6 , 126 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
@@ -1068,7 +1068,7 @@ TabPage TP_OPTCAPTION_PAGE
Center = TRUE ;
Text = "Beispiel" ;
};
- FixedLine GRP_SETTINGS
+ FixedLine FL_SETTINGS_2
{
Pos = MAP_APPFONT ( 133 , 3 ) ;
Size = MAP_APPFONT ( 121 , 8 ) ;
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 259b9efe1947..68b6a323b16d 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: optpage.cxx,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: os $ $Date: 2001-05-30 12:05:16 $
+ * last change: $Author: fme $ $Date: 2001-06-01 10:39:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -213,14 +213,14 @@
SwContentOptPage::SwContentOptPage( Window* pParent,
const SfxItemSet& rCoreSet ) :
SfxTabPage( pParent, SW_RES( TP_CONTENT_OPT ), rCoreSet ),
- aLineGB ( this, SW_RES( GB_LINE ) ),
+ aLineFL ( this, SW_RES( FL_LINE ) ),
aTxtbegCB ( this, SW_RES( CB_TXTBEG ) ),
aTblbegCB ( this, SW_RES( CB_TABBEG ) ),
aSectBoundsCB( this, SW_RES( CB_SECT_BOUNDS ) ),
aCrossCB ( this, SW_RES( CB_CROSS ) ),
aSolidHandleCB( this, SW_RES( CB_HANDLE ) ),
aBigHandleCB ( this, SW_RES( CB_BIGHANDLE) ),
- aWindowGB ( this, SW_RES( GB_WINDOW ) ),
+ aWindowFL ( this, SW_RES( FL_WINDOW ) ),
aHScrollBox ( this, SW_RES( CB_HSCROLL ) ),
aVScrollBox ( this, SW_RES( CB_VSCROLL ) ),
aHRulerCBox ( this, SW_RES( CB_HRULER ) ),
@@ -228,18 +228,18 @@ SwContentOptPage::SwContentOptPage( Window* pParent,
aVRulerCBox ( this, SW_RES( CB_VRULER ) ),
aVMetric ( this, SW_RES( LB_VMETRIC ) ),
aSmoothCBox ( this, SW_RES( CB_SMOOTH_SCROLL ) ),
- aDispBox ( this, SW_RES( GB_DISP ) ),
+ aDispFL ( this, SW_RES( FL_DISP ) ),
aGrfCB ( this, SW_RES( CB_GRF ) ),
aTblCB ( this, SW_RES( CB_TBL ) ),
aDrwCB ( this, SW_RES( CB_DRWFAST ) ),
aFldNameCB ( this, SW_RES( CB_FIELD ) ),
aPostItCB ( this, SW_RES( CB_POSTIT ) ),
- aBackBox ( this, SW_RES( GB_BACK ) ),
+ aBackFL ( this, SW_RES( FL_BACK ) ),
aIdxEntryCB ( this, SW_RES( CB_IDX_ENTRY ) ),
aIdxBackCB ( this, SW_RES( CB_INDEX ) ),
aFootBackCB ( this, SW_RES( CB_FOOTBACK ) ),
aFldBackCB ( this, SW_RES( CB_FLDBACK ) ),
- aSettingsGB ( this, SW_RES( GB_SETTINGS ) ),
+ aSettingsFL ( this, SW_RES( FL_SETTINGS ) ),
aMetricLB ( this, SW_RES( LB_METRIC ) ),
aMetricFT ( this, SW_RES( FT_METRIC ) )
{
@@ -253,7 +253,7 @@ SwContentOptPage::SwContentOptPage( Window* pParent,
aIdxBackCB.Hide();
aFldBackCB.SetPosPixel(aIdxEntryCB.GetPosPixel());
aMetricLB.Show();
- aSettingsGB.Show();
+ aSettingsFL.Show();
aMetricFT.Show();
}
@@ -435,20 +435,20 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
aCtrlFldCB (this, SW_RES(CB_CTRLFLD)),
aBackgroundCB (this, SW_RES(CB_BACKGROUND)),
aBlackFontCB (this, SW_RES(CB_BLACK_FONT)),
- aGroup1 (this, SW_RES(GRP_1)),
+ aFL1 (this, SW_RES(FL_1)),
aSeparatorLFL (this, SW_RES(FL_SEP_PRT_LEFT )),
aSeparatorRFL (this, SW_RES(FL_SEP_PRT_RIGHT)),
aLeftPageCB (this, SW_RES(CB_LEFTP)),
aRightPageCB (this, SW_RES(CB_RIGHTP)),
aReverseCB (this, SW_RES(CB_REVERSE)),
aProspectCB (this, SW_RES(CB_PROSPECT)),
- aGroup2 (this, SW_RES(GRP_2)),
+ aFL2 (this, SW_RES(FL_2)),
aNoRB (this, SW_RES(RB_NO)),
aOnlyRB (this, SW_RES(RB_ONLY)),
aEndRB (this, SW_RES(RB_END)),
aEndPageRB (this, SW_RES(RB_PAGEEND)),
- aGroup3 (this, SW_RES(GRP_3)),
- aGroup4 (this, SW_RES(GRP_4)),
+ aFL3 (this, SW_RES(FL_3)),
+ aFL4 (this, SW_RES(FL_4)),
aPaperFromSetupCB(this, SW_RES(CB_PAPERFROMSETUP)),
aSingleJobsCB (this, SW_RES(CB_SINGLEJOBS)),
aFaxFT (this, SW_RES(FT_FAX)),
@@ -506,7 +506,7 @@ void SwAddPrinterTabPage::SetPreview(BOOL bPrev)
aLeftPageCB.Disable();
aRightPageCB.Disable();
aProspectCB.Disable();
- aGroup3.Disable();
+ aFL3.Disable();
aNoRB.Disable();
aOnlyRB.Disable();
aEndRB.Disable();
@@ -647,7 +647,7 @@ SwStdFontTabPage::SwStdFontTabPage( Window* pParent,
aLabelBox (this, SW_RES(LB_LABEL )),
aIdxLbl (this, SW_RES(FT_IDX )),
aIdxBox (this, SW_RES(LB_IDX )),
- aStdChrFrm (this, SW_RES(GB_STDCHR )),
+ aStdChrFL (this, SW_RES(FL_STDCHR )),
aDocOnlyCB (this, SW_RES(CB_DOCONLY )),
aStandardPB (this, SW_RES(PB_STANDARD)),
sScriptWestern(ResId(ST_SCRIPT_WESTERN)),
@@ -804,9 +804,9 @@ BOOL SwStdFontTabPage::FillItemSet( SfxItemSet& rSet )
--------------------------------------------------*/
void SwStdFontTabPage::Reset( const SfxItemSet& rSet )
{
- String sTmp(aStdChrFrm.GetText());
+ String sTmp(aStdChrFL.GetText());
sTmp.SearchAndReplaceAscii("%1", bCJKMode ? sScriptAsian : sScriptWestern);
- aStdChrFrm.SetText(sTmp);
+ aStdChrFL.SetText(sTmp);
const SfxPoolItem* pItem;
if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_PRINTER, FALSE, &pItem))
@@ -959,9 +959,9 @@ SwTableOptionsTabPage::SwTableOptionsTabPage( Window* pParent, const SfxItemSet&
aNumFmtFormattingCB(this, ResId(CB_NUMFMT_FORMATTING )),
aNumAlignmentCB (this, ResId(CB_NUMALIGNMENT )),
aSeparatorFL (this, ResId(FL_TABLE_SEPARATOR)),
- aTableGB (this, ResId(GB_TABLE )),
- aTableInsertGB (this, ResId(GB_TABLE_INSERT )),
- aMoveGB( this, ResId(GB_MOVE )),
+ aTableFL (this, ResId(FL_TABLE )),
+ aTableInsertFL (this, ResId(FL_TABLE_INSERT )),
+ aMoveFL( this, ResId(FL_MOVE )),
aMoveFT( this, ResId(FT_MOVE )),
aRowMoveFT( this, ResId(FT_ROWMOVE )),
aRowMoveMF( this, ResId(MF_ROWMOVE )),
@@ -1134,9 +1134,9 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet& rSet)
//bestimmte Controls fuer HTML verstecken
if(bHTMLMode)
{
-/* Point aPos(aCaptionGB.GetPosPixel());
- long nYDiff = aTableGB.GetPosPixel().Y() - aPos.Y();
- aTableGB.SetPosPixel(aPos);
+/* Point aPos(aCaptionFL.GetPosPixel());
+ long nYDiff = aTableFL.GetPosPixel().Y() - aPos.Y();
+ aTableFL.SetPosPixel(aPos);
aPos = aHeaderCB.GetPosPixel();
aPos.Y() -= nYDiff;
@@ -1150,9 +1150,9 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet& rSet)
aPos.Y() -= nYDiff;
aBorderCB.SetPosPixel(aPos);
- aPos = aTableInsertGB.GetPosPixel();
+ aPos = aTableInsertFL.GetPosPixel();
aPos.Y() -= nYDiff;
- aTableInsertGB.SetPosPixel(aPos);
+ aTableInsertFL.SetPosPixel(aPos);
aPos = aNumFormattingCB.GetPosPixel();
aPos.Y() -= nYDiff;
@@ -1166,7 +1166,7 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet& rSet)
aPos.Y() -= nYDiff;
aNumAlignmentCB.SetPosPixel(aPos);
- aCaptionGB.Hide();
+ aCaptionFL.Hide();
aCaptionCB.Hide();
aCaptionFT.Hide();
aCaptionPB.Hide();
@@ -1211,7 +1211,7 @@ IMPL_LINK(SwTableOptionsTabPage, CheckBoxHdl, CheckBox*, EMPTYARG)
SwSourceViewOptionsTabPage::SwSourceViewOptionsTabPage(
Window* pParent, const SfxItemSet& rSet ) :
SfxTabPage(pParent, SW_RES(TP_OPTSRCVIEW), rSet),
- aColorGB(this, ResId(GB_COLOR )),
+ aColorFL(this, ResId(FL_COLOR )),
aSGMLFT(this, ResId(FT_SGML )),
aSGMLLB(this, ResId(LB_SGML )),
aCommentFT(this, ResId(FT_COMMENT)),
@@ -1352,7 +1352,7 @@ void SwSourceViewOptionsTabPage::Reset( const SfxItemSet& rSet )
SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent,
const SfxItemSet& rSet )
: SfxTabPage(pParent, SW_RES(TP_OPTSHDWCRSR), rSet),
- aFlagGB( this, ResId( GB_SHDWCRSFLAG )),
+ aFlagFL( this, ResId( FL_SHDWCRSFLAG )),
aOnOffCB( this, ResId( CB_SHDWCRSONOFF )),
aFillModeFT( this, ResId( FT_SHDWCRSFILLMODE )),
aFillMarginRB( this, ResId( RB_SHDWCRSFILLMARGIN )),
@@ -1361,10 +1361,10 @@ SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent,
aFillSpaceRB( this, ResId( RB_SHDWCRSFILLSPACE )),
aColorFT( this, ResId( FT_SHDWCRSCOLOR )),
aColorLB( this, ResId( LB_SHDWCRSCOLOR )),
- aCrsrOptGB ( this, ResId( GB_CRSR_OPT)),
+ aCrsrOptFL ( this, ResId( FL_CRSR_OPT)),
aCrsrInProtCB( this, ResId( CB_ALLOW_IN_PROT )),
aSeparatorFL( this, ResId( FL_SEPARATOR_SHDW)),
- aUnprintBox ( this, ResId( GB_NOPRINT ) ),
+ aUnprintFL ( this, ResId( FL_NOPRINT ) ),
aParaCB ( this, ResId( CB_PARA ) ),
aSHyphCB ( this, ResId( CB_SHYPH ) ),
aSpacesCB ( this, ResId( CB_SPACE ) ),
@@ -1415,7 +1415,7 @@ SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent,
aHiddenCB .Hide();
aHiddenParaCB.Hide();
aBreakCB.SetPosPixel(aTabCB.GetPosPixel());
- aFlagGB .Hide();
+ aFlagFL .Hide();
aOnOffCB .Hide();
aFillModeFT .Hide();
aFillMarginRB .Hide();
@@ -1424,14 +1424,14 @@ SwShdwCrsrOptionsTabPage::SwShdwCrsrOptionsTabPage( Window* pParent,
aFillSpaceRB .Hide();
aColorFT .Hide();
aColorLB .Hide();
- aCrsrOptGB .Hide();
+ aCrsrOptFL .Hide();
aCrsrInProtCB .Hide();
aSeparatorFL.Hide();
- long nWidth = aFlagGB.GetSizePixel().Width() + aFlagGB.GetPosPixel().X()
- - aUnprintBox.GetPosPixel().X();
- Size aSize(aUnprintBox.GetSizePixel());
+ long nWidth = aFlagFL.GetSizePixel().Width() + aFlagFL.GetPosPixel().X()
+ - aUnprintFL.GetPosPixel().X();
+ Size aSize(aUnprintFL.GetSizePixel());
aSize.Width() = nWidth;
- aUnprintBox.SetSizePixel(aSize);
+ aUnprintFL.SetSizePixel(aSize);
}
}
@@ -1725,7 +1725,7 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent,
const SfxItemSet& rSet )
: SfxTabPage(pParent, SW_RES(TP_REDLINE_OPT), rSet),
- aInsertGB( this, SW_RES( GB_TE )),
+ aInsertFL( this, SW_RES( FL_TE )),
aInsertFT( this, SW_RES( FT_CHG_INSERT )),
aInsertAttrFT( this, SW_RES( FT_INS_ATTR )),
aInsertLB( this, SW_RES( LB_INS_ATTR )),
@@ -1750,7 +1750,7 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent,
aMarkColorFT ( this, SW_RES( FT_LC_COL )),
aMarkColorLB ( this, SW_RES( LB_LC_COL )),
aMarkPreviewWN ( this, SW_RES( WIN_MARK )),
- aChangedGB ( this, SW_RES( GB_LC )),
+ aChangedFL ( this, SW_RES( FL_LC )),
sAuthor ( SW_RES( STR_AUTHOR )),
sNone ( SW_RES( STR_NOTHING ))
@@ -2304,7 +2304,7 @@ void lcl_SetPosSize(Window& rWin, Point aPos, Size aSize)
SwTestTabPage::SwTestTabPage( Window* pParent,
const SfxItemSet& rCoreSet) :
SfxTabPage( pParent, WB_HIDE, rCoreSet),
- aTestGBox ( this, WB_GROUP ),
+ aTestFL ( this, WB_GROUP ),
aTest1CBox ( this, 0 ),
aTest2CBox ( this, 0 ),
aTest3CBox ( this, 0 ),
@@ -2318,7 +2318,7 @@ SwTestTabPage::SwTestTabPage( Window* pParent,
bAttrModified( FALSE )
{
lcl_SetPosSize(*this, Point(0,0), Size(260 , 135));
- lcl_SetPosSize(aTestGBox, Point(6,2), Size(209,8));
+ lcl_SetPosSize(aTestFL, Point(6,2), Size(209,8));
lcl_SetPosSize(aTest1CBox , Point(12 , 14), Size(74 , 10));
lcl_SetPosSize(aTest2CBox , Point(12 , 27), Size(74 , 10));
lcl_SetPosSize(aTest3CBox , Point(12 , 40), Size(74 , 10));
@@ -2330,7 +2330,7 @@ SwTestTabPage::SwTestTabPage( Window* pParent,
lcl_SetPosSize(aTest9CBox , Point(116, 53), Size(74 , 10));
lcl_SetPosSize(aTest10CBox , Point(116, 66), Size(74 , 10));
- aTestGBox.SetText( String(ByteString("Einstellungen nur fr Testzwecke" ), RTL_TEXTENCODING_MS_1252));
+ aTestFL.SetText( String(ByteString("Einstellungen nur fr Testzwecke" ), RTL_TEXTENCODING_MS_1252));
aTest1CBox .SetText( C2S("Layout not loading"));
aTest2CBox .SetText( C2S("dynamic"));
aTest3CBox .SetText( C2S("No calm" ));
@@ -2341,7 +2341,7 @@ SwTestTabPage::SwTestTabPage( Window* pParent,
aTest8CBox .SetText( C2S("No Scroll" ));
aTest9CBox .SetText( C2S("DrawingLayerNotLoading"));
aTest10CBox.SetText( C2S("AutoFormat by Input" ));
- aTestGBox.Show();
+ aTestFL.Show();
aTest1CBox .Show();
aTest2CBox .Show();
aTest3CBox .Show();
diff --git a/sw/source/ui/config/redlopt.hrc b/sw/source/ui/config/redlopt.hrc
index 944d442382ec..b33e3015080a 100644
--- a/sw/source/ui/config/redlopt.hrc
+++ b/sw/source/ui/config/redlopt.hrc
@@ -2,9 +2,9 @@
*
* $RCSfile: redlopt.hrc,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: os $ $Date: 2001-05-16 07:21:38 $
+ * last change: $Author: fme $ $Date: 2001-06-01 10:39:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -73,14 +73,14 @@
#define FT_CHG_COL 13
#define LB_CHG_COL 14
#define WIN_CHG 15
-#define GB_TE 16
+#define FL_TE 16
#define FT_MARKPOS 17
#define LB_MARKPOS 18
#define FT_LC_COL 19
#define LB_LC_COL 20
#define WIN_MARK 21
-#define GB_LC 22
+#define FL_LC 22
#define STR_AUTHOR 23
#define STR_NOTHING 24
#define FT_CHG_CHANGE 25
diff --git a/sw/source/ui/config/redlopt.src b/sw/source/ui/config/redlopt.src
index 1d6f52f153f9..6d34bdecc412 100644
--- a/sw/source/ui/config/redlopt.src
+++ b/sw/source/ui/config/redlopt.src
@@ -2,9 +2,9 @@
*
* $RCSfile: redlopt.src,v $
*
- * $Revision: 1.23 $
+ * $Revision: 1.24 $
*
- * last change: $Author: obo $ $Date: 2001-05-30 20:06:50 $
+ * last change: $Author: fme $ $Date: 2001-06-01 10:39:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -79,7 +79,7 @@ TabPage TP_REDLINE_OPT
SVLook = TRUE ;
Hide = TRUE ;
Size = MAP_APPFONT ( 260 , 185 ) ;
- FixedLine GB_TE
+ FixedLine FL_TE
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
@@ -799,7 +799,7 @@ TabPage TP_REDLINE_OPT
Text[ catalan ] = "Attributes";
Text[ finnish ] = "Mritteet";
};
- FixedLine GB_LC
+ FixedLine FL_LC
{
Pos = MAP_APPFONT ( 6 , 144 ) ;
Size = MAP_APPFONT ( 248 , 8 ) ;
generated by cgit (git 2.34.1) at 2025-01-23 06:50:55 +0000