diff options
| -rw-r--r-- | desktop/source/deployment/registry/sfwk/dp_sfwk.cxx | 2 | ||||
| -rw-r--r-- | oox/source/vml/vmlinputstream.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/ext/ucpext_datasupplier.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 9af1ef1c3094..80510373effe 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -143,7 +143,7 @@ BackendImpl::PackageImpl::PackageImpl( initPackageHandler(); sal_Int32 segmEnd = url.getLength(); - if (!url.isEmpty() && url[ url.getLength() - 1 ] == '/') + if ( url.endsWith("/") ) --segmEnd; sal_Int32 segmStart = (url.lastIndexOf( '/', segmEnd ) + 1); if (segmStart < 0) diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx index 48d0a3c42987..edd4cd4b2898 100644 --- a/oox/source/vml/vmlinputstream.cxx +++ b/oox/source/vml/vmlinputstream.cxx @@ -380,7 +380,7 @@ OString InputStream::readToElementBegin() throw (IOException, RuntimeException) OString InputStream::readToElementEnd() throw (IOException, RuntimeException) { OString aText = OUStringToOString( mxTextStrm->readString( maClosingBracket, sal_False ), RTL_TEXTENCODING_ISO_8859_1 ); - OSL_ENSURE( !aText.isEmpty() && (aText[ aText.getLength() - 1 ] == '>'), "InputStream::readToElementEnd - missing closing bracket of XML element" ); + OSL_ENSURE( aText.endsWith(">"), "InputStream::readToElementEnd - missing closing bracket of XML element" ); return aText; } diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index a65e88966e26..8c8057d47907 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -321,7 +321,7 @@ namespace ucb { namespace ucp { namespace ext const OUString& rId( m_pImpl->m_aResults[ i_nIndex ].sId ); const OUString sRootURL( ContentProvider::getRootURL() ); OUString sTitle = Content::decodeIdentifier( rId.copy( sRootURL.getLength() ) ); - if ( !sTitle.isEmpty() && ( sTitle[ sTitle.getLength() - 1 ] == '/' ) ) + if ( sTitle.endsWith("/") ) sTitle = sTitle.copy( 0, sTitle.getLength() - 1 ); xRow = Content::getArtificialNodePropertyValues( m_pImpl->m_xContext, getResultSet()->getProperties(), sTitle ); } |