CWS-TOOLING: integrate CWS tl83_OOO330

3 files changed, 22 insertions, 17 deletions

diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx
index f632131d834f..4d13ea48185e 100644..100755
--- a/starmath/inc/format.hxx
+++ b/starmath/inc/format.hxx
@@ -109,6 +109,7 @@ class SmFormat : public SfxBroadcaster
     USHORT      vSize[SIZ_END + 1];
     USHORT      vDist[DIS_END + 1];
     SmHorAlign  eHorAlign;
+    INT16       nGreekCharStyle;
     BOOL        bIsTextmode,
                 bScaleNormalBrackets;
 
@@ -138,6 +139,9 @@ public:
     BOOL            IsTextmode() const     { return bIsTextmode; }
     void            SetTextmode(BOOL bVal) { bIsTextmode = bVal; }
 
+    INT16           GetGreekCharStyle() const     { return nGreekCharStyle; }
+    void            SetGreekCharStyle(INT16 nVal) { nGreekCharStyle = nVal; }
+
     BOOL            IsScaleNormalBrackets() const     { return bScaleNormalBrackets; }
     void            SetScaleNormalBrackets(BOOL bVal) { bScaleNormalBrackets = bVal; }
 
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 6ef89ea5ec1b..92c9d4621292 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -311,19 +311,10 @@ class SmTextNode : public SmVisibleNode
     USHORT      nFontDesc;
 
 protected:
-    SmTextNode(SmNodeType eNodeType, const SmToken &rNodeToken, USHORT nFontDescP)
-    :   SmVisibleNode(eNodeType, rNodeToken)
-    {
-        nFontDesc = nFontDescP;
-    }
+    SmTextNode(SmNodeType eNodeType, const SmToken &rNodeToken, USHORT nFontDescP );
 
 public:
-    SmTextNode(const SmToken &rNodeToken, USHORT nFontDescP)
-    :   SmVisibleNode(NTEXT, rNodeToken)
-    {
-        nFontDesc = nFontDescP;
-    }
-
+    SmTextNode(const SmToken &rNodeToken, USHORT nFontDescP );
 
     USHORT              GetFontDesc() const { return nFontDesc; }
     void                SetText(const XubString &rText) { aText = rText; }
@@ -347,15 +338,13 @@ public:
 
 class SmSpecialNode : public SmTextNode
 {
+    bool    bIsFromGreekSymbolSet;
+
 protected:
-    SmSpecialNode(SmNodeType eNodeType, const SmToken &rNodeToken, USHORT _nFontDesc)
-    :   SmTextNode(eNodeType, rNodeToken, _nFontDesc)
-    {}
+    SmSpecialNode(SmNodeType eNodeType, const SmToken &rNodeToken, USHORT _nFontDesc);
 
 public:
-    SmSpecialNode(const SmToken &rNodeToken)
-    :   SmTextNode(NSPECIAL, rNodeToken, FNT_MATH)  //! default Font nicht immer richtig
-    {}
+    SmSpecialNode(const SmToken &rNodeToken);
 
     virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
     virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 503859485095..51e8ad0b8642 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -38,7 +38,10 @@
 #include <map>
 #include <vector>
 #include <set>
+#include <functional>
+#include <algorithm>
 
+#include "unomodel.hxx"
 #include "utility.hxx"
 #include "smmod.hxx"
 
@@ -133,6 +136,15 @@ typedef std::map< String, SmSym, lt_String >    SymbolMap_t;
 // vector of pointers to the actual symbols in the above container
 typedef std::vector< const SmSym * >            SymbolPtrVec_t;
 
+struct lt_SmSymPtr : public std::binary_function< const SmSym *, const SmSym *, bool >
+{
+    bool operator() ( const SmSym *pSym1, const SmSym *pSym2 )
+    {
+        return pSym1->GetCharacter() < pSym2->GetCharacter();
+    }
+};
+
+
 class SmSymbolManager : public SfxListener
 {
     SymbolMap_t         m_aSymbols;