cws renaissance2: rebase m80

8 files changed, 96 insertions, 75 deletions

diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index e592ba45a27e..c91fee735954 100755
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -1437,6 +1437,8 @@ void SAL_CALL SdStyleSheetPool::dispose() throw (RuntimeException)
 
 //      EndListening( *mpDoc );
         mpDoc = 0;
+
+        Clear();
     }
 }
 
@@ -1475,3 +1477,15 @@ SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet )
 }
 
 // --------------------------------------------------------------------
+
+void SAL_CALL SdStyleSheetPool::acquire (void) throw ()
+{
+    SdStyleSheetPoolBase::acquire();
+}
+
+void SAL_CALL SdStyleSheetPool::release (void) throw ()
+{
+    SdStyleSheetPoolBase::release();
+}
+
+// --------------------------------------------------------------------
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index f07245d1ff31..c9d083db86d9 100755
--- 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/animations/CustomAnimation.src b/sd/source/ui/animations/CustomAnimation.src
index 1320e75d3e36..449107f05c75 100755
--- a/sd/source/ui/animations/CustomAnimation.src
+++ b/sd/source/ui/animations/CustomAnimation.src
@@ -202,7 +202,7 @@ Menu RID_CUSTOMANIMATION_FONTSTYLE_POPUP
         MenuItem
         {
             Identifier = CM_UNDERLINED ;
-            Text [ en-US ] = "Underlinded" ;
+            Text [ en-US ] = "Underlined" ;
         };
     };
 };
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index de1dadc3ae43..9fb0007cc72c 100755
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -84,6 +84,7 @@
 #include "undoback.hxx"
 #include "sdabstdlg.hxx"
 #include "sdresid.hxx"
+#include "sdundogr.hxx"
 #include "helpids.h"
 
 namespace sd {
@@ -359,6 +360,8 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
                     ( ( (XFillStyleItem*) aMergedAttr.GetItem( XATTR_FILLSTYLE ) )->GetValue() == XFILL_NONE ) ) )
                 mbPageBckgrdDeleted = TRUE;
 
+            bool bSetToAllPages = false;
+
             // Ask, wether the setting are for the background-page or for the current page
             if( !mbMasterPage && bChanges )
             {
@@ -374,7 +377,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
                         aTit,
                         aTxt );
                     aQuestionBox.SetImage( QueryBox::GetStandardImage() );
-                    mbMasterPage = ( RET_YES == aQuestionBox.Execute() );
+                    bSetToAllPages = ( RET_YES == aQuestionBox.Execute() );
                 }
 
                 if( mbPageBckgrdDeleted )
@@ -403,6 +406,48 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
                 pStyleSheet->GetItemSet().Put( *(pTempSet.get()) );
                 pStyleSheet->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
             }
