Kaydet (Commit) a5504e49 authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski Kaydeden (comit) Caolán McNamara

Cleanup SwXMailMerge constructor.

Move all fixed initializers into constructor definition.

Change-Id: I7317deae43abf6a9e865c66969cb39a4b69de826
Reviewed-on: https://gerrit.libreoffice.org/7189Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst b90d65f5
......@@ -113,7 +113,6 @@ class SwXMailMerge :
sal_Bool bSinglePrintJobs;
sal_Bool bFileNameFromColumn;
OUString sInServerPassword;
OUString sOutServerPassword;
OUString sSubject;
......@@ -133,11 +132,8 @@ class SwXMailMerge :
OUString sSaveFilterOptions;
com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSaveFilterData;
sal_Bool bDisposing;
void launchEvent( const com::sun::star::beans::PropertyChangeEvent &rEvt ) const;
// disallow use of copy-constructor and assignment-operator for now
......
......@@ -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()
......
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