diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-28 15:37:38 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-28 15:37:38 +0200 |
| commit | 5908124b1e7a4b11926db0c83e06020e916d72e8 (patch) | |
| tree | 68079d3423cf631367f38513da26533310a43157 /xmloff | |
| parent | 9823cbf7faac2ef54b29e453a8fd03bb7d987c6b (diff) | |
| parent | 1768cff01e1d63687d9ecfedf65b81610dfd71b2 (diff) | |
CWS-TOOLING: integrate CWS dba34d
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/forms/elementimport.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index d917ea31b8c7..0172a185acd4 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -890,12 +890,12 @@ namespace xmloff if (!bRetrievedValues) { getValuePropertyNames(m_eElementType, nClassId, pCurrentValueProperty, pValueProperty); - ENSURE_OR_BREAK( pCurrentValueProperty && pValueProperty, "OControlImport::StartElement: illegal value property names!" ); + ENSURE_OR_BREAK( pValueProperty, "OControlImport::StartElement: illegal value property names!" ); bRetrievedValues = sal_True; } - OSL_ENSURE((PROPID_VALUE != aValueProps->Handle) || pValueProperty, + ENSURE_OR_BREAK((PROPID_VALUE != aValueProps->Handle) || pValueProperty, "OControlImport::StartElement: the control does not have a value property!"); - OSL_ENSURE((PROPID_CURRENT_VALUE != aValueProps->Handle) || pCurrentValueProperty, + ENSURE_OR_BREAK((PROPID_CURRENT_VALUE != aValueProps->Handle) || pCurrentValueProperty, "OControlImport::StartElement: the control does not have a current-value property!"); // transfer the name |