CWS-TOOLING: integrate CWS impress163_DEV300

5 files changed, 30 insertions, 45 deletions

diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index a943728326c6..5e21e672d3bc 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ConfigurationController.cxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.68.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -305,7 +305,11 @@ void SAL_CALL ConfigurationController::unlock (void)
     throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard (maMutex);
-    ThrowIfDisposed();
+
+    // Allow unlocking while the ConfigurationController is being disposed
+    // (but not when that is done and the controller is disposed.)
+    if (rBHelper.bDisposed)
+        ThrowIfDisposed();
 
     OSL_ASSERT(mpImplementation->mnLockCount>0);
     --mpImplementation->mnLockCount;
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 79cfb4cba6d2..29bc28e91e17 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fuolbull.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.104.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -101,16 +101,22 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq )
                 case RET_OK:
                 {
                     SfxItemSet aSet( *pDlg->GetOutputItemSet() );
-/* i35937
-                    if (mpView->ISA(DrawViewShell) )
+
+                    OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
+
+                    std::auto_ptr< OutlineViewModelChangeGuard > aGuard;
+
+                    if (mpView->ISA(OutlineView))
                     {
-                        if( mpView->GetMarkedObjectList().GetMarkCount() == 0)
-                        {
-                            SfxUInt16Item aBulletState( EE_PARA_BULLETSTATE, 0 );
-                            aSet.Put(aBulletState);
-                        }
+                        pOLV = static_cast<OutlineView*>(mpView)
+                            ->GetViewByWindow(mpViewShell->GetActiveWindow());
+
+                        aGuard.reset( new OutlineViewModelChangeGuard( static_cast<OutlineView&>(*mpView) ) );
                     }
-*/
+
+                    if( pOLV )
+                        pOLV->EnableBullets();
+
                     rReq.Done( aSet );
                     pArgs = rReq.GetArgs();
                 }
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index b88d6f226d0f..6975aa66fba9 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fuprlout.cxx,v $
- * $Revision: 1.17 $
+ * $Revision: 1.17.130.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -287,32 +287,4 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
     }
 }
 
-/*************************************************************************
-|*
-|* Layoutvorlage von einem StyleSheetPool in einen anderen uebertragen
-|*
-\************************************************************************/
-
-void FuPresentationLayout::TransferLayoutTemplate(String aFromName,
-                                                  String aToName,
-                                                  SfxStyleSheetBasePool* pFrom,
-                                                  SfxStyleSheetBasePool* pTo)
-{
-    SfxStyleSheetBase* pHis = pFrom->Find(aFromName,SD_STYLE_FAMILY_MASTERPAGE);
-    SfxStyleSheetBase* pMy  = pTo->Find(aToName, SD_STYLE_FAMILY_MASTERPAGE);
-
-    DBG_ASSERT(pHis, "neue Layoutvorlage nicht gefunden");
-
-    // gibt's noch nicht: neu anlegen
-    if (!pMy)
-    {
-        pMy = &(pTo->Make(aToName, SD_STYLE_FAMILY_MASTERPAGE));
-    }
-
-    // Inhalte neu setzen
-    if (pHis)
-        pMy->GetItemSet().Set(pHis->GetItemSet());
-}
-
-
 } // end of namespace sd
diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx
index 60d7a7d307dd..09dab1a735d0 100644
--- a/sd/source/ui/inc/fuprlout.hxx
+++ b/sd/source/ui/inc/fuprlout.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fuprlout.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.130.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -59,10 +59,6 @@ private:
         ::sd::View* pView,
         SdDrawDocument* pDoc,
         SfxRequest& rReq);
-
-    void TransferLayoutTemplate(String aFromName, String aToName,
-                                SfxStyleSheetBasePool* pFrom,
-                                SfxStyleSheetBasePool* pTo);
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 8e29e7d1ade5..8ebc2725a19f 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -467,7 +467,14 @@ bool SlideSorterController::Command (
             }
             mbIsContextMenuOpen = false;
             if (pPage == NULL)
+            {
+                // Select slide before the insertion indicator before it is
+                // hidden, so that a pending slide insertion slot finds the
+                // right place to insert a new slide.
+                mpPageSelector->SelectPage(
+                    mrView.GetOverlay().GetInsertionIndicatorOverlay().GetInsertionPageIndex()-1);
                 mrView.GetOverlay().GetInsertionIndicatorOverlay().Hide();
+            }
             bEventHasBeenHandled = true;
         }
         break;