diff options
| -rw-r--r-- | soltools/cpp/_eval.c | 12 | ||||
| -rw-r--r-- | sw/source/core/frmedt/tblsel.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/soltools/cpp/_eval.c b/soltools/cpp/_eval.c index 22cb9adbfbb0..f10fa7988bb5 100644 --- a/soltools/cpp/_eval.c +++ b/soltools/cpp/_eval.c @@ -313,7 +313,7 @@ long *op++ = UMINUS; if (tp->type == STAR || tp->type == AND) { - error(ERROR, "Illegal operator * or & in #if/#elsif"); + error(ERROR, "Illegal operator * or & in #if/#elif"); return 0; } continue; @@ -380,7 +380,7 @@ long /* fall through */ default: - error(ERROR, "Bad operator (%t) in #if/#elsif", tp); + error(ERROR, "Bad operator (%t) in #if/#elif", tp); return 0; } } @@ -390,14 +390,14 @@ long return 0; if (op != &ops[1] || vp != &vals[1]) { - error(ERROR, "Botch in #if/#elsif"); + error(ERROR, "Botch in #if/#elif"); return 0; } if (vals[0].type == UND) error(ERROR, "Undefined expression value"); return vals[0].val; syntax: - error(ERROR, "Syntax error in #if/#elsif"); + error(ERROR, "Syntax error in #if/#elif"); return 0; } @@ -679,7 +679,7 @@ struct value else { error(ERROR, - "Bad number %t in #if/#elsif", tp); + "Bad number %t in #if/#elif", tp); break; } } @@ -761,7 +761,7 @@ struct value break; case STRING: - error(ERROR, "String in #if/#elsif"); + error(ERROR, "String in #if/#elif"); break; } return v; diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index f0a7423812b6..e82275839856 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -1181,7 +1181,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, pUndo->SaveCollection( *aPosArr[ i ].pSelBox ); aPosArr.Remove( nSttPos, n - nSttPos ); } -#elsif defined( DEL_EMPTY_BOXES_AT_START_AND_END ) +#elif defined( DEL_EMPTY_BOXES_AT_START_AND_END ) nWidth = pFirstBox->GetFrmFmt()->GetFrmSize().GetWidth(); sal_uInt16 n, nSttPos = 0, nSEndPos = 0, nESttPos = 0; |