diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-17 12:56:23 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-01-17 12:59:01 +0100 |
| commit | 9e18f7e3cfec960b788eb5df3b53daf9efd092ab (patch) | |
| tree | 8c51d79b5427cfaf228f506d60f2e02d6040bcb4 /framework | |
| parent | 2fd70b6bf799843d2d9987cc90a5b373f31039f7 (diff) | |
disambiguate URLTransformer
Change-Id: I27a80a7593889105c7a75c04de08eebe28e5c541
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/services/urltransformer.cxx | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index a5346392833c..d8aaacf321e1 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -30,12 +30,6 @@ #include <com/sun/star/lang/XServiceInfo.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 { class URLTransformer : public ::cppu::WeakImplHelper2< css::util::XURLTransformer, css::lang::XServiceInfo> @@ -80,7 +74,7 @@ public: 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. _rURL.Protocol = INetURLObject::GetScheme( _rParser.GetProtocol() ); @@ -132,7 +126,7 @@ namespace //***************************************************************************************************************** // 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. if (( &aURL == NULL ) || @@ -185,8 +179,8 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( URL& aURL ) throw( RuntimeExcepti //***************************************************************************************************************** // XURLTransformer //***************************************************************************************************************** -sal_Bool SAL_CALL URLTransformer::parseSmart( URL& aURL , - const OUString& sSmartProtocol ) throw( RuntimeException ) +sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL, + const OUString& sSmartProtocol ) throw( css::uno::RuntimeException ) { // Safe impossible cases. if (( &aURL == NULL ) || @@ -241,7 +235,7 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( URL& aURL //***************************************************************************************************************** // 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. if ( &aURL == NULL ) @@ -304,8 +298,8 @@ sal_Bool SAL_CALL URLTransformer::assemble( URL& aURL ) throw( RuntimeException //***************************************************************************************************************** // XURLTransformer //***************************************************************************************************************** -OUString SAL_CALL URLTransformer::getPresentation( const URL& aURL , - sal_Bool bWithPassword ) throw( RuntimeException ) +OUString SAL_CALL URLTransformer::getPresentation( const css::util::URL& aURL, + sal_Bool bWithPassword ) throw( css::uno::RuntimeException ) { // Safe impossible cases. if (( &aURL == NULL ) || @@ -317,7 +311,7 @@ OUString SAL_CALL URLTransformer::getPresentation( const URL& aURL } // Check given URL - URL aTestURL = aURL; + css::util::URL aTestURL = aURL; sal_Bool bParseResult = parseSmart( aTestURL, aTestURL.Protocol ); if ( bParseResult ) { |