convert datanavigator sport to .ui

Change-Id: I14f9f8d8df9fc8246e7fc8c0b6762ca51dad67d9

2 files changed, 11 insertions, 36 deletions

diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc
index a9ba59973688..2168994641dd 100644
--- a/svx/source/inc/datanavi.hrc
+++ b/svx/source/inc/datanavi.hrc
@@ -39,30 +39,6 @@
 #define IID_ITEM_EDIT           4
 #define IID_ITEM_REMOVE         5
 
-// class DataNavigatorWindow
-// Controls
-#define LB_MODELS               10
-#define MB_MODELS               11
-#define TC_ITEMS                12
-#define MB_INSTANCES            13
-
-// MenuItems
-#define MID_MODELS_ADD          10
-#define MID_MODELS_EDIT         11
-#define MID_MODELS_REMOVE       12
-#define MID_INSTANCES_ADD       20
-#define MID_INSTANCES_EDIT      21
-#define MID_INSTANCES_REMOVE    22
-#define MID_SHOW_DETAILS        30
-
-// TabPage Ids
-#define TID_SUBMISSION          10
-#define TID_BINDINGS            11
-#define TID_INSTANCE            12
-
-// ImageLists
-#define IL_ITEM_BMPS            30
-
 // ImageIndexes
 #define IID_GROUP_CLOSED        1
 #define IID_GROUP_OPEN          2
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 43788ca19d9d..3a2d80ceacb4 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_DATANAVI_HXX
 #define INCLUDED_SVX_SOURCE_INC_DATANAVI_HXX
 
+#include <vcl/builder.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/layout.hxx>
@@ -36,6 +37,7 @@
 #include <sfx2/childwin.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <svx/dialmgr.hxx>
+#include <svx/dialogs.hrc>
 #include <svx/fmresids.hrc>
 #include <svx/svxdllapi.h>
 #include <rtl/ref.hxx>
@@ -322,27 +324,21 @@ namespace svxform
     typedef std::vector< XFormsPage* >          PageList;
     typedef ::rtl::Reference < DataListener >   DataListener_ref;
 
-    class DataNavigatorWindow : public Window
+    class DataNavigatorWindow : public Window, public VclBuilderContainer
     {
     private:
-
-        ListBox                     m_aModelsBox;
-        MenuButton                  m_aModelBtn;
-        TabControl                  m_aTabCtrl;
-        MenuButton                  m_aInstanceBtn;
+        ListBox*                    m_pModelsBox;
+        MenuButton*                 m_pModelBtn;
+        TabControl*                 m_pTabCtrl;
+        MenuButton*                 m_pInstanceBtn;
 
         XFormsPage*                 m_pInstPage;
         XFormsPage*                 m_pSubmissionPage;
         XFormsPage*                 m_pBindingPage;
 
-        long                        m_nMinWidth;
-        long                        m_nMinHeight;
-        long                        m_nBorderHeight;
         sal_Int32                   m_nLastSelectedPos;
         bool                        m_bShowDetails;
         bool                        m_bIsNotifyDisabled;
-        Size                        m_a2Size;
-        Size                        m_a3Size;
         ImageList                   m_aItemImageList;
         PageList                    m_aPageList;
         ContainerList               m_aContainerList;
@@ -367,10 +363,13 @@ namespace svxform
         void                        InitPages();
         void                        CreateInstancePage( const PropertyValue_seq& _xPropSeq );
         bool                        HasFirstInstancePage() const;
-        sal_uInt16                      GetNewPageId() const;
+        sal_uInt16                  GetNewPageId() const;
+
+        bool                        IsAdditionalPage(sal_uInt16 nPageId) const;
 
     protected:
         virtual void                Resize() SAL_OVERRIDE;
+        virtual Size                GetOptimalSize() const SAL_OVERRIDE;
 
     public:
         DataNavigatorWindow( Window* pParent, SfxBindings* pBindings );