fdo#60698: Move fileaccess module to ucb

Change-Id: I4c688a4aeedcae56ed6404574bd1bb392d4190cb
Reviewed-on: https://gerrit.libreoffice.org/6311
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

5 files changed, 838 insertions, 6 deletions

diff --git a/ucb/Library_ucb1.mk b/ucb/Library_ucb1.mk
index d819a0f24c42..4b1f1d96aff4 100644
--- a/ucb/Library_ucb1.mk
+++ b/ucb/Library_ucb1.mk
@@ -26,7 +26,9 @@ $(eval $(call gb_Library_use_libraries,ucb1,\
 	cppu \
 	cppuhelper \
 	sal \
+	tl \
 	ucbhelper \
+	utl \
 	$(gb_UWINAPI) \
 ))
 
@@ -39,6 +41,7 @@ $(eval $(call gb_Library_add_exception_objects,ucb1,\
 	ucb/source/core/ucbprops \
 	ucb/source/core/ucbserv \
 	ucb/source/core/ucbstore \
+	ucb/source/core/FileAccess \
 	ucb/source/regexp/regexp \
 ))
 
diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
new file mode 100644
index 000000000000..5ecc7e1860b6
--- /dev/null
+++ b/ucb/source/core/FileAccess.cxx
@@ -0,0 +1,777 @@
+/* -*- 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 <osl/mutex.hxx>
+#include <osl/diagnose.h>
+
+#include <uno/mapping.hxx>
+#include <comphelper/processfactory.hxx>
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implbase1.hxx>
+
+#include <tools/urlobj.hxx>
+#include <ucbhelper/content.hxx>
+#include <unotools/streamwrap.hxx>
+#include <tools/stream.hxx>
+#include <tools/string.hxx>
+
+#include <com/sun/star/beans/Property.hpp>
+#include <com/sun/star/container/XChild.hpp>
+#include <com/sun/star/io/XActiveDataSink.hpp>
+#include <com/sun/star/io/XActiveDataSource.hpp>
+#include <com/sun/star/io/XActiveDataStreamer.hpp>
+#include <com/sun/star/sdbc/XResultSet.hpp>
+#include <com/sun/star/ucb/CommandFailedException.hpp>
+#include <com/sun/star/ucb/ContentInfo.hpp>
+#include <com/sun/star/ucb/ContentInfoAttribute.hpp>
+#include <com/sun/star/ucb/InsertCommandArgument.hpp>
+#include <com/sun/star/ucb/InteractiveIOException.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/XCommandEnvironment.hpp>
+#include <com/sun/star/ucb/XContent.hpp>
+#include <com/sun/star/ucb/XContentAccess.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
+#include <com/sun/star/util/theMacroExpander.hpp>
+
+#include <vector>
+
+#include "FileAccess.hxx"
+
+#define SERVICE_NAME "com.sun.star.ucb.SimpleFileAccess"
+
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::ucb;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::task;
+using namespace ::com::sun::star::util;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::registry;
+using namespace ::com::sun::star::container;
+
+using ::std::vector;
+
+namespace
+{
+
+// Implementation XSimpleFileAccess
+typedef cppu::WeakImplHelper1< XSimpleFileAccess3 > FileAccessHelper;
+class OCommandEnvironment;
+
+class OFileAccess : public FileAccessHelper
+{
+    Reference< XComponentContext > m_xContext;
+    Reference< XCommandEnvironment > mxEnvironment;
+    OCommandEnvironment* mpEnvironment;
+
+    void transferImpl( const OUString& rSource, const OUString& rDest, sal_Bool bMoveData )
+        throw(CommandAbortedException, Exception, RuntimeException);
+    bool createNewFile( const OUString & rParentURL,
+                        const OUString & rTitle,
+                        const Reference< XInputStream >& data )
+        throw ( Exception );
+
+public:
+    OFileAccess( const Reference< XComponentContext > & xContext )
+        : m_xContext( xContext), mpEnvironment( NULL ) {}
+    // Methods
+    virtual void SAL_CALL copy( const OUString& SourceURL, const OUString& DestURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL move( const OUString& SourceURL, const OUString& DestURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL kill( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isFolder( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isReadOnly( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL createFolder( const OUString& NewFolderURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Int32 SAL_CALL getSize( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getContentType( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::util::DateTime SAL_CALL getDateTimeModified( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL exists( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL openFileRead( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL openFileWrite( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openFileReadWrite( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL writeFile( const OUString& FileURL, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& data ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isHidden( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+};
+
+// Implementation XActiveDataSink
+typedef cppu::WeakImplHelper1< XActiveDataSink > ActiveDataSinkHelper;
+
+class OActiveDataSink : public ActiveDataSinkHelper
+{
+    Reference< XInputStream > mxStream;
+
+public:
+
+    // Methods
+    virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream )
+        throw(RuntimeException);
+    virtual Reference< XInputStream > SAL_CALL getInputStream(  )
+        throw(RuntimeException);
+};
+
+// Implementation XActiveDataStreamer
+typedef cppu::WeakImplHelper1< XActiveDataStreamer > ActiveDataStreamerHelper;
+
+class OActiveDataStreamer : public ActiveDataStreamerHelper
+{
+    Reference< XStream > mxStream;
+
+public:
+
+    // Methods
+    virtual void SAL_CALL setStream( const Reference< XStream >& aStream )
+        throw(RuntimeException);
+    virtual Reference< XStream > SAL_CALL getStream()
+        throw(RuntimeException);
+};
+
+// Implementation XCommandEnvironment
+typedef cppu::WeakImplHelper1< XCommandEnvironment > CommandEnvironmentHelper;
+
+class OCommandEnvironment : public CommandEnvironmentHelper
+{
+    Reference< XInteractionHandler > mxInteraction;
+
+public:
+    void setHandler( Reference< XInteractionHandler > xInteraction_ )
+    {
+        mxInteraction = xInteraction_;
+    }
+
+    // Methods
+    virtual Reference< XInteractionHandler > SAL_CALL getInteractionHandler()
+        throw(RuntimeException);
+    virtual Reference< XProgressHandler > SAL_CALL getProgressHandler()
+        throw(RuntimeException);
+};
+
+void OActiveDataSink::setInputStream( const Reference< XInputStream >& aStream )
+    throw(RuntimeException)
+{
+    mxStream = aStream;
+}
+
+Reference< XInputStream > OActiveDataSink::getInputStream()
+    throw(RuntimeException)
+{
+    return mxStream;
+}
+
+void OActiveDataStreamer::setStream( const Reference< XStream >& aStream )
+    throw(RuntimeException)
+{
+    mxStream = aStream;
+}
+
+Reference< XStream > OActiveDataStreamer::getStream()
+    throw(RuntimeException)
+{
+    return mxStream;
+}
+
+Reference< XInteractionHandler > OCommandEnvironment::getInteractionHandler()
+    throw(RuntimeException)
+{
+    return mxInteraction;
+}
+
+Reference< XProgressHandler > OCommandEnvironment::getProgressHandler()
+    throw(RuntimeException)
+{
+    Reference< XProgressHandler > xRet;
+    return xRet;
+}
+
+void OFileAccess::transferImpl( const OUString& rSource,
+                                const OUString& rDest,
+                                sal_Bool bMoveData )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    // SfxContentHelper::Transfer_Impl
+    INetURLObject aSourceObj( rSource, INET_PROT_FILE );
+    INetURLObject aDestObj( rDest, INET_PROT_FILE );
+    OUString aName = aDestObj.getName(
+        INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
+    OUString aDestURL;
+    OUString aSourceURL = aSourceObj.GetMainURL( INetURLObject::NO_DECODE );
+    if ( aDestObj.removeSegment() )
+    {
+        // hierarchical URL.
+
+        aDestObj.setFinalSlash();
+        aDestURL = aDestObj.GetMainURL( INetURLObject::NO_DECODE );
+    }
+    else
+    {
+        // non-hierachical URL
+
+        // #i29648#
+        //
+
+        if ( aDestObj.GetProtocol() == INET_PROT_VND_SUN_STAR_EXPAND )
+        {
+            // Hack: Expand destination URL using Macro Expander and try again
+            //       with the hopefully hierarchical expanded URL...
+
+            try
+            {
+                Reference< XMacroExpander > xExpander = theMacroExpander::get(m_xContext);
+
+                aDestURL = xExpander->expandMacros(
+                    aDestObj.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ) );
+            }
+            catch ( Exception const & )
+            {
+                throw RuntimeException(
+                    OUString( "OFileAccess::transferrImpl - Unable to obtain "
+                            "destination folder URL!"  ),
+                    static_cast< cppu::OWeakObject * >( this ) );
+            }
+
+            transferImpl( rSource, aDestURL, bMoveData );
+            return;
+        }
+
+        throw RuntimeException(
+            OUString( "OFileAccess::transferrImpl - Unable to obtain "
+                    "destination folder URL!"  ),
+                static_cast< cppu::OWeakObject * >( this ) );
+
+    }
+
+    ucbhelper::Content aDestPath( aDestURL,   mxEnvironment, comphelper::getProcessComponentContext() );
+    ucbhelper::Content aSrc     ( aSourceURL, mxEnvironment, comphelper::getProcessComponentContext() );
+
+    try
+    {
+        aDestPath.transferContent( aSrc,
+                                   bMoveData
+                                    ? ucbhelper::InsertOperation_MOVE
+                                    : ucbhelper::InsertOperation_COPY,
+                                   aName,
+                                   ::com::sun::star::ucb::NameClash::OVERWRITE );
+    }
+    catch ( ::com::sun::star::ucb::CommandFailedException const & )
+    {
+        // Interaction Handler already handled the error that has occurred...
+    }
+}
+
+void OFileAccess::copy( const OUString& SourceURL, const OUString& DestURL )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    transferImpl( SourceURL, DestURL, sal_False );
+}
+
+void OFileAccess::move( const OUString& SourceURL, const OUString& DestURL )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    transferImpl( SourceURL, DestURL, sal_True );
+}
+
+void OFileAccess::kill( const OUString& FileURL )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    // SfxContentHelper::Kill
+    INetURLObject aDeleteObj( FileURL, INET_PROT_FILE );
+    ucbhelper::Content aCnt( aDeleteObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    try
+    {
+        aCnt.executeCommand( OUString("delete" ), makeAny( sal_Bool( sal_True ) ) );
+    }
+    catch ( ::com::sun::star::ucb::CommandFailedException const & )
+    {
+        // Interaction Handler already handled the error that has occurred...
+    }
+}
+
+sal_Bool OFileAccess::isFolder( const OUString& FileURL )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    sal_Bool bRet = sal_False;
+    try
+    {
+        INetURLObject aURLObj( FileURL, INET_PROT_FILE );
+        ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+        bRet = aCnt.isFolder();
+    }
+    catch (const Exception &) {}
+    return bRet;
+}
+
+sal_Bool OFileAccess::isReadOnly( const OUString& FileURL )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    INetURLObject aURLObj( FileURL, INET_PROT_FILE );
+    ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    Any aRetAny = aCnt.getPropertyValue("IsReadOnly");
+    sal_Bool bRet = sal_False;
+    aRetAny >>= bRet;
+    return bRet;
+}
+
+void OFileAccess::setReadOnly( const OUString& FileURL, sal_Bool bReadOnly )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    INetURLObject aURLObj( FileURL, INET_PROT_FILE );
+    ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    Any aAny;
+    aAny <<= bReadOnly;
+    aCnt.setPropertyValue("IsReadOnly", aAny );
+}
+
+void OFileAccess::createFolder( const OUString& NewFolderURL )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    // Does the folder already exist?
+    if( NewFolderURL.isEmpty() || isFolder( NewFolderURL ) )
+        return;
+
+    // SfxContentHelper::MakeFolder
+    INetURLObject aURL( NewFolderURL, INET_PROT_FILE );
+    OUString aTitle = aURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
+    if ( !aTitle.isEmpty() )
+    {
+        aURL.removeSegment();
+
+        // Does the base folder exist? Otherwise create it first
+        OUString aBaseFolderURLStr = aURL.GetMainURL( INetURLObject::NO_DECODE );
+        if( !isFolder( aBaseFolderURLStr ) )
+        {
+            createFolder( aBaseFolderURLStr );
+        }
+    }
+
+    ucbhelper::Content aCnt( aURL.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+
+    Sequence< ContentInfo > aInfo = aCnt.queryCreatableContentsInfo();
+    sal_Int32 nCount = aInfo.getLength();
+    if ( nCount == 0 )
+        return;
+
+    for ( sal_Int32 i = 0; i < nCount; ++i )
+    {
+        // Simply look for the first KIND_FOLDER...
+        const ContentInfo & rCurr = aInfo[i];
+        if ( rCurr.Attributes & ContentInfoAttribute::KIND_FOLDER )
+        {
+            // Make sure the only required bootstrap property is "Title",
+            const Sequence< Property > & rProps = rCurr.Properties;
+            if ( rProps.getLength() != 1 )
+                continue;
+
+            if ( rProps[ 0 ].Name != "Title" )
+                continue;
+
+            Sequence<OUString> aNames(1);
+            OUString* pNames = aNames.getArray();
+            pNames[0] = OUString( "Title"  );
+            Sequence< Any > aValues(1);
+            Any* pValues = aValues.getArray();
+            pValues[0] = makeAny( OUString( aTitle ) );
+
+            ucbhelper::Content aNew;
+            try
+            {
+                if ( !aCnt.insertNewContent( rCurr.Type, aNames, aValues, aNew ) )
+                    continue;
+
+                // Success. We're done.
+                return;
+            }
+            catch ( ::com::sun::star::ucb::CommandFailedException const & )
+            {
+                // Interaction Handler already handled the error that has occurred...
+                continue;
+            }
+        }
+    }
+}
+
+sal_Int32 OFileAccess::getSize( const OUString& FileURL )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    // SfxContentHelper::GetSize
+    sal_Int32 nSize = 0;
+    sal_Int64 nTemp = 0;
+    INetURLObject aObj( FileURL, INET_PROT_FILE );
+    ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    aCnt.getPropertyValue( "Size" ) >>= nTemp;
+    nSize = (sal_Int32)nTemp;
+    return nSize;
+}
+
+OUString OFileAccess::getContentType( const OUString& FileURL )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    INetURLObject aObj( FileURL, INET_PROT_FILE );
+    ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+
+    Reference< XContent > xContent = aCnt.get();
+    OUString aTypeStr = xContent->getContentType();
+    return aTypeStr;
+}
+
+DateTime OFileAccess::getDateTimeModified( const OUString& FileURL )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    INetURLObject aFileObj( FileURL, INET_PROT_FILE );
+    DateTime aDateTime;
+
+    Reference< XCommandEnvironment > aCmdEnv;
+    ucbhelper::Content aYoung( aFileObj.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv, comphelper::getProcessComponentContext() );
+    aYoung.getPropertyValue("DateModified") >>= aDateTime;
+    return aDateTime;
+}
+
+typedef vector< OUString* > StringList_Impl;
+
+Sequence< OUString > OFileAccess::getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    // SfxContentHelper::GetFolderContents
+
+    StringList_Impl* pFiles = NULL;
+    INetURLObject aFolderObj( FolderURL, INET_PROT_FILE );
+
+    ucbhelper::Content aCnt( aFolderObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    Reference< XResultSet > xResultSet;
+    Sequence< OUString > aProps(0);
+
+    ucbhelper::ResultSetInclude eInclude = bIncludeFolders ? ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS : ucbhelper::INCLUDE_DOCUMENTS_ONLY;
+
+    try
+    {
+        xResultSet = aCnt.createCursor( aProps, eInclude );
+    }
+    catch ( ::com::sun::star::ucb::CommandFailedException const & )
+    {
+        // Interaction Handler already handled the error that has occurred...
+    }
+
+    if ( xResultSet.is() )
+    {
+        pFiles = new StringList_Impl();
+        Reference< com::sun::star::ucb::XContentAccess > xContentAccess( xResultSet, UNO_QUERY );
+
+        while ( xResultSet->next() )
+        {
+            OUString aId = xContentAccess->queryContentIdentifierString();
+            INetURLObject aURL( aId, INET_PROT_FILE );
+            OUString* pFile = new OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
+            pFiles->push_back( pFile );
+        }
+    }
+
+    if ( pFiles )
+    {
+        size_t nCount = pFiles->size();
+        Sequence < OUString > aRet( nCount );
+        OUString* pRet = aRet.getArray();
+        for ( size_t i = 0; i < nCount; ++i )
+        {
+            OUString* pFile = pFiles->at( i );
+            pRet[i] = *( pFile );
+            delete pFile;
+        }
+        pFiles->clear();
+        delete pFiles;
+        return aRet;
+    }
+    else
+        return Sequence < OUString > ();
+}
+
+sal_Bool OFileAccess::exists( const OUString& FileURL )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    sal_Bool bRet = sal_False;
+    try
+    {
+        bRet = isFolder( FileURL );
+        if( !bRet )
+        {
+            Reference< XInputStream > xStream = openFileRead( FileURL );
+            bRet = xStream.is();
+            if( bRet )
+                xStream->closeInput();
+        }
+    }
+    catch (const Exception &) {}
+    return bRet;
+}
+
+Reference< XInputStream > OFileAccess::openFileRead( const OUString& FileURL )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    Reference< XInputStream > xRet;
+    INetURLObject aObj( FileURL, INET_PROT_FILE );
+    ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+
+    Reference< XActiveDataSink > xSink = (XActiveDataSink*)(new OActiveDataSink());
+
+    try
+    {
+        sal_Bool bRet = aCnt.openStream( xSink );
+        if( bRet )
+            xRet = xSink->getInputStream();
+    }
+    catch ( ::com::sun::star::ucb::CommandFailedException const & )
+    {
+        // Interaction Handler already handled the error that has occurred...
+    }
+
+    return xRet;
+}
+
+Reference< XOutputStream > OFileAccess::openFileWrite( const OUString& FileURL )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    Reference< XOutputStream > xRet;
+    Reference< XStream > xStream = OFileAccess::openFileReadWrite( FileURL );
+    if( xStream.is() )
+        xRet = xStream->getOutputStream();
+    return xRet;
+}
+
+Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    Reference< XActiveDataStreamer > xSink = (XActiveDataStreamer*)new OActiveDataStreamer();
+    Reference< XInterface > xSinkIface = Reference< XInterface >::query( xSink );
+
+    OpenCommandArgument2 aArg;
+    aArg.Mode       = OpenMode::DOCUMENT;
+    aArg.Priority   = 0; // unused
+    aArg.Sink       = xSink;
+    aArg.Properties = Sequence< Property >( 0 ); // unused
+
+    Any aCmdArg;
+    aCmdArg <<= aArg;
+
+    INetURLObject aFileObj( FileURL, INET_PROT_FILE );
+    ucbhelper::Content aCnt( aFileObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+
+    // Be silent...
+    Reference< XInteractionHandler > xIH;
+    if ( mpEnvironment )
+    {
+        xIH = mpEnvironment->getInteractionHandler();
+        mpEnvironment->setHandler( 0 );
+    }
+
+    try
+    {
+        aCnt.executeCommand( OUString("open" ), aCmdArg );
+    }
+    catch ( InteractiveIOException const & e )
+    {
+        if ( xIH.is() )
+            mpEnvironment->setHandler( xIH );
+
+        if ( e.Code == IOErrorCode_NOT_EXISTING )
+        {
+            // Create file...
+            SvMemoryStream aStream(0,0);
+            ::utl::OInputStreamWrapper* pInput = new ::utl::OInputStreamWrapper( aStream );
+            Reference< XInputStream > xInput( pInput );
+            InsertCommandArgument aInsertArg;
+            aInsertArg.Data = xInput;
+            aInsertArg.ReplaceExisting = sal_False;
+
+            aCmdArg <<= aInsertArg;
+            aCnt.executeCommand( OUString("insert" ), aCmdArg );
+
+            // Retry...
+            return openFileReadWrite( FileURL );
+        }
+
+        throw;
+    }
+
+    if ( xIH.is() )
+        mpEnvironment->setHandler( xIH );
+
+    Reference< XStream > xRet = xSink->getStream();
+    return xRet;
+}
+
+void OFileAccess::setInteractionHandler( const Reference< XInteractionHandler >& Handler )
+    throw(RuntimeException)
+{
+    if( !mpEnvironment )
+    {
+        mpEnvironment = new OCommandEnvironment();
+        mxEnvironment = (XCommandEnvironment*)mpEnvironment;
+    }
+    mpEnvironment->setHandler( Handler );
+}
+
+bool OFileAccess::createNewFile( const OUString & rParentURL,
+                                 const OUString & rTitle,
+                                 const Reference< XInputStream >& data )
+    throw ( Exception )
+{
+    ucbhelper::Content aParentCnt( rParentURL, mxEnvironment, comphelper::getProcessComponentContext() );
+
+    Sequence< ContentInfo > aInfo = aParentCnt.queryCreatableContentsInfo();
+    sal_Int32 nCount = aInfo.getLength();
+    if ( nCount == 0 )
+        return false;
+
+    for ( sal_Int32 i = 0; i < nCount; ++i )
+    {
+        const ContentInfo & rCurr = aInfo[i];
+        if ( ( rCurr.Attributes
+               & ContentInfoAttribute::KIND_DOCUMENT ) &&
+             ( rCurr.Attributes
+               & ContentInfoAttribute::INSERT_WITH_INPUTSTREAM ) )
+        {
+            // Make sure the only required bootstrap property is
+            // "Title",
+            const Sequence< Property > & rProps = rCurr.Properties;
+            if ( rProps.getLength() != 1 )
+                continue;
+
+            if ( rProps[ 0 ].Name != "Title" )
+                continue;
+
+            Sequence<OUString> aNames(1);
+            OUString* pNames = aNames.getArray();
+            pNames[0] = OUString(
+                            "Title"  );
+            Sequence< Any > aValues(1);
+            Any* pValues = aValues.getArray();
+            pValues[0] = makeAny( OUString( rTitle ) );
+
+            try
+            {
+                ucbhelper::Content aNew;
+                if ( aParentCnt.insertNewContent(
+                         rCurr.Type, aNames, aValues, data, aNew ) )
+                    return true; // success.
+                else
+                    continue;
+            }
+            catch ( CommandFailedException const & )
+            {
+                // Interaction Handler already handled the
+                // error that has occurred...
+                continue;
+            }
+        }
+    }
+
+    return false;
+}
+
+void SAL_CALL OFileAccess::writeFile( const OUString& FileURL,
+                                      const Reference< XInputStream >& data )
+    throw ( Exception, RuntimeException )
+{
+    INetURLObject aURL( FileURL, INET_PROT_FILE );
+    try
+    {
+        ucbhelper::Content aCnt(
+            aURL.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment,
+            comphelper::getProcessComponentContext() );
+
+        try
+        {
+            aCnt.writeStream( data, sal_True /* bReplaceExisting */ );
+        }
+        catch ( CommandFailedException const & )
+        {
+            // Interaction Handler already handled the error that has occurred...
+        }
+    }
+    catch ( ContentCreationException const & e )
+    {
+        // Most probably file does not exist. Try to create.
+        if ( e.eError == ContentCreationError_CONTENT_CREATION_FAILED )
+        {
+            INetURLObject aParentURLObj( aURL );
+            if ( aParentURLObj.removeSegment() )
+            {
+                OUString aParentURL
+                    = aParentURLObj.GetMainURL( INetURLObject::NO_DECODE );
+
+                // ensure all parent folders exist.
+                createFolder( aParentURL );
+
+                // create the new file...
+                OUString aTitle
+                    = aURL.getName( INetURLObject::LAST_SEGMENT,
+                                    true,
+                                    INetURLObject::DECODE_WITH_CHARSET );
+                if ( createNewFile( aParentURL, aTitle, data ) )
+                {
+                    // success
+                    return;
+                }
+            }
+        }
+
+        throw;
+    }
+}
+
+sal_Bool OFileAccess::isHidden( const OUString& FileURL )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    INetURLObject aURLObj( FileURL, INET_PROT_FILE );
+    ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    Any aRetAny = aCnt.getPropertyValue("IsHidden");
+    sal_Bool bRet = sal_False;
+    aRetAny >>= bRet;
+    return bRet;
+}
+
+void OFileAccess::setHidden( const OUString& FileURL, sal_Bool bHidden )
+    throw(CommandAbortedException, Exception, RuntimeException)
+{
+    INetURLObject aURLObj( FileURL, INET_PROT_FILE );
+    ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    Any aAny;
+    aAny <<= bHidden;
+    aCnt.setPropertyValue("IsHidden", aAny );
+}
+
+}; // namespace end
+
+Reference< XInterface > SAL_CALL FileAccess_CreateInstance( const Reference< XMultiServiceFactory > & xSMgr )
+{
+    return Reference < XInterface >( ( cppu::OWeakObject * ) new OFileAccess( comphelper::getComponentContext(xSMgr) ) );
+}
+
+Sequence< OUString > FileAccess_getSupportedServiceNames()
+{
+    Sequence< OUString > seqNames(1);
+    seqNames.getArray()[0] = OUString( SERVICE_NAME );
+    return seqNames;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/core/FileAccess.hxx b/ucb/source/core/FileAccess.hxx
new file mode 100644
index 000000000000..2e2665c10795
--- /dev/null
+++ b/ucb/source/core/FileAccess.hxx
@@ -0,0 +1,44 @@
+/* -*- 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_CORE_FILEACCESS_HXX
+#define INCLUDED_UCB_SOURCE_CORE_FILEACCESS_HXX
+
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+namespace com { namespace sun { namespace star {
+namespace lang { class XMultiServiceFactory; }
+namespace uno { class XInterface; }
+} } }
+
+#define IMPLEMENTATION_NAME "com.sun.star.comp.ucb.SimpleFileAccess"
+
+css::uno::Reference<css::uno::XInterface> SAL_CALL FileAccess_CreateInstance(
+css::uno::Reference<css::lang::XMultiServiceFactory> const & xSMgr);
+
+css::uno::Sequence<OUString> FileAccess_getSupportedServiceNames();
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/core/ucb1.component b/ucb/source/core/ucb1.component
index 00b43ee2ae9a..3fce4dfe8b44 100644
--- a/ucb/source/core/ucb1.component
+++ b/ucb/source/core/ucb1.component
@@ -34,4 +34,7 @@
   <implementation name="com.sun.star.comp.ucb.UniversalContentBroker">
     <service name="com.sun.star.ucb.UniversalContentBroker"/>
   </implementation>
+  <implementation name="com.sun.star.comp.ucb.SimpleFileAccess">
+    <service name="com.sun.star.ucb.SimpleFileAccess"/>
+  </implementation>
 </component>
diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx
index 9c1379592758..1a1745180d67 100644
--- a/ucb/source/core/ucbserv.cxx
+++ b/ucb/source/core/ucbserv.cxx
@@ -24,11 +24,11 @@
 #include "ucbprops.hxx"
 #include "provprox.hxx"
 #include "cmdenv.hxx"
+#include "FileAccess.hxx"
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-
 //=========================================================================
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucb_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * )
@@ -76,8 +76,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucb_component_getFactory(
     else if ( UcbContentProviderProxyFactory::getImplementationName_Static().
                 compareToAscii( pImplName ) == 0 )
     {
-        xFactory
-            = UcbContentProviderProxyFactory::createServiceFactory( xSMgr );
+        xFactory = UcbContentProviderProxyFactory::createServiceFactory( xSMgr );
     }
 
     //////////////////////////////////////////////////////////////////////
@@ -87,11 +86,17 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucb_component_getFactory(
     else if ( ucb_cmdenv::UcbCommandEnvironment::getImplementationName_Static().
                 compareToAscii( pImplName ) == 0 )
     {
-        xFactory
-            = ucb_cmdenv::UcbCommandEnvironment::createServiceFactory( xSMgr );
+        xFactory = ucb_cmdenv::UcbCommandEnvironment::createServiceFactory( xSMgr );
     }
 
-    //////////////////////////////////////////////////////////////////////
+    // FilePicker
+    else if (pServiceManager && rtl_str_compare( pImplName, IMPLEMENTATION_NAME ) == 0)
+    {
+        xFactory = cppu::createSingleFactory(xSMgr,
+                                             OUString::createFromAscii( pImplName ),
+                                             FileAccess_CreateInstance,
+                                             FileAccess_getSupportedServiceNames() );
+    }
 
     if ( xFactory.is() )
     {