+            else if( bSetToAllPages )
+            {
+                String aComment(SdResId(STR_UNDO_CHANGE_PAGEFORMAT));
+                SfxUndoManager* pUndoMgr = mpDocSh->GetUndoManager();
+                pUndoMgr->EnterListAction(aComment, aComment);
+                SdUndoGroup* pUndoGroup = new SdUndoGroup(mpDoc);
+                pUndoGroup->SetComment(aComment);
+
+                //Set background on all master pages
+                USHORT nMasterPageCount = mpDoc->GetMasterSdPageCount(ePageKind);
+                for (USHORT i = 0; i < nMasterPageCount; ++i)
+                {
+                    SdPage *pMasterPage = mpDoc->GetMasterSdPage(i, ePageKind);
+                    SdStyleSheet *pStyle =
+                        pMasterPage->getPresentationStyle(HID_PSEUDOSHEET_BACKGROUND);
+                    StyleSheetUndoAction* pAction =
+                        new StyleSheetUndoAction(mpDoc, (SfxStyleSheet*)pStyle, &(*pTempSet.get()));
+                    pUndoGroup->AddAction(pAction);
+                    pStyle->GetItemSet().Put( *(pTempSet.get()) );
+                    pStyle->Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
+                }
+
+                //Remove background from all pages to reset to the master bg
+                USHORT nPageCount(mpDoc->GetSdPageCount(ePageKind));
+                for(USHORT i=0; i<nPageCount; ++i)
+                {
+                    SdPage *pPage = mpDoc->GetSdPage(i, ePageKind);
+
+                    const SfxItemSet& rFillAttributes = pPage->getSdrPageProperties().GetItemSet();
+                       if(XFILL_NONE != ((const XFillStyleItem&)rFillAttributes.Get(XATTR_FILLSTYLE)).GetValue())
+                    {
+                        SdBackgroundObjUndoAction *pBackgroundObjUndoAction = new SdBackgroundObjUndoAction(*mpDoc, *pPage, rFillAttributes);
+                        pUndoGroup->AddAction(pBackgroundObjUndoAction);
+                        pPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
+                        pPage->ActionChanged();
+                    }
+                }
+
+                pUndoMgr->AddUndoAction(pUndoGroup);
+                pUndoMgr->LeaveListAction();
+
+            }
 
             const SfxPoolItem *pItem;
             if( SFX_ITEM_SET == pTempSet->GetItemState( EE_PARA_WRITINGDIR, sal_False, &pItem ) )
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index bb6f6e7b6908..c1df44e52677 100755
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -104,6 +104,7 @@ FuPoor::FuPoor (
       bNoScrollUntilInside (TRUE),
       bScrollable (FALSE),
       bDelayActive (FALSE),
+      bFirstMouseMove (FALSE),
       // #95491# remember MouseButton state
       mnCode(0)
 {
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index d58cfcb3f6c9..0afcb7df053b 100755
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -51,7 +51,8 @@
 
 #include <sfx2/imagemgr.hxx>
 #include <sfx2/request.hxx>
-#include "sfx2/docfile.hxx"
+#include <sfx2/docfile.hxx>
+#include <sfx2/app.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/svdoole2.hxx>
 
@@ -3472,39 +3473,11 @@ void SAL_CALL SlideshowImpl::gotoNextSlide(  ) throw (RuntimeException)
                 {
                     if( maPresSettings.mnPauseTimeout )
                     {
-                        boost::scoped_ptr< Graphic > pGraphic;
-
-                        if( maPresSettings.mbShowPauseLogo )
+                        if( mpShowWindow )
                         {
-                            // load about image from module path
-                            String aBmpFileName( RTL_CONSTASCII_USTRINGPARAM("about.bmp") );
-                            INetURLObject aObj( SvtPathOptions().GetModulePath(), INET_PROT_FILE );
-                            aObj.insertName( aBmpFileName );
-                            SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ );
-                            if ( !aStrm.GetError() )
-                            {
-                                Bitmap aBmp;
-                                aStrm >> aBmp;
-                                pGraphic.reset( new Graphic(aBmp) );
-                                pGraphic->SetPrefMapMode(MAP_PIXEL);
-                            }
-                            else
-                            {
-                                //if no image is located in the module path
-                                //use default logo from iso resource:
-
-                                String aMgrName( RTL_CONSTASCII_USTRINGPARAM( "iso" ) );
-                                boost::scoped_ptr< ResMgr > pResMgr( ResMgr::CreateResMgr( U2S( aMgrName )) );
-                                DBG_ASSERT(pResMgr,"No ResMgr found");
-                                if(pResMgr.get())
-                                {
-                                    pGraphic.reset( new Graphic( Bitmap( ResId( RID_DEFAULT_ABOUT_BMP_LOGO, *pResMgr ) ) ) );
-                                    pGraphic->SetPrefMapMode(MAP_PIXEL);
-                                }
-                            }
+                            Graphic aGraphic( SfxApplication::GetApplicationLogo().GetBitmapEx() );
+                            mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout, &aGraphic );
                         }
-                        if( mpShowWindow )
-                            mpShowWindow->SetPauseMode( 0, maPresSettings.mnPauseTimeout, pGraphic.get() );
                     }
                     else
                     {
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 54c3f88a6916..d4ea1dce196f 100755
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -737,22 +737,6 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName,
                 aAny <<= aName;
             }
         }
-        else if( aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_shape_zorder ) ) )
-        {
-            SdrObject* pObj = mpShape->GetSdrObject();
-            SdPage* pPage = pObj ? (SdPage*)pObj->GetPage() : NULL;
-            if( pPage && pPage == pObj->GetObjList() && pPage->IsMasterPage() && pPage->GetPageKind() == PK_STANDARD )
-            {
-                sal_Int32 nOrdNum;
-                if( aAny >>= nOrdNum )
-                {
-                    // if this is a masterpage, there is always a background shape with the ord num 0
-                    // so we add one to the api ordnum to hide the background shape over the api
-                    nOrdNum++;
-                    aAny <<= nOrdNum;
-                }
-            }
-        }
 
         mpShape->_setPropertyValue(aPropertyName, aAny);
     }
@@ -910,30 +894,6 @@ void SAL_CALL SdXShape::setPropertyValue( const ::rtl::OUString& aPropertyName,
                 aRet <<= aName;
             }
         }
-        else if( PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( sUNO_shape_zorder ) ) )
-        {
-            SdrObject* pObj = mpShape->GetSdrObject();
-            SdPage* pPage = pObj ? (SdPage*)pObj->GetPage() : NULL;
-            if( pPage && pPage == pObj->GetObjList() && pPage->IsMasterPage() && pPage->GetPageKind() == PK_STANDARD )
-            {
-                sal_Int32 nOrdNum;
-                if( aRet >>= nOrdNum )
-                {
-                    // if this is a masterpage, there is always a background shape with the ord num 0
-                    // so we add one to the api ordnum to hide the background shape over the api
-                    if( nOrdNum > 0 )
-                    {
-                        nOrdNum--;
-                        aRet <<= nOrdNum;
-                    }
-                    else
-                    {
-                        DBG_ERROR( "Masterpage without a background shape, ZOrder property will be corrupt!" );
-                    }
-                }
-            }
-        }
-
     }
 
     return aRet;
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 8a14a7f6bee2..55479228f918 100755
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -156,12 +156,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();
@@ -215,6 +235,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();
             }