[Libreoffice-commits] core.git: forms/source

Stephan Bergmann sbergman at redhat.com
Tue Jan 13 23:38:25 PST 2015


 forms/source/component/ListBox.cxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 4efa9604cf90a581af05c231470bc3fe2e0c49ef
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 14 08:35:33 2015 +0100

    Revert "ListBox: refuse to give values before we are loaded"
    
    This reverts commit 1cc29a04adb721205655091854f5ea828bb8eb11, as it caused
    JunitTest_forms_unoapi trigger the
    
      assert( m_nConvertedBoundValuesType == getValueType())
    
    at forms/source/component/ListBox.cxx:1189.

diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 72ce587..e7f7e21 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -1072,9 +1072,6 @@ namespace frm
 
     ValueList OListBoxModel::impl_getValues() const
     {
-        if (!isLoaded())
-            return ValueList();
-
         const sal_Int32 nFieldType = getValueType();
 
         if ( !m_aConvertedBoundValues.empty() && m_nConvertedBoundValuesType == nFieldType )


More information about the Libreoffice-commits mailing list