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

Caolán McNamara caolanm at redhat.com
Mon Feb 11 03:13:58 PST 2013


 cui/source/dialogs/multipat.cxx |    2 +-
 cui/source/inc/radiobtnbox.hxx  |    2 +-
 cui/source/options/certpath.cxx |    2 +-
 cui/source/options/fontsubs.cxx |    2 +-
 cui/source/options/fontsubs.hxx |    2 +-
 cui/source/options/optjava.cxx  |    2 +-
 svx/source/dialog/simptabl.cxx  |    1 -
 7 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 4895dd454ccf3d403b2ed7aa4b19f726c28e6032
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 11 11:10:25 2013 +0000

    add borders to simpletablecontainer
    
    Change-Id: I9215516c21ce1330cf1fef07cbd647a1c318e241

diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index c45337e..1b2f139 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -183,7 +183,7 @@ SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed
     aPathFL     ( this, CUI_RES( FL_MULTIPATH) ),
     aPathLB     ( this, CUI_RES( LB_MULTIPATH ) ),
     m_aRadioLBContainer(this, CUI_RES(LB_RADIOBUTTON)),
-    aRadioLB(m_aRadioLBContainer),
+    aRadioLB(m_aRadioLBContainer, WB_BORDER),
     aRadioFT    ( this, CUI_RES( FT_RADIOBUTTON ) ),
     aAddBtn     ( this, CUI_RES( BTN_ADD_MULTIPATH ) ),
     aDelBtn     ( this, CUI_RES( BTN_DEL_MULTIPATH ) ),
diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx
index c6c3b43..efa1579 100644
--- a/cui/source/inc/radiobtnbox.hxx
+++ b/cui/source/inc/radiobtnbox.hxx
@@ -38,7 +38,7 @@ protected:
     virtual void        KeyInput( const KeyEvent& rKEvt );
 
 public:
-    SvxRadioButtonListBox(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER);
+    SvxRadioButtonListBox(SvxSimpleTableContainer& rParent, WinBits nBits);
     ~SvxRadioButtonListBox();
 
     void                HandleEntryChecked( SvTreeListEntry* _pEntry );
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index e567260..37719bc 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -50,7 +50,7 @@ CertPathDialog::CertPathDialog( Window* pParent ) :
     , m_aCertPathFL       ( this, CUI_RES( FL_CERTPATH ) )
     , m_aCertPathFT       ( this, CUI_RES( FT_CERTPATH ) )
     , m_aCertPathListContainer( this, CUI_RES( LB_CERTPATH ) )
-    , m_aCertPathList( m_aCertPathListContainer )
+    , m_aCertPathList( m_aCertPathListContainer, WB_BORDER )
     , m_aAddBtn           ( this, CUI_RES( PB_ADD ) )
     , m_aButtonsFL       ( this, CUI_RES( FL_BUTTONS ) )
     , m_aOKBtn           ( this, CUI_RES( PB_OK ) )
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 87afaf9..2f94e8b 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -63,7 +63,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
     pCheckLBContainer->set_width_request(aControlSize.Width());
     pCheckLBContainer->set_height_request(aControlSize.Height());
 
-    m_pCheckLB = new SvxFontSubstCheckListBox(*pCheckLBContainer);
+    m_pCheckLB = new SvxFontSubstCheckListBox(*pCheckLBContainer, 0);
     m_pCheckLB->SetHelpId(HID_OFA_FONT_SUBST_CLB);
 
     m_pCheckLB->SetStyle(m_pCheckLB->GetStyle()|WB_HSCROLL|WB_VSCROLL);
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 775960a..fbc29de 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -41,7 +41,7 @@ class SvxFontSubstCheckListBox : public SvxSimpleTable
         virtual void    Resize();
 
     public:
-        SvxFontSubstCheckListBox(SvxSimpleTableContainer& rParent, WinBits nBits = WB_BORDER)
+        SvxFontSubstCheckListBox(SvxSimpleTableContainer& rParent, WinBits nBits)
             : SvxSimpleTable(rParent, nBits)
         {
         }
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index a5389ca..47f1f9b 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -89,7 +89,7 @@ private:
     const OUString m_sAccessibilityText;
 public:
     SvxJavaListBox(SvxSimpleTableContainer& rParent, const OUString &rAccessibilityText)
-        : SvxRadioButtonListBox(rParent)
+        : SvxRadioButtonListBox(rParent, 0)
         , m_sAccessibilityText(rAccessibilityText)
     {
     }
diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index abed194..5fa4077 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -39,7 +39,6 @@ SvxSimpleTableContainer::SvxSimpleTableContainer(Window* pParent, WinBits nBits)
     : Control(pParent, nBits)
     , m_pTable(NULL)
 {
-    SetBorderStyle(WINDOW_BORDER_NOBORDER);
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxSimpleTableContainer(Window *pParent,


More information about the Libreoffice-commits mailing list