summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 04:40:26 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 04:40:26 +0000
commitc6225b31c5b38c4e361245ad4596cc6f30796371 (patch)
tree82f05e5659f27f6df5b9cfad4ed45ea09578612e
parenteb7290860093a58aa9a289d2fec3cb05a11b6255 (diff)
INTEGRATION: CWS warnings01 (1.4.16); FILE MERGED
2006/02/20 15:31:44 cd 1.4.16.1: #i55991# Warning free code for Windows C++ compiler
-rwxr-xr-xembedserv/source/embed/esdll.cxx15
1 files changed, 13 insertions, 2 deletions
diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx
index 1ddd74f1542a..978dce1bbb4e 100755
--- a/embedserv/source/embed/esdll.cxx
+++ b/embedserv/source/embed/esdll.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: esdll.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 18:52:36 $
+ * last change: $Author: hr $ $Date: 2006-06-20 05:40:26 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -40,8 +40,13 @@
#undef _DEBUG
#endif
+#include "stdafx.h"
+
#include <atlbase.h>
+#pragma warning( push )
+#pragma warning( disable: 4710 )
CComModule _Module;
+#pragma warning( pop )
#include <atlcom.h>
BEGIN_OBJECT_MAP(ObjectMap)
@@ -76,3 +81,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
return TRUE; // ok
}
+// Fix strange warnings about some
+// ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions.
+// warning C4505: 'xxx' : unreferenced local function has been removed
+#if defined(_MSC_VER)
+#pragma warning(disable: 4505)
+#endif