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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Jul 27 19:21:55 UTC 2018


 cui/source/dialogs/zoom.cxx |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 59981d24e2aa4bb50c63f1f14deeb80d258fb847
Author:     Muhammet Kara <muhammet.kara at pardus.org.tr>
AuthorDate: Fri Jul 27 18:53:53 2018 +0300
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Jul 27 21:21:27 2018 +0200

    Merge identical conditional branches in ViewLayoutUserHdl
    
    Change-Id: I7e4d92dd12b00fa4d60cd667af780201b3246312
    Reviewed-on: https://gerrit.libreoffice.org/58200
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 9ff5d03f9ace..a4d3bef88261 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -301,12 +301,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, ViewLayoutUserHdl, weld::ToggleButton&, void)
 {
     m_bModified = true;
 
-    if (m_xAutomaticBtn->get_active())
-    {
-        m_xColumnsEdit->set_sensitive(false);
-        m_xBookModeChk->set_sensitive(false);
-    }
-    else if (m_xSingleBtn->get_active())
+    if (m_xAutomaticBtn->get_active() || m_xSingleBtn->get_active())
     {
         m_xColumnsEdit->set_sensitive(false);
         m_xBookModeChk->set_sensitive(false);


More information about the Libreoffice-commits mailing list