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

[Caolán McNamara]

 sc/source/core/data/documen9.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e7f03c29a4c915674247be1946af2101b5a3d7d5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 12 15:01:06 2014 +0000

    Resolves: fdo#87245 crash because clip doc doesn't own DocumentPool
    
    multiple documents sharing the same doc pool so can't unset its
    secondary here.
    
    Here the assumption is that SharePooledResources has always been called on Clip
    or Undo docs (otherwise persumably need a flag which SharePooledResources
    toggles on)
    
    Change-Id: Ibcdbe5f698102dc683c290d3bd581c31e214765f
    (cherry picked from commit 7a85674c93150d6f5a59e998158909365b47d761)
    Reviewed-on: https://gerrit.libreoffice.org/13451
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 8a23df1..4fe1a11 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -242,7 +242,7 @@ void ScDocument::DeleteDrawLayer()
 {
     //UUUU remove DrawingLayer's SfxItemPool from Calc's SfxItemPool where
     // it is registered as secondary pool
-    if(xPoolHelper.is())
+    if (xPoolHelper.is() && !IsClipOrUndo()) //Using IsClipOrUndo as a proxy for SharePooledResources called
     {
         ScDocumentPool* pLocalPool = xPoolHelper->GetDocPool();