starmath/inc/symbol.hxx | 18 ------------------
starmath/source/cfgitem.cxx | 7 ++++---
starmath/source/node.cxx | 2 +-
3 files changed, 5 insertions(+), 22 deletions(-)
New commits:
commit 1048fd03bae1432af19a794312787d6e4627f3ed
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Sun Mar 20 01:42:42 2016 +0900
starmath: Drop inline wrapper functions
Use corresponding static functions instead.
Change-Id: I362744878d9c88de858cb957106c7a70a45122bb
Reviewed-on: https://gerrit.libreoffice.org/23369
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 3b23e92..225cb47 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 f4faecc..1109c07 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 855bb70..62dd1f5 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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
