Kaydet (Commit) 2c9904f3 authored tarafından Mike Kaganski's avatar Mike Kaganski

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

Change-Id: I0abd5662648b09f31164d919688e17a651bf78c8
Reviewed-on: https://gerrit.libreoffice.org/48976Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst dc4dae12
...@@ -16,9 +16,6 @@ ...@@ -16,9 +16,6 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
#include <docholder.hxx> #include <docholder.hxx>
#include <embeddoc.hxx> #include <embeddoc.hxx>
......
...@@ -16,9 +16,6 @@ ...@@ -16,9 +16,6 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
#include <embeddoc.hxx> #include <embeddoc.hxx>
......
...@@ -16,9 +16,6 @@ ...@@ -16,9 +16,6 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
#include <embeddoc.hxx> #include <embeddoc.hxx>
#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Exception.hpp>
......
...@@ -18,21 +18,11 @@ ...@@ -18,21 +18,11 @@
*/ */
#define _WIN32_DCOM #define _WIN32_DCOM
#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
#include <stdafx.h> #include <stdafx.h>
#include <atlbase.h> #include <atlbase.h>
#ifdef _MSC_VER
#pragma warning( push )
#pragma warning( disable: 4710 )
#endif
CComModule _Module; CComModule _Module;
#ifdef _MSC_VER
#pragma warning( pop )
#endif
#include <atlcom.h> #include <atlcom.h>
BEGIN_OBJECT_MAP(ObjectMap) BEGIN_OBJECT_MAP(ObjectMap)
......
...@@ -16,9 +16,6 @@ ...@@ -16,9 +16,6 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
#include <common.h> #include <common.h>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
......
...@@ -16,9 +16,6 @@ ...@@ -16,9 +16,6 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
#include <servprov.hxx> #include <servprov.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp>
......
...@@ -16,9 +16,6 @@ ...@@ -16,9 +16,6 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
#include <stdafx.h> #include <stdafx.h>
#include <servprov.hxx> #include <servprov.hxx>
......
...@@ -16,9 +16,6 @@ ...@@ -16,9 +16,6 @@
* except in compliance with the License. You may obtain a copy of * except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
#include <docholder.hxx> #include <docholder.hxx>
#include <syswinwrapper.hxx> #include <syswinwrapper.hxx>
......
...@@ -23,10 +23,6 @@ ...@@ -23,10 +23,6 @@
#include <sal/types.h> #include <sal/types.h>
#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
#include <stdafx.h> #include <stdafx.h>
#include <stddef.h> #include <stddef.h>
#include <syswinwrapper.hxx> #include <syswinwrapper.hxx>
......
...@@ -19,9 +19,6 @@ ...@@ -19,9 +19,6 @@
#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOC_HXX #ifndef INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOC_HXX
#define INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOC_HXX #define INCLUDED_EMBEDSERV_SOURCE_INC_EMBEDDOC_HXX
#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
#include "common.h" #include "common.h"
#include <oleidl.h> #include <oleidl.h>
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#define OLESERV_DEACTIVATE 6 #define OLESERV_DEACTIVATE 6
#include <oleidl.h> #include <oleidl.h>
#pragma warning(disable : 4265)
#if defined __clang__ #if defined __clang__
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wall" #pragma clang diagnostic ignored "-Wall"
......
...@@ -19,9 +19,6 @@ ...@@ -19,9 +19,6 @@
#ifndef INCLUDED_EMBEDSERV_SOURCE_INC_IIPAOBJ_HXX #ifndef INCLUDED_EMBEDSERV_SOURCE_INC_IIPAOBJ_HXX
#define INCLUDED_EMBEDSERV_SOURCE_INC_IIPAOBJ_HXX #define INCLUDED_EMBEDSERV_SOURCE_INC_IIPAOBJ_HXX
#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
#include "stdafx.h" #include "stdafx.h"
#include <oleidl.h> #include <oleidl.h>
......
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
#if !defined(AFX_STDAFX_H_) #if !defined(AFX_STDAFX_H_)
#define AFX_STDAFX_H_ #define AFX_STDAFX_H_
#ifdef _MSC_VER
#pragma once
#endif
#define STRICT #define STRICT
#ifndef _WIN32_WINNT #ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0502 #define _WIN32_WINNT 0x0502
...@@ -14,9 +10,6 @@ ...@@ -14,9 +10,6 @@
// #define _ATL_STATIC_REGISTRY // #define _ATL_STATIC_REGISTRY
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push)
#pragma warning(push, 1)
#pragma warning(disable: 4548)
#if defined __clang__ #if defined __clang__
#pragma clang diagnostic push #pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wall" #pragma clang diagnostic ignored "-Wall"
...@@ -54,8 +47,6 @@ extern CComModule _Module; ...@@ -54,8 +47,6 @@ extern CComModule _Module;
#if defined __clang__ #if defined __clang__
#pragma clang diagnostic pop #pragma clang diagnostic pop
#endif #endif
#pragma warning(pop)
#pragma warning(pop)
#endif #endif
#endif #endif
......
...@@ -21,10 +21,6 @@ ...@@ -21,10 +21,6 @@
#include <o3tl/make_unique.hxx> #include <o3tl/make_unique.hxx>
#if defined _MSC_VER
#pragma warning(disable : 4668)
#endif
#include "advisesink.hxx" #include "advisesink.hxx"
namespace inprocserv namespace inprocserv
......
...@@ -20,10 +20,6 @@ ...@@ -20,10 +20,6 @@
#ifndef INCLUDED_EMBEDSERV_SOURCE_INPROCSERV_INPROCEMBOBJ_H #ifndef INCLUDED_EMBEDSERV_SOURCE_INPROCSERV_INPROCEMBOBJ_H
#define INCLUDED_EMBEDSERV_SOURCE_INPROCSERV_INPROCEMBOBJ_H #define INCLUDED_EMBEDSERV_SOURCE_INPROCSERV_INPROCEMBOBJ_H
#if defined _MSC_VER
#pragma warning(disable : 4668)
#endif
#if !defined WIN32_LEAN_AND_MEAN #if !defined WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#endif #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