[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Jul 19 10:12:30 UTC 2018
sw/source/ui/table/tabledlg.cxx | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit de607309e27616a9e53eadee2bab9cd0de74cae3
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jul 16 13:57:06 2018 +0100
Commit: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Jul 19 12:12:08 2018 +0200
tdf#118635 relative checkbox disabled on reopen
Change-Id: Ic52737e5122b1ae37390061a5f7cf17b69e7e665
Reviewed-on: https://gerrit.libreoffice.org/57499
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index d650e10f422a..12004dd51a5a 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -176,14 +176,14 @@ IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, weld::ToggleButton&, rBtn, void
bModified = true;
}
-IMPL_LINK(SwFormatTablePage, AutoClickHdl, weld::ToggleButton&, rControl, void)
+IMPL_LINK_NOARG(SwFormatTablePage, AutoClickHdl, weld::ToggleButton&, void)
{
bool bRestore = true,
bLeftEnable = false,
bRightEnable= false,
bWidthEnable= false,
bOthers = true;
- if (&rControl == m_xFullBtn.get())
+ if (m_xFullBtn->get_active())
{
m_xLeftMF->SetPrcntValue(0);
m_xRightMF->SetPrcntValue(0);
@@ -192,26 +192,26 @@ IMPL_LINK(SwFormatTablePage, AutoClickHdl, weld::ToggleButton&, rControl, void)
bFull = true;
bRestore = false;
}
- else if (&rControl == m_xLeftBtn.get())
+ else if (m_xLeftBtn->get_active())
{
bRightEnable = bWidthEnable = true;
m_xLeftMF->SetPrcntValue(0);
}
- else if (&rControl == m_xFromLeftBtn.get())
+ else if (m_xFromLeftBtn->get_active())
{
bLeftEnable = bWidthEnable = true;
m_xRightMF->SetPrcntValue(0);
}
- else if (&rControl == m_xRightBtn.get())
+ else if (m_xRightBtn->get_active())
{
bLeftEnable = bWidthEnable = true;
m_xRightMF->SetPrcntValue(0);
}
- else if (&rControl == m_xCenterBtn.get())
+ else if (m_xCenterBtn->get_active())
{
bLeftEnable = bWidthEnable = true;
}
- else if (&rControl == m_xFreeBtn.get())
+ else if (m_xFreeBtn->get_active())
{
RightModify();
bLeftEnable = true;
More information about the Libreoffice-commits
mailing list