[Libreoffice-commits] core.git: 3 commits - cli_ure/source configmgr/source dbaccess/source dbaccess/win32 include/dbaccess
Mike Kaganski
mike.kaganski at collabora.com
Thu Feb 1 05:46:23 UTC 2018
cli_ure/source/climaker/climaker_emit.cxx | 2 -
cli_ure/source/uno_bridge/cli_bridge.cxx | 3 --
cli_ure/source/uno_bridge/cli_data.cxx | 2 -
cli_ure/source/uno_bridge/cli_proxy.h | 2 -
configmgr/source/winreg.cxx | 6 ----
dbaccess/source/ui/browser/genericcontroller.cxx | 29 -----------------------
dbaccess/source/ui/dlg/adodatalinks.cxx | 7 -----
dbaccess/win32/source/odbcconfig/odbcconfig.cxx | 9 -------
include/dbaccess/genericcontroller.hxx | 6 ----
9 files changed, 2 insertions(+), 64 deletions(-)
New commits:
commit 6b33a41fcce8e045e4dc9a6775084f8555afaf41
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Wed Jan 31 12:34:32 2018 +0300
dbaccess: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: I0066b2de769a412cb04bcec7cdd8401f42b9dcf3
Reviewed-on: https://gerrit.libreoffice.org/48972
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
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"
diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx
index de8a586c7b6e..52fc8bcbd994 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -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
};
}
commit 8f43170f121443e8320d42c21b3dba8ffe8112b3
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Wed Jan 31 12:26:39 2018 +0300
configmgr: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: I7f98fa855ff521db42bf9b379bfac3d430791ae0
Reviewed-on: https://gerrit.libreoffice.org/48968
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/configmgr/source/winreg.cxx b/configmgr/source/winreg.cxx
index e9c6e8359510..59cd575efe68 100644
--- a/configmgr/source/winreg.cxx
+++ b/configmgr/source/winreg.cxx
@@ -11,15 +11,9 @@
#include <cwchar>
#include <memory>
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#endif
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <msiquery.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/XInterface.hpp>
commit acb3eeb6c20dba8a903d462fe2149c4f5a0762db
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Wed Jan 31 11:41:03 2018 +0300
cli_ure: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: I63e12a22a46de27a8bd010e4d21bf36d3a7e9178
Reviewed-on: https://gerrit.libreoffice.org/48967
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx
index 9a6c7f3f6764..af66a246eca5 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -97,7 +97,7 @@ static inline void emit_ldarg( Emit::ILGenerator ^ code, ::System::Int32 index )
{
case 0:
#pragma warning (push)
-#pragma warning (disable: 4538)
+#pragma warning (disable: 4538) // const/volatile qualifiers on this type are not supported
code->Emit( Emit::OpCodes::Ldarg_0 );
#pragma warning (pop)
break;
diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx
index 93e51058a170..92368f1236dd 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.cxx
+++ b/cli_ure/source/uno_bridge/cli_bridge.cxx
@@ -18,14 +18,11 @@
*/
#include <vcclr.h>
-//ToDo: remove when build with .NET 2
-#pragma warning(push, 1)
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#include "uno/environment.hxx"
-#pragma warning(pop)
#include "uno/lbnames.h"
#include "uno/mapping.hxx"
#include "typelib/typedescription.hxx"
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index 452d0af474d2..722536a3057d 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -17,13 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#pragma warning(push, 1)
#if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#include "windows.h"
#include <ole2.h>
-#pragma warning(pop)
#include <memory>
diff --git a/cli_ure/source/uno_bridge/cli_proxy.h b/cli_ure/source/uno_bridge/cli_proxy.h
index 8937daf290f4..25f7d2801314 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.h
+++ b/cli_ure/source/uno_bridge/cli_proxy.h
@@ -20,9 +20,7 @@
#ifndef INCLUDED_CLI_URE_SOURCE_UNO_BRIDGE_CLI_PROXY_H
#define INCLUDED_CLI_URE_SOURCE_UNO_BRIDGE_CLI_PROXY_H
-#pragma warning(push, 1)
#include "uno/environment.hxx"
-#pragma warning(pop)
#include "uno/mapping.hxx"
#include "uno/dispatcher.h"
#include "cli_bridge.h"
More information about the Libreoffice-commits
mailing list