diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-06-06 14:06:48 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-06-06 14:06:48 +0200 |
| commit | b6212a4a950d9091aaad62022216e8aaaa074965 (patch) | |
| tree | ed81e5f1845d4bb2dcb73e4da0c3b73d247ef0e9 /xmloff | |
| parent | f5e719d38e855484905b8f761a6779788b589546 (diff) | |
| parent | e12af87ff5f4a0d7b10133a9b3ddc114765607d6 (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-4'
Conflicts:
connectivity/qa/makefile.mk
sfx2/source/appl/appdata.cxx
sfx2/source/appl/appinit.cxx
sfx2/source/inc/appdata.hxx
sysui/desktop/productversion.mk
xmloff/source/forms/elementimport.cxx
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/forms/elementimport.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 3f26ebc05cd4..1b23c59282b0 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -889,7 +889,7 @@ namespace xmloff if (!bRetrievedValues) { getValuePropertyNames(m_eElementType, nClassId, pCurrentValueProperty, pValueProperty); - ENSURE_OR_BREAK( pValueProperty, "OControlImport::StartElement: illegal value property names!" ); + ENSURE_OR_BREAK( pCurrentValueProperty || pValueProperty, "OControlImport::StartElement: illegal value property names!" ); bRetrievedValues = sal_True; } ENSURE_OR_BREAK((PROPID_VALUE != aValueProps->Handle) || pValueProperty, |