[ooo-build-commit] Branch 'ooo/OOO320' - sd/source

[Jan Holesovsky]

 sd/source/ui/view/Outliner.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit d1b2fccb5ce34a086fcc14a1fc7214492d7fa8c8
Author: Oliver Bolte <obo at openoffice.org>
Date:   Mon Nov 2 14:21:10 2009 +0000

    CWS-TOOLING: integrate CWS impress180
    2009-10-28 13:52:06 +0100 cl  r277241 : #i106146# fixed also the other 5 occourences of the same buggy code
    2009-10-22 13:02:37 +0200 sj  r277114 : #i106130# fixed crash accessing already deleted shape
    2009-10-22 11:42:03 +0200 cl  r277113 : #i106146# do not crash if there is no numbering rule in itemset
    2009-10-20 13:37:58 +0200 sj  r277049 : #i102257# fixed gpf when loading some types of pict graphics
    2009-10-20 13:13:10 +0200 af  r277046 : #i105895# Prevent old view shell from being deleted too early.

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 8a67904..0d38130 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -334,6 +334,9 @@ void Outliner::EndSpelling (void)
 {
     if (mbViewShellValid)
     {
+        // Keep old view shell alive until we release the outliner view.
+        ::boost::shared_ptr<ViewShell> pOldViewShell (mpViewShell);
+
         ViewShellBase* pBase = PTR_CAST(ViewShellBase,SfxViewShell::Current());
         if (pBase != NULL)
             mpViewShell = pBase->GetMainViewShell();