summaryrefslogtreecommitdiff
path: root/basic/source/comp/exprnode.cxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-10-12 13:34:58 +0000
committerOliver Bolte <obo@openoffice.org>2006-10-12 13:34:58 +0000
commit259bca0645607916dee92f7c481981056c97f799 (patch)
treedde0b06226d4390490549cbb11f2fdcb51eb8139 /basic/source/comp/exprnode.cxx
parent2e22e23a87cb2940bb8d4cb8eb31f200f833c310 (diff)
INTEGRATION: CWS sb59 (1.14.22); FILE MERGED
2006/09/20 11:03:07 sb 1.14.22.2: Manually resolved merge conflict against 1.15 (SRC680m185). 2006/08/11 15:04:27 sb 1.14.22.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'basic/source/comp/exprnode.cxx')
-rw-r--r--basic/source/comp/exprnode.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index 81b93dfc1a05..f9f0afe2a8cd 100644
--- a/basic/source/comp/exprnode.cxx
+++ b/basic/source/comp/exprnode.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: exprnode.cxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: obo $ $Date: 2006-09-17 10:02:02 $
+ * last change: $Author: obo $ $Date: 2006-10-12 14:34:58 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,8 +36,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basic.hxx"
-#define _NTSDK // wg. HUGE_VAL MH
-#define HUGE_VAL HUGE
#include <math.h>
#include <rtl/math.hxx>