CWS-TOOLING: integrate CWS impress174

2009-08-27 18:21:38 +0200 af  r275502 : #i73289# Fixed detection of the cases when the layout menu is be disabled.
2009-08-24 17:45:50 +0200 sj  r275326 : #i103360# only setting filltype if there is also a correct fill element
2009-08-24 16:11:06 +0200 cl  r275322 : #i73871# only remove replaced objects from mark list if replaced by SdrEditView::ReplaceObjectAtView(). see issue for reason
2009-08-24 15:03:33 +0200 cl  r275319 : fixed merge error
2009-08-20 12:45:29 +0200 sj  r275174 : CWS-TOOLING: rebase CWS impress174 to trunk@275001 (milestone: DEV300:m55)
2009-08-19 15:54:47 +0200 sj  r275153 : #158486# text of flipped shapes is not flipped in word
2009-08-17 17:30:16 +0200 sj  r275063 : #158486# also correcting text bound for additional text rotation
2009-08-05 11:09:32 +0200 sj  r274643 : #i102797# adapted customshape coloring (fixed fontwork)
2009-08-04 14:17:36 +0200 sj  r274620 : #i99501# pdf export: fixed export of rotated graphics
2009-07-30 16:15:44 +0200 sj  r274494 : #158653# binary ppt import: fixed table border lines
2009-07-27 18:28:02 +0200 sj  r274376 : added shape text clipping for customshapes
2009-07-20 18:09:14 +0200 sj  r274154 : #i101918# fixed gallery preview (now taking the correct mapmode)
2009-07-13 18:00:58 +0200 cl  r273948 : #i103238# clear hard set attributes only if new style set is manually applied
2009-07-13 17:58:07 +0200 cl  r273947 : #i73289# do not expand a toolpanel when it gets enabled
2009-07-08 12:39:49 +0200 sj  r273827 : #i101566# applied patch from cmc to solve font width inconsistencies
2009-07-08 12:11:13 +0200 sj  r273826 : #i87727# added PDFDialog service
2009-07-06 17:22:40 +0200 sj  r273755 : #i103360# fixed a merge problem, no more looping when loading transparence gradients on background page
2009-07-03 14:42:07 +0200 sj  r273701 : #102797# added patch from thb (Adapted customshape coloring)
2009-07-03 14:09:44 +0200 sj  r273696 : #102797# removed warning
2009-07-03 14:01:47 +0200 sj  r273695 : #102797# added patch from thb (Adapted customshape coloring)
2009-07-03 13:13:39 +0200 sj  r273688 : #102797# added patch from thb (Adapted customshape coloring)
2009-07-03 11:25:30 +0200 sj  r273684 : #i103278# fixed import of lines
2009-07-01 16:23:47 +0200 cl  r273599 : #i96820# correctly call setChanged on model if table is modified
2009-07-01 14:43:09 +0200 cl  r273588 : #i8770# Patch: fix missing type provider for pdf export dialog
2009-07-01 14:40:28 +0200 cl  r273586 : #i73871# activate picture bar after converting shape to bitmap
2009-07-01 14:39:05 +0200 cl  r273584 : #i73871# activate picture bar after converting shape to bitmap
2009-07-01 14:04:53 +0200 cl  r273578 : #i73289# PATCH: Disable layout pane on the masterslide

3 files changed, 10 insertions, 2 deletions

diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx
index fb0504f0da21..79e33452959c 100644
--- a/sd/source/ui/inc/EventMultiplexer.hxx
+++ b/sd/source/ui/inc/EventMultiplexer.hxx
@@ -92,9 +92,10 @@ public:
     */
     static const EventId EID_PANE_MANAGER_DYING     = 0x00000100;
 
-    /** The edit mode of the ViewShell in the center pane has been modified.
+    /** Edit mode was (or is being) switched to normal mode.  Find
+        EID_EDIT_MODE_MASTER below.
     */
-    static const EventId EID_EDIT_MODE              = 0x00000200;
+    static const EventId EID_EDIT_MODE_NORMAL       = 0x00000200;
 
     /** One or more pages have been inserted into or deleted from the model.
     */
@@ -134,6 +135,10 @@ public:
     */
     static const EventId EID_CONFIGURATION_UPDATED  = 0x00040000;
 
+    /** Edit mode was (or is being) switched to master mode.
+    */
+    static const EventId EID_EDIT_MODE_MASTER       = 0x00080000;
+
     const ViewShellBase& mrBase;
     EventId meEventId;
     const void* mpUserData;
diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx
index b1a3f04b4a71..f80242e412a2 100644
--- a/sd/source/ui/inc/taskpane/TitleBar.hxx
+++ b/sd/source/ui/inc/taskpane/TitleBar.hxx
@@ -92,6 +92,7 @@ public:
     virtual void Paint (const Rectangle& rBoundingBox);
     virtual bool Expand (bool bFlag = true);
     virtual bool IsExpanded (void) const;
+    virtual void SetEnabledState(bool bFlag);

 
     void SetFocus (bool bFlag);
 
diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx
index 2ebb8e87f3ce..e0974b864b96 100644
--- a/sd/source/ui/inc/taskpane/TitledControl.hxx
+++ b/sd/source/ui/inc/taskpane/TitledControl.hxx
@@ -135,6 +135,8 @@ public:
     */
     virtual bool IsExpandable (void) const;
 
+    virtual void SetEnabledState(bool bFlag);

+
     /** Ownership of the given data remains with the caller.  The data
         is thus not destroyed when the destructor of this class is
         called.