cmcfixes74: merge with DEV300 m80

3 files changed, 36 insertions, 8 deletions

diff --git a/sd/qa/unoapi/sd.sce b/sd/qa/unoapi/sd.sce
index 84a5216c5ee1..c964c1ba0090 100644
--- a/sd/qa/unoapi/sd.sce
+++ b/sd/qa/unoapi/sd.sce
@@ -1,11 +1,11 @@
 -o sd.AccessibleDrawDocumentView
--o sd.AccessibleOutlineView
+#i111199 -o sd.AccessibleOutlineView
 #i35935# -o sd.AccessibleSlideView
--o sd.DrawController_DrawView
--o sd.DrawController_HandoutView
--o sd.DrawController_NotesView
--o sd.DrawController_OutlineView
--o sd.DrawController_PresentationView
+#i111042# -o sd.DrawController_DrawView
+#i111042# -o sd.DrawController_HandoutView
+#i111042# -o sd.DrawController_NotesView
+#i111043# -o sd.DrawController_OutlineView
+#i111042# -o sd.DrawController_PresentationView
 -o sd.SdDocLinkTargets
 -o sd.SdDrawPage
 -o sd.SdDrawPagesAccess
@@ -16,7 +16,7 @@
 -o sd.SdMasterPagesAccess
 -o sd.SdPageLinkTargets
 -o sd.SdXCustomPresentation
--o sd.SdXCustomPresentationAccess
+#i111329 -o sd.SdXCustomPresentationAccess
 #i84994# -o sd.SdXImpressDocument
 -o sd.SdXPresentation
 #i87746 -o sd.SdXShape
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index f07245d1ff31..c9d083db86d9 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -5358,6 +5358,12 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
                             pClientTextBox->Write( pOut->GetData(), pOut->Tell() );
                             delete pOut, aTextRule.pOut = NULL;
                         }
+                        if ( aExtBu.Tell() )
+                        {
+                            if ( !pClientData )
+                                pClientData = new SvMemoryStream( 0x200, 0x200 );
+                            ImplProgTagContainer( pClientData, &aExtBu );
+                        }
                     }
                 }
             }
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 4b9aecb02ac5..55ba07c3fa23 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -154,12 +154,32 @@ void DrawViewShell::Deactivate(BOOL bIsMDIActivate)
     ViewShell::Deactivate(bIsMDIActivate);
 }
 
+namespace
+{
+    class LockUI
+    {
+    private:
+        void Lock(bool bLock);
+        SfxViewFrame *mpFrame;
+    public:
+        LockUI(SfxViewFrame *pFrame) : mpFrame(pFrame) { Lock(true); }
+        ~LockUI() { Lock(false); }
+
+    };
+
+    void LockUI::Lock(bool bLock)
+    {
+        if (!mpFrame)
+            return;
+        mpFrame->Enable( !bLock );
+    }
+}
+
 /*************************************************************************
 |*
 |* Wird gerufen, wenn sich der Selektionszustand der View aendert
 |*
 \************************************************************************/
-
 void DrawViewShell::SelectionHasChanged (void)
 {
     Invalidate();
@@ -213,6 +233,8 @@ void DrawViewShell::SelectionHasChanged (void)
             // we need to deselect it now
             if (!pOleObj)
             {
+                //#i47279# disable frame until after object has completed unload
+                LockUI aUILock(GetViewFrame());
                 pIPClient->DeactivateObject();
                 //HMHmpDrView->ShowMarkHdl();
             }