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

[Andrea Gelmini (via logerrit)]

 cui/source/inc/border.hxx      |    4 ++--
 cui/source/tabpages/border.cxx |   22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit b35aefac5682d99c172bc24681200aee7b327bf3
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Sat Sep 26 22:18:50 2020 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Sun Sep 27 09:52:14 2020 +0200

    Fix typo in code
    
    It passed "make check" on Linux
    
    Change-Id: I95f8fcdbfb2344624a2ec4cf0780b0af3bc7ba16
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103498
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 81c0216376e5..57f5d5d0919f 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -152,8 +152,8 @@ private:
     std::unique_ptr<weld::CheckButton> m_xMergeWithNextCB;
     // #i29550#
     std::unique_ptr<weld::CheckButton> m_xMergeAdjacentBordersCB;
-    std::unique_ptr<weld::CheckButton> m_xRemoveAdjcentCellBordersCB;
-    std::unique_ptr<weld::Label> m_xRemoveAdjcentCellBordersFT;
+    std::unique_ptr<weld::CheckButton> m_xRemoveAdjacentCellBordersCB;
+    std::unique_ptr<weld::Label> m_xRemoveAdjacentCellBordersFT;
     std::unique_ptr<ShadowControlsWrapper> m_xShadowControls;
     std::unique_ptr<MarginControlsWrapper> m_xMarginControls;
 
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 4f42609ec0cf..0c8fda14defe 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -276,8 +276,8 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, weld::DialogControlle
     , m_xPropertiesFrame(m_xBuilder->weld_container("properties"))
     , m_xMergeWithNextCB(m_xBuilder->weld_check_button("mergewithnext"))
     , m_xMergeAdjacentBordersCB(m_xBuilder->weld_check_button("mergeadjacent"))
-    , m_xRemoveAdjcentCellBordersCB(m_xBuilder->weld_check_button("rmadjcellborders"))
-    , m_xRemoveAdjcentCellBordersFT(m_xBuilder->weld_label("rmadjcellbordersft"))
+    , m_xRemoveAdjacentCellBordersCB(m_xBuilder->weld_check_button("rmadjcellborders"))
+    , m_xRemoveAdjacentCellBordersFT(m_xBuilder->weld_label("rmadjcellbordersft"))
 {
     static std::vector<std::u16string_view> aBorderImageIds;
 
@@ -525,14 +525,14 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, weld::DialogControlle
     }
     if( bIsCalcDoc )
     {
-        m_xRemoveAdjcentCellBordersCB->connect_toggled(LINK(this, SvxBorderTabPage, RemoveAdjacentCellBorderHdl_Impl));
-        m_xRemoveAdjcentCellBordersCB->show();
-        m_xRemoveAdjcentCellBordersCB->set_sensitive(false);
+        m_xRemoveAdjacentCellBordersCB->connect_toggled(LINK(this, SvxBorderTabPage, RemoveAdjacentCellBorderHdl_Impl));
+        m_xRemoveAdjacentCellBordersCB->show();
+        m_xRemoveAdjacentCellBordersCB->set_sensitive(false);
     }
     else
     {
-        m_xRemoveAdjcentCellBordersCB->hide();
-        m_xRemoveAdjcentCellBordersFT->hide();
+        m_xRemoveAdjacentCellBordersCB->hide();
+        m_xRemoveAdjacentCellBordersFT->hide();
     }
 }
 
@@ -820,8 +820,8 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
     m_xSynchronizeCB->set_active(mbSync);
 
     mbRemoveAdjacentCellBorders = false;
-    m_xRemoveAdjcentCellBordersCB->set_active(false);
-    m_xRemoveAdjcentCellBordersCB->set_sensitive(false);
+    m_xRemoveAdjacentCellBordersCB->set_active(false);
+    m_xRemoveAdjacentCellBordersCB->set_sensitive(false);
 }
 
 void SvxBorderTabPage::ChangesApplied()
@@ -1499,12 +1499,12 @@ void SvxBorderTabPage::UpdateRemoveAdjCellBorderCB( sal_uInt16 nPreset )
     if( !bBorderDeletionReq && ( nPreset == IID_PRE_CELL_NONE || nPreset == IID_PRE_TABLE_NONE ) )
         bBorderDeletionReq = true;
 
-    m_xRemoveAdjcentCellBordersCB->set_sensitive(bBorderDeletionReq);
+    m_xRemoveAdjacentCellBordersCB->set_sensitive(bBorderDeletionReq);
 
     if( !bBorderDeletionReq )
     {
         mbRemoveAdjacentCellBorders = false;
-        m_xRemoveAdjcentCellBordersCB->set_active(false);
+        m_xRemoveAdjacentCellBordersCB->set_active(false);
     }
 }