diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-14 20:44:06 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-14 21:28:07 +0100 |
| commit | 459c8131ac6951acaa7f65646ca1c13f671b4012 (patch) | |
| tree | 2f8e99bc350e84c49fb9bd957596cbe34634547d /forms | |
| parent | 058324532ea07f3388e8d2a893fec590b8e8add8 (diff) | |
bool improvements
Change-Id: Iba5bf2d2207f80098cb43ff8ce290eef741d21c9
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/runtime/formoperations.cxx | 2 | ||||
| -rw-r--r-- | forms/source/xforms/computedexpression.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 083844e7f215..3e0d8d485837 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -132,7 +132,7 @@ namespace frm ,m_bActiveControlModified( false ) ,m_bConstructed( false ) #ifdef DBG_UTIL - ,m_nMethodNestingLevel( false ) + ,m_nMethodNestingLevel( 0 ) #endif { } diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx index 306dbd98bb12..809f80fac1d1 100644 --- a/forms/source/xforms/computedexpression.cxx +++ b/forms/source/xforms/computedexpression.cxx @@ -98,11 +98,11 @@ bool ComputedExpression::_checkExpression( const sal_Char* pExpression ) const sal_Int32 nLength = msExpression.getLength(); sal_Int32 nStart = 0; sal_Int32 nEnd = nLength; - int nSearch = aTextSearch.SearchForward( msExpression, &nStart, &nEnd ); + bool nSearch = aTextSearch.SearchForward( msExpression, &nStart, &nEnd ); // our expression is static only if 1) we found our regexp, and 2) // the regexp goes from beginning to end. - return ( nLength == 0 || nSearch != 0 ) + return ( nLength == 0 || nSearch ) && ( nStart == 0 && nEnd == nLength ); } |