webdavdatasupplier.cxx (421ed02e) | webdavdatasupplier.cxx (9646dec5) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 25 unchanged lines hidden (view full) --- 34#include <ucbhelper/contentidentifier.hxx> 35#include <ucbhelper/providerhelper.hxx> 36#include "webdavdatasupplier.hxx" 37#include "webdavcontent.hxx" 38#include "ContentProperties.hxx" 39#ifndef _WEBDAV_SESSION_HXX 40#include "DAVSession.hxx" 41#endif | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 25 unchanged lines hidden (view full) --- 34#include <ucbhelper/contentidentifier.hxx> 35#include <ucbhelper/providerhelper.hxx> 36#include "webdavdatasupplier.hxx" 37#include "webdavcontent.hxx" 38#include "ContentProperties.hxx" 39#ifndef _WEBDAV_SESSION_HXX 40#include "DAVSession.hxx" 41#endif |
42#include "SerfUri.hxx" | 42#include "CurlUri.hxx" |
43 44using namespace com::sun::star; 45using namespace http_dav_ucp; 46 47namespace http_dav_ucp 48{ 49 50//========================================================================= --- 343 unchanged lines hidden (view full) --- 394// OSL_ENSURE( sal_False, "PROPFIND : DAVException" ); 395 m_pImpl->m_bThrowException = sal_True; 396 } 397 398 if ( !m_pImpl->m_bThrowException ) 399 { 400 try 401 { | 43 44using namespace com::sun::star; 45using namespace http_dav_ucp; 46 47namespace http_dav_ucp 48{ 49 50//========================================================================= --- 343 unchanged lines hidden (view full) --- 394// OSL_ENSURE( sal_False, "PROPFIND : DAVException" ); 395 m_pImpl->m_bThrowException = sal_True; 396 } 397 398 if ( !m_pImpl->m_bThrowException ) 399 { 400 try 401 { |
402 SerfUri aURI( | 402 CurlUri aURI( |
403 m_pImpl->m_xContent->getResourceAccess().getURL() ); 404 rtl::OUString aPath = aURI.GetPath(); 405 406 if ( aPath.getStr()[ aPath.getLength() - 1 ] 407 == sal_Unicode( '/' ) ) 408 aPath = aPath.copy( 0, aPath.getLength() - 1 ); 409 | 403 m_pImpl->m_xContent->getResourceAccess().getURL() ); 404 rtl::OUString aPath = aURI.GetPath(); 405 406 if ( aPath.getStr()[ aPath.getLength() - 1 ] 407 == sal_Unicode( '/' ) ) 408 aPath = aPath.copy( 0, aPath.getLength() - 1 ); 409 |
410 aPath = SerfUri::unescape( aPath ); | 410 aPath = CurlUri::unescape( aPath ); |
411 bool bFoundParent = false; 412 413 for ( sal_uInt32 n = 0; n < resources.size(); ++n ) 414 { 415 const DAVResource & rRes = resources[ n ]; 416 417 // Filter parent, which is contained somewhere(!) in 418 // the vector. 419 if ( !bFoundParent ) 420 { 421 try 422 { | 411 bool bFoundParent = false; 412 413 for ( sal_uInt32 n = 0; n < resources.size(); ++n ) 414 { 415 const DAVResource & rRes = resources[ n ]; 416 417 // Filter parent, which is contained somewhere(!) in 418 // the vector. 419 if ( !bFoundParent ) 420 { 421 try 422 { |
423 SerfUri aCurrURI( rRes.uri ); | 423 CurlUri aCurrURI( rRes.uri ); |
424 rtl::OUString aCurrPath = aCurrURI.GetPath(); 425 if ( aCurrPath.getStr()[ 426 aCurrPath.getLength() - 1 ] 427 == sal_Unicode( '/' ) ) 428 aCurrPath 429 = aCurrPath.copy( 430 0, 431 aCurrPath.getLength() - 1 ); 432 | 424 rtl::OUString aCurrPath = aCurrURI.GetPath(); 425 if ( aCurrPath.getStr()[ 426 aCurrPath.getLength() - 1 ] 427 == sal_Unicode( '/' ) ) 428 aCurrPath 429 = aCurrPath.copy( 430 0, 431 aCurrPath.getLength() - 1 ); 432 |
433 aCurrPath = SerfUri::unescape( aCurrPath ); | 433 aCurrPath = CurlUri::unescape( aCurrPath ); |
434 if ( aPath == aCurrPath ) 435 { 436 bFoundParent = true; 437 continue; 438 } 439 } 440 catch ( DAVException const & ) 441 { --- 67 unchanged lines hidden --- | 434 if ( aPath == aCurrPath ) 435 { 436 bFoundParent = true; 437 continue; 438 } 439 } 440 catch ( DAVException const & ) 441 { --- 67 unchanged lines hidden --- |