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

[Caolán McNamara (via logerrit)]

 vcl/source/window/printdlg.cxx |   89 ++++++++++++++++++++---------------------
 1 file changed, 44 insertions(+), 45 deletions(-)

New commits:
commit c4242a448229425e1d432483274d7402f9252396
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed May 19 10:11:48 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed May 19 12:44:59 2021 +0200

    move toggle handlers into ToggleHdl
    
    no logic change intended
    
    Change-Id: I1d6e565f5ed27125d1b455e82bb99e4b0040c7f8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115790
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index a9b2a03ab627..87f77300fb16 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1823,45 +1823,26 @@ PropertyValue* PrintDialog::getValueForWindow( weld::Widget* i_pWindow ) const
 
 IMPL_LINK(PrintDialog, ToggleHdl, weld::ToggleButton&, rButton, void)
 {
-    ClickHdl(rButton);
-}
-
-IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, void)
-{
-    if (&rButton == mxOKButton.get() || &rButton == mxCancelButton.get())
+    if (&rButton == mxSingleJobsBox.get())
     {
-        storeToSettings();
-        m_xDialog->response(&rButton == mxOKButton.get() ? RET_OK : RET_CANCEL);
+        maPController->setValue( "SinglePrintJobs",
+                                 makeAny( isSingleJobs() ) );
+        checkControlDependencies();
     }
-    else if( &rButton == mxHelpButton.get() )
+    else if( &rButton == mxCollateBox.get() )
     {
-        // start help system
-        Help* pHelp = Application::GetHelp();
-        if( pHelp )
-        {
-            pHelp->Start("vcl/ui/printdialog/PrintDialog", mxOKButton.get());
-        }
+        maPController->setValue( "Collate",
+                                 makeAny( isCollate() ) );
+        checkControlDependencies();
     }
-    else if ( &rButton == mxPreviewBox.get() )
+    else if( &rButton == mxReverseOrderBox.get() )
     {
+        bool bChecked = mxReverseOrderBox->get_active();
+        maPController->setReversePrint( bChecked );
+        maPController->setValue( "PrintReverse",
+                                 makeAny( bChecked ) );
         maUpdatePreviewIdle.Start();
     }
-    else if( &rButton == mxForwardBtn.get() )
-    {
-        previewForward();
-    }
-    else if( &rButton == mxBackwardBtn.get() )
-    {
-        previewBackward();
-    }
-    else if( &rButton == mxFirstBtn.get() )
-    {
-        previewFirst();
-    }
-    else if( &rButton == mxLastBtn.get() )
-    {
-        previewLast();
-    }
     else if( &rButton == mxBrochureBtn.get() )
     {
         PropertyValue* pVal = getValueForWindow( &rButton );
@@ -1892,26 +1873,44 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, void)
         enableNupControls( true );
         updateNupFromPages();
     }
-    else if( &rButton == mxCollateBox.get() )
+}
+
+IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, void)
+{
+    if (&rButton == mxOKButton.get() || &rButton == mxCancelButton.get())
     {
-        maPController->setValue( "Collate",
-                                 makeAny( isCollate() ) );
-        checkControlDependencies();
+        storeToSettings();
+        m_xDialog->response(&rButton == mxOKButton.get() ? RET_OK : RET_CANCEL);
     }
-    else if( &rButton == mxSingleJobsBox.get() )
+    else if( &rButton == mxHelpButton.get() )
     {
-        maPController->setValue( "SinglePrintJobs",
-                                 makeAny( isSingleJobs() ) );
-        checkControlDependencies();
+        // start help system
+        Help* pHelp = Application::GetHelp();
+        if( pHelp )
+        {
+            pHelp->Start("vcl/ui/printdialog/PrintDialog", mxOKButton.get());
+        }
     }
-    else if( &rButton == mxReverseOrderBox.get() )
+    else if ( &rButton == mxPreviewBox.get() )
     {
-        bool bChecked = mxReverseOrderBox->get_active();
-        maPController->setReversePrint( bChecked );
-        maPController->setValue( "PrintReverse",
-                                 makeAny( bChecked ) );
         maUpdatePreviewIdle.Start();
     }
+    else if( &rButton == mxForwardBtn.get() )
+    {
+        previewForward();
+    }
+    else if( &rButton == mxBackwardBtn.get() )
+    {
+        previewBackward();
+    }
+    else if( &rButton == mxFirstBtn.get() )
+    {
+        previewFirst();
+    }
+    else if( &rButton == mxLastBtn.get() )
+    {
+        previewLast();
+    }
     else if( &rButton == mxBorderCB.get() )
     {
         updateNup();