[Libreoffice-commits] .: 2 commits - filter/source vcl/unx

[Caolán McNamara]

 filter/source/pdf/impdialog.cxx          |    8 ++++++++
 filter/source/pdf/impdialog.hxx          |    4 +++-
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |    1 -
 3 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit cdd597746ff43c02ae613304ffe7456ec855181f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 12 11:36:31 2011 +0000

    Resolves: fdo#43690 install explicit cancel handler

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 21f4424..650f07b 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -255,11 +255,19 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
     GetOKButton().SetText( ( sOkButtonText.getLength() > 0 ) ?
                             sOkButtonText : OUString( String( PDFFilterResId( STR_PDF_EXPORT ) ) ));
 
+    GetCancelButton().SetClickHdl(LINK(this, ImpPDFTabDialog, CancelHdl));
+
 //remove the reset button, not needed in this tabbed dialog
     RemoveResetButton();
 /////////////////
 }
 
+IMPL_LINK( ImpPDFTabDialog, CancelHdl, Button *, EMPTYARG )
+{
+    EndDialog( sal_False );
+    return 0;
+}
+
 // -----------------------------------------------------------------------------
 ImpPDFTabDialog::~ImpPDFTabDialog()
 {
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 77f88b3..d55c6c9 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -89,9 +89,11 @@ private:
 
     Any                         maSelection;
 
+    DECL_LINK( CancelHdl, Button * );
+
 protected:
 //the following data are the configuration used throughout the dialog and pages
-       sal_Bool                    mbIsPresentation;
+    sal_Bool                    mbIsPresentation;
     sal_Bool                    mbIsWriter;
     sal_Bool                    mbSelectionPresent;
     sal_Bool                    mbUseCTLFont;
commit 6765b2b71544a1ca0957fbd5e04062c274a24f45
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 12 11:35:49 2011 +0000

    stop saying "15" on stdout

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index f9e5906..d064f83 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -2103,7 +2103,6 @@ static Rectangle NWGetSpinButtonRect( int nScreen,
             buttonRect.Left()   = buttonRect.Right()+1;
             buttonRect.Right()  = aAreaRect.Right();
         } else {
-            printf("%ld\n", buttonRect.GetWidth());
             buttonRect.Right()  = buttonRect.Left()-1;
             buttonRect.Left()   = aAreaRect.Left();
         }