[Libreoffice-commits] core.git: sw/source

[Luboš Luňák]

 sw/source/uibase/dbui/dbmgr.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 36e1d19af8585bc2f36322ba32acbed46e58c4de
Author: Luboš Luňák <l.lunak at collabora.com>
Date:   Sun Oct 5 22:09:44 2014 +0200

    do not copy properties from oneself
    
    Change-Id: I6f32e27c7b87c2a15ad920d035f528c29ce2219d

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 28a5d9d..225b3cc 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -985,7 +985,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell,
                                                 rMaster.GetFooter().IsActive();
 
                 // copy compatibility options
-                pTargetShell->GetDoc()->ReplaceCompatabilityOptions( *pTargetShell->GetDoc());
+                pTargetShell->GetDoc()->ReplaceCompatabilityOptions( *pSourceShell->GetDoc());
                 // #72821# copy dynamic defaults
                 pTargetShell->GetDoc()->ReplaceDefaults( *pSourceShell->GetDoc());