oox/source/core/relationshandler.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 66eb739e9a59ed2b96d808115c568172b8488144
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Sun Dec 25 19:13:01 2016 +0100
OSL_ENSURE -> SAL_WARN_IF in oox relationship code
Change-Id: Iac742e253c1f96a412a803025bb89578f8d96018
Reviewed-on: https://gerrit.libreoffice.org/32424
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/oox/source/core/relationshandler.cxx
b/oox/source/core/relationshandler.cxx
index f94d5eb..65c9d46 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 ) );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
