diff options
| author | Marcel Metz <mmetz@adrian-broher.net> | 2012-01-15 11:30:24 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-01-23 23:28:46 +0100 |
| commit | f9e6d195dbbf0b2effa10f69f4c99fce6e2b186b (patch) | |
| tree | d79d0e06993af15e44c7b00c94cbc1d6fac470b2 /ucb | |
| parent | e384f241554a1157137b6121a064f75308b2ba10 (diff) | |
Replaced diagnore ENSURE_OR_BREAK with regular code.
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/ext/ucpext_content.cxx | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index d9989edb1311..ed959bc74d4f 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -359,16 +359,31 @@ namespace ucb { namespace ucp { namespace ext const ::rtl::OUString sURL = m_xIdentifier->getContentIdentifier(); // cut the root URL - ENSURE_OR_BREAK( sURL.match( sRootURL, 0 ), "illegal URL structure - no root" ); + if ( !sURL.match( sRootURL, 0 ) ) + { + SAL_INFO( "ucb.ucp", "illegal URL structure - no root" ); + break; + } + ::rtl::OUString sRelativeURL( sURL.copy( sRootURL.getLength() ) ); // cut the extension ID const ::rtl::OUString sSeparatedExtensionId( encodeIdentifier( m_sExtensionId ) + ::rtl::OUString( sal_Unicode( '/' ) ) ); - ENSURE_OR_BREAK( sRelativeURL.match( sSeparatedExtensionId ), "illegal URL structure - no extension ID" ); + if ( !sRelativeURL.match( sSeparatedExtensionId ) ) + { + SAL_INFO( "ucb.ucp", "illegal URL structure - no extension ID" ); + break; + } + sRelativeURL = sRelativeURL.copy( sSeparatedExtensionId.getLength() ); // cut the final slash (if any) - ENSURE_OR_BREAK( !sRelativeURL.isEmpty(), "illegal URL structure - ExtensionContent should have a level below the extension ID" ); + if ( sRelativeURL.isEmpty() ) + { + SAL_INFO( "ucb.ucp", "illegal URL structure - ExtensionContent should have a level below the extension ID" ); + break; + } + if ( sRelativeURL.getStr()[ sRelativeURL.getLength() - 1 ] == '/' ) sRelativeURL = sRelativeURL.copy( 0, sRelativeURL.getLength() - 1 ); |