From aa4dc893521291ace4828dc6ac390fab2b5ac6a7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 11 Jan 2016 13:13:33 +0200 Subject: loplugin:unusedmethods unused return value in forms Change-Id: I9da3e72ca12e040e7fb5bea7ccaa071edfd34f27 --- forms/source/component/FormComponent.cxx | 4 ++-- forms/source/component/GroupManager.cxx | 5 ----- forms/source/component/GroupManager.hxx | 2 -- forms/source/inc/FormComponent.hxx | 2 +- forms/source/runtime/formoperations.cxx | 16 ++++++---------- forms/source/runtime/formoperations.hxx | 4 ++-- forms/source/xforms/pathexpression.cxx | 8 +++----- forms/source/xforms/pathexpression.hxx | 2 +- 8 files changed, 15 insertions(+), 28 deletions(-) (limited to 'forms') diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 544949da8fd5..7d73658a3536 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -1924,7 +1924,7 @@ void OBoundControlModel::resetField() m_nFieldType = DataType::OTHER; } -bool OBoundControlModel::connectToField(const Reference& rForm) +void OBoundControlModel::connectToField(const Reference& rForm) { OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::connectToField: invalid call (have an external binding)!" ); // if there's a connection to the database @@ -1992,7 +1992,7 @@ bool OBoundControlModel::connectToField(const Reference& rForm) } } - return hasField(); + hasField(); } void OBoundControlModel::initFromField( const Reference< XRowSet >& _rxRowSet ) diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx index d0a33abf4631..46cc2ca84100 100644 --- a/forms/source/component/GroupManager.cxx +++ b/forms/source/component/GroupManager.cxx @@ -180,11 +180,6 @@ void OGroup::RemoveComponent( const Reference& rxElement ) } } -bool OGroup::operator==( const OGroup& rGroup ) const -{ - return m_aGroupName.equals(rGroup.GetGroupName()); -} - Sequence< Reference > OGroup::GetControlModels() const { sal_Int32 nLen = m_aCompArray.size(); diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx index d7abf144c760..a9e3d8efe0a6 100644 --- a/forms/source/component/GroupManager.hxx +++ b/forms/source/component/GroupManager.hxx @@ -145,8 +145,6 @@ public: explicit OGroup(const OUString& rGroupName); virtual ~OGroup(); - bool operator==( const OGroup& rGroup ) const; - OUString GetGroupName() const { return m_aGroupName; } css::uno::Sequence< css::uno::Reference< css::awt::XControlModel> > GetControlModels() const; diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 40c53097846c..d15b1217eeac 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -1106,7 +1106,7 @@ protected: void initFromField( const css::uno::Reference< css::sdbc::XRowSet>& _rxForm ); private: - bool connectToField( const css::uno::Reference< css::sdbc::XRowSet>& _rxForm ); + void connectToField( const css::uno::Reference< css::sdbc::XRowSet>& _rxForm ); void resetField(); /** does a new validation of the control value diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index bdd507f05c7d..33a2fa1c8720 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -1448,17 +1448,17 @@ namespace frm } - bool FormOperations::impl_moveLeft_throw( ) const + void FormOperations::impl_moveLeft_throw( ) const { OSL_PRECOND( impl_hasCursor_nothrow(), "FormOperations::impl_moveLeft_throw: no cursor!" ); if ( !impl_hasCursor_nothrow() ) - return false; + return; sal_Bool bRecordInserted = sal_False; bool bSuccess = impl_commitCurrentRecord_throw( &bRecordInserted ); if ( !bSuccess ) - return false; + return; if ( bRecordInserted ) { @@ -1479,22 +1479,20 @@ namespace frm else m_xCursor->previous(); } - - return true; } - bool FormOperations::impl_moveRight_throw( ) const + void FormOperations::impl_moveRight_throw( ) const { OSL_PRECOND( impl_hasCursor_nothrow(), "FormOperations::impl_moveRight_throw: no cursor!" ); if ( !impl_hasCursor_nothrow() ) - return false; + return; sal_Bool bRecordInserted = sal_False; bool bSuccess = impl_commitCurrentRecord_throw( &bRecordInserted ); if ( !bSuccess ) - return false; + return; if ( bRecordInserted ) { @@ -1508,8 +1506,6 @@ namespace frm else (void)m_xCursor->next(); } - - return true; } diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index 08ee8667b52e..e01bc881817a 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -254,7 +254,7 @@ namespace frm @precond canMoveLeft() */ - bool impl_moveLeft_throw() const; + void impl_moveLeft_throw() const; /** moves our cursor one position to the right, caring for different possible cursor states. @@ -264,7 +264,7 @@ namespace frm @precond canMoveRight() */ - bool impl_moveRight_throw( ) const; + void impl_moveRight_throw( ) const; /** impl-version of commitCurrentRecord, which can be called without caring for an output parameter, and within const-contexts diff --git a/forms/source/xforms/pathexpression.cxx b/forms/source/xforms/pathexpression.cxx index c8273224830b..b2049ee044c4 100644 --- a/forms/source/xforms/pathexpression.cxx +++ b/forms/source/xforms/pathexpression.cxx @@ -95,14 +95,14 @@ const OUString PathExpression::_getExpressionForEvaluation() const return sExpr; } -bool PathExpression::evaluate( const EvaluationContext& rContext ) +void PathExpression::evaluate( const EvaluationContext& rContext ) { // for simple expression we don't need to re-bind (if we were bound before) // (we will evaluate empty expressions, since they are interpreted as ".") if( mxResult.is() && isSimpleExpression() ) - return true; + return; - bool bResult = _evaluate( rContext, _getExpressionForEvaluation() ); + _evaluate( rContext, _getExpressionForEvaluation() ); // clear old result, and copy new maNodes.clear(); @@ -115,8 +115,6 @@ bool PathExpression::evaluate( const EvaluationContext& rContext ) for( sal_Int32 n = 0; n < nLength; n++ ) maNodes.push_back( xNodeList->item( n ) ); } - - return bResult; } diff --git a/forms/source/xforms/pathexpression.hxx b/forms/source/xforms/pathexpression.hxx index 38410f24f0d8..3721ca7845ed 100644 --- a/forms/source/xforms/pathexpression.hxx +++ b/forms/source/xforms/pathexpression.hxx @@ -65,7 +65,7 @@ public: /// evaluate the expression relative to the content node. - bool evaluate( const xforms::EvaluationContext& rContext ); + void evaluate( const xforms::EvaluationContext& rContext ); // get the result of this expression as node/node list/... -- cgit