[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - postprocess/packcomponents RepositoryExternal.mk Repository.mk set_soenv.in ucb/inc ucb/JunitTest_ucb_complex.mk ucb/JunitTest_ucb_unoapi.mk ucb/Library_cached1.mk ucb/Library_srtrs1.mk ucb/Library_ucb1.mk ucb/Library_ucpdav1.mk ucb/Library_ucpexpand1.mk ucb/Library_ucpext.mk ucb/Library_ucpfile1.mk ucb/Library_ucpftp1.mk ucb/Library_ucpgio1.mk ucb/Library_ucpgvfs1.mk ucb/Library_ucphier1.mk ucb/Library_ucppkg1.mk ucb/Library_ucptdoc1.mk ucb/Makefile ucb/Module_ucb.mk ucb/Package_xml.mk ucb/prj ucb/qa ucb/source

Damjan Jovanovic damjan at apache.org
Tue Jan 3 20:13:04 UTC 2017


 Repository.mk                                         |   13 +
 RepositoryExternal.mk                                 |   84 +++++++
 postprocess/packcomponents/makefile.mk                |   26 +-
 set_soenv.in                                          |    4 
 ucb/JunitTest_ucb_complex.mk                          |   42 +++
 ucb/JunitTest_ucb_unoapi.mk                           |   46 ++++
 ucb/Library_cached1.mk                                |   60 +++++
 ucb/Library_srtrs1.mk                                 |   56 +++++
 ucb/Library_ucb1.mk                                   |   63 +++++
 ucb/Library_ucpdav1.mk                                |  112 ++++++++++
 ucb/Library_ucpexpand1.mk                             |   54 +++++
 ucb/Library_ucpext.mk                                 |   60 +++++
 ucb/Library_ucpfile1.mk                               |   68 ++++++
 ucb/Library_ucpftp1.mk                                |   76 +++++++
 ucb/Library_ucpgio1.mk                                |   69 ++++++
 ucb/Library_ucpgvfs1.mk                               |   65 ++++++
 ucb/Library_ucphier1.mk                               |   63 +++++
 ucb/Library_ucppkg1.mk                                |   62 +++++
 ucb/Library_ucptdoc1.mk                               |   67 ++++++
 ucb/Makefile                                          |   32 ++
 ucb/Module_ucb.mk                                     |   60 +++++
 ucb/Package_xml.mk                                    |   36 +++
 ucb/inc/makefile.mk                                   |   44 ----
 ucb/inc/pch/precompiled_cacher.cxx                    |   25 ++
 ucb/inc/pch/precompiled_cacher.hxx                    |  180 ++++++++++++++++
 ucb/inc/pch/precompiled_expand.cxx                    |   25 ++
 ucb/inc/pch/precompiled_expand.hxx                    |  180 ++++++++++++++++
 ucb/inc/pch/precompiled_ext.cxx                       |   25 ++
 ucb/inc/pch/precompiled_ext.hxx                       |  180 ++++++++++++++++
 ucb/inc/pch/precompiled_file.cxx                      |   25 ++
 ucb/inc/pch/precompiled_file.hxx                      |  180 ++++++++++++++++
 ucb/inc/pch/precompiled_ftp.cxx                       |   25 ++
 ucb/inc/pch/precompiled_ftp.hxx                       |  180 ++++++++++++++++
 ucb/inc/pch/precompiled_hier.cxx                      |   25 ++
 ucb/inc/pch/precompiled_hier.hxx                      |  180 ++++++++++++++++
 ucb/inc/pch/precompiled_pkg.cxx                       |   25 ++
 ucb/inc/pch/precompiled_pkg.hxx                       |  180 ++++++++++++++++
 ucb/inc/pch/precompiled_sorter.cxx                    |   25 ++
 ucb/inc/pch/precompiled_sorter.hxx                    |  180 ++++++++++++++++
 ucb/inc/pch/precompiled_tdoc.cxx                      |   25 ++
 ucb/inc/pch/precompiled_tdoc.hxx                      |  180 ++++++++++++++++
 ucb/inc/pch/precompiled_webdav.cxx                    |   25 ++
 ucb/inc/pch/precompiled_webdav.hxx                    |  180 ++++++++++++++++
 ucb/prj/build.lst                                     |   21 -
 ucb/prj/d.lst                                         |   46 ----
 ucb/prj/makefile.mk                                   |   44 ++++
 ucb/qa/complex/ucb/makefile.mk                        |   58 -----
 ucb/qa/unoapi/Test.java                               |    3 
 ucb/qa/unoapi/makefile.mk                             |   46 ----
 ucb/source/cacher/cachedcontentresultset.cxx          |    2 
 ucb/source/cacher/cachedcontentresultsetstub.cxx      |    2 
 ucb/source/cacher/cacheddynamicresultset.cxx          |    2 
 ucb/source/cacher/cacheddynamicresultsetstub.cxx      |    2 
 ucb/source/cacher/cacheserv.cxx                       |    6 
 ucb/source/cacher/contentresultsetwrapper.cxx         |    2 
 ucb/source/cacher/dynamicresultsetwrapper.cxx         |    2 
 ucb/source/cacher/makefile.mk                         |   72 ------
 ucb/source/core/makefile.mk                           |   80 -------
 ucb/source/core/ucbserv.cxx                           |    4 
 ucb/source/regexp/makefile.mk                         |   37 ---
 ucb/source/sorter/makefile.mk                         |   67 ------
 ucb/source/sorter/sortdynres.cxx                      |    2 
 ucb/source/sorter/sortmain.cxx                        |    6 
 ucb/source/sorter/sortresult.cxx                      |    2 
 ucb/source/ucp/expand/makefile.mk                     |   65 ------
 ucb/source/ucp/expand/ucpexpand.cxx                   |    2 
 ucb/source/ucp/ext/makefile.mk                        |   65 ------
 ucb/source/ucp/ext/ucpext_content.cxx                 |    2 
 ucb/source/ucp/ext/ucpext_datasupplier.cxx            |    2 
 ucb/source/ucp/ext/ucpext_provider.cxx                |    2 
 ucb/source/ucp/ext/ucpext_resultset.cxx               |    2 
 ucb/source/ucp/ext/ucpext_services.cxx                |    6 
 ucb/source/ucp/file/bc.cxx                            |    2 
 ucb/source/ucp/file/filcmd.cxx                        |    2 
 ucb/source/ucp/file/filglob.cxx                       |    2 
 ucb/source/ucp/file/filid.cxx                         |    2 
 ucb/source/ucp/file/filinpstr.cxx                     |    2 
 ucb/source/ucp/file/filinsreq.cxx                     |    2 
 ucb/source/ucp/file/filnot.cxx                        |    2 
 ucb/source/ucp/file/filprp.cxx                        |    2 
 ucb/source/ucp/file/filrec.cxx                        |    2 
 ucb/source/ucp/file/filrow.cxx                        |    2 
 ucb/source/ucp/file/filrset.cxx                       |    2 
 ucb/source/ucp/file/filstr.cxx                        |    2 
 ucb/source/ucp/file/filtask.cxx                       |    2 
 ucb/source/ucp/file/makefile.mk                       |   84 -------
 ucb/source/ucp/file/prov.cxx                          |    6 
 ucb/source/ucp/file/shell.cxx                         |    2 
 ucb/source/ucp/ftp/ftpcfunc.cxx                       |    2 
 ucb/source/ucp/ftp/ftpcontent.cxx                     |    2 
 ucb/source/ucp/ftp/ftpcontentcaps.cxx                 |    2 
 ucb/source/ucp/ftp/ftpcontentidentifier.cxx           |    2 
 ucb/source/ucp/ftp/ftpcontentprovider.cxx             |    2 
 ucb/source/ucp/ftp/ftpdirp.cxx                        |    2 
 ucb/source/ucp/ftp/ftpdynresultset.cxx                |    2 
 ucb/source/ucp/ftp/ftpinpstr.cxx                      |    2 
 ucb/source/ucp/ftp/ftpintreq.cxx                      |    2 
 ucb/source/ucp/ftp/ftploaderthread.cxx                |    2 
 ucb/source/ucp/ftp/ftpresultsetI.cxx                  |    2 
 ucb/source/ucp/ftp/ftpresultsetbase.cxx               |    2 
 ucb/source/ucp/ftp/ftpservices.cxx                    |    6 
 ucb/source/ucp/ftp/ftpurl.cxx                         |    2 
 ucb/source/ucp/ftp/makefile.mk                        |  106 ---------
 ucb/source/ucp/ftp/test.cxx                           |    2 
 ucb/source/ucp/ftp/test_activedatasink.cxx            |    2 
 ucb/source/ucp/ftp/test_ftpurl.cxx                    |    2 
 ucb/source/ucp/ftp/test_multiservicefac.cxx           |    2 
 ucb/source/ucp/gio/gio_provider.cxx                   |    4 
 ucb/source/ucp/gio/makefile.mk                        |   83 -------
 ucb/source/ucp/gvfs/gvfs_content.cxx                  |    2 
 ucb/source/ucp/gvfs/gvfs_directory.cxx                |    2 
 ucb/source/ucp/gvfs/gvfs_provider.cxx                 |    7 
 ucb/source/ucp/gvfs/gvfs_stream.cxx                   |    2 
 ucb/source/ucp/gvfs/makefile.mk                       |   87 --------
 ucb/source/ucp/hierarchy/dynamicresultset.cxx         |    2 
 ucb/source/ucp/hierarchy/hierarchycontent.cxx         |    2 
 ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx     |    2 
 ucb/source/ucp/hierarchy/hierarchydata.cxx            |    2 
 ucb/source/ucp/hierarchy/hierarchydatasource.cxx      |    2 
 ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx    |    2 
 ucb/source/ucp/hierarchy/hierarchyprovider.cxx        |    2 
 ucb/source/ucp/hierarchy/hierarchyservices.cxx        |    6 
 ucb/source/ucp/hierarchy/hierarchyuri.cxx             |    2 
 ucb/source/ucp/hierarchy/makefile.mk                  |   88 --------
 ucb/source/ucp/package/makefile.mk                    |   93 --------
 ucb/source/ucp/package/pkgcontent.cxx                 |    2 
 ucb/source/ucp/package/pkgcontentcaps.cxx             |    2 
 ucb/source/ucp/package/pkgdatasupplier.cxx            |    2 
 ucb/source/ucp/package/pkgprovider.cxx                |    2 
 ucb/source/ucp/package/pkgresultset.cxx               |    2 
 ucb/source/ucp/package/pkgservices.cxx                |    6 
 ucb/source/ucp/package/pkguri.cxx                     |    2 
 ucb/source/ucp/tdoc/makefile.mk                       |   98 ---------
 ucb/source/ucp/tdoc/tdoc_content.cxx                  |    2 
 ucb/source/ucp/tdoc/tdoc_contentcaps.cxx              |    2 
 ucb/source/ucp/tdoc/tdoc_datasupplier.cxx             |    2 
 ucb/source/ucp/tdoc/tdoc_docmgr.cxx                   |    2 
 ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx   |    2 
 ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx          |    2 
 ucb/source/ucp/tdoc/tdoc_provider.cxx                 |    2 
 ucb/source/ucp/tdoc/tdoc_resultset.cxx                |    2 
 ucb/source/ucp/tdoc/tdoc_services.cxx                 |    6 
 ucb/source/ucp/tdoc/tdoc_stgelems.cxx                 |    2 
 ucb/source/ucp/tdoc/tdoc_storage.cxx                  |    2 
 ucb/source/ucp/tdoc/tdoc_uri.cxx                      |    2 
 ucb/source/ucp/webdav/AprEnv.cxx                      |    2 
 ucb/source/ucp/webdav/ContentProperties.cxx           |    2 
 ucb/source/ucp/webdav/DAVProperties.cxx               |    2 
 ucb/source/ucp/webdav/DAVResourceAccess.cxx           |    2 
 ucb/source/ucp/webdav/DAVSessionFactory.cxx           |    2 
 ucb/source/ucp/webdav/DateTimeHelper.cxx              |    2 
 ucb/source/ucp/webdav/SerfCallbacks.cxx               |    2 
 ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx         |    2 
 ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx       |    2 
 ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx          |    2 
 ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx         |    2 
 ucb/source/ucp/webdav/SerfInputStream.cxx             |    2 
 ucb/source/ucp/webdav/SerfLockRefreshProcImpl.cxx     |    2 
 ucb/source/ucp/webdav/SerfLockReqProcImpl.cxx         |    2 
 ucb/source/ucp/webdav/SerfLockStore.cxx               |    2 
 ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx        |    2 
 ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx         |    2 
 ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx         |    2 
 ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx     |    2 
 ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx    |    2 
 ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx          |    2 
 ucb/source/ucp/webdav/SerfRequestProcessor.cxx        |    2 
 ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx |    2 
 ucb/source/ucp/webdav/SerfSession.cxx                 |    2 
 ucb/source/ucp/webdav/SerfUnlockProcImpl.cxx          |    2 
 ucb/source/ucp/webdav/SerfUri.cxx                     |    2 
 ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx        |    2 
 ucb/source/ucp/webdav/makefile.mk                     |  193 ------------------
 ucb/source/ucp/webdav/webdavcontent.cxx               |    2 
 ucb/source/ucp/webdav/webdavcontentcaps.cxx           |    2 
 ucb/source/ucp/webdav/webdavdatasupplier.cxx          |    2 
 ucb/source/ucp/webdav/webdavprovider.cxx              |   30 +-
 ucb/source/ucp/webdav/webdavresponseparser.cxx        |    2 
 ucb/source/ucp/webdav/webdavresultset.cxx             |    2 
 ucb/source/ucp/webdav/webdavservices.cxx              |    6 
 180 files changed, 3454 insertions(+), 1601 deletions(-)

New commits:
commit 64cf9a38ec135b0a4da35e7fb00eae2e1ba6d89d
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Tue Jan 3 20:01:08 2017 +0000

    Move ucpgio and ucpgvfs to the UNOLIBS_OOO repository where they belong.
    
    Patch by: me

diff --git a/Repository.mk b/Repository.mk
index c22a890..3dc50ea 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -140,8 +140,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     ucpdav1 \
     ucpfile1 \
     ucpftp1 \
-    ucpgio1 \
-    ucpgvfs1 \
     ucphier1 \
     ucppkg1 \
     vcl \
@@ -215,6 +213,8 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
     vclcanvas \
     ucpext \
     ucpexpand1 \
+    ucpgio1 \
+    ucpgvfs1 \
     ucptdoc1 \
     uuresolver \
     writerfilter_debug \
commit 51e663482c94e93dab048ea122896c5215c31a0e
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Tue Jan 3 18:01:55 2017 +0000

    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

diff --git a/Repository.mk b/Repository.mk
index 9a7e6f0..c22a890 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     basctl \
     basebmp \
     basegfx \
+    cached1 \
     canvastools \
     communi \
     cppcanvas \
@@ -124,6 +125,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     sdd \
     sdui \
     sdfilt \
+    srtrs1 \
     sysdtran \
     sysdtrans \
     textconversiondlgs \
@@ -134,6 +136,14 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     unoxml \
     vbahelper \
     writerfilter \
+    ucb1 \
+    ucpdav1 \
+    ucpfile1 \
+    ucpftp1 \
+    ucpgio1 \
+    ucpgvfs1 \
+    ucphier1 \
+    ucppkg1 \
     vcl \
     vclplug_gen \
     vclplug_gtk \
@@ -203,6 +213,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
     vbaswobj \
     msforms \
     vclcanvas \
+    ucpext \
+    ucpexpand1 \
+    ucptdoc1 \
     uuresolver \
     writerfilter_debug \
 ))
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index dc2888a..e5c270f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -362,4 +362,88 @@ endef
 endif # SYSTEM_OPENSSL
 
 
+ifeq ($(SYSTEM_APR),YES)
+
+define gb_LinkTarget__use_apr
+$(call gb_LinkTarget_add_defs,$(1),\
+        -DSYSTEM_APR \
+)
+$(call gb_LinkTarget_set_include,$(1),\
+    $$(INCLUDE) \
+    $(APR_CFLAGS) \
+)       
+$(call gb_LinkTarget_add_libs,$(1),$(APR_LIBS))
+endef
+
+else # !SYSTEM_APR
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+    apr-1 \
+))
+
+define gb_LinkTarget__use_apr
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+    apr-1 \
+)
+endef
+
+endif # SYSTEM_APR
+
+
+ifeq ($(SYSTEM_APR_UTIL),YES)
+
+define gb_LinkTarget__use_apr_util
+$(call gb_LinkTarget_add_defs,$(1),\
+    -DSYSTEM_APR_UTIL \
+)
+$(call gb_LinkTarget_set_include,$(1),\
+    $$(INCLUDE) \
+    $(APR_UTIL_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(APR_UTIL_LIBS))
+endef
+
+else # !SYSTEM_APR_UTIL
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+    aprutil-1 \
+))
+
+define gb_LinkTarget__use_apr_util
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+    aprutil-1 \
+)
+endef
+
+endif # SYSTEM_APR_UTIL
+
+
+ifeq ($(SYSTEM_SERF),YES)
+
+define gb_LinkTarget__use_serf
+$(call gb_LinkTarget_add_defs,$(1),\
+    -DSYSTEM_SERF \
+)
+$(call gb_LinkTarget_set_include,$(1),\
+    $$(INCLUDE) \
+    $(SERF_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(SERF_LIBS))
+endef
+
+else # !SYSTEM_SERF
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+    serf-1 \
+))
+
+define gb_LinkTarget__use_serf
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+    serf-1 \
+)
+endef
+
+endif # SYSTEM_SERF
+
+
 # vim: set noet sw=4 ts=4:
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index d693667..a6171a0 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -49,7 +49,6 @@ my_components = \
     analysis \
     basprov \
     bib \
-    cached1 \
     calc \
     chartcontroller \
     chartmodel \
@@ -123,6 +122,17 @@ my_components = \
     component/unotools/util/utl \
     component/uui/util/uui \
     component/toolkit/util/ootk \
+    component/ucb/source/cacher/cached1 \
+    component/ucb/source/core/ucb1 \
+    component/ucb/source/sorter/srtrs1 \
+    component/ucb/source/ucp/expand/ucpexpand1 \
+    component/ucb/source/ucp/ext/ucpext \
+    component/ucb/source/ucp/file/ucpfile1 \
+    component/ucb/source/ucp/ftp/ucpftp1 \
+    component/ucb/source/ucp/hierarchy/ucphier1 \
+    component/ucb/source/ucp/package/ucppkg1 \
+    component/ucb/source/ucp/tdoc/ucptdoc1 \
+    component/ucb/source/ucp/webdav/ucpdav1 \
     component/unoxml/source/rdf/unordf \
     component/unoxml/source/service/unoxml \
     component/writerfilter/util/writerfilter \
@@ -169,22 +179,12 @@ my_components = \
     scriptframe \
     sdbc2 \
     spl \
-    srtrs1 \
     stringresource \
     svgfilter \
     syssh \
     t602filter \
     tvhlp1 \
-    ucb1 \
     ucpchelp1 \
-    ucpdav1 \
-    ucpexpand1 \
-    ucpext \
-    ucpfile1 \
-    ucpftp1 \
-    ucphier1 \
-    ucppkg1 \
-    ucptdoc1 \
     updatefeed \
     updchk \
     vbaevents \
@@ -254,11 +254,11 @@ my_components += gconfbe1
 .END
 
 .IF "$(ENABLE_GIO)" != ""
-my_components += ucpgio
+my_components += component/ucb/source/ucp/gio/ucpgio
 .END
 
 .IF "$(ENABLE_GNOMEVFS)" != ""
-my_components += ucpgvfs
+my_components += component/ucb/source/ucp/gvfs/ucpgvfs
 .END
 
 .IF "$(ENABLE_KAB)" != ""
diff --git a/set_soenv.in b/set_soenv.in
index 5cf8b92..4d23f3b 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1684,7 +1684,11 @@ ToFile( "SERVLETAPI_JAR",    "@SERVLETAPI_JAR@",   "e" );
 ToFile( "ENABLE_DBUS",       "@ENABLE_DBUS@",      "e" );
 ToFile( "ENABLE_GCONF",      "@ENABLE_GCONF@",     "e" );
 ToFile( "ENABLE_GNOMEVFS",   "@ENABLE_GNOMEVFS@",  "e" );
+ToFile( "GNOMEVFS_CFLAGS",   "@GNOMEVFS_CFLAGS@",  "e" );
+ToFile( "GNOMEVFS_LIBS",     "@GNOMEVFS_LIBS@",    "e" );
 ToFile( "ENABLE_GIO",        "@ENABLE_GIO@",       "e" );
+ToFile( "GIO_CFLAGS",        "@GIO_CFLAGS@",       "e" );
+ToFile( "GIO_LIBS",          "@GIO_LIBS@",         "e" );
 ToFile( "ENABLE_KDE",        "@ENABLE_KDE@",       "e" );
 ToFile( "KDE_CFLAGS",        "@KDE_CFLAGS@",       "e" );
 ToFile( "KDE_LIBS",          "@KDE_LIBS@",         "e" );
diff --git a/ucb/inc/makefile.mk b/ucb/JunitTest_ucb_complex.mk
similarity index 66%
rename from ucb/inc/makefile.mk
rename to ucb/JunitTest_ucb_complex.mk
index 774e1b4..1056f9b 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
similarity index 61%
rename from ucb/qa/complex/ucb/makefile.mk
rename to ucb/JunitTest_ucb_unoapi.mk
index f546bf7..9895bea 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 0000000..36106c7
--- /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 0000000..68430bb
--- /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 0000000..b19ba20
--- /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 0000000..1e074b7
--- /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 0000000..27bc698
--- /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 0000000..e2c7c22
--- /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 0000000..4a45673
--- /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 0000000..03ff1df
--- /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 0000000..a046a2a
--- /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
similarity index 51%
rename from ucb/source/sorter/makefile.mk
rename to ucb/Library_ucpgvfs1.mk
index 9c164b4..ea11bca 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 0000000..9a0a971
--- /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 0000000..7e45cf3
--- /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 0000000..e3db525
--- /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
similarity index 76%
rename from ucb/source/regexp/makefile.mk
rename to ucb/Makefile
index 941d1d2..c1d144c 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 0000000..5d7652e
--- /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 0000000..cf51ca5
--- /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 0000000..117df3b
--- /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 0000000..b552e11
--- /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 0000000..4a4ba6a
--- /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 0000000..b552e11
--- /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 0000000..73f66e3
--- /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 0000000..b552e11
--- /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 0000000..ba566a3
--- /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 0000000..b552e11
--- /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 0000000..b75352c
--- /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 0000000..b552e11
--- /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 0000000..1472d3a
--- /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 0000000..b552e11
--- /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 0000000..4fcb531
--- /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 0000000..b552e11
--- /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"

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list