diff options
author | Release Engineers <releng@openoffice.org> | 2009-05-07 06:54:56 +0000 |
---|---|---|
committer | Release Engineers <releng@openoffice.org> | 2009-05-07 06:54:56 +0000 |
commit | 449e3653de650a56e393969d4c767677554b9b38 (patch) | |
tree | 4ec9b2e699c9b45a3fff7329b3f8f30860f027a8 /sw/source/core/fields/cellfml.cxx | |
parent | 188bc3b3fbbd16b68a2d4ed262e593379f1d55dc (diff) |
CWS-TOOLING: integrate CWS cmcfixes58
2009-05-04 13:51:10 +0200 cmc r271450 : #i101533# latest sw warnings
2009-05-04 00:02:46 +0200 cmc r271436 : #i101517# silence new warnings
2009-05-03 23:13:53 +0200 cmc r271435 : #i101305# add that one back in
2009-05-02 16:30:42 +0200 cmc r271431 : #i101493# get it to build, and remove some warnings
2009-05-02 16:12:37 +0200 cmc r271430 : CWS-TOOLING: rebase CWS cmcfixes58 to trunk@271427 (milestone: DEV300:m47)
2009-04-23 13:19:33 +0200 cmc r271163 : #i101305# remove annoying import foo is unused warnings
2009-04-21 17:10:34 +0200 cmc r271048 : #i101246# remove AVMEDIA_MANAGER_SERVICE_NAME defines again
2009-04-21 17:07:41 +0200 cmc r271047 : #i86323# remove xml2cmp unused methods
Diffstat (limited to 'sw/source/core/fields/cellfml.cxx')
-rw-r--r-- | sw/source/core/fields/cellfml.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx index 1f9af0404c..c04498bbdc 100644 --- a/sw/source/core/fields/cellfml.cxx +++ b/sw/source/core/fields/cellfml.cxx @@ -1161,8 +1161,8 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr, nSttLnPos = SwTableFormula::GetLnPosInTbl( *pTbl, pSttBox ); if( USHRT_MAX != nSttLnPos && USHRT_MAX != nEndLnPos && - rTblUpd.nSplitLine <= nSttLnPos == - rTblUpd.nSplitLine <= nEndLnPos ) + ((rTblUpd.nSplitLine <= nSttLnPos) == + (rTblUpd.nSplitLine <= nEndLnPos)) ) { // bleiben in der gleichen Tabelle bInNewTbl = rTblUpd.nSplitLine <= nEndLnPos && |