diff options
author | Frank Meies <fme@openoffice.org> | 2001-06-01 09:20:44 +0000 |
---|---|---|
committer | Frank Meies <fme@openoffice.org> | 2001-06-01 09:20:44 +0000 |
commit | c03292c455653d65c411a5bffa59c062a46d4c35 (patch) | |
tree | d576629c0c9fb62a64e13879531904a8b74f5215 /sw/source/ui/inc | |
parent | #86941# get/setRubyList: PositionIsAbove added (diff) | |
download | core-c03292c455653d65c411a5bffa59c062a46d4c35.tar.gz core-c03292c455653d65c411a5bffa59c062a46d4c35.zip |
Fix #86988#: Redesign of dialogs
Diffstat (limited to 'sw/source/ui/inc')
28 files changed, 144 insertions, 213 deletions
diff --git a/sw/source/ui/inc/abstract.hxx b/sw/source/ui/inc/abstract.hxx index 6b86b66b553e..2d019abf9148 100644 --- a/sw/source/ui/inc/abstract.hxx +++ b/sw/source/ui/inc/abstract.hxx @@ -2,9 +2,9 @@ * * $RCSfile: abstract.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:38 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,10 +65,6 @@ #include <sfx2/basedlgs.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif - #ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> #endif @@ -87,7 +83,7 @@ --------------------------------------------------*/ class SwInsertAbstractDlg : public SfxModalDialog { - GroupBox aGB; + FixedLine aFL; FixedText aLevelFT; NumericField aLevelNF; FixedText aParaFT; diff --git a/sw/source/ui/inc/ascfldlg.hxx b/sw/source/ui/inc/ascfldlg.hxx index 2c489b0a6e90..d283b4fc8985 100644 --- a/sw/source/ui/inc/ascfldlg.hxx +++ b/sw/source/ui/inc/ascfldlg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: ascfldlg.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: tl $ $Date: 2001-03-22 10:41:57 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,9 +61,6 @@ #ifndef _ASCFLDLG_HXX #define _ASCFLDLG_HXX -#ifndef _SV_GROUP_HXX -#include <vcl/group.hxx> -#endif #ifndef _SV_FIXED_HXX #include <vcl/fixed.hxx> #endif @@ -89,7 +86,7 @@ class SwDocShell; class SwAsciiFilterDlg : public SfxModalDialog { - GroupBox aGB; + FixedLine aFL; FixedText aCharSetFT; SvxTextEncodingBox aCharSetLB; FixedText aFontFT; diff --git a/sw/source/ui/inc/chartins.hxx b/sw/source/ui/inc/chartins.hxx index fad5a97de0ca..189a2a10cee1 100644 --- a/sw/source/ui/inc/chartins.hxx +++ b/sw/source/ui/inc/chartins.hxx @@ -2,9 +2,9 @@ * * $RCSfile: chartins.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:39 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,7 +61,7 @@ /* /* /* (C) 1995 - 2000 StarDivision GmbH, Hamburg, Germany -/* $Author: hr $ $Date: 2000-09-18 17:14:39 $ $Revision: 1.1.1.1 $ +/* $Author: fme $ $Date: 2001-06-01 10:20:44 $ $Revision: 1.2 $ /* $Logfile: T:/sw/source/ui/inc/chartins.hxv $ $Workfile: CHARTINS.HXX $ /* /* Dialog Einfuegen StarChart @@ -93,10 +93,6 @@ #include <vcl/button.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif - #include "autoedit.hxx" class SfxItemSet; @@ -118,7 +114,7 @@ class SwInsertChartDlg : public SfxModelessDialog PushButton aFinish; CheckBox aFirstRow; CheckBox aFirstCol; - GroupBox aGroup1; + FixedLine aFL1; SchMemChart * pChartData; ModalDialog* pChartDlg; SfxItemSet* pInItemSet; diff --git a/sw/source/ui/inc/chrdlg.hxx b/sw/source/ui/inc/chrdlg.hxx index 8fdb151ba12d..af327e0e4609 100644 --- a/sw/source/ui/inc/chrdlg.hxx +++ b/sw/source/ui/inc/chrdlg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: chrdlg.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:39 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,7 +117,7 @@ public: class SwCharURLPage : public SfxTabPage { - GroupBox aURLGB; + FixedLine aURLFL; FixedText aURLFT; Edit aURLED; @@ -129,7 +129,7 @@ class SwCharURLPage : public SfxTabPage ComboBox aTargetFrmLB; PushButton aURLPB; PushButton aEventPB; - GroupBox aStyleGB; + FixedLine aStyleFL; FixedText aVisitedFT; ListBox aVisitedLB; FixedText aNotVisitedFT; diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/ui/inc/cnttab.hxx index d6d545472bd6..ea09d1332e17 100644 --- a/sw/source/ui/inc/cnttab.hxx +++ b/sw/source/ui/inc/cnttab.hxx @@ -2,9 +2,9 @@ * * $RCSfile: cnttab.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: fme $ $Date: 2001-05-29 13:39:32 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,9 +83,6 @@ #ifndef _SV_LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif #ifndef _SFXTABDLG_HXX //autogen #include <sfx2/tabdlg.hxx> @@ -498,7 +495,7 @@ class SwTOXEntryTabPage : public SfxTabPage Point aRelToStylePos; Point aRelToStyleIdxPos; - Size aLevelGBSize; + Size aLevelFLSize; CurTOXType aLastTOXType; BOOL bInLevelHdl; diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/ui/inc/convert.hxx index e73666a6fc86..ee33fabd0e2a 100644 --- a/sw/source/ui/inc/convert.hxx +++ b/sw/source/ui/inc/convert.hxx @@ -2,9 +2,9 @@ * * $RCSfile: convert.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:39 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,8 +61,8 @@ #ifndef _SW_CONVERT_HXX #define _SW_CONVERT_HXX -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> +#ifndef _SV_FIXED_HXX +#include <vcl/fixed.hxx> #endif #ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> @@ -86,13 +86,13 @@ class SwConvertTableDlg: public SfxModalDialog RadioButton aOtherBtn; Edit aOtherEd; CheckBox aKeepColumn; - GroupBox aDelimFrm; + FixedLine aDelimFL; CheckBox aHeaderCB; CheckBox aRepeatHeaderCB; CheckBox aDontSplitCB; CheckBox aBorderCB; - GroupBox aOptionsGB; + FixedLine aOptionsFL; OKButton aOkBtn; CancelButton aCancelBtn; diff --git a/sw/source/ui/inc/formedt.hxx b/sw/source/ui/inc/formedt.hxx index cccfb99b0c2f..076869573e7c 100644 --- a/sw/source/ui/inc/formedt.hxx +++ b/sw/source/ui/inc/formedt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: formedt.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:40 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,10 +81,6 @@ #include <vcl/edit.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif - #include "toxe.hxx" class SwWrtShell; @@ -118,14 +114,14 @@ class SwIdxFormDlg : public SvxStandardDialog PushButton aTabBT; PushButton aPageBT; PushButton aJumpBT; - GroupBox aEntryGB; + FixedLine aEntryFL; FixedText aLevelFT2; ListBox aLevelLB; FixedText aTemplateFT; ListBox aParaLayLB; PushButton aStdBT; PushButton aAssignBT; - GroupBox aFormatGB; + FixedLine aFormatFL; SwWrtShell &rSh; SwForm *pForm; diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index b71805e60d21..5619462caee4 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -2,9 +2,9 @@ * * $RCSfile: frmpage.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: fme $ $Date: 2001-05-30 16:23:35 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,9 +68,6 @@ #ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif #ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> #endif @@ -215,7 +212,7 @@ public: class SwGrfExtPage: public SfxTabPage { // Spiegeln - GroupBox aMirrorFrm; + FixedLine aMirrorFL; CheckBox aMirrorVertBox; CheckBox aMirrorHorzBox; RadioButton aAllPagesRB; @@ -223,7 +220,7 @@ class SwGrfExtPage: public SfxTabPage RadioButton aRightPagesRB; BmpWindow aBmpWin; - GroupBox aConnectGB; + FixedLine aConnectFL; FixedText aConnectFT; Edit aConnectED; PushButton aBrowseBT; diff --git a/sw/source/ui/inc/inpdlg.hxx b/sw/source/ui/inc/inpdlg.hxx index 6ff63ad02d5f..192c53e67d29 100644 --- a/sw/source/ui/inc/inpdlg.hxx +++ b/sw/source/ui/inc/inpdlg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: inpdlg.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:40 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,11 +74,9 @@ #include <svtools/svmedit.hxx> #endif #endif - -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> +#ifndef _SV_FIXED_HXX +#include <vcl/fixed.hxx> #endif - #ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> #endif @@ -105,7 +103,7 @@ class SwFldInputDlg: public SvxStandardDialog Edit aLabelED; MultiLineEdit aEditED; - GroupBox aEditGB; + FixedLine aEditFL; OKButton aOKBT; CancelButton aCancelBT; diff --git a/sw/source/ui/inc/insfnote.hxx b/sw/source/ui/inc/insfnote.hxx index 9c91d2bc9f01..aeac72738733 100644 --- a/sw/source/ui/inc/insfnote.hxx +++ b/sw/source/ui/inc/insfnote.hxx @@ -2,9 +2,9 @@ * * $RCSfile: insfnote.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:40 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,11 +73,10 @@ #include <vcl/edit.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> +#ifndef _SV_FIXED_HXX +#include <vcl/fixed.hxx> #endif - class SwWrtShell; class SwInsFootNoteDlg: public SvxStandardDialog @@ -94,12 +93,12 @@ class SwInsFootNoteDlg: public SvxStandardDialog RadioButton aNumberCharBtn; Edit aNumberCharEdit; PushButton aNumberExtChar; - GroupBox aNumberFrm; + FixedLine aNumberFL; //Alles fuer die Auswahl Fussnote/Endnote RadioButton aFtnBtn; RadioButton aEndNoteBtn; - GroupBox aTypeBox; + FixedLine aTypeFL; OKButton aOkBtn; CancelButton aCancelBtn; diff --git a/sw/source/ui/inc/insrc.hxx b/sw/source/ui/inc/insrc.hxx index 1414cc02c69d..bf814881e72f 100644 --- a/sw/source/ui/inc/insrc.hxx +++ b/sw/source/ui/inc/insrc.hxx @@ -2,9 +2,9 @@ * * $RCSfile: insrc.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:40 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,10 +73,6 @@ #include <vcl/field.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif - #ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> #endif @@ -98,11 +94,11 @@ class SwInsRowColDlg : public SvxStandardDialog { FixedText aCount; NumericField aCountEdit; - GroupBox aInsGrp; + FixedLine aInsFL; RadioButton aBeforeBtn; RadioButton aAfterBtn; - GroupBox aPosGrp; + FixedLine aPosFL; String aRow; String aCol; diff --git a/sw/source/ui/inc/insrule.hxx b/sw/source/ui/inc/insrule.hxx index 8f59642f44ec..351d7fcb6236 100644 --- a/sw/source/ui/inc/insrule.hxx +++ b/sw/source/ui/inc/insrule.hxx @@ -2,9 +2,9 @@ * * $RCSfile: insrule.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:40 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,7 +74,7 @@ class ValueSet; --------------------------------------------------*/ class SwInsertGrfRulerDlg : public SfxModalDialog { - GroupBox aSelectionGB; + FixedLine aSelectionFL; OKButton aOkPB; CancelButton aCancelPB; HelpButton aHelpPB; diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/ui/inc/instable.hxx index 9539157a6660..0ccd7d7f3615 100644 --- a/sw/source/ui/inc/instable.hxx +++ b/sw/source/ui/inc/instable.hxx @@ -2,9 +2,9 @@ * * $RCSfile: instable.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:40 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,9 +68,6 @@ #ifndef _FIELD_HXX //autogen #include <vcl/field.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif #ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> #endif @@ -89,7 +86,7 @@ class SwTableAutoFmt; class SwInsTableDlg : public SfxModalDialog { TableNameEdit aNameEdit; - GroupBox aNameFrm; + FixedText aNameFT; FixedText aColLbl; NumericField aColEdit; FixedText aRowLbl; @@ -99,9 +96,9 @@ class SwInsTableDlg : public SfxModalDialog CheckBox aRepeatHeaderCB; CheckBox aDontSplitCB; CheckBox aBorderCB; - GroupBox aOptionsGB; + FixedLine aOptionsFL; - GroupBox aFrm; + FixedLine aFL; OKButton aOkBtn; CancelButton aCancelBtn; HelpButton aHelpBtn; diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx index 5afac53b79ca..5ea67668d7ed 100644 --- a/sw/source/ui/inc/javaedit.hxx +++ b/sw/source/ui/inc/javaedit.hxx @@ -2,9 +2,9 @@ * * $RCSfile: javaedit.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:40 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,10 +85,6 @@ #include <vcl/button.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif - #ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> #endif @@ -113,7 +109,7 @@ private: PushButton aUrlPB; Edit aUrlED; MultiLineEdit aEditED; - GroupBox aPostItGB; + FixedLine aPostItFL; OKButton aOKBtn; CancelButton aCancelBtn; diff --git a/sw/source/ui/inc/linenum.hxx b/sw/source/ui/inc/linenum.hxx index d218f5fd26ac..41dc74044419 100644 --- a/sw/source/ui/inc/linenum.hxx +++ b/sw/source/ui/inc/linenum.hxx @@ -2,9 +2,9 @@ * * $RCSfile: linenum.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2001-03-02 14:08:37 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,10 +73,6 @@ #include <vcl/fixed.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif - #ifndef _SV_FIELD_HXX //autogen #include <vcl/field.hxx> #endif @@ -128,17 +124,17 @@ class SwLineNumberingPage : public SfxTabPage FixedText aNumIntervalFT; NumericField aNumIntervalNF; FixedText aNumRowsFT; - GroupBox aDisplayGB; + FixedLine aDisplayFL; FixedText aDivisorFT; Edit aDivisorED; FixedText aDivIntervalFT; NumericField aDivIntervalNF; FixedText aDivRowsFT; - GroupBox aDivisorGB; + FixedLine aDivisorFL; CheckBox aCountEmptyLinesCB; CheckBox aCountFrameLinesCB; CheckBox aRestartEachPageCB; - GroupBox aCountGB; + FixedLine aCountFL; SwWrtShell* pSh; diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/ui/inc/mailmrge.hxx index 678256410260..381efad587f1 100644 --- a/sw/source/ui/inc/mailmrge.hxx +++ b/sw/source/ui/inc/mailmrge.hxx @@ -2,9 +2,9 @@ * * $RCSfile: mailmrge.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2001-03-07 13:41:22 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,11 +76,6 @@ #ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> #endif - -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif - #ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> #endif @@ -110,7 +105,7 @@ class SwMailMergeDlg : public SvxStandardDialog NumericField aFromNF; FixedText aBisFT; NumericField aToNF; - GroupBox aRecordGB; + FixedLine aRecordFL; RadioButton aPrinterRB; RadioButton aMailingRB; @@ -138,7 +133,7 @@ class SwMailMergeDlg : public SvxStandardDialog CheckBox aFormatHtmlCB; CheckBox aFormatRtfCB; CheckBox aFormatSwCB; - GroupBox aDestGB; + FixedLine aDestFL; OKButton aOkBTN; CancelButton aCancelBTN; diff --git a/sw/source/ui/inc/mergetbl.hxx b/sw/source/ui/inc/mergetbl.hxx index ef8481755b06..f192ae4035fb 100644 --- a/sw/source/ui/inc/mergetbl.hxx +++ b/sw/source/ui/inc/mergetbl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: mergetbl.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:41 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,9 +64,11 @@ #ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> + +#ifndef _FIXED_HXX //autogen +#include <vcl/fixed.hxx> #endif + #ifndef _SVX_STDDLG_HXX //autogen #include <svx/stddlg.hxx> #endif @@ -77,7 +79,7 @@ class SwMergeTblDlg : public SvxStandardDialog OKButton aOKPB; CancelButton aCancelPB; HelpButton aHelpPB; - GroupBox aMergeGB; + FixedLine aMergeFL; RadioButton aMergePrevRB; RadioButton aMergeNextRB; diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx index 705b4ad1f51c..9c4ac150cae0 100644 --- a/sw/source/ui/inc/num.hxx +++ b/sw/source/ui/inc/num.hxx @@ -2,9 +2,9 @@ * * $RCSfile: num.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2001-02-09 07:58:34 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,9 +78,6 @@ #ifndef _STDCTRL_HXX //autogen #include <svtools/stdctrl.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif #ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> #endif @@ -147,10 +144,10 @@ class SwBmpNumValueSet; --------------------------------------------------*/ class SwNumPositionTabPage : public SfxTabPage { - GroupBox aLevelGB; + FixedLine aLevelFL; MultiListBox aLevelLB; - GroupBox aPositionGB; + FixedLine aPositionFL; FixedText aDistBorderFT; MetricField aDistBorderMF; CheckBox aRelativeCB; @@ -162,7 +159,6 @@ class SwNumPositionTabPage : public SfxTabPage ListBox aAlignLB; PushButton aStandardPB; - GroupBox aPreviewGB; NumberingPreview aPreviewWIN; SwNumRule* pActNum; diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx index 846d2653115c..b368e034d9b2 100644 --- a/sw/source/ui/inc/optload.hxx +++ b/sw/source/ui/inc/optload.hxx @@ -2,9 +2,9 @@ * * $RCSfile: optload.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2001-05-04 12:05:46 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -104,7 +104,7 @@ class SwWrtShell; class SwLoadOptPage : public SfxTabPage { private: - FixedLine aUpdateGB; + FixedLine aUpdateFL; FixedText aLinkFT; RadioButton aAlwaysRB; RadioButton aRequestRB; @@ -114,18 +114,18 @@ private: CheckBox aAutoUpdateFields; CheckBox aAutoUpdateCharts; - FixedLine aCaptionGB; + FixedLine aCaptionFL; CheckBox aCaptionCB; FixedText aCaptionFT; PushButton aCaptionPB; - FixedLine aSettingsGB; + FixedLine aSettingsFL; FixedText aMetricFT; ListBox aMetricLB; FixedText aTabFT; MetricField aTabMF; - FixedLine aCompatGB; + FixedLine aCompatFL; CheckBox aMergeDistCB; CheckBox aMergeDistPageStartCB; CheckBox aTabAlignment; @@ -196,7 +196,7 @@ private: ListBox aLbLevel; FixedText aFtDelim; Edit aEdDelim; - FixedLine aSettingsGroup; + FixedLine aSettingsGroupFL; String sSWTable; String sSWFrame; diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index 1691d8b9640d..604ea20cd392 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -2,9 +2,9 @@ * * $RCSfile: optpage.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: os $ $Date: 2001-05-16 07:22:32 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,7 +105,7 @@ class SwWrtShell; class SwContentOptPage : public SfxTabPage { //visual aids - FixedLine aLineGB; + FixedLine aLineFL; CheckBox aTxtbegCB; CheckBox aTblbegCB; CheckBox aSectBoundsCB; @@ -114,7 +114,7 @@ class SwContentOptPage : public SfxTabPage CheckBox aBigHandleCB; //view - FixedLine aWindowGB; + FixedLine aWindowFL; CheckBox aHScrollBox; CheckBox aVScrollBox; CheckBox aHRulerCBox; @@ -124,20 +124,20 @@ class SwContentOptPage : public SfxTabPage CheckBox aSmoothCBox; //display - FixedLine aDispBox; + FixedLine aDispFL; CheckBox aGrfCB; CheckBox aTblCB; CheckBox aDrwCB; CheckBox aFldNameCB; CheckBox aPostItCB; //highlighting - FixedLine aBackBox; + FixedLine aBackFL; CheckBox aIdxEntryCB; CheckBox aIdxBackCB; CheckBox aFootBackCB; CheckBox aFldBackCB; - FixedLine aSettingsGB; + FixedLine aSettingsFL; FixedText aMetricFT; ListBox aMetricLB; @@ -161,7 +161,7 @@ public: class SwAddPrinterTabPage : public SfxTabPage { - FixedLine aGroup1; + FixedLine aFL1; CheckBox aGrfCB; CheckBox aTabCB; CheckBox aDrawCB; @@ -171,7 +171,7 @@ class SwAddPrinterTabPage : public SfxTabPage FixedLine aSeparatorLFL; - FixedLine aGroup2; + FixedLine aFL2; CheckBox aLeftPageCB; CheckBox aRightPageCB; CheckBox aReverseCB; @@ -183,8 +183,8 @@ class SwAddPrinterTabPage : public SfxTabPage RadioButton aOnlyRB; RadioButton aEndRB; RadioButton aEndPageRB; - FixedLine aGroup3; - FixedLine aGroup4; + FixedLine aFL3; + FixedLine aFL4; CheckBox aSingleJobsCB; CheckBox aPaperFromSetupCB; FixedText aFaxFT; @@ -221,7 +221,7 @@ public: class SwStdFontTabPage : public SfxTabPage { - FixedLine aStdChrFrm ; + FixedLine aStdChrFL ; FixedText aStandardLbl; ComboBox aStandardBox; FixedText aTitleLbl ; @@ -280,7 +280,7 @@ public: class SwTableOptionsTabPage : public SfxTabPage { - FixedLine aTableGB; + FixedLine aTableFL; CheckBox aHeaderCB; CheckBox aRepeatHeaderCB; CheckBox aDontSplitCB; @@ -288,12 +288,12 @@ class SwTableOptionsTabPage : public SfxTabPage FixedLine aSeparatorFL; - FixedLine aTableInsertGB; + FixedLine aTableInsertFL; CheckBox aNumFormattingCB; CheckBox aNumFmtFormattingCB; CheckBox aNumAlignmentCB; - FixedLine aMoveGB; + FixedLine aMoveFL; FixedText aMoveFT; FixedText aRowMoveFT; MetricField aRowMoveMF; @@ -341,7 +341,7 @@ public: --------------------------------------------------*/ class SwSourceViewOptionsTabPage : public SfxTabPage { - FixedLine aColorGB; + FixedLine aColorFL; FixedText aSGMLFT; ColorListBox aSGMLLB; FixedText aCommentFT; @@ -372,7 +372,7 @@ public: class SwShdwCrsrOptionsTabPage : public SfxTabPage { //nonprinting characters - FixedLine aUnprintBox; + FixedLine aUnprintFL; CheckBox aParaCB; CheckBox aSHyphCB; CheckBox aSpacesCB; @@ -384,7 +384,7 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage FixedLine aSeparatorFL; - FixedLine aFlagGB; + FixedLine aFlagFL; CheckBox aOnOffCB; FixedText aFillModeFT; @@ -396,7 +396,7 @@ class SwShdwCrsrOptionsTabPage : public SfxTabPage FixedText aColorFT; ColorListBox aColorLB; - FixedLine aCrsrOptGB; + FixedLine aCrsrOptFL; CheckBox aCrsrInProtCB; SwShdwCrsrOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); @@ -444,7 +444,7 @@ public: class SwRedlineOptionsTabPage : public SfxTabPage { - FixedLine aInsertGB; + FixedLine aInsertFL; FixedText aInsertFT; FixedText aInsertAttrFT; @@ -467,7 +467,7 @@ class SwRedlineOptionsTabPage : public SfxTabPage ColorListBox aChangedColorLB; SvxFontPrevWindow aChangedPreviewWN; - FixedLine aChangedGB; + FixedLine aChangedFL; FixedText aMarkPosFT; ListBox aMarkPosLB; @@ -514,7 +514,7 @@ public: virtual void Reset( const SfxItemSet& rSet ); private: - FixedLine aTestGBox; + FixedLine aTestFL; CheckBox aTest1CBox; CheckBox aTest2CBox; CheckBox aTest3CBox; diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx index 241ef914d561..4935095ee8dc 100644 --- a/sw/source/ui/inc/outline.hxx +++ b/sw/source/ui/inc/outline.hxx @@ -2,9 +2,9 @@ * * $RCSfile: outline.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2001-03-02 14:08:37 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,10 +79,6 @@ #include <svtools/stdctrl.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif - #ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> #endif @@ -154,7 +150,7 @@ class SwOutlineTabDialog : public SfxTabDialog class SwOutlineSettingsTabPage : public SfxTabPage { ListBox aLevelLB; - GroupBox aLevelGB; + FixedLine aLevelFL; FixedText aCollLbl; ListBox aCollBox; @@ -171,8 +167,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage Edit aSuffixED; FixedText aStartLbl; NumericField aStartEdit; - GroupBox aNumberGrp; - GroupBox aPreviewGB; + FixedLine aNumberFL; NumberingPreview aPreviewWIN; String aNoFmtName; diff --git a/sw/source/ui/inc/rowht.hxx b/sw/source/ui/inc/rowht.hxx index 4357697a786b..d04cb230016b 100644 --- a/sw/source/ui/inc/rowht.hxx +++ b/sw/source/ui/inc/rowht.hxx @@ -2,9 +2,9 @@ * * $RCSfile: rowht.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:41 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,12 +69,12 @@ #include <vcl/field.hxx> #endif -#ifndef _BUTTON_HXX //autogen -#include <vcl/button.hxx> +#ifndef _FIXED_HXX //autogen +#include <vcl/fixed.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> +#ifndef _BUTTON_HXX //autogen +#include <vcl/button.hxx> #endif #ifndef _BUTTON_HXX //autogen @@ -87,7 +87,7 @@ class SwTableHeightDlg : public SvxStandardDialog { MetricField aHeightEdit; CheckBox aAutoHeightCB; - GroupBox aHeightFrm; + FixedLine aHeightFL; OKButton aOKBtn; CancelButton aCancelBtn; HelpButton aHelpBtn; diff --git a/sw/source/ui/inc/selglos.hxx b/sw/source/ui/inc/selglos.hxx index a348d5546b29..902d110c07cc 100644 --- a/sw/source/ui/inc/selglos.hxx +++ b/sw/source/ui/inc/selglos.hxx @@ -2,9 +2,9 @@ * * $RCSfile: selglos.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:42 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,25 +65,23 @@ #include <vcl/dialog.hxx> #endif - #ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> +#ifndef _SV_FIXED_HXX +#include <vcl/fixed.hxx> #endif #ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> #endif - class SwSelGlossaryDlg : public ModalDialog { protected: ListBox aGlosBox; - GroupBox aGlosFrm; + FixedLine aGlosFL; OKButton aOKBtn; CancelButton aCancelBtn; HelpButton aHelpBtn; diff --git a/sw/source/ui/inc/split.hxx b/sw/source/ui/inc/split.hxx index 432e30240bd8..40ed46ca8a58 100644 --- a/sw/source/ui/inc/split.hxx +++ b/sw/source/ui/inc/split.hxx @@ -2,9 +2,9 @@ * * $RCSfile: split.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:42 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,18 +73,10 @@ #include <vcl/field.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif - #ifndef _IMAGEBTN_HXX //autogen #include <vcl/imagebtn.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif - #ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> #endif @@ -95,10 +87,10 @@ class SwSplitTableDlg : public SvxStandardDialog { FixedText aCountLbl; NumericField aCountEdit; - GroupBox aCountFrm; + FixedLine aCountFL; ImageRadioButton aHorzBox; ImageRadioButton aVertBox; - GroupBox aDirFrm; + FixedLine aDirFL; OKButton aOKBtn; CancelButton aCancelBtn; HelpButton aHelpBtn; diff --git a/sw/source/ui/inc/splittbl.hxx b/sw/source/ui/inc/splittbl.hxx index d516ae04188c..e15c876faf58 100644 --- a/sw/source/ui/inc/splittbl.hxx +++ b/sw/source/ui/inc/splittbl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: splittbl.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:42 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,12 +65,12 @@ #include <svx/stddlg.hxx> #endif -#ifndef _BUTTON_HXX //autogen -#include <vcl/button.hxx> +#ifndef _FIXED_HXX //autogen +#include <vcl/fixed.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> +#ifndef _BUTTON_HXX //autogen +#include <vcl/button.hxx> #endif class SwWrtShell; @@ -80,7 +80,7 @@ class SwSplitTblDlg : public SvxStandardDialog OKButton aOKPB; CancelButton aCancelPB; HelpButton aHelpPB; - GroupBox aSplitGB; + FixedLine aSplitFL; RadioButton aCntntCopyRB; RadioButton aBoxAttrCopyWithParaRB ; RadioButton aBoxAttrCopyNoParaRB ; diff --git a/sw/source/ui/inc/srtdlg.hxx b/sw/source/ui/inc/srtdlg.hxx index cbc9ef463efe..44d93f9bfb38 100644 --- a/sw/source/ui/inc/srtdlg.hxx +++ b/sw/source/ui/inc/srtdlg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: srtdlg.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jp $ $Date: 2001-04-24 18:09:30 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,7 +89,7 @@ class SwSortDlg : public SvxStandardDialog FixedText aTypLbl; FixedText aDirLbl; - FixedLine aDirGrp; + FixedLine aDirFL; CheckBox aKeyCB1; NumericField aColEdt1; @@ -109,11 +109,11 @@ class SwSortDlg : public SvxStandardDialog RadioButton aSortUp3RB; RadioButton aSortDn3RB; - FixedLine aSortGrp; + FixedLine aSortFL; RadioButton aColumnRB; RadioButton aRowRB; - FixedLine aDelimGrp; + FixedLine aDelimFL; RadioButton aDelimTabRB; RadioButton aDelimFreeRB; Edit aDelimEdt; diff --git a/sw/source/ui/inc/tautofmt.hxx b/sw/source/ui/inc/tautofmt.hxx index a85da1bcacd2..58efb6353277 100644 --- a/sw/source/ui/inc/tautofmt.hxx +++ b/sw/source/ui/inc/tautofmt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tautofmt.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:42 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,10 +73,6 @@ #include <vcl/lstbox.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif - #ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> #endif @@ -106,13 +102,12 @@ class SwAutoFormatDlg : public SfxModalDialog { FixedText aFtFormat; ListBox aLbFormat; - GroupBox aGbPreview; CheckBox aBtnNumFormat; CheckBox aBtnBorder; CheckBox aBtnFont; CheckBox aBtnPattern; CheckBox aBtnAlignment; - GroupBox aGbFormat; + FixedLine aFLFormat; OKButton aBtnOk; CancelButton aBtnCancel; HelpButton aBtnHelp; diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx index b6f77625d2a2..c7d9fe8a1556 100644 --- a/sw/source/ui/inc/unotools.hxx +++ b/sw/source/ui/inc/unotools.hxx @@ -2,9 +2,9 @@ * * $RCSfile: unotools.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: jp $ $Date: 2001-04-30 15:48:09 $ + * last change: $Author: fme $ $Date: 2001-06-01 10:20:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,9 +71,6 @@ #ifndef _SV_EDIT_HXX //autogen #include <vcl/edit.hxx> #endif -#ifndef _SV_GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif #ifndef _SV_BUTTON_HXX //autogen #include <vcl/button.hxx> #endif @@ -111,7 +108,7 @@ class SwRenameXNamedDlg : public ModalDialog { FixedText aNewNameFT; NoSpaceEdit aNewNameED; - GroupBox aNameGB; + FixedLine aNameFL; OKButton aOk; CancelButton aCancel; HelpButton aHelp; |