adapted includes to renamed source file names.

5 files changed, 95 insertions, 103 deletions

diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index 2eb0ac2e00..f611b577ae 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,9 +39,7 @@
 
 #include "osl/doublecheckedlocking.h"
 
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUES_HPP_
 #include <com/sun/star/beans/PropertyValue.hpp>
-#endif
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertySetInfoChange.hpp>
 #include <com/sun/star/beans/PropertySetInfoChangeEvent.hpp>
@@ -50,14 +48,10 @@
 #include <com/sun/star/lang/IllegalAccessException.hpp>
 #include <com/sun/star/ucb/ContentInfoAttribute.hpp>
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
-#ifndef _COM_SUN_STAR_UCB_INTERACTIVEBADTRANSFRERURLEXCEPTION_HPP_
 #include <com/sun/star/ucb/InteractiveBadTransferURLException.hpp>
-#endif
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 #include <com/sun/star/ucb/InteractiveNetworkConnectException.hpp>
-#ifndef _COM_SUN_STAR_UCB_INTERACTIVENETWORKGENBERALEXCEPTION_HPP_
 #include <com/sun/star/ucb/InteractiveNetworkGeneralException.hpp>
-#endif
 #include <com/sun/star/ucb/InteractiveNetworkReadException.hpp>
 #include <com/sun/star/ucb/InteractiveNetworkResolveNameException.hpp>
 #include <com/sun/star/ucb/InteractiveNetworkWriteException.hpp>
@@ -79,9 +73,7 @@
 #include <com/sun/star/ucb/NameClashException.hpp>
 #include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/propertyvalueset.hxx>
-#ifndef _UCBHELPER_INTERACTIONREQUEST_HXX
 #include <ucbhelper/interactionrequest.hxx>
-#endif
 #include <ucbhelper/cancelcommandexecution.hxx>
 #include <ucbhelper/simpleauthenticationrequest.hxx>
 
@@ -98,10 +90,10 @@ extern "C" { // missing in the header: doh.
 #  include <libgnomevfs/gnome-vfs-module-callback.h>
 }
 
-#include "content.hxx"
-#include "provider.hxx"
-#include "directory.hxx"
-#include "stream.hxx"
+#include "gvfs_content.hxx"
+#include "gvfs_provider.hxx"
+#include "gvfs_directory.hxx"
+#include "gvfs_stream.hxx"
 
 using namespace gvfs;
 using namespace com::sun::star;
@@ -141,7 +133,7 @@ Content::Content(
 #endif
 }
 
-Content::Content( 
+Content::Content(
     const uno::Reference< lang::XMultiServiceFactory >& rxSMgr,
     ContentProvider                                   * pProvider,
     const uno::Reference< ucb::XContentIdentifier >&    Identifier,
@@ -235,7 +227,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
                  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();
@@ -265,7 +257,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
     throw( uno::RuntimeException )
 {
     uno::Sequence< rtl::OUString > aSNS( 1 );
-    aSNS.getArray()[ 0 ] = rtl::OUString::createFromAscii( 
+    aSNS.getArray()[ 0 ] = rtl::OUString::createFromAscii(
         "com.sun.star.ucb.GnomeVFSContent" );
     return aSNS;
 }
@@ -326,7 +318,7 @@ uno::Any SAL_CALL Content::execute(
 
         if ( !( aCommand.Argument >>= Properties ) )
             ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
-        
+
         aRet <<= getPropertyValues( Properties, xEnv );
 
     } else if ( COMMAND_IS( aCommand, "setPropertyValues" ) ) {
@@ -467,13 +459,13 @@ Content::queryCreatableContentsInfo()
         beans::PropertyAttribute::MAYBEVOID | beans::PropertyAttribute::BOUND );
 
     // file
-    seq[0].Type 	  = rtl::OUString::createFromAscii( GVFS_FILE_TYPE );
+    seq[0].Type       = rtl::OUString::createFromAscii( GVFS_FILE_TYPE );
     seq[0].Attributes = ( ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM |
                   ucb::ContentInfoAttribute::KIND_DOCUMENT );
     seq[0].Properties = props;
 
     // folder
-    seq[1].Type 	  = rtl::OUString::createFromAscii( GVFS_FOLDER_TYPE );
+    seq[1].Type       = rtl::OUString::createFromAscii( GVFS_FOLDER_TYPE );
     seq[1].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER;
     seq[1].Properties = props;
 
@@ -487,7 +479,7 @@ Content::createNewContent( const ucb::ContentInfo& Info )
     bool create_document;
     const char *name;
 
-          if ( Info.Type.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( GVFS_FILE_TYPE ) ) )
+        if ( Info.Type.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( GVFS_FILE_TYPE ) ) )
         create_document = true;
     else if ( Info.Type.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( GVFS_FOLDER_TYPE ) ) )
         create_document = false;
@@ -515,11 +507,11 @@ Content::createNewContent( const ucb::ContentInfo& Info )
         uno::Reference< ucb::XContentIdentifier > xId
         ( new ::ucbhelper::ContentIdentifier( m_xSMgr, aURL ) );
 
-          try {
+        try {
         return new ::gvfs::Content( m_xSMgr, m_pProvider, xId, !create_document );
     } catch ( ucb::ContentCreationException & ) {
         return uno::Reference< ucb::XContent >();
-          }
+        }
 }
 
 rtl::OUString Content::getParentURL()
@@ -581,7 +573,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 
     if( ( result = getInfo( xEnv ) ) != GNOME_VFS_OK )
         cancelCommandExecution( result, xEnv, sal_False );
-        
+
     const beans::Property* pProps;
 
     if( rProperties.getLength() ) {
@@ -609,7 +601,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 
         else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) )
             xRow->appendString( rProp, getContentType () );
-    
+
         else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) ) {
             if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE)
                 xRow->appendBoolean( rProp, ( m_info.type == GNOME_VFS_FILE_TYPE_REGULAR ||
@@ -669,7 +661,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             else
                 xRow->appendVoid( rProp );
         }
-        
+
         else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) ) {
             // We do this by sniffing in gnome-vfs; rather expensively.
 #ifdef DEBUG
@@ -688,7 +680,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
     return uno::Reference< sdbc::XRow >( xRow.get() );
 }
 
-static lang::IllegalAccessException 
+static lang::IllegalAccessException
 getReadOnlyException( Content *ctnt )
 {
     return lang::IllegalAccessException
@@ -740,7 +732,7 @@ Content::doSetFileInfo( const GnomeVFSFileInfo *newInfo,
 
         result = gnome_vfs_move ((const sal_Char *)aURI, newURI, FALSE);
 
-        g_free (newURI); 
+        g_free (newURI);
     }
 
     return result;
@@ -757,7 +749,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
     getInfo( xEnv );
 
-      osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
+    osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
     gnome_vfs_file_info_copy( &newInfo, &m_info );
 
@@ -769,16 +761,16 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
     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     =
+    aEvent.Further        = sal_False;
+    aEvent.PropertyHandle = -1;
+    // aEvent.PropertyName = fill in later ...
+    // aEvent.OldValue     =
+    // aEvent.NewValue     =
 
-      int nCount = rValues.getLength();
+    int nCount = rValues.getLength();
     const beans::PropertyValue* pValues = rValues.getConstArray();
 
-      for ( sal_Int32 n = 0; n < nCount; ++n ) {
+    for ( sal_Int32 n = 0; n < nCount; ++n ) {
         const beans::PropertyValue& rValue = pValues[ n ];
 
 #ifdef DEBUG
@@ -810,9 +802,9 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                         aEvent.NewValue     = uno::makeAny( aNewTitle );
                         aChanges.getArray()[ nChanged ] = aEvent;
                         nTitlePos = nChanged++;
-        
+
                         newInfo.name = newName;
-                        setMask |= GNOME_VFS_SET_FILE_INFO_NAME;		
+                        setMask |= GNOME_VFS_SET_FILE_INFO_NAME;
                     } else // same name
                         g_free (newName);
                 }
@@ -832,7 +824,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
             aRet[ n ] <<= getReadOnlyException( this );
         }
     }
-    
+
     GnomeVFSResult result = GNOME_VFS_OK;
 
     if ( !m_bTransient &&
@@ -849,9 +841,9 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 
         if ( setMask & GNOME_VFS_SET_FILE_INFO_NAME ) {
             uno::Reference< ucb::XContentIdentifier > xNewId
-                = new ::ucbhelper::ContentIdentifier( 
+                = new ::ucbhelper::ContentIdentifier(
                     m_xSMgr, makeNewURL( newInfo.name ) );
-            
+
             aGuard.clear();
             if (!exchangeIdentity( xNewId ) )
                 aRet[ nTitlePos ] <<= uno::Exception
@@ -859,7 +851,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                       static_cast< cppu::OWeakObject * >( this ) );
         }
     }
-        
+
     gnome_vfs_file_info_clear( &newInfo );
 
     if ( nChanged > 0 ) {
@@ -919,7 +911,7 @@ void Content::insert(
         const uno::Reference< ucb::XCommandEnvironment > &xEnv )
         throw( uno::Exception )
 {
-      osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
+    osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
 
 #ifdef DEBUG
     g_warning( "Insert '%s' (%d) (0x%x:%d)", getURI(), bReplaceExisting,
@@ -1004,9 +996,9 @@ void Content::insert(
     }
 
     if (m_bTransient) {
-          m_bTransient = sal_False;
+        m_bTransient = sal_False;
         aGuard.clear();
-          inserted();
+        inserted();
     }
 }
 
@@ -1035,14 +1027,14 @@ void Content::destroy( sal_Bool bDeletePhysical )
     deleted();
 
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
-    
+
     // Process instanciated 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;
@@ -1100,10 +1092,10 @@ sal_Bool Content::exchangeIdentity(
             uno::Reference< ucb::XContentIdentifier >
                 xNewChildId
                 = new ::ucbhelper::ContentIdentifier( m_xSMgr, aNewChildURL );
-            
+
             if ( !xChild->exchangeIdentity( xNewChildId ) )
                 return sal_False;
-            
+
             ++it;
         }
         return sal_True;
@@ -1161,7 +1153,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite
 
     if ((gvfs_message = gnome_vfs_result_to_string (result)))
         message = GnomeToOUString( gvfs_message );
-             
+
     switch (result) {
     case GNOME_VFS_OK:
         g_error ("VFS_OK mapped to exception.");
@@ -1181,7 +1173,7 @@ uno::Any Content::mapVFSException( const GnomeVFSResult result, sal_Bool bWrite
         break;
     case GNOME_VFS_ERROR_BAD_PARAMETERS:
         aException <<=
-            lang::IllegalArgumentException 
+            lang::IllegalArgumentException
                 ( rtl::OUString(),
                   static_cast< cppu::OWeakObject * >( this ),
                   -1 );
@@ -1341,7 +1333,7 @@ uno::Sequence< beans::Property > Content::getProperties(
     const int nProps = sizeof (aGenericProperties) / sizeof (aGenericProperties[0]);
 
     return uno::Sequence< beans::Property > ( aGenericProperties, nProps );
-                          
+
 }
 
 uno::Sequence< ucb::CommandInfo > Content::getCommands(
@@ -1380,7 +1372,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
     };
     int num = 7;
 
-       if ( isFolder( xEnv ) )
+        if ( isFolder( xEnv ) )
          num += 1;
 
     return uno::Sequence< ucb::CommandInfo >(aDocumentCommandInfoTable, num );
@@ -1420,8 +1412,8 @@ Content::copyData( uno::Reference< io::XInputStream > xIn,
 }
 
 // Inherits an authentication context
-uno::Reference< io::XInputStream > 
-Content::createTempStream( 
+uno::Reference< io::XInputStream >
+Content::createTempStream(
     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
         throw( uno::Exception )
 {
@@ -1450,8 +1442,8 @@ Content::createTempStream(
     return uno::Reference < io::XInputStream > ( xTempOut, uno::UNO_QUERY );
 }
 
-uno::Reference< io::XInputStream > 
-Content::createInputStream( 
+uno::Reference< io::XInputStream >
+Content::createInputStream(
     const uno::Reference< ucb::XCommandEnvironment >& xEnv )
         throw( uno::Exception )
 {
@@ -1471,11 +1463,11 @@ Content::createInputStream(
     result = gnome_vfs_open
         ( &handle, (const sal_Char *)aURI,
           (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 );
 
@@ -1506,14 +1498,14 @@ Content::feedSink( uno::Reference< uno::XInterface > aSink,
         = 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 );
 
@@ -1538,7 +1530,7 @@ extern "C" {
     {
         task::XInteractionHandler *xIH;
 
-#ifdef DEBUG		
+#ifdef DEBUG
         g_warning ("Full authentication callback (%p) ...", callback_data);
 #endif
 
@@ -1547,7 +1539,7 @@ extern "C" {
 
         const GnomeVFSModuleCallbackFullAuthenticationIn *in =
             (const GnomeVFSModuleCallbackFullAuthenticationIn *) in_void;
-        GnomeVFSModuleCallbackFullAuthenticationOut *out = 
+        GnomeVFSModuleCallbackFullAuthenticationOut *out =
             (GnomeVFSModuleCallbackFullAuthenticationOut *) out_void;
 
         g_return_if_fail (in != NULL && out != NULL);
@@ -1590,7 +1582,7 @@ extern "C" {
                 (aUserName.getLength() ?
                     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 :
@@ -1662,30 +1654,30 @@ extern "C" {
                                      gsize         out_size,
                                      gpointer      callback_data)
     {
-#ifdef DEBUG		
+#ifdef DEBUG
         g_warning ("Old authentication callback (%p) [ UNTESTED ] ...", callback_data);
 #endif
         const GnomeVFSModuleCallbackAuthenticationIn *in =
             (const GnomeVFSModuleCallbackAuthenticationIn *) in_void;
-        GnomeVFSModuleCallbackAuthenticationOut *out = 
+        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 = { 
+        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 | 
+                (mapped_in.flags |
                  GNOME_VFS_MODULE_CALLBACK_FULL_AUTHENTICATION_PREVIOUS_ATTEMPT_FAILED);
 
         GnomeVFSURI *pURI = NULL;
@@ -1698,11 +1690,11 @@ extern "C" {
             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,
@@ -1710,7 +1702,7 @@ extern "C" {
                                      callback_data);
 
         if (pURI)
-            gnome_vfs_uri_unref (pURI); 
+            gnome_vfs_uri_unref (pURI);
 
         // Map the new style auth. out data to the old style out structure.
         out->username = mapped_out.username;
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.cxx b/ucb/source/ucp/gvfs/gvfs_directory.cxx
index ff699a3c63..d8357a060a 100644
--- a/ucb/source/ucp/gvfs/gvfs_directory.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_directory.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -40,7 +40,7 @@
 #include <ucbhelper/contentidentifier.hxx>
 #include <ucbhelper/providerhelper.hxx>
 
-#include "directory.hxx"
+#include "gvfs_directory.hxx"
 
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomevfs/gnome-vfs-directory.h>
@@ -96,7 +96,7 @@ struct ResultListEntry
         gnome_vfs_file_info_copy (&aInfo, fileInfo);
     }
 
-     ~ResultListEntry()
+    ~ResultListEntry()
     {
         gnome_vfs_file_info_clear (&aInfo);
     }
@@ -180,7 +180,7 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
             aId += rtl::OUString::createFromAscii( "/" );
 
         aId += rtl::OUString::createFromAscii( escaped_name );
-        
+
         g_free( escaped_name );
 
         m_pImpl->m_aResults[ nIndex ]->aId = aId;
@@ -240,7 +240,7 @@ DataSupplier::queryContent( sal_uInt32 nIndex )
                 = m_pImpl->m_xContent->getProvider()->queryContent( xId );
             m_pImpl->m_aResults[ nIndex ]->xContent = xContent;
             return xContent;
-            
+
         }
         catch ( ucb::IllegalIdentifierException& ) {
         }
@@ -347,7 +347,7 @@ sal_Bool DataSupplier::getData()
             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'",
@@ -375,18 +375,18 @@ sal_Bool DataSupplier::getData()
                      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 ) );
         }
 #ifdef DEBUG
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.hxx b/ucb/source/ucp/gvfs/gvfs_directory.hxx
index d5124eedb6..929eae9b18 100644
--- a/ucb/source/ucp/gvfs/gvfs_directory.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_directory.hxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,7 +33,7 @@
 #include <rtl/ref.hxx>
 #include <ucbhelper/resultset.hxx>
 #include <ucbhelper/resultsethelper.hxx>
-#include "content.hxx"
+#include "gvfs_content.hxx"
 
 namespace gvfs {
 
@@ -44,11 +44,11 @@ class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper
         com::sun::star::ucb::XCommandEnvironment > m_xEnv;
 
 private:
-      virtual void initStatic();
-      virtual void initDynamic();
+    virtual void initStatic();
+    virtual void initDynamic();
 
 public:
-      DynamicResultSet( const com::sun::star::uno::Reference<
+    DynamicResultSet( const com::sun::star::uno::Reference<
                         com::sun::star::lang::XMultiServiceFactory >& rxSMgr,
                       const rtl::Reference< Content >& rxContent,
                       const com::sun::star::ucb::OpenCommandArgument2& rCommand,
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx
index eec5dd1296..a5eca1dadd 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -33,8 +33,8 @@
 
 #include <ucbhelper/contentidentifier.hxx>
 #include <libgnomevfs/gnome-vfs-init.h>
-#include "provider.hxx"
-#include "content.hxx"
+#include "gvfs_provider.hxx"
+#include "gvfs_content.hxx"
 
 using namespace com::sun::star;
 using namespace gvfs;
@@ -114,7 +114,7 @@ ContentProvider::queryContent(
            uno::RuntimeException )
 {
 #ifdef DEBUG
-    g_warning ("QueryContent: '%s'", 
+    g_warning ("QueryContent: '%s'",
                (const sal_Char *)rtl::OUStringToOString
                (Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8));
 #endif
@@ -182,14 +182,14 @@ writeInfo( void                                 *pRegistryKey,
     return bSuccess;
 }
 
-extern "C" void SAL_CALL 
+extern "C" void SAL_CALL
 component_getImplementationEnvironment( const sal_Char  **ppEnvTypeName,
                     uno_Environment **/*ppEnv*/ )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-extern "C" sal_Bool SAL_CALL 
+extern "C" sal_Bool SAL_CALL
 component_writeInfo( void */*pServiceManager*/,
              void *pRegistryKey )
 {
diff --git a/ucb/source/ucp/gvfs/gvfs_stream.cxx b/ucb/source/ucp/gvfs/gvfs_stream.cxx
index 7ea1e95619..007693d46a 100644
--- a/ucb/source/ucp/gvfs/gvfs_stream.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_stream.cxx
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_ucb.hxx"
-#include "stream.hxx"
+#include "gvfs_stream.hxx"
 #include <rtl/memory.h>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 
@@ -89,7 +89,7 @@ Stream::getInputStream(  )
     }
     return Reference< XInputStream >( this );
 }
-    
+
 com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > SAL_CALL
 Stream::getOutputStream(  )
     throw( com::sun::star::uno::RuntimeException )
@@ -187,13 +187,13 @@ sal_Int32 SAL_CALL Stream::available(  )
 }
 
 void SAL_CALL Stream::closeInput( void )
-         throw( NotConnectedException,
-                  IOException,
-                  RuntimeException )
+        throw( NotConnectedException,
+                   IOException,
+                   RuntimeException )
 {
     osl::MutexGuard aGuard( m_aMutex );
     m_bInputStreamCalled = false;
-    
+
     if( ! m_bOutputStreamCalled )
         closeStream();
 }
@@ -234,7 +234,7 @@ sal_Int64 SAL_CALL Stream::getPosition()
         throw IOException();
 
     throwOnError( gnome_vfs_tell( m_handle, &nBytesIn ) );
-        
+
     return nBytesIn;
 }
 
@@ -293,13 +293,13 @@ void SAL_CALL Stream::writeBytes( const com::sun::star::uno::Sequence< sal_Int8
         p += bytesWritten;
     }
 }
-        
+
 void SAL_CALL Stream::flush( void )
     throw( NotConnectedException, BufferSizeExceededException,
            IOException, RuntimeException )
 {
 }
-        
+
 void SAL_CALL Stream::closeOutput( void )
     throw( com::sun::star::io::NotConnectedException,
            com::sun::star::io::IOException,
@@ -307,7 +307,7 @@ void SAL_CALL Stream::closeOutput( void )
 {
     osl::MutexGuard aGuard( m_aMutex );
     m_bOutputStreamCalled = false;
-    
+
     if( ! m_bInputStreamCalled )
         closeStream();
 }