summaryrefslogtreecommitdiff
path: root/starmath/inc
diff options
context:
space:
mode:
authorJacek Wolszczak <shutdownrunner@gmail.com>2011-03-19 14:01:13 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-19 14:01:13 +0100
commitf9585d9dc148653afee9286b00595222effe3d9c (patch)
tree2417c3f1a22881d61f151557589f9b776bcaa115 /starmath/inc
parent1ade0128a0cec27fdc6106245839e14e8d968482 (diff)
REPLACE j_assert with OSL_
Diffstat (limited to 'starmath/inc')
-rw-r--r--starmath/inc/caret.hxx2
-rw-r--r--starmath/inc/node.hxx2
-rw-r--r--starmath/inc/visitors.hxx2
3 files changed, 2 insertions, 4 deletions
diff --git a/starmath/inc/caret.hxx b/starmath/inc/caret.hxx
index be40598982c7..c0bda175746b 100644
--- a/starmath/inc/caret.hxx
+++ b/starmath/inc/caret.hxx
@@ -188,7 +188,7 @@ public:
SmCaretPosGraphEntry* Add(SmCaretPos pos,
SmCaretPosGraphEntry* left = NULL,
SmCaretPosGraphEntry* right = NULL){
- j_assert(pos.Index >= 0, "Index shouldn't be -1!");
+ OSL_ENSURE(pos.Index >= 0, "Index shouldn't be -1!");
return Add(SmCaretPosGraphEntry(pos, left, right));
}
/** Get an iterator for this graph */
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 45589683c39f..c108016d75bb 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -34,8 +34,6 @@
#include <iostream>
#include <stdio.h>
-#define j_assert(cond, msg) DBG_ASSERT(cond, msg)
-
#include "parse.hxx"
#include "types.hxx"
#include "rect.hxx"
diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index 3dbe887cf53d..8960a24fa90a 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -176,7 +176,7 @@ public:
SmCaretPos2LineVisitor( OutputDevice *pDevice, SmCaretPos position ) {
pDev = pDevice;
pos = position;
- j_assert( position.IsValid( ), "Cannot draw invalid position!" );
+ OSL_ENSURE( position.IsValid( ), "Cannot draw invalid position!" );
pos.pSelectedNode->Accept( this );
}