masterfix DEV300: #i10000# WAE fixes

26 files changed, 73 insertions, 76 deletions

diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index fe8d152bbc8c..ff4ec261b209 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -160,6 +160,7 @@ SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS ) :
     SvxStandardDialog( pParent,SW_RES(DLG_BREAK) ),
 
     rSh(rS),
+    aBreakFL(this,SW_RES(FL_BREAK)),
     aLineBtn(this,SW_RES(RB_LINE)),
     aColumnBtn(this,SW_RES(RB_COL)),
     aPageBtn(this,SW_RES(RB_PAGE)),
@@ -167,7 +168,6 @@ SwBreakDlg::SwBreakDlg( Window *pParent, SwWrtShell &rS ) :
     aPageCollBox(this, SW_RES(LB_COLL)),
     aPageNumBox(this, SW_RES(CB_PAGENUM)),
     aPageNumEdit(this, SW_RES(ED_PAGENUM)),
-    aBreakFL(this,SW_RES(FL_BREAK)),
 
     aOkBtn(this,SW_RES(BT_OK)),
     aCancelBtn(this,SW_RES(BT_CANCEL)),
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index e4b95c599071..8f02d0cc8796 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -569,6 +569,7 @@ SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet) :
 
     SfxTabPage(pParent, SW_RES(TP_DROPCAPS), rSet),
 
+    aSettingsFL   (this, SW_RES(FL_SETTINGS)),
     aDropCapsBox  (this, SW_RES(CB_SWITCH   )),
     aWholeWordCB  (this, SW_RES(CB_WORD     )),
     aSwitchText   (this, SW_RES(FT_DROPCAPS )),
@@ -577,13 +578,12 @@ SwDropCapsPage::SwDropCapsPage(Window *pParent, const SfxItemSet &rSet) :
     aLinesField   (this, SW_RES(FLD_LINES   )),
     aDistanceText (this, SW_RES(TXT_DISTANCE)),
     aDistanceField(this, SW_RES(FLD_DISTANCE)),
-    aSettingsFL   (this, SW_RES(FL_SETTINGS)),
 
+    aContentFL    (this, SW_RES(FL_CONTENT )),
     aTextText     (this, SW_RES(TXT_TEXT    )),
     aTextEdit     (this, SW_RES(EDT_TEXT    )),
     aTemplateText (this, SW_RES(TXT_TEMPLATE)),
     aTemplateBox  (this, SW_RES(BOX_TEMPLATE)),
