xmloff/source/forms/elementimport.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c2d808a5ddf89ce40939d166e67dd0271852104f
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Thu Jan 31 17:04:26 2019 +0100
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Feb 1 16:37:17 2019 +0100
fix incorrect OSL_ENSURE
broken in
commit 5e0b52c1893ffe04a68333026afa7a557c48d534
Date: Thu May 17 14:51:04 2012 +0100
some more ConstAsciiString behind OSL_ENSURE
Also convert to SAL_WARN_IF, and make the error message more useful.
Change-Id: I7f1d0c577751e7309d5a0d544f38c5050b903a58
Reviewed-on: https://gerrit.libreoffice.org/67230
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/xmloff/source/forms/elementimport.cxx
b/xmloff/source/forms/elementimport.cxx
index 16c24f1df352..d0df9c2b604d 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -886,10 +886,10 @@ namespace xmloff
if (TypeClass_ANY == aProp.Type.getTypeClass())
{
// we have exactly 2 properties where this type class is allowed:
- OSL_ENSURE(
- _rPropValue.Name != PROPERTY_EFFECTIVE_VALUE
- && _rPropValue.Name != PROPERTY_EFFECTIVE_DEFAULT,
- "OControlImport::implTranslateValueProperty: invalid property
type/name combination!");
+ SAL_WARN_IF(
+ _rPropValue.Name == PROPERTY_EFFECTIVE_VALUE
+ || _rPropValue.Name == PROPERTY_EFFECTIVE_DEFAULT, "xmloff",
+ "OControlImport::implTranslateValueProperty: invalid property
type/name combination, Any and " + _rPropValue.Name);
// Both properties are allowed to have a double or a string value,
// so first try to convert the string into a number
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
