diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-23 12:23:13 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-23 12:23:13 +0000 |
| commit | 1a29b298809e81ccf1d045f4c0a89c6699e2266b (patch) | |
| tree | 526b806765bf63486d52359f52ac9ac6fcad4887 /starmath/source | |
| parent | 828b1fbe7a78e73d78f5fd367b05a99a5359c6e7 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes57
2009-04-16 14:44:54 +0200 cmc r270885 : #i101062# add in uui fix and stray ^M fixes
2009-04-16 10:57:50 +0200 cmc r270872 : #i101127# remove && || warnings
2009-04-15 17:04:23 +0200 cmc r270857 : #i101112# remove trivial new gcc warnings
2009-04-15 17:01:01 +0200 cmc r270856 : #i101111# remove trivial new warnings
2009-04-15 16:56:53 +0200 cmc r270854 : #i101110# make methods consts
2009-04-15 16:52:37 +0200 cmc r270853 : #i100225# fix visibility of component_getImplementationEnvironment and friends
2009-04-15 16:49:16 +0200 cmc r270852 : #i101109# ? : promotion rules
Diffstat (limited to 'starmath/source')
| -rw-r--r-- | starmath/source/edit.cxx | 2 | ||||
| -rw-r--r-- | starmath/source/parse.cxx | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index d41500d2dbc1..d9c333611071 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -88,7 +88,7 @@ void SmGetLeftSelectionPart(const ESelection aSel, { // compare start and end of selection and use the one that comes first if ( aSel.nStartPara < aSel.nEndPara - || aSel.nStartPara == aSel.nEndPara && aSel.nStartPos < aSel.nEndPos) + || (aSel.nStartPara == aSel.nEndPara && aSel.nStartPos < aSel.nEndPos) ) { nPara = aSel.nStartPara; nPos = aSel.nStartPos; } diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 9e6f3581485e..4404cdb25cdf 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -420,7 +420,7 @@ const sal_Int32 coStartFlags = // Continuing characters may be any alphanumeric or dot. const sal_Int32 coContFlags = - ( coStartFlags | KParseTokens::ASC_DOT ) & ~KParseTokens::IGNORE_LEADING_WS + ((coStartFlags | KParseTokens::ASC_DOT) & ~KParseTokens::IGNORE_LEADING_WS) | KParseTokens::TWO_DOUBLE_QUOTES_BREAK_STRING; // First character for numbers, may be any numeric or dot @@ -430,7 +430,7 @@ const sal_Int32 coNumStartFlags = KParseTokens::IGNORE_LEADING_WS; // Continuing characters for numbers, may be any numeric or dot. const sal_Int32 coNumContFlags = - ( coNumStartFlags | KParseTokens::ASC_DOT ) & ~KParseTokens::IGNORE_LEADING_WS; + (coNumStartFlags | KParseTokens::ASC_DOT) & ~KParseTokens::IGNORE_LEADING_WS; void SmParser::NextToken() { @@ -1364,9 +1364,11 @@ void SmParser::Blank() } // Blanks am Zeilenende ignorieren wenn die entsprechende Option gesetzt ist - if (CurToken.eType == TNEWLINE || CurToken.eType == TEND - && SM_MOD1()->GetConfig()->IsIgnoreSpacesRight()) + if ( CurToken.eType == TNEWLINE || + (CurToken.eType == TEND && SM_MOD1()->GetConfig()->IsIgnoreSpacesRight()) ) + { pBlankNode->Clear(); + } NodeStack.Push(pBlankNode); } |