diff options
Diffstat (limited to 'shell/source')
34 files changed, 36 insertions, 2327 deletions
diff --git a/shell/source/all/makefile.mk b/shell/source/all/makefile.mk deleted file mode 100644 index 8791e62a8717..000000000000 --- a/shell/source/all/makefile.mk +++ /dev/null @@ -1,74 +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=shell -TARGET=xmlparser -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN = TRUE - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(GUI)" == "WNT" -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -.IF "$(BUILD_X64)"!="" -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -.ENDIF # "$(BUILD_X64)"!="" -.ENDIF - -# --- Files -------------------------------------------------------- - -.IF "$(SYSTEM_EXPAT)" == "YES" -CFLAGS+=-DSYSTEM_EXPAT -.ENDIF - -SLOFILES=$(SLO)$/xml_parser.obj - -.IF "$(BUILD_X64)"!="" -SLOFILES_X64=$(SLO_X64)$/xml_parser.obj -.ENDIF # "$(BUILD_X64)"!="" - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -.IF "$(OS)" == "WNT" -INCLUDE!:=$(subst,/stl, $(INCLUDE)) -.ENDIF -.INCLUDE : tg_wntx64.mk - diff --git a/shell/source/backends/desktopbe/makefile.mk b/shell/source/backends/desktopbe/makefile.mk deleted file mode 100644 index 7c6d6381a5a8..000000000000 --- a/shell/source/backends/desktopbe/makefile.mk +++ /dev/null @@ -1,59 +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 = shell -TARGET = desktopbe - -ENABLE_EXCEPTIONS = TRUE -VISIBILITY_HIDDEN = TRUE - -.INCLUDE: settings.mk - -DLLPRE = - -SLOFILES = $(SLO)/desktopbackend.obj - -SHL1IMPLIB = i$(SHL1TARGET) -SHL1OBJS = $(SLOFILES) -SHL1STDLIBS = \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) -SHL1TARGET = $(ENFORCEDSHLPREFIX)desktopbe1.uno -SHL1USE_EXPORTS = name -DEF1NAME = $(SHL1TARGET) - -.INCLUDE: target.mk - -ALLTAR : $(MISC)/desktopbe1.component - -$(MISC)/desktopbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - desktopbe1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt desktopbe1.component diff --git a/shell/source/backends/gconfbe/makefile.mk b/shell/source/backends/gconfbe/makefile.mk deleted file mode 100644 index 84ec3dbee57b..000000000000 --- a/shell/source/backends/gconfbe/makefile.mk +++ /dev/null @@ -1,97 +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=shell -TARGET=gconfbe - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings --- - -.INCLUDE : settings.mk - -# no "lib" prefix -DLLPRE = - -.IF "$(ENABLE_LOCKDOWN)" == "YES" -CFLAGS+=-DENABLE_LOCKDOWN -.ENDIF - -.IF "$(ENABLE_GCONF)"!="" -COMPILER_WARN_ALL=TRUE -PKGCONFIG_MODULES=gconf-2.0 gobject-2.0 glib-2.0 -.INCLUDE: pkg_config.mk - -.IF "$(OS)" == "SOLARIS" -LINKFLAGS+=-z nodefs -.ENDIF # "$(OS)" == "SOLARIS" - -.IF "$(OS)" == "LINUX" -# hack for faked SO environment -CFLAGS+=-gdwarf-2 -PKGCONFIG_LIBS!:=-Wl,--export-dynamic $(PKGCONFIG_LIBS) -.ENDIF - -# --- Files --- - - -SLOFILES=\ - $(SLO)$/gconfaccess.obj \ - $(SLO)$/gconfbackend.obj - -SHL1NOCHECK=TRUE -SHL1TARGET=$(TARGET)1.uno -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -SHL1STDLIBS+=$(PKGCONFIG_LIBS) - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -.ENDIF # "$(ENABLE_GCONF)"!="" - -# --- Targets --- - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/gconfbe1.component - -$(MISC)/gconfbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - gconfbe1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt gconfbe1.component diff --git a/shell/source/backends/kde4be/makefile.mk b/shell/source/backends/kde4be/makefile.mk deleted file mode 100644 index 477e47ca6100..000000000000 --- a/shell/source/backends/kde4be/makefile.mk +++ /dev/null @@ -1,87 +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=shell -TARGET=kde4be - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings --- - -.INCLUDE : settings.mk - -# For some of the included external KDE headers, GCC complains about shadowed -# symbols in instantiated template code only at the end of a compilation unit, -# so the only solution is to disable that warning here: -.IF "$(COM)" == "GCC" -CFLAGSCXX+=-Wno-shadow -.ENDIF - -# no "lib" prefix -DLLPRE = - -.IF "$(ENABLE_KDE4)" == "TRUE" - -CFLAGS+=$(KDE4_CFLAGS) - -# --- Files --- - -SLOFILES=\ - $(SLO)$/kde4access.obj \ - $(SLO)$/kde4backend.obj - -SHL1NOCHECK=TRUE -SHL1TARGET=$(TARGET)1.uno -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(KDE4_LIBS) -lkio - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -.ENDIF - -# --- Targets --- - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/kde4be1.component - -$(MISC)/kde4be1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - kde4be1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt kde4be1.component diff --git a/shell/source/backends/kdebe/makefile.mk b/shell/source/backends/kdebe/makefile.mk deleted file mode 100644 index 948d1a590f3e..000000000000 --- a/shell/source/backends/kdebe/makefile.mk +++ /dev/null @@ -1,123 +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=shell - -TARGET=kdebe -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings --- - -.INCLUDE : settings.mk - -# For some of the included external KDE headers, GCC complains about shadowed -# symbols in instantiated template code only at the end of a compilation unit, -# so the only solution is to disable that warning here: -.IF "$(COM)" == "GCC" -CFLAGSCXX+=-Wno-shadow -.ENDIF - -# no "lib" prefix -DLLPRE = - -.IF "$(ENABLE_TDE)" == "TRUE" -TARGET=tdebe - -CFLAGS+=$(TDE_CFLAGS) -CFLAGS+=-DENABLE_TDE -CFLAGSCXX+=-DENABLE_TDE - -# --- Files --- - -SLOFILES=\ - $(SLO)$/kdeaccess.obj \ - $(SLO)$/kdebackend.obj - -SHL1NOCHECK=TRUE -SHL1TARGET=$(TARGET)1.uno -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(TDE_LIBS) \ - -lkio - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -.ENDIF # "$(ENABLE_TDE)" == "TRUE" - -.IF "$(ENABLE_KDE)" == "TRUE" -TARGET=kdebe - -CFLAGS+=$(KDE_CFLAGS) - -# --- Files --- - -SLOFILES=\ - $(SLO)$/kdeaccess.obj \ - $(SLO)$/kdebackend.obj - -SHL1NOCHECK=TRUE -SHL1TARGET=$(TARGET)1.uno -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(KDE_LIBS) \ - -lkio - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -.ENDIF # "$(ENABLE_KDE)" == "TRUE" - -# --- Targets --- - -.INCLUDE : target.mk - -.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_TDE)" == "TRUE" - -ALLTAR : $(MISC)/$(TARGET)1.component - -$(MISC)/$(TARGET)1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - $(TARGET)1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt $(TARGET)1.component -.ENDIF diff --git a/shell/source/backends/localebe/localebe.xml b/shell/source/backends/localebe/localebe.xml index 3c22a4970881..2d7056242892 100755 --- a/shell/source/backends/localebe/localebe.xml +++ b/shell/source/backends/localebe/localebe.xml @@ -11,13 +11,17 @@ <status value="beta"/> <supported-service>com.sun.star.comp.configuration.backend.LocaleBackend</supported-service> <service-dependency>...</service-dependency> + <type>com.sun.star.beans.Optional</type> + <type>com.sun.star.beans.XPropertySet</type> <type>com.sun.star.configuration.backend.XBackendChangesListener</type> <type>com.sun.star.configuration.backend.XBackendChangesNotifier</type> <type>com.sun.star.configuration.backend.XLayerHandler</type> <type>com.sun.star.configuration.backend.XSingleLayerStratum</type> <type>com.sun.star.lang.XMultiComponentFactory</type> + <type>com.sun.star.lang.XMultiServiceFactory</type> <type>com.sun.star.lang.XServiceInfo</type> <type>com.sun.star.lang.XSingleComponentFactory</type> + <type>com.sun.star.lang.XSingleServiceFactory</type> <type>com.sun.star.lang.XTypeProvider</type> <type>com.sun.star.uno.TypeClass</type> <type>com.sun.star.uno.XAggregation</type> diff --git a/shell/source/backends/localebe/makefile.mk b/shell/source/backends/localebe/makefile.mk deleted file mode 100644 index 33b741230e61..000000000000 --- a/shell/source/backends/localebe/makefile.mk +++ /dev/null @@ -1,80 +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=shell -TARGET=localebe - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -COMP1TYPELIST=$(TARGET) - -# --- Settings --- - -.INCLUDE : settings.mk - -DLLPRE = - -# --- Files --- - -SLOFILES=\ - $(SLO)$/localebecdef.obj \ - $(SLO)$/localebackend.obj - -SHL1TARGET=$(ENFORCEDSHLPREFIX)$(TARGET)1.uno -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) - -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -.IF "$(OS)"=="MACOSX" -SHL1STDLIBS+= -framework CoreServices -.ENDIF - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -# --- Targets --- - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/localebe1.component - -$(MISC)/localebe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - localebe1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt localebe1.component diff --git a/shell/source/backends/macbe/makefile.mk b/shell/source/backends/macbe/makefile.mk deleted file mode 100644 index 50b67916d587..000000000000 --- a/shell/source/backends/macbe/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=shell -TARGET=macbe - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -COMP1TYPELIST=$(TARGET) - -# --- Settings --- - -.INCLUDE : settings.mk - -DLLPRE = - -# --- Files --- - -.IF "$(OS)" != "MACOSX" - -dummy: -# nothing - -.ELSE - -CFLAGSCXX+=$(OBJCXXFLAGS) - -SLOFILES= \ - $(SLO)$/macbecdef.obj \ - $(SLO)$/macbackend.obj - -SHL1TARGET=$(TARGET)1.uno -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - -framework Cocoa -framework SystemConfiguration - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -# --- Targets --- - -.INCLUDE : target.mk - -.ENDIF # "$(OS)" != "MACOSX" - -ALLTAR : $(MISC)/macbe1.component - -$(MISC)/macbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - macbe1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt macbe1.component diff --git a/shell/source/backends/wininetbe/makefile.mk b/shell/source/backends/wininetbe/makefile.mk deleted file mode 100644 index 7d8a6be14b21..000000000000 --- a/shell/source/backends/wininetbe/makefile.mk +++ /dev/null @@ -1,76 +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=shell -TARGET=wininetbe - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -COMP1TYPELIST=$(TARGET) - -# --- Settings --- - -.INCLUDE : settings.mk - -DLLPRE = - -# --- Files --- - - -SLOFILES=\ - $(SLO)$/wininetbecdef.obj \ - $(SLO)$/wininetbackend.obj - -SHL1TARGET=$(TARGET)1.uno -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -# --- Targets --- - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/wininetbe1.component - -$(MISC)/wininetbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - wininetbe1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt wininetbe1.component diff --git a/shell/source/backends/wininetbe/wininetbe.xml b/shell/source/backends/wininetbe/wininetbe.xml index 1bf4bd2cd053..ac277ce50307 100755 --- a/shell/source/backends/wininetbe/wininetbe.xml +++ b/shell/source/backends/wininetbe/wininetbe.xml @@ -11,13 +11,17 @@ <status value="beta"/> <supported-service>com.sun.star.comp.configuration.backend.Win32Backend</supported-service> <service-dependency>...</service-dependency> + <type>com.sun.star.beans.Optional</type> + <type>com.sun.star.beans.XPropertySet</type> <type>com.sun.star.configuration.backend.XBackendChangesListener</type> <type>com.sun.star.configuration.backend.XBackendChangesNotifier</type> <type>com.sun.star.configuration.backend.XLayerHandler</type> <type>com.sun.star.configuration.backend.XSingleLayerStratum</type> <type>com.sun.star.lang.XMultiComponentFactory</type> + <type>com.sun.star.lang.XMultiServiceFactory</type> <type>com.sun.star.lang.XServiceInfo</type> <type>com.sun.star.lang.XSingleComponentFactory</type> + <type>com.sun.star.lang.XSingleServiceFactory</type> <type>com.sun.star.lang.XTypeProvider</type> <type>com.sun.star.uno.TypeClass</type> <type>com.sun.star.uno.XAggregation</type> diff --git a/shell/source/cmdmail/cmdmail.xml b/shell/source/cmdmail/cmdmail.xml index 51de9cc1e4da..7d451f1c9952 100755 --- a/shell/source/cmdmail/cmdmail.xml +++ b/shell/source/cmdmail/cmdmail.xml @@ -25,6 +25,7 @@ <type> com.sun.star.lang.XTypeProvider </type> <type> com.sun.star.lang.IllegalArgumentException </type> <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.uno.DeploymentException </type> <type> com.sun.star.uno.RuntimeException </type> <type> com.sun.star.uno.TypeClass </type> <type> com.sun.star.uno.XWeak </type> diff --git a/shell/source/cmdmail/makefile.mk b/shell/source/cmdmail/makefile.mk deleted file mode 100644 index b658108fb845..000000000000 --- a/shell/source/cmdmail/makefile.mk +++ /dev/null @@ -1,78 +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=shell -TARGET=cmdmail -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST=$(TARGET) - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)" - -ALL: -# nothing - -.ENDIF - -# --- Files -------------------------------------------------------- - -DLLPRE= - -SLOFILES= \ - $(SLO)$/cmdmailsuppl.obj \ - $(SLO)$/cmdmailmsg.obj \ - $(SLO)$/cmdmailentry.obj -SHL1OBJS=$(SLOFILES) - -SHL1TARGET=$(TARGET).uno -SHL1IMPLIB=i$(TARGET) - -SHL1STDLIBS=$(CPPULIB)\ - $(CPPUHELPERLIB)\ - $(SALLIB) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/cmdmail.component - -$(MISC)/cmdmail.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - cmdmail.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt cmdmail.component diff --git a/shell/source/tools/lngconvex/makefile.mk b/shell/source/tools/lngconvex/makefile.mk deleted file mode 100644 index 4d3971b81490..000000000000 --- a/shell/source/tools/lngconvex/makefile.mk +++ /dev/null @@ -1,66 +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=shell -TARGET=lngconvex -TARGETTYPE=CUI -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/DESKTOP//)" -ALL: - @echo No need for this on non-desktop OSes -.ENDIF - -# --- Files -------------------------------------------------------- - -.IF "$(COM)"=="GCC" -CFLAGS+=-fno-inline -D_NTSDK -.ELSE -CFLAGS+=-Ob0 -D_NTSDK -.ENDIF - -APP1TARGET=$(TARGET) -APP1OBJS=$(OBJ)$/$(TARGET).obj\ - $(OBJ)$/cmdline.obj -APP1RPATH = NONE -APP1STDLIBS= \ - $(COMPHELPERLIB)\ - $(SALLIB)\ - $(TOOLSLIB)\ - $(I18NISOLANGLIB) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/shell/source/tools/regsvrex/makefile.mk b/shell/source/tools/regsvrex/makefile.mk deleted file mode 100644 index 2eb8dbf48481..000000000000 --- a/shell/source/tools/regsvrex/makefile.mk +++ /dev/null @@ -1,49 +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=shell -TARGET=regsvrex -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -OBJFILES=$(OBJ)$/regsvrex.obj -APP1TARGET=$(TARGET) -APP1OBJS=$(OBJFILES) -APP1STDLIBS=$(KERNEL32LIB) -APP1DEF=$(MISC)$/$(APP1TARGET).def - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - diff --git a/shell/source/unix/exec/makefile.mk b/shell/source/unix/exec/makefile.mk deleted file mode 100644 index 453609b53a51..000000000000 --- a/shell/source/unix/exec/makefile.mk +++ /dev/null @@ -1,101 +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=shell -TARGET=exec - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -COMP1TYPELIST=syssh - -TESTAPP1=urltest - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)" - -ALL: -# nothing - -.ENDIF - -# --- Files -------------------------------------------------------- - -DLLPRE= - -SLOFILES=$(SLO)$/shellexec.obj\ - $(SLO)$/shellexecentry.obj - -SHL1OBJS=$(SLOFILES) - -SHL1TARGET=syssh.uno -SHL1IMPLIB= - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -SHL1STDLIBS=$(CPPULIB)\ - $(CPPUHELPERLIB)\ - $(SALLIB) -SHL1LIBS= -SHL1DEPN= - -.IF "$(test)" != "" - -APP1TARGET=$(TESTAPP1) -APP1STDLIBS= $(SHL1STDLIBS) -APP1OBJS= \ - $(SLO)$/shellexec.obj \ - $(SLO)$/$(APP1TARGET).obj - -.ENDIF # "$(test)" != "" - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -run_test : $(BIN)$/$(TESTAPP1).sh - dmake test=t - $(BIN)$/$(TESTAPP1) urltest.txt - -$(BIN)$/$(TESTAPP1).sh : $$(@:f) - $(COPY) $< $@ - -chmod +x $@ - -ALLTAR : $(MISC)/syssh.component - -$(MISC)/syssh.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - syssh.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt syssh.component diff --git a/shell/source/unix/exec/syssh.xml b/shell/source/unix/exec/syssh.xml index 5c72befa9141..1b9e28c37fe8 100755 --- a/shell/source/unix/exec/syssh.xml +++ b/shell/source/unix/exec/syssh.xml @@ -15,13 +15,20 @@ <type>com.sun.star.system.SystemShellExecuteException</type> <type>com.sun.star.system.SystemShellExecuteFlags</type> <type>com.sun.star.lang.IllegalArgumentException</type> + <type>com.sun.star.lang.XMultiServiceFactory</type> <type>com.sun.star.lang.XServiceInfo</type> <type>com.sun.star.lang.XSingleComponentFactory</type> + <type>com.sun.star.lang.XSingleServiceFactory</type> <type>com.sun.star.lang.XTypeProvider</type> + <type>com.sun.star.uno.DeploymentException</type> <type>com.sun.star.uno.TypeClass</type> <type>com.sun.star.uno.XAggregation</type> <type>com.sun.star.uno.XComponentContext</type> + <type>com.sun.star.uno.XCurrentContext</type> <type>com.sun.star.uno.XWeak</type> + <type>com.sun.star.uri.ExternalUriReferenceTranslator</type> + <type>com.sun.star.uri.UriReferenceFactory</type> + <type>com.sun.star.util.XMacroExpander</type> <type>com.sun.star.registry.XRegistryKey</type> </component-description> <project-build-dependency>cppuhelper</project-build-dependency> diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk deleted file mode 100644 index 39752bdc4644..000000000000 --- a/shell/source/unix/misc/makefile.mk +++ /dev/null @@ -1,83 +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=shell -TARGET=misc - -LIBTARGET=NO -TARGETTYPE=CUI -NO_DEFAULT_STL=TRUE -LIBSALCPPRT=$(0) - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)" - -ALL: -# nothing - -.ENDIF - -# --- Files -------------------------------------------------------- - -SCRIPTFILES = \ - $(BIN)$/senddoc \ - $(BIN)$/open-url \ - $(BIN)$/cde-open-url \ - $(BIN)$/gnome-open-url \ - $(BIN)$/tde-open-url \ - $(BIN)$/kde-open-url - -APP1TARGET = gnome-open-url.bin -APP1OBJS = \ - $(OBJ)$/gnome-open-url.obj -APP1LIBS = -APP1RPATH = OOO -.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && \ - "$(OS)"!="DRAGONFLY" -APP1STDLIBS=-ldl -.ENDIF - -APP2TARGET = uri-encode -APP2OBJS = $(OBJ)$/uri-encode.obj -APP2LIBS = -APP2RPATH = OOO -APP2STDLIBS = - -OBJFILES = $(APP1OBJS) $(APP2OBJS) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(SCRIPTFILES) $(AWKFILES) - -$(SCRIPTFILES) : $$(@:f:+".sh") - @tr -d "\015" < $(@:f:+".sh") > $@ diff --git a/shell/source/unix/sysshell/makefile.mk b/shell/source/unix/sysshell/makefile.mk deleted file mode 100644 index df97be94d948..000000000000 --- a/shell/source/unix/sysshell/makefile.mk +++ /dev/null @@ -1,75 +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=shell -TARGET=sysshell -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN = TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)" - -ALL: -# nothing - -.ENDIF - -.IF "$(SYSTEM_EXPAT)" == "YES" -CFLAGS+=-DSYSTEM_EXPAT -.ENDIF - -# --- Files -------------------------------------------------------- - -.IF "$(OS)" != "MACOSX" && "$(OS)" != "IOS" && "$(OS)" != "ANDROID" - -SLOFILES=$(SLO)$/recently_used_file.obj \ - $(SLO)$/recently_used_file_handler.obj - -SHL1TARGET=recentfile - -SHL1STDLIBS=$(EXPATASCII3RDLIB)\ - $(SALLIB) - -SHL1USE_EXPORTS = name -SHL1LIBS=$(SLB)$/xmlparser.lib -SHL1OBJS=$(SLOFILES) - -.ELSE - -dummy: -# nothing - -.ENDIF -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/shell/source/win32/makefile.mk b/shell/source/win32/makefile.mk deleted file mode 100644 index 3878a8f9f456..000000000000 --- a/shell/source/win32/makefile.mk +++ /dev/null @@ -1,77 +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=shell -TARGET=syssh -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST=$(TARGET) - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/SysShentry.obj\ - $(SLO)$/SysShExec.obj - -SHL1TARGET=$(TARGET).uno - -SHL1STDLIBS=$(CPPULIB)\ - $(CPPUHELPERLIB)\ - $(SALLIB)\ - $(UWINAPILIB) \ - $(ADVAPI32LIB) \ - $(OLE32LIB) \ - $(SHELL32LIB) - -SHL1DEPN= -SHL1IMPLIB=i$(SHL1TARGET) - -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE= exports.dxp - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - - - -ALLTAR : $(MISC)/syssh.component - -$(MISC)/syssh.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - syssh.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt syssh.component diff --git a/shell/source/win32/ooofilereader/makefile.mk b/shell/source/win32/ooofilereader/makefile.mk deleted file mode 100644 index b26e10a16795..000000000000 --- a/shell/source/win32/ooofilereader/makefile.mk +++ /dev/null @@ -1,92 +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=shell -TARGET=ooofilereader -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - -# --- Files -------------------------------------------------------- - - -SLOFILES=$(SLO)$/basereader.obj\ - $(SLO)$/metainforeader.obj\ - $(SLO)$/contentreader.obj\ - $(SLO)$/simpletag.obj\ - $(SLO)$/keywordstag.obj\ - $(SLO)$/autostyletag.obj - -LIB1TARGET=$(SLB)$/$(TARGET).lib -LIB1OBJFILES=$(SLOFILES) -LIB1FILES=$(SLB)$/zipfile.lib\ - $(SLB)$/xmlparser.lib - -.IF "$(BUILD_X64)"!="" -SLOFILES_X64=$(SLO_X64)$/basereader.obj\ - $(SLO_X64)$/metainforeader.obj\ - $(SLO_X64)$/contentreader.obj\ - $(SLO_X64)$/simpletag.obj\ - $(SLO_X64)$/keywordstag.obj\ - $(SLO_X64)$/autostyletag.obj - -LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib -LIB1OBJFILES_X64=$(SLOFILES_X64) -LIB1FILES_X64=$(SLB_X64)$/zipfile.lib\ - $(SLB_X64)$/xmlparser.lib -.ENDIF # "$(BUILD_X64)"!="" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -.IF "$(OS)" == "WNT" -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.ENDIF -.INCLUDE : tg_wntx64.mk - diff --git a/shell/source/win32/shlxthandler/columninfo/makefile.mk b/shell/source/win32/shlxthandler/columninfo/makefile.mk deleted file mode 100644 index 7157f8f6ae2b..000000000000 --- a/shell/source/win32/shlxthandler/columninfo/makefile.mk +++ /dev/null @@ -1,67 +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=shell -TARGET=columninfo -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/columninfo.obj - -.IF "$(BUILD_X64)"!="" -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x501 -SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj -.ENDIF # "$(BUILD_X64)"!="" - -# --- Targets ------------------------------------------------------ -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/infotips/makefile.mk b/shell/source/win32/shlxthandler/infotips/makefile.mk deleted file mode 100644 index 38126a54c697..000000000000 --- a/shell/source/win32/shlxthandler/infotips/makefile.mk +++ /dev/null @@ -1,68 +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=shell -TARGET=infotips -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -EXTERNAL_WARNINGS_NOT_ERRORS := TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/$(TARGET).obj - -.IF "$(BUILD_X64)"!="" -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj -.ENDIF # "$(BUILD_X64)"!="" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk deleted file mode 100644 index 81c3515b20b7..000000000000 --- a/shell/source/win32/shlxthandler/makefile.mk +++ /dev/null @@ -1,170 +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=shell -TARGET=shlxthdl -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE -.IF "$(BUILD_X64)"!="" -USE_DEFFILE_X64=TRUE -.ENDIF -NO_DEFAULT_STL=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(COM)" == "GCC" -ALL : - @echo This does not build with MinGW anyway, so bypass for now -.ENDIF - - -UWINAPILIB = -UWINAPILIB_X64 = - -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -.IF "$(COM)" == "GCC" -CDEFS+=-DDONT_HAVE_GDIPLUS -.ENDIF - -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/classfactory.obj\ - $(SLO)$/columninfo.obj\ - $(SLO)$/infotips.obj\ - $(SLO)$/propsheets.obj\ - $(SLO)$/shlxthdl.obj\ - $(SLO)$/listviewbuilder.obj\ - $(SLO)$/document_statistic.obj\ - $(SLO)$/thumbviewer.obj\ - $(SLO)$/stream_helper.obj\ - -SHL1TARGET=$(TARGET) - -.IF "$(COM)"=="GCC" -SHL1STDLIBS=$(ZLIB3RDLIB) $(MINIZIP3RDLIB) $(EXPAT3RDLIB) $(COMCTL32LIB) -SHL1LIBS= -.ELSE -SHL1STDLIBS= -SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\ - $(SOLARLIBDIR)$/expat_xmlparse.lib\ - $(SOLARLIBDIR)$/expat_xmltok.lib -.ENDIF -SHL1STDLIBS+=\ - $(OLEAUT32LIB)\ - $(ADVAPI32LIB)\ - $(OLE32LIB)\ - $(UUIDLIB)\ - $(SHELL32LIB)\ - $(KERNEL32LIB)\ - $(GDI32LIB)\ - $(GDIPLUSLIB) - -SHL1STDLIBS+=\ - $(SHLWAPILIB) - -SHL1LIBS+=$(SLB)$/util.lib\ - $(SLB)$/ooofilereader.lib - -SHL1DEPN= - -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1RES=$(RES)$/$(TARGET).res - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -.IF "$(BUILD_X64)"!="" -# -------------------- x64 ----------------------- -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 -.IF "$(COM)" == "MSC" -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS_X64+=-D_WIN32_IE=0x501 - -SLOFILES_X64= \ - $(SLO_X64)$/classfactory.obj\ - $(SLO_X64)$/columninfo.obj\ - $(SLO_X64)$/infotips.obj\ - $(SLO_X64)$/propsheets.obj\ - $(SLO_X64)$/shlxthdl.obj\ - $(SLO_X64)$/listviewbuilder.obj\ - $(SLO_X64)$/document_statistic.obj\ - $(SLO_X64)$/thumbviewer.obj\ - $(SLO_X64)$/stream_helper.obj\ - -SHL1TARGET_X64=$(TARGET) -SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\ - $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\ - $(SOLARLIBDIR_X64)$/expat_xmltok.lib - -SHL1STDLIBS_X64+=\ - $(OLEAUT32LIB_X64)\ - $(ADVAPI32LIB_X64)\ - $(OLE32LIB_X64)\ - $(UUIDLIB_X64)\ - $(SHELL32LIB_X64)\ - $(KERNEL32LIB_X64)\ - $(GDI32LIB_X64)\ - $(USER32LIB_X64) \ - $(GDIPLUSLIB_X64) \ - $(MSVCRT_X64) \ - $(MSVCPRT_X64) \ - $(OLDNAMESLIB_X64) - -SHL1LIBS_X64+=$(SLB_X64)$/util.lib\ - $(SLB_X64)$/ooofilereader.lib -SHL1OBJS_X64=$(SLOFILES_X64) -SHL1DEF_X64=$(MISC_X64)$/$(SHL1TARGET).def -SHL1RES_X64=$(RES_X64)$/$(TARGET).res - -DEF1NAME_X64=$(SHL1TARGET_X64) -DEF1EXPORTFILE_X64=exports.dxp -.ENDIF # "$(BUILD_X64)"!="" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.INCLUDE : tg_wntx64.mk - diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk deleted file mode 100644 index afb2988bb12c..000000000000 --- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk +++ /dev/null @@ -1,140 +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=shell -TARGET=ooofilt -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE - -# Do not use the uwinapi library -UWINAPILIB= - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/ooofilt.obj\ - $(SLO)$/propspec.obj\ - $(SLO)$/stream_helper.obj - -SHL1TARGET=$(TARGET) -.IF "$(COM)"=="GCC" -SHL1STDLIBS=$(ZLIB3RDLIB) $(MINIZIP3RDLIB) $(EXPAT3RDLIB) -SHL1LIBS= -.ELSE -SHL1STDLIBS= -SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\ - $(SOLARLIBDIR)$/expat_xmlparse.lib\ - $(SOLARLIBDIR)$/expat_xmltok.lib -.ENDIF -SHL1STDLIBS+=$(OLE32LIB)\ - $(ADVAPI32LIB)\ - $(COMCTL32LIB)\ - $(UUIDLIB)\ - $(SHELL32LIB)\ - $(KERNEL32LIB)\ - $(OLDNAMESLIB) - -.IF "$(COM)"!="GCC" -SHL1STDLIBS+=msvcprt.lib - -.IF "$(PRODUCT)"!="full" -SHL1STDLIBS+=msvcrt.lib -.ENDIF -.ENDIF - - -SHL1LIBS+=$(SLB)$/util.lib\ - $(SLB)$/ooofilereader.lib - -SHL1DEPN= -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - - -.IF "$(BUILD_X64)"!="" -#---------------------------- x64 ------------------------- -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 -.IF "$(COM)" == "MSC" -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS_X64+=-D_WIN32_IE=0x501 -USE_DEFFILE_X64=TRUE - -SLOFILES_X64=$(SLO_X64)$/ooofilt.obj\ - $(SLO_X64)$/propspec.obj\ - $(SLO_X64)$/stream_helper.obj - -SHL1TARGET_X64=$(TARGET) - -SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\ - $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\ - $(SOLARLIBDIR_X64)$/expat_xmltok.lib - -SHL1STDLIBS_X64+=$(OLE32LIB_X64)\ - $(ADVAPI32LIB_X64)\ - $(COMCTL32LIB_X64)\ - $(UUIDLIB_X64)\ - $(USER32LIB_X64) \ - $(SHELL32LIB_X64)\ - $(KERNEL32LIB_X64)\ - $(MSVCPRT_X64) \ - $(MSVCRT_X64) \ - $(OLDNAMESLIB_X64) - -SHL1LIBS_X64+=$(SLB_X64)$/util.lib\ - $(SLB_X64)$/ooofilereader.lib -SHL1OBJS_X64=$(SLOFILES_X64) -SHL1DEF_X64=$(MISC_X64)$/$(SHL1TARGET_X64).def -DEF1NAME_X64=$(SHL1TARGET_X64) -DEF1EXPORTFILE_X64=exports.dxp -.ENDIF # "$(BUILD_X64)"!="" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/prophdl/makefile.mk b/shell/source/win32/shlxthandler/prophdl/makefile.mk deleted file mode 100644 index 8a6813a616fb..000000000000 --- a/shell/source/win32/shlxthandler/prophdl/makefile.mk +++ /dev/null @@ -1,152 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2010 by Sun Microsystems, Inc. -# -# 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=shell -TARGET=propertyhdl -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -NO_DEFAULT_STL=YES -USE_DEFFILE=TRUE -.IF "$(BUILD_X64)"!="" -USE_DEFFILE_X64=TRUE -.ENDIF - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(COM)" == "GCC" -ALL : - @echo This does not build with MinGW -.ENDIF - - -UWINAPILIB = -UWINAPILIB_X64 = - -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -wd4100 -.ENDIF -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/$(TARGET).obj\ - $(SLO)$/stream_helper.obj - -SHL1TARGET=$(TARGET) - -.IF "$(COM)"=="GCC" -SHL1STDLIBS=$(ZLIB3RDLIB) $(MINIZIP3RDLIB) $(EXPAT3RDLIB) $(COMCTL32LIB) -SHL1LIBS= -.ELSE -SHL1STDLIBS= -SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\ - $(SOLARLIBDIR)$/expat_xmlparse.lib\ - $(SOLARLIBDIR)$/expat_xmltok.lib -.ENDIF -SHL1STDLIBS+=\ - $(OLEAUT32LIB)\ - $(ADVAPI32LIB)\ - $(OLE32LIB)\ - $(UUIDLIB)\ - $(SHELL32LIB)\ - $(KERNEL32LIB)\ - $(GDI32LIB)\ - $(GDIPLUSLIB)\ - $(SHLWAPILIB)\ - $(PROPSYSLIB) - -.IF "$(COM)"!="GCC" -SHL1STDLIBS+=\ - msvcprt.lib - -.IF "$(PRODUCT)"!="full" -SHL1STDLIBS+=msvcrt.lib -.ENDIF -.ENDIF - -SHL1LIBS+=$(SLB)$/util.lib\ - $(SLB)$/ooofilereader.lib - -SHL1DEPN= -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -# -------------------- x64 ----------------------- -.IF "$(BUILD_X64)"!="" -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 -.IF "$(COM)" == "MSC" -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS_X64+=-D_WIN32_IE=0x501 -SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj - -SLOFILES_X64= \ - $(SLO_X64)$/propertyhdl.obj\ - $(SLO_X64)$/stream_helper.obj\ - -SHL1TARGET_X64=$(TARGET) -SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\ - $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\ - $(SOLARLIBDIR_X64)$/expat_xmltok.lib - -SHL1STDLIBS_X64+=\ - $(OLEAUT32LIB_X64)\ - $(ADVAPI32LIB_X64)\ - $(OLE32LIB_X64)\ - $(UUIDLIB_X64)\ - $(SHELL32LIB_X64)\ - $(KERNEL32LIB_X64)\ - $(GDI32LIB_X64)\ - $(USER32LIB_X64) \ - $(GDIPLUSLIB_X64) \ - $(MSVCRT_X64) \ - $(MSVCPRT_X64) \ - $(OLDNAMESLIB_X64)\ - $(PROPSYSLIB_X64) - -SHL1LIBS_X64+=$(SLB_X64)$/util.lib\ - $(SLB_X64)$/ooofilereader.lib -SHL1OBJS_X64=$(SLOFILES_X64) -SHL1DEF_X64=$(MISC_X64)$/$(SHL1TARGET).def - -DEF1NAME_X64=$(SHL1TARGET_X64) -DEF1EXPORTFILE_X64=exports.dxp - -.ENDIF # "$(BUILD_X64)"!="" - -# --- Targets ------------------------------------------------------ -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/propsheets/makefile.mk b/shell/source/win32/shlxthandler/propsheets/makefile.mk deleted file mode 100644 index 08adff7bfe3b..000000000000 --- a/shell/source/win32/shlxthandler/propsheets/makefile.mk +++ /dev/null @@ -1,69 +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=shell -TARGET=propsheets -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -CDEFS+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -U_WIN32_IE -D_WIN32_IE=0x501 -.IF "$(COM)"!="GCC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -CDEFS_X64+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -U_WIN32_IE -D_WIN32_IE=0x501 -.ENDIF - -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/propsheets.obj\ - $(SLO)$/listviewbuilder.obj\ - $(SLO)$/document_statistic.obj - -.IF "$(BUILD_X64)"!="" -SLOFILES_X64=$(SLO_X64)$/propsheets.obj\ - $(SLO_X64)$/listviewbuilder.obj\ - $(SLO_X64)$/document_statistic.obj -.ENDIF # "$(BUILD_X64)"!="" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/res/makefile.mk b/shell/source/win32/shlxthandler/res/makefile.mk deleted file mode 100644 index fc2bcbd7f6e0..000000000000 --- a/shell/source/win32/shlxthandler/res/makefile.mk +++ /dev/null @@ -1,74 +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=shell -TARGET=shlxthdl - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -INCPRE+=$(MFC_INCLUDE) - -# --- Files -------------------------------------------------------- - - -RCFILES=$(RES)$/$(TARGET).rc - -ULFFILES=$(TARGET).ulf - -.IF "$(WITH_LANG)"!="" -ULFDIR:=$(COMMONMISC)$/$(TARGET) -.ELSE # "$(WITH_LANG)"!="" -ULFDIR:=. -.ENDIF # "$(WITH_LANG)"!="" - -# --- Targets ------------------------------------------------------ - -.IF "$(BUILD_X64)"!="" -$(RES)$/x64$/$(TARGET).res : $(RES)$/$(TARGET).res - -$(MKDIR) $(RES)$/x64 - @@cp $< $@ -.ENDIF # "$(BUILD_X64)"!="" - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -.INCLUDE : tg_wntx64.mk - - -# Generate the native Windows resource file -# using lngconvex.exe - -$(RCFILES) : $(ULFDIR)$/shlxthdl.ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt -.IF "$(COM)" == "MSC" - $(subst,$(SOLARBINDIR)$/lngconvex,$(BIN)$/lngconvex $(LNGCONVEX)) -ulf $(ULFDIR)$/shlxthdl.ulf -rc $(RES)$/shlxthdl.rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt -.ELSE - $(LNGCONVEX) -ulf $(ULFDIR)$/shlxthdl.ulf -rc $(RES)$/shlxthdl.rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt -.ENDIF diff --git a/shell/source/win32/shlxthandler/res/shlxthdl.rc b/shell/source/win32/shlxthandler/res/shlxthdl.rc new file mode 100644 index 000000000000..324bb2a307ff --- /dev/null +++ b/shell/source/win32/shlxthandler/res/shlxthdl.rc @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Copyright 2012 LibreOffice contributors. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "shlxthdl_impl.rc" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk deleted file mode 100644 index 189c42a31824..000000000000 --- a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk +++ /dev/null @@ -1,64 +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=shell -TARGET=thumbviewer -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+=-DWIN32_LEAN_AND_MEAN -D_NTSDK -DUNICODE -D_UNICODE -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -.IF "$(COM)" == "GCC" -CDEFS+=-DDONT_HAVE_GDIPLUS -.ENDIF - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/$(TARGET).obj - -.IF "$(BUILD_X64)"!="" -# ----------------- x64 ------------------------ -CFLAGS_X64+=-DWIN32_LEAN_AND_MEAN -D_NTSDK -DUNICODE -D_UNICODE -CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj -.ENDIF # "$(BUILD_X64)"!="" - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.INCLUDE : tg_wntx64.mk - diff --git a/shell/source/win32/shlxthandler/util/makefile.mk b/shell/source/win32/shlxthandler/util/makefile.mk deleted file mode 100644 index e2b7a8294319..000000000000 --- a/shell/source/win32/shlxthandler/util/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=shell -TARGET=util -ENABLE_EXCEPTIONS=TRUE - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/fileextensions.obj\ - $(SLO)$/registry.obj\ - $(SLO)$/utilities.obj\ - $(SLO)$/iso8601_converter.obj - -SLOFILES_X64=$(SLO_X64)$/fileextensions.obj\ - $(SLO_X64)$/registry.obj\ - $(SLO_X64)$/utilities.obj\ - $(SLO_X64)$/iso8601_converter.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.INCLUDE : tg_wntx64.mk - diff --git a/shell/source/win32/simplemail/makefile.mk b/shell/source/win32/simplemail/makefile.mk deleted file mode 100644 index b9e66d5e06e5..000000000000 --- a/shell/source/win32/simplemail/makefile.mk +++ /dev/null @@ -1,87 +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=shell -TARGET=smplmail -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST=$(TARGET) - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/smplmailentry.obj\ - $(SLO)$/smplmailmsg.obj\ - $(SLO)$/smplmailclient.obj\ - $(SLO)$/smplmailsuppl.obj\ - $(SLO)$/simplemapi.obj - -SHL1TARGET=$(TARGET).uno - -SHL1STDLIBS=$(CPPULIB)\ - $(CPPUHELPERLIB)\ - $(SALLIB)\ - $(ADVAPI32LIB) - -SHL1IMPLIB=i$(SHL1TARGET) - -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE= exports.dxp - -# --- mapimailer -------------------------------------------------------- - -TARGETTYPE=CUI - -OBJFILES= $(OBJ)$/senddoc.obj\ - $(OBJ)$/simplemapi.obj - -APP1TARGET=senddoc -APP1OBJS=$(OBJFILES) -APP1STDLIBS=$(KERNEL32LIB)\ - $(SALLIB) -APP1RPATH = OOO -APP1DEF=$(MISC)$/$(APP1TARGET).def - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/smplmail.component - -$(MISC)/smplmail.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - smplmail.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt smplmail.component diff --git a/shell/source/win32/simplemail/smplmail.xml b/shell/source/win32/simplemail/smplmail.xml index 8176f094acad..20fe919b9027 100755 --- a/shell/source/win32/simplemail/smplmail.xml +++ b/shell/source/win32/simplemail/smplmail.xml @@ -17,7 +17,11 @@ <type> com.sun.star.system.XSimpleMailClientSupplier </type> <type> com.sun.star.system.XSimpleMailMessage </type> <type> com.sun.star.system.SimpleMailClientFlags </type> + <type> com.sun.star.lang.DisposedException </type> + <type> com.sun.star.lang.EventObject </type> + <type> com.sun.star.lang.XComponent </type> <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> <type> com.sun.star.lang.XSingleServiceFactory </type> <type> com.sun.star.lang.XServiceInfo </type> <type> com.sun.star.lang.XTypeProvider </type> @@ -25,6 +29,7 @@ <type> com.sun.star.uno.TypeClass </type> <type> com.sun.star.uno.XWeak </type> <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.uno.XComponentContext </type> <type> com.sun.star.registry.XRegistryKey </type> <type> com.sun.star.container.XSet </type> </component-description> diff --git a/shell/source/win32/syssh.xml b/shell/source/win32/syssh.xml index 3af4c73dc111..e1b2a40021ed 100755 --- a/shell/source/win32/syssh.xml +++ b/shell/source/win32/syssh.xml @@ -16,6 +16,7 @@ <type> com.sun.star.system.XSystemShellExecute </type> <type> com.sun.star.system.SystemShellExecuteException </type> <type> com.sun.star.system.SystemShellExecuteFlags </type> + <type> com.sun.star.lang.DisposedException </type> <type> com.sun.star.lang.XMultiServiceFactory </type> <type> com.sun.star.lang.XSingleServiceFactory </type> <type> com.sun.star.lang.XSingleComponentFactory </type> @@ -25,9 +26,11 @@ <type> com.sun.star.lang.EventObject </type> <type> com.sun.star.uno.XComponentContext </type> <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.uno.DeploymentException </type> <type> com.sun.star.uno.TypeClass </type> <type> com.sun.star.uno.XWeak </type> <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.uri.UriReferenceFactory </type> <type> com.sun.star.registry.XRegistryKey </type> <type> com.sun.star.container.XSet </type> </component-description> diff --git a/shell/source/win32/zipfile/makefile.mk b/shell/source/win32/zipfile/makefile.mk deleted file mode 100644 index 0e165dd01faa..000000000000 --- a/shell/source/win32/zipfile/makefile.mk +++ /dev/null @@ -1,60 +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=shell -TARGET=zipfile -ENABLE_EXCEPTIONS=TRUE -EXTERNAL_WARNINGS_NOT_ERRORS := TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - -# --- Files -------------------------------------------------------- - - -SLOFILES=$(SLO)$/zipfile.obj\ - $(SLO)$/zipexcptn.obj - -SLOFILES_X64=$(SLO_X64)$/zipfile.obj\ - $(SLO_X64)$/zipexcptn.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -.IF "$(OS)" == "WNT" -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.ENDIF -.INCLUDE : tg_wntx64.mk - |