mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: fdo#43690 install explicit cancel handler

Browse Source
This commit is contained in:
Caolán McNamara
2011-12-12 11:36:31 +00:00
parent 6765b2b715
commit cdd597746f
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
filter/source/pdf/impdialog.cxx
View File

@@ -255,11 +255,19 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
GetOKButton().SetText( ( sOkButtonText.getLength() > 0 ) ? GetOKButton().SetText( ( sOkButtonText.getLength() > 0 ) ?
sOkButtonText : OUString( String( PDFFilterResId( STR_PDF_EXPORT ) ) )); sOkButtonText : OUString( String( PDFFilterResId( STR_PDF_EXPORT ) ) ));
GetCancelButton().SetClickHdl(LINK(this, ImpPDFTabDialog, CancelHdl));
//remove the reset button, not needed in this tabbed dialog //remove the reset button, not needed in this tabbed dialog
RemoveResetButton(); RemoveResetButton();
///////////////// /////////////////
} }
IMPL_LINK( ImpPDFTabDialog, CancelHdl, Button *, EMPTYARG )
{
EndDialog( sal_False );
return 0;
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
ImpPDFTabDialog::~ImpPDFTabDialog() ImpPDFTabDialog::~ImpPDFTabDialog()
{ {

4
filter/source/pdf/impdialog.hxx
View File

@@ -89,9 +89,11 @@ private:
Any maSelection; Any maSelection;
DECL_LINK( CancelHdl, Button * );
protected: protected:
//the following data are the configuration used throughout the dialog and pages //the following data are the configuration used throughout the dialog and pages
sal_Bool mbIsPresentation; sal_Bool mbIsPresentation;
sal_Bool mbIsWriter; sal_Bool mbIsWriter;
sal_Bool mbSelectionPresent; sal_Bool mbSelectionPresent;
sal_Bool mbUseCTLFont; sal_Bool mbUseCTLFont;