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

[Tamás Zolnai]

 cui/source/inc/border.hxx      |    1 +
 cui/source/tabpages/border.cxx |    5 +++++
 2 files changed, 6 insertions(+)

New commits:
commit b1e5e3725642e2d75a4ba73f9258863d65382489
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Sat Apr 1 22:30:42 2017 +0200

    Hide useless label for adjacent cells on border tabpage
    
    This adjacent cell settings is used only for Calc documents.
    Check box was hidden, but label was not.
    
    Change-Id: I6dcf3bb4ee316c9f3d653fc4f8f9dbcaf393e416
    Reviewed-on: https://gerrit.libreoffice.org/36013
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 7e5d12c596fc..c784d2917e3d 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -100,6 +100,7 @@ private:
     // #i29550#
     VclPtr<CheckBox>           m_pMergeAdjacentBordersCB;
     VclPtr<CheckBox>           m_pRemoveAdjcentCellBordersCB;
+    VclPtr<FixedText>          m_pRemoveAdjcentCellBordersFT;
 
     std::vector<BitmapEx>      m_aShadowImgVec;
     std::vector<BitmapEx>      m_aBorderImgVec;
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 0c1a5dbe874f..0f496ec233be 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -134,6 +134,7 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore
     get(m_pMergeWithNextCB, "mergewithnext");
     get(m_pMergeAdjacentBordersCB, "mergeadjacent");
     get(m_pRemoveAdjcentCellBordersCB, "rmadjcellborders");
+    get(m_pRemoveAdjcentCellBordersFT, "rmadjcellbordersft");
 
     static const sal_uInt16 pnBorderImgIds[] =
     {
@@ -349,7 +350,10 @@ SvxBorderTabPage::SvxBorderTabPage(vcl::Window* pParent, const SfxItemSet& rCore
         m_pRemoveAdjcentCellBordersCB->Enable( false );
     }
     else
+    {
         m_pRemoveAdjcentCellBordersCB->Hide();
+        m_pRemoveAdjcentCellBordersFT->Hide();
+    }
 }
 
 SvxBorderTabPage::~SvxBorderTabPage()
@@ -385,6 +389,7 @@ void SvxBorderTabPage::dispose()
     m_pMergeWithNextCB.clear();
     m_pMergeAdjacentBordersCB.clear();
     m_pRemoveAdjcentCellBordersCB.clear();
+    m_pRemoveAdjcentCellBordersFT.clear();
     SfxTabPage::dispose();
 }