-    aContentFL    (this, SW_RES(FL_CONTENT )),
 
     pPict         (new SwDropCapsPict(this, SW_RES(CNT_PICT))),
 
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 5a055de847d3..20b99cc492fb 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -69,10 +69,10 @@ SwParagraphNumTabPage::SwParagraphNumTabPage(Window* pParent,
     aOutlineStartFL         ( this, SW_RES( FL_OUTLINE_START )),
     aOutlineLvFT            ( this, SW_RES( FT_OUTLINE_LEVEL )),
     aOutlineLvLB            ( this, SW_RES( LB_OUTLINE_LEVEL )),
+    aNewStartFL             ( this, SW_RES( FL_NEW_START ) ),
     aNumberStyleFT          ( this, SW_RES( FT_NUMBER_STYLE ) ),
     aNumberStyleLB          ( this, SW_RES( LB_NUMBER_STYLE ) ),
-    aNewStartFL             ( this, SW_RES( FL_NEW_START ) ),
-    aNewStartCB             ( this, SW_RES( CB_NEW_START ) ),
+       aNewStartCB              ( this, SW_RES( CB_NEW_START ) ),
     aNewStartNumberCB       ( this, SW_RES( CB_NUMBER_NEW_START ) ),
     aNewStartNF             ( this, SW_RES( NF_NEW_START ) ),
     aCountParaFL            ( this, SW_RES( FL_COUNT_PARA        ) ),
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 037d17a5cc5e..84ab51621609 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -345,11 +345,11 @@ SwAddPrinterTabPage::SwAddPrinterTabPage( Window* pParent,
     aProspectCB      (this, SW_RES(CB_PROSPECT)),
     aProspectCB_RTL      (this, SW_RES(CB_PROSPECT_RTL)),
     aSeparatorRFL    (this, SW_RES(FL_SEP_PRT_RIGHT)),
+    aFL3          (this, SW_RES(FL_3)),
     aNoRB            (this, SW_RES(RB_NO)),
     aOnlyRB          (this, SW_RES(RB_ONLY)),
     aEndRB           (this, SW_RES(RB_END)),
     aEndPageRB       (this, SW_RES(RB_PAGEEND)),
-    aFL3          (this, SW_RES(FL_3)),
     aFL4          (this, SW_RES(FL_4)),
     aPrintEmptyPagesCB(this, SW_RES(CB_PRINTEMPTYPAGES)),
 //    aSingleJobsCB    (this, SW_RES(CB_SINGLEJOBS)),
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index cb6a9882fac3..08bb7b96e45b 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -82,23 +82,21 @@ SfxTabPage *  SwDocStatPage::Create(Window *pParent, const SfxItemSet &rSet)
 SwDocStatPage::SwDocStatPage(Window *pParent, const SfxItemSet &rSet) :
 
     SfxTabPage  (pParent, SW_RES(TP_DOC_STAT), rSet),
-
+    aPageLbl    (this, SW_RES( FT_PAGE       )),
+    aPageNo     (this, SW_RES( FT_PAGE_COUNT )),
     aTableLbl   (this, SW_RES( FT_TABLE      )),
+    aTableNo    (this, SW_RES( FT_TABLE_COUNT)),
     aGrfLbl     (this, SW_RES( FT_GRF        )),
+    aGrfNo      (this, SW_RES( FT_GRF_COUNT  )),
     aOLELbl     (this, SW_RES( FT_OLE        )),
-    aPageLbl    (this, SW_RES( FT_PAGE       )),
+    aOLENo      (this, SW_RES( FT_OLE_COUNT  )),
     aParaLbl    (this, SW_RES( FT_PARA       )),
+    aParaNo     (this, SW_RES( FT_PARA_COUNT )),
     aWordLbl    (this, SW_RES( FT_WORD       )),
+    aWordNo     (this, SW_RES( FT_WORD_COUNT )),
     aCharLbl    (this, SW_RES( FT_CHAR       )),
+       aCharNo      (this, SW_RES( FT_CHAR_COUNT )),
     aLineLbl    (this, SW_RES( FT_LINE       )),
-
-    aTableNo    (this, SW_RES( FT_TABLE_COUNT)),
-    aGrfNo      (this, SW_RES( FT_GRF_COUNT  )),
-    aOLENo      (this, SW_RES( FT_OLE_COUNT  )),
-    aPageNo     (this, SW_RES( FT_PAGE_COUNT )),
-    aParaNo     (this, SW_RES( FT_PARA_COUNT )),
-    aWordNo     (this, SW_RES( FT_WORD_COUNT )),
-    aCharNo     (this, SW_RES( FT_CHAR_COUNT )),
     aLineNo     (this, SW_RES( FT_LINE_COUNT )),
     aUpdatePB   (this, SW_RES( PB_PDATE      ))
 {
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index cacd61a83434..4ee1d3295ddc 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -272,6 +272,7 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) :
     pNewDBMgr(NULL),
     aItem          ((const SwLabItem&) rSet.Get(FN_LABEL)),
 
+    aWritingFL     (this, SW_RES(FL_WRITING)),
     aWritingText   (this, SW_RES(TXT_WRITING)),
     aAddrBox       (this, SW_RES(BOX_ADDR   )),
     aWritingEdit   (this, SW_RES(EDT_WRITING)),
@@ -282,7 +283,7 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) :
     aInsertBT      (this, SW_RES(BTN_INSERT )),
     aDBFieldFT     (this, SW_RES(FT_DBFIELD )),
     aDBFieldLB     (this, SW_RES(LB_DBFIELD )),
-    aWritingFL     (this, SW_RES(FL_WRITING)),
+    aFormatFL      (this, SW_RES(FL_FORMAT )),
     aContButton    (this, SW_RES(BTN_CONT   )),
     aSheetButton   (this, SW_RES(BTN_SHEET  )),
     aMakeText      (this, SW_RES(TXT_MAKE   )),
@@ -290,9 +291,8 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) :
     aTypeText      (this, SW_RES(TXT_TYPE   )),
     aTypeBox       (this, SW_RES(BOX_TYPE   )),
     aHiddenSortTypeBox(this, WB_SORT|WB_HIDE),
-    aFormatInfo    (this, SW_RES(INF_FORMAT )),
-    aFormatFL      (this, SW_RES(FL_FORMAT ))
-{
+    aFormatInfo    (this, SW_RES(INF_FORMAT ))
+   {
     WaitObject aWait( pParent );
 
     FreeResource();
@@ -715,10 +715,10 @@ void SwVisitingCardPage::SetUserData( sal_uInt32 nCnt,
 
 SwVisitingCardPage::SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet) :
     SfxTabPage(pParent, SW_RES(TP_VISITING_CARDS), rSet),
+    aContentFL(this,        SW_RES( FL_CONTENT           )),
     aAutoTextLB(this,       SW_RES( LB_AUTO_TEXT            )),
     aAutoTextGroupFT(this,  SW_RES( FT_AUTO_TEXT_GROUP  )),
     aAutoTextGroupLB(this,  SW_RES( LB_AUTO_TEXT_GROUP  )),
-    aContentFL(this,        SW_RES( FL_CONTENT           )),
     aExampleWIN(this,       SW_RES( WIN_EXAMPLE         )),
     sVisCardGroup(SW_RES(ST_VISCARD_GROUP)),
     pExampleFrame(0)
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index 2639109b8079..4341bc9c5b75 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -61,6 +61,7 @@ SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) :
     SfxTabPage(pParent, SW_RES(TP_LAB_PRT), rSet),
 
     pPrinter( 0 ),
+    aFLDontKnow    (this, SW_RES(FL_DONTKNOW)),
     aPageButton    (this, SW_RES(BTN_PAGE   )),
     aSingleButton  (this, SW_RES(BTN_SINGLE )),
     aColText       (this, SW_RES(TXT_COL    )),
@@ -68,10 +69,9 @@ SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) :
     aRowText       (this, SW_RES(TXT_ROW    )),
     aRowField      (this, SW_RES(FLD_ROW    )),
     aSynchronCB    (this, SW_RES(CB_SYNCHRON)),
