summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-12-25 19:13:01 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-12-26 00:59:00 +0000
commit66eb739e9a59ed2b96d808115c568172b8488144 (patch)
tree1af9526db6f21c2ddccd938390a7698fb3221fdc /oox
parent66ecc44c0a8a510b1c4f61776608123e4fe24e9a (diff)
OSL_ENSURE -> SAL_WARN_IF in oox relationship code
Change-Id: Iac742e253c1f96a412a803025bb89578f8d96018 Reviewed-on: https://gerrit.libreoffice.org/32424 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/core/relationshandler.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/core/relationshandler.cxx b/oox/source/core/relationshandler.cxx
index f94d5ebfa569..65c9d46ed999 100644
--- a/oox/source/core/relationshandler.cxx
+++ b/oox/source/core/relationshandler.cxx
@@ -73,11 +73,11 @@ Reference< XFastContextHandler > RelationsFragment::createFastChildContext(
if( !aRelation.maId.isEmpty() && !aRelation.maType.isEmpty() && !aRelation.maTarget.isEmpty() )
{
sal_Int32 nTargetMode = aAttribs.getToken( XML_TargetMode, XML_Internal );
- OSL_ENSURE( (nTargetMode == XML_Internal) || (nTargetMode == XML_External),
+ SAL_WARN_IF( (nTargetMode != XML_Internal) && (nTargetMode != XML_External), "oox",
"RelationsFragment::createFastChildContext - unexpected target mode, assuming external" );
aRelation.mbExternal = nTargetMode != XML_Internal;
- OSL_ENSURE( mxRelations->count( aRelation.maId ) == 0,
+ SAL_WARN_IF( mxRelations->count( aRelation.maId ) != 0, "oox",
"RelationsFragment::createFastChildContext - relation identifier exists already" );
mxRelations->insert( ::std::map< OUString, Relation >::value_type( aRelation.maId, aRelation ) );
}