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/textsh.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/textsh.cxx')
| -rw-r--r-- | sw/source/uibase/shells/textsh.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index cea962a2408e..2c2ba48106f2 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -105,9 +105,6 @@ using namespace ::com::sun::star; #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> #include "swabstdlg.hxx" -#include <misc.hrc> -#include <table.hrc> -#include <frmui.hrc> #include <unomid.h> #include <IDocumentDrawModelAccess.hxx> #include <drawdoc.hxx> @@ -527,9 +524,9 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) case FN_FORMAT_COLUMN : { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - OSL_ENSURE(pFact, "Dialog creation failed!"); - ScopedVclPtr<VclAbstractDialog> pColDlg(pFact->CreateVclAbstractDialog( GetView().GetWindow(), rSh, DLG_COLUMN)); - OSL_ENSURE(pColDlg, "Dialog creation failed!"); + assert(pFact && "Dialog creation failed!"); + ScopedVclPtr<VclAbstractDialog> pColDlg(pFact->CreateSwColumnDialog(GetView().GetWindow(), rSh)); + assert(pColDlg && "Dialog creation failed!"); pColDlg->Execute(); } break; |