-    aFLDontKnow    (this, SW_RES(FL_DONTKNOW)),
+    aFLPrinter     (this, SW_RES(FL_PRINTER )),
     aPrinterInfo   (this, SW_RES(INF_PRINTER)),
-    aPrtSetup      (this, SW_RES(BTN_PRTSETUP)),
-    aFLPrinter     (this, SW_RES(FL_PRINTER ))
+    aPrtSetup      (this, SW_RES(BTN_PRTSETUP))
 
 {
     FreeResource();
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 1dec55af8dd7..9859f4875b46 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -453,12 +453,13 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
 
     : SfxTabPage(pParent, SW_RES(TP_COLUMN), rSet),
 
+    aFLGroup(this,          SW_RES(FL_COLUMNS )),
     aClNrLbl(this,          SW_RES(FT_NUMBER  )),
     aCLNrEdt(this,          SW_RES(ED_NUMBER  )),
     aDefaultVS(this,        SW_RES(VS_DEFAULTS)),
     aBalanceColsCB(this,    SW_RES(CB_BALANCECOLS)),
-    aFLGroup(this,          SW_RES(FL_COLUMNS )),
 
+    aFLLayout(this,         SW_RES(FL_LAYOUT)),
     aBtnUp(this,            SW_RES(BTN_DOWN)),
     aColumnFT(this,         SW_RES(FT_COLUMN)),
     aWidthFT(this,          SW_RES(FT_WIDTH)),
@@ -474,15 +475,13 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
     aBtnDown(this,          SW_RES(BTN_UP)),
     aAutoWidthBox(this,     SW_RES(CB_AUTO_WIDTH)),
 
-    aFLLayout(this,         SW_RES(FL_LAYOUT)),
-
+    aFLLineType(this,       SW_RES(FL_LINETYPE)),
     aLineTypeLbl(this,      SW_RES(FT_STYLE)),
     aLineTypeDLB(this,      SW_RES(LB_STYLE)),
     aLineHeightLbl(this,    SW_RES(FT_HEIGHT)),
     aLineHeightEdit(this,   SW_RES(ED_HEIGHT)),
     aLinePosLbl(this,       SW_RES(FT_POSITION)),
     aLinePosDLB(this,       SW_RES(LB_POSITION)),
-    aFLLineType(this,       SW_RES(FL_LINETYPE)),
 
     aVertFL(this,         SW_RES(FL_VERT)),
     aPropertiesFL(  this,    SW_RES( FL_PROPERTIES    )),
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 35da147aedd6..e64ec62f6c3a 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -654,6 +654,7 @@ namespace
 SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
     SfxTabPage      (pParent, SW_RES(TP_FRM_STD), rSet),
 
+    aSizeFL         (this, SW_RES(FL_SIZE)),
     aWidthFT        (this, SW_RES(FT_WIDTH)),
     aWidthAutoFT    (this, SW_RES(FT_WIDTH_AUTO)),
     aWidthED        (this, SW_RES(ED_WIDTH)),
@@ -666,16 +667,16 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
     aAutoHeightCB   (this, SW_RES(CB_AUTOHEIGHT)),
     aFixedRatioCB   (this, SW_RES(CB_FIXEDRATIO)),
     aRealSizeBT     (this, SW_RES(BT_REALSIZE)),
-    aSizeFL         (this, SW_RES(FL_SIZE)),
 
-    aTypeFL        (this, SW_RES(FL_TYPE)),
     aTypeSepFL     (this, SW_RES(FL_TYPE_SEP)),
+    aTypeFL        (this, SW_RES(FL_TYPE)),
     aAnchorAtPageRB (this, SW_RES(RB_ANCHOR_PAGE)),
     aAnchorAtParaRB (this, SW_RES(RB_ANCHOR_PARA)),
     aAnchorAtCharRB (this, SW_RES(RB_ANCHOR_AT_CHAR)),
     aAnchorAsCharRB (this, SW_RES(RB_ANCHOR_AS_CHAR)),
     aAnchorAtFrameRB(this, SW_RES(RB_ANCHOR_FRAME)),
 
+    aPositionFL     (this, SW_RES(FL_POSITION)),
     aHorizontalFT   (this, SW_RES(FT_HORIZONTAL)),
     aHorizontalDLB  (this, SW_RES(DLB_HORIZONTAL)),
     aAtHorzPosFT    (this, SW_RES(FT_AT_HORZ_POS)),
@@ -691,7 +692,6 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) :
     aVertRelationLB (this, SW_RES(LB_VERT_RELATION)),
     // OD 19.09.2003 #i18732# - new checkbox
     aFollowTextFlowCB(this, SW_RES(CB_FOLLOWTEXTFLOW)),
-    aPositionFL     (this, SW_RES(FL_POSITION)),
 
     aExampleWN      (this, SW_RES(WN_BSP)),
 
@@ -2935,6 +2935,7 @@ void lcl_Move(Window& rWin, sal_Int32 nDiff)
 SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet ) :
     SfxTabPage(pParent,     SW_RES(TP_FRM_ADD), rSet),
 
+    aNamesFL           (this, SW_RES(FL_NAME)),
     aNameFT            (this, SW_RES(FT_NAME)),
     aNameED            (this, SW_RES(ED_NAME)),
     aAltNameFT         (this, SW_RES(FT_ALT_NAME)),
