diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-06-19 15:11:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-06-19 15:11:34 +0000 |
| commit | 911321f8dfc791b630cd0ad311eedec6b424dd92 (patch) | |
| tree | 4fe222e3d7f4eba9c08ec81e6d46b8773a921f86 /ucb/source/ucp/gvfs | |
| parent | 3e716a154b663536854ae82e8fa368880826bb6c (diff) | |
INTEGRATION: CWS ucbfixes02 (1.5.48); FILE MERGED
2007/06/12 08:20:49 kso 1.5.48.2: RESYNC: (1.5-1.6); FILE MERGED
2007/05/31 14:08:22 kso 1.5.48.1: #i77995# - GVFS Content Provider does no longer use solar libs.
Diffstat (limited to 'ucb/source/ucp/gvfs')
| -rw-r--r-- | ucb/source/ucp/gvfs/provider.cxx | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/ucb/source/ucp/gvfs/provider.cxx b/ucb/source/ucp/gvfs/provider.cxx index 4e60142871a1..80f7992684f4 100644 --- a/ucb/source/ucp/gvfs/provider.cxx +++ b/ucb/source/ucp/gvfs/provider.cxx @@ -4,9 +4,9 @@ * * $RCSfile: provider.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: ihi $ $Date: 2007-06-05 18:04:24 $ + * last change: $Author: kz $ $Date: 2007-06-19 16:11:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,7 +35,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_ucb.hxx" -#include <tools/urlobj.hxx> + #include <ucbhelper/contentidentifier.hxx> #include <libgnomevfs/gnome-vfs-init.h> #include "provider.hxx" @@ -124,18 +124,6 @@ ContentProvider::queryContent( (Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8)); #endif - // It sucks to depend on 'tools' but ... -// INetURLObject url( Identifier->getContentIdentifier() ); -// if ( url.GetProtocol() < INET_PROT_END && -// url.GetProtocol() != INET_PROT_HTTPS && -// url.GetProtocol() != INET_PROT_HTTP ) { -// #ifdef DEBUG -// g_warning ("Not one of ours ... '%s'", -// (const sal_Char *)rtl::OUStringToOString -// (Identifier->getContentIdentifier(), RTL_TEXTENCODING_UTF8)); -// #endif -// throw com::sun::star::ucb::IllegalIdentifierException(); -// } osl::MutexGuard aGuard( m_aMutex ); // Check, if a content with given id already exists... |