cws tl82: #i74049# math symbols should be able to handle 20 bit Unicode characters (surrogates)

3 files changed, 6 insertions, 12 deletions

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 75aee6fd2009..7724bc975d54 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -30,9 +30,7 @@
 #include <vcl/image.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 #include <vcl/image.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <vcl/combobox.hxx>
@@ -403,8 +401,8 @@ public:
     {
     }
 
-    void    SetChar(xub_Unicode aChar);
-    void    SetFont(const Font &rFont);
+    void    SetSymbol( const SmSym *pSym );
+    void    SetSymbol( sal_UCS4 cChar, const Font &rFont );
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 503859485095..a3f3cc3c4c0d 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -79,24 +79,24 @@ class SmSym
     String              m_aName;
     String              m_aExportName;
     String              m_aSetName;
-    sal_Unicode         m_cChar;
+    sal_UCS4            m_cChar;
     BOOL                m_bPredefined;
     BOOL                m_bDocSymbol;
 
 public:
     SmSym();
-    SmSym(const String& rName, const Font& rFont, sal_Unicode cChar,
+    SmSym(const String& rName, const Font& rFont, sal_UCS4 cChar,
           const String& rSet, BOOL bIsPredefined = FALSE);
     SmSym(const SmSym& rSymbol);
 
     SmSym&      operator = (const SmSym& rSymbol);
 
     const Font&     GetFace() const { return m_aFace; }
-    sal_Unicode     GetCharacter() const { return m_cChar; }
+    sal_UCS4        GetCharacter() const { return m_cChar; }
     const String&   GetName() const { return m_aName; }
 
     void            SetFace( const Font& rFont )        { m_aFace = rFont; }
-    void            SetCharacter( sal_Unicode cChar )   { m_cChar = cChar; }
+    void            SetCharacter( sal_UCS4 cChar )   { m_cChar = cChar; }
 
 //! since the symbol name is also used as key in the map it should not be possible to change the name
 //! because ten the key would not be the same as its supposed copy here
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index e7db51152e25..d01c894af592 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -42,10 +42,6 @@ class String;
 
 #define C2S(cChar) String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(cChar))
 
-/////////////////////////////////////////////////////////////////
-
-const ByteString    ExportString( const String& rString );
-const String        ImportString( const ByteString& rByteString );
 
 /////////////////////////////////////////////////////////////////