diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-12 11:36:31 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-12 11:36:54 +0000 |
| commit | cdd597746ff43c02ae613304ffe7456ec855181f (patch) | |
| tree | f5252a11984813e09a467731c2e588d081e02ba9 | |
| parent | 6765b2b71544a1ca0957fbd5e04062c274a24f45 (diff) | |
Resolves: fdo#43690 install explicit cancel handler
| -rw-r--r-- | filter/source/pdf/impdialog.cxx | 8 | ||||
| -rw-r--r-- | filter/source/pdf/impdialog.hxx | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 21f4424822f4..650f07b1efc2 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 77f88b37db29..d55c6c99eb36 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; |