extensions: convert activex to gbuild

30 files changed, 249 insertions, 225 deletions

diff --git a/Repository.mk b/Repository.mk
index e7169f919ef9..4f2e8e6362fd 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -328,6 +328,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	dnd \
 	dtrans \
 	ftransl \
+	so_activex \
+	so_activex_x64 \
 	sysdtrans \
 ))
 endif
diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk
new file mode 100644
index 000000000000..732b2713e077
--- /dev/null
+++ b/extensions/Library_so_activex.mk
@@ -0,0 +1,91 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,so_activex))
+
+$(SRCDIR)/extensions/source/activex/so_activex.cxx: $(WORKDIR)/CustomTarget/so_activex/so_activex.tlb
+
+$(WORKDIR)/CustomTarget/so_activex/so_activex.tlb: $(SRCDIR)/extensions/source/activex/so_activex.idl
+	mkdir -p $(WORKDIR)/CustomTarget/so_activex
+	midl.exe -out $(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/so_activex) -Oicf $(call gb_Helper_convert_native,$<) \
+	$(foreach i,$(SOLARINC_FOR_BUILD), $(patsubst -I,/I,$(i)))
+
+$(eval $(call gb_Library_set_include,so_activex,\
+	$$(INCLUDE) \
+	-I$(WORKDIR)/CustomTarget/so_activex \
+	$(foreach i,$(ATL_INCLUDE), -I$(i)) \
+))
+
+$(eval $(call gb_Library_add_api,so_activex,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_nativeres,so_activex,activex_res))
+
+$(eval $(call gb_Library_add_exception_objects,so_activex,\
+	extensions/source/activex/so_activex \
+	extensions/source/activex/SOActiveX \
+	extensions/source/activex/SOComWindowPeer \
+	extensions/source/activex/SODispatchInterceptor \
+	extensions/source/activex/SOActionsApproval \
+	extensions/source/activex/StdAfx2 \
+))
+
+$(eval $(call gb_Library_add_ldflags,so_activex,\
+	/DEF:$(call gb_Helper_convert_native,$(SRCDIR)/extensions/source/activex/so_activex.def) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,so_activex,\
+	uuid \
+	advapi32 \
+	ole32 \
+	oleaut32 \
+	gdi32 \
+	urlmon \
+	shlwapi \
+))
+
+ifneq ($(USE_DEBUG_RUNTIME),)
+$(eval $(call gb_Library_add_libs,so_activex,\
+	$(ATL_LIB)/atlsd.lib \
+))
+else
+$(eval $(call gb_Library_add_libs,so_activex,\
+	$(ATL_LIB)/atls.lib \
+))
+endif
+
+$(call gb_Library_get_clean_target,so_activex): idlclean
+
+idlclean:
+	rm -rf $(WORKDIR)/CustomTarget/so_activex
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
new file mode 100644
index 000000000000..eab054d1dae1
--- /dev/null
+++ b/extensions/Library_so_activex_x64.mk
@@ -0,0 +1,90 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,so_activex_x64))
+
+$(eval $(call gb_Library_set_x64,so_activex_x64,YES))
+
+$(SRCDIR)/extensions/source/activex/so_activex.cxx: $(WORKDIR)/CustomTarget/so_activex/so_activex.tlb
+
+$(eval $(call gb_Library_set_include,so_activex_x64,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/extensions/source/activex) \
+	-I$(WORKDIR)/CustomTarget/so_activex \
+	$(foreach i,$(ATL_INCLUDE), -I$(i)) \
+))
+
+$(eval $(call gb_Library_add_api,so_activex_x64,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_nativeres,so_activex_x64,activex_res))
+
+$(WORKDIR)/extensions/source/activex/%.cxx: $(SRCDIR)/extensions/source/activex/%.cxx
+	mkdir -p $(dir $@)
+	cp $< $@
+
+$(eval $(call gb_Library_add_x64_generated_exception_objects,so_activex_x64,\
+	extensions/source/activex/so_activex \
+	extensions/source/activex/SOActiveX \
+	extensions/source/activex/SOComWindowPeer \
+	extensions/source/activex/SODispatchInterceptor \
+	extensions/source/activex/SOActionsApproval \
+	extensions/source/activex/StdAfx2 \
+))
+
+$(eval $(call gb_Library_add_ldflags,so_activex_x64,\
+	/DEF:$(call gb_Helper_convert_native,$(SRCDIR)/extensions/source/activex/so_activex.def) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,so_activex_x64,\
+	uuid \
+	advapi32 \
+	ole32 \
+	oleaut32 \
+	gdi32 \
+	urlmon \
+	shlwapi \
+))
+
+ifneq ($(USE_DEBUG_RUNTIME),)
+$(eval $(call gb_Library_add_libs,so_activex_x64,\
+	$(ATL_LIB)/amd64/atlsd.lib \
+))
+else
+$(eval $(call gb_Library_add_libs,so_activex_x64,\
+	$(ATL_LIB)/amd64/atls.lib \
+))
+endif
+
+$(call gb_Library_get_clean_target,so_activex_x64): idlclean
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 6865f53cf555..348b95eeca95 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -13,6 +13,7 @@
 #
 # Major Contributor(s):
 # Copyright (C) 2011 Jan Holesovsky <kendy@suse.cz> (initial developer)
