From f03a5364b4830104316262f70022c30f4204aa20 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 24 Feb 2011 22:06:40 +0100 Subject: CWS gnumake4: convert ucbhelper to new build system --- ucbhelper/Library_ucbhelper.mk | 84 +++++++++ ucbhelper/Makefile | 38 +++++ ucbhelper/Module_ucbhelper.mk | 38 +++++ ucbhelper/Package_inc.mk | 59 +++++++ ucbhelper/inc/makefile.mk | 48 ------ ucbhelper/prj/build.lst | 8 +- ucbhelper/prj/d.lst | 40 ----- ucbhelper/prj/makefile.mk | 40 +++++ ucbhelper/source/client/makefile.mk | 60 ------- ucbhelper/source/provider/configureucb.cxx | 242 -------------------------- ucbhelper/source/provider/makefile.mk | 70 -------- ucbhelper/source/provider/provconf.cxx | 266 ----------------------------- ucbhelper/source/provider/provconf.hxx | 52 ------ ucbhelper/util/makefile.mk | 75 -------- ucbhelper/util/makefile.pmk | 31 ---- ucbhelper/util/ucbhelper.flt | 181 -------------------- ucbhelper/util/ucbhelper.xml | 114 ------------- ucbhelper/version.mk | 42 ----- 18 files changed, 261 insertions(+), 1227 deletions(-) create mode 100644 ucbhelper/Library_ucbhelper.mk create mode 100644 ucbhelper/Makefile create mode 100644 ucbhelper/Module_ucbhelper.mk create mode 100644 ucbhelper/Package_inc.mk delete mode 100644 ucbhelper/inc/makefile.mk create mode 100644 ucbhelper/prj/makefile.mk delete mode 100644 ucbhelper/source/client/makefile.mk delete mode 100644 ucbhelper/source/provider/configureucb.cxx delete mode 100644 ucbhelper/source/provider/makefile.mk delete mode 100644 ucbhelper/source/provider/provconf.cxx delete mode 100644 ucbhelper/source/provider/provconf.hxx delete mode 100644 ucbhelper/util/makefile.mk delete mode 100644 ucbhelper/util/makefile.pmk delete mode 100644 ucbhelper/util/ucbhelper.flt delete mode 100644 ucbhelper/util/ucbhelper.xml delete mode 100644 ucbhelper/version.mk (limited to 'ucbhelper') diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk new file mode 100644 index 000000000000..108c6192b833 --- /dev/null +++ b/ucbhelper/Library_ucbhelper.mk @@ -0,0 +1,84 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,ucbhelper)) + +$(eval $(call gb_Library_add_package_headers,ucbhelper,ucbhelper_inc)) + +$(eval $(call gb_Library_add_precompiled_header,ucbhelper,$(SRCDIR)/ucbhelper/inc/pch/precompiled_ucbhelper)) + +$(eval $(call gb_Library_set_include,ucbhelper,\ + $$(INCLUDE) \ + -I$(SRCDIR)/ucbhelper/inc \ + -I$(SRCDIR)/ucbhelper/inc/pch \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,ucbhelper,\ + $$(DEFS) \ + -DUCBHELPER_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,ucbhelper,\ + stl \ + sal \ + cppu \ + cppuhelper \ + salhelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,ucbhelper,\ + ucbhelper/source/provider/simpleauthenticationrequest \ + ucbhelper/source/provider/simpleioerrorrequest \ + ucbhelper/source/provider/cancelcommandexecution \ + ucbhelper/source/provider/contenthelper \ + ucbhelper/source/provider/propertyvalueset \ + ucbhelper/source/provider/resultset \ + ucbhelper/source/provider/resultsetmetadata \ + ucbhelper/source/provider/simplecertificatevalidationrequest \ + ucbhelper/source/provider/contentidentifier \ + ucbhelper/source/provider/resultsethelper \ + ucbhelper/source/provider/simplenameclashresolverequest \ + ucbhelper/source/provider/simpleinteractionrequest \ + ucbhelper/source/provider/handleinteractionrequest \ + ucbhelper/source/provider/registerucb \ + ucbhelper/source/provider/contentinfo \ + ucbhelper/source/provider/interactionrequest \ + ucbhelper/source/provider/commandenvironmentproxy \ + ucbhelper/source/provider/providerhelper \ + ucbhelper/source/client/proxydecider \ + ucbhelper/source/client/content \ + ucbhelper/source/client/contentbroker \ + ucbhelper/source/client/commandenvironment \ + ucbhelper/source/client/activedatastreamer \ + ucbhelper/source/client/fileidentifierconverter \ + ucbhelper/source/client/interceptedinteraction \ + ucbhelper/source/client/activedatasink \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucbhelper/Makefile b/ucbhelper/Makefile new file mode 100644 index 000000000000..90947b2e5f48 --- /dev/null +++ b/ucbhelper/Makefile @@ -0,0 +1,38 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif + +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk + +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +# vim: set noet sw=4 ts=4: diff --git a/ucbhelper/Module_ucbhelper.mk b/ucbhelper/Module_ucbhelper.mk new file mode 100644 index 000000000000..57a40d0544f2 --- /dev/null +++ b/ucbhelper/Module_ucbhelper.mk @@ -0,0 +1,38 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +# replace ucbhelper by the name of the module you are creating + +$(eval $(call gb_Module_Module,ucbhelper)) + +# the targets to be inserted are their file names without .mk extension +$(eval $(call gb_Module_add_targets,ucbhelper,\ + Library_ucbhelper \ + Package_inc \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucbhelper/Package_inc.mk b/ucbhelper/Package_inc.mk new file mode 100644 index 000000000000..abe56b782046 --- /dev/null +++ b/ucbhelper/Package_inc.mk @@ -0,0 +1,59 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,ucbhelper_inc,$(SRCDIR)/ucbhelper/inc)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contentbroker.hxx,ucbhelper/contentbroker.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simpleauthenticationrequest.hxx,ucbhelper/simpleauthenticationrequest.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/propertyvalueset.hxx,ucbhelper/propertyvalueset.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contentinfo.hxx,ucbhelper/contentinfo.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/resultsetmetadata.hxx,ucbhelper/resultsetmetadata.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contenthelper.hxx,ucbhelper/contenthelper.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/activedatasink.hxx,ucbhelper/activedatasink.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/commandenvironment.hxx,ucbhelper/commandenvironment.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/interceptedinteraction.hxx,ucbhelper/interceptedinteraction.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/resultset.hxx,ucbhelper/resultset.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/ucbhelperdllapi.h,ucbhelper/ucbhelperdllapi.h)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simpleinteractionrequest.hxx,ucbhelper/simpleinteractionrequest.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simpleioerrorrequest.hxx,ucbhelper/simpleioerrorrequest.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/interactionrequest.hxx,ucbhelper/interactionrequest.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/activedatastreamer.hxx,ucbhelper/activedatastreamer.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/content.hxx,ucbhelper/content.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simplecertificatevalidationrequest.hxx,ucbhelper/simplecertificatevalidationrequest.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/proxydecider.hxx,ucbhelper/proxydecider.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/fileidentifierconverter.hxx,ucbhelper/fileidentifierconverter.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/cancelcommandexecution.hxx,ucbhelper/cancelcommandexecution.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/commandenvironmentproxy.hxx,ucbhelper/commandenvironmentproxy.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/registerucb.hxx,ucbhelper/registerucb.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/resultsethelper.hxx,ucbhelper/resultsethelper.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/configurationkeys.hxx,ucbhelper/configurationkeys.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/contentidentifier.hxx,ucbhelper/contentidentifier.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/handleinteractionrequest.hxx,ucbhelper/handleinteractionrequest.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/providerhelper.hxx,ucbhelper/providerhelper.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/simplenameclashresolverequest.hxx,ucbhelper/simplenameclashresolverequest.hxx)) +$(eval $(call gb_Package_add_file,ucbhelper_inc,inc/ucbhelper/macros.hxx,ucbhelper/macros.hxx)) + +# vim: set noet sw=4 ts=4: diff --git a/ucbhelper/inc/makefile.mk b/ucbhelper/inc/makefile.mk deleted file mode 100644 index c49fd40ec0e4..000000000000 --- a/ucbhelper/inc/makefile.mk +++ /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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=ucbhelper -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/ucbhelper/prj/build.lst b/ucbhelper/prj/build.lst index bbd01df9022a..2bc7d164cdff 100644 --- a/ucbhelper/prj/build.lst +++ b/ucbhelper/prj/build.lst @@ -1,7 +1,3 @@ uh ucbhelper : offuh sal cppu cppuhelper salhelper NULL -uh ucbhelper usr1 - all uh_mkout NULL -uh ucbhelper\inc nmake - all uh_inc NULL -uh ucbhelper\source\client nmake - all uh_client uh_inc NULL -uh ucbhelper\source\provider nmake - all uh_provider uh_inc NULL -uh ucbhelper\util nmake - all uh_util uh_client uh_provider NULL -uh ucbhelper\workben\myucp nmake - all uh_wb_myucp uh_util NULL +uh ucbhelper\prj nmake - all uh_prj NULL + diff --git a/ucbhelper/prj/d.lst b/ucbhelper/prj/d.lst index 21a46483789b..e69de29bb2d1 100644 --- a/ucbhelper/prj/d.lst +++ b/ucbhelper/prj/d.lst @@ -1,40 +0,0 @@ -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so -..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib -..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib -..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map -..\%__SRC%\misc\*.sym %_DEST%\bin%_EXT%\*.sym - -..\util\ucbhelper.xml %_DEST%\xml%_EXT%\ucbhelper.xml - -mkdir: %_DEST%\inc%_EXT%\ucbhelper -..\inc\ucbhelper\configurationkeys.hxx %_DEST%\inc%_EXT%\ucbhelper\configurationkeys.hxx -..\inc\ucbhelper\registerucb.hxx %_DEST%\inc%_EXT%\ucbhelper\registerucb.hxx -..\inc\ucbhelper\content.hxx %_DEST%\inc%_EXT%\ucbhelper\content.hxx -..\inc\ucbhelper\contentbroker.hxx %_DEST%\inc%_EXT%\ucbhelper\contentbroker.hxx -..\inc\ucbhelper\commandenvironment.hxx %_DEST%\inc%_EXT%\ucbhelper\commandenvironment.hxx -..\inc\ucbhelper\contentidentifier.hxx %_DEST%\inc%_EXT%\ucbhelper\contentidentifier.hxx -..\inc\ucbhelper\contenthelper.hxx %_DEST%\inc%_EXT%\ucbhelper\contenthelper.hxx -..\inc\ucbhelper\contentidentifier.hxx %_DEST%\inc%_EXT%\ucbhelper\contentidentifier.hxx -..\inc\ucbhelper\contentinfo.hxx %_DEST%\inc%_EXT%\ucbhelper\contentinfo.hxx -..\inc\ucbhelper\fileidentifierconverter.hxx %_DEST%\inc%_EXT%\ucbhelper\fileidentifierconverter.hxx -..\inc\ucbhelper\macros.hxx %_DEST%\inc%_EXT%\ucbhelper\macros.hxx -..\inc\ucbhelper\propertyvalueset.hxx %_DEST%\inc%_EXT%\ucbhelper\propertyvalueset.hxx -..\inc\ucbhelper\providerhelper.hxx %_DEST%\inc%_EXT%\ucbhelper\providerhelper.hxx -..\inc\ucbhelper\resultset.hxx %_DEST%\inc%_EXT%\ucbhelper\resultset.hxx -..\inc\ucbhelper\resultsetmetadata.hxx %_DEST%\inc%_EXT%\ucbhelper\resultsetmetadata.hxx -..\inc\ucbhelper\resultsethelper.hxx %_DEST%\inc%_EXT%\ucbhelper\resultsethelper.hxx -..\inc\ucbhelper\activedatasink.hxx %_DEST%\inc%_EXT%\ucbhelper\activedatasink.hxx -..\inc\ucbhelper\commandenvironmentproxy.hxx %_DEST%\inc%_EXT%\ucbhelper\commandenvironmentproxy.hxx -..\inc\ucbhelper\interactionrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\interactionrequest.hxx -..\inc\ucbhelper\interceptedinteraction.hxx %_DEST%\inc%_EXT%\ucbhelper\interceptedinteraction.hxx -..\inc\ucbhelper\simpleinteractionrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simpleinteractionrequest.hxx -..\inc\ucbhelper\simpleauthenticationrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simpleauthenticationrequest.hxx -..\inc\ucbhelper\simplenameclashresolverequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simplenameclashresolverequest.hxx -..\inc\ucbhelper\simplecertificatevalidationrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simplecertificatevalidationrequest.hxx -..\inc\ucbhelper\simpleioerrorrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simpleioerrorrequest.hxx -..\inc\ucbhelper\cancelcommandexecution.hxx %_DEST%\inc%_EXT%\ucbhelper\cancelcommandexecution.hxx -..\inc\ucbhelper\handleinteractionrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\handleinteractionrequest.hxx -..\inc\ucbhelper\proxydecider.hxx %_DEST%\inc%_EXT%\ucbhelper\proxydecider.hxx -..\version.mk %_DEST%\inc%_EXT%\ucbhelper\version.mk -..\inc\ucbhelper\ucbhelperdllapi.h %_DEST%\inc%_EXT%\ucbhelper\ucbhelperdllapi.h diff --git a/ucbhelper/prj/makefile.mk b/ucbhelper/prj/makefile.mk new file mode 100644 index 000000000000..88cd9dfe08b8 --- /dev/null +++ b/ucbhelper/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/ucbhelper/source/client/makefile.mk b/ucbhelper/source/client/makefile.mk deleted file mode 100644 index b8a535ba429c..000000000000 --- a/ucbhelper/source/client/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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME= ucbhelper -TARGET= client -AUTOSEG= TRUE - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(header)" == "" - -SLOFILES=\ - $(SLO)$/content.obj \ - $(SLO)$/contentbroker.obj \ - $(SLO)$/commandenvironment.obj \ - $(SLO)$/fileidentifierconverter.obj \ - $(SLO)$/activedatasink.obj \ - $(SLO)$/activedatastreamer.obj \ - $(SLO)$/proxydecider.obj \ - $(SLO)$/interceptedinteraction.obj - -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/ucbhelper/source/provider/configureucb.cxx b/ucbhelper/source/provider/configureucb.cxx deleted file mode 100644 index ee881c97ecbf..000000000000 --- a/ucbhelper/source/provider/configureucb.cxx +++ /dev/null @@ -1,242 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucbhelper.hxx" -#include -#include -#include -#include -#include -#include -#include - -#include "osl/diagnose.h" - -#ifndef _UCBHELPER_PROVCONF_HXX_ -#include -#endif -#include - -using namespace com::sun::star; - -namespace { - -bool fillPlaceholders(rtl::OUString const & rInput, - uno::Sequence< uno::Any > const & rReplacements, - rtl::OUString * pOutput) -{ - sal_Unicode const * p = rInput.getStr(); - sal_Unicode const * pEnd = p + rInput.getLength(); - sal_Unicode const * pCopy = p; - rtl::OUStringBuffer aBuffer; - while (p != pEnd) - switch (*p++) - { - case '&': - if (pEnd - p >= 4 - && p[0] == 'a' && p[1] == 'm' && p[2] == 'p' - && p[3] == ';') - { - aBuffer.append(pCopy, p - 1 - pCopy); - aBuffer.append(sal_Unicode('&')); - p += 4; - pCopy = p; - } - else if (pEnd - p >= 3 - && p[0] == 'l' && p[1] == 't' && p[2] == ';') - { - aBuffer.append(pCopy, p - 1 - pCopy); - aBuffer.append(sal_Unicode('<')); - p += 3; - pCopy = p; - } - else if (pEnd - p >= 3 - && p[0] == 'g' && p[1] == 't' && p[2] == ';') - { - aBuffer.append(pCopy, p - 1 - pCopy); - aBuffer.append(sal_Unicode('>')); - p += 3; - pCopy = p; - } - break; - - case '<': - sal_Unicode const * q = p; - while (q != pEnd && *q != '>') - ++q; - if (q == pEnd) - break; - rtl::OUString aKey(p, q - p); - rtl::OUString aValue; - bool bFound = false; - for (sal_Int32 i = 2; i + 1 < rReplacements.getLength(); - i += 2) - { - rtl::OUString aReplaceKey; - if ((rReplacements[i] >>= aReplaceKey) - && aReplaceKey == aKey - && (rReplacements[i + 1] >>= aValue)) - { - bFound = true; - break; - } - } - if (!bFound) - return false; - aBuffer.append(pCopy, p - 1 - pCopy); - aBuffer.append(aValue); - p = q + 1; - pCopy = p; - break; - } - aBuffer.append(pCopy, pEnd - pCopy); - *pOutput = aBuffer.makeStringAndClear(); - return true; -} - -} - -namespace ucbhelper { - -//============================================================================ -// -// configureUcb -// -//============================================================================ - -bool -configureUcb( - uno::Reference< ucb::XContentProviderManager > const & rManager, - uno::Reference< lang::XMultiServiceFactory > const & rServiceFactory, - ContentProviderDataList const & rData, - ContentProviderRegistrationInfoList * pInfos) - throw (uno::RuntimeException) -{ - ContentProviderDataList::const_iterator aEnd(rData.end()); - for (ContentProviderDataList::const_iterator aIt(rData.begin()); - aIt != aEnd; ++aIt) - { - ContentProviderRegistrationInfo aInfo; - bool bSuccess = registerAtUcb(rManager, - rServiceFactory, - aIt->ServiceName, - aIt->Arguments, - aIt->URLTemplate, - &aInfo); - - if (bSuccess && pInfos) - pInfos->push_back(aInfo); - } - - return true; -} - -//============================================================================ -// -// configureUcb -// -//============================================================================ - -bool -configureUcb( - uno::Reference< ucb::XContentProviderManager > const & rManager, - uno::Reference< lang::XMultiServiceFactory > const & rServiceFactory, - uno::Sequence< uno::Any > const & rArguments, - std::vector< ContentProviderRegistrationInfo > * pInfos) - throw (uno::RuntimeException) -{ - rtl::OUString aKey1; - rtl::OUString aKey2; - if (rArguments.getLength() < 2 - || !(rArguments[0] >>= aKey1) || !(rArguments[1] >>= aKey2)) - { - OSL_ENSURE(false, "ucb::configureUcb(): Bad arguments"); - return false; - } - - ContentProviderDataList aData; - if (!getContentProviderData(rServiceFactory, aKey1, aKey2, aData)) - { - OSL_ENSURE(false, "ucb::configureUcb(): No configuration"); - return false; - } - - ContentProviderDataList::const_iterator aEnd(aData.end()); - for (ContentProviderDataList::const_iterator aIt(aData.begin()); - aIt != aEnd; ++aIt) - { - rtl::OUString aProviderArguments; - if (fillPlaceholders(aIt->Arguments, - rArguments, - &aProviderArguments)) - { - ContentProviderRegistrationInfo aInfo; - bool bSuccess = registerAtUcb(rManager, - rServiceFactory, - aIt->ServiceName, - aProviderArguments, - aIt->URLTemplate, - &aInfo); - OSL_ENSURE(bSuccess, "ucb::configureUcb(): Bad content provider"); - - if (bSuccess && pInfos) - pInfos->push_back(aInfo); - } - else - OSL_ENSURE(false, - "ucb::configureUcb(): Bad argument placeholders"); - } - - return true; -} - -} - -//============================================================================ -// -// unconfigureUcb -// -//============================================================================ - -namespace ucbhelper { - -void -unconfigureUcb( - uno::Reference< ucb::XContentProviderManager > const & rManager, - std::vector< ContentProviderRegistrationInfo > const & rInfos) - throw (uno::RuntimeException) -{ - std::vector< ContentProviderRegistrationInfo >::const_iterator - aEnd(rInfos.end()); - for (std::vector< ContentProviderRegistrationInfo >::const_iterator - aIt(rInfos.begin()); - aIt != aEnd; ++aIt) - deregisterFromUcb(rManager, *aIt); -} - -} diff --git a/ucbhelper/source/provider/makefile.mk b/ucbhelper/source/provider/makefile.mk deleted file mode 100644 index 5999192f7bdb..000000000000 --- a/ucbhelper/source/provider/makefile.mk +++ /dev/null @@ -1,70 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME= ucbhelper -TARGET= provider -AUTOSEG= TRUE - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(header)" == "" - -SLOFILES=\ - $(SLO)$/contentidentifier.obj \ - $(SLO)$/providerhelper.obj \ - $(SLO)$/contenthelper.obj \ - $(SLO)$/contentinfo.obj \ - $(SLO)$/propertyvalueset.obj \ - $(SLO)$/registerucb.obj \ - $(SLO)$/resultsetmetadata.obj \ - $(SLO)$/resultset.obj \ - $(SLO)$/resultsethelper.obj \ - $(SLO)$/commandenvironmentproxy.obj \ - $(SLO)$/interactionrequest.obj \ - $(SLO)$/simpleinteractionrequest.obj \ - $(SLO)$/simpleauthenticationrequest.obj \ - $(SLO)$/simplenameclashresolverequest.obj \ - $(SLO)$/simpleioerrorrequest.obj \ - $(SLO)$/cancelcommandexecution.obj \ - $(SLO)$/handleinteractionrequest.obj \ - $(SLO)$/simplecertificatevalidationrequest.obj - -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/ucbhelper/source/provider/provconf.cxx b/ucbhelper/source/provider/provconf.cxx deleted file mode 100644 index df1917b45413..000000000000 --- a/ucbhelper/source/provider/provconf.cxx +++ /dev/null @@ -1,266 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucbhelper.hxx" - -/************************************************************************** - TODO - ************************************************************************** - - *************************************************************************/ - -#ifndef _UCBHELPER_PROVCONF_HXX_ -#include -#endif -#include -#include -#include -#include -#include -#include - -using namespace com::sun::star; - -//========================================================================= - -#define CONFIG_CONTENTPROVIDERS_KEY \ - "/org.openoffice.ucb.Configuration/ContentProviders" - -//========================================================================= - -namespace ucbhelper { - -void makeAndAppendXMLName( - rtl::OUStringBuffer & rBuffer, const rtl::OUString & rIn ) -{ - sal_Int32 nCount = rIn.getLength(); - for ( sal_Int32 n = 0; n < nCount; ++n ) - { - const sal_Unicode c = rIn.getStr()[ n ]; - switch ( c ) - { - case '&': - rBuffer.appendAscii( "&" ); - break; - - case '"': - rBuffer.appendAscii( """ ); - break; - - case '\'': - rBuffer.appendAscii( "'" ); - break; - - case '<': - rBuffer.appendAscii( "<" ); - break; - - case '>': - rBuffer.appendAscii( ">" ); - break; - - default: - rBuffer.append( c ); - break; - } - } -} - -//========================================================================= -bool getContentProviderData( - const uno::Reference< lang::XMultiServiceFactory > & rServiceMgr, - const rtl::OUString & rKey1, - const rtl::OUString & rKey2, - ContentProviderDataList & rListToFill ) -{ - if ( !rServiceMgr.is() || !rKey1.getLength() || !rKey2.getLength() ) - { - OSL_ENSURE( false, - "getContentProviderData - Invalid argument!" ); - return false; - } - - try - { - uno::Reference< lang::XMultiServiceFactory > xConfigProv( - rServiceMgr->createInstance( - rtl::OUString::createFromAscii( - "com.sun.star.configuration.ConfigurationProvider" ) ), - uno::UNO_QUERY ); - - if ( !xConfigProv.is() ) - { - OSL_ENSURE( false, - "getContentProviderData - No config provider!" ); - return false; - } - - rtl::OUStringBuffer aFullPath; - aFullPath.appendAscii( CONFIG_CONTENTPROVIDERS_KEY "/['" ); - makeAndAppendXMLName( aFullPath, rKey1 ); - aFullPath.appendAscii( "']/SecondaryKeys/['" ); - makeAndAppendXMLName( aFullPath, rKey2 ); - aFullPath.appendAscii( "']/ProviderData" ); - - uno::Sequence< uno::Any > aArguments( 1 ); - beans::PropertyValue aProperty; - aProperty.Name - = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ); - aProperty.Value <<= aFullPath.makeStringAndClear(); - aArguments[ 0 ] <<= aProperty; - - uno::Reference< uno::XInterface > xInterface( - xConfigProv->createInstanceWithArguments( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationAccess" ) ), - aArguments ) ); - - if ( !xInterface.is() ) - { - OSL_ENSURE( false, - "getContentProviderData - No config access!" ); - return false; - } - - uno::Reference< container::XNameAccess > xNameAccess( - xInterface, uno::UNO_QUERY ); - - if ( !xNameAccess.is() ) - { - OSL_ENSURE( false, - "getContentProviderData - No XNameAccess!" ); - return false; - } - - uno::Sequence< rtl::OUString > aElems = xNameAccess->getElementNames(); - const rtl::OUString* pElems = aElems.getConstArray(); - sal_Int32 nCount = aElems.getLength(); - - if ( nCount > 0 ) - { - uno::Reference< container::XHierarchicalNameAccess > - xHierNameAccess( xInterface, uno::UNO_QUERY ); - - if ( !xHierNameAccess.is() ) - { - OSL_ENSURE( false, - "getContentProviderData - " - "No XHierarchicalNameAccess!" ); - return false; - } - - // Iterate over children. - for ( sal_Int32 n = 0; n < nCount; ++n ) - { - rtl::OUStringBuffer aElemBuffer; - aElemBuffer.appendAscii( "['" ); - makeAndAppendXMLName( aElemBuffer, pElems[ n ] ); - - try - { - ContentProviderData aInfo; - - // Obtain service name. - rtl::OUStringBuffer aKeyBuffer = aElemBuffer; - aKeyBuffer.appendAscii( "']/ServiceName" ); - - rtl::OUString aValue; - if ( !( xHierNameAccess->getByHierarchicalName( - aKeyBuffer.makeStringAndClear() ) >>= aValue ) ) - { - OSL_ENSURE( false, - "getContentProviderData - " - "Error getting item value!" ); - continue; - } - - aInfo.ServiceName = aValue; - - // Obtain URL Template. - aKeyBuffer = aElemBuffer; - aKeyBuffer.appendAscii( "']/URLTemplate" ); - - if ( !( xHierNameAccess->getByHierarchicalName( - aKeyBuffer.makeStringAndClear() ) >>= aValue ) ) - { - OSL_ENSURE( false, - "getContentProviderData - " - "Error getting item value!" ); - continue; - } - - aInfo.URLTemplate = aValue; - - // Obtain Arguments. - aKeyBuffer = aElemBuffer; - aKeyBuffer.appendAscii( "']/Arguments" ); - - if ( !( xHierNameAccess->getByHierarchicalName( - aKeyBuffer.makeStringAndClear() ) >>= aValue ) ) - { - OSL_ENSURE( false, - "getContentProviderData - " - "Error getting item value!" ); - continue; - } - - aInfo.Arguments = aValue; - - // Append info to list. - rListToFill.push_back( aInfo ); - } - catch ( container::NoSuchElementException& ) - { - // getByHierarchicalName - - OSL_ENSURE( false, - "getContentProviderData - " - "caught NoSuchElementException!" ); - } - } - } - } - catch ( uno::RuntimeException& ) - { - OSL_ENSURE( false, - "getContentProviderData - caught RuntimeException!" ); - return false; - } - catch ( uno::Exception& ) - { - // createInstance, createInstanceWithArguments - - OSL_ENSURE( false, - "getContentProviderData - caught Exception!" ); - return false; - } - - return true; -} - -} diff --git a/ucbhelper/source/provider/provconf.hxx b/ucbhelper/source/provider/provconf.hxx deleted file mode 100644 index 66d6a63d47b8..000000000000 --- a/ucbhelper/source/provider/provconf.hxx +++ /dev/null @@ -1,52 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _UCBHELPER_PROVCONF_HXX_ -#define _UCBHELPER_PROFCONF_HXX_ - -#include -#include -#include - -namespace com { namespace sun { namespace star { namespace lang { - class XMultiServiceFactory; -} } } } - -//========================================================================= - -namespace ucbhelper { - -bool getContentProviderData( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > - & rServiceMgr, - const rtl::OUString & rKey1, - const rtl::OUString & rKey2, - ContentProviderDataList & rListToFill ); - -} - -#endif /* !_UCBHELPER_PROVCONF_HXX_ */ diff --git a/ucbhelper/util/makefile.mk b/ucbhelper/util/makefile.mk deleted file mode 100644 index b7a195ab0bea..000000000000 --- a/ucbhelper/util/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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME= ucbhelper -TARGET= ucbhelper - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : ..$/version.mk - -# --- Files -------------------------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET).lib -LIB1FILES= $(SLB)$/client.lib \ - $(SLB)$/provider.lib - -SHL1TARGET= $(TARGET)$(UCBHELPER_MAJOR)$(COMID) -.IF "$(GUI)" == "OS2" -SHL1TARGET= ucbh$(UCBHELPER_MAJOR) -.ENDIF -SHL1STDLIBS = \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALHELPERLIB) \ - $(SALLIB) - -SHL1DEPN= -SHL1IMPLIB= i$(TARGET) -SHL1USE_EXPORTS=name -SHL1LIBS= $(LIB1TARGET) -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) -DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt -DEFLIB1NAME= $(TARGET) -DEF1DES= Universal Content Broker - Helpers - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -# --- Filter ----------------------------------------------------------- - -$(MISC)$/$(SHL1TARGET).flt : ucbhelper.flt - @echo ------------------------------ - @echo Making: $@ - @$(TYPE) ucbhelper.flt > $@ - diff --git a/ucbhelper/util/makefile.pmk b/ucbhelper/util/makefile.pmk deleted file mode 100644 index fdb7754a69b9..000000000000 --- a/ucbhelper/util/makefile.pmk +++ /dev/null @@ -1,31 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# define UCBHELPER_DLLIMPLEMENTATION (see @ ucbhelperdllapi.h) -CDEFS += -DUCBHELPER_DLLIMPLEMENTATION - -VISIBILITY_HIDDEN=TRUE diff --git a/ucbhelper/util/ucbhelper.flt b/ucbhelper/util/ucbhelper.flt deleted file mode 100644 index a36cd4f87e65..000000000000 --- a/ucbhelper/util/ucbhelper.flt +++ /dev/null @@ -1,181 +0,0 @@ -_Impl -_impl -IMP -Dbg -DLL -getCppuType -cpp_queryInterface -cpp_acquire -cpp_release -_aType -unnamed -__CT -??_5 -??_7 -??_8 -??_9 -??_C -??_E -??_F -??_G -??_H -??_I -.cxx -??_R0?AV -??3@YAXPAX0@Z -?_M_allocate_and_copy@?$vector@ -?_M_insert_overflow@?$vector@ -?_M_fill_insert@?$vector@ -?_M_create_node@?$list@ -?_M_list@?$_Stl_prime@_N@_STL@@ -?__lower_bound@_STL@@ -?__uninitialized_copy_aux@_STL@@ -?__uninitialized_fill_n_aux@_STL@@ -??1?$_Vector_base@ -??0?$_Vector_base@ -??1?$_STL_alloc_proxy@ -??0?$_STL_alloc_proxy@ -??1?$allocator@ -??1?$pair@ -??0?$pair@ -??1?$vector@ -??1?$hash_map@ -??A?$hash_map@ -?get_allocator@ -?copy@_STL@@ -??1?$map@ -?erase@?$map@ -?make_pair@_STL@@ -??0?$_List_iterator@ -?__copy@_STL@@ -?__copy_backward@_STL@@ -?end@?$list@ -?insert@?$list@ -?deallocate@?$allocator@ -??0?$_Rb_tree_iterator@ -??1?$_Rb_tree_base@ -?_M_create_node@?$_Rb_tree@ -?_M_decrement@?$_Rb_global@ -?_M_empty_initialize@?$_Rb_tree@ -?_M_erase@?$_Rb_tree@ -?_Rebalance@?$_Rb_global@ -?_Rebalance_for_erase@?$_Rb_global@ -?destroy_node@?$_Rb_tree@ -?erase@?$_Rb_tree@ -?find@?$_Rb_tree@ -?insert_unique@?$_Rb_tree@ -?reserve@?$vector@ -??1?$Guard@VMutex@osl@@@osl@@ -??1?$ClearableGuard@VMutex@osl@@@osl@@ -??1Mutex@osl@@ -??1OUString@rtl@@ -??0OUString@rtl@@ -??8@YAEABVOUString@rtl@@ -?createFromAscii@OUString@rtl@@ -?copy@OUString@rtl@@ -?replaceAt@OUString@rtl@@ -?compareTo@OUString@rtl@@ -?toAsciiLowerCase@OUString@rtl@@ -??1OUStringBuffer@rtl@@ -?makeStringAndClear@OUStringBuffer@rtl@@ -?appendAscii@OUStringBuffer@rtl@@ -??1?$ORef@ -?s_pType@?$Sequence@ -??0?$Reference@ -??1?$Reference@ -??C?$Reference@ -?__query@?$Reference@ -?set@?$Reference@ -??0?$Sequence@ -??1?$Sequence@ -??A?$Sequence@V?$Reference@ -??1OTypeCollection@cppu@@ -?getTypes@OTypeCollection@cppu@@ -?queryInterface@cppu@@ -??0OWeakObject@cppu@@ -??3OWeakObject@cppu@@ -?makeAny@uno@star@sun@com@@ -??0Any@uno@star@sun@com@@ -??1Any@uno@star@sun@com@@ -??4Any@uno@star@sun@com@@ -??0Type@uno@star@sun@com@@ -??0Exception@uno@star@sun@com@@ -??1Exception@uno@star@sun@com@@ -??0RuntimeException@uno@star@sun@com@@ -??1RuntimeException@uno@star@sun@com@@ -??8BaseReference@uno@star@sun@com@@ -??1?$WeakImplHelper1@ -?acquire@?$WeakImplHelper1@ -?release@?$WeakImplHelper1@ -?getImplementationId@?$WeakImplHelper1@ -?getTypes@?$WeakImplHelper1@ -?queryInterface@?$WeakImplHelper1@ -?s_cd@?$WeakImplHelper1@ -??0OpenCommandArgument@ucb@star@sun@com@@ -??1Command@ucb@star@sun@com@@ -??1CommandInfo@ucb@star@sun@com@@ -??1ContentInfo@ucb@star@sun@com@@ -??1InsertCommandArgument@ucb@star@sun@com@@ -??1OpenCommandArgument2@ucb@star@sun@com@@ -??1OpenCommandArgument@ucb@star@sun@com@@ -??0EventObject@lang@star@sun@com@@ -??1EventObject@lang@star@sun@com@@ -??0IllegalArgumentException@lang@star@sun@com@@ -??1IllegalArgumentException@lang@star@sun@com@@ -??0IllegalTypeException@beans@star@sun@com@@ -??1IllegalTypeException@beans@star@sun@com@@ -??0NoSupportException@lang@star@sun@com@@ -??1NoSupportException@lang@star@sun@com@@ -??0NotRemoveableException@beans@star@sun@com@@ -??1NotRemoveableException@beans@star@sun@com@@ -??0PropertyExistException@beans@star@sun@com@@ -??1PropertyExistException@beans@star@sun@com@@ -??0UnknownPropertyException@beans@star@sun@com@@ -??1UnknownPropertyException@beans@star@sun@com@@ -??0UnsupportedCommandException@ucb@star@sun@com@@ -??1UnsupportedCommandException@ucb@star@sun@com@@ -??0ListenerAlreadySetException@ucb@star@sun@com@@ -??1ListenerAlreadySetException@ucb@star@sun@com@@ -??0ContentCreationException@ucb@star@sun@com@@ -??1ContentCreationException@ucb@star@sun@com@@ -??0ServiceNotFoundException@ucb@star@sun@com@@ -??1ServiceNotFoundException@ucb@star@sun@com@@ -??0SQLException@sdbc@star@sun@com@@ -??1SQLException@sdbc@star@sun@com@@ -??1InteractiveAugmentedIOException@ucb@star@sun@com@@ -??0CommandFailedException@ucb@star@sun@com@@ -??1CommandFailedException@ucb@star@sun@com@@ -??1ContentEvent@ucb@star@sun@com@@ -??1Property@beans@star@sun@com@@ -??0Property@beans@star@sun@com@@ -??1PropertyValue@beans@star@sun@com@@ -??1PropertySetInfoChangeEvent@beans@star@sun@com@@ -??1PropertyChangeEvent@beans@star@sun@com@@ -??4PropertyChangeEvent@beans@star@sun@com@@ -??1ListEvent@ucb@star@sun@com@@ -??1GlobalTransferCommandArgument@ucb@star@sun@com@@ -?m_pTheBroker@ContentBroker@ucb@@ -?getArray@?$Sequence@UPropertyChangeEvent@beans@star@sun@com@@ -??0Date@util@star@sun@com@@ -??0Time@util@star@sun@com@@ -??0DateTime@util@star@sun@com@@ -??0ClassifiedInteractionRequest@task@star@sun@com@@ -??1AuthenticationRequest@ucb@star@sun@com@@ -??1NameClashResolveRequest@ucb@star@sun@com@@ -_TI2?AVIllegalArgumentException@lang@star@sun@com@@ -_TI2?AVIllegalTypeException@beans@star@sun@com@@ -_TI2?AVNoSupportException@lang@star@sun@com@@ -_TI2?AVNotRemoveableException@beans@star@sun@com@@ -_TI2?AVPropertyExistException@beans@star@sun@com@@ -_TI2?AVUnknownPropertyException@beans@star@sun@com@@ -_TI2?AVUnsupportedCommandException@ucb@star@sun@com@@ -_TI2?AVSQLException@sdbc@star@sun@com@@ -_TI2?AVContentCreationException@ucb@star@sun@com@@ -_TI2?AVListenerAlreadySetException@ucb@star@sun@com@@ -_TI2?AVServiceNotFoundException@ucb@star@sun@com@@ -_TI2?AVCommandFailedException@ucb@star@sun@com@@ -_TI2?AVRuntimeException@uno@star@sun@com@@ -_real@4@00000000000000000000 -_real@8@00000000000000000000 -?makeAndAppendXMLName@ucb@@ -?CreateType@ diff --git a/ucbhelper/util/ucbhelper.xml b/ucbhelper/util/ucbhelper.xml deleted file mode 100644 index 8e13b5f7bc0c..000000000000 --- a/ucbhelper/util/ucbhelper.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - ucbhelper - - sal - salhelper - cppu - cppuhelper - - sal3 - salhelper3$(COM) - cppu3 - cppuhelper3$(COM) - - - com.sun.star.configuration.ConfigurationAccess - - - com.sun.star.configuration.ConfigurationProvider - - - com.sun.star.script.Converter - - - com.sun.star.ucb.CachedDynamicResultSetStubFactory - - - com.sun.star.ucb.ContentProviderProxyFactory - - - com.sun.star.ucb.PropertiesManager - - - com.sun.star.ucb.Store - - - com.sun.star.ucb.UniversalContentBroker - - - com.sun.star.beans.PropertyAttribute - com.sun.star.beans.PropertySetInfoChange - com.sun.star.beans.PropertyValue - com.sun.star.beans.XPropertiesChangeNotifier - com.sun.star.beans.XPropertyAccess - com.sun.star.beans.XPropertyContainer - com.sun.star.beans.XPropertySetInfo - com.sun.star.beans.XPropertySetInfoChangeNotifier - com.sun.star.container.XChild - com.sun.star.container.XHierarchicalNameAccess - com.sun.star.container.XNameAccess - com.sun.star.container.XNamed - com.sun.star.io.XActiveDataSink - com.sun.star.lang.XMultiServiceFactory - com.sun.star.lang.XSingleServiceFactory - com.sun.star.lang.XServiceInfo - com.sun.star.lang.XTypeProvider - com.sun.star.registry.XRegistryKey - com.sun.star.script.XTypeConverter - com.sun.star.sdbc.ColumnValue - com.sun.star.sdbc.DataType - com.sun.star.sdbc.XCloseable - com.sun.star.sdbc.XColumnLocate - com.sun.star.sdbc.XResultSetMetaData - com.sun.star.sdbc.XResultSetMetaDataSupplier - com.sun.star.sdbc.XRow - com.sun.star.task.XInteractionAbort - com.sun.star.task.XInteractionApprove - com.sun.star.task.XInteractionDisapprove - com.sun.star.task.XInteractionHandler - com.sun.star.task.XInteractionRequest - com.sun.star.task.XInteractionRetry - com.sun.star.ucb.AuthenticationRequest - com.sun.star.ucb.CommandFailedException - com.sun.star.ucb.CommandInfoChange - com.sun.star.ucb.ContentAction - com.sun.star.ucb.ContentCreationError - com.sun.star.ucb.ContentCreationException - com.sun.star.ucb.GlobalTransferCommandArgument - com.sun.star.ucb.InsertCommandArgument - com.sun.star.ucb.InteractiveAugmentedIOException - com.sun.star.ucb.InteractiveIOException - com.sun.star.ucb.ListActionType - com.sun.star.ucb.NameClash - com.sun.star.ucb.NameClashResolveRequest - com.sun.star.ucb.OpenCommandArgument2 - com.sun.star.ucb.OpenMode - com.sun.star.ucb.ResultSetException - com.sun.star.ucb.WelcomeDynamicResultSetStruct - com.sun.star.ucb.XCachedDynamicResultSetStubFactory - com.sun.star.ucb.XCommandEnvironment - com.sun.star.ucb.XCommandInfo - com.sun.star.ucb.XCommandInfoChangeNotifier - com.sun.star.ucb.XCommandProcessor - com.sun.star.ucb.XContentAccess - com.sun.star.ucb.XContentCreator - com.sun.star.ucb.XContentIdentifierFactory - com.sun.star.ucb.XContentProvider - com.sun.star.ucb.XContentProviderFactory - com.sun.star.ucb.XContentProviderManager - com.sun.star.ucb.XDynamicResultSet - com.sun.star.ucb.XFileIdentifierConverter - com.sun.star.ucb.XInteractionReplaceExistingData - com.sun.star.ucb.XInteractionSupplyAuthentication - com.sun.star.ucb.XInteractionSupplyName - com.sun.star.ucb.XParameterizedContentProvider - com.sun.star.ucb.XPropertySetRegistryFactory - com.sun.star.ucb.XSourceInitialization - com.sun.star.uno.RuntimeException - com.sun.star.uno.XWeak - com.sun.star.util.XChangesListener - com.sun.star.util.XChangesNotifier - diff --git a/ucbhelper/version.mk b/ucbhelper/version.mk deleted file mode 100644 index 49f6f0fa67ad..000000000000 --- a/ucbhelper/version.mk +++ /dev/null @@ -1,42 +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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -UCBHELPER_TARGET=ucbhelper - -# the major -UCBHELPER_MAJOR=4 -# the minor -UCBHELPER_MINOR=0 -# the micro -UCBHELPER_MICRO=0 - -# this is a c++ compatible library -UCBHELPER_CPP=1 - -UCBHELPER=$(UCBHELPER_TARGET)_$(CMPEXT) - -LIBUCBHELPER_UNX=lib$(UCBHELPER).a.$(UCBHELPER_MAJOR) -LIBUCBHELPER_WIN=$(UCBHELPER_TARGET)$(UCBHELPER_MAJOR)$(CMPEXT).dll -- cgit v1.2.3