[Libreoffice-commits] .: Branch 'libreoffice-3-4' - xmloff/source

Noel Power noelp at kemper.freedesktop.org
Tue May 31 02:15:15 PDT 2011


 xmloff/source/forms/elementimport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6fccef85a61d6238744f3cef302f63b5a1b3d11e
Author: Noel Power <noel.power at novell.com>
Date:   Tue May 31 10:11:22 2011 +0100

    fix for bug fdo#37590
    
    Signed-off-by: 	Michael Meeks <michael.meeks at novell.com>

diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 6247264..7f5688e 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( pCurrentValueProperty && pValueProperty, "OControlImport::StartElement: illegal value property names!" );
+                            ENSURE_OR_BREAK( pCurrentValueProperty || pValueProperty, "OControlImport::StartElement: illegal value property names!" );
                             bRetrievedValues = sal_True;
                         }
                         OSL_ENSURE((PROPID_VALUE != aValueProps->Handle) || pValueProperty,


More information about the Libreoffice-commits mailing list