diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-01-10 23:36:52 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-08-20 09:40:41 +0200 |
| commit | 671482310c3b6de4df8757618192d57a93d25ae4 (patch) | |
| tree | fff4ae1d2484bdc0fb4bdb035941dfbaadbab119 /sw/source | |
| parent | 16804430f4f768b4ad6a583c23ff2223d27d6ca9 (diff) | |
Drop unused nMergeType from SwNewDBMgr
All code uses the nMergeType from the SwMergeDescriptor. Actually
there is just code setting the nMergeType in the SwNewDBMgr but
none reading or comparing it.
I don't know if the removed assignments actually should work on a
SwMergeDescriptor object, so some parts of mail merge may already
have been broken.
Reviewed-on: https://gerrit.libreoffice.org/7432
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit e3e6ad0e5c36531d8002c24c5e41a99ff597c095)
Conflicts:
sw/inc/dbmgr.hxx
Change-Id: Ic8c52e6171f122d3837d9f2de81053e30ac8f5b7
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmoutputpage.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/uiview/view2.cxx | 3 |
3 files changed, 0 insertions, 10 deletions
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 3272fd2e87da..186789aaae16 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -315,8 +315,6 @@ static sal_Bool lcl_GetColumnCnt(SwDSParam* pParam, --------------------------------------------------------------------*/ sal_Bool SwNewDBMgr::MergeNew(const SwMergeDescriptor& rMergeDesc ) { - SetMergeType( rMergeDesc.nMergeType ); - OSL_ENSURE(!bInMerge && !pImpl->pMergeData, "merge already activated!"); SwDBData aData; @@ -708,7 +706,6 @@ sal_Bool SwNewDBMgr::GetColumnNames(ListBox* pListBox, Description: CTOR --------------------------------------------------------------------*/ SwNewDBMgr::SwNewDBMgr() : - nMergeType(DBMGR_INSERT), bInitDBFields(sal_False), bInMerge(sal_False), bMergeSilent(sal_False), @@ -1350,8 +1347,6 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, SW_MOD()->SetView(&pSourceShell->GetView()); } - - nMergeType = DBMGR_INSERT; } if(bEMail) diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index cf3d9b06b20e..f6be127277e2 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -910,7 +910,6 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl) sPages += OUString(" - "); sPages += OUString::valueOf( rEndInfo.nEndPageInTarget ); - SwWrtShell& rSh = pTargetView->GetWrtShell(); pTargetView->SetMailMergeConfigItem(&rConfigItem, 0, sal_False); if(m_pTempPrinter) { @@ -923,7 +922,6 @@ IMPL_LINK_NOARG(SwMailMergeOutputPage, PrintHdl_Impl) SfxObjectShell* pObjSh = pTargetView->GetViewFrame()->GetObjectShell(); SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE), pObjSh)); - rSh.GetNewDBMgr()->SetMergeType( DBMGR_MERGE_DOCUMENTS ); SfxBoolItem aMergeSilent(SID_SILENT, sal_False); m_pWizard->enableButtons(WZB_CANCEL, sal_False); diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index 744428ca716a..17fdfa3d8713 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -1058,7 +1058,6 @@ void SwView::Execute(SfxRequest &rReq) rSh.EnterStdMode(); // Wechsel in Textshell erzwingen; ist fuer // das Mischen von DB-Feldern notwendig. AttrChangedNotify( &rSh ); - pNewDBMgr->SetMergeType( DBMGR_MERGE ); Sequence<PropertyValue> aProperties(3); PropertyValue* pValues = aProperties.getArray(); @@ -2384,8 +2383,6 @@ void SwView::GenerateFormLetter(sal_Bool bUseCurrentDocument) if (pNewDBMgr) { - pNewDBMgr->SetMergeType( DBMGR_MERGE ); - Sequence<PropertyValue> aProperties(3); PropertyValue* pValues = aProperties.getArray(); pValues[0].Name = "DataSourceName"; |