diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2016-03-20 01:42:42 +0900 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2016-03-24 11:56:47 +0000 |
| commit | 1048fd03bae1432af19a794312787d6e4627f3ed (patch) | |
| tree | a5eba95b63162e0bf1237076cf450bf1df573f39 /starmath | |
| parent | 641c40b32aaea89add1c7acd3e17c949592c582a (diff) | |
starmath: Drop inline wrapper functions
Use corresponding static functions instead.
Change-Id: I362744878d9c88de858cb957106c7a70a45122bb
Reviewed-on: https://gerrit.libreoffice.org/23369
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/symbol.hxx | 18 | ||||
| -rw-r--r-- | starmath/source/cfgitem.cxx | 7 | ||||
| -rw-r--r-- | starmath/source/node.cxx | 2 |
3 files changed, 5 insertions, 22 deletions
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx index 3b23e92ea581..225cb47907da 100644 --- a/starmath/inc/symbol.hxx +++ b/starmath/inc/symbol.hxx @@ -34,24 +34,6 @@ #define SYMBOL_NONE 0xFFFF - -inline const OUString GetUiSymbolName( const OUString &rExportSymbolName ) -{ - return SmLocalizedSymbolData::GetUiSymbolName( rExportSymbolName ); -} - -inline const OUString GetExportSymbolSetName( const OUString &rUiSymbolSetName ) -{ - return SmLocalizedSymbolData::GetExportSymbolSetName( rUiSymbolSetName ); -} - - -inline const OUString GetUiSymbolSetName( const OUString &rExportSymbolSetName ) -{ - return SmLocalizedSymbolData::GetUiSymbolSetName( rExportSymbolSetName ); -} - - class SmSym { private: diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index f4faecc409f2..1109c07fe00b 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -33,6 +33,7 @@ #include "starmath.hrc" #include "smdll.hxx" +#include "smmod.hxx" #include "format.hxx" using namespace com::sun::star::uno; @@ -435,11 +436,11 @@ void SmMathConfig::ReadSymbol( SmSym &rSymbol, if (bPredefined) { OUString aTmp; - aTmp = GetUiSymbolName( rSymbolName ); + aTmp = SmLocalizedSymbolData::GetUiSymbolName( rSymbolName ); OSL_ENSURE( !aTmp.isEmpty(), "localized symbol-name not found" ); if (!aTmp.isEmpty()) aUiName = aTmp; - aTmp = GetUiSymbolSetName( aSet ); + aTmp = SmLocalizedSymbolData::GetUiSymbolSetName( aSet ); OSL_ENSURE( !aTmp.isEmpty(), "localized symbolset-name not found" ); if (!aTmp.isEmpty()) aUiSetName = aTmp; @@ -533,7 +534,7 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols ) pVal->Name += *pName++; OUString aTmp( rSymbol.GetSymbolSetName() ); if (rSymbol.IsPredefined()) - aTmp = GetExportSymbolSetName( aTmp ); + aTmp = SmLocalizedSymbolData::GetExportSymbolSetName( aTmp ); pVal->Value <<= aTmp; pVal++; // Predefined diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index 855bb703f3ad..62dd1f5894f7 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -2659,7 +2659,7 @@ static bool lcl_IsFromGreekSymbolSet( const OUString &rTokenText ) { OUString aName( rTokenText.copy(1) ); SmSym *pSymbol = SM_MOD()->GetSymbolManager().GetSymbolByName( aName ); - if (pSymbol && GetExportSymbolSetName(pSymbol->GetSymbolSetName()) == "Greek") + if (pSymbol && SmLocalizedSymbolData::GetExportSymbolSetName(pSymbol->GetSymbolSetName()) == "Greek") bRes = true; } |