+# Copyright (C) 2011 Peter Foley <pefoley2@verizon.net>
 #
 # All Rights Reserved.
 #
@@ -51,13 +52,30 @@ $(eval $(call gb_Module_add_targets,extensions,\
 ))
 
 ifeq ($(OS),WNT)
+
+ifeq ($(COM),MSC)
+ifneq ($(DISABLE_ACTIVEX),TRUE)
+$(eval $(call gb_Module_add_targets,extensions,\
+	WinResTarget_activex \
+	Library_so_activex \
+))
+
+ifeq ($(BUILD_X64),TRUE)
+$(eval $(call gb_Module_add_targets,extensions,\
+	Library_so_activex_x64 \
+))
+endif # BUILD_X64
+endif # DISABLE_ACTIVEX
+endif # COM=MSC
+
 ifeq ($(DISABLE_ATL),)
 $(eval $(call gb_Module_add_targets,extensions,\
 	Library_oleautobridge \
 	Library_oleautobridge2 \
 ))
-endif
-endif
+endif # DISABLE_ATL
+
+endif # WNT
 
 ifneq ($(WITH_MOZILLA),NO)
 
diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk
new file mode 100644
index 000000000000..0487bc2f3cbc
--- /dev/null
+++ b/extensions/WinResTarget_activex.mk
@@ -0,0 +1,46 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# 	Peter Foley <pefoley2@verizon.net>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_WinResTarget_WinResTarget,activex_res))
+
+ifneq ($(PRODUCT),)
+$(eval $(call gb_WinResTarget_set_defs,activex_res,\
+	$$(DEFS) \
+	-DPRODUCT \
+))
+endif
+
+$(eval $(call gb_WinResTarget_add_file,activex_res,extensions/source/activex/so_activex))
+
+$(SRCDIR)/extensions/source/activex/so_activex.rc: $(WORKDIR)/CustomTarget/so_activex/so_activex.tlb
+
+$(eval $(call gb_WinResTarget_set_defs,activex_res,\
+	$$(DEFS) \
+	-DMISC=$(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/so_activex) \
+))
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index 0e7e855aa6ef..df4ba361d372 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -3,8 +3,6 @@ ex  extensions :  officecfg  TRANSLATIONS:translations DESKTOP:rdbmaker svx SANE
 ex  extensions                                  usr1    -   all ex_mkout NULL
 ex  extensions\inc                              nmake   -   all ex_inc NULL
 ex  extensions\inc\ucbhelper                    get     -   all ex_incucbh ex_inc NULL
-ex  extensions\source\activex\msidl             nmake   -   w   ex_axmsidl ex_inc NULL
-ex  extensions\source\activex\main              nmake   -   w   ex_axmain ex_axmsidl.w ex_inc NULL
 ex  extensions\util                             nmake   -   all ex_util NULL
 ex  extensions\prj                              nmake   -   all ex_prj NULL
 
diff --git a/extensions/source/activex/main/README.txt b/extensions/source/activex/README.txt
index 9d647987aaa7..9d647987aaa7 100644
--- a/extensions/source/activex/main/README.txt
+++ b/extensions/source/activex/README.txt
diff --git a/extensions/source/activex/main/SOActionsApproval.cpp b/extensions/source/activex/SOActionsApproval.cxx
index e0ce5c5da58e..e0ce5c5da58e 100644
--- a/extensions/source/activex/main/SOActionsApproval.cpp
+++ b/extensions/source/activex/SOActionsApproval.cxx
diff --git a/extensions/source/activex/main/SOActionsApproval.h b/extensions/source/activex/SOActionsApproval.h
index a5570312864d..a5570312864d 100644
--- a/extensions/source/activex/main/SOActionsApproval.h
+++ b/extensions/source/activex/SOActionsApproval.h
diff --git a/extensions/source/activex/main/SOActionsApproval.rgs b/extensions/source/activex/SOActionsApproval.rgs
index 543320813948..543320813948 100644
--- a/extensions/source/activex/main/SOActionsApproval.rgs
+++ b/extensions/source/activex/SOActionsApproval.rgs
diff --git a/extensions/source/activex/main/SOActiveX.cpp b/extensions/source/activex/SOActiveX.cxx
index f95e42772185..f95e42772185 100644
--- a/extensions/source/activex/main/SOActiveX.cpp
+++ b/extensions/source/activex/SOActiveX.cxx
diff --git a/extensions/source/activex/main/SOActiveX.h b/extensions/source/activex/SOActiveX.h
index fea95d09c9b9..fea95d09c9b9 100644
--- a/extensions/source/activex/main/SOActiveX.h
+++ b/extensions/source/activex/SOActiveX.h
diff --git a/extensions/source/activex/main/SOActiveX.rgs b/extensions/source/activex/SOActiveX.rgs
index d3814df3b241..d3814df3b241 100644
--- a/extensions/source/activex/main/SOActiveX.rgs
+++ b/extensions/source/activex/SOActiveX.rgs
diff --git a/extensions/source/activex/main/SOComWindowPeer.cpp b/extensions/source/activex/SOComWindowPeer.cxx
index 7fb56dbdfd32..7fb56dbdfd32 100644
--- a/extensions/source/activex/main/SOComWindowPeer.cpp
+++ b/extensions/source/activex/SOComWindowPeer.cxx
diff --git a/extensions/source/activex/main/SOComWindowPeer.h b/extensions/source/activex/SOComWindowPeer.h
index c819e17a81ea..c819e17a81ea 100644
--- a/extensions/source/activex/main/SOComWindowPeer.h
+++ b/extensions/source/activex/SOComWindowPeer.h
diff --git a/extensions/source/activex/main/SOComWindowPeer.rgs b/extensions/source/activex/SOComWindowPeer.rgs
index 42e985a31a1b..42e985a31a1b 100644
--- a/extensions/source/activex/main/SOComWindowPeer.rgs
+++ b/extensions/source/activex/SOComWindowPeer.rgs
diff --git a/extensions/source/activex/main/SODispatchInterceptor.cpp b/extensions/source/activex/SODispatchInterceptor.cxx
index dcddf0d86b0c..dcddf0d86b0c 100644
--- a/extensions/source/activex/main/SODispatchInterceptor.cpp
+++ b/extensions/source/activex/SODispatchInterceptor.cxx
diff --git a/extensions/source/activex/main/SODispatchInterceptor.h b/extensions/source/activex/SODispatchInterceptor.h
index 538b12f24d2e..538b12f24d2e 100644
--- a/extensions/source/activex/main/SODispatchInterceptor.h
+++ b/extensions/source/activex/SODispatchInterceptor.h
diff --git a/extensions/source/activex/main/SODispatchInterceptor.rgs b/extensions/source/activex/SODispatchInterceptor.rgs
index 19fe0b5f0e4c..19fe0b5f0e4c 100644
--- a/extensions/source/activex/main/SODispatchInterceptor.rgs
+++ b/extensions/source/activex/SODispatchInterceptor.rgs
diff --git a/extensions/source/activex/main/StdAfx2.cpp b/extensions/source/activex/StdAfx2.cxx
index f1cf88d10d14..f1cf88d10d14 100644
--- a/extensions/source/activex/main/StdAfx2.cpp
+++ b/extensions/source/activex/StdAfx2.cxx
diff --git a/extensions/source/activex/main/StdAfx2.h b/extensions/source/activex/StdAfx2.h
index 5c540b0ba329..5c540b0ba329 100644
--- a/extensions/source/activex/main/StdAfx2.h
+++ b/extensions/source/activex/StdAfx2.h
diff --git a/extensions/source/activex/main/com_uno_helper.h b/extensions/source/activex/com_uno_helper.h
index 230fc63a6e77..230fc63a6e77 100644
--- a/extensions/source/activex/main/com_uno_helper.h
+++ b/extensions/source/activex/com_uno_helper.h
diff --git a/extensions/source/activex/main/example.html b/extensions/source/activex/example.html
index 3efee1f75a03..3efee1f75a03 100644
--- a/extensions/source/activex/main/example.html
+++ b/extensions/source/activex/example.html
diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk
deleted file mode 100644
index ea70b66d0f0f..000000000000
--- a/extensions/source/activex/main/makefile.mk
+++ /dev/null
@@ -1,157 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=extensions
-TARGET=so_activex
-
-use_shl_versions=
-
-# --- Settings ----------------------------------
-.INCLUDE : settings.mk
-
-.IF "$(GUI)$(COM)" == "WNTMSC" && "$(DISABLE_ACTIVEX)"==""
-
-VERSIONOBJ=
-LIBTARGET=NO
-USE_DEFFILE=YES
-UWINAPILIB=
-
-.IF "$(BUILD_X64)"!=""
-USE_DEFFILE_X64=TRUE
-.ENDIF
-
-INCPRE+=$(foreach,i,$(ATL_INCLUDE) -I$(i)) \
-    -I$(MISC) \
-
-# --- Files -------------------------------------
-
-
-.IF "$(PRODUCT)"!=""
-RC+=-DPRODUCT
-.ENDIF
-
-RCFILES=\
-        $(TARGET).rc
-RCDEPN=$(MISC)$/envsettings.h
-
-SLOFILES=\
-    $(SLO)$/so_activex.obj \
-    $(SLO)$/SOActiveX.obj \
-    $(SLO)$/SOComWindowPeer.obj \
-    $(SLO)$/SODispatchInterceptor.obj \
-    $(SLO)$/SOActionsApproval.obj \
-    $(SLO)$/StdAfx2.obj
-
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=\
-    $(UUIDLIB) \
-    $(ADVAPI32LIB) \
-    $(OLE32LIB) \
-    $(OLEAUT32LIB) \
-    $(GDI32LIB) \
-    $(URLMONLIB) \
-    $(SHLWAPILIB)
-
-.IF "$(COM)" == "MSC"
-.IF "$(USE_DEBUG_RUNTIME)" != ""
-    SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
-    SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
-.ENDIF
-.ENDIF
-
-
-#    $(KERNEL32LIB) \
-#    rpcndr.lib \
-#    rpcns4.lib \
-#    rpcrt4.lib
-
-#$(KERNEL32LIB) rpcndr.lib rpcns4.lib rpcrt4.lib
-
-SHL1OBJS=$(SLOFILES)
-
-SHL1LIBS=
-SHL1DEF=$(TARGET).def
-SHL1RES=$(RES)$/$(TARGET).res
-
-.ENDIF
-
-.IF "$(BUILD_X64)"!=""
-# -------------------- x64 -----------------------
-
-CDEFS_X64+:=$(foreach,i,$(CDEFS) $(subst,-D_X86_=1,  $i))
-LIBTARGET_X64=NO
-USE_DEFFILE_X64=YES
-UWINAPILIB_X64=
-
-SLOFILES_X64= \
-    $(SLO_X64)$/so_activex.obj \
-    $(SLO_X64)$/SOActiveX.obj \
-    $(SLO_X64)$/SOComWindowPeer.obj \
-    $(SLO_X64)$/SODispatchInterceptor.obj \
-    $(SLO_X64)$/SOActionsApproval.obj \
-    $(SLO_X64)$/StdAfx2.obj
-
-SHL1TARGET_X64=$(TARGET)
-
-SHL1STDLIBS_X64+=\
-    $(UUIDLIB_X64) \
-    $(ADVAPI32LIB_X64) \
-    $(OLE32LIB_X64) \
-    $(OLEAUT32LIB_X64) \
-    $(GDI32LIB_X64) \
-    $(URLMONLIB_X64) \
-    $(SHLWAPILIB_X64) \
-    $(KERNEL32LIB_X64) \
-    $(USER32LIB_X64) \
-    $(MSVCRT_X64) \
-    $(MSVCPRT_X64) \
-    $(OLDNAMESLIB_X64)
-
-SHL1OBJS_X64=$(SLOFILES_X64)
-SHL1DEF_X64=$(TARGET).def
-
-.IF "$(USE_DEBUG_RUNTIME)" != ""
-SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atlsd.lib
-.ELSE
-SHL1STDLIBS_X64+= $(ATL_LIB)$/amd64$/atls.lib
-.ENDIF
-
-.ENDIF # "$(BUILD_X64)"!=""
-
-# --- Targets ----------------------------------
-
-.INCLUDE : set_wntx64.mk
-VERSIONOBJ_X64=
-.INCLUDE : target.mk
-.INCLUDE : tg_wntx64.mk
-
-$(MISC)$/envsettings.h : makefile.mk
-    -$(RM) $@
-# it looks wrong; but rc likes it that way...
-    echo "#define MISC .\..\$(INPATH)\misc" > $@
diff --git a/extensions/source/activex/msidl/makefile.mk b/extensions/source/activex/msidl/makefile.mk
deleted file mode 100644
index be9103ead216..000000000000
--- a/extensions/source/activex/msidl/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=extensions
-TARGET=msidl
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(GUI)$(COM)" == "WNTMSC" && "$(DISABLE_ACTIVEX)"==""
-
-# --- Targets ----------------------------------
-
-ALL : $(MISC)$/activex_component
-
-MTL=midl.exe
-MTL_PROJ=
-
-SOURCE=so_activex.idl
-
-MTL_SWITCHES=-tlb $(MISC)$/so_activex.tlb -h $(MISC)$/so_activex.h -iid $(MISC)$/so_activex_i.c -dlldata $(MISC)$/so_activex_dll.c -proxy $(MISC)$/so_activex_p.c -Oicf
-
-.IF "$(COM)"=="GCC"
-MTL_SWITCHES+=-cpp_cmd gcc -cpp_opt "-x c -E -D__stdcall= -D_stdcall= -nostdinc -I $(shell @cygpath -w $(PSDK_HOME)/include)"
-
-$(MISC)$/activex_component : $(SOURCE) 
-    $(MTL) $(MTL_SWITCHES) -I $(shell @cygpath -w $(PSDK_HOME)/include|sed 's#\\#\\\\#g') $(SOURCE) 
-.ELSE
-$(MISC)$/activex_component : $(SOURCE) 
-    $(WRAPCMD) $(MTL) $(MTL_SWITCHES) $(INCLUDE) $(SOURCE) && $(TOUCH) $@
-.ENDIF
-
-.ENDIF
-
-.INCLUDE : target.mk
-
diff --git a/extensions/source/activex/main/resource.h b/extensions/source/activex/resource.h
index fe74853c6d15..fe74853c6d15 100644
--- a/extensions/source/activex/main/resource.h
+++ b/extensions/source/activex/resource.h
diff --git a/extensions/source/activex/main/so_activex.cpp b/extensions/source/activex/so_activex.cxx
index 94dd0ccdcf1c..94dd0ccdcf1c 100644
--- a/extensions/source/activex/main/so_activex.cpp
+++ b/extensions/source/activex/so_activex.cxx
diff --git a/extensions/source/activex/main/so_activex.def b/extensions/source/activex/so_activex.def
index e3d56b070dad..e3d56b070dad 100644
--- a/extensions/source/activex/main/so_activex.def
+++ b/extensions/source/activex/so_activex.def
diff --git a/extensions/source/activex/msidl/so_activex.idl b/extensions/source/activex/so_activex.idl
index d1a7d9936eed..d1a7d9936eed 100644
--- a/extensions/source/activex/msidl/so_activex.idl
+++ b/extensions/source/activex/so_activex.idl
diff --git a/extensions/source/activex/main/so_activex.rc b/extensions/source/activex/so_activex.rc
index 2370a5162187..adba0ee79f8c 100644
--- a/extensions/source/activex/main/so_activex.rc
+++ b/extensions/source/activex/so_activex.rc
@@ -104,8 +104,6 @@ END
 // Generated from the TEXTINCLUDE 3 resource.
 //
 
-#include "envsettings.h"
-
 1 TYPELIB MISC\so_activex.tlb
 
 /////////////////////////////////////////////////////////////////////////////