diff options
| author | Damjan Jovanovic <damjan@apache.org> | 2017-01-03 18:01:55 +0000 |
|---|---|---|
| committer | Damjan Jovanovic <damjan@apache.org> | 2017-01-03 18:01:55 +0000 |
| commit | 51e663482c94e93dab048ea122896c5215c31a0e (patch) | |
| tree | eddd0aea403377d5265df2bc92c4b9f28bbf8548 /ucb | |
| parent | ce830a45c56aa2db5f3e556af7ffc7145611c748 (diff) | |
Port main/ucb to gbuild.
Use real version detection from the library instead of from the header
files for apr, apr-util, and serf.
Add apr, apr-util, and serf to main/RepositoryExternal.mk where they belong.
For GNOMEVFS and GIO, use the CFLAGS and LIBS detected by ./configure
instead of trying to rediscover them like the dmake makefiles did.
Patch by: me
Notes
Notes:
ignore: obsolete
Diffstat (limited to 'ucb')
171 files changed, 3203 insertions, 1451 deletions
diff --git a/ucb/inc/makefile.mk b/ucb/JunitTest_ucb_complex.mk index 774e1b4ff5e5..1056f9b305f0 100644 --- a/ucb/inc/makefile.mk +++ b/ucb/JunitTest_ucb_complex.mk @@ -20,25 +20,23 @@ #************************************************************** -PRJ=.. -PRJNAME=ucb -TARGET=inc +$(eval $(call gb_JunitTest_JunitTest,ucb_complex,SRCDIR)) -# --- Settings ----------------------------------------------------- +$(eval $(call gb_JunitTest_add_jars,ucb_complex,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) -.INCLUDE : settings.mk +$(eval $(call gb_JunitTest_add_sourcefiles,ucb_complex,\ + ucb/qa/complex/ucb/UCB \ +)) -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- +$(eval $(call gb_JunitTest_add_classes,ucb_complex,\ + complex.ucb.UCB \ +)) -.INCLUDE : target.mk -.IF "$(L10N_framework)"=="" - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" -.ENDIF # L10N_framework +# vim: set noet sw=4 ts=4: diff --git a/ucb/qa/complex/ucb/makefile.mk b/ucb/JunitTest_ucb_unoapi.mk index f546bf713a0d..9895bea0b5de 100644 --- a/ucb/qa/complex/ucb/makefile.mk +++ b/ucb/JunitTest_ucb_unoapi.mk @@ -21,38 +21,26 @@ -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../../.. -PRJNAME = UCB -TARGET = qa_complex_ucb - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = complex/ucb -JAVATESTFILES = \ - UCB.java - -JAVAFILES = $(JAVATESTFILES) - -JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar jurt.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) - -# Sample how to debug -# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END - +$(eval $(call gb_JunitTest_JunitTest,ucb_unoapi,SRCDIR)) +$(eval $(call gb_JunitTest_set_defs,ucb_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/ucb/qa/unoapi/ucb.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/ucb/qa/unoapi/knownissues.xcl \ +)) +$(eval $(call gb_JunitTest_add_jars,ucb_unoapi,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ +)) +$(eval $(call gb_JunitTest_add_sourcefiles,ucb_unoapi,\ + ucb/qa/unoapi/Test \ +)) +$(eval $(call gb_JunitTest_add_classes,ucb_unoapi,\ + org.openoffice.ucb.qa.unoapi.Test \ +)) +# vim: set noet sw=4 ts=4: diff --git a/ucb/Library_cached1.mk b/ucb/Library_cached1.mk new file mode 100644 index 000000000000..36106c79ac46 --- /dev/null +++ b/ucb/Library_cached1.mk @@ -0,0 +1,60 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Library_Library,cached1)) + +$(eval $(call gb_Library_add_precompiled_header,cached1,$(SRCDIR)/ucb/inc/pch/precompiled_cacher)) + +$(eval $(call gb_Library_set_componentfile,cached1,ucb/source/cacher/cached1)) + +$(eval $(call gb_Library_set_include,cached1,\ + $$(INCLUDE) \ + -I$(SRCDIR)/ucb/inc/pch \ + -I$(SRCDIR)/ucb/source/inc \ +)) + +$(eval $(call gb_Library_add_api,cached1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,cached1,\ + cppuhelper \ + cppu \ + sal \ + stl \ + $(gb_STDLIBS) \ +)) + + +$(eval $(call gb_Library_add_exception_objects,cached1,\ + ucb/source/cacher/contentresultsetwrapper \ + ucb/source/cacher/cachedcontentresultsetstub \ + ucb/source/cacher/cachedcontentresultset \ + ucb/source/cacher/dynamicresultsetwrapper \ + ucb/source/cacher/cacheddynamicresultsetstub \ + ucb/source/cacher/cacheddynamicresultset \ + ucb/source/cacher/cacheserv \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk new file mode 100644 index 000000000000..68430bbd5bb5 --- /dev/null +++ b/ucb/Library_srtrs1.mk @@ -0,0 +1,56 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Library_Library,srtrs1)) + +$(eval $(call gb_Library_add_precompiled_header,srtrs1,$(SRCDIR)/ucb/inc/pch/precompiled_sorter)) + +$(eval $(call gb_Library_set_componentfile,srtrs1,ucb/source/sorter/srtrs1)) + +$(eval $(call gb_Library_set_include,srtrs1,\ + $$(INCLUDE) \ + -I$(SRCDIR)/ucb/inc/pch \ + -I$(SRCDIR)/ucb/source/inc \ +)) + +$(eval $(call gb_Library_add_api,srtrs1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,srtrs1,\ + cppuhelper \ + cppu \ + sal \ + stl \ + $(gb_STDLIBS) \ +)) + + +$(eval $(call gb_Library_add_exception_objects,srtrs1,\ + ucb/source/sorter/sortdynres \ + ucb/source/sorter/sortresult \ + ucb/source/sorter/sortmain \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk new file mode 100644 index 000000000000..b19ba2046942 --- /dev/null +++ b/ucb/Library_ucb1.mk @@ -0,0 +1,63 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Library_Library,ucb1)) + +$(eval $(call gb_Library_add_precompiled_header,ucb1,$(SRCDIR)/ucb/inc/pch/precompiled_ucb)) + +$(eval $(call gb_Library_set_componentfile,ucb1,ucb/source/core/ucb1)) + +$(eval $(call gb_Library_set_include,ucb1,\ + $$(INCLUDE) \ + -I$(SRCDIR)/ucb/inc/pch \ + -I$(SRCDIR)/ucb/source/inc \ +)) + +$(eval $(call gb_Library_add_api,ucb1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,ucb1,\ + cppuhelper \ + cppu \ + sal \ + stl \ + ucbhelper \ + $(gb_STDLIBS) \ +)) + + +$(eval $(call gb_Library_add_exception_objects,ucb1,\ + ucb/source/regexp/regexp \ + ucb/source/core/identify \ + ucb/source/core/ucb \ + ucb/source/core/ucbserv \ + ucb/source/core/ucbstore \ + ucb/source/core/ucbprops \ + ucb/source/core/provprox \ + ucb/source/core/ucbcmds \ + ucb/source/core/cmdenv \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucb/Library_ucpdav1.mk b/ucb/Library_ucpdav1.mk new file mode 100644 index 000000000000..1e074b7e2858 --- /dev/null +++ b/ucb/Library_ucpdav1.mk @@ -0,0 +1,112 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Library_Library,ucpdav1)) + +$(eval $(call gb_Library_add_precompiled_header,ucpdav1,$(SRCDIR)/ucb/inc/pch/precompiled_webdav)) + +$(eval $(call gb_Library_set_componentfile,ucpdav1,ucb/source/ucp/webdav/ucpdav1)) + +$(eval $(call gb_Library_set_include,ucpdav1,\ + $$(INCLUDE) \ + -I$(SRCDIR)/ucb/inc/pch \ + -I$(SRCDIR)/ucb/source/inc \ +)) + +$(eval $(call gb_Library_add_api,ucpdav1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,ucpdav1,\ + comphelper \ + cppuhelper \ + cppu \ + sal \ + salhelper \ + stl \ + tl \ + ucbhelper \ + $(gb_STDLIBS) \ +)) + +ifeq ($(GUI),WNT) +$(eval $(call gb_Library_add_linked_libs,ucpdav1,wsock32)) +ifneq ($(WINDOWS_VISTA_PSDK),) +$(eval $(call gb_Library_add_linked_libs,ucpdav1,ws2_32)) +endif +endif + +ifeq ($(OS),SOLARIS) +$(eval $(call gb_Library_add_linked_libs,ucpdav1,\ + dl \ + nsl \ + socket \ +)) +endif + +$(call gb_Library_use_external,ucpdav1,apr) +$(call gb_Library_use_external,ucpdav1,apr_util) +$(call gb_Library_use_external,ucpdav1,libxml2) +$(call gb_Library_use_external,ucpdav1,openssl) +$(call gb_Library_use_external,ucpdav1,serf) + +$(eval $(call gb_Library_add_exception_objects,ucpdav1,\ + ucb/source/ucp/webdav/webdavservices \ + ucb/source/ucp/webdav/webdavprovider \ + ucb/source/ucp/webdav/webdavcontent \ + ucb/source/ucp/webdav/webdavcontentcaps \ + ucb/source/ucp/webdav/webdavresultset \ + ucb/source/ucp/webdav/webdavdatasupplier \ + ucb/source/ucp/webdav/ContentProperties \ + ucb/source/ucp/webdav/DAVProperties \ + ucb/source/ucp/webdav/DAVSessionFactory \ + ucb/source/ucp/webdav/DAVResourceAccess \ + ucb/source/ucp/webdav/AprEnv \ + ucb/source/ucp/webdav/webdavresponseparser \ + ucb/source/ucp/webdav/SerfUri \ + ucb/source/ucp/webdav/SerfRequestProcessor \ + ucb/source/ucp/webdav/SerfRequestProcessorImpl \ + ucb/source/ucp/webdav/SerfRequestProcessorImplFac \ + ucb/source/ucp/webdav/SerfPropFindReqProcImpl \ + ucb/source/ucp/webdav/SerfPropPatchReqProcImpl \ + ucb/source/ucp/webdav/SerfGetReqProcImpl \ + ucb/source/ucp/webdav/SerfHeadReqProcImpl \ + ucb/source/ucp/webdav/SerfPutReqProcImpl \ + ucb/source/ucp/webdav/SerfPostReqProcImpl \ + ucb/source/ucp/webdav/SerfDeleteReqProcImpl \ + ucb/source/ucp/webdav/SerfMkColReqProcImpl \ + ucb/source/ucp/webdav/SerfCopyReqProcImpl \ + ucb/source/ucp/webdav/SerfMoveReqProcImpl \ + ucb/source/ucp/webdav/SerfLockReqProcImpl \ + ucb/source/ucp/webdav/SerfLockRefreshProcImpl \ + ucb/source/ucp/webdav/SerfUnlockProcImpl \ + ucb/source/ucp/webdav/SerfLockStore \ + ucb/source/ucp/webdav/SerfSession \ + ucb/source/ucp/webdav/SerfCallbacks \ + ucb/source/ucp/webdav/SerfInputStream \ + ucb/source/ucp/webdav/DateTimeHelper \ + ucb/source/ucp/webdav/UCBDeadPropertyValue \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucb/Library_ucpexpand1.mk b/ucb/Library_ucpexpand1.mk new file mode 100644 index 000000000000..27bc698ea068 --- /dev/null +++ b/ucb/Library_ucpexpand1.mk @@ -0,0 +1,54 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Library_Library,ucpexpand1)) + +$(eval $(call gb_Library_add_precompiled_header,ucpexpand1,$(SRCDIR)/ucb/inc/pch/precompiled_ftp)) + +$(eval $(call gb_Library_set_componentfile,ucpexpand1,ucb/source/ucp/expand/ucpexpand1)) + +$(eval $(call gb_Library_set_include,ucpexpand1,\ + $$(INCLUDE) \ + -I$(SRCDIR)/ucb/inc/pch \ + -I$(SRCDIR)/ucb/source/inc \ +)) + +$(eval $(call gb_Library_add_api,ucpexpand1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,ucpexpand1,\ + cppuhelper \ + cppu \ + sal \ + stl \ + ucbhelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,ucpexpand1,\ + ucb/source/ucp/expand/ucpexpand \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk new file mode 100644 index 000000000000..e2c7c22d9f05 --- /dev/null +++ b/ucb/Library_ucpext.mk @@ -0,0 +1,60 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Library_Library,ucpext)) + +$(eval $(call gb_Library_add_precompiled_header,ucpext,$(SRCDIR)/ucb/inc/pch/precompiled_ext)) + +$(eval $(call gb_Library_set_componentfile,ucpext,ucb/source/ucp/ext/ucpext)) + +$(eval $(call gb_Library_set_include,ucpext,\ + $$(INCLUDE) \ + -I$(SRCDIR)/ucb/inc/pch \ + -I$(SRCDIR)/ucb/source/inc \ +)) + +$(eval $(call gb_Library_add_api,ucpext,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,ucpext,\ + comphelper \ + cppuhelper \ + cppu \ + sal \ + salhelper \ + stl \ + ucbhelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,ucpext,\ + ucb/source/ucp/ext/ucpext_provider \ + ucb/source/ucp/ext/ucpext_content \ + ucb/source/ucp/ext/ucpext_services \ + ucb/source/ucp/ext/ucpext_resultset \ + ucb/source/ucp/ext/ucpext_datasupplier \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucb/Library_ucpfile1.mk b/ucb/Library_ucpfile1.mk new file mode 100644 index 000000000000..4a45673177f2 --- /dev/null +++ b/ucb/Library_ucpfile1.mk @@ -0,0 +1,68 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Library_Library,ucpfile1)) + +$(eval $(call gb_Library_add_precompiled_header,ucpfile1,$(SRCDIR)/ucb/inc/pch/precompiled_file)) + +$(eval $(call gb_Library_set_componentfile,ucpfile1,ucb/source/ucp/file/ucpfile1)) + +$(eval $(call gb_Library_set_include,ucpfile1,\ + $$(INCLUDE) \ + -I$(SRCDIR)/ucb/inc/pch \ + -I$(SRCDIR)/ucb/source/inc \ +)) + +$(eval $(call gb_Library_add_api,ucpfile1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,ucpfile1,\ + cppuhelper \ + cppu \ + sal \ + stl \ + ucbhelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,ucpfile1,\ + ucb/source/ucp/file/prov \ + ucb/source/ucp/file/bc \ + ucb/source/ucp/file/shell \ + ucb/source/ucp/file/filtask \ + ucb/source/ucp/file/filrow \ + ucb/source/ucp/file/filrset \ + ucb/source/ucp/file/filid \ + ucb/source/ucp/file/filnot \ + ucb/source/ucp/file/filprp \ + ucb/source/ucp/file/filinpstr \ + ucb/source/ucp/file/filstr \ + ucb/source/ucp/file/filcmd \ + ucb/source/ucp/file/filglob \ + ucb/source/ucp/file/filinsreq \ + ucb/source/ucp/file/filrec \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucb/Library_ucpftp1.mk b/ucb/Library_ucpftp1.mk new file mode 100644 index 000000000000..03ff1df714b8 --- /dev/null +++ b/ucb/Library_ucpftp1.mk @@ -0,0 +1,76 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Library_Library,ucpftp1)) + +$(eval $(call gb_Library_add_precompiled_header,ucpftp1,$(SRCDIR)/ucb/inc/pch/precompiled_ftp)) + +$(eval $(call gb_Library_set_componentfile,ucpftp1,ucb/source/ucp/ftp/ucpftp1)) + +$(eval $(call gb_Library_set_include,ucpftp1,\ + $$(INCLUDE) \ + -I$(SRCDIR)/ucb/inc/pch \ + -I$(SRCDIR)/ucb/source/inc \ + $(filter -I%,$(CURL_CFLAGS)) \ +)) + +$(eval $(call gb_Library_add_cflags,ucpftp1,\ + $(filter-out -I%,$(CURL_CFLAGS)) \ +)) + +$(eval $(call gb_Library_add_api,ucpftp1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,ucpftp1,\ + cppuhelper \ + cppu \ + sal \ + stl \ + ucbhelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_libs,ucpftp1,\ + $(CURL_LIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,ucpftp1,\ + ucb/source/ucp/ftp/ftpservices \ + ucb/source/ucp/ftp/ftpcontentprovider \ + ucb/source/ucp/ftp/ftpcontent \ + ucb/source/ucp/ftp/ftpcontentidentifier \ + ucb/source/ucp/ftp/ftpcontentcaps \ + ucb/source/ucp/ftp/ftpdynresultset \ + ucb/source/ucp/ftp/ftpresultsetbase \ + ucb/source/ucp/ftp/ftpresultsetI \ + ucb/source/ucp/ftp/ftploaderthread \ + ucb/source/ucp/ftp/ftpinpstr \ + ucb/source/ucp/ftp/ftpdirp \ + ucb/source/ucp/ftp/ftpcfunc \ + ucb/source/ucp/ftp/ftpurl \ + ucb/source/ucp/ftp/ftpintreq \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucb/Library_ucpgio1.mk b/ucb/Library_ucpgio1.mk new file mode 100644 index 000000000000..a046a2ac9962 --- /dev/null +++ b/ucb/Library_ucpgio1.mk @@ -0,0 +1,69 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Library_Library,ucpgio1)) + +$(eval $(call gb_Library_set_componentfile,ucpgio1,ucb/source/ucp/gio/ucpgio)) + +$(eval $(call gb_Library_set_include,ucpgio1,\ + $$(INCLUDE) \ + -I$(SRCDIR)/ucb/inc/pch \ + -I$(SRCDIR)/ucb/source/inc \ + $(filter -I%,$(GIO_CFLAGS)) \ +)) + +$(eval $(call gb_Library_add_cflags,ucpgio1,\ + $(filter-out -I%,$(GIO_CFLAGS)) \ +)) + +$(eval $(call gb_Library_add_api,ucpgio1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,ucpgio1,\ + cppuhelper \ + cppu \ + sal \ + salhelper \ + stl \ + ucbhelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_libs,ucpgio1,\ + $(GIO_LIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,ucpgio1,\ + ucp/source/ucp/gio/gio_provider \ + ucp/source/ucp/gio/gio_content \ + ucp/source/ucp/gio/gio_resultset \ + ucp/source/ucp/gio/gio_datasupplier \ + ucp/source/ucp/gio/gio_seekable \ + ucp/source/ucp/gio/gio_inputstream \ + ucp/source/ucp/gio/gio_outputstream \ + ucp/source/ucp/gio/gio_mount \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucb/source/sorter/makefile.mk b/ucb/Library_ucpgvfs1.mk index 9c164b480ea1..ea11bcad9542 100644 --- a/ucb/source/sorter/makefile.mk +++ b/ucb/Library_ucpgvfs1.mk @@ -21,47 +21,45 @@ -PRJ=..$/.. -PRJNAME=ucb -TARGET=srtrs -ENABLE_EXCEPTIONS=TRUE +$(eval $(call gb_Library_Library,ucpgvfs1)) -# Version -UCB_MAJOR=1 +$(eval $(call gb_Library_set_componentfile,ucpgvfs1,ucb/source/ucp/gvfs/ucpgvfs)) -.INCLUDE: settings.mk -.IF "$(L10N_framework)"=="" +$(eval $(call gb_Library_set_include,ucpgvfs1,\ + $$(INCLUDE) \ + -I$(SRCDIR)/ucb/inc/pch \ + -I$(SRCDIR)/ucb/source/inc \ + $(filter -I%,$(GNOMEVFS_CFLAGS)) \ +)) -SLOFILES=\ - $(SLO)$/sortdynres.obj \ - $(SLO)$/sortresult.obj \ - $(SLO)$/sortmain.obj +$(eval $(call gb_Library_add_cflags,ucpgvfs1,\ + $(filter-out -I%,$(GNOMEVFS_CFLAGS)) \ +)) -LIB1TARGET=$(SLB)$/_$(TARGET).lib -LIB1OBJFILES=$(SLOFILES) +$(eval $(call gb_Library_add_api,ucpgvfs1,\ + offapi \ + udkapi \ +)) -SHL1TARGET=$(TARGET)$(UCB_MAJOR) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1STDLIBS=\ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) +$(eval $(call gb_Library_add_linked_libs,ucpgvfs1,\ + cppuhelper \ + cppu \ + sal \ + salhelper \ + stl \ + ucbhelper \ + $(gb_STDLIBS) \ +)) -SHL1LIBS=$(LIB1TARGET) -SHL1IMPLIB=i$(TARGET) +$(eval $(call gb_Library_add_libs,ucpgvfs1,\ + $(GNOMEVFS_LIBS) \ +)) -SHL1VERSIONMAP=$(SOLARENV)/src/component.map +$(eval $(call gb_Library_add_exception_objects,ucpgvfs1,\ + ucb/source/ucp/gvfs/gvfs_content \ + ucb/source/ucp/gvfs/gvfs_directory \ + ucb/source/ucp/gvfs/gvfs_stream \ + ucb/source/ucp/gvfs/gvfs_provider \ +)) -DEF1NAME=$(SHL1TARGET) -.ENDIF # L10N_framework - -.INCLUDE: target.mk - - -ALLTAR : $(MISC)/srtrs1.component - -$(MISC)/srtrs1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - srtrs1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt srtrs1.component +# vim: set noet sw=4 ts=4: diff --git a/ucb/Library_ucphier1.mk b/ucb/Library_ucphier1.mk new file mode 100644 index 000000000000..9a0a971e785b --- /dev/null +++ b/ucb/Library_ucphier1.mk @@ -0,0 +1,63 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Library_Library,ucphier1)) + +$(eval $(call gb_Library_add_precompiled_header,ucphier1,$(SRCDIR)/ucb/inc/pch/precompiled_hier)) + +$(eval $(call gb_Library_set_componentfile,ucphier1,ucb/source/ucp/hierarchy/ucphier1)) + +$(eval $(call gb_Library_set_include,ucphier1,\ + $$(INCLUDE) \ + -I$(SRCDIR)/ucb/inc/pch \ + -I$(SRCDIR)/ucb/source/inc \ +)) + +$(eval $(call gb_Library_add_api,ucphier1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,ucphier1,\ + cppuhelper \ + cppu \ + sal \ + salhelper \ + stl \ + ucbhelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,ucphier1,\ + ucb/source/ucp/hierarchy/hierarchyservices \ + ucb/source/ucp/hierarchy/hierarchydata \ + ucb/source/ucp/hierarchy/hierarchyprovider \ + ucb/source/ucp/hierarchy/hierarchycontent \ + ucb/source/ucp/hierarchy/hierarchycontentcaps \ + ucb/source/ucp/hierarchy/hierarchydatasupplier \ + ucb/source/ucp/hierarchy/dynamicresultset \ + ucb/source/ucp/hierarchy/hierarchydatasource \ + ucb/source/ucp/hierarchy/hierarchyuri \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucb/Library_ucppkg1.mk b/ucb/Library_ucppkg1.mk new file mode 100644 index 000000000000..7e45cf3e1152 --- /dev/null +++ b/ucb/Library_ucppkg1.mk @@ -0,0 +1,62 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Library_Library,ucppkg1)) + +$(eval $(call gb_Library_add_precompiled_header,ucppkg1,$(SRCDIR)/ucb/inc/pch/precompiled_pkg)) + +$(eval $(call gb_Library_set_componentfile,ucppkg1,ucb/source/ucp/package/ucppkg1)) + +$(eval $(call gb_Library_set_include,ucppkg1,\ + $$(INCLUDE) \ + -I$(SRCDIR)/ucb/inc/pch \ + -I$(SRCDIR)/ucb/source/inc \ +)) + +$(eval $(call gb_Library_add_api,ucppkg1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,ucppkg1,\ + comphelper \ + cppuhelper \ + cppu \ + sal \ + salhelper \ + stl \ + ucbhelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,ucppkg1,\ + ucb/source/ucp/package/pkgservices \ + ucb/source/ucp/package/pkguri \ + ucb/source/ucp/package/pkgprovider \ + ucb/source/ucp/package/pkgcontent \ + ucb/source/ucp/package/pkgcontentcaps \ + ucb/source/ucp/package/pkgresultset \ + ucb/source/ucp/package/pkgdatasupplier \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucb/Library_ucptdoc1.mk b/ucb/Library_ucptdoc1.mk new file mode 100644 index 000000000000..e3db525cec16 --- /dev/null +++ b/ucb/Library_ucptdoc1.mk @@ -0,0 +1,67 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Library_Library,ucptdoc1)) + +$(eval $(call gb_Library_add_precompiled_header,ucptdoc1,$(SRCDIR)/ucb/inc/pch/precompiled_tdoc)) + +$(eval $(call gb_Library_set_componentfile,ucptdoc1,ucb/source/ucp/tdoc/ucptdoc1)) + +$(eval $(call gb_Library_set_include,ucptdoc1,\ + $$(INCLUDE) \ + -I$(SRCDIR)/ucb/inc/pch \ + -I$(SRCDIR)/ucb/source/inc \ +)) + +$(eval $(call gb_Library_add_api,ucptdoc1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,ucptdoc1,\ + comphelper \ + cppuhelper \ + cppu \ + sal \ + salhelper \ + stl \ + ucbhelper \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,ucptdoc1,\ + ucb/source/ucp/tdoc/tdoc_provider \ + ucb/source/ucp/tdoc/tdoc_services \ + ucb/source/ucp/tdoc/tdoc_uri \ + ucb/source/ucp/tdoc/tdoc_content \ + ucb/source/ucp/tdoc/tdoc_contentcaps \ + ucb/source/ucp/tdoc/tdoc_storage \ + ucb/source/ucp/tdoc/tdoc_docmgr \ + ucb/source/ucp/tdoc/tdoc_datasupplier \ + ucb/source/ucp/tdoc/tdoc_resultset \ + ucb/source/ucp/tdoc/tdoc_documentcontentfactory \ + ucb/source/ucp/tdoc/tdoc_passwordrequest \ + ucb/source/ucp/tdoc/tdoc_stgelems \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/ucb/source/regexp/makefile.mk b/ucb/Makefile index 941d1d2df496..c1d144cbd4c9 100644 --- a/ucb/source/regexp/makefile.mk +++ b/ucb/Makefile @@ -19,19 +19,14 @@ # #************************************************************** +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -PRJ=..$/.. -PRJNAME=ucb -TARGET=regexp -AUTOSEG=true -ENABLE_EXCEPTIONS=true +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" - -SLOFILES=\ - $(SLO)$/regexp.obj -.ENDIF # L10N_framework - -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/ucb/Module_ucb.mk b/ucb/Module_ucb.mk new file mode 100644 index 000000000000..5d7652e8ac49 --- /dev/null +++ b/ucb/Module_ucb.mk @@ -0,0 +1,60 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +#************************************************************** + + + +$(eval $(call gb_Module_Module,ucb)) + +$(eval $(call gb_Module_add_targets,ucb,\ + Library_cached1 \ + Library_srtrs1 \ + Library_ucb1 \ + Library_ucpdav1 \ + Library_ucpexpand1 \ + Library_ucpext \ + Library_ucpfile1 \ + Library_ucpftp1 \ + Library_ucphier1 \ + Library_ucppkg1 \ + Library_ucptdoc1 \ + Package_xml \ +)) + +ifeq ($(ENABLE_GNOMEVFS),TRUE) +$(eval $(call gb_Module_add_targets,ucb,\ + Library_ucpgvfs1 \ +)) +endif + +ifeq ($(ENABLE_GIO),TRUE) +$(eval $(call gb_Module_add_targets,ucb,\ + Library_ucpgio1 \ +)) +endif + +ifneq ($(OOO_JUNIT_JAR),) +$(eval $(call gb_Module_add_subsequentcheck_targets,ucb,\ + JunitTest_ucb_complex \ + JunitTest_ucb_unoapi \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/ucb/Package_xml.mk b/ucb/Package_xml.mk new file mode 100644 index 000000000000..cf51ca538985 --- /dev/null +++ b/ucb/Package_xml.mk @@ -0,0 +1,36 @@ +############################################################### +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +############################################################### + + + +$(eval $(call gb_Package_Package,ucb_xml,$(SRCDIR)/ucb/source)) + +$(eval $(call gb_Package_add_file,ucb_xml,xml/cached.xml,cacher/cached.xml)) +$(eval $(call gb_Package_add_file,ucb_xml,xml/srtrs.xml,sorter/srtrs.xml)) +$(eval $(call gb_Package_add_file,ucb_xml,xml/ucb.xml,core/ucb.xml)) +$(eval $(call gb_Package_add_file,ucb_xml,xml/ucpfile.xml,ucp/file/ucpfile.xml)) +$(eval $(call gb_Package_add_file,ucb_xml,xml/ucpftp.xml,ucp/ftp/ucpftp.xml)) +$(eval $(call gb_Package_add_file,ucb_xml,xml/ucpgio.xml,ucp/gio/ucpgio.xml)) +$(eval $(call gb_Package_add_file,ucb_xml,xml/ucpgvfs.xml,ucp/gvfs/ucpgvfs.xml)) +$(eval $(call gb_Package_add_file,ucb_xml,xml/ucphier.xml,ucp/hierarchy/ucphier.xml)) +$(eval $(call gb_Package_add_file,ucb_xml,xml/ucppkg.xml,ucp/package/ucppkg.xml)) +$(eval $(call gb_Package_add_file,ucb_xml,xml/ucptdoc.xml,ucp/tdoc/ucptdoc.xml)) +$(eval $(call gb_Package_add_file,ucb_xml,xml/ucpdav.xml,ucp/webdav/ucpdav.xml)) diff --git a/ucb/inc/pch/precompiled_cacher.cxx b/ucb/inc/pch/precompiled_cacher.cxx new file mode 100644 index 000000000000..117df3b33971 --- /dev/null +++ b/ucb/inc/pch/precompiled_cacher.cxx @@ -0,0 +1,25 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +#include "precompiled_cacher.hxx" + diff --git a/ucb/inc/pch/precompiled_cacher.hxx b/ucb/inc/pch/precompiled_cacher.hxx new file mode 100644 index 000000000000..b552e1197e05 --- /dev/null +++ b/ucb/inc/pch/precompiled_cacher.hxx @@ -0,0 +1,180 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:16.045215 + +#ifdef PRECOMPILED_HEADERS +//---MARKER--- +#include "sal/types.h" + +#include "com/sun/star/beans/IllegalTypeException.hpp" +#include "com/sun/star/beans/Property.hpp" +#include "com/sun/star/beans/PropertyAttribute.hpp" +#include "com/sun/star/beans/PropertyChangeEvent.hpp" +#include "com/sun/star/beans/PropertySetInfoChange.hpp" +#include "com/sun/star/beans/PropertySetInfoChangeEvent.hpp" +#include "com/sun/star/beans/PropertyState.hpp" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/beans/UnknownPropertyException.hpp" +#include "com/sun/star/beans/XPropertiesChangeListener.hpp" +#include "com/sun/star/beans/XPropertiesChangeNotifier.hpp" +#include "com/sun/star/beans/XPropertyAccess.hpp" +#include "com/sun/star/beans/XPropertyChangeListener.hpp" +#include "com/sun/star/beans/XPropertyContainer.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/beans/XPropertySetInfo.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeListener.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeNotifier.hpp" +#include "com/sun/star/bridge/XUnoUrlResolver.hpp" +#include "com/sun/star/container/XChild.hpp" +#include "com/sun/star/container/XEnumeration.hpp" +#include "com/sun/star/container/XEnumerationAccess.hpp" +#include "com/sun/star/container/XHierarchicalNameAccess.hpp" +#include "com/sun/star/container/XNameAccess.hpp" +#include "com/sun/star/container/XNameContainer.hpp" +#include "com/sun/star/container/XNameReplace.hpp" +#include "com/sun/star/container/XNamed.hpp" +#include "com/sun/star/document/XEventBroadcaster.hpp" +#include "com/sun/star/document/XEventListener.hpp" +#include "com/sun/star/document/XStorageBasedDocument.hpp" +#include "com/sun/star/embed/ElementModes.hpp" +#include "com/sun/star/embed/XStorage.hpp" +#include "com/sun/star/embed/XTransactedObject.hpp" +#include "com/sun/star/frame/XModel.hpp" +#include "com/sun/star/frame/XModuleManager.hpp" +#include "com/sun/star/frame/XStorable.hpp" +#include "com/sun/star/io/IOException.hpp" +#include "com/sun/star/io/XActiveDataSink.hpp" +#include "com/sun/star/io/XActiveDataStreamer.hpp" +#include "com/sun/star/io/XAsyncOutputMonitor.hpp" +#include "com/sun/star/io/XInputStream.hpp" +#include "com/sun/star/io/XOutputStream.hpp" +#include "com/sun/star/io/XSeekable.hpp" +#include "com/sun/star/io/XStream.hpp" +#include "com/sun/star/io/XTruncate.hpp" +#include "com/sun/star/lang/DisposedException.hpp" +#include "com/sun/star/lang/IllegalAccessException.hpp" +#include "com/sun/star/lang/IllegalArgumentException.hpp" +#include "com/sun/star/lang/XComponent.hpp" +#include "com/sun/star/lang/XInitialization.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/lang/XServiceInfo.hpp" +#include "com/sun/star/lang/XSingleServiceFactory.hpp" +#include "com/sun/star/lang/XTypeProvider.hpp" +#include "com/sun/star/packages/WrongPasswordException.hpp" +#include "com/sun/star/reflection/XProxyFactory.hpp" +#include "com/sun/star/registry/XRegistryKey.hpp" +#include "com/sun/star/script/XTypeConverter.hpp" +#include "com/sun/star/sdbc/DataType.hpp" +#include "com/sun/star/sdbc/FetchDirection.hpp" +#include "com/sun/star/sdbc/ResultSetType.hpp" +#include "com/sun/star/sdbc/XCloseable.hpp" +#include "com/sun/star/sdbc/XResultSet.hpp" +#include "com/sun/star/sdbc/XResultSetMetaData.hpp" +#include "com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp" +#include "com/sun/star/sdbc/XRow.hpp" +#include "com/sun/star/task/DocumentPasswordRequest.hpp" +#include "com/sun/star/task/NoMasterException.hpp" +#include "com/sun/star/task/PasswordRequestMode.hpp" +#include "com/sun/star/task/XInteractionAbort.hpp" +#include "com/sun/star/task/XInteractionApprove.hpp" +#include "com/sun/star/task/XInteractionDisapprove.hpp" +#include "com/sun/star/task/XInteractionHandler.hpp" +#include "com/sun/star/task/XInteractionPassword.hpp" +#include "com/sun/star/task/XInteractionRequest.hpp" +#include "com/sun/star/task/XPasswordContainer.hpp" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/Exception.hpp" +#include "com/sun/star/uno/Reference.h" +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/Type.hxx" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/uno/XInterface.hpp" +#include "com/sun/star/uno/XReference.hpp" +#include "com/sun/star/uno/XWeak.hpp" +#include "com/sun/star/util/Date.hpp" +#include "com/sun/star/util/DateTime.hpp" +#include "com/sun/star/util/Time.hpp" +#include "com/sun/star/util/XChangesBatch.hpp" +#include "com/sun/star/util/XChangesNotifier.hpp" +#include "com/sun/star/util/XMacroExpander.hpp" +#include "com/sun/star/util/XOfficeInstallationDirectories.hpp" + +#include "comphelper/processfactory.hxx" + +#include "cppuhelper/bootstrap.hxx" +#include "cppuhelper/compbase2.hxx" +#include "cppuhelper/exc_hlp.hxx" +#include "cppuhelper/factory.hxx" +#include "cppuhelper/implbase1.hxx" +#include "cppuhelper/implbase2.hxx" +#include "cppuhelper/implbase5.hxx" +#include "cppuhelper/implementationentry.hxx" +#include "cppuhelper/interfacecontainer.h" +#include "cppuhelper/interfacecontainer.hxx" +#include "cppuhelper/queryinterface.hxx" +#include "cppuhelper/typeprovider.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakref.hxx" + +#include "libxml/parser.h" + +#include "osl/conditn.hxx" +#include "osl/diagnose.h" +#include "osl/doublecheckedlocking.h" +#include "osl/file.hxx" +#include "osl/interlck.h" +#include "osl/module.h" +#include "osl/mutex.hxx" +#include "osl/process.h" +#include "osl/security.hxx" +#include "osl/socket.h" +#include "osl/socket.hxx" +#include "osl/thread.h" +#include "osl/time.h" + +#include "rtl/alloc.h" +#include "rtl/memory.h" +#include "rtl/string.hxx" +#include "rtl/ustrbuf.hxx" +#include "rtl/ustring.h" +#include "rtl/ustring.hxx" + +#include "salhelper/simplereferenceobject.hxx" + +#include "sys/types.h" + +#include "ucbhelper/configurationkeys.hxx" +#include "ucbhelper/macros.hxx" +#include "ucbhelper/proxydecider.hxx" + +#include "vos/diagnose.hxx" +#include "vos/mutex.hxx" +#include "vos/process.hxx" +#include "vos/ref.hxx" +#include "vos/refernce.hxx" +//---MARKER--- + +#endif diff --git a/ucb/inc/pch/precompiled_expand.cxx b/ucb/inc/pch/precompiled_expand.cxx new file mode 100644 index 000000000000..4a4ba6a0f81b --- /dev/null +++ b/ucb/inc/pch/precompiled_expand.cxx @@ -0,0 +1,25 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +#include "precompiled_expand.hxx" + diff --git a/ucb/inc/pch/precompiled_expand.hxx b/ucb/inc/pch/precompiled_expand.hxx new file mode 100644 index 000000000000..b552e1197e05 --- /dev/null +++ b/ucb/inc/pch/precompiled_expand.hxx @@ -0,0 +1,180 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:16.045215 + +#ifdef PRECOMPILED_HEADERS +//---MARKER--- +#include "sal/types.h" + +#include "com/sun/star/beans/IllegalTypeException.hpp" +#include "com/sun/star/beans/Property.hpp" +#include "com/sun/star/beans/PropertyAttribute.hpp" +#include "com/sun/star/beans/PropertyChangeEvent.hpp" +#include "com/sun/star/beans/PropertySetInfoChange.hpp" +#include "com/sun/star/beans/PropertySetInfoChangeEvent.hpp" +#include "com/sun/star/beans/PropertyState.hpp" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/beans/UnknownPropertyException.hpp" +#include "com/sun/star/beans/XPropertiesChangeListener.hpp" +#include "com/sun/star/beans/XPropertiesChangeNotifier.hpp" +#include "com/sun/star/beans/XPropertyAccess.hpp" +#include "com/sun/star/beans/XPropertyChangeListener.hpp" +#include "com/sun/star/beans/XPropertyContainer.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/beans/XPropertySetInfo.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeListener.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeNotifier.hpp" +#include "com/sun/star/bridge/XUnoUrlResolver.hpp" +#include "com/sun/star/container/XChild.hpp" +#include "com/sun/star/container/XEnumeration.hpp" +#include "com/sun/star/container/XEnumerationAccess.hpp" +#include "com/sun/star/container/XHierarchicalNameAccess.hpp" +#include "com/sun/star/container/XNameAccess.hpp" +#include "com/sun/star/container/XNameContainer.hpp" +#include "com/sun/star/container/XNameReplace.hpp" +#include "com/sun/star/container/XNamed.hpp" +#include "com/sun/star/document/XEventBroadcaster.hpp" +#include "com/sun/star/document/XEventListener.hpp" +#include "com/sun/star/document/XStorageBasedDocument.hpp" +#include "com/sun/star/embed/ElementModes.hpp" +#include "com/sun/star/embed/XStorage.hpp" +#include "com/sun/star/embed/XTransactedObject.hpp" +#include "com/sun/star/frame/XModel.hpp" +#include "com/sun/star/frame/XModuleManager.hpp" +#include "com/sun/star/frame/XStorable.hpp" +#include "com/sun/star/io/IOException.hpp" +#include "com/sun/star/io/XActiveDataSink.hpp" +#include "com/sun/star/io/XActiveDataStreamer.hpp" +#include "com/sun/star/io/XAsyncOutputMonitor.hpp" +#include "com/sun/star/io/XInputStream.hpp" +#include "com/sun/star/io/XOutputStream.hpp" +#include "com/sun/star/io/XSeekable.hpp" +#include "com/sun/star/io/XStream.hpp" +#include "com/sun/star/io/XTruncate.hpp" +#include "com/sun/star/lang/DisposedException.hpp" +#include "com/sun/star/lang/IllegalAccessException.hpp" +#include "com/sun/star/lang/IllegalArgumentException.hpp" +#include "com/sun/star/lang/XComponent.hpp" +#include "com/sun/star/lang/XInitialization.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/lang/XServiceInfo.hpp" +#include "com/sun/star/lang/XSingleServiceFactory.hpp" +#include "com/sun/star/lang/XTypeProvider.hpp" +#include "com/sun/star/packages/WrongPasswordException.hpp" +#include "com/sun/star/reflection/XProxyFactory.hpp" +#include "com/sun/star/registry/XRegistryKey.hpp" +#include "com/sun/star/script/XTypeConverter.hpp" +#include "com/sun/star/sdbc/DataType.hpp" +#include "com/sun/star/sdbc/FetchDirection.hpp" +#include "com/sun/star/sdbc/ResultSetType.hpp" +#include "com/sun/star/sdbc/XCloseable.hpp" +#include "com/sun/star/sdbc/XResultSet.hpp" +#include "com/sun/star/sdbc/XResultSetMetaData.hpp" +#include "com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp" +#include "com/sun/star/sdbc/XRow.hpp" +#include "com/sun/star/task/DocumentPasswordRequest.hpp" +#include "com/sun/star/task/NoMasterException.hpp" +#include "com/sun/star/task/PasswordRequestMode.hpp" +#include "com/sun/star/task/XInteractionAbort.hpp" +#include "com/sun/star/task/XInteractionApprove.hpp" +#include "com/sun/star/task/XInteractionDisapprove.hpp" +#include "com/sun/star/task/XInteractionHandler.hpp" +#include "com/sun/star/task/XInteractionPassword.hpp" +#include "com/sun/star/task/XInteractionRequest.hpp" +#include "com/sun/star/task/XPasswordContainer.hpp" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/Exception.hpp" +#include "com/sun/star/uno/Reference.h" +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/Type.hxx" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/uno/XInterface.hpp" +#include "com/sun/star/uno/XReference.hpp" +#include "com/sun/star/uno/XWeak.hpp" +#include "com/sun/star/util/Date.hpp" +#include "com/sun/star/util/DateTime.hpp" +#include "com/sun/star/util/Time.hpp" +#include "com/sun/star/util/XChangesBatch.hpp" +#include "com/sun/star/util/XChangesNotifier.hpp" +#include "com/sun/star/util/XMacroExpander.hpp" +#include "com/sun/star/util/XOfficeInstallationDirectories.hpp" + +#include "comphelper/processfactory.hxx" + +#include "cppuhelper/bootstrap.hxx" +#include "cppuhelper/compbase2.hxx" +#include "cppuhelper/exc_hlp.hxx" +#include "cppuhelper/factory.hxx" +#include "cppuhelper/implbase1.hxx" +#include "cppuhelper/implbase2.hxx" +#include "cppuhelper/implbase5.hxx" +#include "cppuhelper/implementationentry.hxx" +#include "cppuhelper/interfacecontainer.h" +#include "cppuhelper/interfacecontainer.hxx" +#include "cppuhelper/queryinterface.hxx" +#include "cppuhelper/typeprovider.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakref.hxx" + +#include "libxml/parser.h" + +#include "osl/conditn.hxx" +#include "osl/diagnose.h" +#include "osl/doublecheckedlocking.h" +#include "osl/file.hxx" +#include "osl/interlck.h" +#include "osl/module.h" +#include "osl/mutex.hxx" +#include "osl/process.h" +#include "osl/security.hxx" +#include "osl/socket.h" +#include "osl/socket.hxx" +#include "osl/thread.h" +#include "osl/time.h" + +#include "rtl/alloc.h" +#include "rtl/memory.h" +#include "rtl/string.hxx" +#include "rtl/ustrbuf.hxx" +#include "rtl/ustring.h" +#include "rtl/ustring.hxx" + +#include "salhelper/simplereferenceobject.hxx" + +#include "sys/types.h" + +#include "ucbhelper/configurationkeys.hxx" +#include "ucbhelper/macros.hxx" +#include "ucbhelper/proxydecider.hxx" + +#include "vos/diagnose.hxx" +#include "vos/mutex.hxx" +#include "vos/process.hxx" +#include "vos/ref.hxx" +#include "vos/refernce.hxx" +//---MARKER--- + +#endif diff --git a/ucb/inc/pch/precompiled_ext.cxx b/ucb/inc/pch/precompiled_ext.cxx new file mode 100644 index 000000000000..73f66e3494e4 --- /dev/null +++ b/ucb/inc/pch/precompiled_ext.cxx @@ -0,0 +1,25 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +#include "precompiled_ext.hxx" + diff --git a/ucb/inc/pch/precompiled_ext.hxx b/ucb/inc/pch/precompiled_ext.hxx new file mode 100644 index 000000000000..b552e1197e05 --- /dev/null +++ b/ucb/inc/pch/precompiled_ext.hxx @@ -0,0 +1,180 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:16.045215 + +#ifdef PRECOMPILED_HEADERS +//---MARKER--- +#include "sal/types.h" + +#include "com/sun/star/beans/IllegalTypeException.hpp" +#include "com/sun/star/beans/Property.hpp" +#include "com/sun/star/beans/PropertyAttribute.hpp" +#include "com/sun/star/beans/PropertyChangeEvent.hpp" +#include "com/sun/star/beans/PropertySetInfoChange.hpp" +#include "com/sun/star/beans/PropertySetInfoChangeEvent.hpp" +#include "com/sun/star/beans/PropertyState.hpp" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/beans/UnknownPropertyException.hpp" +#include "com/sun/star/beans/XPropertiesChangeListener.hpp" +#include "com/sun/star/beans/XPropertiesChangeNotifier.hpp" +#include "com/sun/star/beans/XPropertyAccess.hpp" +#include "com/sun/star/beans/XPropertyChangeListener.hpp" +#include "com/sun/star/beans/XPropertyContainer.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/beans/XPropertySetInfo.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeListener.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeNotifier.hpp" +#include "com/sun/star/bridge/XUnoUrlResolver.hpp" +#include "com/sun/star/container/XChild.hpp" +#include "com/sun/star/container/XEnumeration.hpp" +#include "com/sun/star/container/XEnumerationAccess.hpp" +#include "com/sun/star/container/XHierarchicalNameAccess.hpp" +#include "com/sun/star/container/XNameAccess.hpp" +#include "com/sun/star/container/XNameContainer.hpp" +#include "com/sun/star/container/XNameReplace.hpp" +#include "com/sun/star/container/XNamed.hpp" +#include "com/sun/star/document/XEventBroadcaster.hpp" +#include "com/sun/star/document/XEventListener.hpp" +#include "com/sun/star/document/XStorageBasedDocument.hpp" +#include "com/sun/star/embed/ElementModes.hpp" +#include "com/sun/star/embed/XStorage.hpp" +#include "com/sun/star/embed/XTransactedObject.hpp" +#include "com/sun/star/frame/XModel.hpp" +#include "com/sun/star/frame/XModuleManager.hpp" +#include "com/sun/star/frame/XStorable.hpp" +#include "com/sun/star/io/IOException.hpp" +#include "com/sun/star/io/XActiveDataSink.hpp" +#include "com/sun/star/io/XActiveDataStreamer.hpp" +#include "com/sun/star/io/XAsyncOutputMonitor.hpp" +#include "com/sun/star/io/XInputStream.hpp" +#include "com/sun/star/io/XOutputStream.hpp" +#include "com/sun/star/io/XSeekable.hpp" +#include "com/sun/star/io/XStream.hpp" +#include "com/sun/star/io/XTruncate.hpp" +#include "com/sun/star/lang/DisposedException.hpp" +#include "com/sun/star/lang/IllegalAccessException.hpp" +#include "com/sun/star/lang/IllegalArgumentException.hpp" +#include "com/sun/star/lang/XComponent.hpp" +#include "com/sun/star/lang/XInitialization.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/lang/XServiceInfo.hpp" +#include "com/sun/star/lang/XSingleServiceFactory.hpp" +#include "com/sun/star/lang/XTypeProvider.hpp" +#include "com/sun/star/packages/WrongPasswordException.hpp" +#include "com/sun/star/reflection/XProxyFactory.hpp" +#include "com/sun/star/registry/XRegistryKey.hpp" +#include "com/sun/star/script/XTypeConverter.hpp" +#include "com/sun/star/sdbc/DataType.hpp" +#include "com/sun/star/sdbc/FetchDirection.hpp" +#include "com/sun/star/sdbc/ResultSetType.hpp" +#include "com/sun/star/sdbc/XCloseable.hpp" +#include "com/sun/star/sdbc/XResultSet.hpp" +#include "com/sun/star/sdbc/XResultSetMetaData.hpp" +#include "com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp" +#include "com/sun/star/sdbc/XRow.hpp" +#include "com/sun/star/task/DocumentPasswordRequest.hpp" +#include "com/sun/star/task/NoMasterException.hpp" +#include "com/sun/star/task/PasswordRequestMode.hpp" +#include "com/sun/star/task/XInteractionAbort.hpp" +#include "com/sun/star/task/XInteractionApprove.hpp" +#include "com/sun/star/task/XInteractionDisapprove.hpp" +#include "com/sun/star/task/XInteractionHandler.hpp" +#include "com/sun/star/task/XInteractionPassword.hpp" +#include "com/sun/star/task/XInteractionRequest.hpp" +#include "com/sun/star/task/XPasswordContainer.hpp" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/Exception.hpp" +#include "com/sun/star/uno/Reference.h" +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/Type.hxx" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/uno/XInterface.hpp" +#include "com/sun/star/uno/XReference.hpp" +#include "com/sun/star/uno/XWeak.hpp" +#include "com/sun/star/util/Date.hpp" +#include "com/sun/star/util/DateTime.hpp" +#include "com/sun/star/util/Time.hpp" +#include "com/sun/star/util/XChangesBatch.hpp" +#include "com/sun/star/util/XChangesNotifier.hpp" +#include "com/sun/star/util/XMacroExpander.hpp" +#include "com/sun/star/util/XOfficeInstallationDirectories.hpp" + +#include "comphelper/processfactory.hxx" + +#include "cppuhelper/bootstrap.hxx" +#include "cppuhelper/compbase2.hxx" +#include "cppuhelper/exc_hlp.hxx" +#include "cppuhelper/factory.hxx" +#include "cppuhelper/implbase1.hxx" +#include "cppuhelper/implbase2.hxx" +#include "cppuhelper/implbase5.hxx" +#include "cppuhelper/implementationentry.hxx" +#include "cppuhelper/interfacecontainer.h" +#include "cppuhelper/interfacecontainer.hxx" +#include "cppuhelper/queryinterface.hxx" +#include "cppuhelper/typeprovider.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakref.hxx" + +#include "libxml/parser.h" + +#include "osl/conditn.hxx" +#include "osl/diagnose.h" +#include "osl/doublecheckedlocking.h" +#include "osl/file.hxx" +#include "osl/interlck.h" +#include "osl/module.h" +#include "osl/mutex.hxx" +#include "osl/process.h" +#include "osl/security.hxx" +#include "osl/socket.h" +#include "osl/socket.hxx" +#include "osl/thread.h" +#include "osl/time.h" + +#include "rtl/alloc.h" +#include "rtl/memory.h" +#include "rtl/string.hxx" +#include "rtl/ustrbuf.hxx" +#include "rtl/ustring.h" +#include "rtl/ustring.hxx" + +#include "salhelper/simplereferenceobject.hxx" + +#include "sys/types.h" + +#include "ucbhelper/configurationkeys.hxx" +#include "ucbhelper/macros.hxx" +#include "ucbhelper/proxydecider.hxx" + +#include "vos/diagnose.hxx" +#include "vos/mutex.hxx" +#include "vos/process.hxx" +#include "vos/ref.hxx" +#include "vos/refernce.hxx" +//---MARKER--- + +#endif diff --git a/ucb/inc/pch/precompiled_file.cxx b/ucb/inc/pch/precompiled_file.cxx new file mode 100644 index 000000000000..ba566a360b14 --- /dev/null +++ b/ucb/inc/pch/precompiled_file.cxx @@ -0,0 +1,25 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +#include "precompiled_file.hxx" + diff --git a/ucb/inc/pch/precompiled_file.hxx b/ucb/inc/pch/precompiled_file.hxx new file mode 100644 index 000000000000..b552e1197e05 --- /dev/null +++ b/ucb/inc/pch/precompiled_file.hxx @@ -0,0 +1,180 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:16.045215 + +#ifdef PRECOMPILED_HEADERS +//---MARKER--- +#include "sal/types.h" + +#include "com/sun/star/beans/IllegalTypeException.hpp" +#include "com/sun/star/beans/Property.hpp" +#include "com/sun/star/beans/PropertyAttribute.hpp" +#include "com/sun/star/beans/PropertyChangeEvent.hpp" +#include "com/sun/star/beans/PropertySetInfoChange.hpp" +#include "com/sun/star/beans/PropertySetInfoChangeEvent.hpp" +#include "com/sun/star/beans/PropertyState.hpp" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/beans/UnknownPropertyException.hpp" +#include "com/sun/star/beans/XPropertiesChangeListener.hpp" +#include "com/sun/star/beans/XPropertiesChangeNotifier.hpp" +#include "com/sun/star/beans/XPropertyAccess.hpp" +#include "com/sun/star/beans/XPropertyChangeListener.hpp" +#include "com/sun/star/beans/XPropertyContainer.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/beans/XPropertySetInfo.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeListener.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeNotifier.hpp" +#include "com/sun/star/bridge/XUnoUrlResolver.hpp" +#include "com/sun/star/container/XChild.hpp" +#include "com/sun/star/container/XEnumeration.hpp" +#include "com/sun/star/container/XEnumerationAccess.hpp" +#include "com/sun/star/container/XHierarchicalNameAccess.hpp" +#include "com/sun/star/container/XNameAccess.hpp" +#include "com/sun/star/container/XNameContainer.hpp" +#include "com/sun/star/container/XNameReplace.hpp" +#include "com/sun/star/container/XNamed.hpp" +#include "com/sun/star/document/XEventBroadcaster.hpp" +#include "com/sun/star/document/XEventListener.hpp" +#include "com/sun/star/document/XStorageBasedDocument.hpp" +#include "com/sun/star/embed/ElementModes.hpp" +#include "com/sun/star/embed/XStorage.hpp" +#include "com/sun/star/embed/XTransactedObject.hpp" +#include "com/sun/star/frame/XModel.hpp" +#include "com/sun/star/frame/XModuleManager.hpp" +#include "com/sun/star/frame/XStorable.hpp" +#include "com/sun/star/io/IOException.hpp" +#include "com/sun/star/io/XActiveDataSink.hpp" +#include "com/sun/star/io/XActiveDataStreamer.hpp" +#include "com/sun/star/io/XAsyncOutputMonitor.hpp" +#include "com/sun/star/io/XInputStream.hpp" +#include "com/sun/star/io/XOutputStream.hpp" +#include "com/sun/star/io/XSeekable.hpp" +#include "com/sun/star/io/XStream.hpp" +#include "com/sun/star/io/XTruncate.hpp" +#include "com/sun/star/lang/DisposedException.hpp" +#include "com/sun/star/lang/IllegalAccessException.hpp" +#include "com/sun/star/lang/IllegalArgumentException.hpp" +#include "com/sun/star/lang/XComponent.hpp" +#include "com/sun/star/lang/XInitialization.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/lang/XServiceInfo.hpp" +#include "com/sun/star/lang/XSingleServiceFactory.hpp" +#include "com/sun/star/lang/XTypeProvider.hpp" +#include "com/sun/star/packages/WrongPasswordException.hpp" +#include "com/sun/star/reflection/XProxyFactory.hpp" +#include "com/sun/star/registry/XRegistryKey.hpp" +#include "com/sun/star/script/XTypeConverter.hpp" +#include "com/sun/star/sdbc/DataType.hpp" +#include "com/sun/star/sdbc/FetchDirection.hpp" +#include "com/sun/star/sdbc/ResultSetType.hpp" +#include "com/sun/star/sdbc/XCloseable.hpp" +#include "com/sun/star/sdbc/XResultSet.hpp" +#include "com/sun/star/sdbc/XResultSetMetaData.hpp" +#include "com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp" +#include "com/sun/star/sdbc/XRow.hpp" +#include "com/sun/star/task/DocumentPasswordRequest.hpp" +#include "com/sun/star/task/NoMasterException.hpp" +#include "com/sun/star/task/PasswordRequestMode.hpp" +#include "com/sun/star/task/XInteractionAbort.hpp" +#include "com/sun/star/task/XInteractionApprove.hpp" +#include "com/sun/star/task/XInteractionDisapprove.hpp" +#include "com/sun/star/task/XInteractionHandler.hpp" +#include "com/sun/star/task/XInteractionPassword.hpp" +#include "com/sun/star/task/XInteractionRequest.hpp" +#include "com/sun/star/task/XPasswordContainer.hpp" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/Exception.hpp" +#include "com/sun/star/uno/Reference.h" +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/Type.hxx" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/uno/XInterface.hpp" +#include "com/sun/star/uno/XReference.hpp" +#include "com/sun/star/uno/XWeak.hpp" +#include "com/sun/star/util/Date.hpp" +#include "com/sun/star/util/DateTime.hpp" +#include "com/sun/star/util/Time.hpp" +#include "com/sun/star/util/XChangesBatch.hpp" +#include "com/sun/star/util/XChangesNotifier.hpp" +#include "com/sun/star/util/XMacroExpander.hpp" +#include "com/sun/star/util/XOfficeInstallationDirectories.hpp" + +#include "comphelper/processfactory.hxx" + +#include "cppuhelper/bootstrap.hxx" +#include "cppuhelper/compbase2.hxx" +#include "cppuhelper/exc_hlp.hxx" +#include "cppuhelper/factory.hxx" +#include "cppuhelper/implbase1.hxx" +#include "cppuhelper/implbase2.hxx" +#include "cppuhelper/implbase5.hxx" +#include "cppuhelper/implementationentry.hxx" +#include "cppuhelper/interfacecontainer.h" +#include "cppuhelper/interfacecontainer.hxx" +#include "cppuhelper/queryinterface.hxx" +#include "cppuhelper/typeprovider.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakref.hxx" + +#include "libxml/parser.h" + +#include "osl/conditn.hxx" +#include "osl/diagnose.h" +#include "osl/doublecheckedlocking.h" +#include "osl/file.hxx" +#include "osl/interlck.h" +#include "osl/module.h" +#include "osl/mutex.hxx" +#include "osl/process.h" +#include "osl/security.hxx" +#include "osl/socket.h" +#include "osl/socket.hxx" +#include "osl/thread.h" +#include "osl/time.h" + +#include "rtl/alloc.h" +#include "rtl/memory.h" +#include "rtl/string.hxx" +#include "rtl/ustrbuf.hxx" +#include "rtl/ustring.h" +#include "rtl/ustring.hxx" + +#include "salhelper/simplereferenceobject.hxx" + +#include "sys/types.h" + +#include "ucbhelper/configurationkeys.hxx" +#include "ucbhelper/macros.hxx" +#include "ucbhelper/proxydecider.hxx" + +#include "vos/diagnose.hxx" +#include "vos/mutex.hxx" +#include "vos/process.hxx" +#include "vos/ref.hxx" +#include "vos/refernce.hxx" +//---MARKER--- + +#endif diff --git a/ucb/inc/pch/precompiled_ftp.cxx b/ucb/inc/pch/precompiled_ftp.cxx new file mode 100644 index 000000000000..b75352c444e9 --- /dev/null +++ b/ucb/inc/pch/precompiled_ftp.cxx @@ -0,0 +1,25 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +#include "precompiled_ftp.hxx" + diff --git a/ucb/inc/pch/precompiled_ftp.hxx b/ucb/inc/pch/precompiled_ftp.hxx new file mode 100644 index 000000000000..b552e1197e05 --- /dev/null +++ b/ucb/inc/pch/precompiled_ftp.hxx @@ -0,0 +1,180 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:16.045215 + +#ifdef PRECOMPILED_HEADERS +//---MARKER--- +#include "sal/types.h" + +#include "com/sun/star/beans/IllegalTypeException.hpp" +#include "com/sun/star/beans/Property.hpp" +#include "com/sun/star/beans/PropertyAttribute.hpp" +#include "com/sun/star/beans/PropertyChangeEvent.hpp" +#include "com/sun/star/beans/PropertySetInfoChange.hpp" +#include "com/sun/star/beans/PropertySetInfoChangeEvent.hpp" +#include "com/sun/star/beans/PropertyState.hpp" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/beans/UnknownPropertyException.hpp" +#include "com/sun/star/beans/XPropertiesChangeListener.hpp" +#include "com/sun/star/beans/XPropertiesChangeNotifier.hpp" +#include "com/sun/star/beans/XPropertyAccess.hpp" +#include "com/sun/star/beans/XPropertyChangeListener.hpp" +#include "com/sun/star/beans/XPropertyContainer.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/beans/XPropertySetInfo.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeListener.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeNotifier.hpp" +#include "com/sun/star/bridge/XUnoUrlResolver.hpp" +#include "com/sun/star/container/XChild.hpp" +#include "com/sun/star/container/XEnumeration.hpp" +#include "com/sun/star/container/XEnumerationAccess.hpp" +#include "com/sun/star/container/XHierarchicalNameAccess.hpp" +#include "com/sun/star/container/XNameAccess.hpp" +#include "com/sun/star/container/XNameContainer.hpp" +#include "com/sun/star/container/XNameReplace.hpp" +#include "com/sun/star/container/XNamed.hpp" +#include "com/sun/star/document/XEventBroadcaster.hpp" +#include "com/sun/star/document/XEventListener.hpp" +#include "com/sun/star/document/XStorageBasedDocument.hpp" +#include "com/sun/star/embed/ElementModes.hpp" +#include "com/sun/star/embed/XStorage.hpp" +#include "com/sun/star/embed/XTransactedObject.hpp" +#include "com/sun/star/frame/XModel.hpp" +#include "com/sun/star/frame/XModuleManager.hpp" +#include "com/sun/star/frame/XStorable.hpp" +#include "com/sun/star/io/IOException.hpp" +#include "com/sun/star/io/XActiveDataSink.hpp" +#include "com/sun/star/io/XActiveDataStreamer.hpp" +#include "com/sun/star/io/XAsyncOutputMonitor.hpp" +#include "com/sun/star/io/XInputStream.hpp" +#include "com/sun/star/io/XOutputStream.hpp" +#include "com/sun/star/io/XSeekable.hpp" +#include "com/sun/star/io/XStream.hpp" +#include "com/sun/star/io/XTruncate.hpp" +#include "com/sun/star/lang/DisposedException.hpp" +#include "com/sun/star/lang/IllegalAccessException.hpp" +#include "com/sun/star/lang/IllegalArgumentException.hpp" +#include "com/sun/star/lang/XComponent.hpp" +#include "com/sun/star/lang/XInitialization.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/lang/XServiceInfo.hpp" +#include "com/sun/star/lang/XSingleServiceFactory.hpp" +#include "com/sun/star/lang/XTypeProvider.hpp" +#include "com/sun/star/packages/WrongPasswordException.hpp" +#include "com/sun/star/reflection/XProxyFactory.hpp" +#include "com/sun/star/registry/XRegistryKey.hpp" +#include "com/sun/star/script/XTypeConverter.hpp" +#include "com/sun/star/sdbc/DataType.hpp" +#include "com/sun/star/sdbc/FetchDirection.hpp" +#include "com/sun/star/sdbc/ResultSetType.hpp" +#include "com/sun/star/sdbc/XCloseable.hpp" +#include "com/sun/star/sdbc/XResultSet.hpp" +#include "com/sun/star/sdbc/XResultSetMetaData.hpp" +#include "com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp" +#include "com/sun/star/sdbc/XRow.hpp" +#include "com/sun/star/task/DocumentPasswordRequest.hpp" +#include "com/sun/star/task/NoMasterException.hpp" +#include "com/sun/star/task/PasswordRequestMode.hpp" +#include "com/sun/star/task/XInteractionAbort.hpp" +#include "com/sun/star/task/XInteractionApprove.hpp" +#include "com/sun/star/task/XInteractionDisapprove.hpp" +#include "com/sun/star/task/XInteractionHandler.hpp" +#include "com/sun/star/task/XInteractionPassword.hpp" +#include "com/sun/star/task/XInteractionRequest.hpp" +#include "com/sun/star/task/XPasswordContainer.hpp" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/Exception.hpp" +#include "com/sun/star/uno/Reference.h" +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/Type.hxx" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/uno/XInterface.hpp" +#include "com/sun/star/uno/XReference.hpp" +#include "com/sun/star/uno/XWeak.hpp" +#include "com/sun/star/util/Date.hpp" +#include "com/sun/star/util/DateTime.hpp" +#include "com/sun/star/util/Time.hpp" +#include "com/sun/star/util/XChangesBatch.hpp" +#include "com/sun/star/util/XChangesNotifier.hpp" +#include "com/sun/star/util/XMacroExpander.hpp" +#include "com/sun/star/util/XOfficeInstallationDirectories.hpp" + +#include "comphelper/processfactory.hxx" + +#include "cppuhelper/bootstrap.hxx" +#include "cppuhelper/compbase2.hxx" +#include "cppuhelper/exc_hlp.hxx" +#include "cppuhelper/factory.hxx" +#include "cppuhelper/implbase1.hxx" +#include "cppuhelper/implbase2.hxx" +#include "cppuhelper/implbase5.hxx" +#include "cppuhelper/implementationentry.hxx" +#include "cppuhelper/interfacecontainer.h" +#include "cppuhelper/interfacecontainer.hxx" +#include "cppuhelper/queryinterface.hxx" +#include "cppuhelper/typeprovider.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakref.hxx" + +#include "libxml/parser.h" + +#include "osl/conditn.hxx" +#include "osl/diagnose.h" +#include "osl/doublecheckedlocking.h" +#include "osl/file.hxx" +#include "osl/interlck.h" +#include "osl/module.h" +#include "osl/mutex.hxx" +#include "osl/process.h" +#include "osl/security.hxx" +#include "osl/socket.h" +#include "osl/socket.hxx" +#include "osl/thread.h" +#include "osl/time.h" + +#include "rtl/alloc.h" +#include "rtl/memory.h" +#include "rtl/string.hxx" +#include "rtl/ustrbuf.hxx" +#include "rtl/ustring.h" +#include "rtl/ustring.hxx" + +#include "salhelper/simplereferenceobject.hxx" + +#include "sys/types.h" + +#include "ucbhelper/configurationkeys.hxx" +#include "ucbhelper/macros.hxx" +#include "ucbhelper/proxydecider.hxx" + +#include "vos/diagnose.hxx" +#include "vos/mutex.hxx" +#include "vos/process.hxx" +#include "vos/ref.hxx" +#include "vos/refernce.hxx" +//---MARKER--- + +#endif diff --git a/ucb/inc/pch/precompiled_hier.cxx b/ucb/inc/pch/precompiled_hier.cxx new file mode 100644 index 000000000000..1472d3a03a33 --- /dev/null +++ b/ucb/inc/pch/precompiled_hier.cxx @@ -0,0 +1,25 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +#include "precompiled_hier.hxx" + diff --git a/ucb/inc/pch/precompiled_hier.hxx b/ucb/inc/pch/precompiled_hier.hxx new file mode 100644 index 000000000000..b552e1197e05 --- /dev/null +++ b/ucb/inc/pch/precompiled_hier.hxx @@ -0,0 +1,180 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:16.045215 + +#ifdef PRECOMPILED_HEADERS +//---MARKER--- +#include "sal/types.h" + +#include "com/sun/star/beans/IllegalTypeException.hpp" +#include "com/sun/star/beans/Property.hpp" +#include "com/sun/star/beans/PropertyAttribute.hpp" +#include "com/sun/star/beans/PropertyChangeEvent.hpp" +#include "com/sun/star/beans/PropertySetInfoChange.hpp" +#include "com/sun/star/beans/PropertySetInfoChangeEvent.hpp" +#include "com/sun/star/beans/PropertyState.hpp" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/beans/UnknownPropertyException.hpp" +#include "com/sun/star/beans/XPropertiesChangeListener.hpp" +#include "com/sun/star/beans/XPropertiesChangeNotifier.hpp" +#include "com/sun/star/beans/XPropertyAccess.hpp" +#include "com/sun/star/beans/XPropertyChangeListener.hpp" +#include "com/sun/star/beans/XPropertyContainer.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/beans/XPropertySetInfo.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeListener.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeNotifier.hpp" +#include "com/sun/star/bridge/XUnoUrlResolver.hpp" +#include "com/sun/star/container/XChild.hpp" +#include "com/sun/star/container/XEnumeration.hpp" +#include "com/sun/star/container/XEnumerationAccess.hpp" +#include "com/sun/star/container/XHierarchicalNameAccess.hpp" +#include "com/sun/star/container/XNameAccess.hpp" +#include "com/sun/star/container/XNameContainer.hpp" +#include "com/sun/star/container/XNameReplace.hpp" +#include "com/sun/star/container/XNamed.hpp" +#include "com/sun/star/document/XEventBroadcaster.hpp" +#include "com/sun/star/document/XEventListener.hpp" +#include "com/sun/star/document/XStorageBasedDocument.hpp" +#include "com/sun/star/embed/ElementModes.hpp" +#include "com/sun/star/embed/XStorage.hpp" +#include "com/sun/star/embed/XTransactedObject.hpp" +#include "com/sun/star/frame/XModel.hpp" +#include "com/sun/star/frame/XModuleManager.hpp" +#include "com/sun/star/frame/XStorable.hpp" +#include "com/sun/star/io/IOException.hpp" +#include "com/sun/star/io/XActiveDataSink.hpp" +#include "com/sun/star/io/XActiveDataStreamer.hpp" +#include "com/sun/star/io/XAsyncOutputMonitor.hpp" +#include "com/sun/star/io/XInputStream.hpp" +#include "com/sun/star/io/XOutputStream.hpp" +#include "com/sun/star/io/XSeekable.hpp" +#include "com/sun/star/io/XStream.hpp" +#include "com/sun/star/io/XTruncate.hpp" +#include "com/sun/star/lang/DisposedException.hpp" +#include "com/sun/star/lang/IllegalAccessException.hpp" +#include "com/sun/star/lang/IllegalArgumentException.hpp" +#include "com/sun/star/lang/XComponent.hpp" +#include "com/sun/star/lang/XInitialization.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/lang/XServiceInfo.hpp" +#include "com/sun/star/lang/XSingleServiceFactory.hpp" +#include "com/sun/star/lang/XTypeProvider.hpp" +#include "com/sun/star/packages/WrongPasswordException.hpp" +#include "com/sun/star/reflection/XProxyFactory.hpp" +#include "com/sun/star/registry/XRegistryKey.hpp" +#include "com/sun/star/script/XTypeConverter.hpp" +#include "com/sun/star/sdbc/DataType.hpp" +#include "com/sun/star/sdbc/FetchDirection.hpp" +#include "com/sun/star/sdbc/ResultSetType.hpp" +#include "com/sun/star/sdbc/XCloseable.hpp" +#include "com/sun/star/sdbc/XResultSet.hpp" +#include "com/sun/star/sdbc/XResultSetMetaData.hpp" +#include "com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp" +#include "com/sun/star/sdbc/XRow.hpp" +#include "com/sun/star/task/DocumentPasswordRequest.hpp" +#include "com/sun/star/task/NoMasterException.hpp" +#include "com/sun/star/task/PasswordRequestMode.hpp" +#include "com/sun/star/task/XInteractionAbort.hpp" +#include "com/sun/star/task/XInteractionApprove.hpp" +#include "com/sun/star/task/XInteractionDisapprove.hpp" +#include "com/sun/star/task/XInteractionHandler.hpp" +#include "com/sun/star/task/XInteractionPassword.hpp" +#include "com/sun/star/task/XInteractionRequest.hpp" +#include "com/sun/star/task/XPasswordContainer.hpp" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/Exception.hpp" +#include "com/sun/star/uno/Reference.h" +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/Type.hxx" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/uno/XInterface.hpp" +#include "com/sun/star/uno/XReference.hpp" +#include "com/sun/star/uno/XWeak.hpp" +#include "com/sun/star/util/Date.hpp" +#include "com/sun/star/util/DateTime.hpp" +#include "com/sun/star/util/Time.hpp" +#include "com/sun/star/util/XChangesBatch.hpp" +#include "com/sun/star/util/XChangesNotifier.hpp" +#include "com/sun/star/util/XMacroExpander.hpp" +#include "com/sun/star/util/XOfficeInstallationDirectories.hpp" + +#include "comphelper/processfactory.hxx" + +#include "cppuhelper/bootstrap.hxx" +#include "cppuhelper/compbase2.hxx" +#include "cppuhelper/exc_hlp.hxx" +#include "cppuhelper/factory.hxx" +#include "cppuhelper/implbase1.hxx" +#include "cppuhelper/implbase2.hxx" +#include "cppuhelper/implbase5.hxx" +#include "cppuhelper/implementationentry.hxx" +#include "cppuhelper/interfacecontainer.h" +#include "cppuhelper/interfacecontainer.hxx" +#include "cppuhelper/queryinterface.hxx" +#include "cppuhelper/typeprovider.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakref.hxx" + +#include "libxml/parser.h" + +#include "osl/conditn.hxx" +#include "osl/diagnose.h" +#include "osl/doublecheckedlocking.h" +#include "osl/file.hxx" +#include "osl/interlck.h" +#include "osl/module.h" +#include "osl/mutex.hxx" +#include "osl/process.h" +#include "osl/security.hxx" +#include "osl/socket.h" +#include "osl/socket.hxx" +#include "osl/thread.h" +#include "osl/time.h" + +#include "rtl/alloc.h" +#include "rtl/memory.h" +#include "rtl/string.hxx" +#include "rtl/ustrbuf.hxx" +#include "rtl/ustring.h" +#include "rtl/ustring.hxx" + +#include "salhelper/simplereferenceobject.hxx" + +#include "sys/types.h" + +#include "ucbhelper/configurationkeys.hxx" +#include "ucbhelper/macros.hxx" +#include "ucbhelper/proxydecider.hxx" + +#include "vos/diagnose.hxx" +#include "vos/mutex.hxx" +#include "vos/process.hxx" +#include "vos/ref.hxx" +#include "vos/refernce.hxx" +//---MARKER--- + +#endif diff --git a/ucb/inc/pch/precompiled_pkg.cxx b/ucb/inc/pch/precompiled_pkg.cxx new file mode 100644 index 000000000000..4fcb531e998a --- /dev/null +++ b/ucb/inc/pch/precompiled_pkg.cxx @@ -0,0 +1,25 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +#include "precompiled_pkg.hxx" + diff --git a/ucb/inc/pch/precompiled_pkg.hxx b/ucb/inc/pch/precompiled_pkg.hxx new file mode 100644 index 000000000000..b552e1197e05 --- /dev/null +++ b/ucb/inc/pch/precompiled_pkg.hxx @@ -0,0 +1,180 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:16.045215 + +#ifdef PRECOMPILED_HEADERS +//---MARKER--- +#include "sal/types.h" + +#include "com/sun/star/beans/IllegalTypeException.hpp" +#include "com/sun/star/beans/Property.hpp" +#include "com/sun/star/beans/PropertyAttribute.hpp" +#include "com/sun/star/beans/PropertyChangeEvent.hpp" +#include "com/sun/star/beans/PropertySetInfoChange.hpp" +#include "com/sun/star/beans/PropertySetInfoChangeEvent.hpp" +#include "com/sun/star/beans/PropertyState.hpp" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/beans/UnknownPropertyException.hpp" +#include "com/sun/star/beans/XPropertiesChangeListener.hpp" +#include "com/sun/star/beans/XPropertiesChangeNotifier.hpp" +#include "com/sun/star/beans/XPropertyAccess.hpp" +#include "com/sun/star/beans/XPropertyChangeListener.hpp" +#include "com/sun/star/beans/XPropertyContainer.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/beans/XPropertySetInfo.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeListener.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeNotifier.hpp" +#include "com/sun/star/bridge/XUnoUrlResolver.hpp" +#include "com/sun/star/container/XChild.hpp" +#include "com/sun/star/container/XEnumeration.hpp" +#include "com/sun/star/container/XEnumerationAccess.hpp" +#include "com/sun/star/container/XHierarchicalNameAccess.hpp" +#include "com/sun/star/container/XNameAccess.hpp" +#include "com/sun/star/container/XNameContainer.hpp" +#include "com/sun/star/container/XNameReplace.hpp" +#include "com/sun/star/container/XNamed.hpp" +#include "com/sun/star/document/XEventBroadcaster.hpp" +#include "com/sun/star/document/XEventListener.hpp" +#include "com/sun/star/document/XStorageBasedDocument.hpp" +#include "com/sun/star/embed/ElementModes.hpp" +#include "com/sun/star/embed/XStorage.hpp" +#include "com/sun/star/embed/XTransactedObject.hpp" +#include "com/sun/star/frame/XModel.hpp" +#include "com/sun/star/frame/XModuleManager.hpp" +#include "com/sun/star/frame/XStorable.hpp" +#include "com/sun/star/io/IOException.hpp" +#include "com/sun/star/io/XActiveDataSink.hpp" +#include "com/sun/star/io/XActiveDataStreamer.hpp" +#include "com/sun/star/io/XAsyncOutputMonitor.hpp" +#include "com/sun/star/io/XInputStream.hpp" +#include "com/sun/star/io/XOutputStream.hpp" +#include "com/sun/star/io/XSeekable.hpp" +#include "com/sun/star/io/XStream.hpp" +#include "com/sun/star/io/XTruncate.hpp" +#include "com/sun/star/lang/DisposedException.hpp" +#include "com/sun/star/lang/IllegalAccessException.hpp" +#include "com/sun/star/lang/IllegalArgumentException.hpp" +#include "com/sun/star/lang/XComponent.hpp" +#include "com/sun/star/lang/XInitialization.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/lang/XServiceInfo.hpp" +#include "com/sun/star/lang/XSingleServiceFactory.hpp" +#include "com/sun/star/lang/XTypeProvider.hpp" +#include "com/sun/star/packages/WrongPasswordException.hpp" +#include "com/sun/star/reflection/XProxyFactory.hpp" +#include "com/sun/star/registry/XRegistryKey.hpp" +#include "com/sun/star/script/XTypeConverter.hpp" +#include "com/sun/star/sdbc/DataType.hpp" +#include "com/sun/star/sdbc/FetchDirection.hpp" +#include "com/sun/star/sdbc/ResultSetType.hpp" +#include "com/sun/star/sdbc/XCloseable.hpp" +#include "com/sun/star/sdbc/XResultSet.hpp" +#include "com/sun/star/sdbc/XResultSetMetaData.hpp" +#include "com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp" +#include "com/sun/star/sdbc/XRow.hpp" +#include "com/sun/star/task/DocumentPasswordRequest.hpp" +#include "com/sun/star/task/NoMasterException.hpp" +#include "com/sun/star/task/PasswordRequestMode.hpp" +#include "com/sun/star/task/XInteractionAbort.hpp" +#include "com/sun/star/task/XInteractionApprove.hpp" +#include "com/sun/star/task/XInteractionDisapprove.hpp" +#include "com/sun/star/task/XInteractionHandler.hpp" +#include "com/sun/star/task/XInteractionPassword.hpp" +#include "com/sun/star/task/XInteractionRequest.hpp" +#include "com/sun/star/task/XPasswordContainer.hpp" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/Exception.hpp" +#include "com/sun/star/uno/Reference.h" +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/Type.hxx" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/uno/XInterface.hpp" +#include "com/sun/star/uno/XReference.hpp" +#include "com/sun/star/uno/XWeak.hpp" +#include "com/sun/star/util/Date.hpp" +#include "com/sun/star/util/DateTime.hpp" +#include "com/sun/star/util/Time.hpp" +#include "com/sun/star/util/XChangesBatch.hpp" +#include "com/sun/star/util/XChangesNotifier.hpp" +#include "com/sun/star/util/XMacroExpander.hpp" +#include "com/sun/star/util/XOfficeInstallationDirectories.hpp" + +#include "comphelper/processfactory.hxx" + +#include "cppuhelper/bootstrap.hxx" +#include "cppuhelper/compbase2.hxx" +#include "cppuhelper/exc_hlp.hxx" +#include "cppuhelper/factory.hxx" +#include "cppuhelper/implbase1.hxx" +#include "cppuhelper/implbase2.hxx" +#include "cppuhelper/implbase5.hxx" +#include "cppuhelper/implementationentry.hxx" +#include "cppuhelper/interfacecontainer.h" +#include "cppuhelper/interfacecontainer.hxx" +#include "cppuhelper/queryinterface.hxx" +#include "cppuhelper/typeprovider.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakref.hxx" + +#include "libxml/parser.h" + +#include "osl/conditn.hxx" +#include "osl/diagnose.h" +#include "osl/doublecheckedlocking.h" +#include "osl/file.hxx" +#include "osl/interlck.h" +#include "osl/module.h" +#include "osl/mutex.hxx" +#include "osl/process.h" +#include "osl/security.hxx" +#include "osl/socket.h" +#include "osl/socket.hxx" +#include "osl/thread.h" +#include "osl/time.h" + +#include "rtl/alloc.h" +#include "rtl/memory.h" +#include "rtl/string.hxx" +#include "rtl/ustrbuf.hxx" +#include "rtl/ustring.h" +#include "rtl/ustring.hxx" + +#include "salhelper/simplereferenceobject.hxx" + +#include "sys/types.h" + +#include "ucbhelper/configurationkeys.hxx" +#include "ucbhelper/macros.hxx" +#include "ucbhelper/proxydecider.hxx" + +#include "vos/diagnose.hxx" +#include "vos/mutex.hxx" +#include "vos/process.hxx" +#include "vos/ref.hxx" +#include "vos/refernce.hxx" +//---MARKER--- + +#endif diff --git a/ucb/inc/pch/precompiled_sorter.cxx b/ucb/inc/pch/precompiled_sorter.cxx new file mode 100644 index 000000000000..1e2402f13e6b --- /dev/null +++ b/ucb/inc/pch/precompiled_sorter.cxx @@ -0,0 +1,25 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +#include "precompiled_sorter.hxx" + diff --git a/ucb/inc/pch/precompiled_sorter.hxx b/ucb/inc/pch/precompiled_sorter.hxx new file mode 100644 index 000000000000..b552e1197e05 --- /dev/null +++ b/ucb/inc/pch/precompiled_sorter.hxx @@ -0,0 +1,180 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:16.045215 + +#ifdef PRECOMPILED_HEADERS +//---MARKER--- +#include "sal/types.h" + +#include "com/sun/star/beans/IllegalTypeException.hpp" +#include "com/sun/star/beans/Property.hpp" +#include "com/sun/star/beans/PropertyAttribute.hpp" +#include "com/sun/star/beans/PropertyChangeEvent.hpp" +#include "com/sun/star/beans/PropertySetInfoChange.hpp" +#include "com/sun/star/beans/PropertySetInfoChangeEvent.hpp" +#include "com/sun/star/beans/PropertyState.hpp" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/beans/UnknownPropertyException.hpp" +#include "com/sun/star/beans/XPropertiesChangeListener.hpp" +#include "com/sun/star/beans/XPropertiesChangeNotifier.hpp" +#include "com/sun/star/beans/XPropertyAccess.hpp" +#include "com/sun/star/beans/XPropertyChangeListener.hpp" +#include "com/sun/star/beans/XPropertyContainer.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/beans/XPropertySetInfo.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeListener.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeNotifier.hpp" +#include "com/sun/star/bridge/XUnoUrlResolver.hpp" +#include "com/sun/star/container/XChild.hpp" +#include "com/sun/star/container/XEnumeration.hpp" +#include "com/sun/star/container/XEnumerationAccess.hpp" +#include "com/sun/star/container/XHierarchicalNameAccess.hpp" +#include "com/sun/star/container/XNameAccess.hpp" +#include "com/sun/star/container/XNameContainer.hpp" +#include "com/sun/star/container/XNameReplace.hpp" +#include "com/sun/star/container/XNamed.hpp" +#include "com/sun/star/document/XEventBroadcaster.hpp" +#include "com/sun/star/document/XEventListener.hpp" +#include "com/sun/star/document/XStorageBasedDocument.hpp" +#include "com/sun/star/embed/ElementModes.hpp" +#include "com/sun/star/embed/XStorage.hpp" +#include "com/sun/star/embed/XTransactedObject.hpp" +#include "com/sun/star/frame/XModel.hpp" +#include "com/sun/star/frame/XModuleManager.hpp" +#include "com/sun/star/frame/XStorable.hpp" +#include "com/sun/star/io/IOException.hpp" +#include "com/sun/star/io/XActiveDataSink.hpp" +#include "com/sun/star/io/XActiveDataStreamer.hpp" +#include "com/sun/star/io/XAsyncOutputMonitor.hpp" +#include "com/sun/star/io/XInputStream.hpp" +#include "com/sun/star/io/XOutputStream.hpp" +#include "com/sun/star/io/XSeekable.hpp" +#include "com/sun/star/io/XStream.hpp" +#include "com/sun/star/io/XTruncate.hpp" +#include "com/sun/star/lang/DisposedException.hpp" +#include "com/sun/star/lang/IllegalAccessException.hpp" +#include "com/sun/star/lang/IllegalArgumentException.hpp" +#include "com/sun/star/lang/XComponent.hpp" +#include "com/sun/star/lang/XInitialization.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/lang/XServiceInfo.hpp" +#include "com/sun/star/lang/XSingleServiceFactory.hpp" +#include "com/sun/star/lang/XTypeProvider.hpp" +#include "com/sun/star/packages/WrongPasswordException.hpp" +#include "com/sun/star/reflection/XProxyFactory.hpp" +#include "com/sun/star/registry/XRegistryKey.hpp" +#include "com/sun/star/script/XTypeConverter.hpp" +#include "com/sun/star/sdbc/DataType.hpp" +#include "com/sun/star/sdbc/FetchDirection.hpp" +#include "com/sun/star/sdbc/ResultSetType.hpp" +#include "com/sun/star/sdbc/XCloseable.hpp" +#include "com/sun/star/sdbc/XResultSet.hpp" +#include "com/sun/star/sdbc/XResultSetMetaData.hpp" +#include "com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp" +#include "com/sun/star/sdbc/XRow.hpp" +#include "com/sun/star/task/DocumentPasswordRequest.hpp" +#include "com/sun/star/task/NoMasterException.hpp" +#include "com/sun/star/task/PasswordRequestMode.hpp" +#include "com/sun/star/task/XInteractionAbort.hpp" +#include "com/sun/star/task/XInteractionApprove.hpp" +#include "com/sun/star/task/XInteractionDisapprove.hpp" +#include "com/sun/star/task/XInteractionHandler.hpp" +#include "com/sun/star/task/XInteractionPassword.hpp" +#include "com/sun/star/task/XInteractionRequest.hpp" +#include "com/sun/star/task/XPasswordContainer.hpp" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/Exception.hpp" +#include "com/sun/star/uno/Reference.h" +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/Type.hxx" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/uno/XInterface.hpp" +#include "com/sun/star/uno/XReference.hpp" +#include "com/sun/star/uno/XWeak.hpp" +#include "com/sun/star/util/Date.hpp" +#include "com/sun/star/util/DateTime.hpp" +#include "com/sun/star/util/Time.hpp" +#include "com/sun/star/util/XChangesBatch.hpp" +#include "com/sun/star/util/XChangesNotifier.hpp" +#include "com/sun/star/util/XMacroExpander.hpp" +#include "com/sun/star/util/XOfficeInstallationDirectories.hpp" + +#include "comphelper/processfactory.hxx" + +#include "cppuhelper/bootstrap.hxx" +#include "cppuhelper/compbase2.hxx" +#include "cppuhelper/exc_hlp.hxx" +#include "cppuhelper/factory.hxx" +#include "cppuhelper/implbase1.hxx" +#include "cppuhelper/implbase2.hxx" +#include "cppuhelper/implbase5.hxx" +#include "cppuhelper/implementationentry.hxx" +#include "cppuhelper/interfacecontainer.h" +#include "cppuhelper/interfacecontainer.hxx" +#include "cppuhelper/queryinterface.hxx" +#include "cppuhelper/typeprovider.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakref.hxx" + +#include "libxml/parser.h" + +#include "osl/conditn.hxx" +#include "osl/diagnose.h" +#include "osl/doublecheckedlocking.h" +#include "osl/file.hxx" +#include "osl/interlck.h" +#include "osl/module.h" +#include "osl/mutex.hxx" +#include "osl/process.h" +#include "osl/security.hxx" +#include "osl/socket.h" +#include "osl/socket.hxx" +#include "osl/thread.h" +#include "osl/time.h" + +#include "rtl/alloc.h" +#include "rtl/memory.h" +#include "rtl/string.hxx" +#include "rtl/ustrbuf.hxx" +#include "rtl/ustring.h" +#include "rtl/ustring.hxx" + +#include "salhelper/simplereferenceobject.hxx" + +#include "sys/types.h" + +#include "ucbhelper/configurationkeys.hxx" +#include "ucbhelper/macros.hxx" +#include "ucbhelper/proxydecider.hxx" + +#include "vos/diagnose.hxx" +#include "vos/mutex.hxx" +#include "vos/process.hxx" +#include "vos/ref.hxx" +#include "vos/refernce.hxx" +//---MARKER--- + +#endif diff --git a/ucb/inc/pch/precompiled_tdoc.cxx b/ucb/inc/pch/precompiled_tdoc.cxx new file mode 100644 index 000000000000..170f565be82c --- /dev/null +++ b/ucb/inc/pch/precompiled_tdoc.cxx @@ -0,0 +1,25 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +#include "precompiled_tdoc.hxx" + diff --git a/ucb/inc/pch/precompiled_tdoc.hxx b/ucb/inc/pch/precompiled_tdoc.hxx new file mode 100644 index 000000000000..b552e1197e05 --- /dev/null +++ b/ucb/inc/pch/precompiled_tdoc.hxx @@ -0,0 +1,180 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:16.045215 + +#ifdef PRECOMPILED_HEADERS +//---MARKER--- +#include "sal/types.h" + +#include "com/sun/star/beans/IllegalTypeException.hpp" +#include "com/sun/star/beans/Property.hpp" +#include "com/sun/star/beans/PropertyAttribute.hpp" +#include "com/sun/star/beans/PropertyChangeEvent.hpp" +#include "com/sun/star/beans/PropertySetInfoChange.hpp" +#include "com/sun/star/beans/PropertySetInfoChangeEvent.hpp" +#include "com/sun/star/beans/PropertyState.hpp" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/beans/UnknownPropertyException.hpp" +#include "com/sun/star/beans/XPropertiesChangeListener.hpp" +#include "com/sun/star/beans/XPropertiesChangeNotifier.hpp" +#include "com/sun/star/beans/XPropertyAccess.hpp" +#include "com/sun/star/beans/XPropertyChangeListener.hpp" +#include "com/sun/star/beans/XPropertyContainer.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/beans/XPropertySetInfo.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeListener.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeNotifier.hpp" +#include "com/sun/star/bridge/XUnoUrlResolver.hpp" +#include "com/sun/star/container/XChild.hpp" +#include "com/sun/star/container/XEnumeration.hpp" +#include "com/sun/star/container/XEnumerationAccess.hpp" +#include "com/sun/star/container/XHierarchicalNameAccess.hpp" +#include "com/sun/star/container/XNameAccess.hpp" +#include "com/sun/star/container/XNameContainer.hpp" +#include "com/sun/star/container/XNameReplace.hpp" +#include "com/sun/star/container/XNamed.hpp" +#include "com/sun/star/document/XEventBroadcaster.hpp" +#include "com/sun/star/document/XEventListener.hpp" +#include "com/sun/star/document/XStorageBasedDocument.hpp" +#include "com/sun/star/embed/ElementModes.hpp" +#include "com/sun/star/embed/XStorage.hpp" +#include "com/sun/star/embed/XTransactedObject.hpp" +#include "com/sun/star/frame/XModel.hpp" +#include "com/sun/star/frame/XModuleManager.hpp" +#include "com/sun/star/frame/XStorable.hpp" +#include "com/sun/star/io/IOException.hpp" +#include "com/sun/star/io/XActiveDataSink.hpp" +#include "com/sun/star/io/XActiveDataStreamer.hpp" +#include "com/sun/star/io/XAsyncOutputMonitor.hpp" +#include "com/sun/star/io/XInputStream.hpp" +#include "com/sun/star/io/XOutputStream.hpp" +#include "com/sun/star/io/XSeekable.hpp" +#include "com/sun/star/io/XStream.hpp" +#include "com/sun/star/io/XTruncate.hpp" +#include "com/sun/star/lang/DisposedException.hpp" +#include "com/sun/star/lang/IllegalAccessException.hpp" +#include "com/sun/star/lang/IllegalArgumentException.hpp" +#include "com/sun/star/lang/XComponent.hpp" +#include "com/sun/star/lang/XInitialization.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/lang/XServiceInfo.hpp" +#include "com/sun/star/lang/XSingleServiceFactory.hpp" +#include "com/sun/star/lang/XTypeProvider.hpp" +#include "com/sun/star/packages/WrongPasswordException.hpp" +#include "com/sun/star/reflection/XProxyFactory.hpp" +#include "com/sun/star/registry/XRegistryKey.hpp" +#include "com/sun/star/script/XTypeConverter.hpp" +#include "com/sun/star/sdbc/DataType.hpp" +#include "com/sun/star/sdbc/FetchDirection.hpp" +#include "com/sun/star/sdbc/ResultSetType.hpp" +#include "com/sun/star/sdbc/XCloseable.hpp" +#include "com/sun/star/sdbc/XResultSet.hpp" +#include "com/sun/star/sdbc/XResultSetMetaData.hpp" +#include "com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp" +#include "com/sun/star/sdbc/XRow.hpp" +#include "com/sun/star/task/DocumentPasswordRequest.hpp" +#include "com/sun/star/task/NoMasterException.hpp" +#include "com/sun/star/task/PasswordRequestMode.hpp" +#include "com/sun/star/task/XInteractionAbort.hpp" +#include "com/sun/star/task/XInteractionApprove.hpp" +#include "com/sun/star/task/XInteractionDisapprove.hpp" +#include "com/sun/star/task/XInteractionHandler.hpp" +#include "com/sun/star/task/XInteractionPassword.hpp" +#include "com/sun/star/task/XInteractionRequest.hpp" +#include "com/sun/star/task/XPasswordContainer.hpp" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/Exception.hpp" +#include "com/sun/star/uno/Reference.h" +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/Type.hxx" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/uno/XInterface.hpp" +#include "com/sun/star/uno/XReference.hpp" +#include "com/sun/star/uno/XWeak.hpp" +#include "com/sun/star/util/Date.hpp" +#include "com/sun/star/util/DateTime.hpp" +#include "com/sun/star/util/Time.hpp" +#include "com/sun/star/util/XChangesBatch.hpp" +#include "com/sun/star/util/XChangesNotifier.hpp" +#include "com/sun/star/util/XMacroExpander.hpp" +#include "com/sun/star/util/XOfficeInstallationDirectories.hpp" + +#include "comphelper/processfactory.hxx" + +#include "cppuhelper/bootstrap.hxx" +#include "cppuhelper/compbase2.hxx" +#include "cppuhelper/exc_hlp.hxx" +#include "cppuhelper/factory.hxx" +#include "cppuhelper/implbase1.hxx" +#include "cppuhelper/implbase2.hxx" +#include "cppuhelper/implbase5.hxx" +#include "cppuhelper/implementationentry.hxx" +#include "cppuhelper/interfacecontainer.h" +#include "cppuhelper/interfacecontainer.hxx" +#include "cppuhelper/queryinterface.hxx" +#include "cppuhelper/typeprovider.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakref.hxx" + +#include "libxml/parser.h" + +#include "osl/conditn.hxx" +#include "osl/diagnose.h" +#include "osl/doublecheckedlocking.h" +#include "osl/file.hxx" +#include "osl/interlck.h" +#include "osl/module.h" +#include "osl/mutex.hxx" +#include "osl/process.h" +#include "osl/security.hxx" +#include "osl/socket.h" +#include "osl/socket.hxx" +#include "osl/thread.h" +#include "osl/time.h" + +#include "rtl/alloc.h" +#include "rtl/memory.h" +#include "rtl/string.hxx" +#include "rtl/ustrbuf.hxx" +#include "rtl/ustring.h" +#include "rtl/ustring.hxx" + +#include "salhelper/simplereferenceobject.hxx" + +#include "sys/types.h" + +#include "ucbhelper/configurationkeys.hxx" +#include "ucbhelper/macros.hxx" +#include "ucbhelper/proxydecider.hxx" + +#include "vos/diagnose.hxx" +#include "vos/mutex.hxx" +#include "vos/process.hxx" +#include "vos/ref.hxx" +#include "vos/refernce.hxx" +//---MARKER--- + +#endif diff --git a/ucb/inc/pch/precompiled_webdav.cxx b/ucb/inc/pch/precompiled_webdav.cxx new file mode 100644 index 000000000000..dba232a49d27 --- /dev/null +++ b/ucb/inc/pch/precompiled_webdav.cxx @@ -0,0 +1,25 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +#include "precompiled_webdav.hxx" + diff --git a/ucb/inc/pch/precompiled_webdav.hxx b/ucb/inc/pch/precompiled_webdav.hxx new file mode 100644 index 000000000000..b552e1197e05 --- /dev/null +++ b/ucb/inc/pch/precompiled_webdav.hxx @@ -0,0 +1,180 @@ +/************************************************************** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + + +// MARKER(update_precomp.py): Generated on 2006-09-01 17:50:16.045215 + +#ifdef PRECOMPILED_HEADERS +//---MARKER--- +#include "sal/types.h" + +#include "com/sun/star/beans/IllegalTypeException.hpp" +#include "com/sun/star/beans/Property.hpp" +#include "com/sun/star/beans/PropertyAttribute.hpp" +#include "com/sun/star/beans/PropertyChangeEvent.hpp" +#include "com/sun/star/beans/PropertySetInfoChange.hpp" +#include "com/sun/star/beans/PropertySetInfoChangeEvent.hpp" +#include "com/sun/star/beans/PropertyState.hpp" +#include "com/sun/star/beans/PropertyValue.hpp" +#include "com/sun/star/beans/UnknownPropertyException.hpp" +#include "com/sun/star/beans/XPropertiesChangeListener.hpp" +#include "com/sun/star/beans/XPropertiesChangeNotifier.hpp" +#include "com/sun/star/beans/XPropertyAccess.hpp" +#include "com/sun/star/beans/XPropertyChangeListener.hpp" +#include "com/sun/star/beans/XPropertyContainer.hpp" +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/beans/XPropertySetInfo.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeListener.hpp" +#include "com/sun/star/beans/XPropertySetInfoChangeNotifier.hpp" +#include "com/sun/star/bridge/XUnoUrlResolver.hpp" +#include "com/sun/star/container/XChild.hpp" +#include "com/sun/star/container/XEnumeration.hpp" +#include "com/sun/star/container/XEnumerationAccess.hpp" +#include "com/sun/star/container/XHierarchicalNameAccess.hpp" +#include "com/sun/star/container/XNameAccess.hpp" +#include "com/sun/star/container/XNameContainer.hpp" +#include "com/sun/star/container/XNameReplace.hpp" +#include "com/sun/star/container/XNamed.hpp" +#include "com/sun/star/document/XEventBroadcaster.hpp" +#include "com/sun/star/document/XEventListener.hpp" +#include "com/sun/star/document/XStorageBasedDocument.hpp" +#include "com/sun/star/embed/ElementModes.hpp" +#include "com/sun/star/embed/XStorage.hpp" +#include "com/sun/star/embed/XTransactedObject.hpp" +#include "com/sun/star/frame/XModel.hpp" +#include "com/sun/star/frame/XModuleManager.hpp" +#include "com/sun/star/frame/XStorable.hpp" +#include "com/sun/star/io/IOException.hpp" +#include "com/sun/star/io/XActiveDataSink.hpp" +#include "com/sun/star/io/XActiveDataStreamer.hpp" +#include "com/sun/star/io/XAsyncOutputMonitor.hpp" +#include "com/sun/star/io/XInputStream.hpp" +#include "com/sun/star/io/XOutputStream.hpp" +#include "com/sun/star/io/XSeekable.hpp" +#include "com/sun/star/io/XStream.hpp" +#include "com/sun/star/io/XTruncate.hpp" +#include "com/sun/star/lang/DisposedException.hpp" +#include "com/sun/star/lang/IllegalAccessException.hpp" +#include "com/sun/star/lang/IllegalArgumentException.hpp" +#include "com/sun/star/lang/XComponent.hpp" +#include "com/sun/star/lang/XInitialization.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/lang/XServiceInfo.hpp" +#include "com/sun/star/lang/XSingleServiceFactory.hpp" +#include "com/sun/star/lang/XTypeProvider.hpp" +#include "com/sun/star/packages/WrongPasswordException.hpp" +#include "com/sun/star/reflection/XProxyFactory.hpp" +#include "com/sun/star/registry/XRegistryKey.hpp" +#include "com/sun/star/script/XTypeConverter.hpp" +#include "com/sun/star/sdbc/DataType.hpp" +#include "com/sun/star/sdbc/FetchDirection.hpp" +#include "com/sun/star/sdbc/ResultSetType.hpp" +#include "com/sun/star/sdbc/XCloseable.hpp" +#include "com/sun/star/sdbc/XResultSet.hpp" +#include "com/sun/star/sdbc/XResultSetMetaData.hpp" +#include "com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp" +#include "com/sun/star/sdbc/XRow.hpp" +#include "com/sun/star/task/DocumentPasswordRequest.hpp" +#include "com/sun/star/task/NoMasterException.hpp" +#include "com/sun/star/task/PasswordRequestMode.hpp" +#include "com/sun/star/task/XInteractionAbort.hpp" +#include "com/sun/star/task/XInteractionApprove.hpp" +#include "com/sun/star/task/XInteractionDisapprove.hpp" +#include "com/sun/star/task/XInteractionHandler.hpp" +#include "com/sun/star/task/XInteractionPassword.hpp" +#include "com/sun/star/task/XInteractionRequest.hpp" +#include "com/sun/star/task/XPasswordContainer.hpp" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/Exception.hpp" +#include "com/sun/star/uno/Reference.h" +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/Type.hxx" +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/uno/XInterface.hpp" +#include "com/sun/star/uno/XReference.hpp" +#include "com/sun/star/uno/XWeak.hpp" +#include "com/sun/star/util/Date.hpp" +#include "com/sun/star/util/DateTime.hpp" +#include "com/sun/star/util/Time.hpp" +#include "com/sun/star/util/XChangesBatch.hpp" +#include "com/sun/star/util/XChangesNotifier.hpp" +#include "com/sun/star/util/XMacroExpander.hpp" +#include "com/sun/star/util/XOfficeInstallationDirectories.hpp" + +#include "comphelper/processfactory.hxx" + +#include "cppuhelper/bootstrap.hxx" +#include "cppuhelper/compbase2.hxx" +#include "cppuhelper/exc_hlp.hxx" +#include "cppuhelper/factory.hxx" +#include "cppuhelper/implbase1.hxx" +#include "cppuhelper/implbase2.hxx" +#include "cppuhelper/implbase5.hxx" +#include "cppuhelper/implementationentry.hxx" +#include "cppuhelper/interfacecontainer.h" +#include "cppuhelper/interfacecontainer.hxx" +#include "cppuhelper/queryinterface.hxx" +#include "cppuhelper/typeprovider.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakref.hxx" + +#include "libxml/parser.h" + +#include "osl/conditn.hxx" +#include "osl/diagnose.h" +#include "osl/doublecheckedlocking.h" +#include "osl/file.hxx" +#include "osl/interlck.h" +#include "osl/module.h" +#include "osl/mutex.hxx" +#include "osl/process.h" +#include "osl/security.hxx" +#include "osl/socket.h" +#include "osl/socket.hxx" +#include "osl/thread.h" +#include "osl/time.h" + +#include "rtl/alloc.h" +#include "rtl/memory.h" +#include "rtl/string.hxx" +#include "rtl/ustrbuf.hxx" +#include "rtl/ustring.h" +#include "rtl/ustring.hxx" + +#include "salhelper/simplereferenceobject.hxx" + +#include "sys/types.h" + +#include "ucbhelper/configurationkeys.hxx" +#include "ucbhelper/macros.hxx" +#include "ucbhelper/proxydecider.hxx" + +#include "vos/diagnose.hxx" +#include "vos/mutex.hxx" +#include "vos/process.hxx" +#include "vos/ref.hxx" +#include "vos/refernce.hxx" +//---MARKER--- + +#endif diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst index 224838010048..8272c9235cdf 100644 --- a/ucb/prj/build.lst +++ b/ucb/prj/build.lst @@ -1,22 +1,3 @@ uc ucb : cppuhelper CURL:curl OPENSSL:openssl LIBXML2:libxml2 LIBXSLT:libxslt offapi sal salhelper ucbhelper udkapi comphelper SERF:serf tools NULL uc ucb usr1 - all uc_mkout NULL -uc ucb\inc nmake - all uc_inc NULL -uc ucb\source\regexp nmake - all uc_regexp uc_inc NULL -uc ucb\source\core nmake - all uc_core uc_regexp uc_inc NULL -uc ucb\source\cacher nmake - all uc_cacher uc_inc NULL -uc ucb\source\sorter nmake - all uc_sorter uc_inc NULL -uc ucb\source\ucp\ftp nmake - all uc_ftp uc_inc NULL -uc ucb\source\ucp\file nmake - all uc_file uc_inc NULL -uc ucb\source\ucp\gvfs nmake - u uc_gvfs uc_inc NULL -uc ucb\source\ucp\gio nmake - u uc_gio uc_inc NULL -uc ucb\source\ucp\hierarchy nmake - all uc_hierarchy uc_inc NULL -uc ucb\source\ucp\webdav nmake - all uc_webdav uc_inc NULL -uc ucb\source\ucp\package nmake - all uc_package uc_inc NULL -uc ucb\source\ucp\tdoc nmake - all uc_tdoc uc_inc NULL -uc ucb\source\ucp\expand nmake - all uc_expand uc_inc NULL -uc ucb\source\ucp\ext nmake - all uc_ext uc_inc NULL -uc ucb\qa\unoapi nmake - all uc_qa_unoapi NULL - -uc ucb\qa\complex\ucb nmake - all uc_complex_ucb uc_inc NULL -# fails, please fix -# uc ucb\qa\complex\tdoc nmake - all uc_complex_tdoc uc_complex_tdoc_interfaces uc_inc NULL +uc ucb\prj nmake - all uc_prj NULL diff --git a/ucb/prj/d.lst b/ucb/prj/d.lst index 65a32e21fba3..e69de29bb2d1 100644 --- a/ucb/prj/d.lst +++ b/ucb/prj/d.lst @@ -1,46 +0,0 @@ -..\%__SRC%\bin\cached*.dll %_DEST%\bin%_EXT%\cached*.dll -..\%__SRC%\lib\libcached*.* %_DEST%\lib%_EXT%\libcached*.* -..\%__SRC%\bin\cached*.map %_DEST%\bin%_EXT%\cached*.map -..\%__SRC%\bin\cached*.sym %_DEST%\bin%_EXT%\cached*.sym -..\source\cacher\cached.xml %_DEST%\xml%_EXT%\cached.xml - -..\%__SRC%\bin\srtrs*.dll %_DEST%\bin%_EXT%\srtrs*.dll -..\%__SRC%\lib\libsrtrs*.* %_DEST%\lib%_EXT%\libsrtrs*.* -..\%__SRC%\bin\srtrs*.map %_DEST%\bin%_EXT%\srtrs*.map -..\%__SRC%\bin\srtrs*.sym %_DEST%\bin%_EXT%\srtrs*.sym -..\source\sorter\srtrs.xml %_DEST%\xml%_EXT%\srtrs.xml - -..\%__SRC%\bin\ucb*.dll %_DEST%\bin%_EXT%\ucb*.dll -..\%__SRC%\lib\libucb*.* %_DEST%\lib%_EXT%\libucb*.* -..\%__SRC%\misc\ucb*.map %_DEST%\bin%_EXT%\ucb*.map -..\%__SRC%\misc\ucb*.sym %_DEST%\bin%_EXT%\ucb*.sym -..\source\core\ucb.xml %_DEST%\xml%_EXT%\ucb.xml - -..\%__SRC%\bin\ucp*.dll %_DEST%\bin%_EXT%\ucp*.dll -..\%__SRC%\lib\libucp*.so %_DEST%\lib%_EXT%\libucp*.so -..\%__SRC%\lib\libucp*.dylib %_DEST%\lib%_EXT%\libucp*.dylib -..\%__SRC%\lib\ucp*.uno.so %_DEST%\lib%_EXT%\ucp*.uno.so -..\%__SRC%\lib\ucp*.uno.dylib %_DEST%\lib%_EXT%\ucp*.uno.dylib -..\%__SRC%\misc\ucp*.map %_DEST%\bin%_EXT%\ucp*.map -..\%__SRC%\misc\ucp*.sym %_DEST%\bin%_EXT%\ucp*.sym -..\source\ucp\file\ucpfile.xml %_DEST%\xml%_EXT%\ucpfile.xml -..\source\ucp\ftp\ucpftp.xml %_DEST%\xml%_EXT%\ucpftp.xml -..\source\ucp\hierarchy\ucphier.xml %_DEST%\xml%_EXT%\ucphier.xml -..\source\ucp\package\ucppkg.xml %_DEST%\xml%_EXT%\ucppkg.xml -..\source\ucp\webdav\ucpdav.xml %_DEST%\xml%_EXT%\ucpdav.xml -..\source\ucp\gvfs\ucpgvfs.xml %_DEST%\xml%_EXT%\ucpgvfs.xml -..\source\ucp\tdoc\ucptdoc.xml %_DEST%\xml%_EXT%\ucptdoc.xml - -..\%__SRC%\misc\ucpgvfs.component %_DEST%\xml%_EXT%\ucpgvfs.component -..\%__SRC%\misc\ucpgio.component %_DEST%\xml%_EXT%\ucpgio.component -..\%__SRC%\misc\cached1.component %_DEST%\xml%_EXT%\cached1.component -..\%__SRC%\misc\srtrs1.component %_DEST%\xml%_EXT%\srtrs1.component -..\%__SRC%\misc\ucb1.component %_DEST%\xml%_EXT%\ucb1.component -..\%__SRC%\misc\ucpdav1.component %_DEST%\xml%_EXT%\ucpdav1.component -..\%__SRC%\misc\ucpexpand1.component %_DEST%\xml%_EXT%\ucpexpand1.component -..\%__SRC%\misc\ucpext.component %_DEST%\xml%_EXT%\ucpext.component -..\%__SRC%\misc\ucpfile1.component %_DEST%\xml%_EXT%\ucpfile1.component -..\%__SRC%\misc\ucpftp1.component %_DEST%\xml%_EXT%\ucpftp1.component -..\%__SRC%\misc\ucphier1.component %_DEST%\xml%_EXT%\ucphier1.component -..\%__SRC%\misc\ucppkg1.component %_DEST%\xml%_EXT%\ucppkg1.component -..\%__SRC%\misc\ucptdoc1.component %_DEST%\xml%_EXT%\ucptdoc1.component diff --git a/ucb/qa/unoapi/makefile.mk b/ucb/prj/makefile.mk index 8969dc950788..c62c6a657d16 100644 --- a/ucb/qa/unoapi/makefile.mk +++ b/ucb/prj/makefile.mk @@ -21,26 +21,24 @@ -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../.. -PRJNAME = ucb -TARGET = qa_unoapi +PRJ=.. +TARGET=prj -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/ucb/qa/unoapi -JAVATESTFILES = Test.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END +.INCLUDE : settings.mk -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF -ALLTAR : javatest +.IF "$(DEBUG)"!="" +DEBUG_ARGUMENT=DEBUG=$(DEBUG) +.ELIF "$(debug)"!="" +DEBUG_ARGUMENT=debug=$(debug) +.ELSE +DEBUG_ARGUMENT= +.ENDIF -.END +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/ucb/qa/unoapi/Test.java b/ucb/qa/unoapi/Test.java index aee7250d4ef1..8037ba6c83f2 100644 --- a/ucb/qa/unoapi/Test.java +++ b/ucb/qa/unoapi/Test.java @@ -25,6 +25,7 @@ package org.openoffice.ucb.qa.unoapi; import org.openoffice.Runner; import org.openoffice.test.OfficeConnection; +import org.openoffice.test.Argument; import static org.junit.Assert.*; public final class Test { @@ -41,7 +42,7 @@ public final class Test { @org.junit.Test public void test() { assertTrue( Runner.run( - "-sce", "ucb.sce", "-xcl", "knownissues.xcl", "-cs", + "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-cs", connection.getDescription())); } diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 1affb4370946..923136c96561 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_cacher.hxx" #include <cachedcontentresultset.hxx> #include <com/sun/star/sdbc/FetchDirection.hpp> diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index f59569709e50..e71c2b688aa4 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_cacher.hxx" #include <cachedcontentresultsetstub.hxx> #include <com/sun/star/sdbc/FetchDirection.hpp> diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx index e32c96f5da85..e636fbd2f76d 100644 --- a/ucb/source/cacher/cacheddynamicresultset.cxx +++ b/ucb/source/cacher/cacheddynamicresultset.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_cacher.hxx" #include <cacheddynamicresultset.hxx> #include <com/sun/star/sdbc/XResultSet.hpp> diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx index 69d9e075b5c7..96985a5e14b8 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_cacher.hxx" #include <cacheddynamicresultsetstub.hxx> #include <com/sun/star/sdbc/XResultSet.hpp> diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx index ef9d6c407fd2..d19b21cb39ce 100644 --- a/ucb/source/cacher/cacheserv.cxx +++ b/ucb/source/cacher/cacheserv.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_cacher.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> @@ -37,14 +37,14 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index 1d55b8255c38..52939deced16 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_cacher.hxx" #include <contentresultsetwrapper.hxx> #include <com/sun/star/sdbc/FetchDirection.hpp> diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index 8eb2bc68caac..5a5e7421a723 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_cacher.hxx" #include <dynamicresultsetwrapper.hxx> #include <ucbhelper/macros.hxx> diff --git a/ucb/source/cacher/makefile.mk b/ucb/source/cacher/makefile.mk deleted file mode 100644 index 7439da2ca539..000000000000 --- a/ucb/source/cacher/makefile.mk +++ /dev/null @@ -1,72 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=..$/.. -PRJNAME=ucb -TARGET=cached -ENABLE_EXCEPTIONS=TRUE -NO_BSYMBOLIC=TRUE - -# Version -UCB_MAJOR=1 - -.INCLUDE: settings.mk -.IF "$(L10N_framework)"=="" - -SLOFILES=\ - $(SLO)$/contentresultsetwrapper.obj \ - $(SLO)$/cachedcontentresultsetstub.obj \ - $(SLO)$/cachedcontentresultset.obj \ - $(SLO)$/dynamicresultsetwrapper.obj \ - $(SLO)$/cacheddynamicresultsetstub.obj \ - $(SLO)$/cacheddynamicresultset.obj \ - $(SLO)$/cacheserv.obj - -LIB1TARGET=$(SLB)$/_$(TARGET).lib -LIB1OBJFILES=$(SLOFILES) - -SHL1TARGET=$(TARGET)$(UCB_MAJOR) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1STDLIBS=\ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -SHL1LIBS=$(LIB1TARGET) -SHL1IMPLIB=i$(TARGET) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -DEF1NAME=$(SHL1TARGET) -.ENDIF # L10N_framework - -.INCLUDE: target.mk - - -ALLTAR : $(MISC)/cached1.component - -$(MISC)/cached1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - cached1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt cached1.component diff --git a/ucb/source/core/makefile.mk b/ucb/source/core/makefile.mk deleted file mode 100644 index 75141054f9d9..000000000000 --- a/ucb/source/core/makefile.mk +++ /dev/null @@ -1,80 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=..$/.. -PRJNAME=ucb -TARGET=ucb -ENABLE_EXCEPTIONS=TRUE -NO_BSYMBOLIC=TRUE - -# Version -UCB_MAJOR=1 - -.INCLUDE: settings.mk -.IF "$(L10N_framework)"=="" - -SLOFILES=\ - $(SLO)$/identify.obj \ - $(SLO)$/ucb.obj \ - $(SLO)$/ucbserv.obj \ - $(SLO)$/ucbstore.obj \ - $(SLO)$/ucbprops.obj \ - $(SLO)$/provprox.obj \ - $(SLO)$/ucbcmds.obj \ - $(SLO)$/cmdenv.obj - -LIB1TARGET=$(SLB)$/_$(TARGET).lib -LIB1OBJFILES=$(SLOFILES) - -SHL1TARGET=$(TARGET)$(UCB_MAJOR) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1STDLIBS=\ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(UCBHELPERLIB) -SHL1LIBS=\ - $(LIB1TARGET) \ - $(SLB)$/regexp.lib -SHL1IMPLIB=i$(TARGET) - -.IF "$(GUI)" == "OS2" -DEF1EXPORTFILE=exports2.dxp -.ELSE -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -.ENDIF - -DEF1NAME=$(SHL1TARGET) - -.ENDIF # L10N_framework - -.INCLUDE: target.mk - - -ALLTAR : $(MISC)/ucb1.component - -$(MISC)/ucb1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - ucb1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt ucb1.component diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx index 3abf7d10f636..5391ae9d523c 100644 --- a/ucb/source/core/ucbserv.cxx +++ b/ucb/source/core/ucbserv.cxx @@ -36,14 +36,14 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx index ef6279b24f38..995bbd474a95 100644 --- a/ucb/source/sorter/sortdynres.cxx +++ b/ucb/source/sorter/sortdynres.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_sorter.hxx" #include <vector> #include <sortdynres.hxx> diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx index e2dd3b4df63b..8a952f297687 100644 --- a/ucb/source/sorter/sortmain.cxx +++ b/ucb/source/sorter/sortmain.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_sorter.hxx" #include <sortdynres.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> @@ -32,14 +32,14 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index 47341a0f7af0..1ea7c67aafff 100644 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_sorter.hxx" #include <vector> #include <sortresult.hxx> diff --git a/ucb/source/ucp/expand/makefile.mk b/ucb/source/ucp/expand/makefile.mk deleted file mode 100644 index 272919ac7031..000000000000 --- a/ucb/source/ucp/expand/makefile.mk +++ /dev/null @@ -1,65 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ = ..$/..$/.. -PRJNAME = ucb -UCPEXPAND_MAJOR = 1 -TARGET = ucpexpand$(UCPEXPAND_MAJOR).uno -ENABLE_EXCEPTIONS = TRUE -NO_BSYMBOLIC = TRUE - -.INCLUDE : settings.mk -DLLPRE = - -.IF "$(L10N_framework)"=="" - -SLOFILES= \ - $(SLO)$/ucpexpand.obj - -SHL1STDLIBS = \ - $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -SHL1VERSIONMAP = $(SOLARENV)/src/component.map -SHL1TARGET = $(TARGET) - -SHL1DEPN = -SHL1IMPLIB = i$(TARGET) -SHL1LIBS = $(SLB)$/$(TARGET).lib -SHL1DEF = $(MISC)$/$(SHL1TARGET).def - -DEF1NAME = $(SHL1TARGET) - -.ENDIF # L10N_framework - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/ucpexpand1.component - -$(MISC)/ucpexpand1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - ucpexpand1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt ucpexpand1.component diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index 173c092d74a5..570c03a27f2a 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_expand.hxx" #include "rtl/uri.hxx" #include "osl/mutex.hxx" diff --git a/ucb/source/ucp/ext/makefile.mk b/ucb/source/ucp/ext/makefile.mk deleted file mode 100644 index 8b00b49bb3f5..000000000000 --- a/ucb/source/ucp/ext/makefile.mk +++ /dev/null @@ -1,65 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ = ..$/..$/.. -PRJNAME = ucb -TARGET = ucpext.uno -ENABLE_EXCEPTIONS = TRUE - -.INCLUDE : settings.mk -DLLPRE = - -SLOFILES= \ - $(SLO)$/ucpext_provider.obj \ - $(SLO)$/ucpext_content.obj \ - $(SLO)$/ucpext_services.obj \ - $(SLO)$/ucpext_resultset.obj \ - $(SLO)$/ucpext_datasupplier.obj - -SHL1STDLIBS = \ - $(UCBHELPERLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(SALHELPERLIB) - -SHL1VERSIONMAP = $(SOLARENV)/src/component.map -SHL1TARGET = $(TARGET) - -SHL1DEPN = -SHL1IMPLIB = i$(TARGET) -SHL1LIBS = $(SLB)$/$(TARGET).lib -SHL1DEF = $(MISC)$/$(SHL1TARGET).def - -DEF1NAME = $(SHL1TARGET) - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/ucpext.component - -$(MISC)/ucpext.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - ucpext.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt ucpext.component diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index 4a454d6bbca0..85b31fabb256 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -21,7 +21,7 @@ -#include "precompiled_ucb.hxx" +#include "precompiled_ext.hxx" #include "ucpext_content.hxx" diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index d054124310ec..ca6de2fdd6d0 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -21,7 +21,7 @@ -#include "precompiled_ucb.hxx" +#include "precompiled_ext.hxx" #include "ucpext_datasupplier.hxx" #include "ucpext_content.hxx" diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 5d99048643a5..9824fca04ddb 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -21,7 +21,7 @@ -#include "precompiled_ucb.hxx" +#include "precompiled_ext.hxx" #include "ucpext_provider.hxx" #include "ucpext_content.hxx" diff --git a/ucb/source/ucp/ext/ucpext_resultset.cxx b/ucb/source/ucp/ext/ucpext_resultset.cxx index e7e65df80ad0..ddcd009bfa4b 100644 --- a/ucb/source/ucp/ext/ucpext_resultset.cxx +++ b/ucb/source/ucp/ext/ucpext_resultset.cxx @@ -21,7 +21,7 @@ -#include "precompiled_ucb.hxx" +#include "precompiled_ext.hxx" #include "ucpext_resultset.hxx" #include "ucpext_content.hxx" diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx index 6515ce89326d..6b2572f2ab0d 100644 --- a/ucb/source/ucp/ext/ucpext_services.cxx +++ b/ucb/source/ucp/ext/ucpext_services.cxx @@ -21,7 +21,7 @@ -#include "precompiled_ucb.hxx" +#include "precompiled_ext.hxx" #include "ucpext_provider.hxx" @@ -71,13 +71,13 @@ namespace ucb { namespace ucp { namespace ext extern "C" { //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) + SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //------------------------------------------------------------------------------------------------------------------ - void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) + SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::ucb::ucp::ext::s_aServiceEntries ); } diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 8a9590dab371..2dbd8807ea6b 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_file.hxx" #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> #include <osl/file.hxx> diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx index 1e3016cccaf8..5a0953d80586 100644 --- a/ucb/source/ucp/file/filcmd.cxx +++ b/ucb/source/ucp/file/filcmd.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_file.hxx" #include "filcmd.hxx" #include "shell.hxx" #include "prov.hxx" diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index 9c44e8b81227..4a9b79c75250 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_file.hxx" #include <stdio.h> #include "filglob.hxx" #ifndef _FILERROR_HXX_ diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx index 59d3208366d8..c61af2c2856e 100644 --- a/ucb/source/ucp/file/filid.cxx +++ b/ucb/source/ucp/file/filid.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_file.hxx" #include "filid.hxx" #include "shell.hxx" diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 9e4ffb9d0484..d5fbe3201c7a 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_file.hxx" #include "filinpstr.hxx" #ifndef _FILERROR_HXX_ #include "filerror.hxx" diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx index 7b4b9208394b..b99df9898734 100644 --- a/ucb/source/ucp/file/filinsreq.cxx +++ b/ucb/source/ucp/file/filinsreq.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_file.hxx" #include "filinsreq.hxx" #include "shell.hxx" #include "filglob.hxx" diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx index 9a7abbc52ac3..cee3949494fc 100644 --- a/ucb/source/ucp/file/filnot.cxx +++ b/ucb/source/ucp/file/filnot.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_file.hxx" #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/ucb/ContentAction.hpp> #include <com/sun/star/beans/PropertySetInfoChange.hpp> diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx index 10c5eb379461..dbb69c88736b 100644 --- a/ucb/source/ucp/file/filprp.cxx +++ b/ucb/source/ucp/file/filprp.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_file.hxx" #include "shell.hxx" #include "prov.hxx" #include "filprp.hxx" diff --git a/ucb/source/ucp/file/filrec.cxx b/ucb/source/ucp/file/filrec.cxx index 5cc4d23db036..51237946e7c3 100644 --- a/ucb/source/ucp/file/filrec.cxx +++ b/ucb/source/ucp/file/filrec.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_file.hxx" #include "filrec.hxx" diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx index ec60086faeab..90e39a8d68ff 100644 --- a/ucb/source/ucp/file/filrow.cxx +++ b/ucb/source/ucp/file/filrow.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_file.hxx" #include "filrow.hxx" #include "shell.hxx" #include "prov.hxx" diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 53067580bb80..0c3c29a452d3 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_file.hxx" #include <com/sun/star/ucb/WelcomeDynamicResultSetStruct.hpp> #include "filid.hxx" #include "shell.hxx" diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index d4ebc4e897d6..20513bb9be0d 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_file.hxx" #include "com/sun/star/io/IOException.hpp" #include "com/sun/star/uno/RuntimeException.hpp" #include "osl/diagnose.h" diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 9f18274f8325..50cab23dc493 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_file.hxx" #include "filtask.hxx" #include "filglob.hxx" diff --git a/ucb/source/ucp/file/makefile.mk b/ucb/source/ucp/file/makefile.mk deleted file mode 100644 index 7ac2ffbcba32..000000000000 --- a/ucb/source/ucp/file/makefile.mk +++ /dev/null @@ -1,84 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=..$/..$/.. -PRJNAME=ucb -TARGET=ucpfile -ENABLE_EXCEPTIONS=TRUE -NO_BSYMBOLIC=TRUE - -# Version -UCPFILE_MAJOR=1 - -.INCLUDE: settings.mk -.IF "$(L10N_framework)"=="" - -SLOFILES=\ - $(SLO)$/prov.obj \ - $(SLO)$/bc.obj \ - $(SLO)$/shell.obj \ - $(SLO)$/filtask.obj \ - $(SLO)$/filrow.obj \ - $(SLO)$/filrset.obj \ - $(SLO)$/filid.obj \ - $(SLO)$/filnot.obj \ - $(SLO)$/filprp.obj \ - $(SLO)$/filinpstr.obj \ - $(SLO)$/filstr.obj \ - $(SLO)$/filcmd.obj \ - $(SLO)$/filglob.obj \ - $(SLO)$/filinsreq.obj \ - $(SLO)$/filrec.obj - -LIB1TARGET=$(SLB)$/_$(TARGET).lib -LIB1OBJFILES=$(SLOFILES) - -SHL1TARGET=$(TARGET)$(UCPFILE_MAJOR) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1LIBS=$(LIB1TARGET) -SHL1IMPLIB=i$(TARGET) -SHL1STDLIBS=\ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(UCBHELPERLIB) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -.IF "$(GUI)" == "OS2" -DEF1EXPORTFILE=exports2.dxp -.ENDIF - -DEF1NAME=$(SHL1TARGET) -.ENDIF # L10N_framework - -.INCLUDE: target.mk - - -ALLTAR : $(MISC)/ucpfile1.component - -$(MISC)/ucpfile1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - ucpfile1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt ucpfile1.component diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 2c424fff0b2d..ca85b4a1b074 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_file.hxx" #include <osl/security.hxx> #include <osl/file.hxx> #include <osl/socket.h> @@ -48,14 +48,14 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::container; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index 7b6b65c0caa9..82b6d1f8ccdc 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_file.hxx" #ifndef INCLUDED_STL_STACK #include <stack> #define INCLUDED_STL_STACK diff --git a/ucb/source/ucp/ftp/ftpcfunc.cxx b/ucb/source/ucp/ftp/ftpcfunc.cxx index f6adc8b5d37c..3f598e340643 100644 --- a/ucb/source/ucp/ftp/ftpcfunc.cxx +++ b/ucb/source/ucp/ftp/ftpcfunc.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index e8a730561b07..4494e4b43d93 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx index 1383156e1a68..0dea699c6052 100644 --- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx +++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx index 0567cb01af39..3db80ee57580 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx index 6f1c2e9d801e..b5703a2ba078 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx index d6b6e9e417f9..58cb13c6698a 100644 --- a/ucb/source/ucp/ftp/ftpdirp.cxx +++ b/ucb/source/ucp/ftp/ftpdirp.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/ftp/ftpdynresultset.cxx b/ucb/source/ucp/ftp/ftpdynresultset.cxx index b78e04444741..e60e7d2418a8 100644 --- a/ucb/source/ucp/ftp/ftpdynresultset.cxx +++ b/ucb/source/ucp/ftp/ftpdynresultset.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" #include <com/sun/star/sdbc/XResultSet.hpp> #ifndef _FTP_FTPDYNRESULTSET_HXX_ #include "ftpdynresultset.hxx" diff --git a/ucb/source/ucp/ftp/ftpinpstr.cxx b/ucb/source/ucp/ftp/ftpinpstr.cxx index be88f35c6c4e..fb1db32119ec 100644 --- a/ucb/source/ucp/ftp/ftpinpstr.cxx +++ b/ucb/source/ucp/ftp/ftpinpstr.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx index a6151b5faa65..8c35244d86f0 100644 --- a/ucb/source/ucp/ftp/ftpintreq.cxx +++ b/ucb/source/ucp/ftp/ftpintreq.cxx @@ -23,7 +23,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" #include <com/sun/star/ucb/UnsupportedNameClashException.hpp> #include <com/sun/star/ucb/NameClash.hpp> #include "ftpintreq.hxx" diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx index f30c9f517197..8965dee0c32f 100644 --- a/ucb/source/ucp/ftp/ftploaderthread.cxx +++ b/ucb/source/ucp/ftp/ftploaderthread.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" /************************************************************************** TODO ************************************************************************** diff --git a/ucb/source/ucp/ftp/ftpresultsetI.cxx b/ucb/source/ucp/ftp/ftpresultsetI.cxx index 63f972eab7b6..824ad8733517 100644 --- a/ucb/source/ucp/ftp/ftpresultsetI.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetI.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" #include "ucbhelper/propertyvalueset.hxx" #include "rtl/ref.hxx" diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index 9acf6e7698dc..a001a8e84b33 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" #include <ucbhelper/contentidentifier.hxx> #include <com/sun/star/ucb/OpenMode.hpp> #include <com/sun/star/uno/Reference.h> diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx index 1f385f1d2287..503809c172b2 100644 --- a/ucb/source/ucp/ftp/ftpservices.cxx +++ b/ucb/source/ucp/ftp/ftpservices.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> @@ -32,14 +32,14 @@ using namespace com::sun::star; using namespace ftp; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx index 053618d398c5..a35384a898c6 100644 --- a/ucb/source/ucp/ftp/ftpurl.cxx +++ b/ucb/source/ucp/ftp/ftpurl.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" /************************************************************************** TODO ************************************************************************** diff --git a/ucb/source/ucp/ftp/makefile.mk b/ucb/source/ucp/ftp/makefile.mk deleted file mode 100644 index f186d3229dba..000000000000 --- a/ucb/source/ucp/ftp/makefile.mk +++ /dev/null @@ -1,106 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=..$/..$/.. -PRJNAME=ucb -TARGET=ucpftp -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE -NO_BSYMBOLIC=TRUE - -# Version -UCPFTP_MAJOR=1 - - -# --- Settings --------------------------------------------------------- - -.INCLUDE: settings.mk - -# --- General ----------------------------------------------------- -.IF "$(L10N_framework)"=="" -# first target ( shared library ) - -SLOFILES1=\ - $(SLO)$/ftpservices.obj \ - $(SLO)$/ftpcontentprovider.obj \ - $(SLO)$/ftpcontent.obj \ - $(SLO)$/ftpcontentidentifier.obj \ - $(SLO)$/ftpcontentcaps.obj \ - $(SLO)$/ftpdynresultset.obj \ - $(SLO)$/ftpresultsetbase.obj \ - $(SLO)$/ftpresultsetI.obj \ - $(SLO)$/ftploaderthread.obj \ - $(SLO)$/ftpinpstr.obj \ - $(SLO)$/ftpdirp.obj \ - $(SLO)$/ftpcfunc.obj \ - $(SLO)$/ftpurl.obj \ - $(SLO)$/ftpintreq.obj - -LIB1TARGET=$(SLB)$/_$(TARGET).lib -LIB1OBJFILES=$(SLOFILES1) - -# --- Shared-Library 1 --------------------------------------------------- - -SHL1TARGET=$(TARGET)$(UCPFTP_MAJOR) -SHL1IMPLIB=i$(TARGET) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -SHL1STDLIBS=\ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(UCBHELPERLIB) \ - $(CURLLIB) - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1LIBS= \ - $(LIB1TARGET) - -# --- Def-File --------------------------------------------------------- - -DEF1NAME=$(SHL1TARGET) - -.ENDIF # L10N_framework -.INCLUDE: target.mk - - - - - - - - - - - - - - -ALLTAR : $(MISC)/ucpftp1.component - -$(MISC)/ucpftp1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - ucpftp1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt ucpftp1.component diff --git a/ucb/source/ucp/ftp/test.cxx b/ucb/source/ucp/ftp/test.cxx index a33ddbe132cd..f2c27012e9c4 100644 --- a/ucb/source/ucp/ftp/test.cxx +++ b/ucb/source/ucp/ftp/test.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/ftp/test_activedatasink.cxx b/ucb/source/ucp/ftp/test_activedatasink.cxx index 896e4d357d4b..dcde5e996d4f 100644 --- a/ucb/source/ucp/ftp/test_activedatasink.cxx +++ b/ucb/source/ucp/ftp/test_activedatasink.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/ftp/test_ftpurl.cxx b/ucb/source/ucp/ftp/test_ftpurl.cxx index dbf07f9941cc..592ad97d7c15 100644 --- a/ucb/source/ucp/ftp/test_ftpurl.cxx +++ b/ucb/source/ucp/ftp/test_ftpurl.cxx @@ -23,7 +23,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" #include <com/sun/star/ucb/OpenMode.hpp> #include "ftpurl.hxx" #include "ftploaderthread.hxx" diff --git a/ucb/source/ucp/ftp/test_multiservicefac.cxx b/ucb/source/ucp/ftp/test_multiservicefac.cxx index 2d1ac16029d5..1a6dcf8e2325 100644 --- a/ucb/source/ucp/ftp/test_multiservicefac.cxx +++ b/ucb/source/ucp/ftp/test_multiservicefac.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_ftp.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 7682976ecd31..a62246500254 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -98,13 +98,13 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); } -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment **) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -extern "C" void * SAL_CALL component_getFactory( const sal_Char *pImplName, +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *pImplName, void *pServiceManager, void * ) { void * pRet = 0; diff --git a/ucb/source/ucp/gio/makefile.mk b/ucb/source/ucp/gio/makefile.mk deleted file mode 100644 index 6df20865f1b3..000000000000 --- a/ucb/source/ucp/gio/makefile.mk +++ /dev/null @@ -1,83 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=..$/..$/.. -PRJNAME=ucb -# Version -UCPGIO_MAJOR=1 -TARGET=ucpgio -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE -NO_BSYMBOLIC=TRUE - -.INCLUDE: settings.mk -.IF "$(L10N_framework)"=="" - -.IF "$(ENABLE_GIO)"!="" -COMPILER_WARN_ALL=TRUE -PKGCONFIG_MODULES=gio-2.0 -.INCLUDE: pkg_config.mk - -.IF "$(OS)" == "SOLARIS" -LINKFLAGS+=-z nodefs -.ENDIF # "$(OS)" == "SOLARIS" - -# no "lib" prefix -DLLPRE = - -SLOFILES=$(SLO)$/gio_provider.obj\ - $(SLO)$/gio_content.obj\ - $(SLO)$/gio_resultset.obj\ - $(SLO)$/gio_datasupplier.obj\ - $(SLO)$/gio_seekable.obj\ - $(SLO)$/gio_inputstream.obj\ - $(SLO)$/gio_outputstream.obj\ - $(SLO)$/gio_mount.obj - -SHL1TARGET=$(TARGET)$(UCPGIO_MAJOR).uno -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1LIBS=$(SLB)$/$(TARGET).lib -SHL1IMPLIB=i$(TARGET) -SHL1STDLIBS=\ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(UCBHELPERLIB) - -SHL1STDLIBS+=$(PKGCONFIG_LIBS) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -.ENDIF # "$(ENABLE_GIO)"!="" -.ENDIF # L10N_framework - -.INCLUDE: target.mk - -ALLTAR : $(MISC)/ucpgio.component - -$(MISC)/ucpgio.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - ucpgio.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt ucpgio.component diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx index f463684e73af..a9026d2bd7d4 100644 --- a/ucb/source/ucp/gvfs/gvfs_content.cxx +++ b/ucb/source/ucp/gvfs/gvfs_content.cxx @@ -21,8 +21,6 @@ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" #include <string.h> #include <unistd.h> #include <sys/types.h> diff --git a/ucb/source/ucp/gvfs/gvfs_directory.cxx b/ucb/source/ucp/gvfs/gvfs_directory.cxx index 60ae476d1912..38f8811733ba 100644 --- a/ucb/source/ucp/gvfs/gvfs_directory.cxx +++ b/ucb/source/ucp/gvfs/gvfs_directory.cxx @@ -21,8 +21,6 @@ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" /* * This file pinched from webdavdatasupplier (etc.) * cut & paste + new getData impl. & collate ResultSet code. diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx index de2b6bb0e771..420d3c875b6d 100644 --- a/ucb/source/ucp/gvfs/gvfs_provider.cxx +++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx @@ -21,9 +21,6 @@ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" - #include <ucbhelper/contentidentifier.hxx> #include <libgnomevfs/gnome-vfs-init.h> #include "gvfs_provider.hxx" @@ -138,14 +135,14 @@ ContentProvider::queryContent( //============================ shlib entry points ============================================= -extern "C" void SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment **/*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -extern "C" void * SAL_CALL +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char *pImplName, void *pServiceManager, void */*pRegistryKey*/ ) diff --git a/ucb/source/ucp/gvfs/gvfs_stream.cxx b/ucb/source/ucp/gvfs/gvfs_stream.cxx index 169747dca1b9..d59c93453513 100644 --- a/ucb/source/ucp/gvfs/gvfs_stream.cxx +++ b/ucb/source/ucp/gvfs/gvfs_stream.cxx @@ -21,8 +21,6 @@ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" #include "gvfs_stream.hxx" #include <rtl/memory.h> #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> diff --git a/ucb/source/ucp/gvfs/makefile.mk b/ucb/source/ucp/gvfs/makefile.mk deleted file mode 100644 index f0724aa991ba..000000000000 --- a/ucb/source/ucp/gvfs/makefile.mk +++ /dev/null @@ -1,87 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=..$/..$/.. -PRJNAME=ucb -# Version -UCPGVFS_MAJOR=1 -TARGET=ucpgvfs -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE -NO_BSYMBOLIC=TRUE - -.INCLUDE: settings.mk -.IF "$(L10N_framework)"=="" - -.IF "$(ENABLE_GNOMEVFS)"!="" -COMPILER_WARN_ALL=TRUE -PKGCONFIG_MODULES=gnome-vfs-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:s/ -llinc//:s/ -lbonobo-activation//:s/ -lgconf-2//:s/ -lORBit-2//:s/ -lIDL-2//:s/ -lgmodule-2.0//:s/ -lgobject-2.0//:s/ -lgthread-2.0//) -.ENDIF # "$(OS)" == "LINUX" - -# no "lib" prefix -DLLPRE = - -SLOFILES=\ - $(SLO)$/gvfs_content.obj \ - $(SLO)$/gvfs_directory.obj \ - $(SLO)$/gvfs_stream.obj \ - $(SLO)$/gvfs_provider.obj - -SHL1NOCHECK=TRUE -SHL1TARGET=$(TARGET)$(UCPGVFS_MAJOR).uno -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1LIBS=$(SLB)$/$(TARGET).lib -SHL1IMPLIB=i$(TARGET) -SHL1STDLIBS=\ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(UCBHELPERLIB) - -SHL1STDLIBS+=$(PKGCONFIG_LIBS) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -.ENDIF # "$(ENABLE_GNOMEVFS)"!="" -.ENDIF # L10N_framework - -.INCLUDE: target.mk - -ALLTAR : $(MISC)/ucpgvfs.component - -$(MISC)/ucpgvfs.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - ucpgvfs.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt ucpgvfs.component diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.cxx b/ucb/source/ucp/hierarchy/dynamicresultset.cxx index 036e2ad40697..1458589c3907 100644 --- a/ucb/source/ucp/hierarchy/dynamicresultset.cxx +++ b/ucb/source/ucp/hierarchy/dynamicresultset.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_hier.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 2bbfbb92b31a..33ff203cf7ec 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_hier.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx index 565237b5452e..4b1dbd629ab7 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_hier.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index 58e899bbeb8e..c95518ab4f11 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_hier.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 7b4e2ea7f6d8..0b1d37ec2696 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_hier.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx index 7e034742ecf3..60d83d1fee70 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_hier.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index 5c2de9b08e9d..332928b7098c 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_hier.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx index b18fdd18c24e..5ba4f2c76ca0 100644 --- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_hier.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include "hierarchyprovider.hxx" @@ -32,14 +32,14 @@ using namespace com::sun::star; using namespace hierarchy_ucp; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx index e9b55deb0cb2..bd2fb60c3b1d 100644 --- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_hier.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/hierarchy/makefile.mk b/ucb/source/ucp/hierarchy/makefile.mk deleted file mode 100644 index 9981727ccf60..000000000000 --- a/ucb/source/ucp/hierarchy/makefile.mk +++ /dev/null @@ -1,88 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=..$/..$/.. -PRJNAME=ucb -TARGET=ucphier -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE -NO_BSYMBOLIC=TRUE - -# Version -UCPHIER_MAJOR=1 - -# --- Settings --------------------------------------------------------- - -.INCLUDE: settings.mk - -# --- General ----------------------------------------------------- -.IF "$(L10N_framework)"=="" - -SLOFILES=\ - $(SLO)$/hierarchyservices.obj \ - $(SLO)$/hierarchydata.obj \ - $(SLO)$/hierarchyprovider.obj \ - $(SLO)$/hierarchycontent.obj \ - $(SLO)$/hierarchycontentcaps.obj \ - $(SLO)$/hierarchydatasupplier.obj \ - $(SLO)$/dynamicresultset.obj \ - $(SLO)$/hierarchydatasource.obj \ - $(SLO)$/hierarchyuri.obj - -LIB1TARGET=$(SLB)$/_$(TARGET).lib -LIB1OBJFILES=$(SLOFILES) - -# --- Shared-Library --------------------------------------------------- - -SHL1TARGET=$(TARGET)$(UCPHIER_MAJOR) -SHL1IMPLIB=i$(TARGET) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -SHL1STDLIBS=\ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(UCBHELPERLIB) - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1LIBS=$(LIB1TARGET) - -# --- Def-File --------------------------------------------------------- - -DEF1NAME=$(SHL1TARGET) - -# --- Targets ---------------------------------------------------------- - -.ENDIF # L10N_framework -.INCLUDE: target.mk - - -ALLTAR : $(MISC)/ucphier1.component - -$(MISC)/ucphier1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - ucphier1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt ucphier1.component diff --git a/ucb/source/ucp/package/makefile.mk b/ucb/source/ucp/package/makefile.mk deleted file mode 100644 index 644b7573332e..000000000000 --- a/ucb/source/ucp/package/makefile.mk +++ /dev/null @@ -1,93 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -# UCP Version - Increase, if UCP libraray becomes incompatible. -UCP_VERSION=1 - -# Name for UCP. Will become part of the library name (See below). -UCP_NAME=pkg - -PRJ=..$/..$/.. - -PRJNAME=ucb - -TARGET=ucp$(UCP_NAME) - -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE -NO_BSYMBOLIC=TRUE - -# --- Settings --------------------------------------------------------- - -.INCLUDE: settings.mk - -# --- General ----------------------------------------------------- -.IF "$(L10N_framework)"=="" - -SLOFILES=\ - $(SLO)$/pkgservices.obj \ - $(SLO)$/pkguri.obj \ - $(SLO)$/pkgprovider.obj \ - $(SLO)$/pkgcontent.obj \ - $(SLO)$/pkgcontentcaps.obj \ - $(SLO)$/pkgresultset.obj \ - $(SLO)$/pkgdatasupplier.obj - -LIB1TARGET=$(SLB)$/_$(TARGET).lib -LIB1OBJFILES=$(SLOFILES) - -# --- Shared-Library --------------------------------------------------- - -SHL1TARGET=$(TARGET)$(UCP_VERSION) -SHL1IMPLIB=i$(TARGET) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -SHL1STDLIBS=\ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(UCBHELPERLIB) - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1LIBS=$(LIB1TARGET) - -# --- Def-File --------------------------------------------------------- - -DEF1NAME=$(SHL1TARGET) - -# --- Targets ---------------------------------------------------------- - -.ENDIF # L10N_framework -.INCLUDE: target.mk - - -ALLTAR : $(MISC)/ucppkg1.component - -$(MISC)/ucppkg1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - ucppkg1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt ucppkg1.component diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index b90e18600bb4..c3c3b61fe25f 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_pkg.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx index bbaed42311f7..a24c7b93fbca 100644 --- a/ucb/source/ucp/package/pkgcontentcaps.cxx +++ b/ucb/source/ucp/package/pkgcontentcaps.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_pkg.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx index e7fe76bd267d..88881d6ed03d 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.cxx +++ b/ucb/source/ucp/package/pkgdatasupplier.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_pkg.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index f0fc95566f09..a1a8a762def3 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_pkg.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/package/pkgresultset.cxx b/ucb/source/ucp/package/pkgresultset.cxx index ebd006fb0a5e..90733b153982 100644 --- a/ucb/source/ucp/package/pkgresultset.cxx +++ b/ucb/source/ucp/package/pkgresultset.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_pkg.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx index a59707b4d7c1..f936e30521d8 100644 --- a/ucb/source/ucp/package/pkgservices.cxx +++ b/ucb/source/ucp/package/pkgservices.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_pkg.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> @@ -31,14 +31,14 @@ using namespace com::sun::star; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx index 3e25804037ba..fc01d05594af 100644 --- a/ucb/source/ucp/package/pkguri.cxx +++ b/ucb/source/ucp/package/pkguri.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_pkg.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/tdoc/makefile.mk b/ucb/source/ucp/tdoc/makefile.mk deleted file mode 100644 index 0b2dad51018d..000000000000 --- a/ucb/source/ucp/tdoc/makefile.mk +++ /dev/null @@ -1,98 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=..$/..$/.. -PRJNAME=ucb -# Version -UCPTDOC_MAJOR=1 -TARGET=ucptdoc$(UCPTDOC_MAJOR).uno -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE -NO_BSYMBOLIC=TRUE - -# --- Settings --------------------------------------------------------- - -.INCLUDE: settings.mk - -# --- General ----------------------------------------------------- -.IF "$(L10N_framework)"=="" - -# no "lib" prefix -DLLPRE = - -SLOFILES=\ - $(SLO)$/tdoc_provider.obj \ - $(SLO)$/tdoc_services.obj \ - $(SLO)$/tdoc_uri.obj \ - $(SLO)$/tdoc_content.obj \ - $(SLO)$/tdoc_contentcaps.obj \ - $(SLO)$/tdoc_storage.obj \ - $(SLO)$/tdoc_docmgr.obj \ - $(SLO)$/tdoc_datasupplier.obj \ - $(SLO)$/tdoc_resultset.obj \ - $(SLO)$/tdoc_documentcontentfactory.obj \ - $(SLO)$/tdoc_passwordrequest.obj \ - $(SLO)$/tdoc_stgelems.obj - -LIB1TARGET=$(SLB)$/_$(TARGET).lib -LIB1OBJFILES=$(SLOFILES) - -# --- Shared-Library --------------------------------------------------- - -SHL1TARGET=$(TARGET) -SHL1IMPLIB=i$(TARGET) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -SHL1STDLIBS=\ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(UCBHELPERLIB) - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1LIBS=$(LIB1TARGET) - -# Make symbol renaming match library name for Mac OS X -.IF "$(OS)"=="MACOSX" -SYMBOLPREFIX=$(TARGET) -.ENDIF - -DEF1NAME=$(SHL1TARGET) - -.ENDIF # L10N_framework - -# --- Targets ---------------------------------------------------------- - -.INCLUDE: target.mk - - -ALLTAR : $(MISC)/ucptdoc1.component - -$(MISC)/ucptdoc1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - ucptdoc1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt ucptdoc1.component diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index f417a54530f2..1ce128ff38ee 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_tdoc.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx index 1c01113b39b7..eaa866b1d44c 100644 --- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx +++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_tdoc.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx index 908308241e6d..a39ebf538f9a 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_tdoc.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 04b4683cd7e6..ab32c85c7227 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_tdoc.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx index 5748cff6d93e..0cb2093a74b9 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_tdoc.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx index 633b943fe34a..03a45a295d07 100644 --- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx +++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_tdoc.hxx" #include "osl/mutex.hxx" diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index 9b28be60e488..6fa13f1163ae 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_tdoc.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/tdoc/tdoc_resultset.cxx b/ucb/source/ucp/tdoc/tdoc_resultset.cxx index be0a9a6e0d28..99ff94d0e595 100644 --- a/ucb/source/ucp/tdoc/tdoc_resultset.cxx +++ b/ucb/source/ucp/tdoc/tdoc_resultset.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_tdoc.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx index 39a44019e1f4..7f67c7e38c3a 100644 --- a/ucb/source/ucp/tdoc/tdoc_services.cxx +++ b/ucb/source/ucp/tdoc/tdoc_services.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_tdoc.hxx" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/lang/XSingleServiceFactory.hpp" @@ -35,14 +35,14 @@ using namespace com::sun::star; using namespace tdoc_ucp; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx index f5ae2804e703..44bd289c4889 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_tdoc.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index d3ee864cab89..f94673f005d6 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_tdoc.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/tdoc/tdoc_uri.cxx b/ucb/source/ucp/tdoc/tdoc_uri.cxx index 33a79a0ea480..77bf2856dfa3 100644 --- a/ucb/source/ucp/tdoc/tdoc_uri.cxx +++ b/ucb/source/ucp/tdoc/tdoc_uri.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_tdoc.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/webdav/AprEnv.cxx b/ucb/source/ucp/webdav/AprEnv.cxx index 7df41b975107..0a3bb6a97284 100644 --- a/ucb/source/ucp/webdav/AprEnv.cxx +++ b/ucb/source/ucp/webdav/AprEnv.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "AprEnv.hxx" diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx index 8043d9326efe..f18609fddf4d 100644 --- a/ucb/source/ucp/webdav/ContentProperties.cxx +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx index 11d0544104c0..03af81443e99 100644 --- a/ucb/source/ucp/webdav/DAVProperties.cxx +++ b/ucb/source/ucp/webdav/DAVProperties.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include <string.h> #include "DAVProperties.hxx" diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx index 53bbba40c3cd..6ec66be140c2 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include <osl/diagnose.h> diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav/DAVSessionFactory.cxx index 27197a39982f..2f7fb267e7b6 100644 --- a/ucb/source/ucp/webdav/DAVSessionFactory.cxx +++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "DAVSessionFactory.hxx" #include "SerfSession.hxx" #include "SerfUri.hxx" diff --git a/ucb/source/ucp/webdav/DateTimeHelper.cxx b/ucb/source/ucp/webdav/DateTimeHelper.cxx index 912d9f81ad67..344cc7e31495 100644 --- a/ucb/source/ucp/webdav/DateTimeHelper.cxx +++ b/ucb/source/ucp/webdav/DateTimeHelper.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include <stdio.h> #include <osl/time.h> diff --git a/ucb/source/ucp/webdav/SerfCallbacks.cxx b/ucb/source/ucp/webdav/SerfCallbacks.cxx index e32d2c770012..5f056cb33156 100644 --- a/ucb/source/ucp/webdav/SerfCallbacks.cxx +++ b/ucb/source/ucp/webdav/SerfCallbacks.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "SerfCallbacks.hxx" diff --git a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx index 098e4590ce42..2e1f1fd4c034 100644 --- a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "SerfCopyReqProcImpl.hxx" diff --git a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx index 359b60e951e4..35e4d6071aeb 100644 --- a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "SerfDeleteReqProcImpl.hxx" diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx index 14f7848cfe14..1af2b73e76fd 100644 --- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "SerfGetReqProcImpl.hxx" diff --git a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx index 23d2ba13ff06..7ed257f9605e 100644 --- a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "SerfHeadReqProcImpl.hxx" diff --git a/ucb/source/ucp/webdav/SerfInputStream.cxx b/ucb/source/ucp/webdav/SerfInputStream.cxx index 192f97247ef5..98ef8cbe1d50 100644 --- a/ucb/source/ucp/webdav/SerfInputStream.cxx +++ b/ucb/source/ucp/webdav/SerfInputStream.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "SerfInputStream.hxx" #include <rtl/memory.h> diff --git a/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx b/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx index c2e662df8af4..84d5a4ea7369 100644 --- a/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "SerfTypes.hxx" #include "SerfLockRefreshProcImpl.hxx" diff --git a/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx index d1c8cb09ed44..5b87af626854 100644 --- a/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "SerfTypes.hxx" #include "SerfLockReqProcImpl.hxx" diff --git a/ucb/source/ucp/webdav/SerfLockStore.cxx b/ucb/source/ucp/webdav/SerfLockStore.cxx index 9f1894384b76..3cef5ce246c3 100644 --- a/ucb/source/ucp/webdav/SerfLockStore.cxx +++ b/ucb/source/ucp/webdav/SerfLockStore.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include <rtl/ustring.hxx> #include <osl/time.h> diff --git a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx index 8ba26d89975c..9c1ab5b35432 100644 --- a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "SerfMkColReqProcImpl.hxx" diff --git a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx index b57d3bfc87b1..3969ca7fa16f 100644 --- a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "SerfMoveReqProcImpl.hxx" diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx index 4d592409142d..dc6b7314b048 100644 --- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "SerfPostReqProcImpl.hxx" diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx index d7ee556b087a..3fd1ee53cde2 100644 --- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "SerfPropFindReqProcImpl.hxx" #include "SerfTypes.hxx" diff --git a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx index 40c9a2e5623e..723e838bc1e7 100644 --- a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx index a2253b2dc40c..3e58fcaaf78c 100644 --- a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include <rtl/ustring.hxx> diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx index 7db219cf71d6..65499518fe80 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "SerfRequestProcessor.hxx" #include "SerfRequestProcessorImpl.hxx" diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx index de4a41e0f6d2..2cee1e0c1310 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "SerfTypes.hxx" #include "SerfRequestProcessorImplFac.hxx" diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx index 9ceafa3538f0..1eb739e5be87 100644 --- a/ucb/source/ucp/webdav/SerfSession.cxx +++ b/ucb/source/ucp/webdav/SerfSession.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include <hash_map> #include <vector> diff --git a/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx b/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx index 6a7657c9e3bb..3e2509b998af 100644 --- a/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "SerfTypes.hxx" #include "SerfUnlockProcImpl.hxx" diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx index b9d423e321cc..e05bc6b9b565 100644 --- a/ucb/source/ucp/webdav/SerfUri.cxx +++ b/ucb/source/ucp/webdav/SerfUri.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include <string.h> #include <rtl/uri.hxx> diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx index b5047a2b2c87..9b19ed778feb 100644 --- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx +++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include <string.h> //#include <ne_xml.h> diff --git a/ucb/source/ucp/webdav/makefile.mk b/ucb/source/ucp/webdav/makefile.mk deleted file mode 100644 index 1df4a365f58f..000000000000 --- a/ucb/source/ucp/webdav/makefile.mk +++ /dev/null @@ -1,193 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -# UCP Version - Increase, if UCP libraray becomes incompatible. -UCP_VERSION=1 - -# Name for the UCP. Will become part of the library name (See below). -UCP_NAME=dav - -# Relative path to project root. -PRJ = ..$/..$/.. - -# Project Name. -PRJNAME=ucb - -TARGET=ucp$(UCP_NAME) - -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE -NO_BSYMBOLIC=TRUE - -# --- Settings --------------------------------------------------------- - -.INCLUDE: settings.mk -.IF "$(L10N_framework)"=="" - -APRINCDIR=apr -APRUTILINCDIR=apr-util -SERFINCDIR=serf - -# -# Extend the list of include paths depending on whether we use locally built -# or system versions of libraries apr, apr-util, serf, libxml -# -# We have to use CFLAGS for this because PRJINC is too inflexible (it adds /inc to everything.) -# - -.IF "$(SYSTEM_APR)" == "YES" -CFLAGS+= $(APR_CFLAGS) -SHL1STDLIBS+=$(APR_LIBS) -.ELSE -CFLAGS+= -I$(SOLARINCDIR)$/$(APRINCDIR) -SHL1STDLIBS+=$(INTERNAL_APR_LIBS) -.INCLUDE : apr_version.mk -CFLAGS+=\ - -DAPR_VERSION=\"$(APR_MAJOR).$(APR_MINOR).$(APR_MICRO)\" -.ENDIF - -.IF "$(SYSTEM_APR_UTIL)" == "YES" -CFLAGS+= $(APR_UTIL_CFLAGS) -SHL1STDLIBS+=$(APR_UTIL_LIBS) -.ELSE -CFLAGS+= -I$(SOLARINCDIR)$/$(APRUTILINCDIR) -SHL1STDLIBS+=$(INTERNAL_APR_UTIL_LIBS) -.INCLUDE : aprutil_version.mk -CFLAGS+=\ - -DAPR_UTIL_VERSION=\"$(APR_UTIL_MAJOR).$(APR_UTIL_MINOR).$(APR_UTIL_MICRO)\" -.ENDIF - -.IF "$(SYSTEM_SERF)" == "YES" -CFLAGS+= $(SERF_CFLAGS) -SHL1STDLIBS+=$(SERF_LIBS) -.ELSE -CFLAGS+= -I$(SOLARINCDIR)$/$(SERFINCDIR) -SHL1STDLIBS+=$(INTERNAL_SERF_LIBS) -.INCLUDE : serf_version.mk -CFLAGS+=\ - -DSERF_VERSION=\"$(SERF_MAJOR).$(SERF_MINOR).$(SERF_MICRO)\" -.ENDIF - -.IF "$(SYSTEM_LIBXML)" == "YES" -CFLAGS+= $(LIBXML_CFLAGS) -.ELSE -LIBXMLINCDIR=external$/libxml -CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR) -.ENDIF - -.IF "$(SYSTEM_OPENSSL)" == "YES" -CFLAGS+= -I$(OPENSSL_CFLAGS) -SHL1STDLIBS+= $(OPENSSLLIB) -.ELSE -SHL1STDLIBS+= $(OPENSSLLIBST) -.ENDIF - -# --- General ----------------------------------------------------- - -SLOFILES=\ - $(SLO)$/webdavservices.obj \ - $(SLO)$/webdavprovider.obj \ - $(SLO)$/webdavcontent.obj \ - $(SLO)$/webdavcontentcaps.obj \ - $(SLO)$/webdavresultset.obj \ - $(SLO)$/webdavdatasupplier.obj \ - $(SLO)$/ContentProperties.obj \ - $(SLO)$/DAVProperties.obj \ - $(SLO)$/DAVSessionFactory.obj \ - $(SLO)$/DAVResourceAccess.obj \ - $(SLO)$/AprEnv.obj \ - $(SLO)$/webdavresponseparser.obj \ - $(SLO)$/SerfUri.obj \ - $(SLO)$/SerfRequestProcessor.obj \ - $(SLO)$/SerfRequestProcessorImpl.obj \ - $(SLO)$/SerfRequestProcessorImplFac.obj \ - $(SLO)$/SerfPropFindReqProcImpl.obj \ - $(SLO)$/SerfPropPatchReqProcImpl.obj \ - $(SLO)$/SerfGetReqProcImpl.obj \ - $(SLO)$/SerfHeadReqProcImpl.obj \ - $(SLO)$/SerfPutReqProcImpl.obj \ - $(SLO)$/SerfPostReqProcImpl.obj \ - $(SLO)$/SerfDeleteReqProcImpl.obj \ - $(SLO)$/SerfMkColReqProcImpl.obj \ - $(SLO)$/SerfCopyReqProcImpl.obj \ - $(SLO)$/SerfMoveReqProcImpl.obj \ - $(SLO)$/SerfLockReqProcImpl.obj \ - $(SLO)$/SerfLockRefreshProcImpl.obj \ - $(SLO)$/SerfUnlockProcImpl.obj \ - $(SLO)$/SerfLockStore.obj \ - $(SLO)$/SerfSession.obj \ - $(SLO)$/SerfCallbacks.obj \ - $(SLO)$/SerfInputStream.obj \ - $(SLO)$/DateTimeHelper.obj \ - $(SLO)$/UCBDeadPropertyValue.obj - -LIB1TARGET=$(SLB)$/_$(TARGET).lib -LIB1OBJFILES=$(SLOFILES) - -# --- Shared-Library --------------------------------------------------- - -SHL1TARGET=$(TARGET)$(UCP_VERSION) -SHL1IMPLIB=i$(TARGET) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -SHL1STDLIBS+=\ - $(TOOLSLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(UCBHELPERLIB) \ - $(COMPHELPERLIB) \ - $(LIBXML2LIB) - -.IF "$(GUI)"=="WNT" -SHL1STDLIBS+= $(WSOCK32LIB) -.IF "$(WINDOWS_VISTA_PSDK)" != "" -SHL1STDLIBS+= $(WS2_32LIB) -.ENDIF -.ELSE # WNT -.IF "$(OS)"=="SOLARIS" -SHL1STDLIBS+= -lnsl -lsocket -ldl -.ENDIF # SOLARIS -.ENDIF # WNT - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1LIBS=$(LIB1TARGET) - -# --- Def-File --------------------------------------------------------- - -DEF1NAME=$(SHL1TARGET) - -.ENDIF # L10N_framework -# --- Targets ---------------------------------------------------------- - -.INCLUDE: target.mk - -ALLTAR : $(MISC)/ucpdav1.component - -$(MISC)/ucpdav1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - ucpdav1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt ucpdav1.component diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 5f664160aae5..cd643fcda5ee 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx index 42b82a0e1691..f5c4eb7e376b 100644 --- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" /************************************************************************** TODO ************************************************************************** diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx index bffe351feb71..67a5c7820842 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index b456897c4f23..4b5f3c04e3a4 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" /************************************************************************** TODO @@ -39,6 +39,9 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/container/XNameAccess.hpp> +#include <apr_version.h> +#include <apu_version.h> +#include <serf.h> using namespace com::sun::star; using namespace http_dav_ucp; @@ -50,17 +53,20 @@ rtl::OUString &WebDAVUserAgent::operator()() const aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "Apache " )); aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "$ooName/$ooSetupVersion" )); #if OSL_DEBUG_LEVEL > 0 -#ifdef APR_VERSION - aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " apr/" APR_VERSION )); -#endif - -#ifdef APR_UTIL_VERSION - aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " apr-util/" APR_UTIL_VERSION )); -#endif - -#ifdef SERF_VERSION - aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " serf/" SERF_VERSION )); -#endif + aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " apr/" ) ); + aBuffer.appendAscii(apr_version_string()); + + aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " apr-util/" ) ); + aBuffer.appendAscii(apu_version_string()); + + int major, minor, patch; + serf_lib_version(&major, &minor, &patch); + aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( " serf/" ) ); + aBuffer.append(major); + aBuffer.append( L'.' ); + aBuffer.append(minor); + aBuffer.append( L'.' ); + aBuffer.append(patch); #endif static rtl::OUString aUserAgent( aBuffer.makeStringAndClear() ); return aUserAgent; diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index acc4a0f62def..990b536c87c2 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -20,7 +20,7 @@ *************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include "webdavresponseparser.hxx" #include <com/sun/star/xml/sax/XDocumentHandler.hpp> diff --git a/ucb/source/ucp/webdav/webdavresultset.cxx b/ucb/source/ucp/webdav/webdavresultset.cxx index 727066c12436..a7b53144ba20 100644 --- a/ucb/source/ucp/webdav/webdavresultset.cxx +++ b/ucb/source/ucp/webdav/webdavresultset.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" /************************************************************************** TODO diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx index d1d43e80a5d0..9a92bbc435dd 100644 --- a/ucb/source/ucp/webdav/webdavservices.cxx +++ b/ucb/source/ucp/webdav/webdavservices.cxx @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_ucb.hxx" +#include "precompiled_webdav.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> @@ -31,14 +31,14 @@ using namespace com::sun::star; //========================================================================= -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //========================================================================= -extern "C" void * SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; |