[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - forms/source
forms/source/component/ListBox.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 7173b70d665608f3823f4a3ff0653f84c0630ed3
Author: Lionel Elie Mamane
Date: Sat Jun 24 15:10:59 2017 +0200
tdf#108732 ListBox: in absence of a field, treat data as string
so that one meaningfully compare it; default is DataType::OTHER,
which is not comparable
Change-Id: Ifc1e1c9b801f45d0a95a83d30cc205b91e647880
Reviewed-on: https://gerrit.libreoffice.org/39212
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/forms/source/component/ListBox.cxx
b/forms/source/component/ListBox.cxx
index 76eadaa64afa..f88c3cb77735 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -1078,7 +1078,9 @@ namespace frm
sal_Int32 OListBoxModel::getValueType() const
{
-return (m_nBoundColumnType != css::sdbc::DataType::SQLNULL) ?
m_nBoundColumnType : getFieldType();
+return (m_nBoundColumnType != css::sdbc::DataType::SQLNULL) ?
+m_nBoundColumnType :
+( hasField() ? getFieldType() : DataType::VARCHAR);
}
ValueList OListBoxModel::impl_getValues() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - forms/source
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 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 Tested-by: Eike Rathke 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, BOUND); DECL_PROP1(STRINGITEMLIST, Sequence< OUString >,BOUND); -DECL_PROP1(TYPEDITEMLIST, Sequence< Any >,BOUND); +DECL_PROP1(TYPEDITEMLIST, Sequence< Any >,OPTIONAL); END_DESCRIBE_PROPERTIES(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - forms/source
forms/source/component/ComboBox.cxx |3 ++-
forms/source/component/ListBox.cxx |3 ++-
forms/source/misc/property.cxx |1 +
3 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit a1d695fb6a4f5a9711d072cca42ca90bff37858a
Author: Eike Rathke
Date: Mon Jun 12 17:22:35 2017 +0200
Resolves: tdf#108413 yet some more TYPEDITEMLIST property entries
... which apparently need to be present to be able to override them. You
also can have never enough macro names to obfuscate things for grep..
Change-Id: Ic0bdcb71682136a537b3ce1c564f02f686f1ee9e
(cherry picked from commit 0f8670ecebcf2af9c98b805c5e446ff073354d92)
Reviewed-on: https://gerrit.libreoffice.org/38704
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/forms/source/component/ComboBox.cxx
b/forms/source/component/ComboBox.cxx
index cc64d8bba73a..b5c43633077f 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -296,13 +296,14 @@ sal_Bool OComboBoxModel::convertFastPropertyValue(
void OComboBoxModel::describeFixedProperties( Sequence< Property >& _rProps )
const
{
-BEGIN_DESCRIBE_PROPERTIES( 6, OBoundControlModel )
+BEGIN_DESCRIBE_PROPERTIES( 7, OBoundControlModel )
DECL_PROP1(TABINDEX,sal_Int16, BOUND);
DECL_PROP1(LISTSOURCETYPE, ListSourceType, BOUND);
DECL_PROP1(LISTSOURCE, OUString,BOUND);
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);
END_DESCRIBE_PROPERTIES();
}
diff --git a/forms/source/component/ListBox.cxx
b/forms/source/component/ListBox.cxx
index a57322ed5ced..bfd531624d2c 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -484,7 +484,7 @@ namespace frm
void OListBoxModel::describeFixedProperties( Sequence< Property >& _rProps
) const
{
-BEGIN_DESCRIBE_PROPERTIES( 9, OBoundControlModel )
+BEGIN_DESCRIBE_PROPERTIES( 10, OBoundControlModel )
DECL_PROP1(TABINDEX,sal_Int16,
BOUND);
DECL_PROP2(BOUNDCOLUMN, sal_Int16,
BOUND, MAYBEVOID);
DECL_PROP1(LISTSOURCETYPE, ListSourceType,
BOUND);
@@ -494,6 +494,7 @@ namespace frm
DECL_PROP2(SELECT_VALUE,Any,
BOUND, TRANSIENT);
DECL_PROP1(DEFAULT_SELECT_SEQ, Sequence,
BOUND);
DECL_PROP1(STRINGITEMLIST, Sequence< OUString >,BOUND);
+DECL_PROP1(TYPEDITEMLIST, Sequence< Any >,BOUND);
END_DESCRIBE_PROPERTIES();
}
diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx
index 10f0caf31218..9fed981242e9 100644
--- a/forms/source/misc/property.cxx
+++ b/forms/source/misc/property.cxx
@@ -91,6 +91,7 @@ void PropertyInfoService::initialize()
EXPAND_PROP_INIT(TARGET_FRAME),
EXPAND_PROP_INIT(BUTTONTYPE),
EXPAND_PROP_INIT(STRINGITEMLIST),
+EXPAND_PROP_INIT(TYPEDITEMLIST),
EXPAND_PROP_INIT(DEFAULT_TEXT),
EXPAND_PROP_INIT(DEFAULT_STATE),
EXPAND_PROP_INIT(DEFAULT_DATE),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
