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

[Caolán McNamara]

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

New commits:
commit 574764bb17093268a70efeea5d5c0ef90ffa8e71
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Sep 29 19:59:38 2013 +0100

    no need for a double border inside border
    
    Change-Id: I650e00bd026a66f82c6a21b0810b53f2f98c81c9

diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 9340ec3..a8a7013 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -67,7 +67,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage
         virtual void    KeyInput( const KeyEvent& rKEvt );
 
     public:
-        MSFltrSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER)
+        MSFltrSimpleTable(SvSimpleTableContainer& rParent, WinBits nBits = 0)
             : SvSimpleTable(rParent, nBits)
         {
         }
commit ffbc9f27688ae9b3b20e8a6a34508a84555a38b1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Sep 29 19:55:46 2013 +0100

    no need for custom HID_OFAPAGE_MSFLTR2_CLB hid
    
    Change-Id: I6002c20bf1f6e6dab6ba7d0b7a0fbbe6a721e115

diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 5b376b6..a66bead 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -36,7 +36,6 @@
 #define HID_DBPATH_CTL_PATH "CUI_HID_DBPATH_CTL_PATH"
 #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_OFADLG_TREELISTBOX "CUI_HID_OFADLG_TREELISTBOX"
 #define HID_OPTIONS_DICT_EDIT_ENTRIES_LIST "CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST"
 #define HID_COLORPAGE_DOCCOLOR_LB "CUI_HID_COLORPAGE_DOCCOLOR_LB"
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 3243842..653448c 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -154,7 +154,6 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, const SfxItemSet& rSe
     m_pCheckLB->InsertHeaderEntry( sHeader, HEADERBAR_APPEND,
                     HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED );
 
-    m_pCheckLB->SetHelpId( HID_OFAPAGE_MSFLTR2_CLB );
     m_pCheckLB->SetStyle( m_pCheckLB->GetStyle()|WB_HSCROLL| WB_VSCROLL );
 }
 
commit 3755b5d8111dd13fc583ddbd2617f5c517b8ab54
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Sep 29 19:55:33 2013 +0100

    Updated core
    Project: help  3d831c50a956ae42a8988d7c579a8e33b4ab6886

diff --git a/helpcontent2 b/helpcontent2
index cc08923..3d831c5 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit cc089237993994a0a3ce91112eb45693f9a2993d
+Subproject commit 3d831c50a956ae42a8988d7c579a8e33b4ab6886