[Libreoffice-commits] core.git: 2 commits - cui/source helpcontent2

[Caolán McNamara]

 cui/source/inc/helpid.hrc              |    1 -
 cui/source/options/connpooloptions.cxx |    3 +--
 helpcontent2                           |    2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 26bb3a08958d1d3062f9c7eb9b155a8e228f1bc5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Sep 29 20:32:59 2013 +0100

    add border to driverlist and drop unnecessary custom hid
    
    Change-Id: I4e81556a0e1e0a6c9dd2aea42b3e7106f7dcf65c

diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index a66bead..4685beb 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -30,7 +30,6 @@
 #define HID_EDIT_MODULES "CUI_HID_EDIT_MODULES"
 #define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"
 #define HID_OFADLG_OPTIONS_TREE "CUI_HID_OFADLG_OPTIONS_TREE"
-#define HID_OFA_CONNPOOL_DRIVERLIST "CUI_HID_OFA_CONNPOOL_DRIVERLIST"
 #define UID_OFA_CONNPOOL_DRIVERLIST_BACK "CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK"
 #define HID_OFA_FONT_SUBST_CLB "CUI_HID_OFA_FONT_SUBST_CLB"
 #define HID_DBPATH_CTL_PATH "CUI_HID_DBPATH_CTL_PATH"
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index d154b0f..f2b6509 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -90,7 +90,7 @@ namespace offapp
 
     //--------------------------------------------------------------------
     DriverListControl::DriverListControl(Window* _pParent)
-        :EditBrowseBox(_pParent, EBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_HIDECURSOR | BROWSER_AUTOSIZE_LASTCOL)
+        :EditBrowseBox(_pParent, EBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_HIDECURSOR | BROWSER_AUTOSIZE_LASTCOL | WB_BORDER)
         ,m_aSeekRow(m_aSettings.end())
         ,m_sYes(CUI_RES(RID_SVXSTR_YES))
         ,m_sNo(CUI_RES(RID_SVXSTR_NO))
@@ -98,7 +98,6 @@ namespace offapp
         SetStyle((GetStyle() & ~WB_HSCROLL) | WB_AUTOHSCROLL);
 
         SetUniqueId(UID_OFA_CONNPOOL_DRIVERLIST_BACK);
-        GetDataWindow().SetHelpId(HID_OFA_CONNPOOL_DRIVERLIST);
     }
 
     extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDriverListControl(Window *pParent, VclBuilder::stringmap &)
commit 48d39355cababdacb8b882e495b8151ac82fd2f6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Sep 29 20:33:40 2013 +0100

    Updated core
    Project: help  1008ed32d8e2196c3c26e5aee2c1929377bea919

diff --git a/helpcontent2 b/helpcontent2
index 3d831c5..1008ed3 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3d831c50a956ae42a8988d7c579a8e33b4ab6886
+Subproject commit 1008ed32d8e2196c3c26e5aee2c1929377bea919