diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-29 20:02:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-29 20:03:23 +0100 |
| commit | ca6052b9a62596902f901f8fa36680d7abe989f5 (patch) | |
| tree | 7597a8f3793f2e9375a080dfd13e217e141ca7ab /unotools | |
| parent | 1e19c59d51b2184bbc2f7b794fe411946553548f (diff) | |
Special casing can be removed again.
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/ucbhelper/ucbhelper.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx index 935620f27e35..84878161565a 100644 --- a/unotools/source/ucbhelper/ucbhelper.cxx +++ b/unotools/source/ucbhelper/ucbhelper.cxx @@ -483,9 +483,6 @@ bool utl::UCBContentHelper::IsSubPath( bool utl::UCBContentHelper::EqualURLs( rtl::OUString const & url1, rtl::OUString const & url2) { - if (url1.isEmpty() || url2.isEmpty()) { - return false; - } ucbhelper::ContentBroker * broker = ucbhelper::ContentBroker::get(); if (broker == 0) { throw css::uno::RuntimeException( @@ -493,11 +490,13 @@ bool utl::UCBContentHelper::EqualURLs( RTL_CONSTASCII_USTRINGPARAM("no ucbhelper::ContentBroker")), css::uno::Reference<css::uno::XInterface>()); } - return 0 == broker->getContentProviderInterface()->compareContentIds( - (broker->getContentIdentifierFactoryInterface()-> - createContentIdentifier(canonic(url1))), - (broker->getContentIdentifierFactoryInterface()-> - createContentIdentifier(canonic(url2)))); + return + broker->getContentProviderInterface()->compareContentIds( + (broker->getContentIdentifierFactoryInterface()-> + createContentIdentifier(canonic(url1))), + (broker->getContentIdentifierFactoryInterface()-> + createContentIdentifier(canonic(url2)))) + == 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |