diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-22 14:36:56 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-22 14:18:25 +0100 |
commit | cbadc090a273a1d07d7b917fe0317d5450067662 (patch) | |
tree | 52fbd1212960af3c12d825f8b4cdf0f9877c79a0 /reportdesign/source | |
parent | 0970b8b652835001076d14138a54b4add1b93a93 (diff) |
inline some construction methods
only called from one constructor
Change-Id: I082cf3b459c936b79a6df695fffac5e3cf43705b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87186
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign/source')
-rw-r--r-- | reportdesign/source/core/misc/reportformula.cxx | 56 |
1 files changed, 25 insertions, 31 deletions
diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx index 1f743afd765f..b035493e6e42 100644 --- a/reportdesign/source/core/misc/reportformula.cxx +++ b/reportdesign/source/core/misc/reportformula.cxx @@ -38,7 +38,31 @@ namespace rptui ReportFormula::ReportFormula( const OUString& _rFormula ) :m_eType( Invalid ) { - impl_construct( _rFormula ); + m_sCompleteFormula = _rFormula; + + // is it an ordinary expression? + if ( m_sCompleteFormula.startsWith( sExpressionPrefix, &m_sUndecoratedContent ) ) + { + m_eType = Expression; + return; + } + + /// does it refer to a field? + if ( m_sCompleteFormula.startsWith( sFieldPrefix ) ) + { + sal_Int32 nPrefixLen = strlen(sFieldPrefix); + if ( ( m_sCompleteFormula.getLength() >= nPrefixLen + 2 ) + && ( m_sCompleteFormula[ nPrefixLen ] == '[' ) + && ( m_sCompleteFormula[ m_sCompleteFormula.getLength() - 1 ] == ']' ) + ) + { + m_eType = Field; + m_sUndecoratedContent = m_sCompleteFormula.copy( nPrefixLen + 1, m_sCompleteFormula.getLength() - nPrefixLen - 2 ); + return; + } + } + + m_eType = Invalid; } @@ -73,36 +97,6 @@ namespace rptui { } - void ReportFormula::impl_construct( const OUString& _rFormula ) - { - m_sCompleteFormula = _rFormula; - - // is it an ordinary expression? - if ( m_sCompleteFormula.startsWith( sExpressionPrefix, &m_sUndecoratedContent ) ) - { - m_eType = Expression; - return; - } - - /// does it refer to a field? - if ( m_sCompleteFormula.startsWith( sFieldPrefix ) ) - { - sal_Int32 nPrefixLen = strlen(sFieldPrefix); - if ( ( m_sCompleteFormula.getLength() >= nPrefixLen + 2 ) - && ( m_sCompleteFormula[ nPrefixLen ] == '[' ) - && ( m_sCompleteFormula[ m_sCompleteFormula.getLength() - 1 ] == ']' ) - ) - { - m_eType = Field; - m_sUndecoratedContent = m_sCompleteFormula.copy( nPrefixLen + 1, m_sCompleteFormula.getLength() - nPrefixLen - 2 ); - return; - } - } - - m_eType = Invalid; - } - - OUString ReportFormula::getBracketedFieldOrExpression() const { bool bIsField = ( getType() == Field ); |