sw/source/ui/envelp/envfmt.cxx | 5 ++++- sw/source/ui/shells/drwtxtex.cxx | 2 +- sw/source/ui/shells/textsh1.cxx | 12 ++++++------ 3 files changed, 11 insertions(+), 8 deletions(-)
New commits: commit d0cba6519d9952eee15f097b8b06b2a66e8c169a Author: Zolnai Tamás <zolnaitamas2...@gmail.com> Date: Fri Jun 21 16:01:18 2013 +0200 Fix indentation Change-Id: I4feae9998647694efaad776396aca2ce8f177152 diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index 340e938..534e293 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -963,13 +963,13 @@ void SwTextShell::Execute(SfxRequest &rReq) if ( !bUseDialog ) { if ( nSlot == SID_ATTR_PARA_LRSPACE) - { - SvxLRSpaceItem aParaMargin((const SvxLRSpaceItem&)pArgs->Get(nSlot)); - aParaMargin.SetWhich( RES_LR_SPACE); - aCoreSet.Put(aParaMargin); - pSet = &aCoreSet; + { + SvxLRSpaceItem aParaMargin((const SvxLRSpaceItem&)pArgs->Get(nSlot)); + aParaMargin.SetWhich( RES_LR_SPACE); + aCoreSet.Put(aParaMargin); + pSet = &aCoreSet; - } else + } else pSet = (SfxItemSet*) pArgs; } commit 0c688abd4460a209614fb4560fc7c075cd15c34a Author: Zolnai Tamás <zolnaitamas2...@gmail.com> Date: Fri Jun 21 15:38:37 2013 +0200 Use the draw specific paragraph dialog id The abstarct dialog creation works the same with the two existent id (DLG_PARA,DLG_DRAWPARA), that's why it was not bugous just nonconsistent. Change-Id: Id0f46d58ff957b1451bedb4444127fc2d641bd16 diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx index ce9f3e7..11d2626 100644 --- a/sw/source/ui/shells/drwtxtex.cxx +++ b/sw/source/ui/shells/drwtxtex.cxx @@ -421,7 +421,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); - SfxAbstractTabDialog* pDlg = pFact->CreateSwParaDlg( GetView().GetWindow(), GetView(), aDlgAttr,DLG_STD, DLG_PARA, 0, sal_True ); + SfxAbstractTabDialog* pDlg = pFact->CreateSwParaDlg( GetView().GetWindow(), GetView(), aDlgAttr,DLG_STD, DLG_DRAWPARA, 0, sal_True ); OSL_ENSURE(pDlg, "Dialogdiet fail!"); sal_uInt16 nRet = pDlg->Execute(); if(RET_OK == nRet) commit 23b1af10016f5297e9ae9c3aa8022b86668b3a2e Author: Zolnai Tamás <zolnaitamas2...@gmail.com> Date: Fri Jun 21 15:22:49 2013 +0200 Use abstract tab dialog to create paragraph dialog In general this abstraction is used. Change-Id: Ibd17f468368fef5300c383b30f82d5d6d0c85e7d diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 462290c..9fd782c 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -352,8 +352,11 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton ) // set BoxInfo ::PrepareBoxInfo( aTmpSet, *pSh ); - SwParaDlg *pDlg = new SwParaDlg(GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, DLG_ENVELOP, &pColl->GetName()); + SwAbstractDialogFactory* pFact = swui::GetFactory(); + OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); + SfxAbstractTabDialog *pDlg = pFact->CreateSwParaDlg(GetParentSwEnvDlg(), pSh->GetView(), aTmpSet, DLG_ENVELOP, DLG_PARA, &pColl->GetName()); + OSL_ENSURE(pDlg, "Dialogdiet fail!"); if ( pDlg->Execute() == RET_OK ) { // maybe relocate defaults
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits