diff options
| author | Frank Meies <fme@openoffice.org> | 2001-06-01 10:14:10 +0000 |
|---|---|---|
| committer | Frank Meies <fme@openoffice.org> | 2001-06-01 10:14:10 +0000 |
| commit | 025ffbc65478de7e579b03dad49c536b63ba0c1a (patch) | |
| tree | 6532921fac58baf806c3585f372fd790213a022c | |
| parent | bdcc42b3ffbee3d7a15589cc6d9c01552fe7c297 (diff) | |
Fix #86988#: Redesign of dialogs
33 files changed, 207 insertions, 244 deletions
diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx index 6695b826d138..12c469a7700c 100644 --- a/sw/source/ui/shells/textidx.cxx +++ b/sw/source/ui/shells/textidx.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textidx.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2000-11-03 11:31:19 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:12:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,10 +106,8 @@ #include "wrtsh.hxx" #include "swundo.hxx" // fuer Undo-Ids #include "textsh.hxx" -#include "idx.hxx" #include "idxmrk.hxx" #include "multmrk.hxx" -#include "usridx.hxx" #include "cnttab.hxx" #include "toxmgr.hxx" diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 242bbdd1410b..ab54b1f14935 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -2,9 +2,9 @@ * * $RCSfile: textsh1.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: os $ $Date: 2001-04-18 09:08:49 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:12:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -193,9 +193,6 @@ #ifndef _SWUNDO_HXX #include <swundo.hxx> // fuer Undo-IDs #endif -#ifndef _AUTOFDLG_HXX -#include <autofdlg.hxx> -#endif #ifndef _REFFLD_HXX #include <reffld.hxx> #endif diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx index 8ae229657135..7a50d8e499ff 100644 --- a/sw/source/ui/table/chartins.cxx +++ b/sw/source/ui/table/chartins.cxx @@ -2,9 +2,9 @@ * * $RCSfile: chartins.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2000-12-01 09:33:27 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -148,7 +148,7 @@ SwInsertChartDlg::SwInsertChartDlg( SfxBindings* pBindings, aNext (this, SW_RES(BT_NEXT )), aFirstRow (this, SW_RES(CB_FIRST_ROW)), aFirstCol (this, SW_RES(CB_FIRST_COL)), - aGroup1 (this, SW_RES(GB_1 )), + aFL1 (this, SW_RES(FL_1 )), pChartDlg(0), pWrtShell(pSh), pInItemSet(0), diff --git a/sw/source/ui/table/chartins.hrc b/sw/source/ui/table/chartins.hrc index f83c07c31b77..5af3ea1cb589 100644 --- a/sw/source/ui/table/chartins.hrc +++ b/sw/source/ui/table/chartins.hrc @@ -2,9 +2,9 @@ * * $RCSfile: chartins.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:47 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,6 +76,6 @@ #define BT_PREV 9 #define FT_HORZLINE 10 #define FT_TEXT 11 -#define GB_1 12 +#define FL_1 12 #endif diff --git a/sw/source/ui/table/chartins.src b/sw/source/ui/table/chartins.src index 517e88b6e567..7537d1bdd5ad 100644 --- a/sw/source/ui/table/chartins.src +++ b/sw/source/ui/table/chartins.src @@ -2,9 +2,9 @@ * * $RCSfile: chartins.src,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: vg $ $Date: 2001-05-17 08:26:03 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -202,10 +202,10 @@ ModelessDialog DLG_INSERT_CHART Text[ catalan ] = "Primera c~olumna como etiqueta"; Text[ finnish ] = "~Ensimminen sarake kuvaotsikkona"; }; - GroupBox GB_1 + FixedLine FL_1 { Pos = MAP_APPFONT ( 6 , 56 ) ; - Size = MAP_APPFONT ( 285 , 65 ) ; + Size = MAP_APPFONT ( 285 , 8 ) ; Text = "Auswahl" ; Text [ English ] = "Selection" ; Text [ english_us ] = "Selection" ; diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx index ae2b52cdeb62..ba02e26f61fb 100644 --- a/sw/source/ui/table/colwd.cxx +++ b/sw/source/ui/table/colwd.cxx @@ -2,9 +2,9 @@ * * $RCSfile: colwd.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jp $ $Date: 2000-10-09 16:54:59 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -128,7 +128,7 @@ SwTableWidthDlg::SwTableWidthDlg(Window *pParent, SwTableFUNC &rTableFnc ) : aColEdit(this, SW_RES(ED_COL)), aWidthFT(this, SW_RES(FT_WIDTH)), aWidthEdit(this, SW_RES(ED_WIDTH)), - aWidthFrm(this, SW_RES(GB_WIDTH)), + aWidthFL(this, SW_RES(FL_WIDTH)), aOKBtn(this, SW_RES(BT_OK)), aCancelBtn(this, SW_RES(BT_CANCEL)), aHelpBtn(this, SW_RES(BT_HELP)), @@ -167,6 +167,9 @@ void SwTableWidthDlg::Apply() /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.3 2000/10/09 16:54:59 jp + compiler error + Revision 1.2 2000/10/06 13:37:52 jp should changes: don't use IniManager diff --git a/sw/source/ui/table/colwd.hrc b/sw/source/ui/table/colwd.hrc index 950e861e779b..97a78086d8b4 100644 --- a/sw/source/ui/table/colwd.hrc +++ b/sw/source/ui/table/colwd.hrc @@ -2,9 +2,9 @@ * * $RCSfile: colwd.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:47 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,7 +62,7 @@ #define ED_COL 2 #define FT_WIDTH 3 #define ED_WIDTH 4 -#define GB_WIDTH 5 +#define FL_WIDTH 5 #define BT_OK 100 #define BT_CANCEL 101 diff --git a/sw/source/ui/table/colwd.src b/sw/source/ui/table/colwd.src index 4b61fea41cd7..9ee31e853f3d 100644 --- a/sw/source/ui/table/colwd.src +++ b/sw/source/ui/table/colwd.src @@ -2,9 +2,9 @@ * * $RCSfile: colwd.src,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: vg $ $Date: 2001-05-17 08:28:06 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -151,10 +151,10 @@ ModalDialog DLG_COL_WIDTH First = 100 ; Last = 9999 ; }; - GroupBox GB_WIDTH + FixedLine FL_WIDTH { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 81 , 50 ) ; + Size = MAP_APPFONT ( 81 , 8 ) ; Text = "Breite" ; Text [ ENGLISH ] = "Width" ; Text [ norwegian ] = "Bredde " ; diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index f0c2e798a902..edfeacee6e60 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -2,9 +2,9 @@ * * $RCSfile: convert.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:47 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -132,7 +132,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView ) aTabBtn (this, SW_RES(CB_TAB)), aSemiBtn (this, SW_RES(CB_SEMI)), aParaBtn (this, SW_RES(CB_PARA)), - aDelimFrm (this, SW_RES(GB_DELIM)), + aDelimFL (this, SW_RES(FL_DELIM)), aOtherBtn (this, SW_RES(RB_OTHER)), aOtherEd (this, SW_RES(ED_OTHER)), aKeepColumn (this, SW_RES(CB_KEEPCOLUMN)), @@ -140,7 +140,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView ) aRepeatHeaderCB (this, SW_RES(CB_REPEAT_HEADER)), aDontSplitCB (this, SW_RES(CB_DONT_SPLIT)), aBorderCB (this, SW_RES(CB_BORDER)), - aOptionsGB (this, SW_RES(GB_OPTIONS)), + aOptionsFL (this, SW_RES(FL_OPTIONS)), aOkBtn(this,SW_RES(BT_OK)), aCancelBtn(this,SW_RES(BT_CANCEL)), @@ -169,11 +169,11 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView ) aRepeatHeaderCB .Show(FALSE); aDontSplitCB .Show(FALSE); aBorderCB .Show(FALSE); - aOptionsGB .Show(FALSE); + aOptionsFL .Show(FALSE); //Groesse anpassen Size aSize(GetSizePixel()); - aSize.Height() = aDelimFrm.GetSizePixel().Height() + 2 * aDelimFrm.GetPosPixel().Y(); + aSize.Height() = 8 + aHelpBtn.GetSizePixel().Height() + aHelpBtn.GetPosPixel().Y(); SetOutputSizePixel(aSize); } aKeepColumn.SaveValue(); @@ -241,6 +241,9 @@ IMPL_LINK(SwConvertTableDlg, CheckBoxHdl, CheckBox*, EMPTYARG) /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/18 17:14:47 hr + initial import + Revision 1.39 2000/09/18 16:06:07 willem.vandorp OpenOffice header added. diff --git a/sw/source/ui/table/convert.hrc b/sw/source/ui/table/convert.hrc index 5bc494667987..59ba72ba3882 100644 --- a/sw/source/ui/table/convert.hrc +++ b/sw/source/ui/table/convert.hrc @@ -2,9 +2,9 @@ * * $RCSfile: convert.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:47 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,7 +61,7 @@ #define CB_TAB 1 #define CB_SEMI 3 #define CB_PARA 4 -#define GB_DELIM 5 +#define FL_DELIM 5 #define RB_OTHER 6 #define ED_OTHER 7 #define CB_KEEPCOLUMN 8 @@ -70,7 +70,7 @@ #define CB_REPEAT_HEADER 14 #define CB_DONT_SPLIT 15 #define CB_BORDER 16 -#define GB_OPTIONS 17 +#define FL_OPTIONS 17 #define BT_OK 100 #define BT_CANCEL 101 diff --git a/sw/source/ui/table/convert.src b/sw/source/ui/table/convert.src index 501c468f9998..24306ae93f93 100644 --- a/sw/source/ui/table/convert.src +++ b/sw/source/ui/table/convert.src @@ -2,9 +2,9 @@ * * $RCSfile: convert.src,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: vg $ $Date: 2001-05-17 08:30:05 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -241,10 +241,10 @@ ModalDialog DLG_CONV_TEXT_TABLE Text[ catalan ] = "Mismo an~cho para todas las columnas"; Text[ finnish ] = "Yhtsuuret sarakkeiden leveydet"; }; - GroupBox GB_DELIM + FixedLine FL_DELIM { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 125 , 62 ) ; + Size = MAP_APPFONT ( 125 , 8 ) ; TEXT = "Trennzeichen im Text" ; TEXT [ ENGLISH ] = "Delimiter" ; TEXT [ norwegian ] = "Skilletegn" ; @@ -387,10 +387,10 @@ ModalDialog DLG_CONV_TEXT_TABLE Text[ catalan ] = "~Borde"; Text[ finnish ] = "Reuna"; }; - GroupBox GB_OPTIONS + FixedLine FL_OPTIONS { Pos = MAP_APPFONT ( 6 , 71 ) ; - Size = MAP_APPFONT ( 125 , 69 ) ; + Size = MAP_APPFONT ( 125 , 8 ) ; Text = "Optionen" ; Text [ English ] = "Options" ; Text[ italian ] = "Opzioni"; diff --git a/sw/source/ui/table/insrc.cxx b/sw/source/ui/table/insrc.cxx index d661797cad59..0c181ee06629 100644 --- a/sw/source/ui/table/insrc.cxx +++ b/sw/source/ui/table/insrc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: insrc.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:47 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,10 +105,10 @@ SwInsRowColDlg::SwInsRowColDlg(SwView& rVw, BOOL bCol ) : SvxStandardDialog( rVw.GetWindow(), SW_RES(DLG_INS_ROW_COL) ), aCount( this, SW_RES( FT_COUNT ) ), aCountEdit( this, SW_RES( ED_COUNT ) ), - aInsGrp( this, SW_RES( GB_INS ) ), + aInsFL( this, SW_RES( FL_INS ) ), aBeforeBtn( this, SW_RES( CB_POS_BEFORE ) ), aAfterBtn( this, SW_RES( CB_POS_AFTER ) ), - aPosGrp( this, SW_RES( GB_POS ) ), + aPosFL( this, SW_RES( FL_POS ) ), aRow(SW_RES(STR_ROW)), aCol(SW_RES(STR_COL)), aOKBtn( this, SW_RES( BT_OK ) ), @@ -135,6 +135,9 @@ SwInsRowColDlg::SwInsRowColDlg(SwView& rVw, BOOL bCol ) /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/18 17:14:47 hr + initial import + Revision 1.30 2000/09/18 16:06:08 willem.vandorp OpenOffice header added. diff --git a/sw/source/ui/table/insrc.hrc b/sw/source/ui/table/insrc.hrc index a11b42dfddad..b2d84ac456c5 100644 --- a/sw/source/ui/table/insrc.hrc +++ b/sw/source/ui/table/insrc.hrc @@ -2,9 +2,9 @@ * * $RCSfile: insrc.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:47 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,11 +60,11 @@ ************************************************************************/ #define FT_COUNT 1 #define ED_COUNT 2 -#define GB_INS 3 +#define FL_INS 3 #define CB_POS_BEFORE 10 #define CB_POS_AFTER 11 -#define GB_POS 12 +#define FL_POS 12 #define STR_ROW 20 #define STR_COL 21 diff --git a/sw/source/ui/table/insrc.src b/sw/source/ui/table/insrc.src index 208d5d42014a..53fe71565e40 100644 --- a/sw/source/ui/table/insrc.src +++ b/sw/source/ui/table/insrc.src @@ -2,9 +2,9 @@ * * $RCSfile: insrc.src,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: vg $ $Date: 2001-05-17 08:32:02 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -178,10 +178,10 @@ ModalDialog DLG_INS_ROW_COL First = 1 ; Last = 5 ; }; - GroupBox GB_INS + FixedLine FL_INS { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 63 , 32 ) ; + Size = MAP_APPFONT ( 63 , 8 ) ; /* ### ACHTUNG: Neuer Text in Resource? Einfgen : Einfgen */ Text = "Einfgen" ; Text [ ENGLISH ] = "Insert" ; @@ -208,10 +208,10 @@ ModalDialog DLG_INS_ROW_COL Text[ language_user1 ] = " "; Text[ catalan ] = "Insertar"; }; - GroupBox GB_POS + FixedLine FL_POS { Pos = MAP_APPFONT ( 6 , 38 ) ; - Size = MAP_APPFONT ( 63 , 40 ) ; + Size = MAP_APPFONT ( 63 , 8 ) ; Text = "Position" ; }; FixedText FT_COUNT diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx index adfe7c2f197a..43d605e0e16c 100644 --- a/sw/source/ui/table/instable.cxx +++ b/sw/source/ui/table/instable.cxx @@ -2,9 +2,9 @@ * * $RCSfile: instable.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2001-02-28 09:09:32 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,17 +116,17 @@ void SwInsTableDlg::GetValues( String& rName, USHORT& rRow, USHORT& rCol, SwInsTableDlg::SwInsTableDlg( SwView& rView ) : SfxModalDialog( rView.GetWindow(), SW_RES(DLG_INSERT_TABLE) ), aNameEdit (this, SW_RES(ED_NAME)), - aNameFrm (this, SW_RES(GB_NAME)), + aNameFT (this, SW_RES(FT_NAME)), aColLbl (this, SW_RES(FT_COL)), aColEdit (this, SW_RES(ED_COL)), aRowLbl (this, SW_RES(FT_ROW)), aRowEdit (this, SW_RES(ED_ROW)), - aFrm (this, SW_RES(GB_TABLE)), + aFL (this, SW_RES(FL_TABLE)), aHeaderCB (this, SW_RES(CB_HEADER)), aRepeatHeaderCB (this, SW_RES(CB_REPEAT_HEADER)), aDontSplitCB (this, SW_RES(CB_DONT_SPLIT)), aBorderCB (this, SW_RES(CB_BORDER)), - aOptionsGB (this, SW_RES(GB_OPTIONS)), + aOptionsFL (this, SW_RES(FL_OPTIONS)), aOkBtn (this, SW_RES(BT_OK)), aCancelBtn (this, SW_RES(BT_CANCEL)), aHelpBtn (this, SW_RES(BT_HELP)), @@ -225,6 +225,9 @@ IMPL_LINK(SwInsTableDlg, CheckBoxHdl, CheckBox*, EMPTYARG) /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.2 2001/02/28 09:09:32 os + #83804# no split in HTML + Revision 1.1.1.1 2000/09/18 17:14:47 hr initial import diff --git a/sw/source/ui/table/instable.hrc b/sw/source/ui/table/instable.hrc index ead7f91dbbe2..33da3d6f3e4e 100644 --- a/sw/source/ui/table/instable.hrc +++ b/sw/source/ui/table/instable.hrc @@ -2,9 +2,9 @@ * * $RCSfile: instable.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:47 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,14 +63,14 @@ #define FT_ROW 2 #define ED_COL 4 #define ED_ROW 5 -#define GB_TABLE 10 +#define FL_TABLE 10 #define ED_NAME 11 -#define GB_NAME 12 +#define FT_NAME 12 #define CB_HEADER 13 #define CB_REPEAT_HEADER 14 #define CB_DONT_SPLIT 15 #define CB_BORDER 16 -#define GB_OPTIONS 17 +#define FL_OPTIONS 17 #define BT_OK 20 #define BT_CANCEL 21 diff --git a/sw/source/ui/table/instable.src b/sw/source/ui/table/instable.src index e71706435d79..81fe446e3d8a 100644 --- a/sw/source/ui/table/instable.src +++ b/sw/source/ui/table/instable.src @@ -2,9 +2,9 @@ * * $RCSfile: instable.src,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: vg $ $Date: 2001-05-17 08:33:30 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,7 +69,7 @@ ModalDialog DLG_INSERT_TABLE HelpID = FN_INSERT_TABLE ; OutputSize = TRUE ; SVLook = TRUE ; - Size = MAP_APPFONT ( 280 , 110 ) ; + Size = MAP_APPFONT ( 280 , 132 ) ; Text = "Tabelle einfgen" ; Text [ ENGLISH ] = "Insert table" ; Text [ norwegian ] = "Insert table" ; @@ -87,14 +87,14 @@ ModalDialog DLG_INSERT_TABLE Edit ED_NAME { Border = TRUE ; - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 199, 12 ) ; + Pos = MAP_APPFONT ( 53 , 6 ) ; + Size = MAP_APPFONT ( 158, 12 ) ; TabStop = TRUE ; }; - GroupBox GB_NAME + FixedText FT_NAME { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 211, 30 ) ; + Pos = MAP_APPFONT ( 6 , 8 ) ; + Size = MAP_APPFONT ( 45, 8 ) ; Text = "Name" ; Text[ENGLISH] = "Name" ; Text[ italian ] = "Nome"; @@ -121,8 +121,8 @@ ModalDialog DLG_INSERT_TABLE }; FixedText FT_COL { - Pos = MAP_APPFONT ( 11 , 49 ) ; - Size = MAP_APPFONT ( 39 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 34 ) ; + Size = MAP_APPFONT ( 39 , 8 ) ; Text = "~Spalten" ; Text [ ENGLISH ] = "~Columns" ; Text [ norwegian ] = "~Columns" ; @@ -152,7 +152,7 @@ ModalDialog DLG_INSERT_TABLE NumericField ED_COL { Border = TRUE ; - Pos = MAP_APPFONT ( 53 , 47 ) ; + Pos = MAP_APPFONT ( 53 , 32 ) ; Size = MAP_APPFONT ( 28 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -166,8 +166,8 @@ ModalDialog DLG_INSERT_TABLE }; FixedText FT_ROW { - Pos = MAP_APPFONT ( 11 , 69 ) ; - Size = MAP_APPFONT ( 39 , 10 ) ; + Pos = MAP_APPFONT ( 12 , 50 ) ; + Size = MAP_APPFONT ( 39 , 8 ) ; Text = "~Zeilen" ; Text [ ENGLISH ] = "~Rows" ; Text [ norwegian ] = "~Rows" ; @@ -197,7 +197,7 @@ ModalDialog DLG_INSERT_TABLE NumericField ED_ROW { Border = TRUE ; - Pos = MAP_APPFONT ( 53 , 67 ) ; + Pos = MAP_APPFONT ( 53 , 48 ) ; Size = MAP_APPFONT ( 28 , 12 ) ; TabStop = TRUE ; Left = TRUE ; @@ -209,38 +209,16 @@ ModalDialog DLG_INSERT_TABLE First = 1 ; Last = 99 ; }; - GroupBox GB_TABLE + FixedLine FL_TABLE { - Pos = MAP_APPFONT ( 6 , 36 ) ; - Size = MAP_APPFONT ( 81 , 68 ) ; - Text = "Gre" ; + Pos = MAP_APPFONT ( 6 , 21 ) ; + Size = MAP_APPFONT ( 212 , 8 ) ; + Text = "Tabellengre" ; Text [ ENGLISH ] = "Size" ; - Text [ norwegian ] = "Strrelse" ; - Text [ italian ] = "Dimensione" ; - Text [ portuguese_brazilian ] = "Tamanho" ; - Text [ portuguese ] = "Tamanho" ; - Text [ finnish ] = "Koko" ; - Text [ danish ] = "Strrelse" ; - Text [ french ] = "Taille" ; - Text [ swedish ] = "Storlek" ; - Text [ dutch ] = "Grootte" ; - Text [ spanish ] = "Tamao" ; - Text [ english_us ] = "Size" ; - Text[ chinese_simplified ] = "С"; - Text[ russian ] = ""; - Text[ polish ] = "Rozmiar"; - Text[ japanese ] = ""; - Text[ chinese_traditional ] = "jp"; - Text[ arabic ] = ""; - Text[ greek ] = ""; - Text[ korean ] = "ũ"; - Text[ turkish ] = "Boyut"; - Text[ language_user1 ] = " "; - Text[ catalan ] = "Tamao"; }; CheckBox CB_HEADER { - Pos = MAP_APPFONT ( 99 , 49 ) ; + Pos = MAP_APPFONT ( 12 , 74 ) ; Size = MAP_APPFONT (113 , 10 ) ; Text = "be~rschrift" ; Text [ ENGLISH ] = "Header" ; @@ -269,7 +247,7 @@ ModalDialog DLG_INSERT_TABLE }; CheckBox CB_REPEAT_HEADER { - Pos = MAP_APPFONT ( 105 , 62 ) ; + Pos = MAP_APPFONT ( 18 , 88 ) ; Size = MAP_APPFONT ( 107 , 10 ) ; Text = "Auf jeder Seite ~wiederholen" ; Text [ ENGLISH ] = "Repeat on every page" ; @@ -298,7 +276,7 @@ ModalDialog DLG_INSERT_TABLE }; CheckBox CB_DONT_SPLIT { - Pos = MAP_APPFONT ( 99 , 75 ) ; + Pos = MAP_APPFONT ( 12 , 102 ) ; Size = MAP_APPFONT ( 113 , 10 ) ; Text = "Tabelle ~nicht trennen" ; Text [ ENGLISH ] = "Don't split table" ; @@ -327,7 +305,7 @@ ModalDialog DLG_INSERT_TABLE }; CheckBox CB_BORDER { - Pos = MAP_APPFONT ( 99 , 88 ) ; + Pos = MAP_APPFONT ( 12 , 116 ) ; Size = MAP_APPFONT ( 113 , 10 ) ; Text = "~Umrandung" ; Text [ ENGLISH ] = "Border" ; @@ -354,10 +332,10 @@ ModalDialog DLG_INSERT_TABLE Text[ catalan ] = "~Borde"; Text[ finnish ] = "Reuna"; }; - GroupBox GB_OPTIONS + FixedLine FL_OPTIONS { - Pos = MAP_APPFONT ( 93 , 36 ) ; - Size = MAP_APPFONT ( 125 , 68 ) ; + Pos = MAP_APPFONT ( 6 , 63 ) ; + Size = MAP_APPFONT ( 212 , 8 ) ; Text = "Optionen" ; Text [ English ] = "Options" ; Text[ italian ] = "Opzioni"; diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx index b84a3a767939..43fbe5f61d38 100644 --- a/sw/source/ui/table/mergetbl.cxx +++ b/sw/source/ui/table/mergetbl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mergetbl.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:48 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,7 @@ SwMergeTblDlg::SwMergeTblDlg( Window *pParent, BOOL& rWithPrev ) aOKPB( this, ResId(PB_OK )), aCancelPB( this, ResId(PB_CANCEL )), aHelpPB( this, ResId(PB_HELP )), - aMergeGB( this, ResId(GB_MERGE )), + aMergeFL( this, ResId(FL_MERGE )), aMergePrevRB( this, ResId(RB_MERGE_PREV)), aMergeNextRB( this, ResId(RB_MERGE_NEXT)), rMergePrev( rWithPrev ) @@ -102,6 +102,9 @@ void SwMergeTblDlg::Apply() /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/18 17:14:48 hr + initial import + Revision 1.3 2000/09/18 16:06:08 willem.vandorp OpenOffice header added. diff --git a/sw/source/ui/table/mergetbl.hrc b/sw/source/ui/table/mergetbl.hrc index 34376e06b450..01b8c8a0d010 100644 --- a/sw/source/ui/table/mergetbl.hrc +++ b/sw/source/ui/table/mergetbl.hrc @@ -2,9 +2,9 @@ * * $RCSfile: mergetbl.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:48 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,6 +61,6 @@ #define PB_OK 1 #define PB_CANCEL 2 #define PB_HELP 3 -#define GB_MERGE 4 +#define FL_MERGE 4 #define RB_MERGE_PREV 5 #define RB_MERGE_NEXT 6 diff --git a/sw/source/ui/table/mergetbl.src b/sw/source/ui/table/mergetbl.src index 6a39bdab4154..c012e4971982 100644 --- a/sw/source/ui/table/mergetbl.src +++ b/sw/source/ui/table/mergetbl.src @@ -2,9 +2,9 @@ * * $RCSfile: mergetbl.src,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: kz $ $Date: 2001-05-10 06:53:01 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,10 +91,10 @@ ModalDialog DLG_MERGE_TABLE Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; - GroupBox GB_MERGE + FixedLine FL_MERGE { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 139 , 51 ) ; + Size = MAP_APPFONT ( 139 , 8 ) ; Text = "Modus" ; Text [ ENGLISH ] = "Mode" ; Text [ english_us ] = "Mode" ; diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx index 1adaaed116cd..05b155a6208b 100644 --- a/sw/source/ui/table/rowht.cxx +++ b/sw/source/ui/table/rowht.cxx @@ -2,9 +2,9 @@ * * $RCSfile: rowht.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: jp $ $Date: 2000-10-09 16:54:59 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -143,7 +143,7 @@ SwTableHeightDlg::SwTableHeightDlg( Window *pParent, SwWrtShell &rS ) : aHeightEdit(this, SW_RES(ED_HEIGHT)), aAutoHeightCB(this, SW_RES(CB_AUTOHEIGHT)), - aHeightFrm(this, SW_RES(GB_HEIGHT)), + aHeightFL(this, SW_RES(FL_HEIGHT)), aOKBtn(this, SW_RES(BT_OK)), aCancelBtn(this, SW_RES(BT_CANCEL)), aHelpBtn( this, SW_RES( BT_HELP ) ), @@ -173,6 +173,9 @@ SwTableHeightDlg::SwTableHeightDlg( Window *pParent, SwWrtShell &rS ) : /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.3 2000/10/09 16:54:59 jp + compiler error + Revision 1.2 2000/10/06 13:37:52 jp should changes: don't use IniManager diff --git a/sw/source/ui/table/rowht.hrc b/sw/source/ui/table/rowht.hrc index 77f5306896e0..68cde29f0de6 100644 --- a/sw/source/ui/table/rowht.hrc +++ b/sw/source/ui/table/rowht.hrc @@ -2,9 +2,9 @@ * * $RCSfile: rowht.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:48 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -60,7 +60,7 @@ ************************************************************************/ #define ED_HEIGHT 1 #define CB_AUTOHEIGHT 2 -#define GB_HEIGHT 3 +#define FL_HEIGHT 3 #define BT_OK 100 #define BT_CANCEL 101 diff --git a/sw/source/ui/table/rowht.src b/sw/source/ui/table/rowht.src index 7ba0d13828ef..5670871d3f15 100644 --- a/sw/source/ui/table/rowht.src +++ b/sw/source/ui/table/rowht.src @@ -2,9 +2,9 @@ * * $RCSfile: rowht.src,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2001-05-30 20:12:27 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -122,8 +122,8 @@ ModalDialog DLG_ROW_HEIGHT }; CheckBox CB_AUTOHEIGHT { - Pos = MAP_APPFONT ( 12 , 31 ) ; - Size = MAP_APPFONT ( 80 , 12 ) ; + Pos = MAP_APPFONT ( 12 , 34 ) ; + Size = MAP_APPFONT ( 80 , 10 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~dynamisch anpassen : auto. H~he */ Text = "~dynamisch anpassen" ; Text [ ENGLISH ] = "~dynamic adjustment" ; @@ -149,10 +149,10 @@ ModalDialog DLG_ROW_HEIGHT Text[ catalan ] = "~ajuste dinmico"; Text[ finnish ] = "~Sovita kokoon"; }; - GroupBox GB_HEIGHT + FixedLine FL_HEIGHT { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 89 , 51 ) ; + Size = MAP_APPFONT ( 89 , 8 ) ; Text = "Hhe" ; Text [ ENGLISH ] = "Height" ; Text [ norwegian ] = "Hyde " ; diff --git a/sw/source/ui/table/splittbl.cxx b/sw/source/ui/table/splittbl.cxx index 276347e0810a..6a660ad6eddd 100644 --- a/sw/source/ui/table/splittbl.cxx +++ b/sw/source/ui/table/splittbl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: splittbl.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:48 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,7 @@ SwSplitTblDlg::SwSplitTblDlg( Window *pParent, SwWrtShell &rSh ) : aOKPB( this, ResId(PB_OK )), aCancelPB( this, ResId(PB_CANCEL )), aHelpPB( this, ResId(PB_HELP )), - aSplitGB( this, ResId(GB_SPLIT )), + aSplitFL( this, ResId(FL_SPLIT )), aCntntCopyRB( this, ResId(RB_CNTNT )), aBoxAttrCopyWithParaRB( this, ResId(RB_BOX_PARA )), aBoxAttrCopyNoParaRB( this, ResId(RB_BOX_NOPARA)), @@ -116,6 +116,9 @@ void SwSplitTblDlg::Apply() /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/18 17:14:48 hr + initial import + Revision 1.4 2000/09/18 16:06:09 willem.vandorp OpenOffice header added. diff --git a/sw/source/ui/table/splittbl.hrc b/sw/source/ui/table/splittbl.hrc index be5c9d2410ca..8ece04a8abba 100644 --- a/sw/source/ui/table/splittbl.hrc +++ b/sw/source/ui/table/splittbl.hrc @@ -2,9 +2,9 @@ * * $RCSfile: splittbl.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:48 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,7 +61,7 @@ #define PB_OK 1 #define PB_CANCEL 2 #define PB_HELP 3 -#define GB_SPLIT 4 +#define FL_SPLIT 4 #define RB_CNTNT 5 #define RB_BOX_NOPARA 6 #define RB_BOX_PARA 7 diff --git a/sw/source/ui/table/splittbl.src b/sw/source/ui/table/splittbl.src index 15b9ada21f1b..903b9aee371d 100644 --- a/sw/source/ui/table/splittbl.src +++ b/sw/source/ui/table/splittbl.src @@ -2,9 +2,9 @@ * * $RCSfile: splittbl.src,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: vg $ $Date: 2001-05-17 08:40:18 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,10 +91,10 @@ ModalDialog DLG_SPLIT_TABLE Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; }; - GroupBox GB_SPLIT + FixedLine FL_SPLIT { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 139 , 70 ) ; + Size = MAP_APPFONT ( 139 , 8 ) ; Text = "Modus" ; Text [ ENGLISH ] = "Mode" ; Text [ english_us ] = "Mode" ; diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 531d789469bf..1d706ee64b16 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tabledlg.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: os $ $Date: 2001-03-21 10:08:51 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -237,15 +237,15 @@ SwFormatTablePage::SwFormatTablePage( Window* pParent, const SfxItemSet& rSet ) aTopMF(this, SW_RES( ED_TOP_DIST )), aBottomFT(this, SW_RES( FT_BOTTOM_DIST )), aBottomMF(this, SW_RES( ED_BOTTOM_DIST )), - aDistGB(this, SW_RES( GB_DIST )), - aOptionsGB(this, SW_RES( GB_OPTIONS )), + aDistFL(this, SW_RES( FL_DIST )), + aOptionsFL(this, SW_RES( FL_OPTIONS )), aFullBtn(this, SW_RES( RB_FULL )), aFreeBtn(this, SW_RES( RB_FREE )), aLeftBtn(this, SW_RES( RB_LEFT )), aFromLeftBtn(this, SW_RES( RB_FROM_LEFT )), aRightBtn(this, SW_RES( RB_RIGHT )), aCenterBtn(this, SW_RES( RB_CENTER )), - aPosFrm(this, SW_RES( GB_POS )), + aPosFL(this, SW_RES( FL_POS )), pTblData(0), nSaveWidth(0), nMinTableWidth(MINLAY), @@ -919,7 +919,7 @@ SwTableColumnPage::SwTableColumnPage( Window* pParent, aMF5(this, SW_RES(COL_MF_5)), aFT6(this, SW_RES(COL_FT_6)), aMF6(this, SW_RES(COL_MF_6)), - aColGB(this, SW_RES(COL_GB_LAYOUT)), + aColFL(this, SW_RES(COL_FL_LAYOUT)), aUpBtn(this, SW_RES(COL_BTN_UP)), aDownBtn(this, SW_RES(COL_BTN_DOWN)), nNoOfCols( 0 ), @@ -1635,7 +1635,7 @@ DEBUG_TBLDLG_TCOLUMN(pOldTColumns, nAllCols); SwTextFlowPage::SwTextFlowPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, SW_RES( TP_TABLE_TEXTFLOW ), rSet ), - aFlowGB (this, SW_RES(GB_FLOW )), + aFlowFL (this, SW_RES(FL_FLOW )), aPgBrkCB (this, SW_RES(CB_PAGEBREAK )), aPgBrkRB (this, SW_RES(RB_BREAKPAGE )), aColBrkRB (this, SW_RES(RB_BREAKCOLUMN )), @@ -1648,7 +1648,7 @@ SwTextFlowPage::SwTextFlowPage( Window* pParent, aKeepCB (this, SW_RES(CB_KEEP )), aSplitCB (this, SW_RES(CB_SPLIT )), aHeadLineCB (this, SW_RES(CB_HEADLINE )), - aVertOrientGB (this, SW_RES(GB_VERT_ORIENT )), + aVertOrientFL (this, SW_RES(FL_VERT_ORIENT )), aTopRB (this, SW_RES(RB_VERT_TOP )), aCenterRB (this, SW_RES(RB_VERT_CENTER )), aBottomRB (this, SW_RES(RB_VERT_BOTTOM )), diff --git a/sw/source/ui/table/tabledlg.hrc b/sw/source/ui/table/tabledlg.hrc index c2699e5ba9c5..795703d66c8c 100644 --- a/sw/source/ui/table/tabledlg.hrc +++ b/sw/source/ui/table/tabledlg.hrc @@ -2,9 +2,9 @@ * * $RCSfile: tabledlg.hrc,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2001-02-09 07:59:25 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,14 +61,14 @@ #include "globals.hrc" #define ED_WIDTH 1 -#define GB_WIDTH 3 +#define FL_WIDTH 3 #define CB_REL_WIDTH 4 #define RB_LEFT 10 #define RB_RIGHT 11 #define RB_CENTER 12 #define RB_FREE 13 #define RB_FULL 14 -#define GB_POS 15 +#define FL_POS 15 #define ED_LEFT_DIST 51 #define ED_RIGHT_DIST 52 #define FT_RIGHT_DIST 53 @@ -77,7 +77,7 @@ #define ED_TOP_DIST 21 #define FT_BOTTOM_DIST 22 #define ED_BOTTOM_DIST 23 -#define GB_DIST 24 +#define FL_DIST 24 #define FT_WIDTH 25 #define FT_SCOL 30 #define DLB_SCOL 31 @@ -85,16 +85,16 @@ #define DLB_SPOS 33 #define FT_SSZ 34 #define ED_SSZ 36 -#define GB_SHADE 37 +#define FL_SHADE 37 #define CB_HEADLINE 40 -#define GB_HEADLINE 41 +#define FL_HEADLINE 41 #define BT_OK 100 #define BT_CANCEL 101 #define BT_MORE 102 #define ED_NAME 103 #define FT_NAME 104 -#define GB_OPTIONS 105 -#define GB_NAME 106 +#define FL_OPTIONS 105 +#define FL_NAME 106 #define COL_FT_1 107 #define COL_MF_1 108 #define COL_FT_2 109 @@ -107,7 +107,7 @@ #define COL_MF_5 116 #define COL_FT_6 117 #define COL_MF_6 118 -#define COL_GB_LAYOUT 119 +#define COL_FL_LAYOUT 119 #define COL_BTN_UP 120 #define COL_BTN_DOWN 121 #define CB_MOD_TBL 122 @@ -116,7 +116,7 @@ #define FT_SPACE 125 #define ED_SPACE 126 -#define GB_FLOW 130 +#define FL_FLOW 130 #define CB_PAGEBREAK 131 #define RB_BREAKPAGE 132 #define RB_BREAKCOLUMN 133 @@ -129,7 +129,7 @@ #define CB_KEEP 144 #define CB_SPLIT 145 -#define GB_VERT_ORIENT 140 +#define FL_VERT_ORIENT 140 #define RB_VERT_TOP 141 #define RB_VERT_CENTER 142 #define RB_VERT_BOTTOM 143 diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src index a2bb10f7f946..802a9754b0cf 100644 --- a/sw/source/ui/table/tabledlg.src +++ b/sw/source/ui/table/tabledlg.src @@ -2,9 +2,9 @@ * * $RCSfile: tabledlg.src,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: vg $ $Date: 2001-05-17 08:44:11 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -373,10 +373,10 @@ TabPage TP_FORMAT_TABLE Text[ catalan ] = "Relati~vo"; Text[ finnish ] = "~Suhteellinen"; }; - GroupBox GB_OPTIONS + FixedLine FL_OPTIONS { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 184 , 42 ) ; + Size = MAP_APPFONT ( 184 , 8 ) ; Text = "Eigenschaften" ; Text [ ENGLISH ] = "Options" ; Text [ norwegian ] = "Options" ; @@ -404,7 +404,7 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_FULL { - Pos = MAP_APPFONT ( 199 , 14 ) ; + Pos = MAP_APPFONT ( 202 , 14 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; TabStop = TRUE ; Text = "~Automatisch" ; @@ -433,7 +433,7 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_LEFT { - Pos = MAP_APPFONT ( 199 , 28 ) ; + Pos = MAP_APPFONT ( 202 , 28 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text = "~Links" ; Text [ ENGLISH ] = "~Left" ; @@ -463,7 +463,7 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_FROM_LEFT { - Pos = MAP_APPFONT ( 199 , 42 ) ; + Pos = MAP_APPFONT ( 202 , 42 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text = "Von l~inks" ; Text [ ENGLISH ] = "~From left" ; @@ -491,7 +491,7 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_RIGHT { - Pos = MAP_APPFONT ( 199 , 56 ) ; + Pos = MAP_APPFONT ( 202 , 56 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text = "~Rechts" ; Text [ ENGLISH ] = "~Right" ; @@ -521,7 +521,7 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_CENTER { - Pos = MAP_APPFONT ( 199 , 70 ) ; + Pos = MAP_APPFONT ( 202 , 70 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text = "Zen~triert" ; Text [ ENGLISH ] = "~Centered" ; @@ -551,7 +551,7 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_FREE { - Pos = MAP_APPFONT ( 199 , 84 ) ; + Pos = MAP_APPFONT ( 202 , 84 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text = "~Manuell" ; Text [ ENGLISH ] = "~Manual" ; @@ -578,10 +578,10 @@ TabPage TP_FORMAT_TABLE Text[ catalan ] = "~Manual"; Text[ finnish ] = "~Manuaalinen"; }; - GroupBox GB_POS + FixedLine FL_POS { - Pos = MAP_APPFONT ( 193 , 3 ) ; - Size = MAP_APPFONT ( 61 , 119 ) ; + Pos = MAP_APPFONT ( 196 , 3 ) ; + Size = MAP_APPFONT ( 58 , 8 ) ; Text = "Ausrichtung" ; Text [ ENGLISH ] = "Position" ; Text [ norwegian ] = "Posisjon" ; @@ -607,10 +607,10 @@ TabPage TP_FORMAT_TABLE Text[ turkish ] = "Hizalama"; Text[ catalan ] = "Alineacin"; }; - GroupBox GB_DIST + FixedLine FL_DIST { Pos = MAP_APPFONT ( 6 , 48 ) ; - Size = MAP_APPFONT ( 184 , 74 ) ; + Size = MAP_APPFONT ( 184 , 8 ) ; Text = "Abstnde" ; Text [ ENGLISH ] = "Distance" ; Text [ norwegian ] = "Avstand" ; @@ -1113,10 +1113,10 @@ TabPage TP_TABLE_COLUMN Last = 5600 ; SpinSize = 10 ; }; - GroupBox COL_GB_LAYOUT + FixedLine COL_FL_LAYOUT { Pos = MAP_APPFONT ( 6 , 50 ) ; - Size = MAP_APPFONT ( 240 , 49 ) ; + Size = MAP_APPFONT ( 240 , 8 ) ; Text = "Spaltenbreite" ; Text [ ENGLISH ] = "Column width" ; Text [ norwegian ] = "Bredde p kolonne " ; @@ -1154,10 +1154,10 @@ TabPage TP_TABLE_TEXTFLOW Size = MAP_APPFONT ( 260 , 185 ) ; TEXT_TEXTFLOW Hide = TRUE; - GroupBox GB_FLOW + FixedLine FL_FLOW { Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 251 , 96 ) ; + Size = MAP_APPFONT ( 251 , 8 ) ; TEXT_TEXTFLOW }; CheckBox CB_PAGEBREAK @@ -1486,10 +1486,10 @@ TabPage TP_TABLE_TEXTFLOW Text[ language_user1 ] = " "; Text[ catalan ] = "Repet~ir encabezado"; }; - GroupBox GB_VERT_ORIENT + FixedLine FL_VERT_ORIENT { Pos = MAP_APPFONT ( 6 , 102 ) ; - Size = MAP_APPFONT ( 251 , 52 ) ; + Size = MAP_APPFONT ( 251 , 8 ) ; Text = "Vertikale Ausrichtung" ; Text [ ENGLISH ] = "Vertical Alignment" ; Text [ english_us ] = "Vertical alignment" ; diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx index 484e4cf6f04c..709458a1d78a 100644 --- a/sw/source/ui/table/tablepg.hxx +++ b/sw/source/ui/table/tablepg.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tablepg.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: os $ $Date: 2001-02-09 07:59:25 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,9 +64,6 @@ #ifndef _SFXTABDLG_HXX //autogen #include <sfx2/tabdlg.hxx> #endif -#ifndef _GROUP_HXX //autogen -#include <vcl/group.hxx> -#endif #ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> #endif @@ -95,14 +92,14 @@ struct TColumn class SwFormatTablePage : public SfxTabPage { - GroupBox aOptionsGB; + FixedLine aOptionsFL; FixedText aNameFT; TableNameEdit aNameED; FixedText aWidthFT; PercentField aWidthMF; CheckBox aRelWidthCB; - GroupBox aPosFrm; + FixedLine aPosFL; RadioButton aFullBtn; RadioButton aLeftBtn; RadioButton aFromLeftBtn; @@ -110,7 +107,7 @@ class SwFormatTablePage : public SfxTabPage RadioButton aCenterBtn; RadioButton aFreeBtn; - GroupBox aDistGB; + FixedLine aDistFL; FixedText aLeftFT; PercentField aLeftMF; FixedText aRightFT; @@ -173,7 +170,7 @@ class SwTableColumnPage : public SfxTabPage FixedText aFT6; PercentField aMF6; ImageButton aDownBtn; - GroupBox aColGB; + FixedLine aColFL; SwTableRep* pTblData; PercentField* pFieldArr[MET_FIELDS]; @@ -215,7 +212,7 @@ public: --------------------------------------------------*/ class SwTextFlowPage : public SfxTabPage { - GroupBox aFlowGB; + FixedLine aFlowFL; CheckBox aPgBrkCB; RadioButton aPgBrkRB; RadioButton aColBrkRB; @@ -229,7 +226,7 @@ class SwTextFlowPage : public SfxTabPage CheckBox aKeepCB; CheckBox aHeadLineCB; - GroupBox aVertOrientGB; + FixedLine aVertOrientFL; RadioButton aTopRB; RadioButton aCenterRB; RadioButton aBottomRB; diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 9e81232d58fe..9bac9e3659e2 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tautofmt.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: os $ $Date: 2001-01-26 15:15:40 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -260,14 +260,13 @@ SwAutoFormatDlg::SwAutoFormatDlg( Window* pParent, SwWrtShell* pWrtShell, // aFtFormat ( this, SW_RES( FT_FORMAT ) ), aLbFormat ( this, SW_RES( LB_FORMAT ) ), - aGbPreview ( this, SW_RES( GB_PREVIEW ) ), pWndPreview ( new AutoFmtPreview( this, SW_RES( WND_PREVIEW ) ) ), aBtnNumFormat ( this, SW_RES( BTN_NUMFORMAT ) ), aBtnBorder ( this, SW_RES( BTN_BORDER ) ), aBtnFont ( this, SW_RES( BTN_FONT ) ), aBtnPattern ( this, SW_RES( BTN_PATTERN ) ), aBtnAlignment ( this, SW_RES( BTN_ALIGNMENT ) ), - aGbFormat ( this, SW_RES( GB_FORMAT ) ), + aFLFormat ( this, SW_RES( FL_FORMAT ) ), aBtnOk ( this, SW_RES( BTN_OK ) ), aBtnCancel ( this, SW_RES( BTN_CANCEL ) ), aBtnHelp ( this, SW_RES( BTN_HELP ) ), @@ -332,7 +331,7 @@ void SwAutoFormatDlg::Init( const SwTableAutoFmt* pSelFmt ) aBtnMore.AddWindow( &aBtnFont ); aBtnMore.AddWindow( &aBtnPattern ); aBtnMore.AddWindow( &aBtnAlignment ); - aBtnMore.AddWindow( &aGbFormat ); + aBtnMore.AddWindow( &aFLFormat ); aBtnMore.AddWindow( &aBtnRename ); aBtnAdd.Enable( bSetAutoFmt ); @@ -1724,6 +1723,9 @@ void lcl_SwLinkLine(const SwLineStruct& dLine, /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.4 2001/01/26 15:15:40 os + #83247# CreateFromInt32 + Revision 1.3 2000/10/20 14:18:06 os use comphelper methods diff --git a/sw/source/ui/table/tautofmt.hrc b/sw/source/ui/table/tautofmt.hrc index 5c1f7d54d81c..bf8b8a98b540 100644 --- a/sw/source/ui/table/tautofmt.hrc +++ b/sw/source/ui/table/tautofmt.hrc @@ -2,9 +2,9 @@ * * $RCSfile: tautofmt.hrc,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:14:48 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,13 +71,12 @@ #define BTN_REMOVE 106 #define BTN_RENAME 107 #define FT_LABEL 110 -#define GB_FRAME 111 +#define FL_FRAME 111 #define STR_BTN_CLOSE 200 // Autoformat #define LB_FORMAT 1 #define FT_FORMAT 9 -#define GB_PREVIEW 10 #define WND_PREVIEW 19 #define BTN_NUMFORMAT 20 #define BTN_BORDER 21 @@ -85,7 +84,7 @@ #define BTN_PATTERN 24 #define BTN_ALIGNMENT 25 //#define BTN_ADJUST 26 -#define GB_FORMAT 29 +#define FL_FORMAT 29 #define STR_ADD_TITLE 100 #define STR_ADD_LABEL 101 #define STR_DEL_TITLE 102 diff --git a/sw/source/ui/table/tautofmt.src b/sw/source/ui/table/tautofmt.src index 48e6e7e4de60..f36c0caf4d9a 100644 --- a/sw/source/ui/table/tautofmt.src +++ b/sw/source/ui/table/tautofmt.src @@ -2,9 +2,9 @@ * * $RCSfile: tautofmt.src,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: vg $ $Date: 2001-05-17 08:45:59 $ + * last change: $Author: fme $ $Date: 2001-06-01 11:14:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,38 +119,9 @@ ModalDialog DLG_AUTOFMT_TABLE }; Window WND_PREVIEW { - Pos = MAP_APPFONT ( 83 , 23 ) ; + Pos = MAP_APPFONT ( 83 , 12 ) ; Size = MAP_APPFONT ( 161 , 86 ) ; }; - GroupBox GB_PREVIEW - { - Pos = MAP_APPFONT ( 77 , 12 ) ; - Size = MAP_APPFONT ( 172 , 102 ) ; - Text = "Vorschau" ; - Text [ ENGLISH ] = "Preview" ; - Text [ norwegian ] = "Preview" ; - Text [ italian ] = "Anteprima" ; - Text [ portuguese_brazilian ] = "Examinar" ; - Text [ portuguese ] = "Previsualizar" ; - Text [ finnish ] = "Esikatselu" ; - Text [ danish ] = "Eksempel" ; - Text [ french ] = "Aperu" ; - Text [ swedish ] = "Frhandsvisning" ; - Text [ dutch ] = "Voorbeeld" ; - Text [ spanish ] = "Previsualizacin" ; - Text [ english_us ] = "Preview" ; - Text[ chinese_simplified ] = "Ԥ"; - Text[ russian ] = ""; - Text[ polish ] = "Podgld"; - Text[ japanese ] = "ޭ"; - Text[ chinese_traditional ] = "w"; - Text[ arabic ] = ""; - Text[ greek ] = ""; - Text[ korean ] = "̸"; - Text[ turkish ] = "nizleme"; - Text[ language_user1 ] = " "; - Text[ catalan ] = "Previsualizacin"; - }; CheckBox BTN_NUMFORMAT { Hide = TRUE ; @@ -306,11 +277,11 @@ ModalDialog DLG_AUTOFMT_TABLE Text[ language_user1 ] = " "; Text[ catalan ] = "Orienta~cin"; }; - GroupBox GB_FORMAT + FixedLine FL_FORMAT { Hide = TRUE ; Pos = MAP_APPFONT ( 6 , 120 ) ; - Size = MAP_APPFONT ( 243 , 43 ) ; + Size = MAP_APPFONT ( 243 , 8 ) ; Text = "Formatierung" ; Text [ ENGLISH ] = "For~mats" ; Text [ norwegian ] = "For~mats" ; |