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

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/page.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit ee094212fd3f3029afd15df07b29aae2c1e36ac9
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Feb 10 16:07:27 2020 +0000
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Tue Feb 11 13:05:35 2020 +0100

    Resolves: tdf#130548 click is sent to the other member of the group
    
    when toggling one the other gets a click signal, but its too
    early and the page size isn't set yet, making the dialog thing
    the margins won't fit in the page
    
    Change-Id: I5b51f2d91c69558d47f43b3f05eca3fd87a24125
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88386
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 99d1fcb67bcd..508984bf882b 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -419,9 +419,17 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
          aPaperSize.Width() > aPaperSize.Height() )
         bLandscape = true;
 
+    // tdf#130548 disable callbacks on the other of a pair of the radiogroup
+    // when toggling its partner
+    m_xLandscapeBtn->connect_clicked(Link<weld::Button&, void>());
+    m_xPortraitBtn->connect_clicked(Link<weld::Button&, void>());
+
     m_xLandscapeBtn->set_active(bLandscape);
     m_xPortraitBtn->set_active(!bLandscape);
 
+    m_xLandscapeBtn->connect_clicked(LINK(this, SvxPageDescPage, SwapOrientation_Impl));
+    m_xPortraitBtn->connect_clicked(LINK(this, SvxPageDescPage, SwapOrientation_Impl));
+
     m_aBspWin.SetSize( Size( ConvertLong_Impl( aPaperSize.Width(), eUnit ),
                            ConvertLong_Impl( aPaperSize.Height(), eUnit ) ) );