diff options
-rw-r--r-- | sw/source/ui/chrdlg/ccoll.cxx | 30 | ||||
-rw-r--r-- | sw/source/ui/chrdlg/ccoll.src | 43 | ||||
-rw-r--r-- | sw/source/ui/chrdlg/chardlg.src | 48 | ||||
-rw-r--r-- | sw/source/ui/chrdlg/drpcps.src | 54 | ||||
-rw-r--r-- | sw/source/ui/chrdlg/numpara.src | 28 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddb.src | 32 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddinf.src | 20 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddok.cxx | 11 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddok.src | 44 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldfunc.src | 48 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldref.src | 36 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldvar.cxx | 11 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldvar.src | 56 |
13 files changed, 229 insertions, 232 deletions
diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/ui/chrdlg/ccoll.cxx index e02185f22ab6..f3a437086a1f 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.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:32 $ + * last change: $Author: os $ $Date: 2001-02-09 07:43:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -154,17 +154,18 @@ Page: Ctor SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, SW_RES(TP_CONDCOLL), rSet), - aConditionCB( this, SW_RES( CB_CONDITION ) ), - aContextFT ( this, SW_RES( FT_CONTEXT ) ), - aUsedFT ( this, SW_RES( FT_USED ) ), - aTbLinks( this, SW_RES( TB_CONDCOLLS ) ), - aStyleFT ( this, SW_RES( FT_STYLE ) ), - aStyleLB ( this, SW_RES( LB_STYLE ) ), - aFilterLB ( this, SW_RES( LB_FILTER ) ), - aRemovePB ( this, SW_RES( PB_REMOVE ) ), - aAssignPB ( this, SW_RES( PB_ASSIGN ) ), - sNoTmpl ( SW_RES( STR_NOTEMPL ) ), - aStrArr ( SW_RES( STR_REGIONS ) ), + aConditionGB( this, ResId( GB_CONDITION )), + aConditionCB( this, ResId( CB_CONDITION ) ), + aContextFT ( this, ResId( FT_CONTEXT ) ), + aUsedFT ( this, ResId( FT_USED ) ), + aTbLinks( this, ResId( TB_CONDCOLLS ) ), + aStyleFT ( this, ResId( FT_STYLE ) ), + aStyleLB ( this, ResId( LB_STYLE ) ), + aFilterLB ( this, ResId( LB_FILTER ) ), + aRemovePB ( this, ResId( PB_REMOVE ) ), + aAssignPB ( this, ResId( PB_ASSIGN ) ), + sNoTmpl ( ResId( STR_NOTEMPL ) ), + aStrArr ( ResId( STR_REGIONS ) ), rSh(::GetActiveView()->GetWrtShell()), pFmt(0), pCmds( SwCondCollItem::GetCmds() ), @@ -521,6 +522,9 @@ const CommandStruct* SwCondCollItem::GetCmds() /************************************************************************* $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/18 17:14:32 hr + initial import + Revision 1.21 2000/09/18 16:05:13 willem.vandorp OpenOffice header added. diff --git a/sw/source/ui/chrdlg/ccoll.src b/sw/source/ui/chrdlg/ccoll.src index ab7b1643f848..698547a36019 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.5 $ + * $Revision: 1.6 $ * - * last change: $Author: kz $ $Date: 2001-01-26 21:30:54 $ + * last change: $Author: os $ $Date: 2001-02-09 07:43:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,11 +69,18 @@ TabPage TP_CONDCOLL { HelpID = HID_COND_COLL ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE ; + GroupBox GB_CONDITION + { + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 248 , 179 ) ; + Text = "Optionen" ; + Text [ English ] = "Settings" ; + }; CheckBox CB_CONDITION { - Pos = MAP_APPFONT ( 12 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text = "~Als bedingte Vorlage" ; Text [ English ] = "~As conditioned Style" ; @@ -101,8 +108,8 @@ TabPage TP_CONDCOLL }; FixedText FT_CONTEXT { - Pos = MAP_APPFONT ( 12 , 25 ) ; - Size = MAP_APPFONT ( 50 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 28 ) ; + Size = MAP_APPFONT ( 50 , 8 ) ; Text = "~Kontext" ; Text [ English ] = "~Context" ; Disable = TRUE ; @@ -128,8 +135,8 @@ TabPage TP_CONDCOLL }; FixedText FT_USED { - Pos = MAP_APPFONT ( 100 , 25 ) ; - Size = MAP_APPFONT ( 80 , 10 ) ; + Pos = MAP_APPFONT ( 100 , 28 ) ; + Size = MAP_APPFONT ( 80 , 8 ) ; Text = "Verwendete Vorlage" ; Text [ English ] = "Used Style" ; Disable = TRUE ; @@ -156,8 +163,8 @@ TabPage TP_CONDCOLL Control TB_CONDCOLLS { Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 36 ) ; - Size = MAP_APPFONT ( 173 , 80 ) ; + Pos = MAP_APPFONT ( 12 , 39 ) ; + Size = MAP_APPFONT ( 173 , 123 ) ; TabStop = TRUE ; ClipChildren = TRUE ; Disable = TRUE ; @@ -165,9 +172,9 @@ TabPage TP_CONDCOLL }; FixedText FT_STYLE { - Pos = MAP_APPFONT ( 190 , 25 ) ; - Size = MAP_APPFONT ( 50 , 10 ) ; - Text = "Absatzvorlagen" ; + Pos = MAP_APPFONT ( 190 , 28 ) ; + Size = MAP_APPFONT ( 50 , 8 ) ; + Text = "A~bsatzvorlagen" ; Text [ English ] = "Styles" ; Disable = TRUE ; Text [ dutch ] = "Alineaprofielen" ; @@ -192,8 +199,8 @@ TabPage TP_CONDCOLL }; ListBox LB_STYLE { - Pos = MAP_APPFONT ( 188 , 36 ) ; - Size = MAP_APPFONT ( 60 , 60 ) ; + Pos = MAP_APPFONT ( 188 , 39 ) ; + Size = MAP_APPFONT ( 60 , 108 ) ; TabStop = TRUE ; Border = TRUE ; Sort = TRUE ; @@ -202,7 +209,7 @@ TabPage TP_CONDCOLL }; ListBox LB_FILTER { - Pos = MAP_APPFONT ( 188 , 104 ) ; + Pos = MAP_APPFONT ( 188 , 150 ) ; Size = MAP_APPFONT ( 60 , 50 ) ; DropDown = TRUE ; TabStop = TRUE ; @@ -212,7 +219,7 @@ TabPage TP_CONDCOLL }; PushButton PB_REMOVE { - Pos = MAP_APPFONT ( 129 , 119 ) ; + Pos = MAP_APPFONT ( 129 , 165 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; Text = "~Entfernen" ; Text [ English ] = "~Remove" ; @@ -240,7 +247,7 @@ TabPage TP_CONDCOLL }; PushButton PB_ASSIGN { - Pos = MAP_APPFONT ( 185 , 119 ) ; + Pos = MAP_APPFONT ( 185 , 165 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; Text = "~Zuweisen" ; Text [ English ] = "Assign" ; diff --git a/sw/source/ui/chrdlg/chardlg.src b/sw/source/ui/chrdlg/chardlg.src index 67420198941c..2d58f415841e 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.13 $ + * $Revision: 1.14 $ * - * last change: $Author: kz $ $Date: 2001-01-26 21:32:03 $ + * last change: $Author: os $ $Date: 2001-02-09 07:43:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,12 +64,10 @@ #include "chardlg.hrc" #include "helpid.h" -#define LBOX_DIFF 4 TabDialog DLG_CHAR { OutputSize = TRUE ; SVLook = TRUE ; - /* ### ACHTUNG: Neuer Text in Resource? Zeichen : Schrift */ Text = "Zeichen" ; Text [ ENGLISH ] = "Character" ; Text [ norwegian ] = "Character" ; @@ -338,12 +336,12 @@ TabPage TP_CHAR_URL { HelpID = HID_CHAR_URL ; SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE ; GroupBox GB_URL { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 72 + LBOX_DIFF ) ; + Size = MAP_APPFONT ( 248 , 93 ) ; Text = "Hyperlink" ; Text [ English ] = "Hyperlink" ; Text [ english_us ] = "Hyperlink" ; @@ -369,8 +367,8 @@ TabPage TP_CHAR_URL }; FixedText FT_URL { - Pos = MAP_APPFONT ( 12 , 15 ) ; - Size = MAP_APPFONT ( 63 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 17 ) ; + Size = MAP_APPFONT ( 63 , 8 ) ; Text = "U~RL" ; Text [ English ] = "U~RL" ; Text [ english_us ] = "~URL" ; @@ -396,7 +394,7 @@ TabPage TP_CHAR_URL }; Edit ED_URL { - Pos = MAP_APPFONT ( 78 , 14 ) ; + Pos = MAP_APPFONT ( 78 , 15 ) ; Size = MAP_APPFONT ( 104 , 12 ) ; Border = TRUE ; TabStop = TRUE ; @@ -431,8 +429,8 @@ TabPage TP_CHAR_URL }; FixedText FT_TEXT { - Pos = MAP_APPFONT ( 12 , 30 ) ; - Size = MAP_APPFONT ( 63 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 34 ) ; + Size = MAP_APPFONT ( 63 , 8 ) ; Text = "Te~xt" ; Text [ English ] = "Text" ; Text[ english_us ] = "Te~xt"; @@ -456,7 +454,7 @@ TabPage TP_CHAR_URL }; Edit ED_TEXT { - Pos = MAP_APPFONT ( 78 , 29 ) ; + Pos = MAP_APPFONT ( 78 , 32 ) ; Size = MAP_APPFONT ( 104 , 12 ) ; Border = TRUE ; TabStop = TRUE ; @@ -464,8 +462,8 @@ TabPage TP_CHAR_URL }; FixedText FT_NAME { - Pos = MAP_APPFONT ( 12 , 45 ) ; - Size = MAP_APPFONT ( 63 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 49 ) ; + Size = MAP_APPFONT ( 63 , 8 ) ; Text = "~Name" ; Text [ English ] = "~Name" ; Text [ english_us ] = "~Name" ; @@ -491,7 +489,7 @@ TabPage TP_CHAR_URL }; Edit ED_NAME { - Pos = MAP_APPFONT ( 78 , 44 ) ; + Pos = MAP_APPFONT ( 78 , 47 ) ; Size = MAP_APPFONT ( 104 , 12 ) ; Border = TRUE ; TabStop = TRUE ; @@ -499,7 +497,7 @@ TabPage TP_CHAR_URL }; FixedText FT_TARGET { - Pos = MAP_APPFONT ( 12 , 60 ) ; + Pos = MAP_APPFONT ( 12 , 65 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; Text = "~Frame" ; Text [ English ] = "Frame" ; @@ -526,7 +524,7 @@ TabPage TP_CHAR_URL }; ComboBox LB_TARGET { - Pos = MAP_APPFONT ( 78 , 59 ) ; + Pos = MAP_APPFONT ( 78 , 63 ) ; Size = MAP_APPFONT ( 104 , 60 ) ; TabStop = TRUE ; DropDown = TRUE ; @@ -535,7 +533,7 @@ TabPage TP_CHAR_URL }; PushButton PB_EVENT { - Pos = MAP_APPFONT ( 188 , 31 ) ; + Pos = MAP_APPFONT ( 12 , 79 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; TabStop = TRUE ; Text = "~Ereignisse..." ; @@ -563,8 +561,8 @@ TabPage TP_CHAR_URL }; GroupBox GB_STYLE { - Pos = MAP_APPFONT ( 6 , 78 + LBOX_DIFF ) ; - Size = MAP_APPFONT ( 248 , 42 + 2 * LBOX_DIFF ) ; + Pos = MAP_APPFONT ( 6 , 99 ) ; + Size = MAP_APPFONT ( 248 , 42 ) ; Text = "Zeichenvorlagen" ; Text [ English ] = "Character styles" ; Text [ dutch ] = "Tekenopmaakprofielen" ; @@ -590,8 +588,8 @@ TabPage TP_CHAR_URL }; FixedText FT_VISITED { - Pos = MAP_APPFONT ( 12 , 91 + LBOX_DIFF ) ; - Size = MAP_APPFONT ( 63 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 112 ) ; + Size = MAP_APPFONT ( 63 , 8 ) ; Text = "~Besuchter Link" ; Text [ English ] = "Visited link" ; Text [ dutch ] = "B~ezochte Link" ; @@ -617,7 +615,7 @@ TabPage TP_CHAR_URL }; ListBox LB_VISITED { - Pos = MAP_APPFONT ( 78 , 90 + LBOX_DIFF ) ; + Pos = MAP_APPFONT ( 78 , 110 ) ; Size = MAP_APPFONT ( 104 , 60 ) ; Border = TRUE ; TabStop = TRUE ; @@ -627,7 +625,7 @@ TabPage TP_CHAR_URL }; FixedText FT_NOT_VISITED { - Pos = MAP_APPFONT ( 12 , 106 + 2 * LBOX_DIFF ) ; + Pos = MAP_APPFONT ( 12 , 128 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; Text = "~Unbesuchter Link" ; Text [ English ] = "Unvisited link" ; @@ -654,7 +652,7 @@ TabPage TP_CHAR_URL }; ListBox LB_NOT_VISITED { - Pos = MAP_APPFONT ( 78 , 105 + 2 * LBOX_DIFF ) ; + Pos = MAP_APPFONT ( 78 , 126 ) ; Size = MAP_APPFONT ( 104 , 60 ) ; Border = TRUE ; TabStop = TRUE ; diff --git a/sw/source/ui/chrdlg/drpcps.src b/sw/source/ui/chrdlg/drpcps.src index db5dc7058769..1889c5242dc4 100644 --- a/sw/source/ui/chrdlg/drpcps.src +++ b/sw/source/ui/chrdlg/drpcps.src @@ -2,9 +2,9 @@ * * $RCSfile: drpcps.src,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: kz $ $Date: 2001-02-02 16:42:24 $ + * last change: $Author: os $ $Date: 2001-02-09 07:43:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - // #pragma ****************************************************************** // #include ***************************************************************** #include "globals.hrc" @@ -134,11 +133,11 @@ TabDialog DLG_DROPCAPS TabPage TP_DROPCAPS { HelpID = HID_DROPCAPS ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Hide = TRUE ; CheckBox CB_SWITCH { - Pos = MAP_APPFONT ( 12 , 15 ) ; + Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text = "I~nitialen anzeigen" ; Text [ English ] = "Show Drop Caps" ; @@ -164,7 +163,7 @@ TabPage TP_DROPCAPS }; CheckBox CB_WORD { - Pos = MAP_APPFONT ( 12 , 26 ) ; + Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text = "Ganzes ~Wort" ; Text [ English ] = "Whole Word" ; @@ -190,21 +189,10 @@ TabPage TP_DROPCAPS }; FixedText FT_DROPCAPS { - Pos = MAP_APPFONT ( 12 , 39 ) ; + Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text = "Anzahl der Ze~ichen" ; Text [ English ] = "Number of characters" ; - // Text[norwegian] = "~Drop Caps"; - // Text[italian] = "~Annulla maiuscole."; - // Text[portuguese_brazilian] = "~Capitulares descidas"; - // Text[portuguese] = "~Capitulares descidas"; - // Text[finnish] = "~Anfangit"; - // Text[danish] = "~Uncialer"; - // Text[french] = "~Drop Caps"; - // Text[swedish] = "~Anfanger"; - // Text[dutch] = "~Initialen"; - // Text[spanish] = "~Quitar maysculas"; - // Text[english_us] = "~Drop Caps"; Text [ english_us ] = "Number of ~characters:" ; Text [ italian ] = "Numero di caratteri" ; Text [ spanish ] = "~Nmero de caracteres" ; @@ -233,7 +221,7 @@ TabPage TP_DROPCAPS Left = TRUE ; Maximum = 9 ; Minimum = 1 ; - Pos = MAP_APPFONT ( 89 , 37 ) ; + Pos = MAP_APPFONT ( 89 , 42 ) ; Repeat = TRUE ; Size = MAP_APPFONT ( 36 , 12 ) ; Spin = TRUE ; @@ -242,7 +230,7 @@ TabPage TP_DROPCAPS FixedText TXT_LINES { Left = TRUE ; - Pos = MAP_APPFONT ( 12 , 53 ) ; + Pos = MAP_APPFONT ( 12 , 60 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text = "Zei~len" ; Text [ English ] = "~Lines" ; @@ -276,7 +264,7 @@ TabPage TP_DROPCAPS Left = TRUE ; Maximum = 9 ; Minimum = 2 ; - Pos = MAP_APPFONT ( 89 , 51 ) ; + Pos = MAP_APPFONT ( 89 , 58 ) ; Repeat = TRUE ; Size = MAP_APPFONT ( 36 , 12 ) ; Spin = TRUE ; @@ -285,7 +273,7 @@ TabPage TP_DROPCAPS FixedText TXT_DISTANCE { Left = TRUE ; - Pos = MAP_APPFONT ( 12 , 67 ) ; + Pos = MAP_APPFONT ( 12 , 74 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text = "A~bstand zum Text" ; Text [ English ] = "D~istance" ; @@ -320,7 +308,7 @@ TabPage TP_DROPCAPS Left = TRUE ; Maximum = 200 ; Minimum = 0 ; - Pos = MAP_APPFONT ( 89 , 65 ) ; + Pos = MAP_APPFONT ( 89 , 72 ) ; Repeat = TRUE ; Size = MAP_APPFONT ( 36 , 12 ) ; Spin = TRUE ; @@ -331,7 +319,7 @@ TabPage TP_DROPCAPS GroupBox GRP_SETTINGS { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 125 , 79 ) ; + Size = MAP_APPFONT ( 125 , 84 ) ; Text = "Einstellungen" ; Text [ English ] = "Options" ; Text [ norwegian ] = "Options" ; @@ -360,12 +348,12 @@ TabPage TP_DROPCAPS { Border = TRUE ; Pos = MAP_APPFONT ( 143 , 14 ) ; - Size = MAP_APPFONT ( 105 , 62 ) ; + Size = MAP_APPFONT ( 105 , 67 ) ; }; GroupBox BOX_PICT { Pos = MAP_APPFONT ( 137 , 3 ) ; - Size = MAP_APPFONT ( 117 , 79 ) ; + Size = MAP_APPFONT ( 117 , 84 ) ; Text = "Beispiel" ; Text [ English ] = "Example" ; Text [ dutch ] = "Voorbeeld" ; @@ -391,8 +379,8 @@ TabPage TP_DROPCAPS FixedText TXT_TEXT { Left = TRUE ; - Pos = MAP_APPFONT ( 12 , 96 ) ; - Size = MAP_APPFONT ( 70 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 103 ) ; + Size = MAP_APPFONT ( 70 , 8 ) ; Text = "Initialen~text" ; Text [ English ] = "~Text" ; Text [ norwegian ] = "~Text" ; @@ -421,7 +409,7 @@ TabPage TP_DROPCAPS { Border = TRUE ; Left = TRUE ; - Pos = MAP_APPFONT ( 143 , 95 ) ; + Pos = MAP_APPFONT ( 143 , 101 ) ; Size = MAP_APPFONT ( 105 , 12 ) ; TabStop = TRUE ; MaxTextLength = 9 ; @@ -429,7 +417,7 @@ TabPage TP_DROPCAPS FixedText TXT_TEMPLATE { Left = TRUE ; - Pos = MAP_APPFONT ( 12 , 111 ) ; + Pos = MAP_APPFONT ( 12 , 119 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text = "Zeichen~vorlage" ; Text [ English ] = "Character st~yle" ; @@ -459,14 +447,14 @@ TabPage TP_DROPCAPS { Border = TRUE ; DropDown = TRUE ; - Pos = MAP_APPFONT ( 143 , 110 ) ; + Pos = MAP_APPFONT ( 143 , 117 ) ; Size = MAP_APPFONT ( 105 , 61 ) ; TabStop = TRUE ; }; GroupBox BOX_CONTENT { - Pos = MAP_APPFONT ( 6 , 85 ) ; - Size = MAP_APPFONT ( 248 , 44 ) ; + Pos = MAP_APPFONT ( 6 , 90 ) ; + Size = MAP_APPFONT ( 248 , 42 ) ; Text = "Inhalt" ; Text [ English ] = "Content" ; Text [ english_us ] = "Contents" ; diff --git a/sw/source/ui/chrdlg/numpara.src b/sw/source/ui/chrdlg/numpara.src index 426d99cf23b6..9b909b8b9d2c 100644 --- a/sw/source/ui/chrdlg/numpara.src +++ b/sw/source/ui/chrdlg/numpara.src @@ -2,9 +2,9 @@ * * $RCSfile: numpara.src,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2000-12-04 11:03:57 $ + * last change: $Author: os $ $Date: 2001-02-09 07:43:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,7 +74,7 @@ TabPage TP_NUMPARA GroupBox GB_NUMBER_STYLE { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 176 , 26 ) ; + Size = MAP_APPFONT ( 248 , 26 ) ; Text = "Nummerierungsvorlage" ; Text [ ENGLISH ] = "Number style" ; Text [ portuguese ] = "Estilo de numerao" ; @@ -99,7 +99,7 @@ TabPage TP_NUMPARA }; ListBox LB_NUMBER_STYLE { - Pos = MAP_APPFONT ( 12 , 12 ) ; + Pos = MAP_APPFONT ( 93 , 14 ) ; Size = MAP_APPFONT ( 158 , 65 ) ; DropDown = TRUE ; Border = TRUE ; @@ -191,7 +191,7 @@ TabPage TP_NUMPARA GroupBox GB_NEW_START { Pos = MAP_APPFONT ( 6 , 32 ) ; - Size = MAP_APPFONT ( 176 , 40 ) ; + Size = MAP_APPFONT ( 248 , 40 ) ; Text = "Nummerierung" ; Text [ English ] = "Numbering" ; TabStop = TRUE ; @@ -218,7 +218,7 @@ TabPage TP_NUMPARA }; TriStateBox CB_NEW_START { - Pos = MAP_APPFONT ( 12 , 44 ) ; + Pos = MAP_APPFONT ( 12 , 43 ) ; Size = MAP_APPFONT ( 160 , 10 ) ; Text = "~An diesem Absatz neu beginnen" ; Text [ English ] = "~Restart at this paragraph" ; @@ -246,8 +246,8 @@ TabPage TP_NUMPARA }; FixedText FT_NEW_START { - Pos = MAP_APPFONT ( 12 , 56 ) ; - Size = MAP_APPFONT ( 50 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 59 ) ; + Size = MAP_APPFONT ( 50 , 8 ) ; Text = "~Beginnen mit:" ; Text [ English ] = "~Start at:" ; Hide = TRUE ; @@ -275,7 +275,7 @@ TabPage TP_NUMPARA NumericField NF_NEW_START { Border = TRUE ; - Pos = MAP_APPFONT ( 144 , 56 ) ; + Pos = MAP_APPFONT ( 225 , 57 ) ; Size = MAP_APPFONT ( 26 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -292,7 +292,7 @@ TabPage TP_NUMPARA GroupBox GB_COUNT_PARA { Pos = MAP_APPFONT ( 6 , 75 ) ; - Size = MAP_APPFONT ( 176 , 53 ) ; + Size = MAP_APPFONT ( 248 , 54 ) ; Text = "Zeilennummerierung" ; Text [ English ] = "Line numbering" ; TabStop = TRUE ; @@ -318,7 +318,7 @@ TabPage TP_NUMPARA }; TriStateBox CB_COUNT_PARA { - Pos = MAP_APPFONT ( 12 , 89 ) ; + Pos = MAP_APPFONT ( 12 , 86 ) ; Size = MAP_APPFONT ( 160 , 10 ) ; Text = "~Die Zeilen dieses Absatzes mitzhlen" ; Text [ English ] = "~Include this paragraph in line numbering" ; @@ -345,7 +345,7 @@ TabPage TP_NUMPARA }; TriStateBox CB_RESTART_PARACOUNT { - Pos = MAP_APPFONT ( 12 , 101 ) ; + Pos = MAP_APPFONT ( 12 , 100 ) ; Size = MAP_APPFONT ( 160 , 10 ) ; Text = "An diese~m Absatz neu beginnen" ; Text [ English ] = "~Restart at this paragraph" ; @@ -372,7 +372,7 @@ TabPage TP_NUMPARA }; FixedText FT_RESTART_NO { - Pos = MAP_APPFONT ( 12 , 113 ) ; + Pos = MAP_APPFONT ( 12 , 116 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text = "B~eginnen mit:" ; Text [ English ] = "~Start at:" ; @@ -400,7 +400,7 @@ TabPage TP_NUMPARA NumericField NF_RESTART_PARA { Border = TRUE ; - Pos = MAP_APPFONT ( 144 , 113 ) ; + Pos = MAP_APPFONT ( 225 , 114 ) ; Size = MAP_APPFONT ( 26 , 12 ) ; TabStop = TRUE ; Left = TRUE ; diff --git a/sw/source/ui/fldui/flddb.src b/sw/source/ui/fldui/flddb.src index 43d6dd7f31c2..29b3c4095496 100644 --- a/sw/source/ui/fldui/flddb.src +++ b/sw/source/ui/fldui/flddb.src @@ -2,9 +2,9 @@ * * $RCSfile: flddb.src,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: kz $ $Date: 2001-02-02 16:48:50 $ + * last change: $Author: os $ $Date: 2001-02-09 07:44:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,13 +67,13 @@ TabPage TP_FLD_DB HelpID = HID_FLD_DB ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Text = "Datenbank" ; Text [ ENGLISH ] = "Database" ; FixedText FT_DBTYPE { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 76 , 10 ) ; + Size = MAP_APPFONT ( 76 , 8 ) ; Text = "~Feldtyp" ; Text [ ENGLISH ] = "Type" ; Text [ norwegian ] = "Type" ; @@ -102,7 +102,7 @@ TabPage TP_FLD_DB { Border = TRUE ; Pos = MAP_APPFONT ( 6 , 16 ) ; - Size = MAP_APPFONT ( 76 , 54 ) ; + Size = MAP_APPFONT ( 76 , 104 ) ; TabStop = TRUE ; Sort = TRUE ; AutoHScroll = TRUE ; @@ -117,8 +117,8 @@ TabPage TP_FLD_DB }; FixedText FT_DBCONDITION { - Pos = MAP_APPFONT ( 6 , 76 ) ; - Size = MAP_APPFONT ( 76 , 10 ) ; + Pos = MAP_APPFONT ( 6 , 126 ) ; + Size = MAP_APPFONT ( 76 , 8 ) ; TEXT = "Bedin~gung" ; TEXT [ English ] = "Conditio~n" ; TEXT [ norwegian ] = "Vilkr" ; @@ -146,14 +146,14 @@ TabPage TP_FLD_DB Edit ED_DBCONDITION { Border = TRUE ; - Pos = MAP_APPFONT ( 6 , 88 ) ; + Pos = MAP_APPFONT ( 6 , 138 ) ; Size = MAP_APPFONT ( 76 , 12 ) ; TabStop = TRUE ; Left = TRUE ; }; FixedText FT_DBSETNUMBER { - Pos = MAP_APPFONT ( 6 , 105 ) ; + Pos = MAP_APPFONT ( 6 , 155 ) ; Size = MAP_APPFONT ( 76 , 10 ) ; TEXT = "Sat~znummer" ; TEXT [ English ] = "Setnumber" ; @@ -182,7 +182,7 @@ TabPage TP_FLD_DB Edit ED_DBSETNUMBER { Border = TRUE ; - Pos = MAP_APPFONT ( 6 , 117 ) ; + Pos = MAP_APPFONT ( 6 , 167 ) ; Size = MAP_APPFONT ( 76 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -217,12 +217,12 @@ TabPage TP_FLD_DB { Border = TRUE ; Pos = MAP_APPFONT ( 88 , 16 ) ; - Size = MAP_APPFONT ( 166 , 72 ) ; + Size = MAP_APPFONT ( 166 , 122 ) ; TabStop = TRUE ; }; RadioButton RB_DBOWNFORMAT { - Pos = MAP_APPFONT ( 94 , 103 ) ; + Pos = MAP_APPFONT ( 94 , 153 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Text = "A~us Datenbank" ; Text [ ENGLISH ] = "From database" ; @@ -248,7 +248,7 @@ TabPage TP_FLD_DB }; RadioButton RB_DBFORMAT { - Pos = MAP_APPFONT ( 94 , 115 ) ; + Pos = MAP_APPFONT ( 94 , 165 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Text = "Se~lbst definiert" ; Text [ ENGLISH ] = "User defined" ; @@ -274,7 +274,7 @@ TabPage TP_FLD_DB ListBox LB_DBNUMFORMAT { Border = TRUE ; - Pos = MAP_APPFONT ( 160 , 113 ) ; + Pos = MAP_APPFONT ( 160 , 163 ) ; Size = MAP_APPFONT ( 88 , 60 ) ; TabStop = TRUE ; AutoHScroll = TRUE ; @@ -283,7 +283,7 @@ TabPage TP_FLD_DB ListBox LB_DBFORMAT { Border = TRUE ; - Pos = MAP_APPFONT ( 160 , 113 ) ; + Pos = MAP_APPFONT ( 160 , 163 ) ; Size = MAP_APPFONT ( 88 , 60 ) ; TabStop = TRUE ; AutoHScroll = TRUE ; @@ -293,7 +293,7 @@ TabPage TP_FLD_DB }; GroupBox GB_DBFORMAT { - Pos = MAP_APPFONT ( 88 , 91 ) ; + Pos = MAP_APPFONT ( 88 , 141 ) ; Size = MAP_APPFONT ( 166 , 38 ) ; TEXT = "Format" ; TEXT [ English ] = "Format" ; diff --git a/sw/source/ui/fldui/flddinf.src b/sw/source/ui/fldui/flddinf.src index 420e9b603c35..be8fab91e896 100644 --- a/sw/source/ui/fldui/flddinf.src +++ b/sw/source/ui/fldui/flddinf.src @@ -2,9 +2,9 @@ * * $RCSfile: flddinf.src,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: kz $ $Date: 2001-01-26 21:40:10 $ + * last change: $Author: os $ $Date: 2001-02-09 07:44:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,13 +67,13 @@ TabPage TP_FLD_DOKINF HelpID = HID_FLD_DOKINF ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Text = "Dokumentinfo" ; Text [ ENGLISH ] = "Document information" ; FixedText FT_DOKINFTYPE { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 76 , 10 ) ; + Size = MAP_APPFONT ( 76 , 8 ) ; Text = "~Feldtyp" ; Text [ ENGLISH ] = "Type" ; Text [ norwegian ] = "Type" ; @@ -103,13 +103,13 @@ TabPage TP_FLD_DOKINF { Border = TRUE ; Pos = MAP_APPFONT ( 6 , 16 ) ; - Size = MAP_APPFONT ( 76 , 113 ) ; + Size = MAP_APPFONT ( 76 , 163 ) ; TabStop = TRUE ; }; FixedText FT_DOKINFSELECTION { Pos = MAP_APPFONT ( 88 , 3 ) ; - Size = MAP_APPFONT ( 76 , 10 ) ; + Size = MAP_APPFONT ( 76 , 8 ) ; Text = "~Auswahl" ; Text [ ENGLISH ] = "Selection" ; Text [ norwegian ] = "Selection" ; @@ -139,7 +139,7 @@ TabPage TP_FLD_DOKINF { Border = TRUE ; Pos = MAP_APPFONT ( 88 , 16 ) ; - Size = MAP_APPFONT ( 76 , 113 ) ; + Size = MAP_APPFONT ( 76 , 163 ) ; TabStop = TRUE ; StringList = { @@ -285,7 +285,7 @@ TabPage TP_FLD_DOKINF FixedText FT_DOKINFFORMAT { Pos = MAP_APPFONT ( 170 , 3 ) ; - Size = MAP_APPFONT ( 84 , 10 ) ; + Size = MAP_APPFONT ( 84 , 8 ) ; TEXT = "F~ormat" ; TEXT [ English ] = "Format" ; Left = TRUE ; @@ -313,13 +313,13 @@ TabPage TP_FLD_DOKINF { Border = TRUE ; Pos = MAP_APPFONT ( 170 , 16 ) ; - Size = MAP_APPFONT ( 84 , 98 ) ; + Size = MAP_APPFONT ( 84 , 148 ) ; TabStop = TRUE ; AutoHScroll = TRUE ; }; CheckBox CB_DOKINFFIXEDCONTENT { - Pos = MAP_APPFONT ( 170 , 120 ) ; + Pos = MAP_APPFONT ( 170 , 170 ) ; Size = MAP_APPFONT ( 72 , 10 ) ; TEXT = "~Inhalt fixieren" ; TEXT [ English ] = "Fixed content" ; diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 4cf7743f6995..d213988a1417 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -2,9 +2,9 @@ * * $RCSfile: flddok.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:36 $ + * last change: $Author: os $ $Date: 2001-02-09 07:44:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -467,9 +467,9 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) Size aSz(aFormatLB.GetSizePixel()); if (bValue | bLevel | bOffset) - aSz.Height() = aFormatLB.LogicToPixel(Size(1, 82), MAP_APPFONT).Height(); + aSz.Height() = aFormatLB.LogicToPixel(Size(1, 137), MAP_APPFONT).Height(); else - aSz.Height() = aFormatLB.LogicToPixel(Size(1, 98), MAP_APPFONT).Height(); + aSz.Height() = aFormatLB.LogicToPixel(Size(1, 152), MAP_APPFONT).Height(); aValueFT.Show(bValue | bLevel | bOffset); aValueED.Show(bValue); @@ -756,6 +756,9 @@ void SwFldDokPage::FillUserData() /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/18 17:14:36 hr + initial import + Revision 1.36 2000/09/18 16:05:28 willem.vandorp OpenOffice header added. diff --git a/sw/source/ui/fldui/flddok.src b/sw/source/ui/fldui/flddok.src index 7e3c5696b075..3683033fc11f 100644 --- a/sw/source/ui/fldui/flddok.src +++ b/sw/source/ui/fldui/flddok.src @@ -2,9 +2,9 @@ * * $RCSfile: flddok.src,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: kz $ $Date: 2001-01-26 21:41:20 $ + * last change: $Author: os $ $Date: 2001-02-09 07:44:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,13 +67,13 @@ TabPage TP_FLD_DOK HelpID = HID_FLD_DOK ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Text = "Dokument" ; Text [ ENGLISH ] = "Document" ; FixedText FT_DOKTYPE { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 76 , 10 ) ; + Size = MAP_APPFONT ( 76 , 8 ) ; Text = "~Feldtyp" ; Text [ ENGLISH ] = "Type" ; Text [ norwegian ] = "Type" ; @@ -102,8 +102,8 @@ TabPage TP_FLD_DOK ListBox LB_DOKTYPE { Border = TRUE ; - Pos = MAP_APPFONT ( 6 , 16 ) ; - Size = MAP_APPFONT ( 76 , 113 ) ; + Pos = MAP_APPFONT ( 6 , 14 ) ; + Size = MAP_APPFONT ( 76 , 165 ) ; TabStop = TRUE ; Sort = TRUE ; AutoHScroll = TRUE ; @@ -111,7 +111,7 @@ TabPage TP_FLD_DOK FixedText FT_DOKSELECTION { Pos = MAP_APPFONT ( 88 , 3 ) ; - Size = MAP_APPFONT ( 76 , 10 ) ; + Size = MAP_APPFONT ( 76 , 8 ) ; Text = "~Auswahl" ; Text [ ENGLISH ] = "Selection" ; Text [ norwegian ] = "Selection" ; @@ -140,16 +140,14 @@ TabPage TP_FLD_DOK ListBox LB_DOKSELECTION { Border = TRUE ; - Pos = MAP_APPFONT ( 88 , 16 ) ; - Size = MAP_APPFONT ( 76 , 113 ) ; - // Keine Sortierung auf Wunsch von MA (wg. Absender) - // Sort = TRUE; + Pos = MAP_APPFONT ( 88 , 15 ) ; + Size = MAP_APPFONT ( 76 , 165 ) ; TabStop = TRUE ; }; FixedText FT_DOKFORMAT { Pos = MAP_APPFONT ( 170 , 3 ) ; - Size = MAP_APPFONT ( 84 , 10 ) ; + Size = MAP_APPFONT ( 84 , 8 ) ; TEXT = "F~ormat" ; TEXT [ English ] = "Format" ; Left = TRUE ; @@ -176,9 +174,8 @@ TabPage TP_FLD_DOK ListBox LB_DOKFORMAT { Border = TRUE ; - Pos = MAP_APPFONT ( 170 , 16 ) ; - // Size = MAP_APPFONT ( 84 , 82 ) ; - Size = MAP_APPFONT ( 84 , 98 ) ; + Pos = MAP_APPFONT ( 170 , 14 ) ; + Size = MAP_APPFONT ( 84 , 151 ) ; TabStop = TRUE ; DropDown = FALSE ; Sort = TRUE ; @@ -187,17 +184,16 @@ TabPage TP_FLD_DOK ListBox LB_DOKNUMFORMAT { Border = TRUE ; - Pos = MAP_APPFONT ( 170 , 16 ) ; - // Size = MAP_APPFONT ( 84 , 82 ) ; - Size = MAP_APPFONT ( 84 , 98 ) ; + Pos = MAP_APPFONT ( 170 , 14 ) ; + Size = MAP_APPFONT ( 84 , 151 ) ; TabStop = TRUE ; AutoHScroll = TRUE ; Hide = TRUE ; }; FixedText FT_DOKVALUE { - Pos = MAP_APPFONT ( 170 , 105 ) ; - Size = MAP_APPFONT ( 84 , 10 ) ; + Pos = MAP_APPFONT ( 170 , 155 ) ; + Size = MAP_APPFONT ( 84 , 8 ) ; TEXT = "Ko~rrektur" ; TEXT [ English ] = "Offs~et" ; TEXT [ norwegian ] = "Offset" ; @@ -227,7 +223,7 @@ TabPage TP_FLD_DOK Edit ED_DOKVALUE { Border = TRUE ; - Pos = MAP_APPFONT ( 170 , 117 ) ; + Pos = MAP_APPFONT ( 170 , 167 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -236,7 +232,7 @@ TabPage TP_FLD_DOK NumericField ED_DOKLEVEL { Border = TRUE ; - Pos = MAP_APPFONT ( 170 , 117 ) ; + Pos = MAP_APPFONT ( 170 , 167 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; Text = "1" ; TabStop = TRUE ; @@ -252,7 +248,7 @@ TabPage TP_FLD_DOK NumericField ED_DOKDATEOFF { Border = TRUE ; - Pos = MAP_APPFONT ( 170 , 117 ) ; + Pos = MAP_APPFONT ( 170 , 167 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; Text = "0" ; TabStop = TRUE ; @@ -264,7 +260,7 @@ TabPage TP_FLD_DOK }; CheckBox CB_DOKFIXEDCONTENT { - Pos = MAP_APPFONT ( 170 , 120 ) ; + Pos = MAP_APPFONT ( 170 , 170 ) ; Size = MAP_APPFONT ( 72 , 10 ) ; TEXT = "~Inhalt fixieren" ; TEXT [ English ] = "Fixed content" ; diff --git a/sw/source/ui/fldui/fldfunc.src b/sw/source/ui/fldui/fldfunc.src index b9f30200d9db..1f7f3a221e70 100644 --- a/sw/source/ui/fldui/fldfunc.src +++ b/sw/source/ui/fldui/fldfunc.src @@ -2,9 +2,9 @@ * * $RCSfile: fldfunc.src,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: kz $ $Date: 2001-01-19 20:50:23 $ + * last change: $Author: os $ $Date: 2001-02-09 07:44:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,13 +67,13 @@ TabPage TP_FLD_FUNC HelpID = HID_FLD_FUNC ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Text = "Funktionen" ; Text [ ENGLISH ] = "Functions" ; FixedText FT_FUNCTYPE { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 76 , 10 ) ; + Size = MAP_APPFONT ( 76 , 8 ) ; Text = "~Feldtyp" ; Text [ ENGLISH ] = "Type" ; Text [ norwegian ] = "Type" ; @@ -102,8 +102,8 @@ TabPage TP_FLD_FUNC ListBox LB_FUNCTYPE { Border = TRUE ; - Pos = MAP_APPFONT ( 6 , 16 ) ; - Size = MAP_APPFONT ( 76 , 113 ) ; + Pos = MAP_APPFONT ( 6 , 14 ) ; + Size = MAP_APPFONT ( 76 , 165 ) ; TabStop = TRUE ; Sort = FALSE ; AutoHScroll = TRUE ; @@ -111,7 +111,7 @@ TabPage TP_FLD_FUNC FixedText FT_FUNCSELECTION { Pos = MAP_APPFONT ( 88 , 3 ) ; - Size = MAP_APPFONT ( 76 , 10 ) ; + Size = MAP_APPFONT ( 76 , 8 ) ; Text = "~Auswahl" ; Text [ ENGLISH ] = "Selection" ; Text [ norwegian ] = "Selection" ; @@ -141,8 +141,8 @@ TabPage TP_FLD_FUNC ListBox LB_FUNCSELECTION { Border = TRUE ; - Pos = MAP_APPFONT ( 88 , 16 ) ; - Size = MAP_APPFONT ( 76 , 113 ) ; + Pos = MAP_APPFONT ( 88 , 14 ) ; + Size = MAP_APPFONT ( 76 , 165 ) ; TabStop = TRUE ; Hide = TRUE ; Sort = TRUE ; @@ -151,7 +151,7 @@ TabPage TP_FLD_FUNC FixedText FT_FUNCFORMAT { Pos = MAP_APPFONT ( 88 , 3 ) ; - Size = MAP_APPFONT ( 76 , 10 ) ; + Size = MAP_APPFONT ( 76 , 8 ) ; Text = "F~ormat" ; Text [ ENGLISH ] = "Format" ; Left = TRUE ; @@ -178,14 +178,14 @@ TabPage TP_FLD_FUNC ListBox LB_FUNCFORMAT { Border = TRUE ; - Pos = MAP_APPFONT ( 88 , 16 ) ; - Size = MAP_APPFONT ( 76 , 113 ) ; + Pos = MAP_APPFONT ( 88 , 14 ) ; + Size = MAP_APPFONT ( 76 , 165 ) ; TabStop = TRUE ; }; FixedText FT_FUNCNAME { Pos = MAP_APPFONT ( 170 , 3 ) ; - Size = MAP_APPFONT ( 84 , 10 ) ; + Size = MAP_APPFONT ( 84 , 8 ) ; Text = "Na~me" ; TEXT [ English ] = "Na~me" ; Left = TRUE ; @@ -212,15 +212,15 @@ TabPage TP_FLD_FUNC Edit ED_FUNCNAME { Border = TRUE ; - Pos = MAP_APPFONT ( 170 , 15 ) ; + Pos = MAP_APPFONT ( 170 , 14 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; TabStop = TRUE ; Left = TRUE ; }; FixedText FT_FUNCVALUE { - Pos = MAP_APPFONT ( 170 , 33 ) ; - Size = MAP_APPFONT ( 84 , 10 ) ; + Pos = MAP_APPFONT ( 170 , 30 ) ; + Size = MAP_APPFONT ( 84 , 8 ) ; Text = "~Wert" ; Text [ ENGLISH ] = "Value" ; Text [ norwegian ] = "Verdi" ; @@ -249,15 +249,15 @@ TabPage TP_FLD_FUNC Edit ED_FUNCVALUE { Border = TRUE ; - Pos = MAP_APPFONT ( 170 , 45 ) ; + Pos = MAP_APPFONT ( 170 , 41 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; TabStop = TRUE ; Left = TRUE ; }; FixedText FT_FUNCCOND1 { - Pos = MAP_APPFONT ( 170 , 33 ) ; - Size = MAP_APPFONT ( 84 , 10 ) ; + Pos = MAP_APPFONT ( 170 , 30 ) ; + Size = MAP_APPFONT ( 84 , 8 ) ; Text = "~Dann" ; Text [ ENGLISH ] = "Then" ; Left = TRUE ; @@ -285,7 +285,7 @@ TabPage TP_FLD_FUNC Edit ED_FUNCCOND1 { Border = TRUE ; - Pos = MAP_APPFONT ( 170 , 45 ) ; + Pos = MAP_APPFONT ( 170 , 41 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -293,8 +293,8 @@ TabPage TP_FLD_FUNC }; FixedText FT_FUNCCOND2 { - Pos = MAP_APPFONT ( 170 , 63 ) ; - Size = MAP_APPFONT ( 84 , 10 ) ; + Pos = MAP_APPFONT ( 170 , 57 ) ; + Size = MAP_APPFONT ( 84 , 8 ) ; Text = "So~nst" ; Text [ ENGLISH ] = "Else" ; Left = TRUE ; @@ -322,7 +322,7 @@ TabPage TP_FLD_FUNC Edit ED_FUNCCOND2 { Border = TRUE ; - Pos = MAP_APPFONT ( 170 , 75 ) ; + Pos = MAP_APPFONT ( 170 , 68 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -330,7 +330,7 @@ TabPage TP_FLD_FUNC }; PushButton BT_FUNCMACRO { - Pos = MAP_APPFONT ( 204 , 115 ) ; + Pos = MAP_APPFONT ( 204 , 165 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text = "M~akro..." ; Text [ English ] = "M~acro..." ; diff --git a/sw/source/ui/fldui/fldref.src b/sw/source/ui/fldui/fldref.src index cfcf7d932668..a480431a3c66 100644 --- a/sw/source/ui/fldui/fldref.src +++ b/sw/source/ui/fldui/fldref.src @@ -2,9 +2,9 @@ * * $RCSfile: fldref.src,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: kz $ $Date: 2001-01-26 21:44:43 $ + * last change: $Author: os $ $Date: 2001-02-09 07:44:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,13 +67,13 @@ TabPage TP_FLD_REF HelpID = HID_FLD_REF ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Text = "Referenzen" ; Text [ ENGLISH ] = "References" ; FixedText FT_REFTYPE { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 76 , 10 ) ; + Size = MAP_APPFONT ( 76 , 8 ) ; Text = "~Feldtyp" ; Text [ ENGLISH ] = "Type" ; Text [ norwegian ] = "Type" ; @@ -102,17 +102,15 @@ TabPage TP_FLD_REF ListBox LB_REFTYPE { Border = TRUE ; - Pos = MAP_APPFONT ( 6 , 16 ) ; - Size = MAP_APPFONT ( 76 , 113 ) ; + Pos = MAP_APPFONT ( 6 , 14 ) ; + Size = MAP_APPFONT ( 76 , 165 ) ; TabStop = TRUE ; - // JP 05.11.96: darf nicht sortiert sein! - // Sort = FALSE; AutoHScroll = TRUE ; }; FixedText FT_REFSELECTION { Pos = MAP_APPFONT ( 88 , 3 ) ; - Size = MAP_APPFONT ( 76 , 10 ) ; + Size = MAP_APPFONT ( 76 , 8 ) ; Text = "~Auswahl" ; Text [ ENGLISH ] = "Selection" ; Text [ norwegian ] = "Selection" ; @@ -141,15 +139,15 @@ TabPage TP_FLD_REF ListBox LB_REFSELECTION { Border = TRUE ; - Pos = MAP_APPFONT ( 88 , 16 ) ; - Size = MAP_APPFONT ( 76 , 113 ) ; + Pos = MAP_APPFONT ( 88 , 14 ) ; + Size = MAP_APPFONT ( 76 , 165 ) ; TabStop = TRUE ; Sort = TRUE ; }; FixedText FT_REFFORMAT { Pos = MAP_APPFONT ( 170 , 3 ) ; - Size = MAP_APPFONT ( 84 , 10 ) ; + Size = MAP_APPFONT ( 84 , 8 ) ; TEXT = "F~ormat" ; TEXT [ English ] = "Format" ; Left = TRUE ; @@ -176,15 +174,15 @@ TabPage TP_FLD_REF ListBox LB_REFFORMAT { Border = TRUE ; - Pos = MAP_APPFONT ( 170 , 16 ) ; - Size = MAP_APPFONT ( 84 , 56 ) ; + Pos = MAP_APPFONT ( 170 , 14 ) ; + Size = MAP_APPFONT ( 84 , 110 ) ; TabStop = TRUE ; DropDown = FALSE ; // Sort = TRUE; }; FixedText FT_REFNAME { - Pos = MAP_APPFONT ( 170 , 78 ) ; + Pos = MAP_APPFONT ( 170 , 128 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; Text = "Na~me" ; TEXT [ English ] = "Na~me" ; @@ -212,15 +210,15 @@ TabPage TP_FLD_REF Edit ED_REFNAME { Border = TRUE ; - Pos = MAP_APPFONT ( 170 , 90 ) ; + Pos = MAP_APPFONT ( 170 , 140 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; TabStop = TRUE ; Left = TRUE ; }; FixedText FT_REFVALUE { - Pos = MAP_APPFONT ( 170 , 105 ) ; - Size = MAP_APPFONT ( 84 , 10 ) ; + Pos = MAP_APPFONT ( 170 , 156 ) ; + Size = MAP_APPFONT ( 84 , 8 ) ; Text = "~Wert" ; Text [ ENGLISH ] = "Value" ; Text [ norwegian ] = "Verdi" ; @@ -250,7 +248,7 @@ TabPage TP_FLD_REF Edit ED_REFVALUE { Border = TRUE ; - Pos = MAP_APPFONT ( 170 , 117 ) ; + Pos = MAP_APPFONT ( 170 , 167 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; TabStop = TRUE ; Disable = TRUE ; diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 2b5f7b964a1f..4e8db6cf9e79 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fldvar.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:37 $ + * last change: $Author: os $ $Date: 2001-02-09 07:44:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -616,9 +616,9 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) Size aSz(aFormatLB.GetSizePixel()); if (bChapterLevel) - aSz.Height() = aFormatLB.LogicToPixel(Size(1, 37), MAP_APPFONT).Height(); + aSz.Height() = aFormatLB.LogicToPixel(Size(1, 94), MAP_APPFONT).Height(); else - aSz.Height() = aFormatLB.LogicToPixel(Size(1, 71), MAP_APPFONT).Height(); + aSz.Height() = aFormatLB.LogicToPixel(Size(1, 123), MAP_APPFONT).Height(); aFormatLB.SetSizePixel(aSz); @@ -1391,6 +1391,9 @@ void SwFldVarPage::FillUserData() /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/18 17:14:37 hr + initial import + Revision 1.54 2000/09/18 16:05:30 willem.vandorp OpenOffice header added. diff --git a/sw/source/ui/fldui/fldvar.src b/sw/source/ui/fldui/fldvar.src index 33b83a487707..04af7a1c7a2e 100644 --- a/sw/source/ui/fldui/fldvar.src +++ b/sw/source/ui/fldui/fldvar.src @@ -2,9 +2,9 @@ * * $RCSfile: fldvar.src,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: kz $ $Date: 2001-01-26 21:43:47 $ + * last change: $Author: os $ $Date: 2001-02-09 07:44:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,13 +68,13 @@ TabPage TP_FLD_VAR HelpID = HID_FLD_VAR ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 135 ) ; + Size = MAP_APPFONT ( 260 , 185 ) ; Text = "Variablen" ; Text [ ENGLISH ] = "Variables" ; FixedText FT_VARTYPE { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 76 , 10 ) ; + Size = MAP_APPFONT ( 76 , 8 ) ; Text = "~Feldtyp" ; Text [ ENGLISH ] = "Type" ; Text [ norwegian ] = "Type" ; @@ -103,8 +103,8 @@ TabPage TP_FLD_VAR ListBox LB_VARTYPE { Border = TRUE ; - Pos = MAP_APPFONT ( 6 , 16 ) ; - Size = MAP_APPFONT ( 76 , 83 ) ; + Pos = MAP_APPFONT ( 6 , 14 ) ; + Size = MAP_APPFONT ( 76 , 135 ) ; TabStop = TRUE ; Sort = FALSE ; AutoHScroll = TRUE ; @@ -139,15 +139,15 @@ TabPage TP_FLD_VAR ListBox LB_VARSELECTION { Border = TRUE ; - Pos = MAP_APPFONT ( 88 , 16 ) ; - Size = MAP_APPFONT ( 76 , 83 ) ; + Pos = MAP_APPFONT ( 88 , 14 ) ; + Size = MAP_APPFONT ( 76 , 135 ) ; TabStop = TRUE ; Sort = TRUE ; }; FixedText FT_VARFORMAT { Pos = MAP_APPFONT ( 170 , 3 ) ; - Size = MAP_APPFONT ( 84 , 10 ) ; + Size = MAP_APPFONT ( 84 , 8 ) ; TEXT = "F~ormat" ; TEXT [ English ] = "Format" ; Left = TRUE ; @@ -174,22 +174,22 @@ TabPage TP_FLD_VAR ListBox LB_VARFORMAT { Border = TRUE ; - Pos = MAP_APPFONT ( 170 , 16 ) ; - Size = MAP_APPFONT ( 84 , 71 ) ; + Pos = MAP_APPFONT ( 170 , 14 ) ; + Size = MAP_APPFONT ( 84 , 123 ) ; TabStop = TRUE ; DropDown = FALSE ; }; ListBox LB_VARNUMFORMAT { Border = TRUE ; - Pos = MAP_APPFONT ( 170 , 16 ) ; - Size = MAP_APPFONT ( 84 , 71 ) ; + Pos = MAP_APPFONT ( 170 , 14 ) ; + Size = MAP_APPFONT ( 84 , 123 ) ; TabStop = TRUE ; DropDown = FALSE ; }; CheckBox CB_VARINVISIBLE { - Pos = MAP_APPFONT ( 170 , 91 ) ; + Pos = MAP_APPFONT ( 170 , 141 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; TEXT = "~Unsichtbar" ; TEXT [ English ] = "Invisible" ; @@ -218,8 +218,8 @@ TabPage TP_FLD_VAR }; FixedText FT_VARCHAPTERHEADER { - Pos = MAP_APPFONT ( 170 , 62 ) ; - Size = MAP_APPFONT ( 84 , 10 ) ; + Pos = MAP_APPFONT ( 170 , 112 ) ; + Size = MAP_APPFONT ( 84 , 8 ) ; Hide = TRUE ; TEXT = "Kapitelweise Nummerierung" ; TEXT [ English ] = "Chapter numbering" ; @@ -245,8 +245,8 @@ TabPage TP_FLD_VAR }; FixedText FT_VARCHAPTERLEVEL { - Pos = MAP_APPFONT ( 175 , 76 ) ; - Size = MAP_APPFONT ( 30 , 10 ) ; + Pos = MAP_APPFONT ( 175 , 125 ) ; + Size = MAP_APPFONT ( 30 , 8 ) ; Hide = TRUE ; TEXT = "E~bene" ; TEXT [ English ] = "Level" ; @@ -274,7 +274,7 @@ TabPage TP_FLD_VAR { Border = TRUE ; Hide = TRUE ; - Pos = MAP_APPFONT ( 208 , 75 ) ; + Pos = MAP_APPFONT ( 208 , 123 ) ; Size = MAP_APPFONT ( 46 , 76 ) ; TabStop = TRUE ; DropDown = TRUE ; @@ -365,7 +365,7 @@ TabPage TP_FLD_VAR }; FixedText FT_VARSEPARATOR { - Pos = MAP_APPFONT ( 175 , 91 ) ; + Pos = MAP_APPFONT ( 175 , 140 ) ; Size = MAP_APPFONT ( 30 , 10 ) ; Hide = TRUE ; TEXT = "~Trenner" ; @@ -392,7 +392,7 @@ TabPage TP_FLD_VAR }; Edit ED_VARSEPARATOR { - Pos = MAP_APPFONT ( 208 , 90 ) ; + Pos = MAP_APPFONT ( 208 , 138 ) ; Size = MAP_APPFONT ( 46 , 12 ) ; Border = TRUE ; Hide = TRUE ; @@ -401,8 +401,8 @@ TabPage TP_FLD_VAR }; FixedText FT_VARNAME { - Pos = MAP_APPFONT ( 6 , 105 ) ; - Size = MAP_APPFONT ( 76 , 10 ) ; + Pos = MAP_APPFONT ( 6 , 155 ) ; + Size = MAP_APPFONT ( 76 , 8 ) ; Text = "Na~me" ; TEXT [ English ] = "Na~me" ; Left = TRUE ; @@ -429,15 +429,15 @@ TabPage TP_FLD_VAR Edit ED_VARNAME { Border = TRUE ; - Pos = MAP_APPFONT ( 6 , 117 ) ; + Pos = MAP_APPFONT ( 6 , 166 ) ; Size = MAP_APPFONT ( 76 , 12 ) ; TabStop = TRUE ; Left = TRUE ; }; FixedText FT_VARVALUE { - Pos = MAP_APPFONT ( 88 , 105 ) ; - Size = MAP_APPFONT ( 76 , 10 ) ; + Pos = MAP_APPFONT ( 88 , 155 ) ; + Size = MAP_APPFONT ( 76 , 8 ) ; Text = "~Wert" ; Text [ ENGLISH ] = "Value" ; Text [ norwegian ] = "Verdi" ; @@ -466,14 +466,14 @@ TabPage TP_FLD_VAR Edit ED_VARVALUE { Border = TRUE ; - Pos = MAP_APPFONT ( 88 , 117 ) ; + Pos = MAP_APPFONT ( 88 , 166 ) ; Size = MAP_APPFONT ( 76 , 12 ) ; TabStop = TRUE ; Left = TRUE ; }; ToolBox TBX_VARNEWDEL { - Pos = MAP_APPFONT ( 167 , 117 ) ; + Pos = MAP_APPFONT ( 167 , 167 ) ; SVLook = TRUE ; Border = FALSE ; ItemList = |