[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

[Jan-Marek Glogowski]

 sw/source/uibase/dbui/dbmgr.cxx |    5 -----
 1 file changed, 5 deletions(-)

New commits:
commit ea1caeed5cc70f41957d56af0ccb4bfdbd01cb87
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Thu Mar 19 15:48:37 2015 +0100

    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 at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 584efa3..00f4d29 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;