[Libreoffice-commits] core.git: embedserv/source
Mike Kaganski
mike.kaganski at collabora.com
Thu Feb 1 09:42:51 UTC 2018
embedserv/source/embed/docholder.cxx | 3 ---
embedserv/source/embed/ed_idataobj.cxx | 3 ---
embedserv/source/embed/ed_ipersiststr.cxx | 3 ---
embedserv/source/embed/esdll.cxx | 10 ----------
embedserv/source/embed/guid.cxx | 3 ---
embedserv/source/embed/register.cxx | 3 ---
embedserv/source/embed/servprov.cxx | 3 ---
embedserv/source/embed/syswinwrapper.cxx | 3 ---
embedserv/source/embed/tracker.cxx | 4 ----
embedserv/source/inc/embeddoc.hxx | 3 ---
embedserv/source/inc/embeddocaccess.hxx | 1 -
embedserv/source/inc/iipaobj.hxx | 3 ---
embedserv/source/inc/stdafx.h | 9 ---------
embedserv/source/inprocserv/advisesink.cxx | 4 ----
embedserv/source/inprocserv/inprocembobj.h | 4 ----
15 files changed, 59 deletions(-)
New commits:
commit 2c9904f300ab195636fc06c3c3b14aa61eb3ee85
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Wed Jan 31 12:45:25 2018 +0300
embedserv: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: I0abd5662648b09f31164d919688e17a651bf78c8
Reviewed-on: https://gerrit.libreoffice.org/48976
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index fb333d862a61..0efc380843b9 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -16,9 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifdef _MSC_VER
-#pragma warning(disable : 4917 4555)
-#endif
#include <docholder.hxx>
#include <embeddoc.hxx>
diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx
index 11b1709c71c1..140595ebfa65 100644
--- a/embedserv/source/embed/ed_idataobj.cxx
+++ b/embedserv/source/embed/ed_idataobj.cxx
@@ -16,9 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifdef _MSC_VER
-#pragma warning(disable : 4917 4555)
-#endif
#include <embeddoc.hxx>
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index b863cd8270ef..3b817ceb3138 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -16,9 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifdef _MSC_VER
-#pragma warning(disable : 4917 4555)
-#endif
#include <embeddoc.hxx>
#include <com/sun/star/uno/Exception.hpp>
diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx
index d9b19510ff2c..bfffe73bb3f6 100644
--- a/embedserv/source/embed/esdll.cxx
+++ b/embedserv/source/embed/esdll.cxx
@@ -18,21 +18,11 @@
*/
#define _WIN32_DCOM
-#ifdef _MSC_VER
-#pragma warning(disable : 4917 4555)
-#endif
#include <stdafx.h>
#include <atlbase.h>
-#ifdef _MSC_VER
-#pragma warning( push )
-#pragma warning( disable: 4710 )
-#endif
CComModule _Module;
-#ifdef _MSC_VER
-#pragma warning( pop )
-#endif
#include <atlcom.h>
BEGIN_OBJECT_MAP(ObjectMap)
diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx
index f943eb7220e2..cb23d05f0fc5 100644
--- a/embedserv/source/embed/guid.cxx
+++ b/embedserv/source/embed/guid.cxx
@@ -16,9 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifdef _MSC_VER
-#pragma warning(disable : 4917 4555)
-#endif
#include <common.h>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx
index 461e831b6abf..25c25b7a5aa3 100644
--- a/embedserv/source/embed/register.cxx
+++ b/embedserv/source/embed/register.cxx
@@ -16,9 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifdef _MSC_VER
-#pragma warning(disable : 4917 4555)
-#endif
#include <servprov.hxx>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx
index 0460565a3f20..ff56b7ec69d8 100644
--- a/embedserv/source/embed/servprov.cxx
+++ b/embedserv/source/embed/servprov.cxx
@@ -16,9 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifdef _MSC_VER
-#pragma warning(disable : 4917 4555)
-#endif
#include <stdafx.h>
#include <servprov.hxx>
diff --git a/embedserv/source/embed/syswinwrapper.cxx b/embedserv/source/embed/syswinwrapper.cxx
index 8b87a88acc77..be2416f30086 100644
--- a/embedserv/source/embed/syswinwrapper.cxx
+++ b/embedserv/source/embed/syswinwrapper.cxx
@@ -16,9 +16,6 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifdef _MSC_VER
-#pragma warning(disable : 4917 4555)
-#endif
#include <docholder.hxx>
#include <syswinwrapper.hxx>
diff --git a/embedserv/source/embed/tracker.cxx b/embedserv/source/embed/tracker.cxx
index ba8582c97fad..823f25588ccd 100644
--- a/embedserv/source/embed/tracker.cxx
+++ b/embedserv/source/embed/tracker.cxx
@@ -23,10 +23,6 @@
#include <sal/types.h>
-#ifdef _MSC_VER
-#pragma warning(disable : 4917 4555)
-#endif
-
#include <stdafx.h>
#include <stddef.h>
#include <syswinwrapper.hxx>
diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx
index ce3e70f02101..1d6a28bae946 100644
--- a/embedserv/source/inc/embeddoc.hxx
+++ b/embedserv/source/inc/embeddoc.hxx
@@ -19,9 +19,6 @@
#ifndef 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 <oleidl.h>
diff --git a/embedserv/source/inc/embeddocaccess.hxx b/embedserv/source/inc/embeddocaccess.hxx
index 96d005863eaf..8b03900afd82 100644
--- a/embedserv/source/inc/embeddocaccess.hxx
+++ b/embedserv/source/inc/embeddocaccess.hxx
@@ -28,7 +28,6 @@
#define OLESERV_DEACTIVATE 6
#include <oleidl.h>
-#pragma warning(disable : 4265)
#if defined __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wall"
diff --git a/embedserv/source/inc/iipaobj.hxx b/embedserv/source/inc/iipaobj.hxx
index 7ae08932fdd5..8bcc04688385 100644
--- a/embedserv/source/inc/iipaobj.hxx
+++ b/embedserv/source/inc/iipaobj.hxx
@@ -19,9 +19,6 @@
#ifndef 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 <oleidl.h>
diff --git a/embedserv/source/inc/stdafx.h b/embedserv/source/inc/stdafx.h
index 8e65c0af9c4d..e2369d3f7af9 100644
--- a/embedserv/source/inc/stdafx.h
+++ b/embedserv/source/inc/stdafx.h
@@ -2,10 +2,6 @@
#if !defined(AFX_STDAFX_H_)
#define AFX_STDAFX_H_
-#ifdef _MSC_VER
-#pragma once
-#endif
-
#define STRICT
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0502
@@ -14,9 +10,6 @@
// #define _ATL_STATIC_REGISTRY
#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(push, 1)
-#pragma warning(disable: 4548)
#if defined __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wall"
@@ -54,8 +47,6 @@ extern CComModule _Module;
#if defined __clang__
#pragma clang diagnostic pop
#endif
-#pragma warning(pop)
-#pragma warning(pop)
#endif
#endif
diff --git a/embedserv/source/inprocserv/advisesink.cxx b/embedserv/source/inprocserv/advisesink.cxx
index a73f52e7fb8b..e13ad7260d2b 100644
--- a/embedserv/source/inprocserv/advisesink.cxx
+++ b/embedserv/source/inprocserv/advisesink.cxx
@@ -21,10 +21,6 @@
#include <o3tl/make_unique.hxx>
-#if defined _MSC_VER
-#pragma warning(disable : 4668)
-#endif
-
#include "advisesink.hxx"
namespace inprocserv
diff --git a/embedserv/source/inprocserv/inprocembobj.h b/embedserv/source/inprocserv/inprocembobj.h
index 691ef58d4500..3f5c5ce6e5e1 100644
--- a/embedserv/source/inprocserv/inprocembobj.h
+++ b/embedserv/source/inprocserv/inprocembobj.h
@@ -20,10 +20,6 @@
#ifndef 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
# define WIN32_LEAN_AND_MEAN
#endif
More information about the Libreoffice-commits
mailing list