summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2022-08-24 10:49:47 +0200
committerCaolán McNamara <caolanm@redhat.com>2022-08-26 11:42:48 +0200
commit0e12ed1c39531566d080c9fa1e27e9e2659addd2 (patch)
treef13c75ae67d8c1b1d3eb9f05298c93ded775e1a8
parenttdf#150407 do not use loext in save in ODF strict (diff)
downloadcore-0e12ed1c39531566d080c9fa1e27e9e2659addd2.tar.gz
core-0e12ed1c39531566d080c9fa1e27e9e2659addd2.zip
tdf#150577: Revert "Micro-optim in FormController::approveRowChange"
This reverts commit e005ab5d40d358adb75a64e140d46f4bf605647d. XColumn::wasNull is documented [1] to require a previous call to a get* method. The reverted change internally queried the *previous* column's wasNull. [1] https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1sdb_1_1XColumn.html#a0d482c20564f9119052b1962f830190e Change-Id: I3e988358764fa6935e8eb3e66340a0869c157d02 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138550 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 59f30175bfc557aa7c752ab0b45af9d34215d4dc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138822 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--svx/source/form/formcontroller.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 50e0d4f592d9..d5687a15ba03 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3647,7 +3647,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent
}
// TODO: in case of binary fields, this "getString" below is extremely expensive
- if ( !rColInfo.xColumn->wasNull() || !rColInfo.xColumn->getString().isEmpty() )
+ if ( !rColInfo.xColumn->getString().isEmpty() || !rColInfo.xColumn->wasNull() )
continue;
OUString sMessage( SvxResId( RID_ERR_FIELDREQUIRED ) );