mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disambiguate URLTransformer

Browse Source 
Change-Id: I27a80a7593889105c7a75c04de08eebe28e5c541
This commit is contained in:
Matúš Kukan 2014-01-17 12:56:23 +01:00
parent 2fd70b6bf7
commit 9e18f7e3cf
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
framework/source/services/urltransformer.cxx
View File

@ -30,12 +30,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
namespace { namespace {
class URLTransformer : public ::cppu::WeakImplHelper2< css::util::XURLTransformer, css::lang::XServiceInfo> class URLTransformer : public ::cppu::WeakImplHelper2< css::util::XURLTransformer, css::lang::XServiceInfo>
@ -80,7 +74,7 @@ public:
namespace namespace
{ {
void lcl_ParserHelper(INetURLObject& _rParser,URL& _rURL,bool _bUseIntern) void lcl_ParserHelper(INetURLObject& _rParser, css::util::URL& _rURL,bool _bUseIntern)
{ {
// Get all information about this URL. // Get all information about this URL.
_rURL.Protocol = INetURLObject::GetScheme( _rParser.GetProtocol() ); _rURL.Protocol = INetURLObject::GetScheme( _rParser.GetProtocol() );
@ -132,7 +126,7 @@ namespace
//***************************************************************************************************************** //*****************************************************************************************************************
// XURLTransformer // XURLTransformer
//***************************************************************************************************************** //*****************************************************************************************************************
sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeException ) sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css::uno::RuntimeException )
{ {
// Safe impossible cases. // Safe impossible cases.
if (( &aURL == NULL ) || if (( &aURL == NULL ) ||
@ -185,8 +179,8 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeExcepti
//***************************************************************************************************************** //*****************************************************************************************************************
// XURLTransformer // XURLTransformer
//***************************************************************************************************************** //*****************************************************************************************************************
sal_Bool SAL_CALL URLTransformer::parseSmart( URL& aURL , sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL,
const OUString& sSmartProtocol ) throw( RuntimeException ) const OUString& sSmartProtocol ) throw( css::uno::RuntimeException )
{ {
// Safe impossible cases. // Safe impossible cases.
if (( &aURL == NULL ) || if (( &aURL == NULL ) ||
@ -241,7 +235,7 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( URL& aURL
//***************************************************************************************************************** //*****************************************************************************************************************
// XURLTransformer // XURLTransformer
//***************************************************************************************************************** //*****************************************************************************************************************
sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException ) sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::uno::RuntimeException )
{ {
// Safe impossible cases. // Safe impossible cases.
if ( &aURL == NULL ) if ( &aURL == NULL )
@ -304,8 +298,8 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException
//***************************************************************************************************************** //*****************************************************************************************************************
// XURLTransformer // XURLTransformer
//***************************************************************************************************************** //*****************************************************************************************************************
OUString SAL_CALL URLTransformer::getPresentation( const URL& aURL , OUString SAL_CALL URLTransformer::getPresentation( const css::util::URL& aURL,
sal_Bool bWithPassword ) throw( RuntimeException ) sal_Bool bWithPassword ) throw( css::uno::RuntimeException )
{ {
// Safe impossible cases. // Safe impossible cases.
if (( &aURL == NULL ) || if (( &aURL == NULL ) ||
@ -317,7 +311,7 @@ OUString SAL_CALL URLTransformer::getPresentation( const URL& aURL
} }
// Check given URL // Check given URL
URL aTestURL = aURL; css::util::URL aTestURL = aURL;
sal_Bool bParseResult = parseSmart( aTestURL, aTestURL.Protocol ); sal_Bool bParseResult = parseSmart( aTestURL, aTestURL.Protocol );
if ( bParseResult ) if ( bParseResult )
{ {