diff options
| author | Szymon Kłos <eszkadev@gmail.com> | 2014-07-23 16:38:34 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-24 15:08:11 +0000 |
| commit | be97f2f553bfb1a584646ad75bd932e686ba80c2 (patch) | |
| tree | 971ed8ebc6dd0d90371e9e0360ed1c418d7e34a6 /sw/source/ui/dbui/mailmergewizard.cxx | |
| parent | 27b7152609a336c95c86fe31eb075e1955f4818a (diff) | |
DLG_MAILMERGEWIZARD conversion to .ui
Conflicts:
sw/inc/dbui.hrc
Change-Id: Id224fd3a99abe8ec497a38c40b099dd7ae917890
Reviewed-on: https://gerrit.libreoffice.org/10494
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/dbui/mailmergewizard.cxx')
| -rw-r--r-- | sw/source/ui/dbui/mailmergewizard.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 59fdfad0f6d5..b816633ede75 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -36,15 +36,13 @@ #include <vcl/msgbox.hxx> #include <helpid.h> -#include <mailmergewizard.hrc> using namespace svt; using namespace ::com::sun::star; SwMailMergeWizard::SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rItem) : RoadmapWizard(&rView.GetViewFrame()->GetWindow(), - SW_RES(DLG_MAILMERGEWIZARD), - WZB_NEXT|WZB_PREVIOUS|WZB_FINISH|WZB_CANCEL|WZB_HELP), + static_cast<sal_uInt32>(WZB_NEXT|WZB_PREVIOUS|WZB_FINISH|WZB_CANCEL|WZB_HELP)), m_pSwView(&rView), m_bDocumentLoad( false ), m_rConfigItem(rItem), @@ -60,7 +58,6 @@ SwMailMergeWizard::SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rItem m_sFinish( SW_RES( ST_FINISH )), m_nRestartPage( MM_DOCUMENTSELECTPAGE ) { - FreeResource(); ShowButtonFixedLine(true); defaultButton(WZB_NEXT); enableButtons(WZB_FINISH, false); |