diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 18:20:34 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 10:21:11 +0200 |
| commit | c1a4cd6c4e0dc79bcebfc050f17963cc8f642ce3 (patch) | |
| tree | 402b667e0325bcd2705ffeb9320efc5fd2a48fc8 | |
| parent | 5c859f4f91fa99fc59ef4cd3ebc7b1a762e172f8 (diff) | |
Dialog::Execute return type is short/VclResponseType
Change-Id: I40fb77dff3112ee154d6d413757af6593486280d
| -rw-r--r-- | extensions/source/scanner/sanedlg.cxx | 2 | ||||
| -rw-r--r-- | svtools/source/dialogs/prnsetup.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index e30c771ac487..ae9c4d5cc00d 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -258,7 +258,7 @@ short SaneDlg::Execute() { MessageDialog aErrorBox(NULL, SaneResId(STR_COULD_NOT_BE_INIT)); aErrorBox.Execute(); - return sal_False; + return RET_CANCEL; } LoadState(); return ModalDialog::Execute(); diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 498f03862ecb..72cff7fc2657 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -345,7 +345,7 @@ short PrinterSetupDialog::Execute() if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() ) { SAL_WARN( "svtools.dialogs", "PrinterSetupDialog::Execute() - No Printer or printer is printing" ); - return sal_False; + return RET_CANCEL; } Printer::updatePrinters(); @@ -358,7 +358,7 @@ short PrinterSetupDialog::Execute() short nRet = ModalDialog::Execute(); // update data if the dialog was terminated with OK - if ( nRet == sal_True ) + if ( nRet == RET_OK ) { if ( mpTempPrinter ) mpPrinter->SetPrinterProps( mpTempPrinter ); |