diff options
| -rw-r--r-- | formula/source/ui/dlg/FormulaHelper.cxx | 12 | ||||
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 2 | ||||
| -rw-r--r-- | include/formula/formulahelper.hxx | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index 58d474de8015..764cdba9d8f5 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -61,14 +61,14 @@ namespace formula #define FUNC_NOTFOUND -1 FormulaHelper::FormulaHelper(const IFunctionManager* _pFunctionManager) - :m_pFunctionManager(_pFunctionManager) + :m_rCharClass(m_aSysLocale.GetCharClass()) + ,m_pFunctionManager(_pFunctionManager) ,open(_pFunctionManager->getSingleToken(IFunctionManager::eOk)) ,close(_pFunctionManager->getSingleToken(IFunctionManager::eClose)) ,sep(_pFunctionManager->getSingleToken(IFunctionManager::eSep)) ,arrayOpen(_pFunctionManager->getSingleToken(IFunctionManager::eArrayOpen)) ,arrayClose(_pFunctionManager->getSingleToken(IFunctionManager::eArrayClose)) { - m_pCharClass = &m_aSysLocale.GetCharClass(); } sal_Int32 FormulaHelper::GetCategoryCount() const @@ -184,9 +184,9 @@ void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs, } -static bool IsFormulaText( const CharClass* _pCharClass,const OUString& rStr, sal_Int32 nPos ) +static bool IsFormulaText(const CharClass& rCharClass, const OUString& rStr, sal_Int32 nPos) { - if( _pCharClass->isLetterNumeric( rStr, nPos ) ) + if( rCharClass.isLetterNumeric( rStr, nPos ) ) return true; else { // In internationalized versions function names may contain a dot @@ -260,7 +260,7 @@ sal_Int32 FormulaHelper::GetFunctionStart( const OUString& rFormula, { nFStart = nParPos-1; - while ( (nFStart > 0) && IsFormulaText(m_pCharClass, rFormula, nFStart )) + while ( (nFStart > 0) && IsFormulaText(m_rCharClass, rFormula, nFStart )) nFStart--; } @@ -268,7 +268,7 @@ sal_Int32 FormulaHelper::GetFunctionStart( const OUString& rFormula, if ( bFound ) { - if ( IsFormulaText( m_pCharClass,rFormula, nFStart ) ) + if ( IsFormulaText( m_rCharClass, rFormula, nFStart ) ) { // Function found if ( pFuncName ) diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index c73543603158..139c9ab4795c 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -375,7 +375,7 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos) const sal_Unicode sep = m_pHelper->getFunctionManager()->getSingleToken(IFunctionManager::eSep); sal_Int32 nFuncPos = SAL_MAX_INT32; - OUString aFormString = m_aFormulaHelper.GetCharClass()->uppercase(m_xMEdit->get_text()); + OUString aFormString = m_aFormulaHelper.GetCharClass().uppercase(m_xMEdit->get_text()); const uno::Reference< sheet::XFormulaParser > xParser(m_pHelper->getFormulaParser()); const table::CellAddress aRefPos(m_pHelper->getReferencePosition()); diff --git a/include/formula/formulahelper.hxx b/include/formula/formulahelper.hxx index e6173eb65e53..3b6cb88a67d3 100644 --- a/include/formula/formulahelper.hxx +++ b/include/formula/formulahelper.hxx @@ -38,7 +38,7 @@ namespace formula class FORMULA_DLLPUBLIC FormulaHelper { SvtSysLocale m_aSysLocale; - const CharClass* m_pCharClass; + const CharClass& m_rCharClass; const IFunctionManager* m_pFunctionManager; const sal_Unicode open; const sal_Unicode close; @@ -48,7 +48,7 @@ namespace formula public: FormulaHelper(const IFunctionManager* _pFunctionManager); - const CharClass* GetCharClass() const { return m_pCharClass; } + const CharClass& GetCharClass() const { return m_rCharClass; } sal_Int32 GetCategoryCount() const; |