Merge branch 'master' into feature/gsoc2011_wizards

Conflicts:
	automation/source/inc/cmdbasestream.hxx
	automation/source/server/cmdbasestream.cxx
	automation/source/server/retstrm.hxx
	automation/source/testtool/cmdstrm.cxx
	automation/source/testtool/cmdstrm.hxx
	automation/source/testtool/tcommuni.cxx
	basctl/prj/d.lst
	basctl/uiconfig/basicide/toolbar/findbar.xml
	cui/source/dialogs/about.cxx
	cui/source/dialogs/about.src
	cui/source/inc/about.hxx
	extensions/source/abpilot/abpservices.cxx
	extensions/source/dbpilots/dbpservices.cxx
	extensions/source/propctrlr/pcrservices.cxx
	extensions/source/svg/makefile.mk
	forms/Library_frm.mk
	lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
	lingucomponent/source/spellcheck/spell/sspellimp.cxx
	package/prj/d.lst
	package/source/zipapi/XMemoryStream.cxx
	package/source/zipapi/XMemoryStream.hxx
	setup_native/prj/d.lst
	setup_native/source/win32/customactions/relnotes/makefile.mk
	tools/test/export.map
	wizards/com/sun/star/wizards/common/ConfigGroup.py
	wizards/com/sun/star/wizards/common/ConfigNode.py
	wizards/com/sun/star/wizards/common/Configuration.py
	wizards/com/sun/star/wizards/common/Desktop.py
	wizards/com/sun/star/wizards/common/FileAccess.py
	wizards/com/sun/star/wizards/common/Helper.py
	wizards/com/sun/star/wizards/common/SystemDialog.py
	wizards/com/sun/star/wizards/document/OfficeDocument.py
	wizards/com/sun/star/wizards/fax/FaxDocument.py
	wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
	wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
	wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
	wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
	wizards/com/sun/star/wizards/letter/LetterDocument.py
	wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
	wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
	wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
	wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
	wizards/com/sun/star/wizards/text/TextDocument.py
	wizards/com/sun/star/wizards/text/TextFieldHandler.py
	wizards/com/sun/star/wizards/text/TextSectionHandler.py
	wizards/com/sun/star/wizards/text/ViewHandler.py
	wizards/com/sun/star/wizards/ui/UnoDialog.py
	wizards/com/sun/star/wizards/ui/UnoDialog2.py
	wizards/com/sun/star/wizards/ui/WizardDialog.py
	wizards/com/sun/star/wizards/ui/event/CommonListener.py
	wizards/com/sun/star/wizards/ui/event/DataAware.py
	wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
	wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
	wizards/util/helpids.h
	wizards/util/hidother.src
	xmlsecurity/prj/build.lst
	xmlsecurity/prj/d.lst
	xmlsecurity/qa/certext/SanCertExt.cxx

6 files changed, 6 insertions, 22 deletions

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/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/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/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
diff --git a/embedserv/util/makefile.mk b/embedserv/util/makefile.mk
index 1f8ad8a90baf..ce4b08b10f9f 100644
--- a/embedserv/util/makefile.mk
+++ b/embedserv/util/makefile.mk
@@ -68,15 +68,15 @@ SHL1STDLIBS=\
         $(OLEAUT32LIB)
 
 .IF "$(COM)"=="MSC"
-.IF "$(CCNUMVER)" >= "001300000000" && "$(CCNUMVER)" <= "001399999999"
 SHL1STDLIBS+=\
-        $(ADVAPI32LIB)	\
-        $(ATL_LIB)$/atls.lib
-.ENDIF
-
+        $(ADVAPI32LIB)
+.IF "$(USE_DEBUG_RUNTIME)" == ""
 SHL1STDLIBS+=\
-        $(ADVAPI32LIB)	\
         $(ATL_LIB)$/atls.lib
+.ELSE
+SHL1STDLIBS+=\
+        $(ATL_LIB)$/atlsd.lib
+.ENDIF
 .ENDIF # "$(COM)"=="MSC"