diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2018-09-06 20:52:26 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2018-09-07 07:01:36 +0200 |
| commit | dbb444e4ed7c19a11733ce8438bbb6546d42f852 (patch) | |
| tree | 96211e2629e33e90cad296819ba360a508bdd163 | |
| parent | e55a85228ddb6910cbc045bb2aa06149b6f749bc (diff) | |
tdf#75341: fix condition to approve row (form)
Considering rColInfo.nNullable != ColumnValue::NO_NULLS is ok to approve row
isn't sufficient in the case the field is "Input required" in form.
Change-Id: I27c57fe8ce5afac97eb0650f93703333c85f1421
Reviewed-on: https://gerrit.libreoffice.org/60109
Tested-by: Jenkins
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
| -rw-r--r-- | svx/source/form/formcontroller.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 8e4396a5440a..134b73d93782 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3723,8 +3723,6 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent for ( size_t col = 0; col < colCount; ++col ) { const ColumnInfo& rColInfo = m_pColumnInfoCache->getColumnInfo( col ); - if ( rColInfo.nNullable != ColumnValue::NO_NULLS ) - continue; if ( rColInfo.bAutoIncrement ) continue; @@ -3732,8 +3730,11 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent if ( rColInfo.bReadOnly ) continue; - if ( !rColInfo.xFirstControlWithInputRequired.is() && !rColInfo.xFirstGridWithInputRequiredColumn.is() ) + if ( !rColInfo.xFirstControlWithInputRequired.is() && !rColInfo.xFirstGridWithInputRequiredColumn.is() + && rColInfo.nNullable != ColumnValue::NO_NULLS ) + { continue; + } // TODO: in case of binary fields, this "getString" below is extremely expensive if ( !rColInfo.xColumn->getString().isEmpty() || !rColInfo.xColumn->wasNull() ) |