From 6b33a41fcce8e045e4dc9a6775084f8555afaf41 Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Wed, 31 Jan 2018 12:34:32 +0300
Subject: dbaccess: MSVC: pragma warning: make more specific, remove obsolete

Change-Id: I0066b2de769a412cb04bcec7cdd8401f42b9dcf3
Reviewed-on: https://gerrit.libreoffice.org/48972
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
---
 dbaccess/source/ui/browser/genericcontroller.cxx | 29 ------------------------
 dbaccess/source/ui/dlg/adodatalinks.cxx          |  7 ------
 dbaccess/win32/source/odbcconfig/odbcconfig.cxx  |  9 --------
 3 files changed, 45 deletions(-)

(limited to 'dbaccess')

diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index dc66cd102eb0..0c3ebaf937e3 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -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()
 {
 
diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx
index 4e0db429b773..72fd0beb0e6d 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -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>
 
diff --git a/dbaccess/win32/source/odbcconfig/odbcconfig.cxx b/dbaccess/win32/source/odbcconfig/odbcconfig.cxx
index 73eb04a74d57..f9add1bef2f1 100644
--- a/dbaccess/win32/source/odbcconfig/odbcconfig.cxx
+++ b/dbaccess/win32/source/odbcconfig/odbcconfig.cxx
@@ -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"
 
-- 
cgit