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

Previous fix did not help, have to just ignore the "Unreachable code" warning

Browse Source 
Change-Id: Ic62056e2df9a17fd6716ae90e4372dec1d5dd40f
This commit is contained in:
Tor Lillqvist
2012-12-21 16:03:56 +02:00
parent 445d350c5c
commit a7599b1e60
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dbaccess/inc/genericcontroller.hxx
View File

@@ -521,7 +521,6 @@ namespace dbaui
protected: protected:
#ifdef _MSC_VER #ifdef _MSC_VER
__declspec(noreturn)
OGenericUnoController(); // never implemented OGenericUnoController(); // never implemented
#endif #endif
}; };

9
dbaccess/source/ui/browser/genericcontroller.cxx
View File

@@ -209,8 +209,10 @@ OGenericUnoController::OGenericUnoController(const Reference< XMultiServiceFacto
} }
#ifdef _MSC_VER #ifdef _MSC_VER
// -----------------------------------------------------------------------------
__declspec(noreturn) #pragma warning(push)
#pragma warning(disable:4702)
OGenericUnoController::OGenericUnoController() OGenericUnoController::OGenericUnoController()
:OGenericUnoController_Base( getMutex() ) :OGenericUnoController_Base( getMutex() )
,m_pView(NULL) ,m_pView(NULL)
@@ -230,6 +232,9 @@ OGenericUnoController::OGenericUnoController()
// we simply abort here. // we simply abort here.
abort(); abort();
} }
#pragma warning(pop)
#endif #endif
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------