#91580# convert to/from localized symbol names for XML annotation import/export

3 files changed, 52 insertions, 21 deletions

diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 6ed13a631536..9ae0d5b37075 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: parse.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: tl $ $Date: 2001-04-19 11:38:04 $
+ *  last change: $Author: tl $ $Date: 2001-08-28 07:46:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,6 +78,7 @@
 #include "types.hxx"
 
 class SmNode;
+class SmDocShell;
 
 
 // TokenGroups
@@ -200,16 +201,18 @@ DECLARE_LIST(SmErrDescList, SmErrorDesc *);
 
 class SmParser
 {
-    String        BufferString;
-    SmToken       CurToken;
-    SmNodeStack   NodeStack;
-    SmErrDescList ErrDescList;
-    int           CurError;
-    xub_StrLen    BufferIndex,
-                  nTokenIndex;
-    USHORT        Row,
-                  ColOff;
-    BOOL          bConvert40To50;
+    String          BufferString;
+    SmToken         CurToken;
+    SmNodeStack     NodeStack;
+    SmErrDescList   ErrDescList;
+    int             CurError;
+    xub_StrLen      BufferIndex,
+                    nTokenIndex;
+    USHORT          Row,
+                    ColOff;
+    BOOL            bConvert40To50,
+                    bImportSymNames,
+                    bExportSymNames;
 
     // declare copy-constructor and assignment-operator private
     SmParser(const SmParser &);
@@ -220,6 +223,7 @@ protected:
     void            NextToken();
     xub_StrLen      GetTokenIndex() const   { return nTokenIndex; }
     void            Insert(const String &rText, USHORT nPos);
+    void            Replace( USHORT nPos, USHORT nLen, const String &rText );
 
     inline BOOL     TokenInGroup(ULONG nGroup);
 
@@ -268,6 +272,11 @@ public:
     BOOL         IsConvert40To50() const         { return bConvert40To50; }
     void         SetConvert40To50(BOOL bConvert) { bConvert40To50 = bConvert; }
 
+    BOOL         IsImportSymbolNames() const        { return bImportSymNames; }
+    void         SetImportSymbolNames(BOOL bVal)    { bImportSymNames = bVal; }
+    BOOL         IsExportSymbolNames() const        { return bExportSymNames; }
+    void         SetExportSymbolNames(BOOL bVal)    { bExportSymNames = bVal; }
+
     USHORT       AddError(SmParseError Type, SmNode *pNode);
 
     const SmErrorDesc * NextError();
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 62b65dbfe4c4..76d82e599913 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: smmod.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: tl $ $Date: 2001-08-02 15:32:10 $
+ *  last change: $Author: tl $ $Date: 2001-08-28 07:46:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,9 +109,13 @@ public:
 
     const ResStringArray& GetUiSymbolNamesArray() const     { return aUiSymbolNamesAry; }
     const ResStringArray& GetExportSymbolNamesArray() const { return aExportSymbolNamesAry; }
+    const String          GetUiSymbolName( const String &rExportName ) const;
+    const String          GetExportSymbolName( const String &rUiName ) const;
 
     const ResStringArray& GetUiSymbolSetNamesArray() const     { return aUiSymbolSetNamesAry; }
     const ResStringArray& GetExportSymbolSetNamesArray() const { return aExportSymbolSetNamesAry; }
+    const String          GetUiSymbolSetName( const String &rExportName ) const;
+    const String          GetExportSymbolSetName( const String &rUiName ) const;
 
     const ResStringArray& GetFrench50NamesArray() const     { return aFrench50NamesAry; }
     const ResStringArray& GetFrench60NamesArray() const     { return aFrench60NamesAry; }
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 100ac624bd91..0a466b29b147 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: symbol.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: tl $ $Date: 2001-06-28 07:19:17 $
+ *  last change: $Author: tl $ $Date: 2001-08-28 07:46:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,7 +86,9 @@
 #ifndef UTILITY_HXX
 #include "utility.hxx"
 #endif
-
+#ifndef _SMMOD_HXX
+#include <smmod.hxx>
+#endif
 
 #define SS_ATTR_ACCESS      0x80
 
@@ -95,11 +97,27 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-String GetExportSymbolName( const String &rUiSymbolName );
-String GetUiSymbolName( const String &rExportSymbolName );
+inline const String GetExportSymbolName( const String &rUiSymbolName )
+{
+    return SM_MOD1()->GetLocSymbolData().GetExportSymbolName( rUiSymbolName );
+}
+
+
+inline const String GetUiSymbolName( const String &rExportSymbolName )
+{
+    return SM_MOD1()->GetLocSymbolData().GetUiSymbolName( rExportSymbolName );
+}
+
+inline const String GetExportSymbolSetName( const String &rUiSymbolSetName )
+{
+    return SM_MOD1()->GetLocSymbolData().GetExportSymbolSetName( rUiSymbolSetName );
+}
 
-String GetExportSymbolSetName( const String &rUiSymbolSetName );
-String GetUiSymbolSetName( const String &rExportSymbolSetName );
+
+inline const String GetUiSymbolSetName( const String &rExportSymbolSetName )
+{
+    return SM_MOD1()->GetLocSymbolData().GetUiSymbolSetName( rExportSymbolSetName );
+}
 
 ////////////////////////////////////////////////////////////////////////////////