From 280ea32b9dd5b975a6d94f3555145dc3898c09ec Mon Sep 17 00:00:00 2001
From: Andre Fischer <af@openoffice.org>
Date: Tue, 20 Oct 2009 11:13:10 +0000
Subject: #i105895# Prevent old view shell from being deleted too early.

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

(limited to 'sd/source/ui')

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 233976585e58..ba5836e8f1db 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();
-- 
cgit 


From 3838b0a0e8c89da328481dd6d417f5e4ebaeb953 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Tue, 1 Dec 2009 08:45:04 +0100
Subject: #i10000# fix for lik-error on Windows

---
 sd/source/ui/dlg/ins_paste.cxx | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sd/source/ui')

diff --git a/sd/source/ui/dlg/ins_paste.cxx b/sd/source/ui/dlg/ins_paste.cxx
index 9f2c3bf0b6b6..422acbec4a73 100644
--- a/sd/source/ui/dlg/ins_paste.cxx
+++ b/sd/source/ui/dlg/ins_paste.cxx
@@ -31,6 +31,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sd.hxx"
 
+#ifdef SD_DLLIMPLEMENTATION
+#undef SD_DLLIMPLEMENTATION
+#endif
+
 #include "ins_paste.hrc"
 #include "ins_paste.hxx"
 
-- 
cgit