1 files changed, 37 insertions, 41 deletions

diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx
index ff0a3d6ce3e7..349a3f7d5d64 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -52,18 +52,13 @@ enum SvtRemoteDlgType
 
 typedef std::shared_ptr< Place > ServicePtr;
 
-class FileViewContainer;
-
 class RemoteFilesDialog : public SvtFileDialog_Base
 {
 public:
-    RemoteFilesDialog( vcl::Window* pParent, PickerFlags nBits );
+    RemoteFilesDialog( weld::Window* pParent, PickerFlags nBits );
     virtual ~RemoteFilesDialog() override;
 
-    virtual void dispose() override;
-    virtual void Resize() override;
-    virtual short Execute() override;
-    void Show();
+    virtual short run() override;
 
     // SvtFileDialog_Base
 
@@ -97,7 +92,6 @@ public:
 
     virtual void EnableAutocompletion( bool = true) override;
 
-    virtual sal_Int32 getTargetColorDepth() override;
     virtual sal_Int32 getAvailableWidth() override;
     virtual sal_Int32 getAvailableHeight() override;
 
@@ -105,7 +99,7 @@ public:
 
     virtual bool getShowState() override;
 
-    virtual Control* getControl( sal_Int16 nControlId, bool bLabelControl = false ) const override;
+    virtual weld::Widget* getControl( sal_Int16 nControlId, bool bLabelControl = false ) const override;
     virtual void enableControl( sal_Int16 nControlId, bool bEnable ) override;
     virtual OUString getCurFilter( ) const override;
 
@@ -123,31 +117,33 @@ private:
     int m_nWidth;
     int m_nHeight;
 
+    bool m_bIsInExecute;
+
     OUString m_sPath;
     OUString m_sStdDir;
     OUString m_sRootLabel;
     OUString m_sLastServiceUrl;
-    unsigned int m_nCurrentFilter;
+    int m_nCurrentFilter;
 
     ::rtl::Reference< ::svt::AsyncPickerAction > m_pCurrentAsyncAction;
 
     css::uno::Sequence< OUString > m_aBlackList;
 
-    VclPtr< PushButton > m_pOk_btn;
-    VclPtr< CancelButton > m_pCancel_btn;
-    VclPtr< MenuButton > m_pAddService_btn;
-    VclPtr< ListBox > m_pServices_lb;
-    VclPtr< Breadcrumb > m_pPath;
-    VclPtr< PushButton > m_pNewFolder;
-    VclPtr< PushButton > m_pListView_btn;
-    VclPtr< PushButton > m_pIconView_btn;
-    VclPtr< Splitter > m_pSplitter;
-    VclPtr< FolderTree > m_pTreeView;
-    VclPtr< SvtFileView > m_pFileView;
-    VclPtr< FileViewContainer > m_pContainer;
-    VclPtr< ListBox > m_pFilter_lb;
-    VclPtr< AutocompleteEdit > m_pName_ed;
-    VclPtr<PopupMenu> m_pAddMenu;
+    std::unique_ptr<weld::Button> m_xOk_btn;
+    std::unique_ptr<weld::Button> m_xCancel_btn;
+    std::unique_ptr<weld::Toolbar> m_xAddService_bar;
+    std::unique_ptr<weld::Menu> m_xAddService_menu;
+    std::unique_ptr<weld::ComboBox> m_xServices_lb;
+    std::unique_ptr<weld::Container> m_xPathContainer;
+    std::unique_ptr<Breadcrumb> m_xPath;
+    std::unique_ptr<weld::Button> m_xNewFolder;
+    std::unique_ptr<weld::ToggleButton> m_xListView_btn;
+    std::unique_ptr<weld::ToggleButton> m_xIconView_btn;
+    std::unique_ptr<FolderTree> m_xTreeView;
+    std::unique_ptr<SvtFileView> m_xFileView;
+    std::unique_ptr<weld::Container> m_xContainer;
+    std::unique_ptr<weld::ComboBox> m_xFilter_lb;
+    std::unique_ptr<AutocompleteEdit> m_xName_ed;
 
     std::vector< ServicePtr > m_aServices;
     std::vector< std::pair< OUString, OUString > > m_aFilters;
@@ -166,33 +162,33 @@ private:
     void EnableControls();
     void DisableControls();
 
-    void SavePassword( const OUString& rURL, const OUString& rUser
-                    , const OUString& rPassword, bool bPersistent );
+    void SavePassword(const OUString& rURL, const OUString& rUser,
+                      const OUString& rPassword, bool bPersistent);
 
-    DECL_LINK ( AddServiceHdl, Button*, void );
-    DECL_LINK ( SelectServiceHdl, ListBox&, void );
-    DECL_LINK ( EditServiceMenuHdl, MenuButton *, void );
+    DECL_LINK ( AddServiceHdl, const OString&, void );
+    DECL_LINK ( SelectServiceHdl, weld::ComboBox&, void );
+    DECL_LINK ( EditServiceMenuHdl, const OString&, void );
 
-    DECL_LINK( DoubleClickHdl, SvTreeListBox*, bool );
-    DECL_LINK( SelectHdl, SvTreeListBox*, void );
+    DECL_LINK( DoubleClickHdl, SvtFileView*, bool );
+    DECL_LINK( SelectHdl, SvtFileView*, void );
 
-    DECL_LINK( FileNameGetFocusHdl, Control&, void );
-    DECL_LINK( FileNameModifyHdl, Edit&, void );
+    DECL_LINK( FileNameGetFocusHdl, weld::Widget&, void );
+    DECL_LINK( FileNameModifyHdl, weld::Entry&, void );
 
     DECL_LINK( SplitHdl, Splitter*, void );
 
-    DECL_LINK( SelectFilterHdl, ListBox&, void );
+    DECL_LINK( SelectFilterHdl, weld::ComboBox&, void );
 
-    DECL_LINK( TreeSelectHdl, SvTreeListBox*, void );
+    DECL_LINK( TreeSelectHdl, weld::TreeView&, void );
 
     DECL_LINK( SelectBreadcrumbHdl, Breadcrumb *, void );
 
-    DECL_LINK( NewFolderHdl, Button*, void );
-    DECL_LINK( IconViewHdl, Button*, void );
-    DECL_LINK( ListViewHdl, Button*, void );
+    DECL_LINK( NewFolderHdl, weld::Button&, void );
+    DECL_LINK( IconViewHdl, weld::Button&, void );
+    DECL_LINK( ListViewHdl, weld::Button&, void );
 
-    DECL_LINK( OkHdl, Button*, void );
-    DECL_LINK( CancelHdl, Button*, void );
+    DECL_LINK( OkHdl, weld::Button&, void );
+    DECL_LINK( CancelHdl, weld::Button&, void );
 };
 
 #endif // INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX