ditch gnome-vfs2 support

Change-Id: I882c04fd3a255f55511b1884157de26e7574e6db
Reviewed-on: https://gerrit.libreoffice.org/18262
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

33 files changed, 6 insertions, 3499 deletions

diff --git a/Repository.mk b/Repository.mk
index 9eb35ca82c68..07336f75abef 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -248,7 +248,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
 	$(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
 	$(if $(ENABLE_GIO),losessioninstall) \
 	$(if $(ENABLE_GIO),ucpgio1) \
-	$(if $(ENABLE_GNOMEVFS),ucpgvfs1) \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \
diff --git a/config_host/config_vclplug.h.in b/config_host/config_vclplug.h.in
index 4daf38375766..b9ee53088e7e 100644
--- a/config_host/config_vclplug.h.in
+++ b/config_host/config_vclplug.h.in
@@ -11,7 +11,6 @@ Settings about which X11 desktops have support enabled.
 #define ENABLE_KDE 0
 #define ENABLE_KDE4 0
 #define ENABLE_TDE 0
-#define ENABLE_GNOME_VFS 0
 #define ENABLE_GIO 0
 
 #endif
diff --git a/configure.ac b/configure.ac
index 467f182ee1f0..8d832f1c160e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1166,12 +1166,6 @@ AC_ARG_ENABLE(gconf,
         [Determines whether to use the GConf support.]),
 ,enable_gconf=yes)
 
-AC_ARG_ENABLE(gnome-vfs,
-    AS_HELP_STRING([--enable-gnome-vfs],
-        [Determines whether to use the Gnome Virtual Filing System on platforms
-         where that VFS is available.]),
-,enable_gnome_vfs=no)
-
 AC_ARG_ENABLE(gio,
     AS_HELP_STRING([--disable-gio],
         [Determines whether to use the GIO support.]),
@@ -10070,25 +10064,6 @@ AC_SUBST(GCONF_CFLAGS)
 AC_SUBST(ENABLE_GCONF)
 
 dnl ===================================================================
-dnl Gnome VFS check
-dnl ===================================================================
-
-ENABLE_GNOMEVFS=""
-AC_MSG_CHECKING([whether to enable GNOME VFS support])
-if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes" -a "$enable_gconf" = "yes"; then
-    ENABLE_GNOMEVFS="TRUE"
-    AC_MSG_RESULT([yes])
-    PKG_CHECK_MODULES( GNOMEVFS, gnome-vfs-2.0 >= 2.6.0 )
-    GNOMEVFS_CFLAGS=$(printf '%s' "$GNOMEVFS_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
-    AC_DEFINE(ENABLE_GNOME_VFS)
-else
-    AC_MSG_RESULT([no])
-fi
-AC_SUBST(GNOMEVFS_LIBS)
-AC_SUBST(GNOMEVFS_CFLAGS)
-AC_SUBST(ENABLE_GNOMEVFS)
-
-dnl ===================================================================
 dnl check for dbus support
 dnl ===================================================================
 ENABLE_DBUS=""
@@ -10218,9 +10193,6 @@ if test  "$test_gtk" = "yes"; then
 
         AC_MSG_CHECKING([whether to enable GIO support])
         if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then
-            if test "$ENABLE_GNOMEVFS" = "TRUE"; then
-                AC_MSG_ERROR([please use --enable-gio only together with --disable-gnome-vfs.])
-            fi
             dnl Need at least 2.26 for the dbus support.
             PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.26],
                               [ENABLE_GIO="TRUE"], [ENABLE_GIO=""])
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 794071953dcd..7928ad027e13 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -72,33 +72,6 @@ static void configureUcb()
     // For backwards compatibility, in case some code still uses plain
     // createInstance w/o args directly to obtain an instance:
     UniversalContentBroker::create(comphelper::getProcessComponentContext());
-
-#if ENABLE_GNOME_VFS
-    try {
-        // Instantiate GNOME-VFS UCP in the thread that initialized GNOME in order
-        // to avoid a deadlock that may occur in case the UCP gets initialized from
-        // a different thread (which may happen when calling remotely via UNO); this
-        // is not a fix, just a workaround:
-        Reference< XCurrentContext > xCurrentContext(getCurrentContext());
-        Any aValue(xCurrentContext->getValueByName("system.desktop-environment"));
-        OUString aDesktopEnvironment;
-        if ((aValue >>= aDesktopEnvironment) && aDesktopEnvironment == "GNOME")
-        {
-            Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
-            UniversalContentBroker::create(xContext)
-                ->registerContentProvider(
-                        Reference<XContentProvider>(
-                        xContext->getServiceManager()->createInstanceWithContext(
-                                "com.sun.star.ucb.GnomeVFSContentProvider", xContext),
-                        UNO_QUERY_THROW),
-                        ".*", false);
-        }
-    }
-    catch ( const Exception & )
-    {
-        SAL_WARN( "desktop.app", "missing gnome-vfs component to initialize thread workaround" );
-    }
-#endif // ENABLE_GNOME_VFS
 }
 
 void Desktop::InitApplicationServiceManager()
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 4d58305bfc35..8963f06aea8f 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -2,7 +2,6 @@
 --disable-cairo-canvas
 --disable-cups
 --disable-gconf
---disable-gnome-vfs
 --disable-gstreamer-0-10
 --disable-gstreamer-1-0
 --disable-liblangtag
diff --git a/distro-configs/LibreOfficeAndroidAarch64.conf b/distro-configs/LibreOfficeAndroidAarch64.conf
index f488fc097c1c..05abdfcc5665 100644
--- a/distro-configs/LibreOfficeAndroidAarch64.conf
+++ b/distro-configs/LibreOfficeAndroidAarch64.conf
@@ -2,7 +2,6 @@
 --disable-cairo-canvas
 --disable-cups
 --disable-gconf
---disable-gnome-vfs
 --disable-gstreamer-0-10
 --disable-gstreamer-1-0
 --disable-liblangtag
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index 7a73a01a84bb..bf7085b93cce 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -2,7 +2,6 @@
 --disable-cairo-canvas
 --disable-cups
 --disable-gconf
---disable-gnome-vfs
 --disable-gstreamer-0-10
 --disable-gstreamer-1-0
 --disable-liblangtag
diff --git a/distro-configs/LibreOfficeCoverity.conf b/distro-configs/LibreOfficeCoverity.conf
index 43e57488c4d5..66218a17379a 100644
--- a/distro-configs/LibreOfficeCoverity.conf
+++ b/distro-configs/LibreOfficeCoverity.conf
@@ -1,7 +1,6 @@
 --enable-assert-always-abort
 --without-help
 --enable-gio
---disable-gnome-vfs
 --without-myspell-dicts
 --disable-ccache
 --disable-gstreamer-0-10
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 645c92f639a1..288f64d9affd 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -27,7 +27,6 @@
 --enable-gstreamer-0-10
 --disable-gstreamer-1-0
 --enable-evolution2
---disable-gnome-vfs
 --enable-gio
 --enable-scripting-beanshell
 --enable-scripting-javascript
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
index 05a739431359..5cdcc8eacbe0 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -1,6 +1,5 @@
 --disable-dbus
 --disable-epm
---disable-gnome-vfs
 --disable-kde
 --disable-kde4
 --disable-nss-module
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
index 72cb10d179ed..6e0f105b369b 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -26,7 +26,6 @@
 --enable-extra-font
 --with-lang=en-US hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs ko sl
 --enable-dbus
---enable-gnome-vfs
 --enable-extensions
 --enable-extension-integration
 --enable-ext-wiki-publisher
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 3eb754c3a90c..5d11a7ea116a 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -354,7 +354,6 @@ certain functionality.
 @li @c ucb.ucp.file
 @li @c ucb.ucp.ftp
 @li @c ucb.ucp.gio
-@li @c ucb.ucp.gvfs
 @li @c ucb.ucp.webdav
 
 @section unotools
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh b/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
index bd40ad3f4d92..4be8766870fa 100644
--- a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
+++ b/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
@@ -19,13 +19,6 @@
 
 cat > /dev/null
 [[ "${PLATFORMID}" == "linux_x86_64" ]] && mark64="()(64bit)"
-if [[ "${ENABLE_GNOMEVFS}" == "TRUE" ]]; then
-  if [[ "${OS}" == "AIX" ]]; then
-    echo "libgnomevfs-2.a(libgnomevfs-2.so.0${mark64})"
-  else
-    echo "libgnomevfs-2.so.0${mark64}"
-  fi
-fi
 if [[ "${OS}" == "AIX" ]]; then
   echo "libgconf-2.a(libgconf-2.so.4${mark64})"
 else
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 6d3b895baea1..eec7449c425d 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -329,11 +329,6 @@ postprocess_DRIVERS += ado
 endif
 ifneq ($(WITH_WEBDAV),)
 postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-webdav.xcu
-ifeq ($(WITH_WEBDAV),neon)
-ifeq ($(ENABLE_GNOMEVFS),TRUE)
-postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-webdav_neon_gnomevfs.xcu
-endif
-endif
 endif
 ifeq ($(ENABLE_EVOAB2),TRUE)
 postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 88b28ddc7518..07b4a972758d 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -199,9 +199,6 @@ $(eval $(call gb_Rdb_add_components,services,\
 		shell/source/sessioninstall/losessioninstall \
 		ucb/source/ucp/gio/ucpgio \
 	) \
-	$(if $(ENABLE_GNOMEVFS), \
-		ucb/source/ucp/gvfs/ucpgvfs \
-	) \
 	$(if $(ENABLE_GSTREAMER_1_0), \
 		avmedia/source/gstreamer/avmediagstreamer \
 	) \
diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
index 3e2fa774d9d8..686f6c16cb94 100644
--- a/scp2/InstallModule_gnome.mk
+++ b/scp2/InstallModule_gnome.mk
@@ -13,9 +13,8 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
 	ENABLE_GIO \
-	ENABLE_GNOMEVFS \
 	ENABLE_LOCKDOWN \
-        ENABLE_GTK \
+    ENABLE_GTK \
 ))
 
 $(eval $(call gb_InstallModule_add_scpfiles,scp2/gnome,\
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index ab776cc2cee1..0464d3542aed 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
 	$(if $(WITH_EXTENSION_INTEGRATION),\
 		scp2/extensions \
 	) \
-	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
+	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
 		scp2/gnome \
 	) \
 	$(if $(filter TRUE,$(ENABLE_KDE) $(ENABLE_KDE4)),\
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 2db4fc7e966d..5b8ad47e3c8c 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
 			InstallModule_winexplorerext \
 		) \
 	) \
