rework to get panel and dialog working at the same time

Change-Id: I0a2adcd606842c6b39665ecc641d2fd92c4eb7e7

1 files changed, 25 insertions, 9 deletions

diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 9ef735bcb9c0..9ec8f454c84d 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -60,21 +60,20 @@ private:
 public:
     TableValueSet(Window *pParent, WinBits nStyle);
     virtual void Resize();
+    virtual void DataChanged( const DataChangedEvent& rDCEvt );
     void updateSettings();
     void setModal(bool bModal) { m_bModal = bModal; }
 };
 
-class TableDesignPane : public PanelLayout
+class TableDesignWidget
 {
 public:
-    TableDesignPane( ::Window* pParent, ViewShellBase& rBase, bool bModal );
-    virtual ~TableDesignPane();
+    TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal );
+    virtual ~TableDesignWidget();
 
     // callbacks
     void onSelectionChanged();
 
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt );
-
     void ApplyOptions();
     void ApplyStyle();
 
@@ -109,16 +108,33 @@ private:
     bool mbOptionsChanged;
 };
 
+class TableDesignPane : public PanelLayout
+{
+private:
+    TableDesignWidget aImpl;
+public:
+    TableDesignPane( ::Window* pParent, ViewShellBase& rBase )
+        : PanelLayout(pParent, "TableDesignPanel",
+        "modules/simpress/ui/tabledesignpanel.ui", com::sun::star::uno::Reference<css::frame::XFrame>())
+        , aImpl(this, rBase, false)
+    {
+    }
+};
+
 // --------------------------------------------------------------------
 
 class TableDesignDialog : public ModalDialog
 {
+private:
+    TableDesignWidget aImpl;
 public:
-    TableDesignDialog( ::Window* pParent, ViewShellBase& rBase );
-
+    TableDesignDialog( ::Window* pParent, ViewShellBase& rBase )
+        : ModalDialog(pParent, "TableDesignDialog",
+        "modules/sdraw/ui/tabledesigndialog.ui")
+        , aImpl(this, rBase, true)
+    {
+    }
     virtual short Execute();
-private:
-    boost::scoped_ptr< TableDesignPane > mxDesignPane;
 };
 
 }