From d98ac11f3962f39efb1418588c609d03fb7cc37c Mon Sep 17 00:00:00 2001
From: Matus Kukan <matus.kukan@gmail.com>
Date: Sun, 3 Jul 2011 13:59:22 +0200
Subject: Remove component_getImplementationEnvironment

---
 embedserv/source/embed/register.cxx | 5 -----
 embedserv/util/exports.dxp          | 1 -
 2 files changed, 6 deletions(-)

(limited to 'embedserv')

diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx
index 4810713d0a49..f2a96215e641 100644
--- a/embedserv/source/embed/register.cxx
+++ b/embedserv/source/embed/register.cxx
@@ -67,11 +67,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL EmbedServer_getSupportedServiceNames()
 
 extern "C" {
 
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
 {
     void * pRet = 0;
diff --git a/embedserv/util/exports.dxp b/embedserv/util/exports.dxp
index f0e1c69934bc..70033078921a 100755
--- a/embedserv/util/exports.dxp
+++ b/embedserv/util/exports.dxp
@@ -1,2 +1 @@
-component_getImplementationEnvironment
 component_getFactory
-- 
cgit v1.2.3


From 2e9c7ef2b065aff27f1f53ade9e5c9ba57b19f75 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Wed, 17 Aug 2011 22:00:42 +0300
Subject: Bin a couple of duplicated and unneeded lines

---
 embedserv/util/makefile.mk | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'embedserv')

diff --git a/embedserv/util/makefile.mk b/embedserv/util/makefile.mk
index 1f8ad8a90baf..0051d7a823c4 100644
--- a/embedserv/util/makefile.mk
+++ b/embedserv/util/makefile.mk
@@ -68,12 +68,6 @@ SHL1STDLIBS=\
         $(OLEAUT32LIB)
 
 .IF "$(COM)"=="MSC"
-.IF "$(CCNUMVER)" >= "001300000000" && "$(CCNUMVER)" <= "001399999999"
-SHL1STDLIBS+=\
-        $(ADVAPI32LIB)	\
-        $(ATL_LIB)$/atls.lib
-.ENDIF
-
 SHL1STDLIBS+=\
         $(ADVAPI32LIB)	\
         $(ATL_LIB)$/atls.lib
-- 
cgit v1.2.3


From 94fb4e55c8f83442e79c99515b8cdf33997f56c4 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@novell.com>
Date: Wed, 17 Aug 2011 22:03:54 +0300
Subject: Fix MSVC build with debugging C/C++ runtime, i.e. with
 --enable-dbgutil

Whether this stuff actually works with the debugging runtime is
another question... The reason why the .cxx and .hxx files in this
commit explicitly undefined _DEBUG is unknown. As usual the old commit
message doesn't give any clue. Hamburg apparently didn't use the debug
runtime in their "dbgutil" a.k.a. "non-pro" builds?
---
 embedserv/source/embed/esdll.cxx  | 3 ---
 embedserv/source/inc/embeddoc.hxx | 3 ---
 embedserv/source/inc/servprov.hxx | 4 ----
 embedserv/util/makefile.mk        | 8 +++++++-
 4 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'embedserv')

diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx
index 56ee550c1e81..ab92a9728771 100644
--- a/embedserv/source/embed/esdll.cxx
+++ b/embedserv/source/embed/esdll.cxx
@@ -29,9 +29,6 @@
 #define STRICT
 #define _WIN32_WINNT 0x0400
 #define _WIN32_DCOM
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
-#undef _DEBUG
-#endif
 #if defined(_MSC_VER) && (_MSC_VER > 1310)
 #pragma warning(disable : 4917 4555)
 #endif
diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx
index 40081abefb4b..fef44f1ff541 100644
--- a/embedserv/source/inc/embeddoc.hxx
+++ b/embedserv/source/inc/embeddoc.hxx
@@ -28,9 +28,6 @@
 
 #ifndef _EMBEDDOC_HXX_
 #define _EMBEDDOC_HXX_
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
-#undef _DEBUG
-#endif
 #if defined(_MSC_VER) && (_MSC_VER > 1310)
 #pragma warning(disable : 4917 4555)
 #endif
diff --git a/embedserv/source/inc/servprov.hxx b/embedserv/source/inc/servprov.hxx
index cc861d2cc8d0..963170c39a92 100644
--- a/embedserv/source/inc/servprov.hxx
+++ b/embedserv/source/inc/servprov.hxx
@@ -29,10 +29,6 @@
 #ifndef _SERVPROV_HXX
 #define _SERVPROV_HXX
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
-#undef _DEBUG
-#endif
-
 #include "common.h"
 #include <oleidl.h>
 #include <com/sun/star/uno/Reference.h>
diff --git a/embedserv/util/makefile.mk b/embedserv/util/makefile.mk
index 0051d7a823c4..ce4b08b10f9f 100644
--- a/embedserv/util/makefile.mk
+++ b/embedserv/util/makefile.mk
@@ -69,8 +69,14 @@ SHL1STDLIBS=\
 
 .IF "$(COM)"=="MSC"
 SHL1STDLIBS+=\
-        $(ADVAPI32LIB)	\
+        $(ADVAPI32LIB)
+.IF "$(USE_DEBUG_RUNTIME)" == ""
+SHL1STDLIBS+=\
         $(ATL_LIB)$/atls.lib
+.ELSE
+SHL1STDLIBS+=\
+        $(ATL_LIB)$/atlsd.lib
+.ENDIF
 .ENDIF # "$(COM)"=="MSC"
 
 
-- 
cgit v1.2.3