3 files changed, 2 insertions, 135 deletions
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 528a66e29337..1b9c02c1bd9f 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_Bool component_canUnload( TimeValue* libUnused)
+extern "C"  sal_Bool SAL_DLLPUBLIC_EXPORT
+component_canUnload( TimeValue* libUnused)
 {
     return globalModuleCount.canUnload( &globalModuleCount, libUnused);
 }