CWS-TOOLING: integrate CWS impress166

2009-01-27 11:42:29 +0100 af  r266972 : #i98508# Handle non DrawViewShell view shells correctly.
2009-01-21 10:41:32 +0100 af  r266635 : #i98069# Do not call PreModelChange() for every ModelLock.
2009-01-20 15:25:41 +0100 af  r266588 : #i98069# Added friend declaration that became necessary on Solaris after recent changes.
2009-01-19 13:48:47 +0100 af  r266493 : #i97478# Prevent SID_PARASPACE_(DE|IN)CREASE from crashing when style sheet is missing.
2009-01-16 11:52:37 +0100 af  r266411 : #i97338# Check the dispatcher before using it to show a context menu.
2009-01-15 14:33:55 +0100 sj  r266373 : #153716# taking care of font-independent line spacing (editmode and hittest)
2009-01-15 14:29:46 +0100 sj  r266372 : #153716# taking care of font-independent line spacing also in presentation styles
2009-01-14 14:04:16 +0100 af  r266301 : #i97634# Do view change synchronously.  Use shared pointers for view shells.
2009-01-14 14:01:27 +0100 af  r266300 : #i97634# Added non-API methods that update the configuration synchronously.
2009-01-14 13:34:40 +0100 af  r266295 : #i98069# Be more carefull with handling model updates to avoid assertion regarding number of selected pages.
2009-01-14 11:34:57 +0100 cl  r266270 : #i97261# force outliner para oibject after text edit
2009-01-14 10:49:08 +0100 cl  r266269 : #i97413# dispose cell undo action if shape dies
2009-01-13 18:50:05 +0100 cl  r266247 : #i97347# fixed cell undo crash
2009-01-12 14:16:56 +0100 af  r266156 : #i97296# Using is() method to check WeakReference for validity.
2009-01-12 13:52:00 +0100 af  r266155 : #i97190# Turned static_cast to dynamic_cast in CreateChildList.
2009-01-12 13:06:57 +0100 af  r266153 : #i97552# Catching Exceptions caught while accessing OLE-Object that is to be inserted.
2009-01-12 13:06:37 +0100 cl  r266152 : #i96164# applied patch to fix ambiguous operation

2 files changed, 26 insertions, 1 deletions

diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx
index 8741909acdeb..12a19d9d40be 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -92,6 +92,16 @@ public:
 
     void ProcessEvent (void);
 
+    /** Normally the requested changes of the configuration are executed
+        asynchronously.  However, there is at least one situation (searching
+        with the Outliner) where the surrounding code does not cope with
+        this.  So, instead of calling Reschedule until the global event loop
+        executes the configuration update, this method does (almost) the
+        same without the reschedules.
+
+        Do not use this method until there is absolutely no other way.
+    */
+    void RequestSynchronousUpdate (void);
 
     // XConfigurationController
 
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index 74804f2a0870..27ed5f6f8bef 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -215,8 +215,12 @@ public:
             The resource URL of the view to show.
         @param rsAnchorURL
             The URL of the pane in which to show the view.
+        @return
+            The resource id of the requested view is returned.  With that
+            the caller can, for example, call RunOnResourceActivation() to
+            do some initialization after the requested view becomes active.
     */
-    void RequestView (
+    css::uno::Reference<css::drawing::framework::XResourceId> RequestView (
         const ::rtl::OUString& rsResourceURL,
         const ::rtl::OUString& rsAnchorURL);
 
@@ -257,6 +261,17 @@ public:
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId,
         const Callback& rCallback);
 
+    /** Normally the requested changes of the configuration are executed
+        asynchronously.  However, there is at least one situation (searching
+        with the Outliner) where the surrounding code does not cope with
+        this.  So, instead of calling Reschedule until the global event loop
+        executes the configuration update, this method does (almost) the
+        same without the reschedules.
+
+        Do not use this method until there is absolutely no other way.
+    */
+    void RequestSynchronousUpdate (void);
+
     /** Block until the specified event is notified by the configuration
         controller.  When the configuration controller is not processing any
         requests the method returns immediately.