slidecopy: add a IDeckLayouter implementation which mimics the old task panel look/behavior. In non-release builds, allow to switch between this old and the new (not yet polished) tab layout via the task pane's menu

3 files changed, 14 insertions, 10 deletions

diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx
index 28af936e240a..9616a081ff47 100644
--- a/sd/source/ui/inc/taskpane/TitleBar.hxx
+++ b/sd/source/ui/inc/taskpane/TitleBar.hxx
@@ -50,16 +50,12 @@ namespace sd { namespace toolpanel {
     TBT_SUB_CONTROL_HEADLINE both show a expansion indicator in front of
     the title string that shows whether the associated control is
     visible (expanded) or not.
-    A title bar with TBT_WINDOW_TITLE is typically used only once as the
-    title bar of the whole task pane.
 
-    <p>The title bar shows three kinds of indicators: 1) Expansion is
+    <p>The title bar shows two kinds of indicators: 1) Expansion is
     displayed by two sets of two bitmaps, a triangle pointing to the right
     resp. a minus in a square indicates that the control is collapsed, a
     triangle pointing down resp. a plus in a square stands for an expanded
-    control. 2) Keyboard focus is indicated by a dotted rectangle. 3) An
-    underlined title string is a mouse over indicator for a
-    selectable/expandable control.</p>
+    control. 2) Keyboard focus is indicated by a dotted rectangle.
 */
 class TitleBar
     : public ::Window,
@@ -67,7 +63,6 @@ class TitleBar
 {
 public:
     enum TitleBarType {
-        TBT_WINDOW_TITLE,
         TBT_CONTROL_TITLE,
         TBT_SUB_CONTROL_HEADLINE
         };
@@ -162,7 +157,6 @@ private:
         const Rectangle& rTextBox,
         int nTitleBarWidth);
 
-    void PaintWindowTitleBar (void);
     void PaintPanelControlTitle (void);
     void PaintSubPanelHeadLineBar (void);
 
diff --git a/sd/source/ui/inc/taskpane/ToolPanel.hxx b/sd/source/ui/inc/taskpane/ToolPanel.hxx
index e7b1140406da..dd165e8310b9 100644
--- a/sd/source/ui/inc/taskpane/ToolPanel.hxx
+++ b/sd/source/ui/inc/taskpane/ToolPanel.hxx
@@ -42,6 +42,7 @@ class Window;
 namespace sd { namespace toolpanel {
 
 class TaskPaneViewShell;
+class ToolPanelViewShell;
 class ControlFactory;
 
 /** This control is basically a layout manager for the vertical
@@ -64,6 +65,10 @@ public:
         ::Window* pParentWindow,
         TaskPaneViewShell& rViewShell);
 
+    ToolPanel (
+        ::Window* pParentWindow,
+        ToolPanelViewShell& rViewShell);
+
     virtual ~ToolPanel (void);
 
     /** Append the given control to the end of the list of controls that are
@@ -85,6 +90,11 @@ public:
         ULONG nHelpId,
         const TitledControl::ClickHandler& rClickHandler);
 
+    /** returns the area occupied by the content of the active control (i.e. the area of the active control,
+        minus the are for its title)
+    */
+    Rectangle GetActiveControlContentArea() const;
+
     virtual void Resize (void);
 
     virtual Size GetPreferredSize (void);
@@ -110,7 +120,8 @@ protected:
     void ListHasChanged (void);
 
 private:
-    TaskPaneViewShell& mrViewShell;
+    TaskPaneViewShell*  mpTaskPaneViewShell;
+    ToolPanelViewShell* mpToolPanelViewShell;
 
     /// Guard against recursive calls or Rearrange().
     bool mbRearrangeActive;
diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
index a4eb499076e6..bfe3b9419748 100644
--- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
+++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
@@ -128,7 +128,6 @@ public:
 private:
     class Implementation;
     ::boost::scoped_ptr< Implementation >   mpImpl;
-    ::boost::scoped_ptr< ToolPanelDeck >    mpPanelDeck;
 
     bool mbIsInitialized;