diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-07-16 15:05:04 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-21 08:20:51 +0100 |
commit | 182a74d937088f0f08850014a7b918719e106b7d (patch) | |
tree | 0a286f4a6a5adcd32fd32a26b61b247d247c93d2 /sw/source/uibase/shells/txtnum.cxx | |
parent | 00657aef09d854c74fb426a935a3e8b1fc390bb0 (diff) |
de-hrc various things
e.g. helpid[s].hrc -> helpids.h
and insert include guards where missing
move "ordinary" defines into .hxx files
remove .hrc entries that are used as arguments to dialog factory
when a dedicated method can be added instead
Change-Id: I792fb8eb0adfaa63cf354e6e57401fc943e9196e
Diffstat (limited to 'sw/source/uibase/shells/txtnum.cxx')
-rw-r--r-- | sw/source/uibase/shells/txtnum.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx index a435c410e7a4..718f538ba77c 100644 --- a/sw/source/uibase/shells/txtnum.cxx +++ b/sw/source/uibase/shells/txtnum.cxx @@ -183,10 +183,9 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq) pDocSh->PutItem(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(pDocSh))); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialog creation failed!"); - ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSwTabDialog( DLG_SVXTEST_NUM_BULLET, - GetView().GetWindow(), &aSet, GetShell())); - OSL_ENSURE(pDlg, "Dialog creation failed!"); + assert(pFact && "Dialog creation failed!"); + ScopedVclPtr<SfxAbstractTabDialog> pDlg(pFact->CreateSvxNumBulletTabDialog(GetView().GetWindow(), &aSet, GetShell())); + assert(pDlg && "Dialog creation failed!"); const SfxStringItem* pPageItem = rReq.GetArg<SfxStringItem>(FN_PARAM_1); if ( pPageItem ) pDlg->SetCurPageId( OUStringToOString( pPageItem->GetValue(), RTL_TEXTENCODING_UTF8 ) ); |