summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2009-01-29 10:02:54 +0000
committerKurt Zenker <kz@openoffice.org>2009-01-29 10:02:54 +0000
commitee5dcf56c5a8b68c5d4e6314015563b4ced8747f (patch)
tree3373d730be8cf56f037363acef77cddc3a88ca3c /sw
parent340aedbac9892e88bba0a1fe06243a6bfc146bc1 (diff)
CWS-TOOLING: integrate CWS cmcfixes52
2009-01-05 10:49:04 +0100 cmc r265860 : #i97763# remove low-hanging warnings
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/crsr/findtxt.cxx4
-rw-r--r--sw/source/core/crsr/pam.cxx4
-rw-r--r--sw/source/core/crsr/swcrsr.cxx4
-rw-r--r--sw/source/core/doc/docfmt.cxx12
-rw-r--r--sw/source/core/doc/docnum.cxx4
-rw-r--r--sw/source/core/edit/autofmt.cxx4
-rw-r--r--sw/source/core/view/vprint.cxx2
-rw-r--r--sw/source/filter/ww1/w1filter.cxx3
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx2
-rw-r--r--sw/source/ui/app/appopt.cxx8
-rw-r--r--sw/source/ui/docvw/edtwin.cxx2
-rw-r--r--sw/source/ui/shells/drawsh.cxx2
-rw-r--r--sw/source/ui/utlui/content.cxx2
13 files changed, 28 insertions, 25 deletions
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index e21d744b705a..90680b7a1d22 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -463,8 +463,8 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
}
xub_StrLen nStringEnd = nEnde;
- while ( bSrchForward && nStart < nStringEnd ||
- ! bSrchForward && nStart > nStringEnd )
+ while ( (bSrchForward && nStart < nStringEnd) ||
+ (! bSrchForward && nStart > nStringEnd) )
{
// SearchAlgorithms_APPROXIMATE works on a per word base
// so we have to provide the text searcher with the correct
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index acf124b4dd88..f4d2b94f3a1b 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -647,7 +647,7 @@ BOOL SwPaM::HasReadonlySel( bool bFormView ) const
const SwSectionNode* pSNd = pNd->GetSectionNode();
if( pSNd && ( pSNd->GetSection().IsProtectFlag() ||
// --> FME 2004-06-29 #114856# Formular view
- bFormView && !pSNd->GetSection().IsEditInReadonlyFlag() ) )
+ (bFormView && !pSNd->GetSection().IsEditInReadonlyFlag()) ) )
// <--
bRet = TRUE;
}
@@ -670,7 +670,7 @@ BOOL SwPaM::HasReadonlySel( bool bFormView ) const
const SwSectionNode* pSNd = pNd->GetSectionNode();
if( pSNd && ( pSNd->GetSection().IsProtectFlag() ||
// --> FME 2004-06-29 #114856# Formular view
- bFormView && !pSNd->GetSection().IsEditInReadonlyFlag() ) )
+ (bFormView && !pSNd->GetSection().IsEditInReadonlyFlag()) ) )
// <--
bRet = TRUE;
}
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index fd2bbcf457c7..197bc62c08ba 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1869,8 +1869,8 @@ BOOL SwCursor::GoPrevNextCell( BOOL bNext, USHORT nCnt )
pTableBoxStartNode;
SwNodeIndex aCellIdx( *pTmpNode, bNext ? 1 : -1 );
- if( bNext && !aCellIdx.GetNode().IsStartNode() ||
- !bNext && !aCellIdx.GetNode().IsEndNode() )
+ if( (bNext && !aCellIdx.GetNode().IsStartNode()) ||
+ (!bNext && !aCellIdx.GetNode().IsEndNode()) )
return FALSE;
rPtIdx = bNext ? aCellIdx : SwNodeIndex(*aCellIdx.GetNode().StartOfSectionNode());
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 5207a638612f..c036bcbe28da 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -619,22 +619,22 @@ BOOL InsAttr( SwDoc *pDoc, const SwPaM &rRg, const SfxItemSet& rChgSet,
const SfxPoolItem* pItem = aIter.FirstItem();
const USHORT nWhich = pItem->Which();
- if ( RES_CHRATR_BEGIN <= nWhich && nWhich < RES_CHRATR_END ||
+ if ( (RES_CHRATR_BEGIN <= nWhich && nWhich < RES_CHRATR_END) ||
RES_TXTATR_CHARFMT == nWhich ||
RES_TXTATR_INETFMT == nWhich ||
RES_TXTATR_AUTOFMT == nWhich ||
- RES_UNKNOWNATR_BEGIN <= nWhich && nWhich < RES_UNKNOWNATR_END )
+ (RES_UNKNOWNATR_BEGIN <= nWhich && nWhich < RES_UNKNOWNATR_END) )
{
pCharSet = &rChgSet;
bCharAttr = true;
}
- if ( RES_PARATR_BEGIN <= nWhich && nWhich < RES_PARATR_END ||
+ if ( (RES_PARATR_BEGIN <= nWhich && nWhich < RES_PARATR_END) ||
// --> OD 2008-02-25 #refactorlists#
- RES_PARATR_LIST_BEGIN <= nWhich && nWhich < RES_PARATR_LIST_END ||
+ (RES_PARATR_LIST_BEGIN <= nWhich && nWhich < RES_PARATR_LIST_END) ||
// <--
- RES_FRMATR_BEGIN <= nWhich && nWhich < RES_FRMATR_END ||
- RES_GRFATR_BEGIN <= nWhich && nWhich < RES_GRFATR_END )
+ (RES_FRMATR_BEGIN <= nWhich && nWhich < RES_FRMATR_END) ||
+ (RES_GRFATR_BEGIN <= nWhich && nWhich < RES_GRFATR_END) )
{
pOtherSet = &rChgSet;
bOtherAttr = true;
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 423d041c1369..005371b0d3bb 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1881,8 +1881,8 @@ const SwNumRule * SwDoc::SearchNumRule(SwPosition & rPos,
if (pNumRule)
{
if (pNumRule->IsOutlineRule() == bOutline && // #115901#
- (bNum && pNumRule->Get(0).IsEnumeration() ||
- !bNum && pNumRule->Get(0).IsItemize())) // #i22362#, #i29560#
+ ( (bNum && pNumRule->Get(0).IsEnumeration()) ||
+ (!bNum && pNumRule->Get(0).IsItemize()) )) // #i22362#, #i29560#
{
pResult = pTxtNd->GetNumRule();
// --> OD 2008-03-18 #refactorlists#
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index aeeb931d1102..164011a48a8f 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -823,8 +823,8 @@ USHORT SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos,
while( nPos < rTxt.Len() && nDigitLvl < MAXLEVEL - 1)
{
const sal_Unicode cCurrentChar = rTxt.GetChar( nPos );
- if( '0' <= cCurrentChar && '9' >= cCurrentChar ||
- 0xff10 <= cCurrentChar && 0xff19 >= cCurrentChar)
+ if( ('0' <= cCurrentChar && '9' >= cCurrentChar) ||
+ (0xff10 <= cCurrentChar && 0xff19 >= cCurrentChar) )
{
if( eScan & DELIM )
{
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index cf2721b91f87..740b06b39f7e 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -277,7 +277,7 @@ USHORT _PostItFld::GetPageNo( MultiSelection &rMulti, BOOL bRgt, BOOL bLft,
pFrm; pFrm = (SwTxtFrm*)aIter.Next() )
{
if( pFrm->GetOfst() > nPos ||
- pFrm->HasFollow() && pFrm->GetFollow()->GetOfst() <= nPos )
+ (pFrm->HasFollow() && pFrm->GetFollow()->GetOfst() <= nPos) )
continue;
USHORT nPgNo = pFrm->GetPhyPageNum();
BOOL bRight = pFrm->OnRightPage();
diff --git a/sw/source/filter/ww1/w1filter.cxx b/sw/source/filter/ww1/w1filter.cxx
index cc12561458d9..4021d449c286 100644
--- a/sw/source/filter/ww1/w1filter.cxx
+++ b/sw/source/filter/ww1/w1filter.cxx
@@ -1158,7 +1158,7 @@ void W1_CHP::Out(Ww1Shell& rOut, Ww1Manager& rMan)
sQps = sQps - 64;
rOut << SvxKerningItem(sQps, RES_CHRATR_KERNING);
}
- if (fsPosGet())
+ if (fsPosGet()) {
if (hpsPosGet() == 0)
rOut << SvxEscapementItem(SVX_ESCAPEMENT_OFF, 100, RES_CHRATR_ESCAPEMENT);
else {
@@ -1169,6 +1169,7 @@ void W1_CHP::Out(Ww1Shell& rOut, Ww1Manager& rMan)
sHps /= 24;
rOut << SvxEscapementItem(sHps, 100, RES_CHRATR_ESCAPEMENT);
}
+ }
if (fsFtcGet()) {
SvxFontItem aFont(rMan.GetFont(ftcGet()));
rOut << aFont;
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index b32d26fcfe9d..3113bd720756 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -717,7 +717,7 @@ ULONG SwWW8Writer::FillUntil( SvStream& rStrm, ULONG nEndPos )
{
ULONG nCurPos = rStrm.Tell();
if( !nEndPos ) // nEndPos == 0 -> next Page
- nEndPos = nCurPos + 0x1ff & ~0x1ffUL;
+ nEndPos = (nCurPos + 0x1ff) & ~0x1ffUL;
if( nEndPos > nCurPos )
SwWW8Writer::FillCount( rStrm, nEndPos - nCurPos );
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index 5f2285a2bce9..da681b63b077 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -332,10 +332,10 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet )
if(!aViewOpt.IsViewMetaChars())
{
- if( !aViewOpt.IsTab( TRUE ) && pDocDispItem->bTab ||
- !aViewOpt.IsBlank( TRUE ) && pDocDispItem->bSpace ||
- !aViewOpt.IsParagraph( TRUE ) && pDocDispItem->bParagraphEnd ||
- !aViewOpt.IsLineBreak( TRUE ) && pDocDispItem->bManualBreak )
+ if( (!aViewOpt.IsTab( TRUE ) && pDocDispItem->bTab) ||
+ (!aViewOpt.IsBlank( TRUE ) && pDocDispItem->bSpace) ||
+ (!aViewOpt.IsParagraph( TRUE ) && pDocDispItem->bParagraphEnd) ||
+ (!aViewOpt.IsLineBreak( TRUE ) && pDocDispItem->bManualBreak) )
{
aViewOpt.SetViewMetaChars(TRUE);
if(pBindings)
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index a68acd0525a4..04566207cc46 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -1266,7 +1266,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
}
SfxObjectShell *pObjSh = (SfxObjectShell*)rView.GetViewFrame()->GetObjectShell();
- if ( bLockInput || pObjSh && pObjSh->GetProgress() )
+ if ( bLockInput || (pObjSh && pObjSh->GetProgress()) )
// Wenn die Rechenleiste aktiv ist oder
// auf dem Document ein Progress laeuft wird keine
// Bestellungen angenommen.
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index e616126f8b1c..ed7d60e84e6f 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -340,7 +340,7 @@ void SwDrawShell::GetState(SfxItemSet& rSet)
case SID_OBJECT_ROTATE:
{
const BOOL bIsRotate = GetView().IsDrawRotate();
- if ( !bIsRotate && !pSdrView->IsRotateAllowed() || bProtected )
+ if ( (!bIsRotate && !pSdrView->IsRotateAllowed()) || bProtected )
rSet.DisableItem( nWhich );
else
rSet.Put( SfxBoolItem( nWhich, bIsRotate ) );
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 7c2ed2e1d938..b925fdb8bf83 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -2063,7 +2063,9 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier)
if(bIsRoot && nRootType == CONTENT_TYPE_OUTLINE ||
((SwContent*)pFirstEntry->GetUserData())->GetParent()->GetType()
== CONTENT_TYPE_OUTLINE)
+ {
nActPos = ((SwOutlineContent*)pFirstEntry->GetUserData())->GetPos();
+ }
}
if ( nActPos < USHRT_MAX &&
( !nMove || pShell->IsOutlineMovable( nActPos )) )
generated by cgit (git 2.34.1) at 2025-03-08 20:44:12 +0000