summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-03-08 14:11:35 +0100
committerFridrich Strba <fridrich@documentfoundation.org>2013-03-08 13:16:49 +0000
commit4bf95c4c31dd871065d4042028a4b3ae476dab70 (patch)
tree2935dfd660fc2ee2b914ca27a72077e51e5862f3 /xmloff
parent596334776ad45f7ab87937615fa1d4e7d2d0fd42 (diff)
make use of startsWith()
Change-Id: Ie70097de550ddd1cddc6714f8f86f9723cb36679 Reviewed-on: https://gerrit.libreoffice.org/2599 Tested-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/core/xmlexp.cxx18
-rw-r--r--xmloff/source/core/xmlimp.cxx2
-rw-r--r--xmloff/source/style/XMLClipPropertyHandler.cxx2
-rw-r--r--xmloff/source/transform/TransformerBase.cxx5
4 files changed, 10 insertions, 17 deletions
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 81afbf314543..c578286c0b7a 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1854,8 +1854,7 @@ sal_Int32 SvXMLExport::dataStyleForceSystemLanguage(sal_Int32 nFormat) const
OUString SvXMLExport::AddEmbeddedGraphicObject( const OUString& rGraphicObjectURL )
{
OUString sRet( rGraphicObjectURL );
- if( 0 == rGraphicObjectURL.compareTo( msGraphicObjectProtocol,
- msGraphicObjectProtocol.getLength() ) &&
+ if( rGraphicObjectURL.startsWith( msGraphicObjectProtocol ) &&
mxGraphicResolver.is() )
{
if( (getExportFlags() & EXPORT_EMBEDDED) == 0 )
@@ -1874,8 +1873,7 @@ sal_Bool SvXMLExport::AddEmbeddedGraphicObjectAsBase64( const OUString& rGraphic
sal_Bool bRet = sal_False;
if( (getExportFlags() & EXPORT_EMBEDDED) != 0 &&
- 0 == rGraphicObjectURL.compareTo( msGraphicObjectProtocol,
- msGraphicObjectProtocol.getLength() ) &&
+ rGraphicObjectURL.startsWith( msGraphicObjectProtocol ) &&
mxGraphicResolver.is() )
{
Reference< XBinaryStreamResolver > xStmResolver( mxGraphicResolver, UNO_QUERY );
@@ -1898,10 +1896,8 @@ sal_Bool SvXMLExport::AddEmbeddedGraphicObjectAsBase64( const OUString& rGraphic
OUString SvXMLExport::AddEmbeddedObject( const OUString& rEmbeddedObjectURL )
{
OUString sRet;
- if( (0 == rEmbeddedObjectURL.compareTo( msEmbeddedObjectProtocol,
- msEmbeddedObjectProtocol.getLength() ) ||
- 0 == rEmbeddedObjectURL.compareTo( msGraphicObjectProtocol,
- msGraphicObjectProtocol.getLength() ) ) &&
+ if( (rEmbeddedObjectURL.startsWith( msEmbeddedObjectProtocol ) ||
+ rEmbeddedObjectURL.startsWith( msGraphicObjectProtocol ) ) &&
mxEmbeddedResolver.is() )
{
sRet =
@@ -1916,10 +1912,8 @@ OUString SvXMLExport::AddEmbeddedObject( const OUString& rEmbeddedObjectURL )
sal_Bool SvXMLExport::AddEmbeddedObjectAsBase64( const OUString& rEmbeddedObjectURL )
{
sal_Bool bRet = sal_False;
- if( (0 == rEmbeddedObjectURL.compareTo( msEmbeddedObjectProtocol,
- msEmbeddedObjectProtocol.getLength() ) ||
- 0 == rEmbeddedObjectURL.compareTo( msGraphicObjectProtocol,
- msGraphicObjectProtocol.getLength() ) ) &&
+ if( (rEmbeddedObjectURL.startsWith( msEmbeddedObjectProtocol ) ||
+ rEmbeddedObjectURL.startsWith( msGraphicObjectProtocol ) ) &&
mxEmbeddedResolver.is() )
{
Reference < XNameAccess > xNA( mxEmbeddedResolver, UNO_QUERY );
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 2edbac4ad084..04f7a51081af 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -639,7 +639,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName,
}
}
else if( ( rAttrName.getLength() >= 5 ) &&
- ( rAttrName.compareTo( GetXMLToken(XML_XMLNS), 5 ) == 0 ) &&
+ ( rAttrName.startsWith( GetXMLToken(XML_XMLNS) ) ) &&
( rAttrName.getLength() == 5 || ':' == rAttrName[5] ) )
{
if( !pRewindMap )
diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx
index e55e6ee4a87d..ec0e1d59de1a 100644
--- a/xmloff/source/style/XMLClipPropertyHandler.cxx
+++ b/xmloff/source/style/XMLClipPropertyHandler.cxx
@@ -66,7 +66,7 @@ sal_Bool XMLClipPropertyHandler::importXML( const OUString& rStrImpValue, uno::A
sal_Bool bRet = sal_False;
sal_Int32 nLen = rStrImpValue.getLength();
if( nLen > 6 &&
- 0 == rStrImpValue.compareTo( GetXMLToken(XML_RECT), 4 ) &&
+ rStrImpValue.startsWith( GetXMLToken(XML_RECT)) &&
rStrImpValue[4] == '(' &&
rStrImpValue[nLen-1] == ')' )
{
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 67c8e5bb39a0..4adfc9727bd0 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -242,7 +242,7 @@ void SAL_CALL XMLTransformerBase::startElement( const OUString& rName,
{
const OUString& rAttrName = xAttrList->getNameByIndex( i );
if( ( rAttrName.getLength() >= 5 ) &&
- ( rAttrName.compareTo( GetXMLToken(XML_XMLNS), 5 ) == 0 ) &&
+ ( rAttrName.startsWith( GetXMLToken(XML_XMLNS) ) ) &&
( rAttrName.getLength() == 5 || ':' == rAttrName[5] ) )
{
if( !pRewindMap )
@@ -1340,8 +1340,7 @@ sal_Bool XMLTransformerBase::ConvertURIToOOo( ::rtl::OUString& rURI,
break;
case '.':
// a rel path
- if( 0 == rURI.compareTo( m_aExtPathPrefix,
- m_aExtPathPrefix.getLength() ) )
+ if( rURI.startsWith( m_aExtPathPrefix ) )
{
// an external URI; remove '../'
rURI = rURI.copy( m_aExtPathPrefix.getLength() );