move paths option page .ui to cui and adapt code

Change-Id: I60063a0d101ef47271194e45ee59f9ff622a4f1c

3 files changed, 7 insertions, 20 deletions

diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 8621fe4cafe0..62e2b936155b 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -26,6 +26,7 @@
 #include <svl/poolitem.hxx>
 #include "ControlFocusHelper.hxx"
 #include <sfx2/basedlgs.hxx>
+#include <svx/simptabl.hxx>
 
 class SvTreeListEntry;
 namespace svx
@@ -46,12 +47,11 @@ namespace svx
         FixedLine           aStdBox;
         FixedText           aTypeText;
         FixedText           aPathText;
-        SvxControlFocusHelper   aPathCtrl;
+        SvxSimpleTableContainer aPathCtrl;
         PushButton          m_aNew;
         PushButton          m_aEdit;
         PushButton          m_aDelete;
 
-        HeaderBar*          pHeaderBar;
         ::svx::OptHeaderTabListBox* pPathBox;
         SvTreeListEntry*        m_pCurEntry;
         sal_uLong               m_nOldCount;
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 43e79e1cc5a4..e67692a9db47 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -24,7 +24,6 @@
 // Help-Ids --------------------------------------------------------------
 
 #define HID_OPTIONS_SAVE "CUI_HID_OPTIONS_SAVE"
-#define HID_OPTIONS_PATH "CUI_HID_OPTIONS_PATH"
 #define HID_OPTIONS_GENERAL "CUI_HID_OPTIONS_GENERAL"
 #define HID_OPTIONS_LINGU "CUI_HID_OPTIONS_LINGU"
 #define HID_OPTIONS_DICT_NEW "CUI_HID_OPTIONS_DICT_NEW"
@@ -41,7 +40,6 @@
 #define HID_EDIT_MODULES "CUI_HID_EDIT_MODULES"
 #define HID_LNGDLG_NUM_PREBREAK "CUI_HID_LNGDLG_NUM_PREBREAK"
 #define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
-#define HID_OPTIONS_PATHS_SELECTFOLDER "CUI_HID_OPTIONS_PATHS_SELECTFOLDER"
 #define HID_OPTIONS_JAVA_PARAMETER "CUI_HID_OPTIONS_JAVA_PARAMETER"
 #define HID_OPTIONS_JAVA_CLASSPATH "CUI_HID_OPTIONS_JAVA_CLASSPATH"
 #define HID_SVXPAGE_JSEARCH_OPTIONS "CUI_HID_SVXPAGE_JSEARCH_OPTIONS"
@@ -60,11 +58,9 @@
 #define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR"
 #define HID_OFAPAGE_SMARTTAG_OPTIONS "CUI_HID_OFAPAGE_SMARTTAG_OPTIONS"
 #define HID_OFAPAGE_MSFLTR2_CLB "CUI_HID_OFAPAGE_MSFLTR2_CLB"
-#define HID_OPTPATH_CTL_PATH "CUI_HID_OPTPATH_CTL_PATH"
 #define HID_OFADLG_TREELISTBOX "CUI_HID_OFADLG_TREELISTBOX"
 #define HID_DLG_WEBCONNECTION_INFO "CUI_HID_DLG_WEBCONNECTION_INFO"
 #define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST "CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST"
-#define HID_OPTPATH_HEADERBAR "CUI_HID_OPTPATH_HEADERBAR"
 #define HID_WARN_NAME_DUPLICATE "CUI_HID_WARN_NAME_DUPLICATE"
 #define HID_COLORPAGE_DOCCOLOR_LB "CUI_HID_COLORPAGE_DOCCOLOR_LB"
 #define HID_COLORPAGE_DOCBOUNDARIES_LB "CUI_HID_COLORPAGE_DOCBOUNDARIES_LB"
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 4a25dfe424a5..e6b8982a828e 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -20,14 +20,9 @@
 #define _SVX_OPTPATH_HXX
 
 #include <sfx2/tabdlg.hxx>
+#include <svx/simptabl.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/group.hxx>
-
-#ifdef _SVX_OPTPATH_CXX
-#include <svtools/headbar.hxx>
-#else
-class HeaderBar;
-#endif
 #include "ControlFocusHelper.hxx"
 
 #include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
@@ -47,14 +42,10 @@ class SvxPathTabPage;
 class SvxPathTabPage : public SfxTabPage
 {
 private:
-    FixedLine           aStdBox;
-    FixedText           aTypeText;
-    FixedText           aPathText;
-    SvxControlFocusHelper aPathCtrl;
-    PushButton          aStandardBtn;
-    PushButton          aPathBtn;
-
-    HeaderBar*                  pHeaderBar;
+    SvxSimpleTableContainer* m_pPathCtrl;
+    PushButton*         m_pStandardBtn;
+    PushButton*         m_pPathBtn;
+
     ::svx::OptHeaderTabListBox* pPathBox;
     OptPath_Impl*               pImpl;