From eb52fad75717c6e0d16e93b39d3fb49132cf69d1 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 6 Oct 2009 07:38:24 +0200 Subject: #103496#: move VCL free ConfigItems to unotools --- sw/source/ui/shells/annotsh.cxx | 2 +- sw/source/ui/shells/tabsh.cxx | 2 +- sw/source/ui/shells/textfld.cxx | 2 +- sw/source/ui/shells/textsh.cxx | 2 +- sw/source/ui/shells/textsh1.cxx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sw/source/ui/shells') diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 1a34e2972956..7c6962f23efa 100755 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 7ba4d0b8e954..98818515a4d0 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -38,7 +38,7 @@ #endif #include #include -#include +#include #include #include #include diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 0dedb918aaf5..520d0635d52e 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 7e38c1297d0b..615e2464e991 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 77de4c0821ff..b2fe47d4e052 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -117,7 +117,7 @@ #include #include -#include +#include #include #include #include -- cgit From ed87eb8f7aec4990f65ed9c5b90738eab8b59e21 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Oct 2009 00:05:16 +0200 Subject: #i103496#: split svtools; improve ConfitItems --- sw/source/ui/shells/annotsh.cxx | 18 +++++++++--------- sw/source/ui/shells/basesh.cxx | 16 ++++++++-------- sw/source/ui/shells/beziersh.cxx | 4 ++-- sw/source/ui/shells/drawsh.cxx | 4 ++-- sw/source/ui/shells/drformsh.cxx | 4 ++-- sw/source/ui/shells/drwbassh.cxx | 4 ++-- sw/source/ui/shells/drwtxtex.cxx | 10 +++++----- sw/source/ui/shells/drwtxtsh.cxx | 6 +++--- sw/source/ui/shells/frmsh.cxx | 8 ++++---- sw/source/ui/shells/grfsh.cxx | 6 +++--- sw/source/ui/shells/grfshex.cxx | 4 ++-- sw/source/ui/shells/langhelper.cxx | 8 ++++---- sw/source/ui/shells/listsh.cxx | 8 ++++---- sw/source/ui/shells/mediash.cxx | 6 +++--- sw/source/ui/shells/slotadd.cxx | 12 ++++++------ sw/source/ui/shells/tabsh.cxx | 8 ++++---- sw/source/ui/shells/textdrw.cxx | 2 +- sw/source/ui/shells/textfld.cxx | 8 ++++---- sw/source/ui/shells/textglos.cxx | 4 ++-- sw/source/ui/shells/textidx.cxx | 4 ++-- sw/source/ui/shells/textsh.cxx | 10 +++++----- sw/source/ui/shells/textsh1.cxx | 20 ++++++++++---------- sw/source/ui/shells/textsh2.cxx | 8 ++++---- sw/source/ui/shells/txtattr.cxx | 8 ++++---- sw/source/ui/shells/txtcrsr.cxx | 2 +- sw/source/ui/shells/txtnum.cxx | 4 ++-- 26 files changed, 98 insertions(+), 98 deletions(-) (limited to 'sw/source/ui/shells') diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx index 7c6962f23efa..023936ffa5d6 100755 --- a/sw/source/ui/shells/annotsh.cxx +++ b/sw/source/ui/shells/annotsh.cxx @@ -57,17 +57,17 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -108,18 +108,18 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include -#include +#include #include -#include +#include #include "swabstdlg.hxx" //CHINA001 #include "chrdlg.hrc" //CHINA001 #include "misc.hrc" diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 9f5ee6195e81..c697a19e496f 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -32,8 +32,8 @@ #include "precompiled_sw.hxx" #include #include -#include -#include +#include +#include #ifndef _SVX_SVXIDS_HRC #include @@ -45,8 +45,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -55,11 +55,11 @@ #include #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx index cc3493fe5120..919531e84fb7 100644 --- a/sw/source/ui/shells/beziersh.cxx +++ b/sw/source/ui/shells/beziersh.cxx @@ -35,8 +35,8 @@ #include "cmdid.h" #include #include -#include -#include +#include +#include #include #include #include diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx index 4da015e2d586..8e5b20c67dd2 100644 --- a/sw/source/ui/shells/drawsh.cxx +++ b/sw/source/ui/shells/drawsh.cxx @@ -35,12 +35,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/ui/shells/drformsh.cxx index 97cac7006b98..d15c0b697e12 100644 --- a/sw/source/ui/shells/drformsh.cxx +++ b/sw/source/ui/shells/drformsh.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -59,7 +59,7 @@ #include "shells.hrc" #include "drwbassh.hxx" #include "drformsh.hxx" -#include +#include #include #include #include diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index 339c332c9135..f07f9a890e19 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -39,11 +39,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index 11874ca5b151..da71d364f6a3 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -59,9 +59,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -99,10 +99,10 @@ #include "misc.hrc" //modified on Jul. 30th -#include +#include #include #include -#include +#include #include #include diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index 9f1d49ebe067..a501d1a22f1e 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -32,8 +32,8 @@ #include "precompiled_sw.hxx" #include #include -#include -#include +#include +#include #include #include #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index f7957a66077a..dff0db8c909b 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -33,15 +33,15 @@ #include -#include +#include #include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx index 7203d9c91ebb..4a34d39588fe 100644 --- a/sw/source/ui/shells/grfsh.cxx +++ b/sw/source/ui/shells/grfsh.cxx @@ -40,9 +40,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx index ccf9d006c26f..9ee02b74e591 100644 --- a/sw/source/ui/shells/grfshex.cxx +++ b/sw/source/ui/shells/grfshex.cxx @@ -51,7 +51,7 @@ #endif #include #define _SVSTDARR_STRINGSSORTDTOR -#include +#include #include #include #include @@ -81,7 +81,7 @@ #include #include -#include +#include #include #include diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/ui/shells/langhelper.cxx index e5e4dbe81b29..fa27f72b36d7 100755 --- a/sw/source/ui/shells/langhelper.cxx +++ b/sw/source/ui/shells/langhelper.cxx @@ -48,11 +48,11 @@ #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx index 34f349befbc9..e0d6bdcc4228 100644 --- a/sw/source/ui/shells/listsh.cxx +++ b/sw/source/ui/shells/listsh.cxx @@ -40,11 +40,11 @@ #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx index ae1ed883cb8b..d0e3a94c970e 100644 --- a/sw/source/ui/shells/mediash.cxx +++ b/sw/source/ui/shells/mediash.cxx @@ -40,9 +40,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/ui/shells/slotadd.cxx index 333128a18db9..94c74122bdec 100644 --- a/sw/source/ui/shells/slotadd.cxx +++ b/sw/source/ui/shells/slotadd.cxx @@ -35,12 +35,12 @@ #include "uiitems.hxx" #include "cmdid.h" -#include +#include -#include -#include -#include +#include +#include +#include #include #include #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include @@ -130,7 +130,7 @@ #include "fmtline.hxx" #include #include -#include +#include #include #include #include diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 98818515a4d0..20b548efaf91 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -34,10 +34,10 @@ #ifndef _ZFORLIST_HXX #define _ZFORLIST_DECLARE_TABLE -#include +#include #endif -#include -#include +#include +#include #include #include #include @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx index 1d10c885bc17..ee714ee6ff55 100644 --- a/sw/source/ui/shells/textdrw.cxx +++ b/sw/source/ui/shells/textdrw.cxx @@ -57,7 +57,7 @@ #include #endif #include -#include +#include #include #include diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index 520d0635d52e..b1c4dbcbc9be 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -38,11 +38,11 @@ #include #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/ui/shells/textglos.cxx index 076697ac08ff..6eab16a31141 100644 --- a/sw/source/ui/shells/textglos.cxx +++ b/sw/source/ui/shells/textglos.cxx @@ -33,8 +33,8 @@ #include -#include -#include +#include +#include #include "errhdl.hxx" #include "view.hxx" diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx index 3eb67f725acd..62eeb00dcb20 100644 --- a/sw/source/ui/shells/textidx.cxx +++ b/sw/source/ui/shells/textidx.cxx @@ -37,8 +37,8 @@ #endif #include #include -#include -#include +#include +#include #include #include #include diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 615e2464e991..9dd27b760064 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -35,7 +35,7 @@ #define _SW_FRMVALID_HXX #include -#include +#include #include #include @@ -43,8 +43,8 @@ #include #endif #include -#include -#include +#include +#include #include #include #include @@ -52,9 +52,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index b2fe47d4e052..66ffdb9cea76 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -38,30 +38,30 @@ #include #include -#include +#include #include #include -#include +#include #include -#include +#include #include -#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include #include #include @@ -116,13 +116,13 @@ #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/ui/shells/textsh2.cxx index e3ba958d9e1a..417f235c190d 100644 --- a/sw/source/ui/shells/textsh2.cxx +++ b/sw/source/ui/shells/textsh2.cxx @@ -38,16 +38,16 @@ #endif #include -#include -#include +#include +#include #include #include #include #ifndef _MSGBOX_HXX //autogen #include #endif -#include -#include +#include +#include #include #include #include diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/ui/shells/txtattr.cxx index 8e30123a192b..a88f5c996f65 100644 --- a/sw/source/ui/shells/txtattr.cxx +++ b/sw/source/ui/shells/txtattr.cxx @@ -37,10 +37,10 @@ #ifndef _MSGBOX_HXX //autogen #include #endif -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/sw/source/ui/shells/txtcrsr.cxx b/sw/source/ui/shells/txtcrsr.cxx index 19b36367d49f..9c3a95e2006b 100644 --- a/sw/source/ui/shells/txtcrsr.cxx +++ b/sw/source/ui/shells/txtcrsr.cxx @@ -33,7 +33,7 @@ #include -#include +#include #ifndef __SBX_SBXVARIABLE_HXX //autogen #include #endif diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx index 3bbee6762431..6b4be8da6e14 100644 --- a/sw/source/ui/shells/txtnum.cxx +++ b/sw/source/ui/shells/txtnum.cxx @@ -37,8 +37,8 @@ #include #endif #include -#include -#include +#include +#include #include #include #include -- cgit From 1c93cfc40edd2997b8478d05c2250343930bd125 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 2 Nov 2009 20:49:14 +0100 Subject: #i106421#: create new cui resource file --- sw/source/ui/shells/drawdlg.cxx | 4 +--- sw/source/ui/shells/drwbassh.cxx | 8 ++++---- sw/source/ui/shells/drwtxtsh.cxx | 2 +- sw/source/ui/shells/frmsh.cxx | 3 +-- sw/source/ui/shells/textfld.cxx | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) (limited to 'sw/source/ui/shells') diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/ui/shells/drawdlg.cxx index 8cad5be21ccb..329465421dd4 100644 --- a/sw/source/ui/shells/drawdlg.cxx +++ b/sw/source/ui/shells/drawdlg.cxx @@ -83,7 +83,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if ( pFact ) { - SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, RID_SVXDLG_TEXT, pView ); + SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, pView ); USHORT nResult = pDlg->Execute(); if (nResult == RET_OK) @@ -111,7 +111,6 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq) AbstractSvxAreaTabDialog * pDlg = pFact->CreateSvxAreaTabDialog( NULL, &aNewAttr, pDoc, - RID_SVXDLG_AREA, pView); DBG_ASSERT(pDlg, "Dialogdiet fail!"); const SvxColorTableItem* pColorItem = (const SvxColorTableItem*) @@ -154,7 +153,6 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq) SfxAbstractTabDialog * pDlg = pFact->CreateSvxLineTabDialog( NULL, &aNewAttr, pDoc, - RID_SVXDLG_LINE, pObj, bHasMarked); DBG_ASSERT(pDlg, "Dialogdiet fail!"); diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index f07f9a890e19..3f5bb4fe6d77 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -238,7 +238,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) if ( pFact ) { AbstractSvxCaptionDialog* pCaptionDlg = - pFact->CreateCaptionDialog( NULL, pSdrView, RID_SVXDLG_CAPTION, nAllowedAnchors ); + pFact->CreateCaptionDialog( NULL, pSdrView, nAllowedAnchors ); pCaptionDlg->SetValidateFramePosLink( LINK(this, SwDrawBaseShell, ValidatePosition) ); pDlg = pCaptionDlg; DBG_ASSERT(pDlg, "Dialogdiet fail!"); @@ -251,7 +251,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) { AbstractSvxTransformTabDialog* pTransform = - pFact->CreateSvxTransformTabDialog( NULL, NULL, pSdrView, RID_SVXDLG_TRANSFORM, nAllowedAnchors ); + pFact->CreateSvxTransformTabDialog( NULL, NULL, pSdrView, nAllowedAnchors ); pTransform->SetValidateFramePosLink( LINK(this, SwDrawBaseShell, ValidatePosition) ); pDlg = pTransform; DBG_ASSERT(pDlg, "Dialogdiet fail!"); @@ -567,7 +567,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); - AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName, RID_SVXDLG_OBJECT_NAME); + AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName); OSL_ENSURE(pDlg, "Dialogdiet fail!"); pDlg->SetCheckNameHdl(LINK(this, SwDrawBaseShell, CheckGroupShapeNameHdl)); @@ -599,7 +599,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); - AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription, RID_SVXDLG_OBJECT_TITLE_DESC); + AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription); OSL_ENSURE(pDlg, "Dialogdiet fail!"); if(RET_OK == pDlg->Execute()) diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx index a501d1a22f1e..59e4bc01c5e3 100644 --- a/sw/source/ui/shells/drwtxtsh.cxx +++ b/sw/source/ui/shells/drwtxtsh.cxx @@ -577,7 +577,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq) { SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( &(GetView().GetViewFrame()->GetWindow()), - &aNewAttr, RID_SVXDLG_TEXT, pSdrView ); + &aNewAttr, pSdrView ); USHORT nResult = pDlg->Execute(); if (nResult == RET_OK) diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx index dff0db8c909b..4bd22a2c5822 100644 --- a/sw/source/ui/shells/frmsh.cxx +++ b/sw/source/ui/shells/frmsh.cxx @@ -618,8 +618,7 @@ void SwFrameShell::Execute(SfxRequest &rReq) AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog( NULL, aTitle, - aDescription, - RID_SVXDLG_OBJECT_TITLE_DESC ); + aDescription ); OSL_ENSURE(pDlg, "Dialogdiet fail!"); if ( pDlg->Execute() == RET_OK ) diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx index b1c4dbcbc9be..2e65b5a5ce48 100644 --- a/sw/source/ui/shells/textfld.cxx +++ b/sw/source/ui/shells/textfld.cxx @@ -463,7 +463,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) SvxAbstractDialogFactory* pFact2 = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact2, "Dialogdiet fail!"); - AbstractSvxPostItDialog* pDlg = pFact2->CreateSvxPostItDialog( pMDI, aSet, RID_SVXDLG_POSTIT, bTravel, TRUE ); + AbstractSvxPostItDialog* pDlg = pFact2->CreateSvxPostItDialog( pMDI, aSet, bTravel, TRUE ); DBG_ASSERT(pDlg, "Dialogdiet fail!"); pDlg->HideAuthor(); -- cgit