-	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GNOMEVFS) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
+	$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GCONF) $(ENABLE_GIO) $(ENABLE_GTK) $(ENABLE_GTK3)),\
 		InstallModule_gnome \
 	) \
 	$(if $(filter TRUE,$(ENABLE_KDE) $(ENABLE_KDE4)),\
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 91d0a00bae62..08d9efeb7f57 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -26,11 +26,8 @@ Module gid_Module_Optional_Gnome
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC(MODULE_OPTIONAL_GNOME);
     Styles = ();
-#ifdef ENABLE_GNOMEVFS
-    XpdCheckSolaris = "SUNWgnome-vfs";
-#endif
     Files = (auto_gnome_ALL,
-#if (defined ENABLE_GNOMEVFS && defined ENABLE_LOCKDOWN) || defined ENABLE_GIO
+#if defined ENABLE_GIO
       gid_File_Share_Registry_Gnome_Xcd,
 #endif
       gid_File_Bin_Gnome_Open_Url
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index e4dde6fbaaaf..d58baccd9ba3 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -12,8 +12,6 @@ include $(SRCDIR)/sysui/productlist.mk
 
 ifeq ($(ENABLE_GIO),TRUE)
 	brand_URIPARAM := --urls
-else ifeq ($(ENABLE_GNOMEVFS),TRUE)
-	brand_URIPARAM := --urls
 else ifeq ($(ENABLE_TDE),TRUE)
 	brand_URIPARAM := --urls
 else ifeq ($(ENABLE_KDE),TRUE)
diff --git a/ucb/Library_ucpgvfs1.mk b/ucb/Library_ucpgvfs1.mk
deleted file mode 100644
index 58d1f75e4a26..000000000000
--- a/ucb/Library_ucpgvfs1.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Library_Library,ucpgvfs1))
-
-$(eval $(call gb_Library_set_componentfile,ucpgvfs1,ucb/source/ucp/gvfs/ucpgvfs))
-
-$(eval $(call gb_Library_set_include,ucpgvfs1,\
-	$(GNOMEVFS_CFLAGS) \
-	$$(INCLUDE) \
-))
-
-$(eval $(call gb_Library_use_sdk_api,ucpgvfs1))
-
-$(eval $(call gb_Library_add_libs,ucpgvfs1,\
-	$(GNOMEVFS_LIBS) \
-))
-
-$(eval $(call gb_Library_use_libraries,ucpgvfs1,\
-	comphelper \
-	cppu \
-	cppuhelper \
-	sal \
-	salhelper \
-	ucbhelper \
-))
-
-$(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_provider \
-	ucb/source/ucp/gvfs/gvfs_stream \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/ucb/Module_ucb.mk b/ucb/Module_ucb.mk
index c07d751014a0..a143aca3f635 100644
--- a/ucb/Module_ucb.mk
+++ b/ucb/Module_ucb.mk
@@ -30,12 +30,6 @@ $(eval $(call gb_Module_add_targets,ucb,\
 ))
 endif
 
-ifeq ($(ENABLE_GNOMEVFS),TRUE)
-$(eval $(call gb_Module_add_targets,ucb,\
-	Library_ucpgvfs1 \
-))
-endif
-
 $(eval $(call gb_Module_add_subsequentcheck_targets,ucb,\
 	JunitTest_ucb_complex \
 	JunitTest_ucb_unoapi \
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
deleted file mode 100644
index 29449f08634f..000000000000
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ /dev/null
@@ -1,1813 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-#include <sal/macros.h>
-#include <osl/time.h>
-#include <osl/diagnose.h>
-
-#include "osl/doublecheckedlocking.h"
-
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/beans/PropertySetInfoChange.hpp>
-#include <com/sun/star/beans/PropertySetInfoChangeEvent.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/TempFile.hpp>
-#include <com/sun/star/lang/IllegalAccessException.hpp>
-#include <com/sun/star/ucb/ContentInfoAttribute.hpp>
-#include <com/sun/star/ucb/InsertCommandArgument.hpp>
-#include <com/sun/star/ucb/InteractiveBadTransferURLException.hpp>
-#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
-#include <com/sun/star/ucb/InteractiveNetworkConnectException.hpp>
-#include <com/sun/star/ucb/InteractiveNetworkGeneralException.hpp>
-#include <com/sun/star/ucb/InteractiveNetworkReadException.hpp>
-#include <com/sun/star/ucb/InteractiveNetworkResolveNameException.hpp>
-#include <com/sun/star/ucb/InteractiveNetworkWriteException.hpp>
-#include <com/sun/star/ucb/NameClash.hpp>
-#include <com/sun/star/ucb/NameClashException.hpp>
-#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
-#include <com/sun/star/ucb/OpenMode.hpp>
-#include <com/sun/star/ucb/PostCommandArgument2.hpp>
-#include <com/sun/star/ucb/TransferInfo.hpp>
-#include <com/sun/star/ucb/XCommandInfo.hpp>
-#include <com/sun/star/ucb/XPersistentPropertySet.hpp>
-#include <com/sun/star/ucb/MissingInputStreamException.hpp>
-#include <com/sun/star/ucb/MissingPropertiesException.hpp>
-#include <com/sun/star/ucb/UnsupportedCommandException.hpp>
-#include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
-#include <com/sun/star/ucb/UnsupportedNameClashException.hpp>
-#include <com/sun/star/ucb/UnsupportedOpenModeException.hpp>
-#include <comphelper/processfactory.hxx>
-#include <ucbhelper/contentidentifier.hxx>
-#include <ucbhelper/propertyvalueset.hxx>
-#include <ucbhelper/interactionrequest.hxx>
-#include <ucbhelper/cancelcommandexecution.hxx>
-#include <ucbhelper/simpleauthenticationrequest.hxx>
-
-const int TRANSFER_BUFFER_SIZE = 65536;
-
-/*
- * NB. Name escaping is done only for URIs
- * the 'Title' property is unescaped on set/get
- */
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-result.h>
-#include <libgnomevfs/gnome-vfs-standard-callbacks.h>
-extern "C" { // missing in the header: doh.
-#  include <libgnomevfs/gnome-vfs-module-callback.h>
-}
-
-#include "gvfs_content.hxx"
-#include "gvfs_provider.hxx"
-#include "gvfs_directory.hxx"
-#include "gvfs_stream.hxx"
-
-using namespace gvfs;
-using namespace com::sun::star;
-
-#define CLEAR_INFO(info) memset((info), 0, sizeof ((info)[0]))
-
-
-static char *
-OUStringToGnome( const OUString &str )
-{
-    OString aTempStr = OUStringToOString( str, RTL_TEXTENCODING_UTF8 );
-    return g_strdup( aTempStr.getStr() );
-}
-
-static OUString
-GnomeToOUString( const char *utf8_str)
-{
-    if (!utf8_str)
-        return OUString();
-    else
-        return OUString( utf8_str, strlen( utf8_str ), RTL_TEXTENCODING_UTF8 );
-}
-
-
-Content::Content(
-          const uno::Reference< uno::XComponentContext >& rxContext,
-          ContentProvider* pProvider,
-          const uno::Reference< ucb::XContentIdentifier >& Identifier)
-  throw ( ucb::ContentCreationException )
-    : ContentImplHelper( rxContext, pProvider, Identifier ),
-      m_pProvider( pProvider ),
-      m_bTransient( sal_False )
-{
-    CLEAR_INFO (&m_info);
-#if OSL_DEBUG_LEVEL > 1
-    g_warning ("New Content ('%s')", getURI());
-#endif
-}
-
-Content::Content(
-    const uno::Reference< uno::XComponentContext >& rxContext,
-    ContentProvider                                   * pProvider,
-    const uno::Reference< ucb::XContentIdentifier >&    Identifier,
-    sal_Bool                                            IsFolder)
-        throw ( ucb::ContentCreationException )
-    : ContentImplHelper( rxContext, pProvider, Identifier ),
-      m_pProvider( pProvider ),
-      m_bTransient( sal_True )
-{
-    CLEAR_INFO (&m_info);
-
-#if OSL_DEBUG_LEVEL > 1
-    g_warning ("New Transient content ('%s') (%d)", getURI(), IsFolder);
-#endif
-//  m_info.name = FIXME: set name ?
-    m_info.valid_fields = GNOME_VFS_FILE_INFO_FIELDS_TYPE;
-    m_info.type = IsFolder ? GNOME_VFS_FILE_TYPE_DIRECTORY :
-                         GNOME_VFS_FILE_TYPE_REGULAR;
-}
-
-// virtual
-Content::~Content()
-{
-    gnome_vfs_file_info_clear( &m_info );
-}
-
-
-// XInterface methods.
-
-
-void SAL_CALL Content::acquire()
-    throw( )
-{
-    ContentImplHelper::acquire();
-}
-void SAL_CALL Content::release()
-    throw( )
-{
-    ContentImplHelper::release();
-}
-uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
-    throw ( uno::RuntimeException, std::exception )
-{
-    // Note: isFolder may require network activities! So call it only
-    //       if it is really necessary!!!
-    uno::Any aRet = cppu::queryInterface( rType,
-                        static_cast< ucb::XContentCreator * >( this ) );
-    if ( aRet.hasValue() )
-            return isFolder( uno::Reference< ucb::XCommandEnvironment >() )
-            ? aRet : uno::Any();
-    else
-        return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface( rType );
-}
-
-
-// XTypeProvider methods.
-
-
-XTYPEPROVIDER_COMMON_IMPL( Content );
-
-uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
-    throw( uno::RuntimeException, std::exception )
-{
-    static cppu::OTypeCollection *pFolderCollection = NULL;
-    static cppu::OTypeCollection *pFileCollection = NULL;
-
-    if (!pFolderCollection) {
-        osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
-
-        if (!pFolderCollection) {
-            static cppu::OTypeCollection aFolderCollection
-                (CPPU_TYPE_REF( lang::XTypeProvider ),
-                 CPPU_TYPE_REF( lang::XServiceInfo ),
-                 CPPU_TYPE_REF( lang::XComponent ),
-                 CPPU_TYPE_REF( ucb::XContent ),
-                 CPPU_TYPE_REF( ucb::XCommandProcessor ),
-                 CPPU_TYPE_REF( beans::XPropertiesChangeNotifier ),
-                 CPPU_TYPE_REF( ucb::XCommandInfoChangeNotifier ),
-                 CPPU_TYPE_REF( beans::XPropertyContainer ),
-                 CPPU_TYPE_REF( beans::XPropertySetInfoChangeNotifier ),
-                 CPPU_TYPE_REF( container::XChild ),
-                 CPPU_TYPE_REF( ucb::XContentCreator ) ); // !!
-            static cppu::OTypeCollection aFileCollection
-                (CPPU_TYPE_REF( lang::XTypeProvider ),
-                 CPPU_TYPE_REF( lang::XServiceInfo ),
-                 CPPU_TYPE_REF( lang::XComponent ),
-                 CPPU_TYPE_REF( ucb::XContent ),
-                 CPPU_TYPE_REF( ucb::XCommandProcessor ),
-                 CPPU_TYPE_REF( beans::XPropertiesChangeNotifier ),
-                 CPPU_TYPE_REF( ucb::XCommandInfoChangeNotifier ),
-                 CPPU_TYPE_REF( beans::XPropertyContainer ),
-                 CPPU_TYPE_REF( beans::XPropertySetInfoChangeNotifier ),
-                 CPPU_TYPE_REF( container::XChild ) );
-
-            pFolderCollection = &aFolderCollection;
-            pFileCollection = &aFileCollection;
-            OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
-        }
-    }
-    else {
-        OSL_DOUBLE_CHECKED_LOCKING_MEMORY_BARRIER();
-    }
-
-    if ( isFolder( uno::Reference< ucb::XCommandEnvironment >() ) )
-        return pFolderCollection->getTypes();
-    else
-        return pFileCollection->getTypes();
-}
-
-
-// XServiceInfo methods.
-
-
-OUString SAL_CALL Content::getImplementationName()
-    throw( uno::RuntimeException )
-{
-    return OUString("com.sun.star.comp.GnomeVFSContent");
-}
-
-uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
-    throw( uno::RuntimeException )
-{
-    uno::Sequence< OUString > aSNS( 1 );
-    aSNS.getArray()[ 0 ] = "com.sun.star.ucb.GnomeVFSContent";
-    return aSNS;
-}
-
-
-// XContent methods.
-
-
-OUString SAL_CALL Content::getContentType()
-    throw( uno::RuntimeException )
-{
-    if ( isFolder( uno::Reference< ucb::XCommandEnvironment >() ) )
-        return OUString( GVFS_FOLDER_TYPE );
-    else
-        return OUString( GVFS_FILE_TYPE );
-}
-
-
-// XCommandProcessor methods.
-
-
-uno::Any Content::getBadArgExcept()
-{
-    return uno::makeAny( lang::IllegalArgumentException
-                 ( OUString("Wrong argument type!"),
-                   static_cast< cppu::OWeakObject * >( this ),
-                   -1 ) );
-}
-
-uno::Any SAL_CALL Content::execute(
-        const ucb::Command& aCommand,
-        sal_Int32 /*CommandId*/,
-        const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw( uno::Exception,
-           ucb::CommandAbortedException,
-           uno::RuntimeException )
-{
-    uno::Any aRet;
-
-#if OSL_DEBUG_LEVEL > 1
-    {
-        uno::Reference< task::XInteractionHandler > xIH;
-
-        if ( xEnv.is() )
-            xIH = xEnv->getInteractionHandler();
-        g_warning( "Execute command: '%s' with %s interaction env",
-               OUStringToGnome( aCommand.Name ),
-               xIH.is() ? "" : "NO" );
-    }
-#endif
-
-#define COMMAND_IS(cmd,name) ( (cmd).Name == name )
-
-    if ( COMMAND_IS( aCommand, "getPropertyValues" ) ) {
-        uno::Sequence< beans::Property > Properties;
-
-        if ( !( aCommand.Argument >>= Properties ) )
-            ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
-
-        aRet <<= getPropertyValues( Properties, xEnv );
-
-    } else if ( COMMAND_IS( aCommand, "setPropertyValues" ) ) {
-        uno::Sequence< beans::PropertyValue > aProperties;
-
-        if ( !( aCommand.Argument >>= aProperties ) ||
-             !aProperties.getLength() )
-            ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
-
-        aRet <<= setPropertyValues( aProperties, xEnv );
-
-    } else if ( COMMAND_IS( aCommand, "getPropertySetInfo" ) ) {
-        aRet <<= getPropertySetInfo( xEnv, false );
-
-    } else if ( COMMAND_IS( aCommand, "getCommandInfo" ) ) {
-        aRet <<= getCommandInfo( xEnv, false );
-
-    } else if ( COMMAND_IS( aCommand, "open" ) ) {
-        ucb::OpenCommandArgument2 aOpenCommand;
-        if ( !( aCommand.Argument >>= aOpenCommand ) )
-            ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
-
-        sal_Bool bOpenFolder =
-            ( ( aOpenCommand.Mode == ucb::OpenMode::ALL ) ||
-              ( aOpenCommand.Mode == ucb::OpenMode::FOLDERS ) ||
-              ( aOpenCommand.Mode == ucb::OpenMode::DOCUMENTS ) );
-
-        if ( bOpenFolder && isFolder( xEnv ) ) {
-            uno::Reference< ucb::XDynamicResultSet > xSet
-                = new DynamicResultSet( m_xContext, this, aOpenCommand, xEnv );
-            aRet <<= xSet;
-
-        } else if ( aOpenCommand.Sink.is() ) {
-
-            if ( ( aOpenCommand.Mode
-                   == ucb::OpenMode::DOCUMENT_SHARE_DENY_NONE ) ||
-                 ( aOpenCommand.Mode
-                   == ucb::OpenMode::DOCUMENT_SHARE_DENY_WRITE ) ) {
-                ucbhelper::cancelCommandExecution
-                    ( uno::makeAny ( ucb::UnsupportedOpenModeException
-                             ( OUString(),
-                               static_cast< cppu::OWeakObject * >( this ),
-                               sal_Int16( aOpenCommand.Mode ) ) ),
-                      xEnv );
-            }
-            if ( !feedSink( aOpenCommand.Sink, xEnv ) ) {
-                // Note: aOpenCommand.Sink may contain an XStream
-                //       implementation. Support for this type of
-                //       sink is optional...
-#ifdef DEBUG
-                g_warning ("Failed to load data from '%s'", getURI());
-#endif
-                ucbhelper::cancelCommandExecution
-                    ( uno::makeAny (ucb::UnsupportedDataSinkException
-                            ( OUString(),
-                              static_cast< cppu::OWeakObject * >( this ),
-                              aOpenCommand.Sink ) ),
-                      xEnv );
-            }
-        }
-#ifdef DEBUG
-        else
-            g_warning ("Open falling through ...");
-#endif
-
-    } else if ( COMMAND_IS( aCommand, "createNewContent" ) && isFolder( xEnv ) ) {
-        ucb::ContentInfo arg;
-        if ( !( aCommand.Argument >>= arg ) )
-            ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
-
-        aRet <<= createNewContent( arg );
-
-    } else if ( COMMAND_IS( aCommand, "insert" ) ) {
-        ucb::InsertCommandArgument arg;
-        if ( !( aCommand.Argument >>= arg ) )
-            ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
-
-        insert( arg.Data, arg.ReplaceExisting, xEnv );
-
-    } else if ( COMMAND_IS( aCommand, "delete" ) ) {
-
-        sal_Bool bDeletePhysical = sal_False;
-        aCommand.Argument >>= bDeletePhysical;
-
-        OString aURI = getOURI();
-        GnomeVFSResult result = gnome_vfs_unlink (aURI.getStr());
-
-        if (result != GNOME_VFS_OK)
-            cancelCommandExecution( result, xEnv, sal_True );
-
-        destroy( bDeletePhysical );
-
-    } else if ( COMMAND_IS( aCommand, "transfer" ) && isFolder( xEnv ) ) {
-        ucb::TransferInfo transferArgs;
-
-        if ( !( aCommand.Argument >>= transferArgs ) )
-            ucbhelper::cancelCommandExecution( getBadArgExcept(), xEnv );
-
-        transfer( transferArgs, xEnv );
-
-    } else { // Unsupported
-#ifdef DEBUG
-        g_warning( "Unsupported command: '%s'",
-               OUStringToGnome( aCommand.Name ) );
-#endif
-        ucbhelper::cancelCommandExecution
-            ( uno::makeAny( ucb::UnsupportedCommandException
-                    ( OUString(),
-                      static_cast< cppu::OWeakObject * >( this ) ) ),
-              xEnv );
-    }
-#undef COMMAND_IS
-
-    return aRet;
-}
-
-void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
-    throw( uno::RuntimeException )
-{
-    // FIXME: we should use the GnomeVFSCancellation APIs here ...
-}
-
-
-// XContentCreator methods.
-
-
-uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo(
-    const uno::Reference< ucb::XCommandEnvironment >& xEnv)
-            throw( uno::RuntimeException )
-{
-    if ( isFolder( xEnv ) )
-    {
-        uno::Sequence< ucb::ContentInfo > seq(2);
-
-        // Minimum set of props we really need
-        uno::Sequence< beans::Property > props( 1 );
-        props[0] = beans::Property(
-            OUString("Title"),
-            -1,
-            cppu::UnoType<OUString>::get(),
-            beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND );
-
-        // file
-        seq[0].Type       = OUString( GVFS_FILE_TYPE );
-        seq[0].Attributes = ( ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM |
-                              ucb::ContentInfoAttribute::KIND_DOCUMENT );
-        seq[0].Properties = props;
-
-        // folder
-        seq[1].Type       = OUString( GVFS_FOLDER_TYPE );
-        seq[1].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER;
-        seq[1].Properties = props;
-
-        return seq;
-    }
-    else
-    {
-        return uno::Sequence< ucb::ContentInfo >();
-    }
-}
-
-uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo()
-            throw( uno::RuntimeException )
-{
-    return queryCreatableContentsInfo( uno::Reference< ucb::XCommandEnvironment >() );
-}
-
-uno::Reference< ucb::XContent > SAL_CALL
-Content::createNewContent( const ucb::ContentInfo& Info )
-    throw( uno::RuntimeException )
-{
-    bool create_document;
-    const char *name;
-
-        if ( Info.Type == GVFS_FILE_TYPE )
-        create_document = true;
-    else if ( Info.Type == GVFS_FOLDER_TYPE )
-        create_document = false;
-    else {
-#ifdef DEBUG
-        g_warning( "Failed to create new content '%s'",
-               OUStringToGnome( Info.Type ) );
-#endif
-        return uno::Reference< ucb::XContent >();
-    }
-
-#if OSL_DEBUG_LEVEL > 1
-    g_warning( "createNewContent (%d)", (int) create_document );
-#endif
-
-    OUString aURL = getOUURI();
-
-    if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
-        aURL += "/";
-
-    name = create_document ? "[New_Content]" : "[New_Collection]";
-    // This looks problematic to me cf. webdav
-    aURL += OUString::createFromAscii( name );
-
-    uno::Reference< ucb::XContentIdentifier > xId
-        ( new ::ucbhelper::ContentIdentifier( aURL ) );
-
-    try {
-        return new ::gvfs::Content( m_xContext, m_pProvider, xId, !create_document );
-    } catch ( ucb::ContentCreationException & ) {
-        return uno::Reference< ucb::XContent >();
-    }
-}
-
-OUString Content::getParentURL()
-{
-    OUString aParentURL;
-    // <scheme>://              -> ""
-    // <scheme>://foo           -> ""
-    // <scheme>://foo/          -> ""
-    // <scheme>://foo/bar       -> <scheme>://foo/
-    // <scheme>://foo/bar/      -> <scheme>://foo/
-    // <scheme>://foo/bar/abc   -> <scheme>://foo/bar/
-
-    OUString aURL = getOUURI();
-
-    sal_Int32 nPos = aURL.lastIndexOf( '/' );
-    if ( nPos == ( aURL.getLength() - 1 ) ) {
-        // Trailing slash found. Skip.
-        nPos = aURL.lastIndexOf( '/', nPos );
-    }
-
-    sal_Int32 nPos1 = aURL.lastIndexOf( '/', nPos );
-    if ( nPos1 != -1 )
-        nPos1 = aURL.lastIndexOf( '/', nPos1 );
-
-    if ( nPos1 != -1 )
-        aParentURL = aURL.copy( 0, nPos + 1 );
-
-#if OSL_DEBUG_LEVEL > 1
-    g_warning ("getParentURL '%s' -> '%s'",
-           getURI(), OUStringToOString
-               ( aParentURL, RTL_TEXTENCODING_UTF8 ).getStr() );
-#endif
-
-    return aParentURL;
-}
-
-static util::DateTime
-getDateFromUnix (time_t t)
-{
-    TimeValue tv;
-    tv.Nanosec = 0;
-    tv.Seconds = t;
-    oslDateTime dt;
-
-    if ( osl_getDateTimeFromTimeValue( &tv, &dt ) )
-        return util::DateTime( 0, dt.Seconds, dt.Minutes, dt.Hours,
-                               dt.Day, dt.Month, dt.Year, false);
-    else
-        return util::DateTime();
-}
-
-uno::Reference< sdbc::XRow > Content::getPropertyValues(
-                const uno::Sequence< beans::Property >& rProperties,
-                const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-{
-    int nProps;
-    uno::Sequence< beans::Property > allProperties;
-
-    getInfo( xEnv );
-
-    const beans::Property* pProps;
-
-    if( rProperties.getLength() ) {
-        nProps = rProperties.getLength();
-        pProps = rProperties.getConstArray();
-    } else {
-        allProperties = getPropertySetInfo( xEnv )->getProperties();
-        nProps = allProperties.getLength();
-        pProps = allProperties.getConstArray();
-    }
-
-    rtl::Reference< ::ucbhelper::PropertyValueSet > xRow
-        = new ::ucbhelper::PropertyValueSet( m_xContext );
-
-        osl::Guard< osl::Mutex > aGuard( m_aMutex );
-    for( sal_Int32 n = 0; n < nProps; ++n ) {
-        const beans::Property& rProp = pProps[ n ];
-
-        if ( rProp.Name == "Title" ) {
-            if ( m_info.name ) {
-                if (m_info.name[0] == '/')
-                    g_warning ("Odd NFS title on item '%s' == '%s'",
-                               getURI(), m_info.name);
-                xRow->appendString( rProp, GnomeToOUString( m_info.name ) );
-            } else
-                xRow->appendVoid( rProp );
-        }
-
-        else if ( rProp.Name == "ContentType" )
-            xRow->appendString( rProp, getContentType () );
-
-        else if ( rProp.Name == "IsDocument" ) {
-            if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE)
-                xRow->appendBoolean( rProp, ( m_info.type == GNOME_VFS_FILE_TYPE_REGULAR ||
-                                  m_info.type == GNOME_VFS_FILE_TYPE_UNKNOWN ) );
-            else
-                xRow->appendVoid( rProp );
-        }
-        else if ( rProp.Name == "IsFolder" ) {
-            if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE)
-                xRow->appendBoolean( rProp, ( m_info.type == GNOME_VFS_FILE_TYPE_DIRECTORY ) );
-            else
-                xRow->appendVoid( rProp );
-        }
-        else if ( rProp.Name == "IsReadOnly" ) {
-
-            GnomeVFSFileInfo* fileInfo = gnome_vfs_file_info_new ();
-
-            OString aURI = getOURI();
-            gnome_vfs_get_file_info
-                ( aURI.getStr(), fileInfo,
-                        GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS );
-
-            if (fileInfo->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_ACCESS) {
-                bool read_only = true;
-
-                if (fileInfo->permissions & GNOME_VFS_PERM_ACCESS_WRITABLE)
-                                        read_only = false;
-
-                xRow->appendBoolean( rProp, read_only );
-            } else
-                xRow->appendVoid( rProp );
-            gnome_vfs_file_info_unref (fileInfo);
-        }
-        else if ( rProp.Name == "Size" ) {
-            if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE)
-                xRow->appendLong( rProp, m_info.size );
-            else
-                xRow->appendVoid( rProp );
-        }
-        else if ( rProp.Name == "IsHidden" )
-            if ( m_info.name )
-                xRow->appendBoolean( rProp, m_info.name[0] == '.' );
-            else
-                xRow->appendVoid( rProp );
-
-        else if ( rProp.Name == "IsVolume" || rProp.Name == "IsCompactDisk" )
-            xRow->appendBoolean( rProp, false );
-
-        else if ( rProp.Name == "DateCreated" ) {
-            if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_CTIME)
-                xRow->appendTimestamp( rProp, getDateFromUnix( m_info.ctime ) );
-            else
-                xRow->appendVoid( rProp );
-        }
-
-        else if ( rProp.Name == "DateModified" ) {
-            if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MTIME)
-                xRow->appendTimestamp( rProp, getDateFromUnix( m_info.mtime ) );
-            else
-                xRow->appendVoid( rProp );
-        }
-
-        else if ( rProp.Name == "MediaType" ) {
-            // We do this by sniffing in gnome-vfs; rather expensively.
-#ifdef DEBUG
-            g_warning ("FIXME: Requested mime-type - an expensive op. indeed!");
-#endif
-            xRow->appendVoid( rProp );
-        } else if ( rProp.Name == "CreatableContentsInfo" )
-            xRow->appendObject( rProp, uno::makeAny( queryCreatableContentsInfo( xEnv ) ) );
-
-        else {
-            xRow->appendVoid( rProp );
-        }
-    }
-#if OSL_DEBUG_LEVEL > 1
-    g_warning ("getPropertyValues on '%s' %d properties returned (of %d)",
-           getURI(), 0, (int)nProps);
-#endif
-
-    return uno::Reference< sdbc::XRow >( xRow.get() );
-}
-
-static lang::IllegalAccessException
-getReadOnlyException( Content *ctnt )
-{
-    return lang::IllegalAccessException
-        ( OUString("Property is read-only!"),
-          static_cast< cppu::OWeakObject * >( ctnt ) );
-}
-
-OUString
-Content::makeNewURL( const char */*newName*/ )
-{
-    OUString aNewURL = getParentURL();
-    if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) )
-        aNewURL += "/";
-
-    char *name = gnome_vfs_escape_string( m_info.name );
-    aNewURL += GnomeToOUString( name );
-    g_free( name );
-
-    return aNewURL;
-}
-
-// This is slightly complicated by needing to support either 'move' or 'setname'
-GnomeVFSResult
-Content::doSetFileInfo( const GnomeVFSFileInfo *newInfo,
-            GnomeVFSSetFileInfoMask setMask,
-            const uno::Reference< ucb::XCommandEnvironment >& /*xEnv*/ )
-{
-    GnomeVFSResult result = GNOME_VFS_OK;
-
-    g_assert (!m_bTransient);
-
-    OString aURI = getOURI();
-
-        osl::Guard< osl::Mutex > aGuard( m_aMutex );
-
-    // The simple approach:
-    if( setMask != GNOME_VFS_SET_FILE_INFO_NONE )
-        result = gnome_vfs_set_file_info // missed a const in the API there
-            ( aURI.getStr(), (GnomeVFSFileInfo *)newInfo, setMask );
-
-    if ( result == GNOME_VFS_ERROR_NOT_SUPPORTED &&
-         ( setMask & GNOME_VFS_SET_FILE_INFO_NAME ) ) {
-        // Try a move instead
-#ifdef DEBUG
-        g_warning( "SetFileInfo not supported on '%s'", getURI() );
-#endif
-
-        char *newURI = OUStringToGnome( makeNewURL( newInfo->name ) );
-
-        result = gnome_vfs_move (aURI.getStr(), newURI, FALSE);
-
-        g_free (newURI);
-    }
-
-    return result;
-}
-
-
-uno::Sequence< uno::Any > Content::setPropertyValues(
-                const uno::Sequence< beans::PropertyValue >& rValues,
-                const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-{
-    OUString    aNewTitle;
-    GnomeVFSFileInfo newInfo;
-    int              setMask = GNOME_VFS_SET_FILE_INFO_NONE;
-
-    getInfo( xEnv );
-
-    osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
-
-    gnome_vfs_file_info_copy( &newInfo, &m_info );
-
-    Authentication aAuth( xEnv );
-
-    int nChanged = 0, nTitlePos = 0;
-    uno::Sequence< uno::Any > aRet( rValues.getLength() );
-    uno::Sequence< beans::PropertyChangeEvent > aChanges( rValues.getLength() );
-
-    beans::PropertyChangeEvent aEvent;
-    aEvent.Source         = static_cast< cppu::OWeakObject * >( this );
-    aEvent.Further        = sal_False;
-    aEvent.PropertyHandle = -1;
-    // aEvent.PropertyName = fill in later ...
-    // aEvent.OldValue     =
-    // aEvent.NewValue     =
-
-    int nCount = rValues.getLength();
-    const beans::PropertyValue* pValues = rValues.getConstArray();
-
-    for ( sal_Int32 n = 0; n < nCount; ++n ) {
-        const beans::PropertyValue& rValue = pValues[ n ];
-
-#if OSL_DEBUG_LEVEL > 1
-        g_warning( "Set prop '%s'", OUStringToGnome( rValue.Name ) );
-#endif
-        if ( rValue.Name == "ContentType" ||
-             rValue.Name == "MediaType" ||
-             rValue.Name == "IsDocument" ||
-             rValue.Name == "IsFolder" ||
-             rValue.Name == "Size" ||
-             rValue.Name == "CreatableContentsInfo" )
-            aRet[ n ] <<= getReadOnlyException( this );
-
-        else if ( rValue.Name == "Title" ) {
-            if ( rValue.Value >>= aNewTitle ) {
-                if ( aNewTitle.isEmpty() )
-                    aRet[ n ] <<= lang::IllegalArgumentException
-                        ( OUString("Empty title not allowed!"),
-                          static_cast< cppu::OWeakObject * >( this ), -1 );
-                else {
-                    char *newName = OUStringToGnome( aNewTitle );
-
-                    if( !newName || !m_info.name || strcmp( newName, m_info.name ) ) {
-#if OSL_DEBUG_LEVEL > 1
-                        g_warning ("Set new name to '%s'", newName);
-#endif
-
-                        aEvent.PropertyName = "Title";
-                        aEvent.OldValue     = uno::makeAny( GnomeToOUString( newInfo.name ) );
-                        aEvent.NewValue     = uno::makeAny( aNewTitle );
-                        aChanges.getArray()[ nChanged ] = aEvent;
-                        nTitlePos = nChanged++;
-
-                        newInfo.name = newName;
-                        setMask |= GNOME_VFS_SET_FILE_INFO_NAME;
-                    } else // same name
-                        g_free (newName);
-                }
-            } else
-                aRet[ n ] <<= beans::IllegalTypeException
-                    ( OUString("Property value has wrong type!"),
-                      static_cast< cppu::OWeakObject * >( this ) );
-
-        } else if ( rValue.Name == "DateCreated" || rValue.Name == "DateModified" ) {
-            // FIXME: should be able to set the timestamps
-            aRet[ n ] <<= getReadOnlyException( this );
-        } else {
-#ifdef DEBUG
-            g_warning( "Unhandled property '%s'", OUStringToGnome( rValue.Name ) );
-#endif
-            aRet[ n ] <<= getReadOnlyException( this );
-        }
-    }
-
-    GnomeVFSResult result = GNOME_VFS_OK;
-
-    if ( !m_bTransient &&
-         ( result = doSetFileInfo( &newInfo,
-                       (GnomeVFSSetFileInfoMask) setMask,
-                       xEnv ) ) != GNOME_VFS_OK ) {
-        for (int i = 0; i < nChanged; i++)
-            aRet[ i ] <<= mapVFSException( result, sal_True );
-
-    }
-
-    if ( result == GNOME_VFS_OK) {
-        gnome_vfs_file_info_copy( &m_info, &newInfo );
-
-        if ( setMask & GNOME_VFS_SET_FILE_INFO_NAME ) {
-            uno::Reference< ucb::XContentIdentifier > xNewId
-                = new ::ucbhelper::ContentIdentifier( makeNewURL( newInfo.name ) );
-
-            aGuard.clear();
-            if (!exchangeIdentity( xNewId ) )
-                aRet[ nTitlePos ] <<= uno::Exception
-                    ( OUString("Exchange failed!"),
-                      static_cast< cppu::OWeakObject * >( this ) );
-        }
-    }
-
-    gnome_vfs_file_info_clear( &newInfo );
-
-    if ( nChanged > 0 ) {
-            aGuard.clear();
-        aChanges.realloc( nChanged );
-        notifyPropertiesChange( aChanges );
-    }
-
-    return aRet;
-}
-
-void Content::queryChildren( ContentRefList& rChildren )
-{
-    // Obtain a list with a snapshot of all currently instantiated contents
-    // from provider and extract the contents which are direct children
-    // of this content.
-
-    ::ucbhelper::ContentRefList aAllContents;
-    m_xProvider->queryExistingContents( aAllContents );
-
-    OUString aURL = getOUURI();
-    sal_Int32 nURLPos = aURL.lastIndexOf( '/' );
-
-    if ( nURLPos != ( aURL.getLength() - 1 ) )
-        aURL += "/";
-
-    sal_Int32 nLen = aURL.getLength();
-
-    ::ucbhelper::ContentRefList::const_iterator it  = aAllContents.begin();
-    ::ucbhelper::ContentRefList::const_iterator end = aAllContents.end();
-
-    while ( it != end ) {
-        ::ucbhelper::ContentImplHelperRef xChild = (*it);
-        OUString aChildURL
-            = xChild->getIdentifier()->getContentIdentifier();
-
-        // Is aURL a prefix of aChildURL?
-        if ( ( aChildURL.getLength() > nLen ) &&
-             ( aChildURL.startsWith( aURL ) ) ) {
-            sal_Int32 nPos = nLen;
-            nPos = aChildURL.indexOf( '/', nPos );
-
-            if ( ( nPos == -1 ) ||
-                 ( nPos == ( aChildURL.getLength() - 1 ) ) ) {
-                // No further slashes / only a final slash. It's a child!
-                rChildren.push_back( ::gvfs::Content::ContentRef
-                             (static_cast< ::gvfs::Content * >(xChild.get() ) ) );
-            }
-        }
-        ++it;
-    }
-}
-
-void Content::insert(
-        const uno::Reference< io::XInputStream >               &xInputStream,
-        sal_Bool                                                bReplaceExisting,
-        const uno::Reference< ucb::XCommandEnvironment > &xEnv )
-        throw( uno::Exception )
-{
-    osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
-
-#if OSL_DEBUG_LEVEL > 1
-    g_warning( "Insert '%s' (%d) (0x%x:%d)", getURI(), bReplaceExisting,
-           m_info.valid_fields, m_info.type );
-#endif
-
-    GnomeVFSResult result = getInfo( xEnv );
-    // a racy design indeed.
-    if( !bReplaceExisting && !m_bTransient &&
-        result != GNOME_VFS_ERROR_NOT_FOUND) {
-#ifdef DEBUG
-        g_warning ("Nasty error inserting to '%s' ('%s')",
-               getURI(), gnome_vfs_result_to_string( result ));
-#endif
-        cancelCommandExecution( GNOME_VFS_ERROR_FILE_EXISTS, xEnv, sal_True );
-    }
-
-    if ( m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE &&
-         m_info.type == GNOME_VFS_FILE_TYPE_DIRECTORY ) {
-        OString aURI = getOURI();
-        int perm;
-
-        perm = ( GNOME_VFS_PERM_USER_ALL |
-             GNOME_VFS_PERM_GROUP_READ |
-             GNOME_VFS_PERM_OTHER_READ );
-
-#if OSL_DEBUG_LEVEL > 1
-        g_warning ("Make directory");
-#endif
-        result = gnome_vfs_make_directory( aURI.getStr(), perm );
-
-        if( result != GNOME_VFS_OK )
-            cancelCommandExecution( result, xEnv, sal_True );
-
-        return;
-    }
-
-    if ( !xInputStream.is() ) {
-        // FIXME: slightly unclear whether to accept this and create an empty file
-        ucbhelper::cancelCommandExecution
-            ( uno::makeAny
-              ( ucb::MissingInputStreamException
-                ( OUString(),
-                  static_cast< cppu::OWeakObject * >( this ) ) ),
-              xEnv );
-    }
-
-    GnomeVFSHandle *handle = NULL;
-    OString aURI = getOURI();
-
-    result = GNOME_VFS_ERROR_GENERIC;
-    if ( bReplaceExisting ) {
-        Authentication aAuth( xEnv );
-        result = gnome_vfs_open( &handle, aURI.getStr(), GNOME_VFS_OPEN_WRITE );
-    }
-
-    if ( result != GNOME_VFS_OK ) {
-        int perm;
-        Authentication aAuth( xEnv );
-
-        perm = ( ( GNOME_VFS_PERM_USER_WRITE | GNOME_VFS_PERM_USER_READ ) |
-             ( GNOME_VFS_PERM_GROUP_WRITE | GNOME_VFS_PERM_GROUP_READ ) );
-
-        result = gnome_vfs_create
-            ( &handle, aURI.getStr(), GNOME_VFS_OPEN_WRITE, TRUE, perm );
-    }
-
-    if( result != GNOME_VFS_OK )
-        cancelCommandExecution( result, xEnv, sal_True );
-
-    if ( !xInputStream.is() ) {
-        result = gnome_vfs_close( handle );
-        if (result != GNOME_VFS_OK)
-            cancelCommandExecution( result, xEnv, sal_True );
-
-    } else { // copy it over
-        uno::Reference < io::XOutputStream > xOutput =
-            new gvfs::Stream( handle, &m_info );
-
-        copyData( xInputStream, xOutput );
-    }
-
-    if (m_bTransient) {
-        m_bTransient = sal_False;
-        aGuard.clear();
-        inserted();
-    }
-}
-
-void Content::transfer(const ucb::TransferInfo & /*rArgs*/,
-               const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-    throw( uno::Exception )
-{
-    // FIXME: see gnome-vfs-xfer.h - but we need to be able to easily
-    // detect which are gnome-vfs owned URI types ...
-    ucbhelper::cancelCommandExecution
-        ( uno::makeAny
-            ( ucb::InteractiveBadTransferURLException
-                ( OUString("Unsupported URL scheme!"),
-                  static_cast< cppu::OWeakObject * >( this ) ) ),
-          xEnv );
-}
-
-void Content::destroy( sal_Bool bDeletePhysical )
-    throw( uno::Exception )
-{
-    // @@@ take care about bDeletePhysical -> trashcan support
-    uno::Reference< ucb::XContent > xThis = this;
-
-    deleted();
-
-    osl::Guard< osl::Mutex > aGuard( m_aMutex );
-
-    // Process instantiated children...
-    ::gvfs::Content::ContentRefList aChildren;
-    queryChildren( aChildren );
-
-    ContentRefList::const_iterator it  = aChildren.begin();
-    ContentRefList::const_iterator end = aChildren.end();
-
-    while ( it != end ) {
-        (*it)->destroy( bDeletePhysical );
-        ++it;
-    }
-}
-
-// Used by the 'setPropertyValues' method for
-// propagating the renaming of a Content.
-sal_Bool Content::exchangeIdentity(
-    const uno::Reference< ucb::XContentIdentifier >& xNewId )
-{
-    if ( !xNewId.is() )
-        return sal_False;
-
-    uno::Reference< ucb::XContent > xThis = this;
-
-#if OSL_DEBUG_LEVEL > 1
-    g_warning( "exchangeIdentity from '%s' to '%s'",
-           getURI(), OUStringToGnome( xNewId->getContentIdentifier() ) );
-#endif
-
-    if ( m_bTransient ) {
-        osl::Guard< osl::Mutex > aGuard( m_aMutex );
-        /* FIXME: can we not screw up an identically named
-         * Content pointing to ourself here ? */
-        m_xIdentifier = xNewId;
-        return sal_False;
-    }
-
-    OUString aOldURL = getOUURI();
-
-    // Exchange own identitity.
-    if ( exchange( xNewId ) ) {
-
-        // Process instantiated children...
-        ContentRefList aChildren;
-        queryChildren( aChildren );
-
-        ContentRefList::const_iterator it  = aChildren.begin();
-        ContentRefList::const_iterator end = aChildren.end();
-
-        while ( it != end ) {
-            ContentRef xChild = (*it);
-
-            // Create new content identifier for the child...
-            uno::Reference< ucb::XContentIdentifier >
-                xOldChildId = xChild->getIdentifier();
-            OUString aOldChildURL
-                = xOldChildId->getContentIdentifier();
-            OUString aNewChildURL
-                = aOldChildURL.replaceAt(
-                             0,
-                             aOldURL.getLength(),
-                             xNewId->getContentIdentifier() );
-            uno::Reference< ucb::XContentIdentifier >
-                xNewChildId
-                = new ::ucbhelper::ContentIdentifier( aNewChildURL );
-
-            if ( !xChild->exchangeIdentity( xNewChildId ) )
-                return sal_False;
-
-            ++it;
-        }
-        return sal_True;
-    }
-
-    return sal_False;
-}
-
-GnomeVFSResult
-Content::getInfo( const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-{
-    GnomeVFSResult result;
-        osl::Guard< osl::Mutex > aGuard( m_aMutex );
-
-    if (m_bTransient)
-        result = GNOME_VFS_OK;
-
-    else if ( !m_info.valid_fields ) {
-        OString aURI = getOURI();
-        Authentication aAuth( xEnv );
-        result = gnome_vfs_get_file_info
-            ( aURI.getStr(), &m_info, GNOME_VFS_FILE_INFO_DEFAULT );
-        if (result != GNOME_VFS_OK)
-        {
-            SAL_WARN(
-                "ucb.ucp.gvfs",
-                "gnome_vfs_get_file_info for <" << aURI << "> failed with \""
-                    << gnome_vfs_result_to_string(result) << "\" (" << +result
-                    << ")");
-            gnome_vfs_file_info_clear( &m_info );
-        }
-    } else
-        result = GNOME_VFS_OK;
-#if OSL_DEBUG_LEVEL > 1
-    g_warning( "getInfo on '%s' returns '%s' (%d) (0x%x)",
-           getURI(), gnome_vfs_result_to_string( result ),
-           result, m_info.valid_fields );
-#endif
-    return result;
-}
-
-sal_Bool
-Content::isFolder(const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-{
-        osl::Guard< osl::Mutex > aGuard( m_aMutex );
-    getInfo( xEnv );
-    return (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE &&
-        m_info.type == GNOME_VFS_FILE_TYPE_DIRECTORY);
-}
-
-uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite )
-{
-    uno::Any aException;
-    const char *gvfs_message;
-    OUString message;
-    uno::Sequence< uno::Any > aArgs( 1 );
-
-#if OSL_DEBUG_LEVEL > 1
-    g_warning ("Map VFS exception '%s' (%d)",
-           gnome_vfs_result_to_string( result ), result );
-#endif
-
-    if ((gvfs_message = gnome_vfs_result_to_string (result)))
-        message = GnomeToOUString( gvfs_message );
-
-    switch (result) {
-    case GNOME_VFS_OK:
-        g_warning("VFS_OK mapped to exception.");
-        break;
-    case GNOME_VFS_ERROR_EOF:
-        g_warning ("VFS_EOF not handled somewhere.");
-        break;
-    case GNOME_VFS_ERROR_NOT_FOUND:
-        aArgs[ 0 ] <<= m_xIdentifier->getContentIdentifier();
-        aException <<=
-            ucb::InteractiveAugmentedIOException
-            ( OUString("Not found!"),
-              static_cast< cppu::OWeakObject * >( this ),
-              task::InteractionClassification_ERROR,
-              ucb::IOErrorCode_NOT_EXISTING,
-              aArgs );
-        break;
-    case GNOME_VFS_ERROR_BAD_PARAMETERS:
-        aException <<=
-            lang::IllegalArgumentException
-                ( OUString(),
-                  static_cast< cppu::OWeakObject * >( this ),
-                  -1 );
-        break;
-    case GNOME_VFS_ERROR_GENERIC:
-    case GNOME_VFS_ERROR_INTERNAL:
-    case GNOME_VFS_ERROR_NOT_SUPPORTED:
-#ifdef DEBUG
-        g_warning ("Internal - un-mapped error");
-#endif
-        aException <<= io::IOException();
-        break;
-    case GNOME_VFS_ERROR_IO:
-        if ( bWrite )
-            aException <<=
-                ucb::InteractiveNetworkWriteException
-                ( OUString(),
-                  static_cast< cppu::OWeakObject * >( this ),
-                  task::InteractionClassification_ERROR,
-                  message );
-        else
-            aException <<=
-                ucb::InteractiveNetworkReadException
-                ( OUString(),
-                  static_cast< cppu::OWeakObject * >( this ),
-                  task::InteractionClassification_ERROR,
-                  message );
-        break;
-    case GNOME_VFS_ERROR_HOST_NOT_FOUND:
-    case GNOME_VFS_ERROR_INVALID_HOST_NAME:
-        aException <<=
-            ucb::InteractiveNetworkResolveNameException
-            ( OUString(),
-              static_cast< cppu::OWeakObject * >( this ),
-              task::InteractionClassification_ERROR,
-              message );
-        break;
-    case GNOME_VFS_ERROR_SERVICE_NOT_AVAILABLE:
-    case GNOME_VFS_ERROR_SERVICE_OBSOLETE:
-    case GNOME_VFS_ERROR_PROTOCOL_ERROR:
-    case GNOME_VFS_ERROR_NO_MASTER_BROWSER:
-        aException <<=
-            ucb::InteractiveNetworkConnectException
-                ( OUString(),
-                  static_cast< cppu::OWeakObject * >( this ),
-                  task::InteractionClassification_ERROR,
-                  message );
-        break;
-
-    case GNOME_VFS_ERROR_FILE_EXISTS:
-        aException <<= ucb::NameClashException
-                ( OUString(),
-                  static_cast< cppu::OWeakObject * >( this ),
-                  task::InteractionClassification_ERROR,
-                  message );
-        break;
-
-    case GNOME_VFS_ERROR_INVALID_OPEN_MODE:
-        aException <<= ucb::UnsupportedOpenModeException();
-        break;
-
-    case GNOME_VFS_ERROR_CORRUPTED_DATA:
-    case GNOME_VFS_ERROR_WRONG_FORMAT:
-    case GNOME_VFS_ERROR_BAD_FILE:
-    case GNOME_VFS_ERROR_TOO_BIG:
-    case GNOME_VFS_ERROR_NO_SPACE:
-    case GNOME_VFS_ERROR_READ_ONLY:
-    case GNOME_VFS_ERROR_INVALID_URI:
-    case GNOME_VFS_ERROR_NOT_OPEN:
-    case GNOME_VFS_ERROR_ACCESS_DENIED:
-    case GNOME_VFS_ERROR_TOO_MANY_OPEN_FILES:
-    case GNOME_VFS_ERROR_NOT_A_DIRECTORY:
-    case GNOME_VFS_ERROR_IN_PROGRESS:
-    case GNOME_VFS_ERROR_INTERRUPTED:
-    case GNOME_VFS_ERROR_LOOP:
-    case GNOME_VFS_ERROR_NOT_PERMITTED:
-    case GNOME_VFS_ERROR_IS_DIRECTORY:
-    case GNOME_VFS_ERROR_NO_MEMORY:
-    case GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS:
-    case GNOME_VFS_ERROR_LOGIN_FAILED:
-    case GNOME_VFS_ERROR_CANCELLED:
-    case GNOME_VFS_ERROR_DIRECTORY_BUSY:
-    case GNOME_VFS_ERROR_DIRECTORY_NOT_EMPTY:
-    case GNOME_VFS_ERROR_TOO_MANY_LINKS:
-    case GNOME_VFS_ERROR_READ_ONLY_FILE_SYSTEM:
-    case GNOME_VFS_ERROR_NOT_SAME_FILE_SYSTEM:
-    case GNOME_VFS_ERROR_NAME_TOO_LONG:
-#ifdef DEBUG
-        g_warning( "FIXME: Un-mapped VFS exception '%s' (%d)",
-               gnome_vfs_result_to_string( result ), result );
-#endif
-    default:
-        aException <<= ucb::InteractiveNetworkGeneralException
-            ( OUString(),
-              static_cast< cppu::OWeakObject * >( this ),
-              task::InteractionClassification_ERROR );
-        break;
-    }
-
-    return aException;
-}
-
-void Content::cancelCommandExecution(
-    GnomeVFSResult result,
-    const uno::Reference< ucb::XCommandEnvironment > & xEnv,
-    sal_Bool bWrite /* = sal_False */ )
-    throw ( uno::Exception )
-{
-    ucbhelper::cancelCommandExecution( mapVFSException( result, bWrite ), xEnv );
-    // Unreachable
-}
-
-uno::Sequence< beans::Property > Content::getProperties(
-    const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ )
-{
-    static const beans::Property aGenericProperties[] = {
-                beans::Property( OUString(  "ContentType"  ),
-                 -1, cppu::UnoType<OUString>::get(),
-                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-                beans::Property( OUString(  "IsDocument"  ),
-                 -1, cppu::UnoType<bool>::get(),
-                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-                beans::Property( OUString(  "IsFolder"  ),
-                 -1, cppu::UnoType<bool>::get(),
-                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-                beans::Property( OUString(  "Title"  ),
-                 -1, cppu::UnoType<OUString>::get(),
-                 beans::PropertyAttribute::BOUND ),
-        // Optional ...
-        beans::Property( OUString(  "DateCreated"  ),
-                 -1, cppu::UnoType<util::DateTime>::get(),
-                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-                beans::Property( OUString(  "DateModified"  ),
-                 -1, cppu::UnoType<util::DateTime>::get(),
-                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-// FIXME: Too expensive for now (?)
-//                beans::Property( OUString(  "MediaType"  ),
-//                 -1, cppu::UnoType<OUString>::get(),
-//                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-                beans::Property( OUString(  "Size"  ),
-                 -1, cppu::UnoType<sal_Int64>::get(),
-                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-                beans::Property( OUString(  "IsReadOnly"  ),
-                 -1, cppu::UnoType<bool>::get(),
-                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-                beans::Property( OUString(  "IsVolume"  ),
-                 -1, cppu::UnoType<bool>::get(),
-                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-                beans::Property( OUString(  "IsCompactDisk"  ),
-                 -1, cppu::UnoType<bool>::get(),
-                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-                beans::Property( OUString(  "IsHidden"  ),
-                 -1, cppu::UnoType<bool>::get(),
-                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
-                beans::Property( OUString(  "CreatableContentsInfo"  ),
-                 -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
-                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY )
-    };
-
-    const int nProps = sizeof (aGenericProperties) / sizeof (aGenericProperties[0]);
-
-    return uno::Sequence< beans::Property > ( aGenericProperties, nProps );
-
-}
-
-uno::Sequence< ucb::CommandInfo > Content::getCommands(
-    const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-{
-    static const ucb::CommandInfo aCommandInfoTable[] = {
-        // Required commands
-        ucb::CommandInfo
-        ( OUString(  "getCommandInfo"  ),
-          -1, cppu::UnoType<void>::get() ),
-        ucb::CommandInfo
-        ( OUString(  "getPropertySetInfo"  ),
-          -1, cppu::UnoType<void>::get() ),
-        ucb::CommandInfo
-        ( OUString(  "getPropertyValues"  ),
-          -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ),
-        ucb::CommandInfo
-        ( OUString(  "setPropertyValues"  ),
-          -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ),
-
-        // Optional standard commands
-        ucb::CommandInfo
-        ( OUString(  "delete"  ),
-          -1, cppu::UnoType<bool>::get() ),
-        ucb::CommandInfo
-        ( OUString(  "insert"  ),
-          -1, cppu::UnoType<ucb::InsertCommandArgument>::get() ),
-        ucb::CommandInfo
-        ( OUString(  "open"  ),
-          -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ),
-
-        // Folder Only, omitted if not a folder
-        ucb::CommandInfo
-        ( OUString(  "transfer"  ),
-          -1, cppu::UnoType<ucb::TransferInfo>::get() ),
-        ucb::CommandInfo
-        ( OUString(  "createNewContent"  ),
-          -1, cppu::UnoType<ucb::ContentInfo>::get() )
-    };
-
-    const int nProps
-        = sizeof( aCommandInfoTable ) / sizeof( aCommandInfoTable[ 0 ] );
-    return uno::Sequence< ucb::CommandInfo >(
-        aCommandInfoTable, isFolder( xEnv ) ? nProps : nProps - 2 );
-}
-
-OUString
-Content::getOUURI ()
-{
-    osl::Guard< osl::Mutex > aGuard( m_aMutex );
-    return m_xIdentifier->getContentIdentifier();
-}
-
-OString
-Content::getOURI ()
-{
-    return OUStringToOString( getOUURI(), RTL_TEXTENCODING_UTF8 );
-}
-
-char *
-Content::getURI ()
-{
-    return OUStringToGnome( getOUURI() );
-}
-
-void
-Content::copyData( uno::Reference< io::XInputStream > xIn,
-                   uno::Reference< io::XOutputStream > xOut )
-{
-    uno::Sequence< sal_Int8 > theData( TRANSFER_BUFFER_SIZE );
-
-    g_return_if_fail( xIn.is() && xOut.is() );
-
-    while ( xIn->readBytes( theData, TRANSFER_BUFFER_SIZE ) > 0 )
-        xOut->writeBytes( theData );
-
-    xOut->closeOutput();
-}
-
-// Inherits an authentication context
-uno::Reference< io::XInputStream >
-Content::createTempStream(
-    const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-        throw( uno::Exception )
-{
-    GnomeVFSResult result;
-    GnomeVFSHandle *handle = NULL;
-    OString aURI = getOURI();
-
-    osl::Guard< osl::Mutex > aGuard( m_aMutex );
-    // Something badly wrong happened - can't seek => stream to a temporary file
-    uno::Reference < io::XOutputStream > xTempOut =
-        uno::Reference < io::XOutputStream >
-            ( io::TempFile::create( m_xContext ), uno::UNO_QUERY );
-
-    if ( !xTempOut.is() )
-        cancelCommandExecution( GNOME_VFS_ERROR_IO, xEnv );
-
-    result = gnome_vfs_open
-        ( &handle, aURI.getStr(), GNOME_VFS_OPEN_READ );
-    if (result != GNOME_VFS_OK)
-        cancelCommandExecution( result, xEnv );
-
-    uno::Reference < io::XInputStream > pStream = new ::gvfs::Stream( handle, &m_info );
-    copyData( pStream, xTempOut );
-
-    return uno::Reference < io::XInputStream > ( xTempOut, uno::UNO_QUERY );
-}
-
-uno::Reference< io::XInputStream >
-Content::createInputStream(
-    const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-        throw( uno::Exception )
-{
-    GnomeVFSHandle *handle = NULL;
-    GnomeVFSResult  result;
-    uno::Reference<io::XInputStream > xIn;
-
-    Authentication aAuth( xEnv );
-        osl::Guard< osl::Mutex > aGuard( m_aMutex );
-
-    getInfo( xEnv );
-    OString aURI = getOURI();
-
-    if ( !(m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) )
-        return createTempStream( xEnv );
-
-    result = gnome_vfs_open
-        ( &handle, aURI.getStr(),
-          (GnomeVFSOpenMode) (GNOME_VFS_OPEN_READ | GNOME_VFS_OPEN_RANDOM ) );
-
-    if (result == GNOME_VFS_ERROR_INVALID_OPEN_MODE ||
-        result == GNOME_VFS_ERROR_NOT_SUPPORTED)
-        return createTempStream( xEnv );
-
-    if (result != GNOME_VFS_OK)
-        cancelCommandExecution( result, xEnv );
-
-    // Try a seek just to make sure it's Random access: some lie.
-    result = gnome_vfs_seek( handle, GNOME_VFS_SEEK_START, 0);
-    if (result == GNOME_VFS_ERROR_NOT_SUPPORTED) {
-        gnome_vfs_close( handle );
-        return createTempStream( xEnv );
-    }
-
-    if (result != GNOME_VFS_OK)
-        cancelCommandExecution( result, xEnv );
-
-    if (handle != NULL)
-        xIn = new ::gvfs::Stream( handle, &m_info );
-
-    return xIn;
-}
-
-sal_Bool
-Content::feedSink( uno::Reference< uno::XInterface > aSink,
-                   const uno::Reference< ucb::XCommandEnvironment >& xEnv )
-{
-    if ( !aSink.is() )
-        return sal_False;
-
-    uno::Reference< io::XOutputStream > xOut
-        = uno::Reference< io::XOutputStream >(aSink, uno::UNO_QUERY );
-    uno::Reference< io::XActiveDataSink > xDataSink
-        = uno::Reference< io::XActiveDataSink >(aSink, uno::UNO_QUERY );
-
-    if ( !xOut.is() && !xDataSink.is() )
-        return sal_False;
-
-    uno::Reference< io::XInputStream > xIn = createInputStream( xEnv );
-    if ( !xIn.is() )
-        return sal_False;
-
-    if ( xOut.is() )
-        copyData( xIn, xOut );
-
-    if ( xDataSink.is() )
-        xDataSink->setInputStream( xIn );
-
-    return sal_True;
-}
-
-extern "C" {
-
-#ifndef GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION
-#  error "We require Gnome VFS 2.6.x to compile (will run fine with < 2.6)"
-#endif
-
-    static void
-    vfs_authentication_callback (gconstpointer in_void,
-                     gsize         in_size,
-                     gpointer      out_void,
-                     gsize         out_size,
-                     gpointer      callback_data)
-    {
-        task::XInteractionHandler *xIH;
-
-#if OSL_DEBUG_LEVEL > 1
-        g_warning ("Full authentication callback (%p) ...", callback_data);
-#endif
-
-        if( !( xIH = (task::XInteractionHandler *) callback_data ) )
-            return;
-
-        const GnomeVFSModuleCallbackFullAuthenticationIn *in =
-            (const GnomeVFSModuleCallbackFullAuthenticationIn *) in_void;
-        GnomeVFSModuleCallbackFullAuthenticationOut *out =
-            (GnomeVFSModuleCallbackFullAuthenticationOut *) out_void;
-
-        g_return_if_fail (in != NULL && out != NULL);
-        g_return_if_fail (sizeof (GnomeVFSModuleCallbackFullAuthenticationIn) == in_size &&
-                  sizeof (GnomeVFSModuleCallbackFullAuthenticationOut) == out_size);
-
-#if OSL_DEBUG_LEVEL > 1
-#  define NNIL(x) (x?x:"<Null>")
-        g_warning (" InComing data 0x%x uri '%s' prot '%s' server '%s' object '%s' "
-                   "port %d auth_t '%s' user '%s' domain '%s' "
-                   "def user '%s', def domain '%s'",
-                   (int) in->flags, NNIL(in->uri), NNIL(in->protocol),
-                   NNIL(in->server), NNIL(in->object),
-                   (int) in->port, NNIL(in->authtype), NNIL(in->username), NNIL(in->domain),
-                   NNIL(in->default_user), NNIL(in->default_domain));
-#  undef NNIL
-#endif
-
-        ucbhelper::SimpleAuthenticationRequest::EntityType
-                                   eDomain, eUserName, ePassword;
-        OUString aHostName, aDomain, aUserName, aPassword;
-
-        aHostName = GnomeToOUString( in->server );
-
-        if (in->flags & GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_NEED_DOMAIN)
-        {
-            aDomain = GnomeToOUString( in->domain );
-            eDomain = ucbhelper::SimpleAuthenticationRequest::ENTITY_MODIFY;
-            if (aDomain.isEmpty())
-                aDomain = GnomeToOUString( in->default_domain );
-        }
-        else // no underlying capability to display realm otherwise
-            eDomain = ucbhelper::SimpleAuthenticationRequest::ENTITY_NA;
-
-        aUserName = GnomeToOUString( in->username );
-        if (aUserName.isEmpty())
-            aUserName = GnomeToOUString( in->default_user );
-        eUserName = (in->flags & GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_NEED_USERNAME) ?
-            ucbhelper::SimpleAuthenticationRequest::ENTITY_MODIFY :
-                (!aUserName.isEmpty() ?
-                    ucbhelper::SimpleAuthenticationRequest::ENTITY_FIXED :
-                    ucbhelper::SimpleAuthenticationRequest::ENTITY_NA);
-
-        // No suggested password.
-        ePassword = (in->flags & GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_NEED_PASSWORD) ?
-            ucbhelper::SimpleAuthenticationRequest::ENTITY_MODIFY :
-            ucbhelper::SimpleAuthenticationRequest::ENTITY_FIXED;
-
-        // Really, really bad things happen if we don't provide
-        // the same user/password as was entered last time if
-        // we failed to authenticate - infinite looping / flickering
-        // madness etc. [ nice infrastructure ! ]
-        static OUString aLastUserName, aLastPassword;
-        if (in->flags & GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_PREVIOUS_ATTEMPT_FAILED)
-        {
-            osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
-            aUserName = aLastUserName;
-            aPassword = aLastPassword;
-        }
-
-        rtl::Reference< ucbhelper::SimpleAuthenticationRequest > xRequest
-            = new ucbhelper::SimpleAuthenticationRequest (GnomeToOUString(in->uri),
-                                                          aHostName, eDomain, aDomain,
-                                                          eUserName, aUserName,
-                                                          ePassword, aPassword);
-
-        xIH->handle( xRequest.get() );
-
-        rtl::Reference< ucbhelper::InteractionContinuation > xSelection
-            = xRequest->getSelection();
-
-        if ( xSelection.is() ) {
-            // Handler handled the request.
-            uno::Reference< task::XInteractionAbort > xAbort(xSelection.get(), uno::UNO_QUERY );
-            if ( !xAbort.is() ) {
-                const rtl::Reference<
-                    ucbhelper::InteractionSupplyAuthentication > & xSupp
-                    = xRequest->getAuthenticationSupplier();
-
-                OUString aNewDomain, aNewUserName, aNewPassword;
-
-                aNewUserName = xSupp->getUserName();
-                if ( !aNewUserName.isEmpty() )
-                    aUserName = aNewUserName;
-                aNewDomain = xSupp->getRealm();
-                if ( !aNewDomain.isEmpty() )
-                    aDomain = aNewDomain;
-                aNewPassword = xSupp->getPassword();
-                if ( !aNewPassword.isEmpty() )
-                    aPassword = aNewPassword;
-
-                {
-                    osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
-                    aLastUserName = aUserName;
-                    aLastPassword = aPassword;
-                }
-
-                out->username = OUStringToGnome( aUserName );
-                out->domain   = OUStringToGnome( aDomain );
-                out->password = OUStringToGnome( aPassword );
-                out->save_password = xSupp->getRememberPasswordMode();
-
-#if OSL_DEBUG_LEVEL > 1
-                g_warning ("Got valid user/domain/password '%s' '%s' '%s', %s password",
-                           out->username, out->domain, out->password,
-                           out->save_password ? "save" : "don't save");
-#endif
-            }
-            else
-                out->abort_auth = TRUE;
-        }
-        else
-            out->abort_auth = TRUE;
-    }
-
-    static void
-    vfs_authentication_old_callback (gconstpointer in_void,
-                                     gsize         in_size,
-                                     gpointer      out_void,
-                                     gsize         out_size,
-                                     gpointer      callback_data)
-    {
-#ifdef DEBUG
-        g_warning ("Old authentication callback (%p) [ UNTESTED ] ...", callback_data);
-#endif
-        const GnomeVFSModuleCallbackAuthenticationIn *in =
-            (const GnomeVFSModuleCallbackAuthenticationIn *) in_void;
-        GnomeVFSModuleCallbackAuthenticationOut *out =
-            (GnomeVFSModuleCallbackAuthenticationOut *) out_void;
-
-        g_return_if_fail (in != NULL && out != NULL);
-        g_return_if_fail (sizeof (GnomeVFSModuleCallbackAuthenticationIn) == in_size &&
-                  sizeof (GnomeVFSModuleCallbackAuthenticationOut) == out_size);
-
-        GnomeVFSModuleCallbackFullAuthenticationIn mapped_in = {
-                (GnomeVFSModuleCallbackFullAuthenticationFlags)
-                (GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_NEED_PASSWORD |
-                 GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_NEED_USERNAME |
-                 GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_NEED_DOMAIN),
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-        GnomeVFSModuleCallbackFullAuthenticationOut mapped_out = { 0, 0, 0, 0, 0, 0, 0, 0 };
-
-        // Map the old style input auth. data to the new style structure.
-        if (in->previous_attempt_failed)
-            mapped_in.flags = (GnomeVFSModuleCallbackFullAuthenticationFlags)
-                (mapped_in.flags |
-                 GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_PREVIOUS_ATTEMPT_FAILED);
-
-        GnomeVFSURI *pURI = NULL;
-        // Urk - parse all this from the URL ...
-        mapped_in.uri = in->uri;
-        if (in->uri)
-        {
-            pURI = gnome_vfs_uri_new( in->uri );
-            mapped_in.protocol = (char *) gnome_vfs_uri_get_scheme (pURI);
-            mapped_in.server   = (char *) gnome_vfs_uri_get_host_name (pURI);
-            mapped_in.port     = gnome_vfs_uri_get_host_port (pURI);
-            mapped_in.username = (char *) gnome_vfs_uri_get_user_name (pURI);
-        }
-        mapped_in.domain = in->realm;
-        mapped_in.default_user = mapped_in.username;
-        mapped_in.default_domain = mapped_in.domain;
-
-        vfs_authentication_callback ((gconstpointer) &mapped_in,
-                                     sizeof (mapped_in),
-                                     (gpointer) &mapped_out,
-                                     sizeof (mapped_out),
-                                     callback_data);
-
-        if (pURI)
-            gnome_vfs_uri_unref (pURI);
-
-        // Map the new style auth. out data to the old style out structure.
-        out->username = mapped_out.username;
-        out->password = mapped_out.password;
-        g_free (mapped_out.domain);
-        g_free (mapped_out.keyring);
-    }
-
-
-    static void
-    auth_destroy (gpointer data)
-    {
-        task::XInteractionHandler *xIH;
-        if( ( xIH = ( task::XInteractionHandler * )data ) )
-            xIH->release();
-    }
-
-    // This sucks, but gnome-vfs doesn't much like
-    // repeated set / unsets - so we have to compensate.
-    GPrivate *auth_queue = NULL;
-
-    void auth_queue_destroy( gpointer data )
-    {
-        GList  *l;
-        GQueue *vq = (GQueue *) data;
-
-        for (l = vq->head; l; l = l->next)
-            auth_destroy (l->data);
-        g_queue_free (vq);
-    }
-}
-
-static void
-refresh_auth( GQueue *vq )
-{
-    GList *l;
-
-    gnome_vfs_module_callback_pop( GNOME_VFS_MODULE_CALLBACK_AUTHENTICATION );
-    gnome_vfs_module_callback_pop( GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION );
-
-    for (l = vq->head; l; l = l->next) {
-        if (l->data) {
-            gnome_vfs_module_callback_push
-                ( GNOME_VFS_MODULE_CALLBACK_AUTHENTICATION,
-                  vfs_authentication_old_callback, l->data, NULL );
-            gnome_vfs_module_callback_push
-                ( GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION,
-                  vfs_authentication_callback, l->data, NULL );
-            break;
-        }
-    }
-}
-
-gvfs::Authentication::Authentication(
-    const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-{
-    GQueue *vq;
-    uno::Reference< task::XInteractionHandler > xIH;
-
-    if ( xEnv.is() )
-        xIH = xEnv->getInteractionHandler();
-
-    if ( xIH.is() )
-        xIH->acquire();
-
-    if( !(vq = (GQueue *)g_private_get( auth_queue ) ) ) {
-        vq = g_queue_new();
-        g_private_set( auth_queue, vq );
-    }
-
-    g_queue_push_head( vq, (gpointer) xIH.get() );
-    refresh_auth( vq );
-}
-
-gvfs::Authentication::~Authentication()
-{
-    GQueue *vq;
-    gpointer data;
-
-    vq = (GQueue *)g_private_get( auth_queue );
-
-    data = g_queue_pop_head( vq );
-    auth_destroy (data);
-
-    refresh_auth( vq );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx b/ucb/source/ucp/gvfs/gvfs_content.hxx
deleted file mode 100644
index 0b062f4ceede..000000000000
--- a/ucb/source/ucp/gvfs/gvfs_content.hxx
+++ /dev/null
@@ -1,272 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_CONTENT_HXX
-#define INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_CONTENT_HXX
-
-#include <memory>
-#include <list>
-#include <rtl/ref.hxx>
-#include <com/sun/star/ucb/ContentCreationException.hpp>
-#include <com/sun/star/ucb/XContentCreator.hpp>
-#include <ucbhelper/contenthelper.hxx>
-
-#include <glib.h>
-#include <libgnomevfs/gnome-vfs-ops.h>
-#include <libgnomevfs/gnome-vfs-directory.h>
-
-namespace com { namespace sun { namespace star { namespace beans {
-    struct Property;
-    struct PropertyValue;
-} } } }
-
-namespace com { namespace sun { namespace star { namespace io {
-    class XInputStream;
-    class XOutputStream;
-} } } }
-
-namespace com { namespace sun { namespace star { namespace sdbc {
-    class XRow;
-} } } }
-
-namespace com { namespace sun { namespace star { namespace ucb {
-    struct TransferInfo;
-} } } }
-
-namespace gvfs
-{
-
-class ContentProvider;
-
-// Random made up names - AFAICS
-#define GVFS_FILE_TYPE   "application/vnd.sun.staroffice.gvfs-file"
-#define GVFS_FOLDER_TYPE "application/vnd.sun.staroffice.gvfs-folder"
-
-class Authentication
-{
-public:
-    // Helper class to make exceptions pleasant
-    explicit Authentication( const com::sun::star::uno::Reference<
-                com::sun::star::ucb::XCommandEnvironment > & xEnv );
-    ~Authentication();
-};
-
-class Content : public ::ucbhelper::ContentImplHelper,
-        public com::sun::star::ucb::XContentCreator
-{
-
-//                             Internals
-
-private:
-    typedef rtl::Reference< Content > ContentRef;
-    typedef std::list< ContentRef > ContentRefList;
-
-    // Instance data
-    ContentProvider  *m_pProvider;  // No need for a ref, base class holds object
-    sal_Bool          m_bTransient; // A non-existent (as yet) item
-    GnomeVFSFileInfo  m_info;       // cached status information
-
-    // Internal helpers
-    void                       queryChildren   ( ContentRefList& rChildren );
-    ::com::sun::star::uno::Any getBadArgExcept ();
-    GnomeVFSResult             getInfo         ( const ::com::sun::star::uno::Reference<
-                             ::com::sun::star::ucb::XCommandEnvironment >& xEnv );
-    sal_Bool                   isFolder        ( const ::com::sun::star::uno::Reference<
-                             ::com::sun::star::ucb::XCommandEnvironment >& xEnv );
-    sal_Bool                   exchangeIdentity( const ::com::sun::star::uno::Reference<
-                             ::com::sun::star::ucb::XContentIdentifier >&  xNewId);
-    GnomeVFSResult             doSetFileInfo   ( const GnomeVFSFileInfo                       *newInfo,
-                             GnomeVFSSetFileInfoMask                       setMask,
-                             const ::com::sun::star::uno::Reference<
-                             ::com::sun::star::ucb::XCommandEnvironment >& xEnv );
-    OUString            makeNewURL      ( const char *newName );
-    // End Internal helpers
-
-    // For ucbhelper
-    virtual OUString getParentURL() SAL_OVERRIDE;
-    // For ucbhelper
-    virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
-    getProperties( const com::sun::star::uno::Reference<
-               com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE;
-    // For ucbhelper
-    virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo >
-    getCommands( const com::sun::star::uno::Reference<
-             com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE;
-
-public:
-    // Command "getPropertyValues"
-    ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >
-    getPropertyValues( const ::com::sun::star::uno::Sequence<
-               ::com::sun::star::beans::Property >& rProperties,
-               const ::com::sun::star::uno::Reference<
-               ::com::sun::star::ucb::XCommandEnvironment >& xEnv );
-
-private:
-    // Command "setPropertyValues"
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
-    setPropertyValues( const ::com::sun::star::uno::Sequence<
-               ::com::sun::star::beans::PropertyValue >& rValues,
-               const ::com::sun::star::uno::Reference<
-               ::com::sun::star::ucb::XCommandEnvironment >& xEnv );
-
-    // Command "insert"
-    void insert( const ::com::sun::star::uno::Reference<
-                    ::com::sun::star::io::XInputStream > & xInputStream,
-                 sal_Bool bReplaceExisting,
-                 const com::sun::star::uno::Reference<
-                    com::sun::star::ucb::XCommandEnvironment >& xEnv )
-        throw( ::com::sun::star::uno::Exception );
-
-    // Command "transfer"
-    void transfer( const ::com::sun::star::ucb::TransferInfo & rArgs,
-               const com::sun::star::uno::Reference<
-                    com::sun::star::ucb::XCommandEnvironment >& xEnv )
-        throw( ::com::sun::star::uno::Exception );
-
-    // Command "delete"
-    void destroy( sal_Bool bDeletePhysical )
-        throw( ::com::sun::star::uno::Exception );
-
-    // "open" helpers
-    void    copyData( ::com::sun::star::uno::Reference<
-                ::com::sun::star::io::XInputStream > xIn,
-              ::com::sun::star::uno::Reference<
-                    ::com::sun::star::io::XOutputStream > xOut );
-
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::io::XInputStream >
-        createTempStream(  const ::com::sun::star::uno::Reference<
-                    com::sun::star::ucb::XCommandEnvironment >& xEnv )
-        throw( ::com::sun::star::uno::Exception );
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::io::XInputStream >
-        createInputStream(  const ::com::sun::star::uno::Reference<
-                    com::sun::star::ucb::XCommandEnvironment >& xEnv )
-        throw( ::com::sun::star::uno::Exception );
-            sal_Bool feedSink( ::com::sun::star::uno::Reference<
-                ::com::sun::star::uno::XInterface> aSink,
-               const ::com::sun::star::uno::Reference<
-                com::sun::star::ucb::XCommandEnvironment >& xEnv );
-
-    ::com::sun::star::uno::Any mapVFSException( const GnomeVFSResult result,
-                            sal_Bool bWrite );
-
-    void cancelCommandExecution(const GnomeVFSResult result,
-                    const ::com::sun::star::uno::Reference<
-                    com::sun::star::ucb::XCommandEnvironment > & xEnv,
-                    sal_Bool bWrite = sal_False )
-        throw( ::com::sun::star::uno::Exception );
-
-
-public:
-    // Non-interface bits
-    char         *getURI ();
-    OString  getOURI ();
-    OUString getOUURI ();
-
-
-//                            Externals
-
-public:
-
-    Content( const ::com::sun::star::uno::Reference<
-         ::com::sun::star::uno::XComponentContext >& rxContext,
-         ContentProvider                                *pProvider,
-         const ::com::sun::star::uno::Reference<
-         ::com::sun::star::ucb::XContentIdentifier >&    Identifier)
-            throw ( ::com::sun::star::ucb::ContentCreationException );
-    Content( const ::com::sun::star::uno::Reference<
-         ::com::sun::star::uno::XComponentContext >& rxContext,
-         ContentProvider                                *pProvider,
-         const ::com::sun::star::uno::Reference<
-         ::com::sun::star::ucb::XContentIdentifier >&    Identifier,
-         sal_Bool                                        isFolder)
-            throw ( ::com::sun::star::ucb::ContentCreationException );
-    virtual ~Content();
-
-    // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual void SAL_CALL acquire()
-        throw() SAL_OVERRIDE;
-    virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
-
-    // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
-        // XServiceInfo
-        virtual OUString SAL_CALL getImplementationName()
-        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
-    getSupportedServiceNames()
-        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
-    // XContent
-    virtual OUString SAL_CALL
-    getContentType()
-        throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
-    // XCommandProcessor
-    virtual com::sun::star::uno::Any SAL_CALL
-    execute( const com::sun::star::ucb::Command& aCommand,
-         sal_Int32 CommandId,
-         const com::sun::star::uno::Reference<
-         com::sun::star::ucb::XCommandEnvironment >& xEnv )
-        throw( com::sun::star::uno::Exception,
-               com::sun::star::ucb::CommandAbortedException,
-               com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-    virtual void SAL_CALL
-    abort( sal_Int32 CommandId )
-        throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
-
-    // Additional interfaces
-
-
-    // XContentCreator
-    virtual com::sun::star::uno::Sequence<
-        com::sun::star::ucb::ContentInfo > SAL_CALL
-    queryCreatableContentsInfo()
-        throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-    virtual com::sun::star::uno::Reference<
-        com::sun::star::ucb::XContent > SAL_CALL
-    createNewContent( const com::sun::star::ucb::ContentInfo& Info )
-        throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
-
-    com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo >
-    queryCreatableContentsInfo(
-        const com::sun::star::uno::Reference<
-            com::sun::star::ucb::XCommandEnvironment >& xEnv)
-        throw( com::sun::star::uno::RuntimeException );
-};
-
-}
-
-extern "C" {
-    extern GPrivate *auth_queue;
-    extern void auth_queue_destroy( gpointer data );
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.cxx b/ucb/source/ucp/gvfs/gvfs_directory.cxx
deleted file mode 100644
index dd5c1036ba71..000000000000
--- a/ucb/source/ucp/gvfs/gvfs_directory.cxx
+++ /dev/null
@@ -1,411 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-
-/*
- * This file pinched from webdavdatasupplier (etc.)
- * cut & paste + new getData impl. & collate ResultSet code.
- */
-#include <vector>
-#include <osl/diagnose.h>
-#include <com/sun/star/ucb/OpenMode.hpp>
-#include <ucbhelper/contentidentifier.hxx>
-#include <ucbhelper/providerhelper.hxx>
-
-#include "gvfs_directory.hxx"
-
-#include <libgnomevfs/gnome-vfs-utils.h>
-#include <libgnomevfs/gnome-vfs-directory.h>
-#include <comphelper/processfactory.hxx>
-
-using namespace com::sun::star;
-using namespace gvfs;
-
-// DynamicResultSet Implementation.
-
-DynamicResultSet::DynamicResultSet(
-    const uno::Reference< uno::XComponentContext >& rxContext,
-    const rtl::Reference< Content >& rxContent,
-    const ucb::OpenCommandArgument2& rCommand,
-    const uno::Reference< ucb::XCommandEnvironment >& rxEnv )
-    : ResultSetImplHelper( rxContext, rCommand ),
-      m_xContent( rxContent ),
-      m_xEnv( rxEnv )
-{
-}
-void DynamicResultSet::initStatic()
-{
-    m_xResultSet1
-        = new ::ucbhelper::ResultSet( m_xContext,
-                                      m_aCommand.Properties,
-                                      new DataSupplier( m_xContent,
-                                                        m_aCommand.Mode ),
-                                      m_xEnv );
-}
-void DynamicResultSet::initDynamic()
-{
-    initStatic();
-    m_xResultSet2 = m_xResultSet1;
-}
-
-
-
-
-// DataSupplier Implementation.
-
-
-
-struct ResultListEntry
-{
-    OUString                             aId;
-    uno::Reference< ucb::XContentIdentifier > xId;
-    uno::Reference< ucb::XContent >           xContent;
-    uno::Reference< sdbc::XRow >              xRow;
-    GnomeVFSFileInfo                          aInfo;
-
-    explicit ResultListEntry( const GnomeVFSFileInfo *fileInfo)
-    {
-        gnome_vfs_file_info_copy (&aInfo, fileInfo);
-    }
-
-    ~ResultListEntry()
-    {
-        gnome_vfs_file_info_clear (&aInfo);
-    }
-};
-
-
-
-// ResultList.
-
-
-
-typedef std::vector< ResultListEntry* > ResultList;
-
-
-
-// struct DataSupplier_Impl.
-
-
-
-struct gvfs::DataSupplier_Impl
-{
-    osl::Mutex                                   m_aMutex;
-    ResultList                                   m_aResults;
-    rtl::Reference< Content >                    m_xContent;
-    sal_Int32                                    m_nOpenMode;
-    sal_Bool                                     m_bCountFinal;
-
-    DataSupplier_Impl(
-              const rtl::Reference< Content >& rContent,
-              sal_Int32 nOpenMode )
-        : m_xContent( rContent ),
-          m_nOpenMode( nOpenMode ), m_bCountFinal( sal_False ) {}
-    ~DataSupplier_Impl()
-    {
-        ResultList::const_iterator it  = m_aResults.begin();
-        ResultList::const_iterator end = m_aResults.end();
-
-        while ( it != end )
-        {
-            delete (*it);
-            ++it;
-        }
-    }
-};
-
-DataSupplier::DataSupplier(
-            const rtl::Reference< Content >& rContent,
-            sal_Int32 nOpenMode )
-: m_pImpl( new DataSupplier_Impl( rContent, nOpenMode ) )
-{
-}
-
-
-// virtual
-DataSupplier::~DataSupplier()
-{
-    delete m_pImpl;
-}
-
-// virtual
-OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
-{
-    osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-
-    if ( nIndex < m_pImpl->m_aResults.size() ) {
-        OUString aId = m_pImpl->m_aResults[ nIndex ]->aId;
-        if ( !aId.isEmpty() ) // cached
-            return aId;
-    }
-
-    if ( getResult( nIndex ) ) {
-        OUString aId = m_pImpl->m_xContent->getOUURI();
-
-        char *escaped_name;
-        escaped_name = gnome_vfs_escape_string( m_pImpl->m_aResults[ nIndex ]->aInfo.name );
-
-        if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() )
-            aId += "/";
-
-        aId += OUString::createFromAscii( escaped_name );
-
-        g_free( escaped_name );
-
-        m_pImpl->m_aResults[ nIndex ]->aId = aId;
-        return aId;
-    }
-
-    return OUString();
-}
-
-// virtual
-uno::Reference< ucb::XContentIdentifier >
-DataSupplier::queryContentIdentifier( sal_uInt32 nIndex )
-{
-    osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-
-    if ( nIndex < m_pImpl->m_aResults.size() ) {
-        uno::Reference< ucb::XContentIdentifier > xId
-            = m_pImpl->m_aResults[ nIndex ]->xId;
-        if ( xId.is() ) // Already cached.
-            return xId;
-    }
-
-    OUString aId = queryContentIdentifierString( nIndex );
-    if ( !aId.isEmpty() ) {
-        uno::Reference< ucb::XContentIdentifier > xId
-            = new ::ucbhelper::ContentIdentifier( aId );
-        m_pImpl->m_aResults[ nIndex ]->xId = xId;
-        return xId;
-    }
-
-    return uno::Reference< ucb::XContentIdentifier >();
-}
-
-// virtual
-uno::Reference< ucb::XContent >
-DataSupplier::queryContent( sal_uInt32 nIndex )
-{
-    osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-
-    if ( nIndex < m_pImpl->m_aResults.size() ) {
-        uno::Reference< ucb::XContent > xContent
-            = m_pImpl->m_aResults[ nIndex ]->xContent;
-        if ( xContent.is() ) // Already cached.
-            return xContent;
-    }
-
-    uno::Reference< ucb::XContentIdentifier > xId
-        = queryContentIdentifier( nIndex );
-    if ( xId.is() ) {
-        try
-        {
-            // FIXME:
-            // It would be really nice to propagate this information
-            // to the Content, but we can't then register it with the
-            // ContentProvider, and the ucbhelper hinders here.
-            uno::Reference< ucb::XContent > xContent
-                = m_pImpl->m_xContent->getProvider()->queryContent( xId );
-            m_pImpl->m_aResults[ nIndex ]->xContent = xContent;
-            return xContent;
-
-        }
-        catch ( ucb::IllegalIdentifierException& ) {
-        }
-    }
-    return uno::Reference< ucb::XContent >();
-}
-
-// virtual
-bool DataSupplier::getResult( sal_uInt32 nIndex )
-{
-    osl::ClearableGuard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-
-    if ( m_pImpl->m_aResults.size() > nIndex ) // Result already present.
-        return true;
-
-    if ( getData() && m_pImpl->m_aResults.size() > nIndex )
-        return true;
-
-    return false;
-}
-
-// virtual
-sal_uInt32 DataSupplier::totalCount()
-{
-    getData();
-
-    osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-
-    return m_pImpl->m_aResults.size();
-}
-
-// virtual
-sal_uInt32 DataSupplier::currentCount()
-{
-    osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-    return m_pImpl->m_aResults.size();
-}
-
-// virtual
-bool DataSupplier::isCountFinal()
-{
-    osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-    return m_pImpl->m_bCountFinal;
-}
-
-// virtual
-uno::Reference< sdbc::XRow > DataSupplier::queryPropertyValues( sal_uInt32 nIndex )
-{
-    osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-
-    if ( nIndex < m_pImpl->m_aResults.size() ) {
-        uno::Reference< sdbc::XRow > xRow = m_pImpl->m_aResults[ nIndex ]->xRow;
-        if ( xRow.is() ) // Already cached.
-            return xRow;
-    }
-
-    if ( getResult( nIndex ) ) {
-        // Inefficient - but we can't create xContent's sensibly
-        // nor can we do the property code sensibly cleanly staticaly.
-        Content *pContent = static_cast< ::gvfs::Content * >(queryContent( nIndex ).get());
-
-        uno::Reference< sdbc::XRow > xRow =
-            pContent->getPropertyValues( getResultSet()->getProperties(),
-                             getResultSet()->getEnvironment() );
-
-        m_pImpl->m_aResults[ nIndex ]->xRow = xRow;
-
-        return xRow;
-    }
-
-    return uno::Reference< sdbc::XRow >();
-}
-
-// virtual
-void DataSupplier::releasePropertyValues( sal_uInt32 nIndex )
-{
-    osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-
-    if ( nIndex < m_pImpl->m_aResults.size() )
-        m_pImpl->m_aResults[ nIndex ]->xRow = uno::Reference< sdbc::XRow >();
-}
-
-// virtual
-void DataSupplier::close()
-{
-}
-
-// virtual
-void DataSupplier::validate()
-    throw( ucb::ResultSetException )
-{
-}
-
-sal_Bool DataSupplier::getData()
-{
-    osl::ClearableGuard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
-
-    if ( !m_pImpl->m_bCountFinal ) {
-        GnomeVFSResult result;
-        GnomeVFSDirectoryHandle *dirHandle = NULL;
-
-        {
-            Authentication aAuth( getResultSet()->getEnvironment() );
-            char *uri = m_pImpl->m_xContent->getURI();
-            result = gnome_vfs_directory_open
-                ( &dirHandle, uri, GNOME_VFS_FILE_INFO_DEFAULT );
-
-            if (result != GNOME_VFS_OK) {
-#ifdef DEBUG
-                g_warning ("Failed open of '%s' with '%s'",
-                       uri, gnome_vfs_result_to_string( result ));
-#endif
-                g_free( uri );
-                return sal_False;
-            }
-
-            g_free( uri );
-        }
-
-        GnomeVFSFileInfo* fileInfo = gnome_vfs_file_info_new ();
-
-        while ((result = gnome_vfs_directory_read_next (dirHandle, fileInfo)) == GNOME_VFS_OK) {
-            if( fileInfo->name && fileInfo->name[0] == '.' &&
-                ( fileInfo->name[1] == '\0' ||
-                  ( fileInfo->name[1] == '.' && fileInfo->name[2] == '\0' ) ) )
-                continue;
-
-            switch ( m_pImpl->m_nOpenMode ) {
-            case ucb::OpenMode::FOLDERS:
-                if ( !(fileInfo->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) ||
-                     fileInfo->type != GNOME_VFS_FILE_TYPE_DIRECTORY )
-                    continue;
-                break;
-
-            case ucb::OpenMode::DOCUMENTS:
-                if ( !(fileInfo->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) ||
-                     fileInfo->type != GNOME_VFS_FILE_TYPE_REGULAR )
-                    continue;
-                break;
-
-            case ucb::OpenMode::ALL:
-            default:
-                break;
-            }
-
-            m_pImpl->m_aResults.push_back( new ResultListEntry( fileInfo ) );
-        }
-
-        gnome_vfs_file_info_unref (fileInfo);
-
-#if OSL_DEBUG_LEVEL > 1
-        g_warning ("Got %d directory entries", result);
-#endif
-
-        m_pImpl->m_bCountFinal = sal_True;
-
-        // Callback possible, because listeners may be informed!
-        aGuard.clear();
-        getResultSet()->rowCountFinal();
-
-        if (result != GNOME_VFS_ERROR_EOF) {
-#ifdef DEBUG
-            g_warning( "Failed read_next '%s'",
-                   gnome_vfs_result_to_string( result ) );
-#endif
-            return sal_False;
-        }
-
-        result = gnome_vfs_directory_close (dirHandle);
-        if (result != GNOME_VFS_OK) {
-#ifdef DEBUG
-            g_warning( "Failed close '%s'",
-                   gnome_vfs_result_to_string( result ) );
-#endif
-            return sal_False;
-        }
-    }
-
-    return sal_True;
-}
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.hxx b/ucb/source/ucp/gvfs/gvfs_directory.hxx
deleted file mode 100644
index 0be70dca343d..000000000000
--- a/ucb/source/ucp/gvfs/gvfs_directory.hxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_DIRECTORY_HXX
-#define INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_DIRECTORY_HXX
-
-#include <rtl/ref.hxx>
-#include <ucbhelper/resultset.hxx>
-#include <ucbhelper/resultsethelper.hxx>
-#include "gvfs_content.hxx"
-
-namespace gvfs {
-
-class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
-{
-    rtl::Reference< Content > m_xContent;
-    com::sun::star::uno::Reference<
-        com::sun::star::ucb::XCommandEnvironment > m_xEnv;
-
-private:
-    virtual void initStatic() SAL_OVERRIDE;
-    virtual void initDynamic() SAL_OVERRIDE;
-
-public:
-    DynamicResultSet( const com::sun::star::uno::Reference<
-                        com::sun::star::uno::XComponentContext >& rxContext,
-                      const rtl::Reference< Content >& rxContent,
-                      const com::sun::star::ucb::OpenCommandArgument2& rCommand,
-                      const com::sun::star::uno::Reference<
-                        com::sun::star::ucb::XCommandEnvironment >& rxEnv );
-};
-
-
-struct DataSupplier_Impl;
-class DataSupplier : public ucbhelper::ResultSetDataSupplier
-{
-private:
-    gvfs::DataSupplier_Impl *m_pImpl;
-    sal_Bool getData();
-
-public:
-    DataSupplier(const rtl::Reference< Content >& rContent,
-              sal_Int32 nOpenMode);
-
-    virtual ~DataSupplier();
-
-    virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) SAL_OVERRIDE;
-    virtual com::sun::star::uno::Reference<
-                com::sun::star::ucb::XContentIdentifier >
-                          queryContentIdentifier( sal_uInt32 nIndex ) SAL_OVERRIDE;
-    virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent >
-                          queryContent( sal_uInt32 nIndex ) SAL_OVERRIDE;
-
-    virtual bool      getResult( sal_uInt32 nIndex ) SAL_OVERRIDE;
-
-    virtual sal_uInt32    totalCount() SAL_OVERRIDE;
-    virtual sal_uInt32    currentCount() SAL_OVERRIDE;
-    virtual bool      isCountFinal() SAL_OVERRIDE;
-
-    virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow >
-                          queryPropertyValues( sal_uInt32 nIndex  ) SAL_OVERRIDE;
-    virtual void          releasePropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE;
-    virtual void          close() SAL_OVERRIDE;
-    virtual void          validate()
-        throw( com::sun::star::ucb::ResultSetException ) SAL_OVERRIDE;
-};
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx
deleted file mode 100644
index 68789c04034d..000000000000
--- a/ucb/source/ucp/gvfs/gvfs_provider.cxx
+++ /dev/null
@@ -1,179 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-
-
-#include <comphelper/processfactory.hxx>
-#include <ucbhelper/contentidentifier.hxx>
-#include <libgnomevfs/gnome-vfs-init.h>
-#include "gvfs_provider.hxx"
-#include "gvfs_content.hxx"
-
-using namespace com::sun::star;
-using namespace gvfs;
-
-
-
-
-// ContentProvider Implementation.
-
-
-
-
-ContentProvider::ContentProvider(
-    const uno::Reference< uno::XComponentContext >& rxContext )
-: ::ucbhelper::ContentProviderImplHelper( rxContext )
-{
-}
-// sdafas
-
-// virtual
-ContentProvider::~ContentProvider()
-{
-}
-
-
-
-// XInterface methods.
-void SAL_CALL ContentProvider::acquire()
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-void SAL_CALL ContentProvider::release()
-    throw()
-{
-    OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
-{
-    css::uno::Any aRet = cppu::queryInterface( rType,
-                                               (static_cast< lang::XTypeProvider* >(this)),
-                                               (static_cast< lang::XServiceInfo* >(this)),
-                                               (static_cast< css::ucb::XContentProvider* >(this))
-                                               );
-    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-
-
-XTYPEPROVIDER_IMPL_3( ContentProvider,
-                      lang::XTypeProvider,
-                      lang::XServiceInfo,
-                      com::sun::star::ucb::XContentProvider );
-
-
-
-// XServiceInfo methods.
-
-
-
-XSERVICEINFO_IMPL_1_CTX( ContentProvider,
-                     OUString( "com.sun.star.comp.GnomeVFSContentProvider" ),
-                     OUString( "com.sun.star.ucb.GnomeVFSContentProvider" ) );
-
-
-// Service factory implementation.
-
-
-
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
-
-
-
-// XContentProvider methods.
-
-
-
-uno::Reference< com::sun::star::ucb::XContent > SAL_CALL
-ContentProvider::queryContent(
-            const uno::Reference<
-                    com::sun::star::ucb::XContentIdentifier >& Identifier )
-    throw( com::sun::star::ucb::IllegalIdentifierException,
-           uno::RuntimeException )
-{
-#if OSL_DEBUG_LEVEL > 1
-    g_warning ("QueryContent: '%s'",
-               OUStringToOString (Identifier->getContentIdentifier(),
-                                       RTL_TEXTENCODING_UTF8).getStr() );
-#endif
-
-    osl::MutexGuard aGuard( m_aMutex );
-
-    // Check, if a content with given id already exists...
-    uno::Reference< com::sun::star::ucb::XContent > xContent
-        = queryExistingContent( Identifier ).get();
-    if ( xContent.is() )
-        return xContent;
-
-    try
-    {
-        xContent = new ::gvfs::Content( m_xContext, this, Identifier );
-        registerNewContent( xContent );
-    }
-    catch ( com::sun::star::ucb::ContentCreationException const & )
-    {
-        throw com::sun::star::ucb::IllegalIdentifierException();
-    }
-
-    if ( !xContent->getIdentifier().is() )
-        throw com::sun::star::ucb::IllegalIdentifierException();
-
-    return xContent;
-}
-
-
-//============================ shlib entry points =============================================
-
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgvfs1_component_getFactory(
-    const sal_Char *pImplName, void* pServiceManager, void* /*pRegistryKey*/)
-{
-    void * pRet = 0;
-
-    {
-        osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
-        if (!gnome_vfs_initialized ())
-            gnome_vfs_init ();
-        SAL_WNODEPRECATED_DECLARATIONS_PUSH
-        if (!auth_queue)
-            auth_queue = g_private_new( auth_queue_destroy );
-        SAL_WNODEPRECATED_DECLARATIONS_POP
-    }
-
-    uno::Reference< lang::XMultiServiceFactory > xSMgr
-        (reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
-    uno::Reference< lang::XSingleServiceFactory > xFactory;
-
-    if ( ::gvfs::ContentProvider::getImplementationName_Static().equalsAscii( pImplName ) )
-        xFactory = ::gvfs::ContentProvider::createServiceFactory( xSMgr );
-
-    if ( xFactory.is() ) {
-        xFactory->acquire();
-        pRet = xFactory.get();
-    }
-
-    return pRet;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.hxx b/ucb/source/ucp/gvfs/gvfs_provider.hxx
deleted file mode 100644
index 699ab964546b..000000000000
--- a/ucb/source/ucp/gvfs/gvfs_provider.hxx
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_PROVIDER_HXX
-#define INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_PROVIDER_HXX
-
-#include <rtl/ref.hxx>
-#include <com/sun/star/beans/Property.hpp>
-#include <ucbhelper/providerhelper.hxx>
-
-namespace gvfs {
-
-class ContentProvider : public ::ucbhelper::ContentProviderImplHelper
-{
-public:
-    explicit ContentProvider( const ::com::sun::star::uno::Reference<
-             ::com::sun::star::uno::XComponentContext >& rxContext );
-    virtual ~ContentProvider();
-
-    // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual void SAL_CALL acquire()
-        throw() SAL_OVERRIDE;
-    virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE;
-
-    // XTypeProvider
-    virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
-    // XServiceInfo
-    virtual OUString SAL_CALL getImplementationName()
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
-        throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
-    static OUString getImplementationName_Static();
-    static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
-    static css::uno::Reference< css::lang::XSingleServiceFactory >
-    createServiceFactory( const css::uno::Reference<
-                          css::lang::XMultiServiceFactory >& rxServiceMgr );
-
-    // XContentProvider
-    virtual ::com::sun::star::uno::Reference<
-      ::com::sun::star::ucb::XContent > SAL_CALL
-    queryContent( const ::com::sun::star::uno::Reference<
-              ::com::sun::star::ucb::XContentIdentifier >& Identifier )
-        throw( ::com::sun::star::ucb::IllegalIdentifierException,
-               ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
-};
-
-} /* namespace gvfs */
-
-#endif // INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_PROVIDER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/gvfs/gvfs_stream.cxx b/ucb/source/ucp/gvfs/gvfs_stream.cxx
deleted file mode 100644
index e453b98f1ed0..000000000000
--- a/ucb/source/ucp/gvfs/gvfs_stream.cxx
+++ /dev/null
@@ -1,335 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-
-#include "gvfs_stream.hxx"
-#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
-#include <cppuhelper/queryinterface.hxx>
-
-#include <libgnomevfs/gnome-vfs-ops.h>
-
-using namespace cppu;
-using namespace com::sun::star::io;
-using namespace com::sun::star::uno;
-using namespace com::sun::star::ucb;
-using namespace gvfs;
-
-
-Stream::Stream( GnomeVFSHandle         *handle,
-        const GnomeVFSFileInfo *aInfo ) :
-    m_eof (sal_False),
-    m_bInputStreamCalled( sal_False ),
-    m_bOutputStreamCalled( sal_False )
-{
-    m_handle = handle;
-    gnome_vfs_file_info_copy (&m_info, aInfo);
-}
-
-Stream::~Stream()
-{
-    if (m_handle) {
-        gnome_vfs_close (m_handle);
-        m_handle = NULL;
-    }
-}
-
-Any Stream::queryInterface( const Type &type )
-    throw( RuntimeException )
-{
-    Any aRet = ::cppu::queryInterface
-        ( type,
-          static_cast< XStream * >( this ),
-          static_cast< XInputStream * >( this ),
-          static_cast< XOutputStream * >( this ),
-          static_cast< XSeekable * >( this ),
-          static_cast< XTruncate * >( this ) );
-
-    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( type );
-}
-
-
-//                            XStream
-
-
-com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL
-Stream::getInputStream(  )
-    throw( com::sun::star::uno::RuntimeException )
-{
-    {
-        osl::MutexGuard aGuard( m_aMutex );
-        m_bInputStreamCalled = true;
-    }
-    return Reference< XInputStream >( this );
-}
-
-com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > SAL_CALL
-Stream::getOutputStream(  )
-    throw( com::sun::star::uno::RuntimeException )
-{
-    {
-        osl::MutexGuard aGuard( m_aMutex );
-        m_bOutputStreamCalled = true;
-    }
-    return Reference< XOutputStream >( this );
-}
-
-
-//                            XInputStream
-
-
-sal_Int32 SAL_CALL Stream::readBytes(
-    Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
-        throw( NotConnectedException,
-               BufferSizeExceededException,
-               IOException,
-               RuntimeException )
-{
-    GnomeVFSResult   result;
-    GnomeVFSFileSize nBytesRead = 0;
-
-    if( ! m_handle )
-        throw IOException();
-
-    if( m_eof ) {
-        aData.realloc( 0 );
-        return 0;
-    }
-
-    try {
-        aData.realloc( nBytesToRead );
-    } catch ( const Exception &e ) {
-        throw BufferSizeExceededException();
-    }
-
-    do {
-        result = gnome_vfs_read( m_handle, aData.getArray(),
-                     nBytesToRead, &nBytesRead );
-    } while( result == GNOME_VFS_ERROR_INTERRUPTED );
-
-    if (result != GNOME_VFS_OK &&
-        result != GNOME_VFS_ERROR_EOF)
-        throwOnError( result );
-
-    if (result == GNOME_VFS_ERROR_EOF)
-        m_eof = sal_True;
-
-    aData.realloc( sal::static_int_cast<sal_uInt32>(nBytesRead) );
-
-    return sal::static_int_cast<sal_Int32>(nBytesRead);
-}
-
-sal_Int32 SAL_CALL Stream::readSomeBytes(
-    Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
-            throw( NotConnectedException,
-               BufferSizeExceededException,
-               IOException,
-               RuntimeException )
-{
-    // Again - having 2 methods here just sucks; cf. filinpstr.cxx
-    // This can never be an effective non-blocking API - so why bother ?
-    return readBytes( aData, nMaxBytesToRead );
-}
-
-void SAL_CALL Stream::skipBytes( sal_Int32 nBytesToSkip )
-        throw( NotConnectedException,
-               BufferSizeExceededException,
-               IOException,
-               RuntimeException )
-{
-    GnomeVFSResult result;
-
-    if( ! m_handle )
-        throw IOException();
-
-    result = gnome_vfs_seek( m_handle, GNOME_VFS_SEEK_CURRENT, nBytesToSkip );
-
-    if ( result == GNOME_VFS_ERROR_BAD_PARAMETERS ||
-         result == GNOME_VFS_ERROR_NOT_SUPPORTED )
-        g_warning ("FIXME: just read them in ...");
-
-    throwOnError( result );
-}
-
-sal_Int32 SAL_CALL Stream::available(  )
-        throw( NotConnectedException,
-               IOException,
-               RuntimeException )
-{
-    return 0; // cf. filinpstr.cxx
-}
-
-void SAL_CALL Stream::closeInput()
-        throw( NotConnectedException,
-                   IOException,
-                   RuntimeException )
-{
-    osl::MutexGuard aGuard( m_aMutex );
-    m_bInputStreamCalled = false;
-
-    if( ! m_bOutputStreamCalled )
-        closeStream();
-}
-
-
-//                            XSeekable
-
-
-void SAL_CALL Stream::seek( sal_Int64 location )
-        throw( ::com::sun::star::lang::IllegalArgumentException,
-               IOException,
-               RuntimeException )
-{
-    GnomeVFSResult result;
-
-    if( ! m_handle )
-        throw IOException();
-
-    if ( location < 0 )
-        throw ::com::sun::star::lang::IllegalArgumentException();
-
-    m_eof = sal_False;
-    result = gnome_vfs_seek( m_handle, GNOME_VFS_SEEK_START, location );
-
-    if (result == GNOME_VFS_ERROR_EOF)
-        throw ::com::sun::star::lang::IllegalArgumentException();
-
-    throwOnError( result );
-}
-
-sal_Int64 SAL_CALL Stream::getPosition()
-        throw( IOException,
-               RuntimeException )
-{
-    GnomeVFSFileSize nBytesIn = 0;
-
-    if( ! m_handle )
-        throw IOException();
-
-    throwOnError( gnome_vfs_tell( m_handle, &nBytesIn ) );
-
-    return nBytesIn;
-}
-
-sal_Int64 SAL_CALL Stream::getLength()
-    throw( IOException, RuntimeException )
-{
-    // FIXME: so this sucks; it may be stale but ...
-    if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE)
-        return m_info.size;
-    else {
-        g_warning ("FIXME: No valid length");
-        return 0;
-    }
-}
-
-
-//                            XTruncate
-
-
-void SAL_CALL Stream::truncate()
-    throw( com::sun::star::io::IOException,
-           com::sun::star::uno::RuntimeException )
-{
-    if( ! m_handle )
-        throw IOException();
-
-    throwOnError( gnome_vfs_truncate_handle( m_handle, 0 ) );
-}
-
-
-//                            XOutputStream
-
-
-void SAL_CALL Stream::writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData )
-    throw( com::sun::star::io::NotConnectedException,
-           com::sun::star::io::BufferSizeExceededException,
-           com::sun::star::io::IOException,
-           com::sun::star::uno::RuntimeException)
-{
-    GnomeVFSResult   result = GNOME_VFS_OK;
-    GnomeVFSFileSize toWrite = aData.getLength();
-    const sal_Int8 *p = aData.getConstArray();
-
-    if( ! m_handle )
-        throw IOException();
-
-    while( toWrite > 0) {
-        GnomeVFSFileSize bytesWritten = 0;
-
-        result = gnome_vfs_write( m_handle, p, toWrite, &bytesWritten );
-        if( result == GNOME_VFS_ERROR_INTERRUPTED )
-            continue;
-        throwOnError( result );
-        g_assert( bytesWritten <= toWrite );
-        toWrite -= bytesWritten;
-        p += bytesWritten;
-    }
-}
-
-void SAL_CALL Stream::flush()
-    throw( NotConnectedException, BufferSizeExceededException,
-           IOException, RuntimeException )
-{
-}
-
-void SAL_CALL Stream::closeOutput()
-    throw( com::sun::star::io::NotConnectedException,
-           com::sun::star::io::IOException,
-           com::sun::star::uno::RuntimeException )
-{
-    osl::MutexGuard aGuard( m_aMutex );
-    m_bOutputStreamCalled = false;
-
-    if( ! m_bInputStreamCalled )
-        closeStream();
-}
-
-
-//                            Misc.
-
-
-void Stream::closeStream()
-    throw( ::com::sun::star::io::NotConnectedException,
-           ::com::sun::star::io::IOException,
-           ::com::sun::star::uno::RuntimeException )
-{
-    if (m_handle) {
-        gnome_vfs_close (m_handle);
-        m_handle = NULL;
-    } else
-        throw IOException();
-}
-
-void Stream::throwOnError( GnomeVFSResult result )
-    throw( NotConnectedException,
-           BufferSizeExceededException,
-           IOException,
-           RuntimeException )
-{
-    if( result != GNOME_VFS_OK ) {
-        OUString aMsg = OUString::createFromAscii
-              ( gnome_vfs_result_to_string( result ) );
-
-        g_warning( "Input Stream exceptional result '%s' (%d)",
-               gnome_vfs_result_to_string( result ), result );
-
-        throw IOException( aMsg, static_cast< cppu::OWeakObject * >( this ) );
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/gvfs/gvfs_stream.hxx b/ucb/source/ucp/gvfs/gvfs_stream.hxx
deleted file mode 100644
index aaf249dc45ea..000000000000
--- a/ucb/source/ucp/gvfs/gvfs_stream.hxx
+++ /dev/null
@@ -1,159 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- */
-#ifndef INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_STREAM_HXX
-#define INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_STREAM_HXX
-
-#include <sal/types.h>
-#include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
-#include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XTruncate.hpp>
-#include <com/sun/star/io/XSeekable.hpp>
-
-#include <libgnomevfs/gnome-vfs-handle.h>
-
-namespace gvfs
-{
-
-class Stream : public ::com::sun::star::io::XStream,
-           public ::com::sun::star::io::XInputStream,
-           public ::com::sun::star::io::XOutputStream,
-           public ::com::sun::star::io::XTruncate,
-           public ::com::sun::star::io::XSeekable,
-           public ::cppu::OWeakObject
-{
-private:
-    GnomeVFSHandle  *m_handle;
-    GnomeVFSFileInfo m_info;
-    osl::Mutex       m_aMutex;
-    sal_Bool         m_eof;
-    sal_Bool         m_bInputStreamCalled;
-    sal_Bool         m_bOutputStreamCalled;
-
-    void throwOnError( GnomeVFSResult result )
-        throw( ::com::sun::star::io::NotConnectedException,
-               ::com::sun::star::io::BufferSizeExceededException,
-               ::com::sun::star::io::IOException,
-               ::com::sun::star::uno::RuntimeException );
-
-    void closeStream()
-        throw( ::com::sun::star::io::NotConnectedException,
-               ::com::sun::star::io::IOException,
-               ::com::sun::star::uno::RuntimeException );
-
-public:
-    Stream ( GnomeVFSHandle         *handle,
-         const GnomeVFSFileInfo *aInfo );
-    virtual ~Stream();
-
-    // XInterface
-    virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type )
-        throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-    virtual void SAL_CALL acquire()
-        throw () SAL_OVERRIDE
-            { OWeakObject::acquire(); }
-    virtual void SAL_CALL release()
-        throw() SAL_OVERRIDE
-            { OWeakObject::release(); }
-
-    // XStream
-    virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getInputStream(  )
-        throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
-    virtual com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > SAL_CALL getOutputStream(  )
-        throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
-    // XInputStream
-    virtual sal_Int32 SAL_CALL readBytes(
-              ::com::sun::star::uno::Sequence< sal_Int8 > & aData,
-            sal_Int32 nBytesToRead )
-                throw( ::com::sun::star::io::NotConnectedException,
-                          ::com::sun::star::io::BufferSizeExceededException,
-                          ::com::sun::star::io::IOException,
-                          ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
-    virtual sal_Int32 SAL_CALL readSomeBytes(
-            ::com::sun::star::uno::Sequence< sal_Int8 > & aData,
-            sal_Int32 nMaxBytesToRead )
-                throw( ::com::sun::star::io::NotConnectedException,
-                          ::com::sun::star::io::BufferSizeExceededException,
-                          ::com::sun::star::io::IOException,
-                          ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
-    virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
-                throw( ::com::sun::star::io::NotConnectedException,
-                          ::com::sun::star::io::BufferSizeExceededException,
-                          ::com::sun::star::io::IOException,
-                          ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
-    virtual sal_Int32 SAL_CALL available()
-                throw( ::com::sun::star::io::NotConnectedException,
-                          ::com::sun::star::io::IOException,
-                          ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
-    virtual void SAL_CALL closeInput()
-                throw( ::com::sun::star::io::NotConnectedException,
-                          ::com::sun::star::io::IOException,
-                          ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
-    // XSeekable
-    virtual void SAL_CALL seek( sal_Int64 location )
-        throw( ::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::io::IOException,
-               ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
-    virtual sal_Int64 SAL_CALL getPosition()
-        throw( ::com::sun::star::io::IOException,
-               ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
-    virtual sal_Int64 SAL_CALL getLength()
-        throw( ::com::sun::star::io::IOException,
-               ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
-        // XOutputStream
-    virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData )
-        throw( com::sun::star::io::NotConnectedException,
-               com::sun::star::io::BufferSizeExceededException,
-               com::sun::star::io::IOException,
-               com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-
-    virtual void SAL_CALL flush()
-        throw( com::sun::star::io::NotConnectedException,
-               com::sun::star::io::BufferSizeExceededException,
-               com::sun::star::io::IOException,
-               com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
-
-
-        virtual void SAL_CALL closeOutput()
-        throw( com::sun::star::io::NotConnectedException,
-               com::sun::star::io::IOException,
-               com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-
-    // XTruncate
-    virtual void SAL_CALL truncate()
-        throw( com::sun::star::io::IOException,
-               com::sun::star::uno::RuntimeException ) SAL_OVERRIDE;
-};
-
-} // namespace gvfs
-#endif // INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_STREAM_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/gvfs/ucpgvfs.component b/ucb/source/ucp/gvfs/ucpgvfs.component
deleted file mode 100644
index 47e6e7cb1df1..000000000000
--- a/ucb/source/ucp/gvfs/ucpgvfs.component
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   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 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    prefix="ucpgvfs1" xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.GnomeVFSContentProvider">
-    <service name="com.sun.star.ucb.GnomeVFSContentProvider"/>
-  </implementation>
-</component>
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 273116233612..4efce45d6f49 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -126,7 +126,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
 
     gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
 
-#if ENABLE_GNOME_VFS || ENABLE_GIO
+#if ENABLE_GIO
     gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), false );
 #endif
     gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), false );
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 23efb79c3f9e..0b4ccda90023 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -57,7 +57,7 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentCon
         GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, nullptr );
 
     gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
-#if ENABLE_GNOME_VFS || ENABLE_GIO
+#if ENABLE_GIO
     gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), false );
 #endif
     gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), false );