reportdesign/source/core/inc/conditionupdater.hxx | 2 +- reportdesign/source/core/misc/conditionupdater.cxx | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-)
New commits: commit c50cd9678df2067b33f6c1d98600223a339b3225 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Mon Aug 13 13:40:32 2018 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Aug 14 11:44:51 2018 +0200 loplugin:returnconstant in reportdesign Change-Id: I3a198faad8f4dff607b1a7e1a06afda0225b4f9a Reviewed-on: https://gerrit.libreoffice.org/58964 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/reportdesign/source/core/inc/conditionupdater.hxx b/reportdesign/source/core/inc/conditionupdater.hxx index fd626a9d5a32..8102f67661f2 100644 --- a/reportdesign/source/core/inc/conditionupdater.hxx +++ b/reportdesign/source/core/inc/conditionupdater.hxx @@ -42,7 +42,7 @@ namespace rptui private: /// does late initializations, return whether or not successful - bool impl_lateInit_nothrow(); + void impl_lateInit_nothrow(); void impl_adjustFormatConditions_nothrow( const css::uno::Reference< css::report::XReportControlModel >& _rxRptControlModel, diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx index ded43a57cdc0..59714ac22556 100644 --- a/reportdesign/source/core/misc/conditionupdater.cxx +++ b/reportdesign/source/core/misc/conditionupdater.cxx @@ -52,8 +52,7 @@ namespace rptui void ConditionUpdater::notifyPropertyChange( const PropertyChangeEvent& _rEvent ) { - if ( !impl_lateInit_nothrow() ) - return; + impl_lateInit_nothrow(); Reference< XReportControlModel > xRptControlModel( _rEvent.Source, UNO_QUERY ); if ( xRptControlModel.is() && _rEvent.PropertyName == "DataField" ) @@ -66,13 +65,12 @@ namespace rptui } - bool ConditionUpdater::impl_lateInit_nothrow() + void ConditionUpdater::impl_lateInit_nothrow() { if ( !m_aConditionalExpressions.empty() ) - return true; + return; ConditionalExpressionFactory::getKnownConditionalExpressions( m_aConditionalExpressions ); - return true; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits