#90029# french 50 <-> 60 symbol name conversion

3 files changed, 47 insertions, 10 deletions

diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 589489c92bf9..d3a6dbf5c175 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: document.hxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: jp $ $Date: 2001-07-05 10:52:21 $
+ *  last change: $Author: tl $ $Date: 2001-08-02 15:31:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -212,7 +212,9 @@ class SmDocShell : public SfxObjectShell, public SfxInPlaceObject,
 
     Printer            *GetPrt();
 
-    void                Convert40To50Txt();
+    void                Convert40To50Txt( String &rText );
+    void                Convert50To60Txt( String &rText );
+    void                Convert60To50Txt( String &rText );
 
     BOOL                IsFormulaArranged() const { return bIsFormulaArranged; }
     void                SetFormulaArranged(BOOL bVal) { bIsFormulaArranged = bVal; }
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 38257ad2b71d..62b65dbfe4c4 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: smmod.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2001-07-06 13:02:49 $
+ *  last change: $Author: tl $ $Date: 2001-08-02 15:32:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,6 +62,9 @@
 #ifndef _SMMOD_HXX
 #define _SMMOD_HXX
 
+#ifndef _SV_RESARY_HXX
+#include <tools/resary.hxx>
+#endif
 
 #ifndef _SMDLL_HXX
 #define _SM_DLL             // fuer SD_MOD()
@@ -89,11 +92,39 @@ class SmModule;
 class SmRectCache;
 class SvtSysLocale;
 
+/////////////////////////////////////////////////////////////////
+
+class SmLocalizedSymbolData : public Resource
+{
+    ResStringArray      aUiSymbolNamesAry;
+    ResStringArray      aExportSymbolNamesAry;
+    ResStringArray      aUiSymbolSetNamesAry;
+    ResStringArray      aExportSymbolSetNamesAry;
+    ResStringArray      aFrench50NamesAry;
+    ResStringArray      aFrench60NamesAry;
+
+public:
+    SmLocalizedSymbolData();
+    ~SmLocalizedSymbolData();
+
+    const ResStringArray& GetUiSymbolNamesArray() const     { return aUiSymbolNamesAry; }
+    const ResStringArray& GetExportSymbolNamesArray() const { return aExportSymbolNamesAry; }
+
+    const ResStringArray& GetUiSymbolSetNamesArray() const     { return aUiSymbolSetNamesAry; }
+    const ResStringArray& GetExportSymbolSetNamesArray() const { return aExportSymbolSetNamesAry; }
+
+    const ResStringArray& GetFrench50NamesArray() const     { return aFrench50NamesAry; }
+    const ResStringArray& GetFrench60NamesArray() const     { return aFrench60NamesAry; }
+};
+
+/////////////////////////////////////////////////////////////////
+
 class SmModule : public SmModuleDummy
 {
-    SmConfig            *pConfig;
-    SmRectCache         *pRectCache;
-    SvtSysLocale        *pSysLocale;
+    SmConfig                *pConfig;
+    SmLocalizedSymbolData   *pLocSymbolData;
+    SmRectCache             *pRectCache;
+    SvtSysLocale            *pSysLocale;
 
     virtual void FillStatusBar(StatusBar &rBar);
     void _CreateSysLocale() const;
@@ -111,6 +142,8 @@ public:
     SmConfig *          GetConfig();
     SmRectCache *       GetRectCache()     { return pRectCache; }
 
+    const SmLocalizedSymbolData &   GetLocSymbolData() const;
+
     void GetState(SfxItemSet&);
 
     const SvtSysLocale& GetSysLocale() const
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 6e3b5250c479..35024ce8e94b 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: starmath.hrc,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: cmc $ $Date: 2001-08-01 13:55:13 $
+ *  last change: $Author: tl $ $Date: 2001-08-02 15:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -459,6 +459,8 @@
 #define RID_LOCALIZED_SYMBOLSET_NAMES   (RID_APP_START + 3104)
 #define RID_UI_SYMBOLSET_NAMES          (RID_APP_START + 3105)
 #define RID_EXPORT_SYMBOLSET_NAMES      (RID_APP_START + 3106)
+#define RID_FRENCH_50_NAMES             (RID_APP_START + 3107)
+#define RID_FRENCH_60_NAMES             (RID_APP_START + 3108)
 
 #define HID_SMA_OPTIONSDIALOG           (HID_SMA_START + 1)
 #define HID_SMA_FONTDIALOG              (HID_SMA_START + 2)