[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - forms/source

[Eike Rathke]

 forms/source/component/ComboBox.cxx |    2 +-
 forms/source/component/ListBox.cxx  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1ac550cb9e9379b32853518f9e366e0620ae2f69
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Jun 13 03:11:53 2017 +0200

    Fix subsequentcheck, TYPEDITEMLIST has to be OPTIONAL, tdf#108413 follow-up
    
    Change-Id: Idb74536b9fa3837e36ae4fbb529d09b6218c80d8
    (cherry picked from commit a1ace08b5b86a76e7275dcef2545a7d52ae2ed2d)
    Reviewed-on: https://gerrit.libreoffice.org/38719
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index b5c43633077f..f41d0e247a4b 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -303,7 +303,7 @@ void OComboBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) co
         DECL_BOOL_PROP1(EMPTY_IS_NULL,                              BOUND);
         DECL_PROP1(DEFAULT_TEXT,        OUString,            BOUND);
         DECL_PROP1(STRINGITEMLIST,      Sequence< OUString >,BOUND);
-        DECL_PROP1(TYPEDITEMLIST,       Sequence< Any >,        BOUND);
+        DECL_PROP1(TYPEDITEMLIST,       Sequence< Any >,        OPTIONAL);
     END_DESCRIBE_PROPERTIES();
 }
 
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index bfd531624d2c..76eadaa64afa 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -494,7 +494,7 @@ namespace frm
             DECL_PROP2(SELECT_VALUE,        Any,                            BOUND, TRANSIENT);
             DECL_PROP1(DEFAULT_SELECT_SEQ,  Sequence<sal_Int16>,            BOUND);
             DECL_PROP1(STRINGITEMLIST,      Sequence< OUString >,    BOUND);
-            DECL_PROP1(TYPEDITEMLIST,       Sequence< Any >,    BOUND);
+            DECL_PROP1(TYPEDITEMLIST,       Sequence< Any >,    OPTIONAL);
         END_DESCRIBE_PROPERTIES();
     }