[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source

[Libreoffice Gerrit user]

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

New commits:
commit c21e8bde3a2cf31e02d5eaf7a8773f6af6c67b3b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Aug 21 12:06:51 2018 +0100
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Tue Aug 28 18:27:19 2018 +0200

    Resolves: tdf#119350 page with 0 margins shown as 1cm in page dialog
    
    since...
    
    commit 7958091b06954a7b253fdebb9ea0313db9217959
    Date:   Fri Jun 15 14:03:31 2018 +0100
    
        weld SvxPageDescPage
    
    because the toggle handler fires when the value of landscape is set,
    change to a click handler which fires only when the user explicitly
    clicks on it, which restore the original quirky behaviour
    
    Change-Id: If93cc9e0b5d38d92844a1d85de53ee2da958efa0
    Reviewed-on: https://gerrit.libreoffice.org/59394
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index ab9f1cad1869..da7ee7047391 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -137,7 +137,7 @@ private:
     void                Init_Impl();
     DECL_LINK(LayoutHdl_Impl, weld::ComboBoxText&, void);
     DECL_LINK(PaperBinHdl_Impl, weld::ComboBoxText&, void);
-    DECL_LINK(SwapOrientation_Impl, weld::ToggleButton&, void);
+    DECL_LINK(SwapOrientation_Impl, weld::Button&, void);
     void SwapFirstValues_Impl( bool bSet );
     DECL_LINK(BorderModify_Impl, weld::MetricSpinButton&, void);
     void InitHeadFoot_Impl( const SfxItemSet& rSet );
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 265b2d1ef72b..df36ebf3a12d 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -316,8 +316,8 @@ void SvxPageDescPage::Init_Impl()
     m_xPaperSizeBox->connect_changed(LINK(this, SvxPageDescPage, PaperSizeSelect_Impl));
     m_xPaperWidthEdit->connect_value_changed( LINK(this, SvxPageDescPage, PaperSizeModify_Impl));
     m_xPaperHeightEdit->connect_value_changed(LINK(this, SvxPageDescPage, PaperSizeModify_Impl));
-    m_xLandscapeBtn->connect_toggled(LINK(this, SvxPageDescPage, SwapOrientation_Impl));
-    m_xPortraitBtn->connect_toggled(LINK(this, SvxPageDescPage, SwapOrientation_Impl));
+    m_xLandscapeBtn->connect_clicked(LINK(this, SvxPageDescPage, SwapOrientation_Impl));
+    m_xPortraitBtn->connect_clicked(LINK(this, SvxPageDescPage, SwapOrientation_Impl));
 
     Link<weld::MetricSpinButton&, void> aLink = LINK(this, SvxPageDescPage, BorderModify_Impl);
     m_xLeftMarginEdit->connect_value_changed(aLink);
@@ -905,7 +905,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl, weld::MetricSpinButton&,
     RangeHdl_Impl();
 }
 
-IMPL_LINK(SvxPageDescPage, SwapOrientation_Impl, weld::ToggleButton&, rBtn, void)
+IMPL_LINK(SvxPageDescPage, SwapOrientation_Impl, weld::Button&, rBtn, void)
 {
     if (
         (!bLandscape && &rBtn == m_xLandscapeBtn.get()) ||