diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2013-12-22 17:37:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-12-24 00:18:47 +0000 |
| commit | a5504e49dba07f7217ad3c0980d8c0f21f9f646c (patch) | |
| tree | 9774227a6a152465f62d1d2e5a6ce2cdd5152e0b /sw/source/ui/uno/unomailmerge.cxx | |
| parent | b90d65f5c697806ee9b70a3ea8fb0f154241335f (diff) | |
Cleanup SwXMailMerge constructor.
Move all fixed initializers into constructor definition.
Change-Id: I7317deae43abf6a9e865c66969cb39a4b69de826
Reviewed-on: https://gerrit.libreoffice.org/7189
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/uno/unomailmerge.cxx')
| -rw-r--r-- | sw/source/ui/uno/unomailmerge.cxx | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index f9d2b0cf3066..717a0959330b 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -373,29 +373,24 @@ SwXMailMerge::SwXMailMerge() : aMergeListeners ( GetMailMergeMutex() ), aPropListeners ( GetMailMergeMutex() ), pPropSet( aSwMapProvider.GetPropertySet( PROPERTY_MAP_MAILMERGE ) ), + nDataCommandType(sdb::CommandType::TABLE), + nOutputType(MailMergeType::PRINTER), + bEscapeProcessing(sal_True), //!! allow to process properties like "Filter", "Order", ... + bSinglePrintJobs(sal_False), + bFileNameFromColumn(sal_False), bSendAsHTML(sal_False), bSendAsAttachment(sal_False), - bSaveAsSingleFile(sal_False) - + bSaveAsSingleFile(sal_False), + bDisposing(sal_False) { // create empty document // like in: SwModule::InsertEnv (appenv.cxx) - SwDocShell *pDocShell = new SwDocShell( SFX_CREATE_MODE_STANDARD ); - xDocSh = pDocShell; + xDocSh = new SwDocShell( SFX_CREATE_MODE_STANDARD ); xDocSh->DoInitNew( 0 ); SfxViewFrame *pFrame = SfxViewFrame::LoadHiddenDocument( *xDocSh, 0 ); SwView *pView = (SwView*) pFrame->GetViewShell(); - pView->AttrChangedNotify( &pView->GetWrtShell() );//So that SelectShell is called. - - xModel = pDocShell->GetModel(); - - nDataCommandType = sdb::CommandType::TABLE; - nOutputType = MailMergeType::PRINTER; - bEscapeProcessing = sal_True; //!! allow to process properties like "Filter", "Order", ... - bSinglePrintJobs = sal_False; - bFileNameFromColumn = sal_False; - - bDisposing = sal_False; + pView->AttrChangedNotify( &pView->GetWrtShell() ); //So that SelectShell is called. + xModel = xDocSh->GetModel(); } SwXMailMerge::~SwXMailMerge() |