diff options
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/inc/genericcontroller.hxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/browser/genericcontroller.cxx | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx index 0880138738f5..ddcb323e97ce 100644 --- a/dbaccess/inc/genericcontroller.hxx +++ b/dbaccess/inc/genericcontroller.hxx @@ -521,7 +521,6 @@ namespace dbaui protected: #ifdef _MSC_VER - __declspec(noreturn) OGenericUnoController(); // never implemented #endif }; diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 35eb6d359fba..3260f2fed556 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -209,8 +209,10 @@ OGenericUnoController::OGenericUnoController(const Reference< XMultiServiceFacto } #ifdef _MSC_VER -// ----------------------------------------------------------------------------- -__declspec(noreturn) + +#pragma warning(push) +#pragma warning(disable:4702) + OGenericUnoController::OGenericUnoController() :OGenericUnoController_Base( getMutex() ) ,m_pView(NULL) @@ -230,6 +232,9 @@ OGenericUnoController::OGenericUnoController() // we simply abort here. abort(); } + +#pragma warning(pop) + #endif // ----------------------------------------------------------------------------- |