fpicker: moved the PlaceEditDialog to .ui file

This is a preliminary step to CMIS server selection simplification.

Change-Id: I74f333a9f233bbaabb4d6b6ba48fb8e86df2f508

2 files changed, 33 insertions, 47 deletions

diff --git a/svtools/inc/svtools/PlaceEditDialog.hxx b/svtools/inc/svtools/PlaceEditDialog.hxx
index 14a1fb04b455..4db4316ab806 100644
--- a/svtools/inc/svtools/PlaceEditDialog.hxx
+++ b/svtools/inc/svtools/PlaceEditDialog.hxx
@@ -46,39 +46,15 @@ class SVT_DLLPUBLIC PlaceEditDialog : public ModalDialog
 {
 private :
 
-    FixedText m_aFTServerName;
-    FixedText m_aFTServerType;
-
-    Edit m_aEDServerName;
-    ListBox m_aLBServerType;
+    Edit*      m_pEDServerName;
+    ListBox*   m_pLBServerType;
     boost::shared_ptr< DetailsContainer > m_pCurrentDetails;
 
-    FixedText    m_aFTHost;
-    Edit         m_aEDHost;
-    FixedText    m_aFTPort;
-    NumericField m_aEDPort;
-    FixedText    m_aFTPath;
-    Edit         m_aEDPath;
-    CheckBox     m_aCBDavs;
-
-    Edit         m_aEDSmbHost;
-    FixedText    m_aFTShare;
-    Edit         m_aEDShare;
-    FixedText    m_aFTSmbPath;
-    Edit         m_aEDSmbPath;
-
-    FixedText    m_aFTCmisBinding;
-    Edit         m_aEDCmisBinding;
-    FixedText    m_aFTCmisRepository;
-    ListBox      m_aLBCmisRepository;
-    ImageButton  m_aBTCmisRepoRefresh;
-
-    FixedText    m_aFTUsername;
-    Edit         m_aEDUsername;
-    OKButton m_aBTOk;
-    CancelButton m_aBTCancel;
-
-    PushButton m_aBTDelete;
+    Edit*         m_pEDUsername;
+    OKButton*     m_pBTOk;
+    CancelButton* m_pBTCancel;
+
+    PushButton*   m_pBTDelete;
 
     /** Vector holding the details UI control for each server type.
 
@@ -97,7 +73,7 @@ public :
      // Returns a place instance with given informations
      boost::shared_ptr<Place> GetPlace();
 
-     rtl::OUString GetServerName() 	{ return m_aEDServerName.GetText(); }
+    rtl::OUString GetServerName() { return m_pEDServerName->GetText(); }
      rtl::OUString GetServerUrl();
 
 private:
diff --git a/svtools/inc/svtools/ServerDetailsControls.hxx b/svtools/inc/svtools/ServerDetailsControls.hxx
index 7d0c9ad3f005..f29ec4473b54 100644
--- a/svtools/inc/svtools/ServerDetailsControls.hxx
+++ b/svtools/inc/svtools/ServerDetailsControls.hxx
@@ -33,26 +33,23 @@
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 
 #include <tools/urlobj.hxx>
+#include <vcl/builder.hxx>
 #include <vcl/button.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
+#include <vcl/layout.hxx>
 
 class DetailsContainer
 {
     private:
-        std::map< sal_uInt16, Control* > m_aControls;
-        bool m_bShown;
         Link m_aChangeHdl;
+        VclFrame*       m_pFrame;
 
     public:
-        DetailsContainer( );
+        DetailsContainer( VclBuilderContainer* pBuilder, const rtl::OString& rFrame );
         virtual ~DetailsContainer( );
 
-        virtual void addControl( sal_uInt16 nId, Control* pControl );
-        Control* getControl( sal_uInt16 nId );
-        Rectangle getBounds( );
-
         void setChangeHdl( const Link& rLink ) { m_aChangeHdl = rLink; }
 
         virtual void show( bool bShow = true );
@@ -69,8 +66,6 @@ class DetailsContainer
 
     protected:
         void notifyChange( );
-
-    private:
         DECL_LINK ( ValueChangeHdl, void * );
 };
 
@@ -80,8 +75,13 @@ class HostDetailsContainer : public DetailsContainer
         sal_uInt16 m_nDefaultPort;
         rtl::OUString m_sScheme;
 
+    protected:
+        Edit*           m_pEDHost;
+        NumericField*   m_pEDPort;
+        Edit*           m_pEDPath;
+
     public:
-        HostDetailsContainer( sal_uInt16 nPort, rtl::OUString sScheme );
+        HostDetailsContainer( VclBuilderContainer* pBuilder, sal_uInt16 nPort, rtl::OUString sScheme );
         virtual ~HostDetailsContainer( ) { };
 
         virtual void show( bool bShow = true );
@@ -99,11 +99,13 @@ class HostDetailsContainer : public DetailsContainer
 
 class DavDetailsContainer : public HostDetailsContainer
 {
+    private:
+        CheckBox*   m_pCBDavs;
+
     public:
-        DavDetailsContainer( );
+        DavDetailsContainer( VclBuilderContainer* pBuilder );
         ~DavDetailsContainer( ) { };
 
-        virtual void addControl( sal_uInt16 nId, Control* pControl );
         virtual void show( bool bShow = true );
 
     protected:
@@ -115,8 +117,13 @@ class DavDetailsContainer : public HostDetailsContainer
 
 class SmbDetailsContainer : public DetailsContainer
 {
+    private:
+        Edit*           m_pEDHost;
+        Edit*           m_pEDShare;
+        Edit*           m_pEDPath;
+
     public:
-        SmbDetailsContainer( ) : DetailsContainer( ) { };
+        SmbDetailsContainer( VclBuilderContainer* pBuilder );
         ~SmbDetailsContainer( ) { };
 
         virtual INetURLObject getUrl( );
@@ -131,14 +138,17 @@ class CmisDetailsContainer : public DetailsContainer
         std::vector< rtl::OUString > m_aRepoIds;
         rtl::OUString m_sRepoId;
 
+        Edit*       m_pEDBinding;
+        ListBox*    m_pLBRepository;
+        Button*     m_pBTRepoRefresh;
+
     public:
-        CmisDetailsContainer( );
+        CmisDetailsContainer( VclBuilderContainer* pBuilder );
         ~CmisDetailsContainer( ) { };
 
         virtual INetURLObject getUrl( );
         virtual bool setUrl( const INetURLObject& rUrl );
         virtual void setUsername( const rtl::OUString& rUsername );
-        virtual void addControl( sal_uInt16 nId, Control* pControl );
 
     private:
         void selectRepository( );