@@ -2943,20 +2944,18 @@ SwFrmAddPage::SwFrmAddPage(Window *pParent, const SfxItemSet &rSet ) :
     aPrevLB            (this, SW_RES(LB_PREV)),
     aNextFT            (this, SW_RES(FT_NEXT)),
     aNextLB            (this, SW_RES(LB_NEXT)),
-    aNamesFL           (this, SW_RES(FL_NAME)),
 
+    aProtectFL         (this, SW_RES(FL_PROTECT)),
     aProtectContentCB  (this, SW_RES(CB_PROTECT_CONTENT)),
     aProtectFrameCB    (this, SW_RES(CB_PROTECT_FRAME)),
     aProtectSizeCB     (this, SW_RES(CB_PROTECT_SIZE)),
-    aProtectFL         (this, SW_RES(FL_PROTECT)),
+    aExtFL             (this, SW_RES(FL_EXT)),
 
     aEditInReadonlyCB  (this, SW_RES(CB_EDIT_IN_READONLY)),
     aPrintFrameCB      (this, SW_RES(CB_PRINT_FRAME)),
     aTextFlowFT        (this, SW_RES(FT_TEXTFLOW)),
     aTextFlowLB        (this, SW_RES(LB_TEXTFLOW)),
 
-    aExtFL             (this, SW_RES(FL_EXT)),
-
     pWrtSh(0),
 
     nDlgType(0),
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 6ebaa586e6aa..905caaf6f0ef 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -991,6 +991,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS
 
     aTOXMarksCB(        this, SW_RES(CB_TOXMARKS         )),
 
+    aIdxOptionsFL(      this, SW_RES(FL_IDXOPTIONS       )),
     aCollectSameCB(     this, SW_RES(CB_COLLECTSAME      )),
     aUseFFCB(           this, SW_RES(CB_USEFF           )),
     aUseDashCB(         this, SW_RES(CB_USE_DASH            )),
@@ -999,7 +1000,6 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS
     aKeyAsEntryCB(      this, SW_RES(CB_KEYASENTRY      )),
     aFromFileCB(        this, SW_RES(CB_FROMFILE            )),
     aAutoMarkPB(        this, SW_RES(MB_AUTOMARK            )),
-    aIdxOptionsFL(      this, SW_RES(FL_IDXOPTIONS       )),
 
     aFromNames(         SW_RES(RES_SRCTYPES              )),
     aFromObjCLB(        this, SW_RES(CLB_FROMOBJ            )),
@@ -2064,6 +2064,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
         SfxTabPage(pParent, SW_RES(TP_TOX_ENTRY), rAttrSet),
     aLevelFT(this,              SW_RES(FT_LEVEL              )),
     aLevelLB(this,              SW_RES(LB_LEVEL             )),
+    aEntryFL(this,              SW_RES(FL_ENTRY              )),
 
     aTokenFT(this,              SW_RES(FT_TOKEN              )),
     aTokenWIN(this,             SW_RES(WIN_TOKEN             )),
@@ -2097,14 +2098,14 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
     aTabPosFT(this,             SW_RES(FT_TABPOS                )),
     aTabPosMF(this,             SW_RES(MF_TABPOS                )),
     aAutoRightCB(this,          SW_RES(CB_AUTORIGHT         )),
-    aEntryFL(this,              SW_RES(FL_ENTRY              )),
+    aFormatFL(this,             SW_RES(FL_FORMAT             )),
+
 
     aRelToStyleCB(this,         SW_RES(CB_RELTOSTYLE         )),
     aMainEntryStyleFT(this,     SW_RES(FT_MAIN_ENTRY_STYLE)),
     aMainEntryStyleLB(this,     SW_RES(LB_MAIN_ENTRY_STYLE)),
     aAlphaDelimCB(this,         SW_RES(CB_ALPHADELIM            )),
     aCommaSeparatedCB(this,     SW_RES(CB_COMMASEPARATED        )),
-    aFormatFL(this,             SW_RES(FL_FORMAT             )),
 
     aSortDocPosRB(this,         SW_RES(RB_DOCPOS                )),
     aSortContentRB(this,        SW_RES(RB_SORTCONTENT       )),
@@ -3933,14 +3934,14 @@ void SwTokenWindow::GetFocus()
  * --------------------------------------------------*/
 SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrSet ) :
     SfxTabPage(pParent, SW_RES(TP_TOX_STYLES), rAttrSet),
+    aFormatFL(this,     SW_RES(FL_FORMAT  )),
     aLevelFT2(this,     SW_RES(FT_LEVEL  )),
     aLevelLB(this,      SW_RES(LB_LEVEL  )),
+    aAssignBT(this,     SW_RES(BT_ASSIGN  )),
     aTemplateFT(this,   SW_RES(FT_TEMPLATE)),
     aParaLayLB(this,    SW_RES(LB_PARALAY )),
     aStdBT(this,        SW_RES(BT_STD    )),
-    aAssignBT(this,     SW_RES(BT_ASSIGN  )),
     aEditStyleBT(this,  SW_RES(BT_EDIT_STYLE    )),
-    aFormatFL(this,     SW_RES(FL_FORMAT  )),
     m_pCurrentForm(0)
 {
     FreeResource();
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index d4fd6197f496..74fbc4383f96 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -102,6 +102,7 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent,
                                const ResId& rResId,
                                sal_Int32 _nOptionsId, SwWrtShell& rWrtShell ) :
       Window(pParent, rResId),
+    aIndexFL(this,  SW_RES(FL_INDEX )),
     aTypeFT (this,  SW_RES(LBL_INDEX    )),
     aTypeDCB(this,  SW_RES(DCB_INDEX    )),
     aNewBT(this,    SW_RES(BT_NEW   )),
@@ -128,7 +129,6 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent,
     aSearchCaseSensitiveCB(this,    SW_RES(CB_CASESENSITIVE )),
     aSearchCaseWordOnlyCB(this,     SW_RES(CB_WORDONLY      )),
 
-    aIndexFL(this,  SW_RES(FL_INDEX )),
 
     aOKBT(this,     SW_RES(BT_OK    )),
     aCancelBT(this, SW_RES(BT_CANCEL )),
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 77ce091d454b..5df6fc1fca5d 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -152,9 +152,8 @@ void SwInsertBookmarkDlg::Apply()
 SwInsertBookmarkDlg::SwInsertBookmarkDlg( Window *pParent, SwWrtShell &rS, SfxRequest& rRequest ) :
 
     SvxStandardDialog(pParent,SW_RES(DLG_INSERT_BOOKMARK)),
-
-    aBookmarkBox(this,SW_RES(CB_BOOKMARK)),
     aBookmarkFl(this,SW_RES(FL_BOOKMARK)),
+    aBookmarkBox(this,SW_RES(CB_BOOKMARK)),
     aOkBtn(this,SW_RES(BT_OK)),
     aCancelBtn(this,SW_RES(BT_CANCEL)),
     aDeleteBtn(this,SW_RES(BT_DELETE)),
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 0992c1e35562..731e1451bd32 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -110,6 +110,8 @@ IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn )
 SwEndNoteOptionPage::SwEndNoteOptionPage( Window *pParent, sal_Bool bEN,
                                           const SfxItemSet &rSet ) :
     SfxTabPage( pParent, SW_RES(bEN ? TP_ENDNOTEOPTION : TP_FOOTNOTEOPTION), rSet ),
+    aNumFL         (this, SW_RES( FL_NUM        )),
+
     aNumTypeFT      (this, SW_RES( FT_NUMTYPE    )),
     aNumViewBox     (this, SW_RES( LB_NUMVIEW   ), INSERT_NUM_EXTENDED_TYPES),
     aOffsetLbl      (this, SW_RES( FT_OFFSET    )),
@@ -123,25 +125,24 @@ SwEndNoteOptionPage::SwEndNoteOptionPage( Window *pParent, sal_Bool bEN,
     aPosFT          (this, SW_RES( FT_POS    )),
     aPosPageBox     (this, SW_RES( RB_POS_PAGE   )),
     aPosChapterBox  (this, SW_RES( RB_POS_CHAPTER)),
-    aNumFL         (this, SW_RES( FL_NUM        )),
 
+    aTemplFL       (this, SW_RES( FL_TEMPL      )),
     aParaTemplLbl   (this, SW_RES( FT_PARA_TEMPL)),
     aParaTemplBox   (this, SW_RES( LB_PARA_TEMPL)),
     aPageTemplLbl   (this, SW_RES( FT_PAGE_TEMPL)),
     aPageTemplBox   (this, SW_RES( LB_PAGE_TEMPL)),
-    aTemplFL       (this, SW_RES( FL_TEMPL      )),
 
+    aCharTemplFL(          this, SW_RES(FL_CHAR_TEMPL)),
     aFtnCharAnchorTemplLbl( this, SW_RES( FT_ANCHR_CHARFMT)),
     aFtnCharAnchorTemplBox( this, SW_RES( LB_ANCHR_CHARFMT)),
     aFtnCharTextTemplLbl(   this, SW_RES( FT_TEXT_CHARFMT)),
     aFtnCharTextTemplBox(   this, SW_RES( LB_TEXT_CHARFMT)),
-    aCharTemplFL(          this, SW_RES(FL_CHAR_TEMPL)),
 
+    aContFL        (this, SW_RES( FL_CONT       )),
     aContLbl        (this, SW_RES( FT_CONT      )),
     aContEdit       (this, SW_RES( ED_CONT      )),
     aContFromLbl    (this, SW_RES( FT_CONT_FROM )),
     aContFromEdit   (this, SW_RES( ED_CONT_FROM )),
-    aContFL        (this, SW_RES( FL_CONT       )),
 
     aNumDoc(aNumCountBox.GetEntry(FTNNUM_DOC)),
     aNumPage(aNumCountBox.GetEntry(FTNNUM_PAGE)),
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 64392b6a6d6f..de1342c91ae9 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -76,9 +76,11 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
                         const SvStrings* pPathArr,
                         SwGlossaryHdl *pHdl) :
     SvxStandardDialog(pParent, SW_RES(DLG_BIB_BASE)),
-
+    aBibFT(     this, SW_RES(FT_BIB)),
     aNameED(    this, SW_RES(ED_NAME)),
+    aPathFT(     this, SW_RES(FT_PATH)),
     aPathLB(    this, SW_RES(LB_PATH)),
