diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2015-03-19 15:48:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-03-19 16:31:40 +0000 |
| commit | ea1caeed5cc70f41957d56af0ccb4bfdbd01cb87 (patch) | |
| tree | dc564c8e6f47a9d460026a7698edab46d5a68d7e | |
| parent | 32a466e6a95723f26d20a20e74d1f0e563d5dbca (diff) | |
tdf#70346 MM: don't restore section visibility
Mail merging the current document is expected to change the
source document. So there is no need to try to restore the pre-MM
document, even the visibility. In the end any effort is futile,
as field changes cannot be undone.
Even worse: it introduced a regression using the "data to fields"
function from the data source manager (F4), which would never
set the correct section visibility.
We need to copy the document to prevent changes to the source
document and skip the quite probably unexpected save in MM.
Change-Id: I814905f1566a63b2ee14cb5f6d08da34c05942aa
(cherry picked from commit adb98d94ca1059b56d6b6726ca9aea96ecae8a96)
Reviewed-on: https://gerrit.libreoffice.org/14906
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 584efa39c4af..00f4d29d74ae 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -441,11 +441,6 @@ bool SwDBManager::MergeNew( const SwMergeDescriptor& rMergeDesc ) DELETEZ( pImpl->pMergeData ); - // Recalculate original section visibility states, as field changes aren't - // tracked (not undo-able). Has to be done, after pImpl->pMergeData is - // gone, otherwise merge data is used for calculation! - rMergeDesc.rSh.SwViewShell::UpdateFlds(); - bInMerge = false; return bRet; |