sw/source/ui/inc/unomailmerge.hxx | 4 ----
sw/source/ui/uno/unomailmerge.cxx | 25 ++++++++++---------------
2 files changed, 10 insertions(+), 19 deletions(-)
New commits:
commit a5504e49dba07f7217ad3c0980d8c0f21f9f646c
Author: Jan-Marek Glogowski <glo...@fbihome.de>
Date: Sun Dec 22 17:37:28 2013 +0100
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/ui/inc/unomailmerge.hxx
b/sw/source/ui/inc/unomailmerge.hxx
index 9b9a4c1..2be74c6 100644
--- a/sw/source/ui/inc/unomailmerge.hxx
+++ b/sw/source/ui/inc/unomailmerge.hxx
@@ -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
diff --git a/sw/source/ui/uno/unomailmerge.cxx
b/sw/source/ui/uno/unomailmerge.cxx
index f9d2b0c..717a095 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()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
