diff options
author | Oliver Bolte <obo@openoffice.org> | 2009-03-05 07:09:20 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2009-03-05 07:09:20 +0000 |
commit | 4241c3a3762d5dd0df9e97b02f8b752a936187e1 (patch) | |
tree | a311930f8b449bf4836531e2e1b78501f8c76a6b | |
parent | CWS-TOOLING: integrate CWS ause099 (diff) | |
download | binfilter-4241c3a3762d5dd0df9e97b02f8b752a936187e1.tar.gz binfilter-4241c3a3762d5dd0df9e97b02f8b752a936187e1.zip |
CWS-TOOLING: integrate CWS cmcfixes54
2009-02-19 17:39:12 +0100 cmc r268301 : revert meant-to-be local-only changes in configure
2009-02-19 17:33:52 +0100 cmc r268300 : revert meant-to-be local-only change in readlicense_oo
2009-02-19 17:31:48 +0100 cmc r268299 : remove config_office dir from workspace, hopefully this doesn't screw things up
2009-02-05 17:38:47 +0100 cmc r267431 : #i98367# snprintf needs stdio.h on gcc4.4
2009-01-27 10:51:54 +0100 cmc r266964 : CWS-TOOLING: rebase CWS cmcfixes54 to trunk@266944 (milestone: DEV300:m40)
2009-01-23 10:05:33 +0100 cmc r266774 : #i98389# fix t602 filter warnings
2009-01-22 16:37:57 +0100 cmc r266740 : #i98367# revert limits.h as its going in elsewhere
2009-01-22 16:36:45 +0100 cmc r266739 : #i98367# remove easy warnings
2009-01-22 16:31:49 +0100 cmc r266738 : #i98366# merge in basic fix of #i96087# to bf_basic
2009-01-22 14:50:24 +0100 cmc r266716 : #i98288# some versions of neon report DAV:Collection instead of Collection
-rw-r--r-- | binfilter/bf_basic/source/comp/scanner.cxx | 2 | ||||
-rw-r--r-- | binfilter/bf_basic/source/sbx/sbxexec.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/binfilter/bf_basic/source/comp/scanner.cxx b/binfilter/bf_basic/source/comp/scanner.cxx index 4d888f5eb..ecd63478e 100644 --- a/binfilter/bf_basic/source/comp/scanner.cxx +++ b/binfilter/bf_basic/source/comp/scanner.cxx @@ -187,7 +187,7 @@ BOOL SbiScanner::NextSym() } // Leerstellen weg: - while( *pLine && ( *pLine == ' ' ) || ( *pLine == '\t' ) || ( *pLine == '\f' ) ) + while( *pLine && (( *pLine == ' ' ) || ( *pLine == '\t' ) || ( *pLine == '\f' )) ) pLine++, nCol++, bSpaces = TRUE; nCol1 = nCol; diff --git a/binfilter/bf_basic/source/sbx/sbxexec.cxx b/binfilter/bf_basic/source/sbx/sbxexec.cxx index 10e1b3018..b5153db64 100644 --- a/binfilter/bf_basic/source/sbx/sbxexec.cxx +++ b/binfilter/bf_basic/source/sbx/sbxexec.cxx @@ -95,7 +95,7 @@ static const xub_Unicode* Symbol( const xub_Unicode* p, XubString& rSym, const S { rSym = p; // Dann darf es Buchstaben, Zahlen oder Underlines enthalten - while( *p && rCharClass.isAlphaNumeric( *p ) || *p == '_' ) + while( *p && (rCharClass.isAlphaNumeric( *p ) || *p == '_') ) p++, nLen++; // BASIC-Standard-Suffixe werden ignoriert if( *p && (*p == '%' || *p == '&' || *p == '!' || *p == '#' || *p == '$' ) ) @@ -119,7 +119,7 @@ static SbxVariable* QualifiedName { // Element einlesen refVar = Element( pObj, pGbl, &p, t, aCharClass ); - while( refVar.Is() && *p == '.' || *p == '!' ) + while( refVar.Is() && (*p == '.' || *p == '!') ) { // Es folgt noch ein Objektelement. Das aktuelle Element // muss also ein SBX-Objekt sein oder liefern! |