[Libreoffice-commits] .: starmath/source sw/source

[Thorsten Behrens]

 starmath/source/parse.cxx        |   12 ++++++------
 sw/source/core/except/errhdl.cxx |   16 +++++++++++++++-
 2 files changed, 21 insertions(+), 7 deletions(-)

New commits:
commit b773ab1d87d5f139d6835ba088ef96d8cf42c076
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Mar 18 22:55:14 2011 +0100

    Made dbgutil build work again
    
    A few member var renames, and put removed error.h macros into
    cxx directly (as the only client)

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index e73c546..ee27781 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1513,7 +1513,7 @@ void SmParser::Term()
                         FontAttribut();
 
                     // check if casting in following line is ok
-                    OSL_ENSURE(!NodeStack.Top()->IsVisible(), "Sm : Ooops...");
+                    OSL_ENSURE(!m_aNodeStack.Top()->IsVisible(), "Sm : Ooops...");
 
                     aArray[n] = (SmStructureNode *) m_aNodeStack.Pop();
                     n++;
@@ -1671,7 +1671,7 @@ void SmParser::Oper()
         case TOPER :
             NextToken();
 
-            OSL_ENSURE(CurToken.eType == TSPECIAL, "Sm: wrong token");
+            OSL_ENSURE(m_aCurToken.eType == TSPECIAL, "Sm: wrong token");
             pNode = new SmGlyphSpecialNode(m_aCurToken);
             break;
 
@@ -1844,7 +1844,7 @@ void SmParser::FontAttribut()
 
 void SmParser::Color()
 {
-    OSL_ENSURE(CurToken.eType == TCOLOR, "Sm : Ooops...");
+    OSL_ENSURE(m_aCurToken.eType == TCOLOR, "Sm : Ooops...");
 
     // last color rules, get that one
     SmToken  aToken;
@@ -1865,7 +1865,7 @@ void SmParser::Color()
 
 void SmParser::Font()
 {
-    OSL_ENSURE(CurToken.eType == TFONT, "Sm : Ooops...");
+    OSL_ENSURE(m_aCurToken.eType == TFONT, "Sm : Ooops...");
 
     // last font rules, get that one
     SmToken  aToken;
@@ -1908,7 +1908,7 @@ bool lcl_IsNumber(const UniString& rText)
 
 void SmParser::FontSize()
 {
-    OSL_ENSURE(CurToken.eType == TSIZE, "Sm : Ooops...");
+    OSL_ENSURE(m_aCurToken.eType == TSIZE, "Sm : Ooops...");
 
     sal_uInt16   Type;
     SmFontNode *pFontNode = new SmFontNode(m_aCurToken);
@@ -1977,7 +1977,7 @@ void SmParser::FontSize()
 
 void SmParser::Brace()
 {
-    OSL_ENSURE(CurToken.eType == TLEFT  ||  TokenInGroup(TGLBRACES),
+    OSL_ENSURE(m_aCurToken.eType == TLEFT  ||  TokenInGroup(TGLBRACES),
         "Sm: kein Klammer Ausdruck");
 
     SmStructureNode *pSNode  = new SmBraceNode(m_aCurToken);
diff --git a/sw/source/core/except/errhdl.cxx b/sw/source/core/except/errhdl.cxx
index ea3b5de..c42350a 100644
--- a/sw/source/core/except/errhdl.cxx
+++ b/sw/source/core/except/errhdl.cxx
@@ -38,12 +38,26 @@
 #include <vcl/svapp.hxx>
 #include <vcl/sound.hxx>
 #include <errhdl.hxx>
-#include <error.h>				// fuer die defines von ERR_SW6MSG_ ...
 
 #ifndef CVBREAK
 #define CVBREAK
 #endif
 
+// Error Codes.
+#define ERR_SWGBASE 25000
+
+#define ERR_VAR_IDX                            (ERR_SWGBASE+ 0)
+#define ERR_OUTOFSCOPE                         (ERR_SWGBASE+ 1)
+
+#define ERR_NUMLEVEL                           (ERR_SWGBASE+ 2)
+
+// Error Codes for TxtNode.
+#define ERR_NOHINTS                            (ERR_SWGBASE+ 3)
+
+// Strings to be queried are in COREDL.DLL from _START to _END.
+#define ERR_SWGMSG_START                       (ERR_VAR_IDX)
+#define ERR_SWGMSG_END                         (ERR_NOHINTS)
+
 sal_Bool bAssertFail = sal_False;			// ist gerade eine Assertbox oben ?
 sal_Bool bAssert = sal_False;				// sal_True, wenn mal ein ASSERT kam.