sw/source/uibase/dbui/dbmgr.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit 3930c14be021e325c1efdb3fa7858069085286f8 Author: Jan-Marek Glogowski <glo...@fbihome.de> Date: Tue Jul 29 15:38:32 2014 +0200 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.michael...@canonical.com> Tested-by: Björn Michaelsen <bjoern.michael...@canonical.com> diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 91875dd..59a43f6 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -895,8 +895,9 @@ bool SwDBManager::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 ), ::aEmptyOUStr );
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits