Merge branch 'feature/gbuild_extensions'

Conflicts: extensions/source/ole/servreg.cxx extensions/source/plugin/util/makefile.mk postprocess/packcomponents/makefile.mk postprocess/prj/build.lst tail_build/prj/build.lst
author: Michael Stahl <mstahl@redhat.com> 2012-01-06 21:09:13 +0100
committer: Michael Stahl <mstahl@redhat.com> 2012-01-06 21:09:13 +0100
commit: 23dd856d3c70a63dd47ae2a09a75833267296432 (patch)
tree: 3ed426d983d5a46cc48dc1ee873ac5627b867f05 /extensions/source
parent: 5106b38a9cc64677b3fa4a0aea7450560775e78e (diff)
parent: 7e5b321535977ccddc6703c0ad4e5d25af797654 (diff)
66 files changed, 109 insertions, 2570 deletions
diff --git a/extensions/source/abpilot/exports.dxp b/extensions/source/abpilot/exports.dxp
deleted file mode 100644
index 70033078921a..000000000000
--- a/extensions/source/abpilot/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk
deleted file mode 100644
index 7f84828247bb..000000000000
--- a/extensions/source/abpilot/makefile.mk
+++ /dev/null
@@ -1,115 +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=..$/..
-PRJINC=..$/inc
-
-PRJNAME=extensions
-TARGET=abp
-USE_DEFFILE=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- defines ------------------------------------------------------
-
-CDEFS+=-DCOMPMOD_NAMESPACE=abp
-CDEFS+=-DCOMPMOD_RESPREFIX=abp
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=	\
-        $(SLO)$/abpfinalpage.obj	\
-        $(SLO)$/abpservices.obj		\
-        $(SLO)$/abspage.obj		\
-        $(SLO)$/abspilot.obj		\
-        $(SLO)$/admininvokationimpl.obj	\
-        $(SLO)$/admininvokationpage.obj	\
-        $(SLO)$/datasourcehandling.obj	\
-        $(SLO)$/fieldmappingimpl.obj	\
-        $(SLO)$/fieldmappingpage.obj	\
-        $(SLO)$/moduleabp.obj		\
-        $(SLO)$/tableselectionpage.obj	\
-        $(SLO)$/typeselectionpage.obj	\
-        $(SLO)$/unodialogabp.obj	\
-
-SLOFILES=	\
-        $(EXCEPTIONSFILES)
-
-
-.IF "$(WITH_MOZILLA)" != "NO"
-.IF "$(SYSTEM_MOZILLA)" != "YES"
-CDEFS+=-DWITH_MOZILLA
-.ENDIF
-.ENDIF
-
-SRS1NAME=$(TARGET)
-SRC1FILES=			abspilot.src
-
-RESLIB1NAME=abp
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES= $(SRS)$/abp.srs
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-SHL1STDLIBS= \
-        $(COMPHELPERLIB) \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB) \
-        $(SFXLIB) \
-        $(SVLLIB) \
-        $(SVTLIB) \
-        $(SVTOOLLIB) \
-        $(SVXCORELIB) \
-        $(SVXLIB) \
-        $(TKLIB) \
-        $(TOOLSLIB) \
-        $(UNOTOOLSLIB) \
-        $(VCLLIB) \
-
-SHL1LIBS=		$(SLB)$/$(TARGET).lib
-SHL1IMPLIB=		i$(TARGET)
-SHL1DEPN=		$(SHL1LIBS)
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=		$(SHL1TARGET)
-DEF1EXPORTFILE=	exports.dxp
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/abp.component
-
-$(MISC)/abp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        abp.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt abp.component
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
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/extensions/source/bibliography/makefile.mk b/extensions/source/bibliography/makefile.mk
deleted file mode 100644
index b681c6c90b19..000000000000
--- a/extensions/source/bibliography/makefile.mk
+++ /dev/null
@@ -1,98 +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=bib
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=			$(SLO)$/formcontrolcontainer.obj \
-                    $(SLO)$/loadlisteneradapter.obj \
-                    $(SLO)$/bibconfig.obj \
-                    $(SLO)$/bibcont.obj \
-                    $(SLO)$/bibload.obj \
-                    $(SLO)$/bibmod.obj \
-                    $(SLO)$/general.obj \
-                    $(SLO)$/framectr.obj \
-                    $(SLO)$/bibview.obj \
-                    $(SLO)$/bibbeam.obj  \
-                    $(SLO)$/toolbar.obj  \
-                    $(SLO)$/datman.obj	\
-
-
-SRS1NAME=$(TARGET)
-SRC1FILES=			bib.src	 \
-                    datman.src \
-                    sections.src \
-                    toolbar.src
-
-RESLIB1NAME=bib
-RESLIB1SRSFILES= $(SRS)$/bib.srs
-RESLIB1DEPN= bib.src bib.hrc
-
-
-SHL1STDLIBS= \
-        $(SOTLIB)           \
-        $(SVTOOLLIB) \
-        $(TKLIB) \
-        $(VCLLIB) \
-        $(SVLLIB) \
-        $(UNOTOOLSLIB) \
-        $(TOOLSLIB) \
-        $(DBTOOLSLIB) \
-        $(COMPHELPERLIB) \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB)
-
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1LIBS=       $(SLB)$/$(TARGET).lib
-SHL1IMPLIB=		i$(TARGET)
-SHL1DEPN=		$(SHL1LIBS)
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-DEF1NAME=		$(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-
-ALLTAR : $(MISC)/bib.component
-
-$(MISC)/bib.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        bib.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt bib.component
diff --git a/extensions/source/config/ldap/exports.dxp b/extensions/source/config/ldap/exports.dxp
deleted file mode 100644
index 70033078921a..000000000000
--- a/extensions/source/config/ldap/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/extensions/source/config/ldap/makefile.mk b/extensions/source/config/ldap/makefile.mk
deleted file mode 100644
index d35e2428ca31..000000000000
--- a/extensions/source/config/ldap/makefile.mk
+++ /dev/null
@@ -1,105 +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=ldapbe
-ENABLE_EXCEPTIONS=TRUE
-
-# Version
-LDAP_MAJOR=2
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-DLLPRE =
-
-.IF "$(WITH_LDAP)" != "YES"
-@all:
-    @echo "LDAP disabled."
-.ENDIF
-
-.IF "$(LDAPSDKINCLUDES)" == ""
-
-.IF "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_OPENLDAP)" != "YES"
-LDAPSDKINCLUDES = $(MOZ_LDAP_CFLAGS)
-.ELSE
-LDAPSDKINCLUDES = -I$(SOLARINCDIR)$/mozilla
-.ENDIF
-.ENDIF
-
-.IF "$(WITH_OPENLDAP)" == "YES"
-CFLAGS += -DWITH_OPENLDAP -DLDAP_DEPRECATED
-.ENDIF
-
-SOLARINC+= $(LDAPSDKINCLUDES)
-# --- Files ---
-
-
-SLOFILES=\
-    $(SLO)$/ldapuserprofilebe.obj \
-    $(SLO)$/ldapaccess.obj	\
-    $(SLO)$/componentdef.obj
-
-LIB1TARGET=$(SLB)$/_$(TARGET).lib        
-LIB1OBJFILES=$(SLOFILES)
-
-SHL1TARGET=$(TARGET)$(LDAP_MAJOR).uno   
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=$(LIB1TARGET)
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1STDLIBS=    \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALHELPERLIB) \
-        $(SALLIB)
-.IF "$(OS)"=="FREEBSD"
-SHL1STDLIBS+=-lcompat
-# workaround for FreeBSD, which needs -llber50, too
-.IF "$(WITH_OPENLDAP)" != "YES"
-SHL1STDLIBS+=-Wl,-Bstatic -llber50
-.ENDIF
-.ENDIF
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp    
-DEF1DES=Configuration: LDAP User Profile Backend
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-
-ALLTAR : $(MISC)/ldapbe2.component
-
-$(MISC)/ldapbe2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        ldapbe2.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt ldapbe2.component
diff --git a/extensions/source/dbpilots/makefile.mk b/extensions/source/dbpilots/makefile.mk
deleted file mode 100644
index e37ab0a546ac..000000000000
--- a/extensions/source/dbpilots/makefile.mk
+++ /dev/null
@@ -1,111 +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=..$/..
-PRJINC=..$/inc
-
-PRJNAME=extensions
-TARGET=dbp
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- defines ------------------------------------------------------
-
-CDEFS+=-DCOMPMOD_NAMESPACE=dbp
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=			dbptools.cxx	\
-                    gridwizard.cxx	\
-                    listcombowizard.cxx	\
-                    optiongrouplayouter.cxx	\
-                    commonpagesdbp.cxx	\
-                    groupboxwiz.cxx	\
-                    wizardservices.cxx	\
-                    controlwizard.cxx	\
-                    moduledbp.cxx	\
-                    dbpservices.cxx
-
-SLOFILES=			$(SLO)$/dbptools.obj	\
-                    $(SLO)$/gridwizard.obj	\
-                    $(SLO)$/listcombowizard.obj	\
-                    $(SLO)$/optiongrouplayouter.obj	\
-                    $(SLO)$/commonpagesdbp.obj	\
-                    $(SLO)$/groupboxwiz.obj	\
-                    $(SLO)$/wizardservices.obj	\
-                    $(SLO)$/controlwizard.obj	\
-                    $(SLO)$/moduledbp.obj	\
-                    $(SLO)$/dbpservices.obj
-
-
-SRS1NAME=$(TARGET)
-SRC1FILES=			gridpages.src	\
-                    commonpagesdbp.src	\
-                    dbpilots.src	\
-                    groupboxpages.src	\
-                    listcombopages.src
-
-RESLIB1NAME=dbp
-RESLIB1SRSFILES= $(SRS)$/dbp.srs
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-SHL1STDLIBS= \
-        $(SVTOOLLIB) \
-        $(VCLLIB) \
-        $(TOOLSLIB) \
-        $(SVLLIB) \
-        $(SFXLIB)		\
-        $(DBTOOLSLIB) \
-                $(UNOTOOLSLIB) \
-        $(COMPHELPERLIB) \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB)
-
-SHL1LIBS=		$(SLB)$/$(TARGET).lib
-SHL1IMPLIB=		i$(TARGET)
-SHL1DEPN=		$(SHL1LIBS)
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=		$(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/dbp.component
-
-$(MISC)/dbp.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        dbp.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt dbp.component
diff --git a/extensions/source/logging/makefile.mk b/extensions/source/logging/makefile.mk
deleted file mode 100644
index 1436576e89ba..000000000000
--- a/extensions/source/logging/makefile.mk
+++ /dev/null
@@ -1,84 +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=log
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files -------------------------------------
-
-# ... object files ............................
-EXCEPTIONSFILES= \
-        $(SLO)$/consolehandler.obj      \
-        $(SLO)$/csvformatter.obj        \
-        $(SLO)$/filehandler.obj         \
-        $(SLO)$/log_services.obj        \
-        $(SLO)$/logger.obj              \
-        $(SLO)$/loggerconfig.obj        \
-        $(SLO)$/loghandler.obj          \
-        $(SLO)$/plaintextformatter.obj  \
-
-SLOFILES= \
-        $(EXCEPTIONSFILES) \
-        $(SLO)$/log_module.obj          \
-        $(SLO)$/logrecord.obj           \
-
-# --- library -----------------------------------
-
-LIB1TARGET=$(SLB)$/$(TARGET)_t.lib
-LIB1FILES=\
-        $(SLB)$/$(TARGET).lib
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
-        $(COMPHELPERLIB) \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB)
-
-SHL1LIBS=$(LIB1TARGET)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/log.component
-
-$(MISC)/log.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        log.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt log.component
diff --git a/extensions/source/macosx/spotlight/delzip b/extensions/source/macosx/spotlight/delzip
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/extensions/source/macosx/spotlight/delzip
+++ /dev/null
diff --git a/extensions/source/macosx/spotlight/makefile.mk b/extensions/source/macosx/spotlight/makefile.mk
deleted file mode 100644
index e7b15150bd03..000000000000
--- a/extensions/source/macosx/spotlight/makefile.mk
+++ /dev/null
@@ -1,99 +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=spotlightplugin
-
-# --- Settings ----------------------------------
-.INCLUDE : settings.mk
-
-.IF "$(OS)"!="MACOSX"
-dummy:
-    @echo Not using Mac OS X - nothing to build
-.ENDIF
-
-# --- Files -------------------------------------
-
-# ... object files ............................
-SLOFILES= \
-        $(SLO)$/ioapi.obj                \
-        $(SLO)$/unzip.obj                \
-        $(SLO)$/main.obj                 \
-        $(SLO)$/GetMetadataForFile.obj   \
-        $(SLO)$/OOoContentDataParser.obj \
-        $(SLO)$/OOoMetaDataParser.obj    \
-        $(SLO)$/OOoSpotlightImporter.obj \
-        
-BUNDLE =    $(MISC)$/OOoSpotlightImporter.mdimporter
-CONTENTS =  $(BUNDLE)$/Contents
-RESOURCES = $(CONTENTS)$/Resources
-MACOS =     $(CONTENTS)$/MacOS
-
-BUNDLELIBS= -framework CoreFoundation \
-            -framework Foundation     \
-            -framework CoreServices   \
-            $(ZLIB3RDLIB)
-
-plistfiles  = $(CONTENTS)$/Info.plist 
-binaries =    $(MACOS)$/OOoSpotlightImporter
-resources =   $(RESOURCES)/en.lproj/schema.strings \
-              $(RESOURCES)/schema.xml
-
-ZIPFLAGS = -r
-ZIP1TARGET = mdibundle
-ZIP1DIR = $(CONTENTS)
-ZIP1LIST = *
-
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ZIP1TARGETN)"!=""
-$(ZIP1TARGETN) : $(plistfiles) $(binaries) $(resources)
-
-.ENDIF          # "$(ZIP1TARGETN)"!=""
-
-# Info.plist is just versioned and copied into the bundle   
-$(CONTENTS)$/%.plist : mdimporter/%.plist
-    $(MKDIRHIER) $(@:d)
-    $(COPY) "$<" "$@"
-    
-$(MACOS)$/OOoSpotlightImporter: $(SLOFILES)
-    $(MKDIRHIER) $(@:d)
-    $(CC) -o $(MACOS)$/OOoSpotlightImporter $(SLOFILES:s/.obj/.o/) $(EXTRA_LINKFLAGS) $(BUNDLELIBS) -bundle
-# we have to change the zlib install name, otherwise the plugin will not work
-    .IF "$(SYSTEM_ZLIB)"=="NO"
-    install_name_tool -change @executable_path/libz.1.dylib @executable_path/../../../../MacOS/libz.1.dylib $(MACOS)$/OOoSpotlightImporter
-    .ENDIF
-
-#the resources are just copied
-$(RESOURCES)$/% : mdimporter/%
-    $(MKDIRHIER) $(@:d)
-    $(COPY) "$<" "$@"
-
diff --git a/extensions/source/nsplugin/source/exports.dxp b/extensions/source/nsplugin/source/exports.dxp
deleted file mode 100644
index e8b697289c20..000000000000
--- a/extensions/source/nsplugin/source/exports.dxp
+++ /dev/null
@@ -1,16 +0,0 @@
-NPP_GetMIMEDescription
-NPP_GetValue
-NPP_Initialize
-NPP_GetJavaClass
-NPP_Shutdown
-NPP_New
-NPP_Destroy
-NPP_SetWindow
-NPP_NewStream
-NPP_WriteReady
-NPP_Write
-NPP_DestroyStream
-NPP_StreamAsFile
-NPP_URLNotify
-NPP_Print
-NPP_Shutdown
diff --git a/extensions/source/nsplugin/source/exports_wnt.dxp b/extensions/source/nsplugin/source/exports_wnt.dxp
deleted file mode 100644
index a27be8c38300..000000000000
--- a/extensions/source/nsplugin/source/exports_wnt.dxp
+++ /dev/null
@@ -1,18 +0,0 @@
-NPP_GetMIMEDescription
-NPP_Initialize
-NPP_Shutdown
-NPP_New
-NPP_Destroy
-NPP_SetWindow
-NPP_NewStream
-NPP_WriteReady
-NPP_Write
-NPP_DestroyStream
-NPP_StreamAsFile
-NPP_URLNotify
-NPP_Print
-NPP_Shutdown
-NP_GetEntryPoints
-NP_Initialize
-NP_Shutdown
-NP_GetMIMEDescription
diff --git a/extensions/source/nsplugin/source/makefile.mk b/extensions/source/nsplugin/source/makefile.mk
deleted file mode 100644
index 5b7476408a31..000000000000
--- a/extensions/source/nsplugin/source/makefile.mk
+++ /dev/null
@@ -1,164 +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=npsoplugin
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE :  	settings.mk
-
-.IF "$(SYSTEM_MOZILLA_HEADERS)" == "YES"
-INCPRE+=$(MOZILLA_HEADERS_CFLAGS)
-.ELSE
-INCPRE=$(SOLARINCDIR)$/npsdk
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-
-# not sure about -DMOZ_X11 but otheriwse some struct member don't exist...
-CFLAGS+=-DMOZ_X11
-
-.IF "$(ENABLE_NSPLUGIN)"=="NO"
-
-dummy:
-    @echo Nsplugin disabled, nothing to build
-
-.ELSE           # ENABLE_NSPLUGIN
-.IF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || \
-    "$(OS)"=="OPENBSD" || "$(OS)"=="DRAGONFLY"
-INC+= -DNP_LINUX
-.ENDIF
-PKGCONFIG_MODULES=gtk+-2.0
-.INCLUDE: pkg_config.mk
-.ENDIF          # ENABLE_NSPLUGIN
-.ENDIF          # "$(GUI)"=="UNX"
-.IF "$(GUI)"=="WNT" 
-INC+= -DENGLISH
-.ENDIF
-
-
-# --- Files -------------------------------------
-
-SLOFILES=       $(SLO)$/npshell.obj \
-            $(SLO)$/so_env.obj
-
-SHL1OBJS=	$(SLO)$/npshell.obj \
-            $(SLO)$/so_env.obj
-
-.IF "$(GUI)"=="UNX"
-STDLIBS+=$(SOLARLIBDIR)$/npunix.o
-SHL1STDLIBS+=$(SOLARLIBDIR)$/npunix.o
-.ENDIF #UNX
-.IF "$(GUI)"=="WNT"
-SHL1OBJS+=$(SOLARLIBDIR)$/pathutils-obj.obj
-STDLIBS+=$(SOLARLIBDIR)$/npwin.obj
-SHL1STDLIBS+= $(SHELL32LIB) $(SOLARLIBDIR)$/npwin.obj
-
-.ENDIF
-
-OBJFILES=\
-        $(OBJ)$/so_closelistener.obj\
-        $(OBJ)$/so_instance.obj\
-        $(OBJ)$/so_env.obj\
-        $(OBJ)$/so_main.obj
-
-# --- Plugin executable -------------------------
-APP1TARGET=nsplugin$(EXEPOSTFIX)
-APP1OBJS=$(OBJFILES)
-
-APP1STDLIBS=\
-            $(CPPULIB)			\
-            $(CPPUHELPERLIB)	\
-            $(SALLIB)
-
-.IF "$(OS)"=="SOLARIS"
-APP1STDLIBS+= -lsocket -lnsl
-.ENDIF
-
-.IF "$(GUI)"=="WNT"
-DEPOBJFILES=$(OBJ)$/nsp_windows.obj
-APP1OBJS+=$(OBJ)$/nsp_windows.obj $(SOLARLIBDIR)$/pathutils-obj.obj
-APP1STDLIBS+= $(WS2_32LIB) $(SHELL32LIB) $(OLE32LIB) $(KERNEL32LIB) $(USER32LIB) $(GDI32LIB) $(WINSPOOLLIB) $(COMDLG32LIB) $(ADVAPI32LIB) $(OLEAAUT32LIB) $(UUIDLIB)
-.ENDIF
-
-# --- Library -----------------------------------
-
-SHL1TARGET=$(TARGET)_so
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+= $(WS2_32LIB) $(SHELL32LIB) $(OLE32LIB) $(KERNEL32LIB) $(USER32LIB) $(GDI32LIB) $(WINSPOOLLIB) $(COMDLG32LIB) $(ADVAPI32LIB) $(OLE32LIB) $(OLEAAUT32LIB) $(UUIDLIB) $(KERNEL32LIB) $(USER32LIB) $(GDI32LIB) $(WINSPOOLLIB) $(COMDLG32LIB) $(ADVAPI32LIB)
-.ENDIF
-
-SHL1DEPN=
-SHL1IMPLIB=	i$(SHL1TARGET)
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-SHL1RPATH=OOO
-
-# ----- get some additional keys in versioninfo ------------
-SHL1ADD_VERINFO=nsplugin.rc
-SHL1DEPN+=$(SHL1ADD_VERINFO)
-
-DEF1NAME=$(SHL1TARGET)
-.IF "$(GUI)"=="UNX"
-DEF1EXPORTFILE=exports.dxp
-.ENDIF
-.IF "$(GUI)"=="WNT"
-DEF1EXPORTFILE=exports_wnt.dxp
-.ENDIF
-
-SHL2OBJS=$(SHL1OBJS)
-SHL2STDLIBS=$(SHL1STDLIBS)
-SHL2TARGET=$(TARGET)
-.IF "$(GUI)"=="WNT"
-SHL2STDLIBS+= $(WS2_32LIB) $(SHELL32LIB) $(OLE32LIB) $(KERNEL32LIB) $(USER32LIB) $(GDI32LIB) $(WINSPOOLLIB) $(COMDLG32LIB) $(ADVAPI32LIB) $(OLE32LIB) $(OLEAAUT32LIB) $(UUIDLIB) $(KERNEL32LIB) $(USER32LIB) $(GDI32LIB) $(WINSPOOLLIB) $(COMDLG32LIB) $(ADVAPI32LIB)
-.ENDIF
-
-SHL2DEPN=
-SHL2IMPLIB=	i$(SHL2TARGET)
-SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
-SHL2RPATH=OOO
-
-# ----- get some additional keys in versioninfo ------------
-SHL2ADD_VERINFO=nsplugin_oo.rc
-SHL2DEPN+=$(SHL2ADD_VERINFO)
-
-DEF2NAME=$(SHL2TARGET)
-.IF "$(GUI)"=="UNX"
-DEF2EXPORTFILE=exports.dxp
-.ENDIF
-.IF "$(GUI)"=="WNT"
-DEF2EXPORTFILE=exports_wnt.dxp
-.ENDIF
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index 134ee3677e30..76dd7a86ac5b 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -361,7 +361,7 @@ MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII ":odp:OpenDocument Presentation;"
 MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII ":otp:OpenDocument Presentation Template;"
 MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ":odf:OpenDocument Formula;" );
 
-char*
+SAL_DLLPUBLIC_EXPORT char*
 NPP_GetMIMEDescription(void)
 {
     debug_fprintf(NSP_LOG_APPEND, "print by Netscape Plugin,  NPP_GetMIMEDescription:%s.\n", pMimeTypes);
@@ -369,7 +369,7 @@ NPP_GetMIMEDescription(void)
 }
 
 #ifdef UNIX
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 // I am not actually sure wrt this, it ast least compiles with external
 // npapi.h now...
 NPP_GetValue(NPP /*instance*/, NPPVariable variable, void *value)
@@ -404,7 +404,7 @@ dupMimeType(NPMIMEType type)
 }
 #endif // end of UNIX
 
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NPP_Initialize(void)
 {
     debug_fprintf(NSP_LOG_NEW, "NS Plugin begin initialize.\n");
@@ -419,7 +419,7 @@ NPP_GetJavaClass()
 }
 #endif
 
-void
+SAL_DLLPUBLIC_EXPORT void
 NPP_Shutdown(void)
 {
     PLUGIN_MSG msg;
@@ -435,7 +435,7 @@ NPP_Shutdown(void)
 #endif
 }
 
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NPP_New(NPMIMEType pluginType,
     NPP instance,
     uint16_t mode,
@@ -487,7 +487,7 @@ NPP_New(NPMIMEType pluginType,
     return NPERR_NO_ERROR;
 }
 
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NPP_Destroy(NPP instance, NPSavedData** /*save*/)
 {
     debug_fprintf(NSP_LOG_APPEND, "print by Nsplugin, enter NPP_Destroy.\n");
@@ -532,7 +532,7 @@ NPP_Destroy(NPP instance, NPSavedData** /*save*/)
 }
 
 
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NPP_SetWindow(NPP instance, NPWindow* window)
 {
     PluginInstance* This;
@@ -626,7 +626,7 @@ NPP_SetWindow(NPP instance, NPWindow* window)
 }
 
 
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NPP_NewStream(NPP instance,
           NPMIMEType /*type*/,
           NPStream* /*stream*/,
@@ -648,21 +648,21 @@ int32_t STREAMBUFSIZE = 0X0FFFFFFF;
  * mode so we can take any size stream in our
  * write call (since we ignore it) */
 
-int32_t
+SAL_DLLPUBLIC_EXPORT int32_t
 NPP_WriteReady(NPP /*instance*/, NPStream* /*stream*/)
 {
     return STREAMBUFSIZE;
 }
 
 
-int32_t
+SAL_DLLPUBLIC_EXPORT int32_t
 NPP_Write(NPP /*instance*/, NPStream* /*stream*/, int32_t /*offset*/, int32_t len, void* /*buffer*/)
 {
     return len;     /* The number of bytes accepted */
 }
 
 
-NPError
+SAL_DLLPUBLIC_EXPORT NPError
 NPP_DestroyStream(NPP instance, NPStream* /*stream*/, NPError /*reason*/)
 {
     if (instance == NULL)
@@ -671,7 +671,7 @@ NPP_DestroyStream(NPP instance, NPStream* /*stream*/, NPError /*reason*/)
 }
 
 // save fname to another file with the original file name
-void
+SAL_DLLPUBLIC_EXPORT void
 NPP_StreamAsFile(NPP instance, NPStream *stream, const char* fname)
 {
     debug_fprintf(NSP_LOG_APPEND, "Into Stream\n");
@@ -812,14 +812,14 @@ NPP_StreamAsFile(NPP instance, NPStream *stream, const char* fname)
         debug_fprintf(NSP_LOG_APPEND, "NPP_StreamAsFile send SO_SET_WINDOW return failure \n");
 }
 
-void
+SAL_DLLPUBLIC_EXPORT void
 NPP_URLNotify(NPP /*instance*/, const char* /*url*/,
                 NPReason /*reason*/, void* /*notifyData*/)
 {
 }
 
 
-void
+SAL_DLLPUBLIC_EXPORT void
 NPP_Print(NPP instance, NPPrint* printInfo)
 {
     if(printInfo == NULL)
diff --git a/extensions/source/nsplugin/source/nsplugin.rc b/extensions/source/nsplugin/source/nsplugin.rc
deleted file mode 100644
index 34639157d7a4..000000000000
--- a/extensions/source/nsplugin/source/nsplugin.rc
+++ /dev/null
@@ -1,30 +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.
- *
- ************************************************************************/
-#define ADDITIONAL_VERINFO1     VALUE "FileExtents", "sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\
-    VALUE "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0"
-#define ADDITIONAL_VERINFO2    VALUE "FileDescription", "Oracle Open Office Plug-in handles all its documents" VALUE "ProductName", "Oracle Open Office Plug-in"  VALUE "MIMEType",   "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|"
-#define ADDITIONAL_VERINFO3     "application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0"
diff --git a/extensions/source/ole/makefile.mk b/extensions/source/ole/makefile.mk
deleted file mode 100644
index a9ff68118c58..000000000000
--- a/extensions/source/ole/makefile.mk
+++ /dev/null
@@ -1,132 +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=oleautobridge.uno
-TARGET2=oleautobridge2.uno
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-LIBTARGET=NO
-USE_DEFFILE=YES
-
-USE_DEFFILE=TRUE
-
-INCPRE+= $(foreach,i,$(ATL_INCLUDE) -I$(i))
-
-# --- Settings -----------------------------------------------------
-
-.IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
-
-.IF "$(USE_DEBUG_RUNTIME)"!=""
-CDEFS+=-D_DEBUG
-.ENDIF # "$(USE_DEBUG_RUNTIME)"!=""
-
-SLOFILES= \
-            $(SLO)$/servreg.obj		\
-            $(SLO)$/servprov.obj	\
-            $(SLO)$/unoobjw.obj		\
-            $(SLO)$/oleobjw.obj		\
-            $(SLO)$/olethread.obj	\
-            $(SLO)$/oledll.obj		\
-        $(SLO)$/jscriptclasses.obj	\
-        $(SLO)$/ole2uno.obj		\
-        $(SLO)$/windata.obj		\
-        $(SLO)$/unotypewrapper.obj
-
-SECOND_BUILD=OWNGUID
-OWNGUID_SLOFILES=$(SLOFILES)
-OWNGUIDCDEFS+= -DOWNGUID
-
-# the original library
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=\
-        $(SALLIB) 	\
-    $(CPPULIB)	\
-    $(CPPUHELPERLIB)	\
-    $(OLE32LIB) 	\
-    $(UUIDLIB) 	\
-    $(ADVAPI32LIB)	\
-    $(OLEAUT32LIB)
-
-.IF "$(COM)"=="MSC"
-.IF "$(USE_DEBUG_RUNTIME)" != ""
-    SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
-    SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
-.ENDIF
-.ENDIF # "$(COM)"=="MSC"
-
-SHL1LIBS=
-SHL1OBJS=$(SLOFILES)
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=$(SHL1TARGET).dxp
-
-# the second library
-SHL2TARGET=$(TARGET2)
-SHL2STDLIBS=\
-        $(SALLIB) 	\
-    $(CPPULIB)	\
-    $(CPPUHELPERLIB)	\
-    $(OLE32LIB) 	\
-    $(UUIDLIB) 	\
-    $(ADVAPI32LIB)	\
-    $(OLEAUT32LIB)
-
-.IF "$(COM)"=="MSC"
-.IF "$(USE_DEBUG_RUNTIME)" != ""
-    SHL2STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
-    SHL2STDLIBS+= $(ATL_LIB)$/atls.lib
-.ENDIF
-.ENDIF # "$(COM)"=="MSC"
-
-SHL2LIBS=
-SHL2OBJS=$(REAL_OWNGUID_SLOFILES)
-
-DEF2NAME=$(SHL2TARGET)
-DEF2EXPORTFILE=$(TARGET).dxp
-
-.ENDIF # "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
-
-#----------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/oleautobridge.component
-
-$(MISC)/oleautobridge.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt oleautobridge.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt oleautobridge.component
diff --git a/extensions/source/ole/oleautobridge.uno.dxp b/extensions/source/ole/oleautobridge.uno.dxp
deleted file mode 100644
index 843ff2fc389f..000000000000
--- a/extensions/source/ole/oleautobridge.uno.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getFactory @101
-component_canUnload @103
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index c7ebaa8c7569..b6471e47e6c4 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -118,7 +118,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     return pRet;
 }
 
-extern "C"  SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue* libUnused)
+extern "C"  SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL
+component_canUnload( TimeValue* libUnused)
 {
     return globalModuleCount.canUnload( &globalModuleCount, libUnused);
 }
diff --git a/extensions/source/plugin/aqua/makefile.mk b/extensions/source/plugin/aqua/makefile.mk
deleted file mode 100644
index 8d1aaa484d28..000000000000
--- a/extensions/source/plugin/aqua/makefile.mk
+++ /dev/null
@@ -1,63 +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=plaqua
-
-.INCLUDE :  ..$/util$/makefile.pmk
-
-.IF "$(GUIBASE)"!="aqua" || "$(WITH_MOZILLA)"=="NO"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)."
-
-.ELSE
-
-# --- Files --------------------------------------------------------
-
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin
-.IF "$(SOLAR_JAVA)" != ""
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
-INCPRE+=-I$(SOLARINCDIR)$/npsdk
-CDEFS+=-DOJI
-.ENDIF
-
-.IF "$(GUIBASE)"=="aqua"
-CFLAGSCXX+=$(OBJCXXFLAGS)
-.ENDIF  # "$(GUIBASE)"=="aqua"
-
-SLOFILES=\
-    $(SLO)$/macmgr.obj      \
-    $(SLO)$/sysplug.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-.ENDIF # $(GUIBASE)==aqua
diff --git a/extensions/source/plugin/aqua/sysplug.cxx b/extensions/source/plugin/aqua/sysplug.mm
index 415ca936c46f..415ca936c46f 100644
--- a/extensions/source/plugin/aqua/sysplug.cxx
+++ b/extensions/source/plugin/aqua/sysplug.mm
diff --git a/extensions/source/plugin/base/makefile.mk b/extensions/source/plugin/base/makefile.mk
deleted file mode 100644
index a7e28f8deae5..000000000000
--- a/extensions/source/plugin/base/makefile.mk
+++ /dev/null
@@ -1,65 +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=plbase
-TARGETTYPE=GUI
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :  ..$/util$/makefile.pmk
-
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin
-.IF "$(SOLAR_JAVA)" != ""
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
-.ENDIF
-
-.IF "$(WITH_MOZILLA)" != "NO"
-
-.IF "$(GUIBASE)"=="aqua"
-CFLAGSCXX+=$(OBJCXXFLAGS)
-.ENDIF  # "$(GUIBASE)"=="aqua"
-
-SLOFILES=		\
-                $(SLO)$/plctrl.obj		\
-                $(SLO)$/service.obj		\
-                $(SLO)$/xplugin.obj		\
-                $(SLO)$/nfuncs.obj		\
-                $(SLO)$/manager.obj		\
-                $(SLO)$/context.obj		\
-                $(SLO)$/evtlstnr.obj	\
-                $(SLO)$/plcom.obj		\
-                $(SLO)$/multiplx.obj    \
-                $(SLO)$/plmodel.obj
-
-.ENDIF # $(WITH_MOZILLA) != "NO"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/extensions/source/plugin/util/pl.component b/extensions/source/plugin/pl.component
index 4a9d98f7dc7b..4a9d98f7dc7b 100644
--- a/extensions/source/plugin/util/pl.component
+++ b/extensions/source/plugin/pl.component
diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk
deleted file mode 100644
index 9dcdf1ace314..000000000000
--- a/extensions/source/plugin/unx/makefile.mk
+++ /dev/null
@@ -1,104 +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=plunx
-TARGETTYPE=CUI
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :  ..$/util$/makefile.pmk
-
-.IF "$(GUIBASE)"=="aqua"
-dummy:
-    @echo "Nothing to build for GUIBASE aqua."
-    
-.ELSE
-
-# --- Files --------------------------------------------------------
-
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin
-.IF "$(SOLAR_JAVA)" != ""
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
-CDEFS+=-DOJI
-.ENDIF
-
-.IF "$(WITH_MOZILLA)" != "NO"
-
-SLOFILES=\
-    $(SLO)$/nppapi.obj		\
-    $(SLO)$/sysplug.obj		\
-    $(SLO)$/mediator.obj	\
-    $(SLO)$/plugcon.obj		\
-    $(SLO)$/unxmgr.obj
-
-OBJFILES=\
-    $(OBJ)$/npwrap.obj		\
-    $(OBJ)$/npnapi.obj		\
-    $(OBJ)$/mediator.obj	\
-    $(OBJ)$/plugcon.obj
-
-APP1TARGET=pluginapp.bin
-APP1OBJS=$(OBJFILES)
-APP1STDLIBS= $(SALLIB)
-
-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO"
-APP1STDLIBS+=-lXm -lXt $(X11LINK_DYNAMIC) -ldl
-.ELSE
-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || "$(OS)"=="OPENBSD" || "$(OS)"=="DRAGONFLY"
-APP1STDLIBS+= -lXt -lXext -lX11
-.ELIF "$(OS)"=="AIX"
-APP1STDLIBS+= -lXpm -lXmu -lXt $(X11LINK_DYNAMIC) -ldl
-.ELSE
-APP1STDLIBS+= -lXt $(X11LINK_DYNAMIC) -ldl
-.ENDIF
-.ENDIF
-
-.IF "$(ENABLE_GTK)" == "TRUE"
-# libs for gtk plugin
-APP1STDLIBS+=$(PKGCONFIG_LIBS:s/ -lpangoxft-1.0//)
-# hack for faked SO environment
-.IF "$(PKGCONFIG_ROOT)"!=""
-.IF "$(OS)" == "SOLARIS"
-# don't ask, it's ugly
-DIRECT :=-z nodefs $(DIRECT)
-.ENDIF
-.ENDIF          # "$(PKGCONFIG_ROOT)"!=""
-.ENDIF
-
-
-APP1DEF=	$(MISC)$/$(TARGET).def
-
-.ENDIF # $(WITH_MOZILLA) != "NO"
-
-.ENDIF # $(GUIBASE)==aqua
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk
deleted file mode 100644
index 1e6dda1e5ca0..000000000000
--- a/extensions/source/plugin/util/makefile.mk
+++ /dev/null
@@ -1,110 +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=pl
-TARGETTYPE=GUI
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(WITH_MOZILLA)" != "NO"
-
-LIB1TARGET = $(SLB)$/plall.lib
-LIB1FILES  = \
-    $(SLB)$/plbase.lib	\
-    $(SHL1LINKLIB)
-
-.IF "$(GUI)" == "UNX"
-.IF "$(GUIBASE)"=="aqua"
-.IF "$(WITH_MOZILLA)"=="YES"
-SHL1LINKLIB = $(SLB)$/plaqua.lib
-.ENDIF
-.ELSE
-SHL1LINKLIB = $(SLB)$/plunx.lib
-.ENDIF # $(GUIBASE)==aqua
-.IF "$(OS)" == "SOLARIS"
-SHL1OWNLIBS = -lsocket
-.ENDIF # SOLARIS
-.ENDIF # UNX
-
-.IF "$(GUI)" == "WNT"
-SHL1LINKLIB = $(SLB)$/plwin.lib
-SHL1OWNLIBS = \
-    $(VERSIONLIB)	\
-    $(OLE32LIB)	\
-    $(ADVAPI32LIB)
-.ENDIF # WNT
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB= i$(TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1LIBS=$(LIB1TARGET)
-
-SHL1STDLIBS+= \
-    $(TKLIB)            \
-    $(VCLLIB)			\
-    $(SVLLIB)			\
-    $(UNOTOOLSLIB)      \
-    $(TOOLSLIB)			\
-    $(UCBHELPERLIB)		\
-    $(COMPHELPERLIB)	\
-    $(CPPUHELPERLIB)	\
-    $(CPPULIB)			\
-    $(SALLIB)           \
-    $(SALHELPERLIB)
-
-.IF "$(GUIBASE)"=="unx"
-SHL1STDLIBS+=$(X11LINK_DYNAMIC)
-.ENDIF
-
-SHL1STDLIBS+=$(SHL1OWNLIBS)
-
-.ENDIF # $(WITH_MOZILLA) != "NO"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-
-
-ALLTAR : $(MISC)/pl.component
-
-$(MISC)/pl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        pl.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt pl.component
diff --git a/extensions/source/plugin/util/makefile.pmk b/extensions/source/plugin/util/makefile.pmk
deleted file mode 100644
index 0f06ea2a50ce..000000000000
--- a/extensions/source/plugin/util/makefile.pmk
+++ /dev/null
@@ -1,48 +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.
-#
-#*************************************************************************
-NOUNODOC=true
-
-.INCLUDE :  settings.mk
-
-.IF "$(SYSTEM_MOZILLA)" == "YES"
-CFLAGS+=-DSYSTEM_MOZILLA
-PKGCONFIG_MODULES+=$(MOZ_FLAVOUR)-plugin
-.ENDIF
-
-.IF "$(GUIBASE)" == "unx" && "$(ENABLE_GTK)" == "TRUE"
-CDEFS+=-DENABLE_GTK
-PKGCONFIG_MODULES+=gtk+-2.0 gthread-2.0
-.ENDIF
-
-.IF "$(GUIBASE)" == "aqua"
-CFLAGS += -I$(FRAMEWORKSHOME)/ApplicationServices.framework/Versions/Current/Frameworks/QD.framework/Headers\
-          -I$(FRAMEWORKSHOME)/Carbon.framework/Versions/Current/Frameworks/HIToolbox.framework/Versions/Current/Headers
-.ENDIF
-
-.IF "$(PKGCONFIG_MODULES)" != ""
-.INCLUDE : pkg_config.mk
-.ENDIF
diff --git a/extensions/source/plugin/win/makefile.mk b/extensions/source/plugin/win/makefile.mk
deleted file mode 100644
index 7f676ac16748..000000000000
--- a/extensions/source/plugin/win/makefile.mk
+++ /dev/null
@@ -1,58 +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=plwin
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-.IF "$(GUI)" == "WNT"
-
-.INCLUDE :  ..$/util$/makefile.pmk
-
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/plugin
-.IF "$(SOLAR_JAVA)" != ""
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/java
-INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
-CDEFS+=-DOJI
-.ENDIF
-
-# --- Types -------------------------------------
-
-.IF "$(WITH_MOZILLA)" != "NO"
-SLOFILES =	$(SLO)$/winmgr.obj	\
-            $(SLO)$/sysplug.obj
-.ENDIF # $(WITH_MOZILLA) != "NO"
-
-.ENDIF
-
-# ------------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/extensions/source/propctrlr/makefile.mk b/extensions/source/propctrlr/makefile.mk
deleted file mode 100644
index ebb629ae39c9..000000000000
--- a/extensions/source/propctrlr/makefile.mk
+++ /dev/null
@@ -1,154 +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=..$/..
-PRJINC=..$/inc
-
-PRJNAME=extensions
-TARGET=pcr
-USE_DEFFILE=TRUE
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=           $(SLO)$/controlfontdialog.obj \
-                    $(SLO)$/fontdialog.obj	\
-                    $(SLO)$/pcrservices.obj	\
-                    $(SLO)$/selectlabeldialog.obj	\
-                    $(SLO)$/propcontroller.obj	\
-                    $(SLO)$/formcontroller.obj	\
-                    $(SLO)$/modulepcr.obj  \
-                    $(SLO)$/cellbindinghelper.obj   \
-                    $(SLO)$/taborder.obj   \
-                    $(SLO)$/pcrunodialogs.obj   \
-                    $(SLO)$/unourl.obj   \
-                    $(SLO)$/formlinkdialog.obj   \
-                    $(SLO)$/listselectiondlg.obj   \
-                    $(SLO)$/browserlistbox.obj	\
-                    $(SLO)$/stringrepresentation.obj   \
-                    $(SLO)$/eformshelper.obj   \
-                    $(SLO)$/xsddatatypes.obj   \
-                    $(SLO)$/xsdvalidationhelper.obj \
-                    $(SLO)$/pushbuttonnavigation.obj \
-                    $(SLO)$/sqlcommanddesign.obj \
-                    $(SLO)$/composeduiupdate.obj \
-                    $(SLO)$/propertycomposer.obj \
-                    $(SLO)$/pcrcomponentcontext.obj \
-                    $(SLO)$/commoncontrol.obj \
-                    $(SLO)$/standardcontrol.obj \
-                    $(SLO)$/usercontrol.obj \
-                    $(SLO)$/browserline.obj \
-                    $(SLO)$/genericpropertyhandler.obj \
-                    $(SLO)$/buttonnavigationhandler.obj \
-                    $(SLO)$/handlerhelper.obj \
-                    $(SLO)$/propertyhandler.obj \
-                    $(SLO)$/eventhandler.obj \
-                    $(SLO)$/editpropertyhandler.obj \
-                    $(SLO)$/eformspropertyhandler.obj \
-                    $(SLO)$/cellbindinghandler.obj \
-                    $(SLO)$/submissionhandler.obj \
-                    $(SLO)$/xsdvalidationpropertyhandler.obj \
-                    $(SLO)$/formcomponenthandler.obj \
-                    $(SLO)$/formmetadata.obj \
-                    $(SLO)$/defaultforminspection.obj \
-                    $(SLO)$/formbrowsertools.obj \
-                    $(SLO)$/browserpage.obj	\
-                    $(SLO)$/propertyeditor.obj	\
-                    $(SLO)$/formstrings.obj	\
-                    $(SLO)$/pcrstrings.obj	\
-                    $(SLO)$/browserview.obj	\
-                    $(SLO)$/pcrcommon.obj	\
-                    $(SLO)$/newdatatype.obj \
-                    $(SLO)$/propeventtranslation.obj \
-                    $(SLO)$/objectinspectormodel.obj \
-                    $(SLO)$/inspectorhelpwindow.obj \
-                    $(SLO)$/defaulthelpprovider.obj \
-                    $(SLO)$/MasterDetailLinkDialog.obj \
-                    $(SLO)$/inspectormodelbase.obj \
-                    $(SLO)$/propertycontrolextender.obj \
-                    $(SLO)$/formgeometryhandler.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=			propres.src	 \
-                    formres.src \
-                    pcrmiscres.src \
-                    taborder.src \
-                    fontdialog.src \
-                    selectlabeldialog.src \
-                    formlinkdialog.src \
-                    listselectiondlg.src \
-                    newdatatype.src
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES= $(SRS)$/$(TARGET).srs
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-SHL1STDLIBS= \
-        $(EDITENGLIB)	\
-        $(SVXCORELIB)	\
-        $(SVXLIB)	\
-        $(SFXLIB)	\
-        $(SVTOOLLIB)\
-        $(TKLIB)	\
-        $(VCLLIB)	\
-        $(SVLLIB)	\
-        $(TOOLSLIB) \
-        $(I18NISOLANGLIB)   \
-        $(DBTOOLSLIB)	\
-        $(COMPHELPERLIB) 	 \
-        $(CPPUHELPERLIB) 	 \
-        $(CPPULIB) 	\
-        $(UNOTOOLSLIB) 	\
-        $(SALLIB)
-
-SHL1LIBS=		$(SLB)$/$(TARGET).lib
-SHL1IMPLIB=		i$(TARGET)
-SHL1DEPN=		$(SHL1LIBS)
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=		$(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-
-ALLTAR : $(MISC)/pcr.component
-
-$(MISC)/pcr.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        pcr.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt pcr.component
diff --git a/extensions/source/resource/exports.dxp b/extensions/source/resource/exports.dxp
deleted file mode 100644
index 70033078921a..000000000000
--- a/extensions/source/resource/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/extensions/source/resource/makefile.mk b/extensions/source/resource/makefile.mk
deleted file mode 100644
index 4839ec0b7ca2..000000000000
--- a/extensions/source/resource/makefile.mk
+++ /dev/null
@@ -1,86 +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=res
-LIBTARGET=NO
-USE_LDUMP2=TRUE
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-    $(SLO)$/ResourceIndexAccess.obj \
-    $(SLO)$/oooresourceloader.obj \
-    $(SLO)$/resourceservices.obj
-
-LIB1TARGET= 	$(SLB)$/$(TARGET).lib
-LIB1OBJFILES=	$(SLOFILES)
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
-        $(COMPHELPERLIB) 	 \
-        $(CPPULIB) 	 \
-        $(CPPUHELPERLIB) 	 \
-        $(SALLIB) 	 \
-        $(VCLLIB)	\
-        $(TOOLSLIB)
-
-SHL1DEPN=
-SHL1IMPLIB=		ires
-SHL1LIBS=		$(LIB1TARGET)
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=		$(SHL1TARGET)
-DEF1EXPORTFILE=	exports.dxp
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-.INCLUDE :	$(PRJ)$/util$/target.pmk
-
-
-ALLTAR : $(MISC)/res.component
-
-$(MISC)/res.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        res.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt res.component
diff --git a/extensions/source/scanner/exports.dxp b/extensions/source/scanner/exports.dxp
deleted file mode 100644
index 70033078921a..000000000000
--- a/extensions/source/scanner/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk
deleted file mode 100644
index 60d1900f0b6b..000000000000
--- a/extensions/source/scanner/makefile.mk
+++ /dev/null
@@ -1,104 +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=scn
-ENABLE_EXCEPTIONS=TRUE
-PACKAGE=com$/sun$/star$/scanner
-USE_DEFFILE=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-                $(SLO)$/scnserv.obj		\
-                $(SLO)$/scanner.obj
-
-.IF "$(GUI)"=="WNT"
-SLOFILES+=\
-                $(SLO)$/scanwin.obj		
-.ENDIF
-
-.IF "$(GUI)"=="UNX"
-SLOFILES+=\
-                $(SLO)$/sane.obj		\
-                $(SLO)$/sanedlg.obj		\
-                $(SLO)$/scanunx.obj		\
-                $(SLO)$/grid.obj
-
-.ENDIF
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-    sanedlg.src		\
-    grid.src
-
-RESLIB1NAME=san
-RESLIB1IMAGES=$(PRJ)$/source$/scanner
-RESLIB1SRSFILES= $(SRS)$/scn.srs
-RESLIB1DEPN= sanedlg.src sanedlg.hrc grid.src grid.hrc
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1STDLIBS=\
-    $(CPPULIB)			\
-    $(CPPUHELPERLIB)	\
-    $(COMPHELPERLIB)	\
-    $(SALLIB)			\
-    $(ONELIB)			\
-    $(TOOLSLIB)			\
-    $(VCLLIB)			\
-    $(SVTOOLLIB)
-
-.IF "$(GUI)"=="UNX" && "$(OS)"!="FREEBSD" && \
-    "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY"
-SHL1STDLIBS+=$(SVTOOLLIB) -ldl
-.ENDIF
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
-ALLTAR : $(MISC)/scn.component
-
-$(MISC)/scn.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        scn.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt scn.component
diff --git a/extensions/source/unoactivex/main/initwindowpeer.cxx b/extensions/source/unoactivex/main/initwindowpeer.cxx
deleted file mode 100644
index f2ae4cc713a2..000000000000
--- a/extensions/source/unoactivex/main/initwindowpeer.cxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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.
- *
- ************************************************************************/
-
-
-
-#include "initwindowpeer.hxx"
-
-using namespace ::com::sun::star;
-
-
-uno::Any SAL_CALL InitWindowPeer::getWindowHandle( const uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType )
-    throw ( uno::RuntimeException )
-{
-    uno::Any aRes;
-    sal_Int32 nHwnd = (sal_Int32)m_hwnd;
-    aRes <<= nHwnd;
-    return aRes;
-}
-
-
-uno::Reference< awt::XToolkit > SAL_CALL InitWindowPeer::getToolkit()
-    throw ( uno::RuntimeException )
-{
-    return uno::Reference< awt::XToolkit >();
-}
-
-void SAL_CALL InitWindowPeer::setPointer( const uno::Reference< awt::XPointer >& Pointer )
-    throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::setBackground( sal_Int32 Color )
-    throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::invalidate( sal_Int16 Flags )
-    throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::invalidateRect( const awt::Rectangle& Rect, sal_Int16 Flags )
-    throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::dispose()
-    throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
-    throw ( uno::RuntimeException )
-{
-}
-
-void SAL_CALL InitWindowPeer::removeEventListener( const uno::Reference< lang::XEventListener >& aListener )
-    throw ( uno::RuntimeException )
-{
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/update/check/makefile.mk b/extensions/source/update/check/makefile.mk
deleted file mode 100644
index 47da869ea11e..000000000000
--- a/extensions/source/update/check/makefile.mk
+++ /dev/null
@@ -1,142 +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=updchk
-PACKAGE=org.openoffice.Office
-
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-ABSXCSROOT=$(SOLARXMLDIR)
-XCSROOT=..
-DTDDIR=$(ABSXCSROOT)
-XSLDIR=$(ABSXCSROOT)$/processing
-PROCESSOUT=$(MISC)$/$(TARGET)
-PROCESSORDIR=$(SOLARBINDIR)
-
-# no validation by inspector class
-NO_INSPECTION=TRUE
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-
-# no "lib" prefix
-DLLPRE =
-
-# --- Files ---
-
-SRS2NAME=$(TARGET)
-SRC2FILES=\
-    updatehdl.src
-
-RESLIB2NAME=upd
-RESLIB2SRSFILES= $(SRS)$/updchk.srs
-RESLIB2DEPN= updatehdl.src updatehdl.hrc
-
-SLOFILES=\
-    $(SLO)$/download.obj \
-    $(SLO)$/updatecheck.obj \
-    $(SLO)$/updatecheckjob.obj \
-    $(SLO)$/updatecheckconfig.obj \
-    $(SLO)$/updateprotocol.obj \
-    $(SLO)$/updatehdl.obj
-        
-SHL1NOCHECK=TRUE
-SHL1TARGET=$(TARGET).uno   
-SHL1OBJS=$(SLOFILES)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1STDLIBS=    \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(CURLLIB) \
-        $(SALLIB) \
-        $(SHELL32LIB) \
-        $(OLE32LIB)
-        
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-PACKAGEDIR=$(subst,.,$/ $(PACKAGE))
-SPOOLDIR=$(MISC)$/registry$/spool
-
-XCUFILES= \
-    Addons.xcu \
-    Jobs.xcu
-
-MYXCUFILES= \
-    $(SPOOLDIR)$/$(PACKAGEDIR)$/Addons$/Addons-onlineupdate.xcu \
-    $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-onlineupdate.xcu
-
-LOCALIZEDFILES= \
-    Addons.xcu \
-    Jobs.xcu
-
-.IF "$(test)" != ""
-APP1TARGET=updateprotocoltest
-APP1STDLIBS= $(SHL1STDLIBS)
-APP1OBJS= \
-    $(SLO)$/updateprotocol.obj \
-    $(SLO)$/updateprotocoltest.obj
-
-
-.ENDIF # "$(test)" != ""
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MYXCUFILES)
-
-.IF "$(WITH_LANG)"!=""
-XCU_SOURCEDIR:=$(PROCESSOUT)$/merge$/$(PACKAGEDIR)
-.ELSE			# "$(WITH_LANG)"!=""
-XCU_SOURCEDIR:=.
-.ENDIF			# "$(WITH_LANG)"!=""
-
-$(SPOOLDIR)$/$(PACKAGEDIR)$/Addons$/Addons-onlineupdate.xcu : $(XCU_SOURCEDIR)$/Addons.xcu
-    @-$(MKDIRHIER) $(@:d)
-    @$(COPY) $< $@
-
-$(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-onlineupdate.xcu : $(XCU_SOURCEDIR)$/Jobs.xcu
-    @-$(MKDIRHIER) $(@:d)
-    @$(COPY) $< $@
-#	@$(PERL) transform.pl < $< > $@
-
-
-ALLTAR : $(MISC)/updchk.uno.component
-
-$(MISC)/updchk.uno.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        updchk.uno.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt updchk.uno.component
diff --git a/extensions/source/update/check/onlinecheck.cxx b/extensions/source/update/check/onlinecheck.cxx
new file mode 100644
index 000000000000..0a765399cce3
--- /dev/null
+++ b/extensions/source/update/check/onlinecheck.cxx
@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifdef _MSC_VER
+#pragma warning( disable: 4668 )
+#endif
+
+#include <sal/types.h>
+#include <sal/macros.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <wininet.h>
+
+#ifdef UNICODE
+#define _UNICODE
+#endif
+#include <tchar.h>
+
+// #i71984
+extern "C" bool SAL_CALL WNT_hasInternetConnection()
+{
+    DWORD   dwFlags;
+    TCHAR   szConnectionName[1024];
+
+#ifndef __MINGW32__
+    __try {
+#endif
+    BOOL fIsConnected = InternetGetConnectedStateEx(
+        &dwFlags,
+        szConnectionName,
+        SAL_N_ELEMENTS(szConnectionName),
+        0 );
+
+    return fIsConnected ? true : false;
+
+#ifndef __MINGW32__
+    } __except( EXCEPTION_EXECUTE_HANDLER ) {
+        return false;
+    }
+#endif
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/update/check/Addons.xcu b/extensions/source/update/check/org/openoffice/Office/Addons.xcu
index 8794ce858073..8794ce858073 100644
--- a/extensions/source/update/check/Addons.xcu
+++ b/extensions/source/update/check/org/openoffice/Office/Addons.xcu
diff --git a/extensions/source/update/check/Jobs.xcu b/extensions/source/update/check/org/openoffice/Office/Jobs.xcu
index 840d630698cb..840d630698cb 100644
--- a/extensions/source/update/check/Jobs.xcu
+++ b/extensions/source/update/check/org/openoffice/Office/Jobs.xcu
diff --git a/extensions/source/update/check/transform.pl b/extensions/source/update/check/transform.pl
deleted file mode 100644
index fb452ae0482c..000000000000
--- a/extensions/source/update/check/transform.pl
+++ /dev/null
@@ -1,61 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-        if 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.
-#
-#*************************************************************************
-
-while (<>) {
-
-  if( /<prop/ ) {
-    $prop = $_;
-    next if( /Text/ || /Bubble/ );
-  }
-
-  if( /<\/prop>/ ) {
-    next if( $prop =~ /Text/ || $prop =~ /Bubble/ );
-  }
-
-  if( /xml:lang/ ) {
-    $lang = $_;
-    $lang =~ s/.*xml:lang=\"//;
-    $lang =~ s/\".*//;
-    chomp $lang;
-    $line = $prop;
-    $line =~ s/\" oor:type/_$lang\" oor:type/;
-    print $line;
-    $line = $_;
-    $line =~ s/ xml:lang=\".*\"//;
-    print $line;
-    $line = $prop;
-    $line =~ s/<prop.*/<\/prop>/;
-    print $line;
-    next;
-  }
-
-  print;
-}
-\ No newline at end of file
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index ee04697d3296..9d8c7b92a286 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -85,6 +85,7 @@ namespace uno = com::sun::star::uno ;
 #define PROPERTY_DEFAULT_TEXT   UNISTRING("DefaultText")
 #define PROPERTY_SHOW_MENUICON  UNISTRING("MenuIconVisible")
 
+extern "C" bool SAL_CALL WNT_hasInternetConnection();
 //------------------------------------------------------------------------------
 
 // Returns the URL of the release note for the given position
@@ -267,9 +268,11 @@ private:
     /* Used to avoid dialup login windows (on platforms we know how to double this) */
     inline bool hasInternetConnection() const
     {
-        if(m_pHasInternetConnection != NULL )
-            return (sal_True == m_pHasInternetConnection());
+#ifdef WNT
+        return WNT_hasInternetConnection();
+#else
         return true;
+#endif
     }
 
     /* Creates a new instance of UpdateInformationProvider and returns this instance */
@@ -295,10 +298,6 @@ protected:
     osl::Condition& m_aCondition;
 
 private:
-
-//    const
-    OnlineCheckFunc m_pHasInternetConnection;
-
     const uno::Reference<uno::XComponentContext> m_xContext;
     uno::Reference<deployment::XUpdateInformationProvider> m_xProvider;
 };
@@ -373,30 +372,8 @@ private:
 UpdateCheckThread::UpdateCheckThread( osl::Condition& rCondition,
                                       const uno::Reference<uno::XComponentContext>& xContext ) :
     m_aCondition(rCondition),
-    m_pHasInternetConnection(NULL),
     m_xContext(xContext)
 {
-
-#ifdef WNT
-    rtl::OUString aPath;
-    if( osl_getExecutableFile(&aPath.pData) == osl_Process_E_None )
-    {
-        sal_uInt32 lastIndex = aPath.lastIndexOf('/');
-        if ( lastIndex > 0 )
-        {
-            aPath = aPath.copy( 0, lastIndex+1 );
-            aPath  += UNISTRING( "onlinecheck" );
-        }
-
-        if ( m_aModule.load(aPath) )
-        {
-            m_pHasInternetConnection =
-                reinterpret_cast < OnlineCheckFunc > (
-                    m_aModule.getFunctionSymbol( UNISTRING("hasInternetConnection")));
-        }
-    }
-#endif
-
     createSuspended();
 
     // actually run the thread
diff --git a/extensions/source/update/check/updatecheck.hxx b/extensions/source/update/check/updatecheck.hxx
index 0f0768919877..d6db5e8e8978 100644
--- a/extensions/source/update/check/updatecheck.hxx
+++ b/extensions/source/update/check/updatecheck.hxx
@@ -58,7 +58,7 @@ public:
     virtual void SAL_CALL cancel() = 0;
 };
 
-class UpdateCheck :
+class SAL_DLLPUBLIC_EXPORT UpdateCheck :
     public UpdateCheckConfigListener,
     public IActionListener,
     public DownloadInteractionHandler,
@@ -107,35 +107,35 @@ public:
     bool hasOfficeUpdate() const { return (m_aUpdateInfo.BuildId.getLength() > 0); }
 
     // DownloadInteractionHandler
-    virtual bool downloadTargetExists(const rtl::OUString& rFileName);
-    virtual void downloadStalled(const rtl::OUString& rErrorMessage);
-    virtual void downloadProgressAt(sal_Int8 nProcent);
-    virtual void downloadStarted(const rtl::OUString& rLocalFileName, sal_Int64 nFileSize);
-    virtual void downloadFinished(const rtl::OUString& rLocalFileName);
+    SAL_DLLPUBLIC_EXPORT virtual bool downloadTargetExists(const rtl::OUString& rFileName);
+    SAL_DLLPUBLIC_EXPORT virtual void downloadStalled(const rtl::OUString& rErrorMessage);
+    SAL_DLLPUBLIC_EXPORT virtual void downloadProgressAt(sal_Int8 nProcent);
+    SAL_DLLPUBLIC_EXPORT virtual void downloadStarted(const rtl::OUString& rLocalFileName, sal_Int64 nFileSize);
+    SAL_DLLPUBLIC_EXPORT virtual void downloadFinished(const rtl::OUString& rLocalFileName);
     // checks if the download target already exists and asks user what to do next
-    virtual bool checkDownloadDestination( const rtl::OUString& rFile );
+    SAL_DLLPUBLIC_EXPORT virtual bool checkDownloadDestination( const rtl::OUString& rFile );
 
     // Cancels the download action (and resumes checking if enabled)
     void cancelDownload();
 
     // Returns the XInteractionHandler of the UpdateHandler instance if present (and visible)
-    com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > getInteractionHandler() const;
+    SAL_DLLPUBLIC_EXPORT com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > getInteractionHandler() const;
 
     // UpdateCheckConfigListener
-    virtual void autoCheckStatusChanged(bool enabled);
-    virtual void autoCheckIntervalChanged();
+    SAL_DLLPUBLIC_EXPORT virtual void autoCheckStatusChanged(bool enabled);
+    SAL_DLLPUBLIC_EXPORT virtual void autoCheckIntervalChanged();
 
     // IActionListener
-    void cancel();
-    void download();
-    void install();
-    void pause();
-    void resume();
-    void closeAfterFailure();
+    SAL_DLLPUBLIC_EXPORT void cancel();
+    SAL_DLLPUBLIC_EXPORT void download();
+    SAL_DLLPUBLIC_EXPORT void install();
+    SAL_DLLPUBLIC_EXPORT void pause();
+    SAL_DLLPUBLIC_EXPORT void resume();
+    SAL_DLLPUBLIC_EXPORT void closeAfterFailure();
 
     // rtl::IReference
-    virtual oslInterlockedCount SAL_CALL acquire() SAL_THROW(());
-    virtual oslInterlockedCount SAL_CALL release() SAL_THROW(());
+    SAL_DLLPUBLIC_EXPORT virtual oslInterlockedCount SAL_CALL acquire() SAL_THROW(());
+    SAL_DLLPUBLIC_EXPORT virtual oslInterlockedCount SAL_CALL release() SAL_THROW(());
 
 private:
 
diff --git a/extensions/source/update/check/updateprotocol.hxx b/extensions/source/update/check/updateprotocol.hxx
index 510f8f968fd6..605ab84c130a 100644
--- a/extensions/source/update/check/updateprotocol.hxx
+++ b/extensions/source/update/check/updateprotocol.hxx
@@ -42,7 +42,7 @@ bool checkForUpdates(
 );
 
 // The same as above, that does not read the info from bootstrap
-bool
+SAL_DLLPUBLIC_EXPORT bool
 checkForUpdates(
     UpdateInfo& o_rUpdateInfo,
     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext,
diff --git a/extensions/source/update/feed/makefile.mk b/extensions/source/update/feed/makefile.mk
deleted file mode 100644
index 6361f20bdd73..000000000000
--- a/extensions/source/update/feed/makefile.mk
+++ /dev/null
@@ -1,72 +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=updatefeed
-
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-
-# no "lib" prefix
-DLLPRE =
-
-# --- Files ---
-
-SLOFILES=\
-    $(SLO)$/updatefeed.obj \
-
-SHL1NOCHECK=TRUE
-SHL1TARGET=$(TARGET).uno
-SHL1OBJS=$(SLOFILES)
-
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1STDLIBS=    \
-    $(CPPUHELPERLIB) \
-    $(CPPULIB) \
-    $(SALLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/updatefeed.component
-
-$(MISC)/updatefeed.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        updatefeed.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt updatefeed.component
diff --git a/extensions/source/update/ui/makefile.mk b/extensions/source/update/ui/makefile.mk
deleted file mode 100644
index 5ea6994d3d22..000000000000
--- a/extensions/source/update/ui/makefile.mk
+++ /dev/null
@@ -1,82 +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=updchkui
-
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ---
-
-.INCLUDE : settings.mk
-
-# --- Files ---
-
-SLOFILES=\
-    $(SLO)$/updatecheckui.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=\
-    updatecheckui.src
-
-RESLIB1NAME=updchk
-RESLIB1IMAGES=$(PRJ)$/source$/update$/ui
-RESLIB1SRSFILES= $(SRS)$/updchkui.srs
-RESLIB1DEPN= updatecheckui.src updatecheckui.hrc
-
-SHL1NOCHECK=TRUE
-SHL1TARGET=updchk$(DLLPOSTFIX)
-SHL1OBJS=$(SLOFILES)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1STDLIBS=    \
-        $(COMPHELPERLIB) \
-        $(CPPUHELPERLIB) \
-        $(CPPULIB) \
-        $(SALLIB) \
-        $(VCLLIB) \
-        $(TOOLSLIB)
-        
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-# --- Targets ---
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/updchk.component
-
-$(MISC)/updchk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        updchk.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt updchk.component
diff --git a/extensions/source/xmlextract/makefile.mk b/extensions/source/xmlextract/makefile.mk
deleted file mode 100644
index fa54df738b58..000000000000
--- a/extensions/source/xmlextract/makefile.mk
+++ /dev/null
@@ -1,73 +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=xmx
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-SLOFILES=	$(SLO)$/xmxuno.obj									\
-            $(SLO)$/xmxtrct.obj
-
-# --- Library -----------------------------------
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1IMPLIB=	i$(SHL1TARGET)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-SHL1STDLIBS=\
-        $(SOTLIB)                       \
-    $(UNOTOOLSLIB)		\
-    $(TOOLSLIB)			\
-    $(CPPUHELPERLIB)	\
-    $(CPPULIB)			\
-    $(SALLIB)
-
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/xmx.component
-
-$(MISC)/xmx.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        xmx.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt xmx.component
author	Michael Stahl <mstahl@redhat.com>	2012-01-06 21:09:13 +0100
committer	Michael Stahl <mstahl@redhat.com>	2012-01-06 21:09:13 +0100
commit	23dd856d3c70a63dd47ae2a09a75833267296432 (patch)
tree	3ed426d983d5a46cc48dc1ee873ac5627b867f05 /extensions/source
parent	5106b38a9cc64677b3fa4a0aea7450560775e78e (diff)
parent	7e5b321535977ccddc6703c0ad4e5d25af797654 (diff)