diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 20:22:02 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 20:22:02 +0000 |
| commit | e1f3cb450776e6a7861f3b77502bfd0d0d2f4ffb (patch) | |
| tree | a409ee8806ff2b3358a3d4cb6a6d7bb477718313 /svtools | |
| parent | 7db6c88d06aca5bcb60333a6db156c53570c293d (diff) | |
INTEGRATION: CWS warnings01 (1.17.62); FILE MERGED
2005/11/15 19:25:42 pl 1.17.62.2: #i55991# removed warnings
2005/10/26 12:40:33 pl 1.17.62.1: #i55991# removed warnings for linux platform
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/misc/urihelper.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/svtools/source/misc/urihelper.cxx b/svtools/source/misc/urihelper.cxx index fc815d23ce97..951bb1d6a2f8 100644 --- a/svtools/source/misc/urihelper.cxx +++ b/svtools/source/misc/urihelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: urihelper.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: rt $ $Date: 2005-09-08 16:24:06 $ + * last change: $Author: hr $ $Date: 2006-06-19 21:22:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -267,8 +267,10 @@ Result normalizePrefix( return GeneralFailure; } try { - bool ok - = (css::uno::Reference< css::ucb::XCommandProcessor >( + #if OSL_DEBUG_LEVEL > 0 + bool ok = + #endif + (css::uno::Reference< css::ucb::XCommandProcessor >( content, css::uno::UNO_QUERY_THROW)->execute( css::ucb::Command( rtl::OUString( @@ -299,13 +301,16 @@ rtl::OUString normalize( // normalize as long a prefix of the given URL as possible (i.e., normalize // all the existing directories within the path): rtl::OUString normalized; - sal_Int32 i = uriReference.indexOf('#'); - normalized = i == -1 ? uriReference : uriReference.copy(0, i); + sal_Int32 n = uriReference.indexOf('#'); + normalized = n == -1 ? uriReference : uriReference.copy(0, n); switch (normalizePrefix(broker, normalized, &normalized)) { case Success: - return i == -1 ? normalized : normalized + uriReference.copy(i); + return n == -1 ? normalized : normalized + uriReference.copy(n); case GeneralFailure: return uriReference; + case SpecificFailure: + default: + break; } css::uno::Reference< css::uri::XUriReference > ref( uriFactory->parse(uriReference)); |