[Libreoffice-commits] .: dbaccess/inc dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/inc/genericcontroller.hxx               |    1 -
 dbaccess/source/ui/browser/genericcontroller.cxx |    9 +++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit a7599b1e601725b18e1bdb996982eb6f00598eb4
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Dec 21 16:03:56 2012 +0200

    Previous fix did not help, have to just ignore the "Unreachable code" warning
    
    Change-Id: Ic62056e2df9a17fd6716ae90e4372dec1d5dd40f

diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx
index 0880138..ddcb323 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 35eb6d3..3260f2f 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
 
 // -----------------------------------------------------------------------------