include/vcl/svapp.hxx | 12 +-----------
vcl/source/app/svapp.cxx | 2 --
vcl/source/window/dialog.cxx | 3 +--
3 files changed, 2 insertions(+), 15 deletions(-)
New commits:
commit ff966ca6f43e2013095f6379525f1d969e65aef4
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Wed May 22 16:05:23 2013 +0200
replace DialogCancelledException with std::abort
Change-Id: Ib815c1a84efa4682ad644132ad3704f249b04a68
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index ffe228e..c182a0b 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -124,17 +124,7 @@ public:
DIALOG_CANCEL_OFF, ///< do not automatically cancel dialogs
DIALOG_CANCEL_SILENT, ///< silently cancel any dialogs
DIALOG_CANCEL_FATAL
- ///< cancel any dialogs by throwing a DialogCancelledException
- };
-
- class VCL_DLLPUBLIC DialogCancelledException:
- virtual public std::runtime_error
- {
- public:
- explicit DialogCancelledException(char const * what_arg):
- runtime_error(what_arg) {}
-
- virtual ~DialogCancelledException() throw ();
+ ///< cancel any dialogs by std::abort
};
Application();
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 8b3d149..ac2d4c8 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1877,6 +1877,4 @@ Application::createFolderPicker( const Reference<
uno::XComponentContext >& xSM
return pSVData->mpDefInst->createFolderPicker( xSM );
}
-Application::DialogCancelledException::~DialogCancelledException() throw () {}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index c0bb501..266a4a7 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -835,8 +835,7 @@ sal_Bool Dialog::ImplStartExecuteModal()
assert(false); // this cannot happen
// fall through
case Application::DIALOG_CANCEL_FATAL:
- throw Application::DialogCancelledException(
- ImplGetDialogText(this).getStr());
+ std::abort();
}
#ifdef DBG_UTIL
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
