summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-04-24 18:34:24 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-04-24 18:34:24 +0000
commit5b0e3f7887374c6eb816646b75e50ab32cb3ca60 (patch)
treecac64329c0ffdfcaa1140baffc8e65e196a28f08
parente02a491f9234c1886998259f0848299408344263 (diff)
CWS-TOOLING: integrate CWS dba31m_DEV300
2009-04-08 21:06:02 +0200 fs r270660 : #i100956# hold the assigned events in the ModelImpl, not in the DatabaseDocument, so they survive the model being destroyed 2009-04-08 12:40:13 +0200 b_michaelsen r270635 : #i100928# Opening the Tools->Options->Improvement Program Tabpage on first start accidently activates Usage Tracking 2009-04-07 12:56:29 +0200 fs r270594 : #i100866# don't call into the StatusIndicator with our mutex locked 2009-04-07 10:31:02 +0200 fs r270581 : #i100866# impl_import_throw -> impl_import_nolck_throw 2009-04-06 22:53:10 +0200 fs r270575 : #i100866# some more mutex lock tweaking 2009-04-06 22:01:51 +0200 fs r270573 : #i100861# load the Show/Hide strings from the proper (an existing, in particular) resource 2009-04-06 12:43:16 +0200 fs r270537 : #i100866# notifyEvent: instantiate the ScriptDocument only when required. 2009-04-06 12:42:03 +0200 fs r270536 : #i100866# rework how and when it is determined whether the DBDoc or sub documents contain scripts/macros. In particular, cache this information in the ODatabaseDocument implementation, so that queryInterface does not need to lock the mutex 2009-04-03 10:21:02 +0200 oj r270465 : #i100789# surround uno call with try catch 2009-04-03 09:18:37 +0200 oj r270453 : #i100789# check token is not null
-rw-r--r--reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
index 26a454cab9aa..1a8d02d53b64 100644
--- a/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
+++ b/reportbuilder/java/com/sun/star/report/pentaho/SOFormulaParser.java
@@ -220,7 +220,7 @@ public final class SOFormulaParser extends ComponentBase
// error occured so all token must be bad
for (int i = 0; i < tokens.size(); i++)
{
- if ( !found && images.get(i).equals(ex.currentToken.image) )
+ if ( !found && ex.currentToken != null && images.get(i).equals(ex.currentToken.image) )
found = true;
if ( found )
{