summaryrefslogtreecommitdiff
path: root/embedserv
diff options
context:
space:
mode:
Diffstat (limited to 'embedserv')
-rw-r--r--embedserv/source/embed/docholder.cxx4
-rw-r--r--embedserv/source/embed/ed_idataobj.cxx2
-rw-r--r--embedserv/source/embed/ed_ipersiststr.cxx2
-rw-r--r--embedserv/source/embed/esdll.cxx2
-rw-r--r--embedserv/source/embed/guid.cxx2
-rw-r--r--embedserv/source/embed/register.cxx2
-rw-r--r--embedserv/source/embed/servprov.cxx2
-rw-r--r--embedserv/source/embed/syswinwrapper.cxx2
-rw-r--r--embedserv/source/embed/tracker.cxx2
-rw-r--r--embedserv/source/inc/embeddoc.hxx2
-rw-r--r--embedserv/source/inc/embeddocaccess.hxx2
-rw-r--r--embedserv/source/inc/iipaobj.hxx2
-rw-r--r--embedserv/source/inc/stdafx.h4
13 files changed, 15 insertions, 15 deletions
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index cf2b71c4c9d9..8ddfb66703ff 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if defined(_MSC_VER) && (_MSC_VER > 1310)
+#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
@@ -1507,7 +1507,7 @@ void SAL_CALL DocumentHolder::modified( const lang::EventObject& /*aEvent*/ )
// Fix strange warnings about some
// ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions.
// warning C4505: 'xxx' : unreferenced local function has been removed
-#if defined(_MSC_VER)
+#ifdef _MSC_VER
#pragma warning(disable: 4505)
#endif
diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx
index 7dc8824ffde2..c62f6eae8cbe 100644
--- a/embedserv/source/embed/ed_idataobj.cxx
+++ b/embedserv/source/embed/ed_idataobj.cxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if defined(_MSC_VER) && (_MSC_VER > 1310)
+#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index 783ab45138e4..f65cd0163065 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if defined(_MSC_VER) && (_MSC_VER > 1310)
+#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx
index 6df9c2edb2cb..b5aa6b7a2762 100644
--- a/embedserv/source/embed/esdll.cxx
+++ b/embedserv/source/embed/esdll.cxx
@@ -20,7 +20,7 @@
#define STRICT
#define _WIN32_WINNT 0x0403
#define _WIN32_DCOM
-#if defined(_MSC_VER) && (_MSC_VER > 1310)
+#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx
index a04dcd18bb76..b7520cd51552 100644
--- a/embedserv/source/embed/guid.cxx
+++ b/embedserv/source/embed/guid.cxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if defined(_MSC_VER) && (_MSC_VER > 1310)
+#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx
index e6d1fff1bdab..1ce0a67b5350 100644
--- a/embedserv/source/embed/register.cxx
+++ b/embedserv/source/embed/register.cxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if defined(_MSC_VER) && (_MSC_VER > 1310)
+#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx
index e6fb95880007..739a3088f025 100644
--- a/embedserv/source/embed/servprov.cxx
+++ b/embedserv/source/embed/servprov.cxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if defined(_MSC_VER) && (_MSC_VER > 1310)
+#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
diff --git a/embedserv/source/embed/syswinwrapper.cxx b/embedserv/source/embed/syswinwrapper.cxx
index b9ad3675257e..0621eb54ebb4 100644
--- a/embedserv/source/embed/syswinwrapper.cxx
+++ b/embedserv/source/embed/syswinwrapper.cxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if defined(_MSC_VER) && (_MSC_VER > 1310)
+#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
diff --git a/embedserv/source/embed/tracker.cxx b/embedserv/source/embed/tracker.cxx
index edaff017a12c..61338dbe4487 100644
--- a/embedserv/source/embed/tracker.cxx
+++ b/embedserv/source/embed/tracker.cxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#if defined(_MSC_VER) && (_MSC_VER > 1310)
+#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx
index 3eab4a0b4bb1..1962c5451748 100644
--- a/embedserv/source/inc/embeddoc.hxx
+++ b/embedserv/source/inc/embeddoc.hxx
@@ -19,7 +19,7 @@
#ifndef _EMBEDDOC_HXX_
#define _EMBEDDOC_HXX_
-#if defined(_MSC_VER) && (_MSC_VER > 1310)
+#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
diff --git a/embedserv/source/inc/embeddocaccess.hxx b/embedserv/source/inc/embeddocaccess.hxx
index 1b3ff4bd255a..b094ac0b4f8b 100644
--- a/embedserv/source/inc/embeddocaccess.hxx
+++ b/embedserv/source/inc/embeddocaccess.hxx
@@ -29,7 +29,7 @@
#include <oleidl.h>
#ifndef __MINGW32__
-#if defined(_MSC_VER) && (_MSC_VER > 1310)
+#ifdef _MSC_VER
#pragma warning(disable : 4265)
#include <atldbcli.h>
#else
diff --git a/embedserv/source/inc/iipaobj.hxx b/embedserv/source/inc/iipaobj.hxx
index 24dd60b3b944..d4f9f8b2eb02 100644
--- a/embedserv/source/inc/iipaobj.hxx
+++ b/embedserv/source/inc/iipaobj.hxx
@@ -19,7 +19,7 @@
#ifndef _IIPAOBJ_HXX_
#define _IIPAOBJ_HXX_
-#if defined(_MSC_VER) && (_MSC_VER > 1310)
+#ifdef _MSC_VER
#pragma warning(disable : 4917 4555)
#endif
diff --git a/embedserv/source/inc/stdafx.h b/embedserv/source/inc/stdafx.h
index c1110ac8ab42..d3109ddf9b91 100644
--- a/embedserv/source/inc/stdafx.h
+++ b/embedserv/source/inc/stdafx.h
@@ -2,9 +2,9 @@
#if !defined(AFX_STDAFX_H_)
#define AFX_STDAFX_H_
-#if _MSC_VER > 1000
+#ifdef _MSC_VER
#pragma once
-#endif // _MSC_VER > 1000
+#endif
#define STRICT
#ifndef _WIN32_WINNT