summaryrefslogtreecommitdiff
path: root/embedserv/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'embedserv/source/inc')
-rw-r--r--embedserv/source/inc/embeddocaccess.hxx2
-rw-r--r--embedserv/source/inc/embservconst.h17
-rw-r--r--embedserv/source/inc/stdafx.h5
3 files changed, 0 insertions, 24 deletions
diff --git a/embedserv/source/inc/embeddocaccess.hxx b/embedserv/source/inc/embeddocaccess.hxx
index 4ddefca1dab4..96d005863eaf 100644
--- a/embedserv/source/inc/embeddocaccess.hxx
+++ b/embedserv/source/inc/embeddocaccess.hxx
@@ -28,7 +28,6 @@
#define OLESERV_DEACTIVATE 6
#include <oleidl.h>
-#ifndef __MINGW32__
#pragma warning(disable : 4265)
#if defined __clang__
#pragma clang diagnostic push
@@ -41,7 +40,6 @@
#if defined __clang__
#pragma clang diagnostic pop
#endif
-#endif
#include <cppuhelper/weak.hxx>
class EmbedDocument_Impl;
diff --git a/embedserv/source/inc/embservconst.h b/embedserv/source/inc/embservconst.h
index 332c0abe855f..aca7c8e49728 100644
--- a/embedserv/source/inc/embservconst.h
+++ b/embedserv/source/inc/embservconst.h
@@ -26,22 +26,6 @@
#define SUPPORTED_FACTORIES_NUM 10
-#if defined(__MINGW32__) && !defined(INITGUID)
-extern "C" const GUID DECLSPEC_SELECTANY OID_WriterTextServer;
-extern "C" const GUID DECLSPEC_SELECTANY OID_WriterOASISTextServer;
-
-extern "C" const GUID DECLSPEC_SELECTANY OID_CalcServer;
-extern "C" const GUID DECLSPEC_SELECTANY OID_CalcOASISServer;
-
-extern "C" const GUID DECLSPEC_SELECTANY OID_DrawingServer;
-extern "C" const GUID DECLSPEC_SELECTANY OID_DrawingOASISServer;
-
-extern "C" const GUID DECLSPEC_SELECTANY OID_PresentationServer;
-extern "C" const GUID DECLSPEC_SELECTANY OID_PresentationOASISServer;
-
-extern "C" const GUID DECLSPEC_SELECTANY OID_MathServer;
-extern "C" const GUID DECLSPEC_SELECTANY OID_MathOASISServer;
-#else
extern "C" const GUID DECLSPEC_SELECTANY OID_WriterTextServer = { SO3_SW_OLE_EMBED_CLASSID_60 };
extern "C" const GUID DECLSPEC_SELECTANY OID_WriterOASISTextServer = { SO3_SW_OLE_EMBED_CLASSID_8 };
@@ -56,7 +40,6 @@ extern "C" const GUID DECLSPEC_SELECTANY OID_PresentationOASISServer = { SO3_SIM
extern "C" const GUID DECLSPEC_SELECTANY OID_MathServer = { SO3_SM_OLE_EMBED_CLASSID_60 };
extern "C" const GUID DECLSPEC_SELECTANY OID_MathOASISServer = { SO3_SM_OLE_EMBED_CLASSID_8 };
-#endif
#endif
diff --git a/embedserv/source/inc/stdafx.h b/embedserv/source/inc/stdafx.h
index 06b6606706f6..c056c5bf714a 100644
--- a/embedserv/source/inc/stdafx.h
+++ b/embedserv/source/inc/stdafx.h
@@ -38,11 +38,6 @@
//You may derive a class from CComModule and use it if you want to override
//something, but do not change the name of _Module
extern CComModule _Module;
-#ifdef __MINGW32__
-#include <algorithm>
-using ::std::min;
-using ::std::max;
-#endif
#include <atlcom.h>
#include <atlctl.h>