Kaydet (Commit) 0473818b authored tarafından Michaël Lefèvre's avatar Michaël Lefèvre Kaydeden (comit) Noel Grandin

tdf#60739 code factorisation

Limit duplication for SfxRequest FN_FORMAT_FOOTNOTE_DLG in sw shells

Change-Id: I6f1ce98acf44a3811e4666a6bd9952232429f55a
Reviewed-on: https://gerrit.libreoffice.org/14312Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 530226ca
......@@ -545,6 +545,7 @@ public:
void GetState(SfxItemSet&);
void StateStatusLine(SfxItemSet&);
void UpdateWordCount(SfxShell*, sal_uInt16);
void ExecFormatFootnote();
// functions for drawing
void SetDrawFuncPtr(SwDrawBase* pFuncPtr);
......
......@@ -436,12 +436,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
}
case FN_FORMAT_FOOTNOTE_DLG:
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwFootNoteOptionDlg(rView.GetWindow(), rView.GetWrtShell()));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
rView.ExecFormatFootnote();
break;
}
case FN_NUMBERING_OUTLINE_DLG:
......
......@@ -298,12 +298,7 @@ void SwDrawShell::Execute(SfxRequest &rReq)
break;
case FN_FORMAT_FOOTNOTE_DLG:
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwFootNoteOptionDlg(GetView().GetWindow(), GetView().GetWrtShell()));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
GetView().ExecFormatFootnote();
break;
}
case FN_NUMBERING_OUTLINE_DLG:
......
......@@ -376,12 +376,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
break;
case FN_FORMAT_FOOTNOTE_DLG:
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact && "SwAbstractDialogFactory fail!");
boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwFootNoteOptionDlg(GetView().GetWindow(), rView.GetWrtShell()));
assert(pDlg && "Dialog creation failed!");
pDlg->Execute();
GetView().ExecFormatFootnote();
break;
}
case FN_NUMBERING_OUTLINE_DLG:
......
......@@ -237,12 +237,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
break;
case FN_FORMAT_FOOTNOTE_DLG:
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact);
boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwFootNoteOptionDlg(GetView().GetWindow(), GetView().GetWrtShell()));
assert(pDlg);
pDlg->Execute();
GetView().ExecFormatFootnote();
break;
}
case FN_NUMBERING_OUTLINE_DLG:
......
......@@ -472,12 +472,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
break;
case FN_FORMAT_FOOTNOTE_DLG:
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwFootNoteOptionDlg(GetView().GetWindow(), rWrtSh));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
GetView().ExecFormatFootnote();
break;
}
case SID_INSERTDOC:
......
......@@ -78,6 +78,7 @@ using namespace ::com::sun::star;
#include <unomid.h>
#include <boost/scoped_ptr.hpp>
#include "swabstdlg.hxx"
SFX_IMPL_NAMED_VIEWFACTORY(SwView, "Default")
{
......@@ -594,4 +595,14 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
rReq.Done();
}
void SwView::ExecFormatFootnote()
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
boost::scoped_ptr<VclAbstractDialog> pDlg(pFact->CreateSwFootNoteOptionDlg(GetWindow(), GetWrtShell()));
OSL_ENSURE(pDlg, "Dialog creation failed!");
pDlg->Execute();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment