158766 avoid duplicating symbols in the catalog

1 files changed, 8 insertions, 20 deletions

diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 16461d97d6e1..6cc49595d821 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -432,7 +432,7 @@ SmMathConfig::SmMathConfig() :
     pFormat         = 0;
     pOther          = 0;
     pFontFormatList = 0;
-    pSymSetMgr      = 0;
+    pSymbolMgr      = 0;
 
     bIsOtherModified = bIsFormatModified = FALSE;
 }
@@ -444,7 +444,7 @@ SmMathConfig::~SmMathConfig()
     delete pFormat;
     delete pOther;
     delete pFontFormatList;
-    delete pSymSetMgr;
+    delete pSymbolMgr;
 }
 
 
@@ -557,14 +557,14 @@ void SmMathConfig::ReadSymbol( SmSym &rSymbol,
 }
 
 
-SmSymSetManager & SmMathConfig::GetSymSetManager()
+SmSymbolManager & SmMathConfig::GetSymbolManager()
 {
-    if (!pSymSetMgr)
+    if (!pSymbolMgr)
     {
-        pSymSetMgr = new SmSymSetManager;
-        pSymSetMgr->Load();
+        pSymbolMgr = new SmSymbolManager;
+        pSymbolMgr->Load();
     }
-    return *pSymSetMgr;
+    return *pSymbolMgr;
 }
 
 
@@ -581,18 +581,6 @@ void SmMathConfig::Save()
 }
 
 
-USHORT SmMathConfig::GetSymbolCount() const
-{
-    return ((SmMathConfig *) this)->GetSymSetManager().GetSymbolCount();
-}
-
-
-const SmSym * SmMathConfig::GetSymbol( USHORT nIndex ) const
-{
-    return ((SmMathConfig *) this)->GetSymSetManager().GetSymbolByPos( nIndex );
-}
-
-
 void SmMathConfig::GetSymbols( std::vector< SmSym > &rSymbols ) const
 {
     Sequence< OUString > aNodes( ((SmMathConfig*) this)->GetNodeNames( A2OU( SYMBOL_LIST ) ) );
@@ -643,7 +631,7 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols )
         // Set
         pVal->Name  = aNodeNameDelim;
         pVal->Name += *pName++;
-        OUString aTmp( rSymbol.GetSetName() );
+        OUString aTmp( rSymbol.GetSymbolSetName() );
         if (rSymbol.IsPredefined())
             aTmp = GetExportSymbolSetName( aTmp );
         pVal->Value <<= aTmp;