diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-07-29 15:38:32 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-09-30 09:49:03 +0200 |
| commit | 699070c073804505496f1bf944baca15fe995e10 (patch) | |
| tree | 9dbac2776aa7eb47f360ab0f5e0e2dcf2bd40e38 | |
| parent | 855f5bc2e020d877c2931c47ffca41ec9bc6c67c (diff) | |
MM: restore the non-saving wizard behaviour
The wizard didn't save the MM source document, even if it was modified.
Change-Id: I0c7fb6abd31934bab7a33d7a9c93222af3e35ee5
Reviewed-on: https://gerrit.libreoffice.org/10986
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
(cherry picked from commit 3930c14be021e325c1efdb3fa7858069085286f8)
Conflicts:
sw/source/uibase/dbui/dbmgr.cxx
| -rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 667723196fa9..a171ef704558 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -906,8 +906,9 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell, // Try saving the source document SfxDispatcher* pSfxDispatcher = pSourceShell->GetView().GetViewFrame()->GetDispatcher(); SwDocShell* pSourceDocSh = pSourceShell->GetView().GetDocShell(); - pSfxDispatcher->Execute( pSourceDocSh->HasName() ? SID_SAVEDOC : SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD); - if( !pSourceDocSh->IsModified() ) + if( !bMergeOnly && pSourceDocSh->IsModified() ) + pSfxDispatcher->Execute( pSourceDocSh->HasName() ? SID_SAVEDOC : SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD); + if( bMergeOnly || !pSourceDocSh->IsModified() ) { const SfxFilter* pStoreToFilter = SwIoSystem::GetFileFilter( pSourceDocSh->GetMedium()->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), ::aEmptyStr ); |