diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2019-01-31 17:04:26 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-01 16:37:17 +0100 |
| commit | c2d808a5ddf89ce40939d166e67dd0271852104f (patch) | |
| tree | f05c6c4a2fa8fea809a4ba7cf96e79967d99de26 | |
| parent | b94eaae7a3e654b992ee7eea838245c57fea3017 (diff) | |
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.grandin@collabora.co.uk>
| -rw-r--r-- | xmloff/source/forms/elementimport.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
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 |