+    aSelectFT(   this, SW_RES(FT_SELECT)),
     aGroupTLB(  this, SW_RES(TLB_GROUPS)),
 
     aOkPB(      this, SW_RES(BT_OK)),
@@ -87,9 +89,6 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
     aNewPB(     this, SW_RES(PB_NEW)),
     aDelPB(     this, SW_RES(PB_DELETE)),
     aRenamePB(  this, SW_RES(PB_RENAME)),
-    aBibFT(     this, SW_RES(FT_BIB)),
-    aPathFT(     this, SW_RES(FT_PATH)),
-    aSelectFT(   this, SW_RES(FT_SELECT)),
 
     pRemovedArr(0),
     pInsertedArr(0),
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 840cbf03c6a1..9835b2f4d681 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -183,11 +183,12 @@ SwNewGlosNameDlg::SwNewGlosNameDlg(Window* pParent,
     aNewShort(this,SW_RES( ED_NS    )),
     aOk     (this, SW_RES( BT_OKNEW)),
     aCancel (this, SW_RES( BT_CANCEL)),
-    aFL    (this, SW_RES( FL_NN    )),
     aONFT   (this, SW_RES( FT_ON    )),
     aOldName(this, SW_RES( ED_ON    )),
     aOSFT   (this, SW_RES( FT_OS    )),
-    aOldShort(this,SW_RES( ED_OS    ))
+    aOldShort(this,SW_RES( ED_OS    )),
+    aFL    (this, SW_RES( FL_NN    ))
+
 {
     FreeResource();
     aOldName.SetText( rOldName );
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 999a800984da..7e9d4894faaa 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -233,15 +233,15 @@ SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell &rShell, sal_Bool
     rSh(rShell),
     bExtCharAvailable(sal_False),
     bEdit(bEd),
+    aNumberFL      (this,SW_RES(FL_NUMBER)),
     aNumberAutoBtn  (this,SW_RES(RB_NUMBER_AUTO)),
     aNumberCharBtn  (this,SW_RES(RB_NUMBER_CHAR)),
     aNumberCharEdit (this,SW_RES(ED_NUMBER_CHAR)),
     aNumberExtChar  (this,SW_RES(BT_NUMBER_CHAR)),
-    aNumberFL      (this,SW_RES(FL_NUMBER)),
 
+    aTypeFL        (this,SW_RES(FL_TYPE)),
     aFtnBtn         (this,SW_RES(RB_TYPE_FTN)),
     aEndNoteBtn     (this,SW_RES(RB_TYPE_ENDNOTE)),
-    aTypeFL        (this,SW_RES(FL_TYPE)),
 
     aOkBtn          (this,SW_RES(BT_OK)),
     aCancelBtn      (this,SW_RES(BT_CANCEL)),
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 2e8baa173728..4b03871e9f7d 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -105,6 +105,7 @@ SwLineNumberingPage::SwLineNumberingPage( Window* pParent,
                                                     const SfxItemSet& rSet )
     : SfxTabPage(pParent, SW_RES(TP_LINENUMBERING), rSet),
     aNumberingOnCB      ( this, SW_RES( CB_NUMBERING_ON )),
+    aDisplayFL          ( this, SW_RES( FL_DISPLAY )),
     aCharStyleFT        ( this, SW_RES( FT_CHAR_STYLE )),
     aCharStyleLB        ( this, SW_RES( LB_CHAR_STYLE )),
     aFormatFT           ( this, SW_RES( FT_FORMAT )),
@@ -116,17 +117,16 @@ SwLineNumberingPage::SwLineNumberingPage( Window* pParent,
     aNumIntervalFT      ( this, SW_RES( FT_NUM_INVERVAL )),
     aNumIntervalNF      ( this, SW_RES( NF_NUM_INVERVAL )),
     aNumRowsFT          ( this, SW_RES( FT_NUM_ROWS )),
-    aDisplayFL          ( this, SW_RES( FL_DISPLAY )),
+    aDivisorFL          ( this, SW_RES( FL_DIVISOR )),
     aDivisorFT          ( this, SW_RES( FT_DIVISOR )),
     aDivisorED          ( this, SW_RES( ED_DIVISOR )),
     aDivIntervalFT      ( this, SW_RES( FT_DIV_INTERVAL )),
     aDivIntervalNF      ( this, SW_RES( NF_DIV_INTERVAL )),
     aDivRowsFT          ( this, SW_RES( FT_DIV_ROWS )),
-    aDivisorFL          ( this, SW_RES( FL_DIVISOR )),
+    aCountFL            ( this, SW_RES( FL_COUNT )),
     aCountEmptyLinesCB  ( this, SW_RES( CB_COUNT_EMPTYLINES )),
     aCountFrameLinesCB  ( this, SW_RES( CB_COUNT_FRAMELINES )),
-    aRestartEachPageCB  ( this, SW_RES( CB_RESTART_PAGE )),
-    aCountFL            ( this, SW_RES( FL_COUNT ))
+    aRestartEachPageCB  ( this, SW_RES( CB_RESTART_PAGE ))
 
 {
     String sIntervalName = aDivIntervalFT.GetAccessibleName();
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index e6cb5f2383b5..4b6b48e5ccea 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -101,9 +101,9 @@ static sal_Bool bLastRelative = sal_False;
 SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
                                const SfxItemSet& rSet) :
     SfxTabPage( pParent, SW_RES( TP_NUM_POSITION ), rSet ),
-    aPositionFL(    this, SW_RES(FL_POSITION )),
     aLevelFL(       this, SW_RES(FL_LEVEL    )),
     aLevelLB(       this, SW_RES(LB_LEVEL   )),
+    aPositionFL(    this, SW_RES(FL_POSITION )),
 
     aDistBorderFT(  this, SW_RES(FT_BORDERDIST  )),
     aDistBorderMF(  this, SW_RES(MF_BORDERDIST  )),
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index dbb938df7aae..3f67fb5cdb1a 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -190,9 +190,9 @@ IMPL_LINK_INLINE_END( SwNumNamesDlg, DoubleClickHdl, ListBox *, EMPTYARG )
 
 SwNumNamesDlg::SwNumNamesDlg(Window *pParent)
     : ModalDialog(pParent, SW_RES(DLG_NUM_NAMES)),
+    aFormFL(this, SW_RES(FL_FORM)),
     aFormEdit(this, SW_RES(ED_FORM)),
     aFormBox(this, SW_RES(LB_FORM)),
-    aFormFL(this, SW_RES(FL_FORM)),
     aOKBtn(this, SW_RES(BT_OK)),
     aCancelBtn(this, SW_RES(BT_CANCEL)),
     aHelpBtn(this, SW_RES(BT_HELP))
@@ -548,8 +548,9 @@ short SwOutlineTabDialog::Ok()
  * --------------------------------------------------*/
 SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxItemSet& rSet) :
     SfxTabPage(pParent, SW_RES(TP_OUTLINE_NUM), rSet),
-    aLevelLB(       this, SW_RES(LB_LEVEL   )),
     aLevelFL(       this, SW_RES(FL_LEVEL    )),
+    aLevelLB(       this, SW_RES(LB_LEVEL   )),
+    aNumberFL(this, SW_RES(FL_NUMBER)),
     aCollLbl(this, SW_RES(FT_COLL)),
     aCollBox(this, SW_RES(LB_COLL)),
     aNumberLbl(this, SW_RES(FT_NUMBER)),
@@ -565,7 +566,6 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxIte
     aSuffixED(this, SW_RES(ED_SUFFIX)),
     aStartLbl(this, SW_RES(FT_START)),
     aStartEdit(this, SW_RES(ED_START)),
-    aNumberFL(this, SW_RES(FL_NUMBER)),
     aPreviewWIN(    this, SW_RES(WIN_PREVIEW )),
 
     aNoFmtName(SW_RES(ST_NO_COLL)),
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 423f66c8e9ef..593dbebae5ef 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -156,14 +156,14 @@ IMPL_LINK( SwFootNotePage, HeightModify, MetricField *, EMPTYARG )
 SwFootNotePage::SwFootNotePage(Window *pParent, const SfxItemSet &rSet) :
 
     SfxTabPage(pParent, SW_RES(TP_FOOTNOTE_PAGE), rSet),
-
+    aPosHeader(this,        SW_RES(FL_FOOTNOTE_SIZE)),
     aMaxHeightPageBtn(this, SW_RES(RB_MAXHEIGHT_PAGE)),
     aMaxHeightBtn(this,     SW_RES(RB_MAXHEIGHT)),
     aMaxHeightEdit(this,    SW_RES(ED_MAXHEIGHT)),
     aDistLbl(this,          SW_RES(FT_DIST)),
     aDistEdit(this,         SW_RES(ED_DIST)),
-    aPosHeader(this,        SW_RES(FL_FOOTNOTE_SIZE)),
 
+    aLineHeader(this,       SW_RES(FL_LINE)),
     aLinePosLbl(this,       SW_RES(FT_LINEPOS)),
     aLinePosBox(this,       SW_RES(DLB_LINEPOS)),
     aLineTypeLbl(this,      SW_RES(FT_LINETYPE)),
@@ -171,9 +171,8 @@ SwFootNotePage::SwFootNotePage(Window *pParent, const SfxItemSet &rSet) :
     aLineWidthLbl(this,     SW_RES(FT_LINEWIDTH)),
     aLineWidthEdit(this,    SW_RES(ED_LINEWIDTH)),
     aLineDistLbl(this,      SW_RES(FT_LINEDIST)),
-    aLineDistEdit(this,     SW_RES(ED_LINEDIST)),
-    aLineHeader(this,       SW_RES(FL_LINE))
-{
+    aLineDistEdit(this,     SW_RES(ED_LINEDIST))
+    {
     FreeResource();
 
     SetExchangeSupport();
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index a4c45235dbb4..678b0c917e3c 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -133,11 +133,12 @@ sal_Bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY )
 SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) :
 
     SvxStandardDialog(pParent, SW_RES(DLG_SORTING)),
+
     aColLbl(this,       SW_RES(FT_COL   )),
     aTypLbl(this,       SW_RES(FT_KEYTYP)),
     aDirLbl(this,       SW_RES(FT_DIR   )),
+    aSortFL(this,      SW_RES(FL_SORT_2  )),
 
-    aDirFL(this,       SW_RES(FL_DIR   )),
 
     aKeyCB1(this,       SW_RES(CB_KEY1  )),
     aColEdt1(this,      SW_RES(ED_KEY1  )),
@@ -156,8 +157,8 @@ SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) :
     aTypDLB3(this,      SW_RES(DLB_KEY3 )),
     aSortUp3RB(this,    SW_RES(RB_UP3    )),
     aSortDn3RB(this,    SW_RES(RB_DN3    )),
+    aDirFL(this,       SW_RES(FL_DIR   )),
 
-    aSortFL(this,      SW_RES(FL_SORT_2  )),
     aColumnRB(this,     SW_RES(RB_COL   )),
     aRowRB(this,        SW_RES(RB_ROW   )),
 
diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx
index 70811c670496..d9e3d64b22e2 100644
--- a/sw/source/ui/table/colwd.cxx
+++ b/sw/source/ui/table/colwd.cxx
@@ -76,12 +76,12 @@ IMPL_LINK_INLINE_END( SwTableWidthDlg, LoseFocusHdl, Edit *, EMPTYARG )
 SwTableWidthDlg::SwTableWidthDlg(Window *pParent, SwTableFUNC &rTableFnc ) :
 
     SvxStandardDialog( pParent, SW_RES(DLG_COL_WIDTH) ),
+    aWidthFL(this,     SW_RES(FL_WIDTH)),
 
     aColFT(this,        SW_RES(FT_COL)),
     aColEdit(this,      SW_RES(ED_COL)),
     aWidthFT(this,      SW_RES(FT_WIDTH)),
     aWidthEdit(this,    SW_RES(ED_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)),
diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx
index 1fb108276bc1..a1d1770136d7 100644
--- a/sw/source/ui/table/rowht.cxx
+++ b/sw/source/ui/table/rowht.cxx
@@ -86,10 +86,10 @@ void SwTableHeightDlg::Apply()
 SwTableHeightDlg::SwTableHeightDlg( Window *pParent, SwWrtShell &rS ) :
 
     SvxStandardDialog(pParent, SW_RES(DLG_ROW_HEIGHT)),
+    aHeightFL(this, SW_RES(FL_HEIGHT)),
 
     aHeightEdit(this, SW_RES(ED_HEIGHT)),
     aAutoHeightCB(this, SW_RES(CB_AUTOHEIGHT)),
-    aHeightFL(this, SW_RES(FL_HEIGHT)),
     aOKBtn(this, SW_RES(BT_OK)),
     aCancelBtn(this, SW_RES(BT_CANCEL)),
     aHelpBtn( this, SW_RES( BT_HELP ) ),
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 3ca0a5357f91..45eab49d553d 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -827,6 +827,7 @@ SwTableColumnPage::SwTableColumnPage( Window* pParent,
     aSpaceFT(this,          SW_RES(FT_SPACE)),
     aSpaceED(this,          SW_RES(ED_SPACE)),
 
+    aColFL(this,            SW_RES(COL_FL_LAYOUT)),
     aUpBtn(this,            SW_RES(COL_BTN_UP)),
     aFT1(this,              SW_RES(COL_FT_1)),
     aMF1(this,              SW_RES(COL_MF_1)),
@@ -841,7 +842,6 @@ SwTableColumnPage::SwTableColumnPage( Window* pParent,
     aFT6(this,              SW_RES(COL_FT_6)),
     aMF6(this,              SW_RES(COL_MF_6)),
     aDownBtn(this,          SW_RES(COL_BTN_DOWN)),
-    aColFL(this,            SW_RES(COL_FL_LAYOUT)),
 
     nTableWidth(0),
     nMinWidth( MINLAY ),
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 41aaca4a4f65..e64c5110a942 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -184,13 +184,13 @@ SwAutoFormatDlg::SwAutoFormatDlg( Window* pParent, SwWrtShell* pWrtShell,
     //
     aFlFormat       ( this, SW_RES( FL_FORMAT ) ),
     aLbFormat       ( this, SW_RES( LB_FORMAT ) ),
+    aFlFormats       ( this, SW_RES( FL_FORMATS ) ),
 
     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 ) ),
-    aFlFormats       ( this, SW_RES( FL_FORMATS ) ),
     aBtnOk          ( this, SW_RES( BTN_OK ) ),
     aBtnCancel      ( this, SW_RES( BTN_CANCEL ) ),
     aBtnHelp        ( this, SW_RES( BTN_HELP ) ),
diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx
index 27b861991e0f..94363dfbbbcf 100644
--- a/sw/source/ui/utlui/swrenamexnameddlg.cxx
+++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx
@@ -72,9 +72,9 @@ SwRenameXNamedDlg::SwRenameXNamedDlg( Window* pWin,
             uno::Reference< container::XNamed > & xN,
             uno::Reference< container::XNameAccess > & xNA ) :
     ModalDialog(pWin, SW_RES(DLG_RENAME_XNAMED)),
-   aNewNameFT(this, SW_RES(FT_NEW_NAME)),
-   aNewNameED(this, SW_RES(ED_NEW_NAME)),
    aNameFL(this, SW_RES(FL_NAME)),
+    aNewNameFT(this, SW_RES(FT_NEW_NAME)),
+   aNewNameED(this, SW_RES(ED_NEW_NAME)),
    aOk(this, SW_RES(PB_OK)),
    aCancel(this, SW_RES(PB_CANCEL)),
    aHelp(this, SW_RES(PB_HELP)),