Kaydet (Commit) 6b33a41f authored tarafından Mike Kaganski's avatar Mike Kaganski

dbaccess: MSVC: pragma warning: make more specific, remove obsolete

Change-Id: I0066b2de769a412cb04bcec7cdd8401f42b9dcf3
Reviewed-on: https://gerrit.libreoffice.org/48972Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst 8f43170f
......@@ -176,35 +176,6 @@ OGenericUnoController::OGenericUnoController(const Reference< XComponentContext
}
}
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4702)
OGenericUnoController::OGenericUnoController()
:OGenericUnoController_Base( getMutex() )
,m_pView(nullptr)
#ifdef DBG_UTIL
,m_bDescribingSupportedFeatures( false )
#endif
,m_aAsyncInvalidateAll(LINK(this, OGenericUnoController, OnAsyncInvalidateAll))
,m_aAsyncCloseTask(LINK(this, OGenericUnoController, OnAsyncCloseTask))
,m_aCurrentFrame( *this )
,m_bPreview(false)
,m_bReadOnly(false)
,m_bCurrentlyModified(false)
{
SAL_WARN("dbaccess.ui", "OGenericUnoController::OGenericUnoController: illegal call!" );
// This ctor only exists because the MSVC compiler complained about an unresolved external
// symbol. It should not be used at all. Since using it yields strange runtime problems,
// we simply abort here.
abort();
}
#pragma warning(pop)
#endif
OGenericUnoController::~OGenericUnoController()
{
......
......@@ -19,17 +19,10 @@
#if defined(_WIN32)
#if defined _MSC_VER
#pragma warning(push, 1)
#pragma warning(disable: 4917)
#endif
// LO/windows.h conflict
#undef WB_LEFT
#undef WB_RIGHT
#include <msdasc.h>
#if defined _MSC_VER
#pragma warning(push, 1)
#endif
#include <o3tl/char16_t2wchar_t.hxx>
......
......@@ -18,21 +18,12 @@
*/
#ifdef _MSC_VER
#pragma warning(push, 1)
#pragma warning(disable:4005)
#endif
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include <sqlext.h>
#ifdef _MSC_VER
#pragma warning(pop)
#endif
// the name of the library which contains the SQLManageDataSources function
#define ODBC_UI_LIB_NAME L"ODBCCP32.DLL"
......
......@@ -294,6 +294,7 @@ namespace dbaui
// methods
OGenericUnoController( const css::uno::Reference< css::uno::XComponentContext >& _rM );
OGenericUnoController() = delete;
const ::comphelper::NamedValueCollection&
getInitParams() const { return m_aInitParameters; }
......@@ -530,11 +531,6 @@ namespace dbaui
virtual void SAL_CALL removeKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) override;
virtual void SAL_CALL addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) override;
virtual void SAL_CALL removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) override;
protected:
#ifdef _MSC_VER
OGenericUnoController(); // never implemented
#endif
};
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment