diff options
21 files changed, 58 insertions, 300 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 469888c922..c4992b7b12 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: OfficeFilePicker.cxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.17.20.1 $ * * This file is part of OpenOffice.org. * @@ -1056,20 +1056,32 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments ) throw ( Exception, RuntimeException ) { checkAlive(); + + Sequence< Any > aArguments( _rArguments.getLength()); m_nServiceType = TemplateDescription::FILEOPEN_SIMPLE; if ( _rArguments.getLength() >= 1 ) { // compatibility: one argument, type sal_Int16 , specifies the service type - _rArguments[0] >>= m_nServiceType; + int index = 0; - for ( int i = 0; i < _rArguments.getLength(); i++) + if (_rArguments[0] >>= m_nServiceType) + { + // skip the first entry if it was the ServiceType, because it's not needed in OCommonPicker::initialize and it's not a NamedValue + NamedValue emptyNamedValue; + aArguments[0] <<= emptyNamedValue; + index = 1; + + } + for ( int i = index; i < _rArguments.getLength(); i++) { NamedValue namedValue; + aArguments[i] <<= _rArguments[i]; - if (_rArguments[i] >>= namedValue ) + if (aArguments[i] >>= namedValue ) { + if ( namedValue.Name.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StandardDir" ) ) ) ) { ::rtl::OUString sStandardDir; @@ -1087,7 +1099,7 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments ) } // let the base class analyze the sequence (will call into implHandleInitializationArgument) - OCommonPicker::initialize( _rArguments ); + OCommonPicker::initialize( aArguments ); } //------------------------------------------------------------------------- diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index 0290b1ee01..8fa1ac31f4 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: commonpicker.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.12.1 $ * * This file is part of OpenOffice.org. * @@ -449,13 +449,21 @@ namespace svt { if ( *pArgument >>= aPropArg ) { + if ( aPropArg.Name.getLength() <= 0) + continue; + sSettingName = aPropArg.Name; aSettingValue = aPropArg.Value; } else if ( *pArgument >>= aPairArg ) { + if ( aPairArg.Name.getLength() <= 0) + continue; + sSettingName = aPairArg.Name; aSettingValue = aPairArg.Value; + + } else { diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 740311457b..a7a63c1095 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cachedcontentresultset.cxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.14.22.1 $ * * This file is part of OpenOffice.org. * @@ -818,25 +818,6 @@ sal_Bool SAL_CALL CachedContentResultSet return sal_True; }; -sal_Bool SAL_CALL CachedContentResultSet - ::applyPositionToOrigin() - throw( SQLException, - RuntimeException ) -{ - impl_EnsureNotDisposed(); - - sal_Int32 nRow; - { - osl::Guard< osl::Mutex > aGuard( m_aMutex ); - if( m_bAfterLast ) - throw SQLException(); - nRow = m_nRow; - if( !nRow ) - throw SQLException(); - } - return applyPositionToOrigin( nRow ); -}; - //-------------------------------------------------------------------------- //-------------------------------------------------------------------------- //define for fetching data diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx index 90a0c0fac1..693c66320f 100644 --- a/ucb/source/cacher/cachedcontentresultset.hxx +++ b/ucb/source/cacher/cachedcontentresultset.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cachedcontentresultset.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.22.1 $ * * This file is part of OpenOffice.org. * @@ -179,11 +179,6 @@ private: throw( com::sun::star::sdbc::SQLException, com::sun::star::uno::RuntimeException ); - sal_Bool SAL_CALL - applyPositionToOrigin() - throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); - void SAL_CALL impl_fetchData( sal_Int32 nRow, sal_Int32 nCount , sal_Int32 nFetchDirection ) diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index c20af8aee3..9fc3ffe764 100644 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: sortresult.cxx,v $ - * $Revision: 1.18 $ + * $Revision: 1.18.22.1 $ * * This file is part of OpenOffice.org. * @@ -1677,7 +1677,7 @@ void SortedResultSet::Move( long nPos, long nCount, long nOffset ) // finally put the remembered entries at there new location nTo = nPos + nOffset; - for ( i=0; i<nCount; i++ ); + for ( i=0; i<nCount; i++ ) { maO2S.Replace( (void*)pTmpArr[ i ], (sal_uInt32)( nTo+i ) ); } diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index b423bcc643..1b61504fa1 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: filglob.cxx,v $ - * $Revision: 1.26 $ + * $Revision: 1.26.4.1 $ * * This file is part of OpenOffice.org. * @@ -263,80 +263,6 @@ namespace fileaccess { return osl::File::move( strPath,strDestPath ); } - - oslFileError getResolvedURL(rtl_uString* ustrPath, rtl_uString** pustrResolvedURL) - { - /* TODO: If file exist and is a link get link target URL */ - rtl_uString_assign( pustrResolvedURL, ustrPath ); - - return osl_File_E_None; - } - - - -//---------------------------------------------------------------------------- -// makeAbsolute Path -//---------------------------------------------------------------------------- - - - sal_Bool SAL_CALL makeAbsolutePath( const rtl::OUString& aRelPath, - rtl::OUString& aAbsPath ) - { - // should no longer happen - OSL_ASSERT( 0 != aRelPath.compareToAscii( "//./" , 4 ) ); - - if ( 0 != aRelPath.compareToAscii( "file://" , 7 ) ) - return sal_False; - - // The 'upward' ('/../') pattern. - static const sal_Unicode pattern[5] = - { - '/', '.', '.', '/', 0 - }; - - // Ensure 'relative path' contains 'pattern'. - if (rtl_ustr_indexOfStr_WithLength ( - aRelPath.getStr(), aRelPath.getLength(), pattern, 4) < 0) - { - // Path already absolute. - aAbsPath = aRelPath; - return sal_True; - } - - // Tokenize 'relative path'. - std::vector< rtl::OUString > aTokenStack; - sal_Int32 nIndex = 6; - - aRelPath.getToken( 0, '/', nIndex ); - while ( nIndex >= 0 ) - { - rtl::OUString aToken (aRelPath.getToken( 0, '/', nIndex )); - - if ( aToken.compareToAscii( ".." ) == 0 && ! aTokenStack.empty()) - aTokenStack.pop_back(); - else - aTokenStack.push_back( aToken ); - } - - // Reassemble as 'absolute path'. - rtl::OUStringBuffer aBuffer (aRelPath.getLength()); - aBuffer.appendAscii ("file:/", 6); - - std::vector< rtl::OUString >::const_iterator it; - for (it = aTokenStack.begin(); it != aTokenStack.end(); ++it) - { - aBuffer.append (sal_Unicode('/')); - aBuffer.append (*it); - } - - aAbsPath = aBuffer.makeStringAndClear(); - - return sal_True; - } - - - - void throw_handler( sal_Int32 errorCode, sal_Int32 minorCode, diff --git a/ucb/source/ucp/file/filglob.hxx b/ucb/source/ucp/file/filglob.hxx index aeaae08c07..d9ee20f32a 100644 --- a/ucb/source/ucp/file/filglob.hxx +++ b/ucb/source/ucp/file/filglob.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: filglob.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.22.1 $ * * This file is part of OpenOffice.org. * @@ -105,18 +105,6 @@ namespace fileaccess { const rtl::OUString& strDestPath, sal_Bool test = false ); - extern oslFileError getResolvedURL( rtl_uString* ustrPath, - rtl_uString** pustrResolvedURL); - - - // Removes ellipses like .. and . from a file path - // Needs rework; This seems to be the most time consuming function in - // the whole file content provider - - extern sal_Bool SAL_CALL makeAbsolutePath( const rtl::OUString& aRelPath, - rtl::OUString& aAbsPath ); - - // This function implements the global exception handler of the file_ucp; // It never returns; diff --git a/ucb/source/ucp/file/filrec.cxx b/ucb/source/ucp/file/filrec.cxx index d8c2aa86a2..b4d40006d0 100644 --- a/ucb/source/ucp/file/filrec.cxx +++ b/ucb/source/ucp/file/filrec.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: filrec.cxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.22.1 $ * * This file is part of OpenOffice.org. * @@ -122,14 +122,6 @@ sal_Bool ReconnectingFile::reconnect() return m_aFile.getPos( uPos ); } -::osl::FileBase::RC ReconnectingFile::isEndOfFile( sal_Bool *pIsEOF ) -{ - if ( m_bDisconnect ) - return ::osl::FileBase::E_NETWORK; - - return m_aFile.isEndOfFile( pIsEOF ); -} - ::osl::FileBase::RC ReconnectingFile::setSize( sal_uInt64 uSize ) { ::osl::FileBase::RC nRes = ::osl::FileBase::E_NETWORK; @@ -200,14 +192,6 @@ sal_Bool ReconnectingFile::reconnect() return m_aFile.write( pBuffer, uBytesToWrite, rBytesWritten ); } -::osl::FileBase::RC ReconnectingFile::readLine( ::rtl::ByteSequence& aSeq ) -{ - if ( m_bDisconnect ) - return ::osl::FileBase::E_NETWORK; - - return m_aFile.readLine( aSeq ); -} - ::osl::FileBase::RC ReconnectingFile::sync() const { if ( m_bDisconnect ) diff --git a/ucb/source/ucp/file/filrec.hxx b/ucb/source/ucp/file/filrec.hxx index 52df440b0b..40d98aa437 100644 --- a/ucb/source/ucp/file/filrec.hxx +++ b/ucb/source/ucp/file/filrec.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: filrec.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.22.1 $ * * This file is part of OpenOffice.org. * @@ -73,8 +73,6 @@ public: ::osl::FileBase::RC getPos( sal_uInt64& uPos ); - ::osl::FileBase::RC isEndOfFile( sal_Bool *pIsEOF ); - ::osl::FileBase::RC setSize( sal_uInt64 uSize ); ::osl::FileBase::RC getSize( sal_uInt64 &rSize ); @@ -83,8 +81,6 @@ public: ::osl::FileBase::RC write(const void *pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64& rBytesWritten); - ::osl::FileBase::RC readLine( ::rtl::ByteSequence& aSeq ); - ::osl::FileBase::RC sync() const; }; diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index 293f2c571d..e071eac1a0 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -2297,6 +2297,11 @@ shell::commit( const shell::ContentMap::iterator& it, sal_Bool isDirectory,isFile,isVolume,isRemoveable,isRemote,isFloppy,isCompactDisc; + sal_Int64 dirSize = 0;
+
+ if( aFileStatus.isValid( FileStatusMask_FileSize ) )
+ dirSize = aFileStatus.getFileSize(); + if( aFileStatus.isValid( FileStatusMask_Type ) ) { if( osl::FileStatus::Link == aFileStatus.getFileType() && @@ -2314,6 +2319,9 @@ shell::commit( const shell::ContentMap::iterator& it, osl::FileStatus::Directory == aFileStatus2.getFileType(); isFile = osl::FileStatus::Regular == aFileStatus2.getFileType(); + + if( aFileStatus2.isValid( FileStatusMask_FileSize ) )
+ dirSize = aFileStatus2.getFileSize(); } else { @@ -2395,17 +2403,8 @@ shell::commit( const shell::ContentMap::iterator& it, it1 = properties.find( MyProperty( Size ) ); if( it1 != properties.end() ) { - if( aFileStatus.isValid( FileStatusMask_FileSize ) ) - { - aAny <<= sal_Int64( aFileStatus.getFileSize() ); - it1->setValue( aAny ); - } - else - { - sal_Int64 dirSize = 0; - aAny <<= dirSize; - it1->setValue( aAny ); - } + aAny <<= dirSize;
+ it1->setValue( aAny ); } diff --git a/ucb/source/ucp/ftp/ftpcfunc.cxx b/ucb/source/ucp/ftp/ftpcfunc.cxx index b062074a63..9ec3edf0c0 100644 --- a/ucb/source/ucp/ftp/ftpcfunc.cxx +++ b/ucb/source/ucp/ftp/ftpcfunc.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ftpcfunc.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.22.1 $ * * This file is part of OpenOffice.org. * @@ -46,19 +46,7 @@ using namespace ftp; using namespace com::sun::star::uno; extern "C" { - - int ftp_write(void *buffer,size_t size,size_t nmemb,void *stream) - { - FTPStreamContainer *_stream = - reinterpret_cast<FTPStreamContainer*>(stream); - - if(!_stream) - return 0; - - return _stream->write(buffer,size,nmemb); - } - - + int file_write(void *buffer,size_t size,size_t nmemb,void *stream) { FILE* file = @@ -68,11 +56,4 @@ extern "C" { return fwrite(buffer,size,nmemb,file); } - - int ftp_passwd(void *, char*, char*, int) - { - return 0; - } - - } diff --git a/ucb/source/ucp/ftp/ftpcfunc.hxx b/ucb/source/ucp/ftp/ftpcfunc.hxx index 487f638507..95a6cd00cb 100644 --- a/ucb/source/ucp/ftp/ftpcfunc.hxx +++ b/ucb/source/ucp/ftp/ftpcfunc.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ftpcfunc.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.22.1 $ * * This file is part of OpenOffice.org. * @@ -58,35 +58,9 @@ extern "C" { * stream has to be of type 'FTPStreamContainer'. */ - - int ftp_write(void *buffer,size_t size,size_t nmemb,void *stream); - - int file_write(void *buffer,size_t size,size_t nmemb,void *stream); - -} - - - - -namespace ftp { - - /** Is the first argument to 'passwd' below. - */ - - class FTPClient - { - public: - virtual rtl::OUString passwd() const = 0; - }; - -} - - -extern "C" { + int file_write(void *buffer,size_t size,size_t nmemb,void *stream); - int ftp_passwd(void *client,char*prompt,char*buffer,int bufferlength); - } #endif diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx index 13c6be69c8..4cc975070d 100644 --- a/ucb/source/ucp/webdav/ContentProperties.cxx +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -371,28 +371,6 @@ void ContentProperties::UCBNamesToHTTPNames( } //========================================================================= -// static -void ContentProperties::getMappableHTTPHeaders( - std::vector< rtl::OUString > & rHeaderNames ) -{ - // -> DateModified - rHeaderNames.push_back( - rtl::OUString::createFromAscii( "Last-Modified" ) ); - - // -> MediaType - rHeaderNames.push_back( - rtl::OUString::createFromAscii( "Content-Type" ) ); - - // -> Size - rHeaderNames.push_back( - rtl::OUString::createFromAscii( "Content-Length" ) ); - - // -> BaseURI - rHeaderNames.push_back( - rtl::OUString::createFromAscii( "Content-Location" ) ); -} - -//========================================================================= bool ContentProperties::containsAllNames( const uno::Sequence< beans::Property >& rProps, std::vector< rtl::OUString > & rNamesNotContained ) const diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx index 0f43dc1389..4fb9af57f2 100644 --- a/ucb/source/ucp/webdav/ContentProperties.hxx +++ b/ucb/source/ucp/webdav/ContentProperties.hxx @@ -146,11 +146,6 @@ public: std::vector< rtl::OUString > & resources, bool bIncludeUnmatched = true ); - // Returns a list of HTTP header names that can be mapped to UCB property - // names. - static void getMappableHTTPHeaders( - std::vector< rtl::OUString > & rHeaderNames ); - // return true, if all properties contained in rProps are contained in // this ContentProperties instance. Otherwiese, false will be returned. // rNamesNotContained contain the missing names. diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx index 212dfb3aba..4f1fa929c7 100644 --- a/ucb/source/ucp/webdav/NeonSession.cxx +++ b/ucb/source/ucp/webdav/NeonSession.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: NeonSession.cxx,v $ - * $Revision: 1.55 $ + * $Revision: 1.55.12.1 $ * * This file is part of OpenOffice.org. * @@ -270,6 +270,8 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, * cancel the request. (if non-zero, username and password are * ignored.) */ + + #if 0 // Give'em only a limited mumber of retries.. if ( attempt > 9 ) @@ -357,6 +359,7 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) ); return theRetVal; + } // ------------------------------------------------------------------- @@ -762,6 +765,7 @@ void NeonSession::Init() // checked: 0.22.0) ne_set_server_auth( m_pHttpSession, NeonSession_NeonAuth, this ); ne_set_proxy_auth ( m_pHttpSession, NeonSession_NeonAuth, this ); + } } @@ -1816,30 +1820,6 @@ bool NeonSession::getDataFromInputStream( NeonSession::Map NeonSession::certMap; -bool NeonSession::isCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) -{ - Map::iterator p = NeonSession::certMap.find(url); - - bool ret = false; - - while( p != NeonSession::certMap.end() ) - { - ret = (*p).second.equals(certificate_name); - if( ret ) - break; - p++; - } - - return ret; -} - -// ------------------------------------------------------------------- -//static -void NeonSession::rememberCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ) -{ - NeonSession::certMap.insert( Map::value_type( url, certificate_name ) ); -} - // --------------------------------------------------------------------- sal_Bool NeonSession::isDomainMatch( rtl::OUString certHostName) diff --git a/ucb/source/ucp/webdav/NeonSession.hxx b/ucb/source/ucp/webdav/NeonSession.hxx index d796292e03..d1bda2fac4 100644 --- a/ucb/source/ucp/webdav/NeonSession.hxx +++ b/ucb/source/ucp/webdav/NeonSession.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: NeonSession.hxx,v $ - * $Revision: 1.31 $ + * $Revision: 1.31.12.1 $ * * This file is part of OpenOffice.org. * @@ -225,10 +225,6 @@ class NeonSession : public DAVSession const ::uno::Reference< ::lang::XMultiServiceFactory > getMSF() { return m_xFactory->getServiceFactory(); } - - static bool isCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ); - static void rememberCertificate( const ::rtl::OUString & url, const ::rtl::OUString & certificate_name ); - const void * getRequestData() const { return m_pRequestData; } sal_Bool isDomainMatch( rtl::OUString certHostName ); diff --git a/ucb/source/ucp/webdav/NeonUri.cxx b/ucb/source/ucp/webdav/NeonUri.cxx index cc2efb95e1..ed8315b1cd 100644 --- a/ucb/source/ucp/webdav/NeonUri.cxx +++ b/ucb/source/ucp/webdav/NeonUri.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: NeonUri.cxx,v $ - * $Revision: 1.25 $ + * $Revision: 1.25.16.1 $ * * This file is part of OpenOffice.org. * @@ -310,20 +310,6 @@ bool NeonUri::operator== ( const NeonUri & rOther ) const return unescape( GetPathBaseName() ); } -::rtl::OUString NeonUri::GetPathDirName () const -{ - sal_Int32 nPos = mPath.lastIndexOf ('/'); - if (nPos == mPath.getLength () - 1) - { - // Trailing slash found. Skip. - nPos = mPath.lastIndexOf ('/', nPos); - } - if (nPos != -1) - return mPath.copy (0, nPos + 1); - else - return rtl::OUString::createFromAscii ("/"); -} - void NeonUri::AppendPath (const rtl::OUString& rPath) { if (mPath.lastIndexOf ('/') != mPath.getLength () - 1) diff --git a/ucb/source/ucp/webdav/NeonUri.hxx b/ucb/source/ucp/webdav/NeonUri.hxx index 46d4a7b1b6..1b54085e53 100644 --- a/ucb/source/ucp/webdav/NeonUri.hxx +++ b/ucb/source/ucp/webdav/NeonUri.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: NeonUri.hxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.14.22.1 $ * * This file is part of OpenOffice.org. * @@ -81,7 +81,6 @@ class NeonUri { return mPath; }; ::rtl::OUString GetPathBaseName ( void ) const; - ::rtl::OUString GetPathDirName ( void ) const; ::rtl::OUString GetPathBaseNameUnescaped ( void ) const; diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 7c7a0b4644..00894a0579 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -2129,9 +2129,6 @@ uno::Any Content::open( DAVResource aResource; std::vector< rtl::OUString > aHeaders; -// // Obtain list containing all HTTP headers that can -// // be mapped to UCB properties. -// ContentProperties::getMappableHTTPHeaders( aHeaders ); xResAccess->GET( xOut, aHeaders, aResource, xEnv ); m_bDidGetOrHead = true; @@ -2176,9 +2173,6 @@ uno::Any Content::open( // fill inputsream sync; return if all data present DAVResource aResource; std::vector< rtl::OUString > aHeaders; -// // Obtain list containing all HTTP headers that can -// // be mapped to UCB properties. -// ContentProperties::getMappableHTTPHeaders( aHeaders ); uno::Reference< io::XInputStream > xIn = xResAccess->GET( aHeaders, aResource, xEnv ); diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx index cd520792be..030fcc2b7e 100644 --- a/ucb/source/ucp/webdav/webdavcontent.hxx +++ b/ucb/source/ucp/webdav/webdavcontent.hxx @@ -106,10 +106,6 @@ private: ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) throw ( ::com::sun::star::uno::Exception ); - void getProperties( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv, - PropertyMap & rProps ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > getPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rProperties, diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx index a3d13d82ae..b4a265eefe 100644 --- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: webdavcontentcaps.cxx,v $ - * $Revision: 1.21 $ + * $Revision: 1.21.20.1 $ * * This file is part of OpenOffice.org. * @@ -335,6 +335,7 @@ uno::Sequence< beans::Property > Content::getProperties( // we used a depth of DAVZERO for PROPFIND. aPropSet.insert( (*props.begin()).properties.begin(), (*props.begin()).properties.end() ); + } catch ( DAVException const & ) { @@ -524,17 +525,6 @@ uno::Sequence< beans::Property > Content::getProperties( } //========================================================================= -void Content::getProperties( - const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv, - PropertyMap & rProps ) -{ - uno::Sequence< beans::Property > aProps = getProperties( xEnv ); - sal_Int32 nCount = aProps.getLength(); - for ( sal_Int32 n = 0; n < nCount; ++n ) - rProps.insert( aProps[ n ] ); -} - -//========================================================================= // virtual uno::Sequence< com::sun::star::ucb::CommandInfo > Content::getCommands( const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) |