From f2de7d05457d54767f8d1e0fab01adfaf52d0c37 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 31 Oct 2016 12:38:39 +0100 Subject: This apparently always wanted to check that _rChars.trim() is non-empty ...and d3e89269304c623e3b52a097e9e270f1bf1f09b8 "initial checkin - implementations for formlayer import/export - still under construction" just forgot the '.getLength()' in OSL_ENSURE(0 == _rChars.trim(), ... that is present in other, similar code. (And the current code happend to use the operator ==(sal_Unicode const *, OUString const &) overload that happens to treat a null first argument like an empty string.) Change-Id: I9d74b6ae29ca5f5f80391de50e4898add6bf6fe2 --- xmloff/source/forms/propertyimport.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xmloff') diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 33ac8aca3281..6ad41b0e59b9 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -388,7 +388,7 @@ SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPr void OPropertyElementsContext::Characters(const OUString& _rChars) { - OSL_ENSURE(nullptr == _rChars.trim(), "OPropertyElementsContext::Characters: non-whitespace characters detected!"); + OSL_ENSURE(_rChars.trim().isEmpty(), "OPropertyElementsContext::Characters: non-whitespace characters detected!"); SvXMLImportContext::Characters(_rChars); } -- cgit