[ooo-build-commit] .: 3 commits - sw/inc sw/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Thu Sep 30 09:37:47 PDT 2010
sw/inc/cellfml.hxx | 18 +++++++++---------
sw/source/core/doc/docfld.cxx | 12 ++++++------
sw/source/core/doc/tblrwcl.cxx | 16 ++++++++--------
sw/source/core/fields/cellfml.cxx | 18 +++++++++---------
sw/source/core/table/swtable.cxx | 2 +-
sw/source/core/unocore/unotbl.cxx | 26 +++++++++++++-------------
sw/source/ui/fldui/fldmgr.cxx | 2 +-
sw/source/ui/index/cnttab.cxx | 12 ++++++------
sw/source/ui/shells/tabsh.cxx | 16 ++++++++--------
sw/source/ui/shells/textsh1.cxx | 4 ++--
10 files changed, 63 insertions(+), 63 deletions(-)
New commits:
commit 784a5776bfcb22166f16fdc5983b48ed277ed411
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Sep 30 18:36:36 2010 +0200
remove 'precedence' warnings (corrected)
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 5d9a390..3ede701 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1826,8 +1826,8 @@ void SwTOXEdit::KeyInput( const KeyEvent& rKEvt )
{
const Selection& rSel = GetSelection();
sal_uInt16 nTextLen = GetText().Len();
- if(rSel.A() == rSel.B() &&
- !rSel.A() || rSel.A() == nTextLen )
+ if((rSel.A() == rSel.B() &&
+ !rSel.A()) || rSel.A() == nTextLen )
{
sal_Bool bCall = sal_False;
KeyCode aCode = rKEvt.GetKeyCode();
@@ -3804,8 +3804,8 @@ IMPL_LINK(SwTokenWindow, EditResize, Edit*, pEdit)
IMPL_LINK(SwTokenWindow, NextItemHdl, SwTOXEdit*, pEdit)
{
sal_uInt16 nPos = (sal_uInt16)aControlList.GetPos(pEdit);
- if(nPos && !pEdit->IsNextControl() ||
- nPos < aControlList.Count() - 1 && pEdit->IsNextControl())
+ if((nPos && !pEdit->IsNextControl()) ||
+ (nPos < aControlList.Count() - 1 && pEdit->IsNextControl()))
{
aControlList.Seek(nPos);
Control* pNextPrev = pEdit->IsNextControl() ? aControlList.Next() : aControlList.Prev();
@@ -3840,8 +3840,8 @@ IMPL_LINK(SwTokenWindow, TbxFocusHdl, SwTOXEdit*, pEdit)
IMPL_LINK(SwTokenWindow, NextItemBtnHdl, SwTOXButton*, pBtn )
{
sal_uInt16 nPos = (sal_uInt16)aControlList.GetPos(pBtn);
- if(nPos && !pBtn->IsNextControl() ||
- nPos < aControlList.Count() - 1 && pBtn->IsNextControl())
+ if((nPos && !pBtn->IsNextControl()) ||
+ (nPos < aControlList.Count() - 1 && pBtn->IsNextControl()))
{
aControlList.Seek(nPos);
sal_Bool bNext = pBtn->IsNextControl();
commit 0eefd02098eefc40e9d191586541c29b090167fc
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Sep 30 18:34:49 2010 +0200
remove precedence warning in sw
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 9d907b9..63b2f57 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -2464,9 +2464,9 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
{
SwDBData aDBData(((SwDBNumSetField*)pFld)->GetDBData(&rDoc));
- if( bIsDBMgr &&
- rDoc.GetNewDBMgr()->OpenDataSource( aDBData.sDataSource, aDBData.sCommand )&&
- GETFLD_ALL == eGetMode ||
+ if( (bIsDBMgr &&
+ rDoc.GetNewDBMgr()->OpenDataSource( aDBData.sDataSource, aDBData.sCommand ) &&
+ GETFLD_ALL == eGetMode) ||
( GETFLD_CALC & eGetMode &&
((SwDBNumSetField*)pFld)->IsCondValid()))
pFormel = &pFld->GetPar1();
@@ -2476,9 +2476,9 @@ void SwDocUpdtFld::_MakeFldList( SwDoc& rDoc, int eGetMode )
{
SwDBData aDBData(((SwDBNextSetField*)pFld)->GetDBData(&rDoc));
- if( bIsDBMgr &&
- rDoc.GetNewDBMgr()->OpenDataSource( aDBData.sDataSource, aDBData.sCommand )&&
- GETFLD_ALL == eGetMode ||
+ if( (bIsDBMgr &&
+ rDoc.GetNewDBMgr()->OpenDataSource( aDBData.sDataSource, aDBData.sCommand ) &&
+ GETFLD_ALL == eGetMode) ||
( GETFLD_CALC & eGetMode &&
((SwDBNextSetField*)pFld)->IsCondValid() ))
pFormel = &pFld->GetPar1();
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 5d93e03..a443835 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -2924,10 +2924,10 @@ BOOL lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
if(
rParam.bLeft ? ((nDist + nWidth / 2 ) <= rParam.nSide &&
(TBLFIX_CHGABS != rParam.nMode ||
- n < rBoxes.Count() &&
- (nDist + nWidth + rBoxes[ n+1 ]->
- GetFrmFmt()->GetFrmSize().GetWidth() / 2)
- > rParam.nSide ))
+ (n < rBoxes.Count() &&
+ (nDist + nWidth + rBoxes[ n+1 ]->
+ GetFrmFmt()->GetFrmSize().GetWidth() / 2)
+ > rParam.nSide )))
: (nDist + nWidth / 2 ) > rParam.nSide
)
{
@@ -2989,10 +2989,10 @@ BOOL lcl_InsOtherBox( SwTableLine* pLine, CR_SetBoxWidth& rParam,
if( nLowerDiff ||
(rParam.bLeft ? ((nDist + nWidth / 2 ) <= rParam.nSide &&
(TBLFIX_CHGABS != rParam.nMode ||
- n < rBoxes.Count() &&
- (nDist + nWidth + rBoxes[ n+1 ]->
- GetFrmFmt()->GetFrmSize().GetWidth() / 2)
- > rParam.nSide ))
+ (n < rBoxes.Count() &&
+ (nDist + nWidth + rBoxes[ n+1 ]->
+ GetFrmFmt()->GetFrmSize().GetWidth() / 2)
+ > rParam.nSide )))
: (nDist + nWidth / 2 ) > rParam.nSide ))
{
if( !nLowerDiff )
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 9144738..2ede651 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2410,7 +2410,7 @@ void SwTableBoxFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
BOOL bNewIsTxtFmt = pNumFmtr->IsTextFormat( nNewFmt ) ||
NUMBERFORMAT_TEXT == nNewFmt;
- if( !bNewIsTxtFmt && nOldFmt != nNewFmt || pNewFml )
+ if( (!bNewIsTxtFmt && nOldFmt != nNewFmt) || pNewFml )
{
BOOL bChgTxt = TRUE;
double fVal = 0;
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 9dd21a4..0959cec 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -700,7 +700,7 @@ void lcl_SetTblSeparators(const uno::Any& rVal, SwTable* pTable, SwTableBox* pBo
{
aCols[i] = pArray[i].Position;
if(pArray[i].IsVisible == aCols.IsHidden(i) ||
- !bRow && aCols.IsHidden(i) ||
+ (!bRow && aCols.IsHidden(i)) ||
long(aCols[i] - long(nLastValue)) < 0 ||
UNO_TABLE_COLUMN_SUM < aCols[i] )
{
@@ -3415,7 +3415,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName,
}
break;
case FN_UNO_TABLE_BORDER_DISTANCES:
- {
+ {
table::TableBorderDistances aTableBorderDistances;
if( !(aValue >>= aTableBorderDistances) ||
(!aTableBorderDistances.IsLeftDistanceValid &&
@@ -3441,15 +3441,15 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName,
SwTableBox* pBox = rBoxes.GetObject(k);
const SwFrmFmt* pBoxFmt = pBox->GetFrmFmt();
const SvxBoxItem& rBox = pBoxFmt->GetBox();
- if(
- aTableBorderDistances.IsLeftDistanceValid && nLeftDistance != rBox.GetDistance( BOX_LINE_LEFT ) ||
- aTableBorderDistances.IsRightDistanceValid && nRightDistance != rBox.GetDistance( BOX_LINE_RIGHT ) ||
- aTableBorderDistances.IsTopDistanceValid && nTopDistance != rBox.GetDistance( BOX_LINE_TOP ) ||
- aTableBorderDistances.IsBottomDistanceValid && nBottomDistance != rBox.GetDistance( BOX_LINE_BOTTOM ))
+ if(
+ (aTableBorderDistances.IsLeftDistanceValid && nLeftDistance != rBox.GetDistance( BOX_LINE_LEFT )) ||
+ (aTableBorderDistances.IsRightDistanceValid && nRightDistance != rBox.GetDistance( BOX_LINE_RIGHT )) ||
+ (aTableBorderDistances.IsTopDistanceValid && nTopDistance != rBox.GetDistance( BOX_LINE_TOP )) ||
+ (aTableBorderDistances.IsBottomDistanceValid && nBottomDistance != rBox.GetDistance( BOX_LINE_BOTTOM )))
{
SvxBoxItem aSetBox( rBox );
SwFrmFmt* pSetBoxFmt = pBox->ClaimFrmFmt();
- if( aTableBorderDistances.IsLeftDistanceValid )
+ if( aTableBorderDistances.IsLeftDistanceValid )
aSetBox.SetDistance( nLeftDistance, BOX_LINE_LEFT );
if( aTableBorderDistances.IsRightDistanceValid )
aSetBox.SetDistance( nRightDistance, BOX_LINE_RIGHT );
@@ -3458,7 +3458,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName,
if( aTableBorderDistances.IsBottomDistanceValid )
aSetBox.SetDistance( nBottomDistance, BOX_LINE_BOTTOM );
pDoc->SetAttr( aSetBox, *pSetBoxFmt );
- }
+ }
}
}
pDoc->EndUndo(UNDO_END, NULL);
@@ -3758,10 +3758,10 @@ void SwXTextTable::setName(const OUString& rName) throw( uno::RuntimeException )
vos::OGuard aGuard(Application::GetSolarMutex());
SwFrmFmt* pFmt = GetFrmFmt();
String sNewTblName(rName);
- if(!pFmt && !bIsDescriptor ||
- !sNewTblName.Len() ||
- STRING_NOTFOUND != sNewTblName.Search('.') ||
- STRING_NOTFOUND != sNewTblName.Search(' ') )
+ if((!pFmt && !bIsDescriptor) ||
+ !sNewTblName.Len() ||
+ STRING_NOTFOUND != sNewTblName.Search('.') ||
+ STRING_NOTFOUND != sNewTblName.Search(' ') )
throw uno::RuntimeException();
if(pFmt)
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 1ff5f90..d07622d 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -562,7 +562,7 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill)
((nTypeId == TYP_INPUTFLD || nTypeId == TYP_FORMELFLD) &&
(nWhich == RES_USERFLD ||
(nWhich == RES_SETEXPFLD &&
- !(((SwSetExpFieldType*)pFldType)->GetType() & nsSwGetSetExpType::GSE_SEQ))) ) )
+ !(((SwSetExpFieldType*)pFldType)->GetType() & nsSwGetSetExpType::GSE_SEQ)) )) )
{
String* pNew = new String(pFldType->GetName());
rToFill.Insert(pNew, rToFill.Count());
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 3e17c83..3c22e8a 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -220,7 +220,7 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
// Tabellenvariante, wenn mehrere Tabellenzellen selektiert
rSh.GetCrsr(); //Damit GetCrsrCnt() auch das Richtige liefert
- aBoxInfo.SetTable (rSh.IsTableMode() && rSh.GetCrsrCnt() > 1 ||
+ aBoxInfo.SetTable ((rSh.IsTableMode() && rSh.GetCrsrCnt() > 1) ||
!bTableSel);
// Abstandsfeld immer anzeigen
aBoxInfo.SetDist ((BOOL) TRUE);
@@ -663,7 +663,7 @@ void SwTableShell::Execute(SfxRequest &rReq)
else
aCoreSet.InvalidateItem( RES_BACKGROUND );
- if ( !pDlg && rReq.GetArgs() || pDlg->Execute() == RET_OK )
+ if ( (!pDlg && rReq.GetArgs()) || pDlg->Execute() == RET_OK )
{
const SfxItemSet* pOutSet = pDlg ? pDlg->GetOutputItemSet() : rReq.GetArgs();
if ( pDlg )
@@ -1329,9 +1329,9 @@ void SwTableShell::GetState(SfxItemSet &rSet)
case FN_TABLE_VERT_BOTTOM:
{
USHORT nAlign = rSh.GetBoxAlign();
- BOOL bSet = nSlot == FN_TABLE_VERT_NONE && nAlign == text::VertOrientation::NONE||
- nSlot == FN_TABLE_VERT_CENTER && nAlign == text::VertOrientation::CENTER ||
- nSlot == FN_TABLE_VERT_BOTTOM && nAlign == text::VertOrientation::BOTTOM;
+ BOOL bSet = (nSlot == FN_TABLE_VERT_NONE && nAlign == text::VertOrientation::NONE) ||
+ (nSlot == FN_TABLE_VERT_CENTER && nAlign == text::VertOrientation::CENTER) ||
+ (nSlot == FN_TABLE_VERT_BOTTOM && nAlign == text::VertOrientation::BOTTOM);
rSet.Put(SfxBoolItem(nSlot, bSet));
}
break;
@@ -1341,9 +1341,9 @@ void SwTableShell::GetState(SfxItemSet &rSet)
case FN_TABLE_MODE_VARIABLE :
{
TblChgMode nMode = rSh.GetTblChgMode();
- BOOL bSet = nSlot == FN_TABLE_MODE_FIX && nMode == TBLFIX_CHGABS ||
- nSlot == FN_TABLE_MODE_FIX_PROP && nMode == TBLFIX_CHGPROP ||
- nSlot == FN_TABLE_MODE_VARIABLE && nMode == TBLVAR_CHGABS;
+ BOOL bSet = (nSlot == FN_TABLE_MODE_FIX && nMode == TBLFIX_CHGABS) ||
+ (nSlot == FN_TABLE_MODE_FIX_PROP && nMode == TBLFIX_CHGPROP) ||
+ (nSlot == FN_TABLE_MODE_VARIABLE && nMode == TBLVAR_CHGABS);
rSet.Put(SfxBoolItem(nSlot, bSet));
}
break;
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index f41d28c..129f59c 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -1758,8 +1758,8 @@ void SwTextShell::ChangeHeaderOrFooter(
if( !rStyleName.Len() || rStyleName == sTmp )
{
if( bShowWarning && !bOn && GetActiveView() && GetActiveView() == &GetView() &&
- (bHeader && aDesc.GetMaster().GetHeader().IsActive() ||
- !bHeader && aDesc.GetMaster().GetFooter().IsActive()))
+ (bHeader && aDesc.GetMaster().GetHeader().IsActive()) ||
+ (!bHeader && aDesc.GetMaster().GetFooter().IsActive()))
{
bShowWarning = FALSE;
//Actions have to be closed while the dialog is showing
commit f21f789ba325dadb7c4a4c19d03defcd72b06c29
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Sep 30 18:29:08 2010 +0200
convert BOOL to bool in class SwTableFormula et al
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 7579256..c3bed09 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -53,9 +53,9 @@ public:
SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable );
~SwTblCalcPara();
- BOOL CalcWithStackOverflow();
- BOOL IsStackOverFlow() const { return nMaxSize == nStackCnt; }
- BOOL IncStackCnt() { return nMaxSize == ++nStackCnt; }
+ bool CalcWithStackOverflow();
+ bool IsStackOverFlow() const { return nMaxSize == nStackCnt; }
+ bool IncStackCnt() { return nMaxSize == ++nStackCnt; }
void DecStackCnt() { if( nStackCnt ) --nStackCnt; }
void SetLastTblBox( const SwTableBox* pBox ) { pLastTblBox = pBox; }
};
@@ -98,7 +98,7 @@ protected:
String sFormel; // akt. Formel
NameType eNmType; // akt. Darstellungs Art
- BOOL bValidValue; // TRUE: Formel neu berechnen
+ bool bValidValue; // TRUE: Formel neu berechnen
// suche den Node, in dem die Formel steht:
// TextFeld -> TextNode,
@@ -138,25 +138,25 @@ public:
void ToSplitMergeBoxNm( SwTableFmlUpdate& rTblUpd );
// ist gerade eine intern Darstellung aktiv
- BOOL IsIntrnlName() const { return eNmType == INTRNL_NAME; }
+ bool IsIntrnlName() const { return eNmType == INTRNL_NAME; }
// erfrage die akt. Darstellung der Formel
NameType GetNameType() const { return eNmType; }
// erfrage/setze das Flag, ob der akt. Wert gueltig ist
- BOOL IsValid() const { return bValidValue; }
- inline void ChgValid( BOOL bNew ) { bValidValue = bNew; }
+ bool IsValid() const { return bValidValue; }
+ inline void ChgValid( bool bNew ) { bValidValue = bNew; }
const String& GetFormula() const { return sFormel; }
void SetFormula( const String& rNew )
{
sFormel = rNew;
- bValidValue = FALSE;
+ bValidValue = false;
eNmType = EXTRNL_NAME;
}
USHORT GetBoxesOfFormula( const SwTable& rTbl, SwSelBoxes& rBoxes );
// sind alle Boxen gueltig, auf die sich die Formel bezieht?
- BOOL HasValidBoxes() const;
+ bool HasValidBoxes() const;
};
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index fb98a31..a9caae6 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -60,7 +60,7 @@ const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox );
long lcl_GetLongBoxNum( String& rStr );
const SwTableBox* lcl_RelToBox( const SwTable&, const SwTableBox*, const String& );
String lcl_BoxNmToRel( const SwTable&, const SwTableNode&,
- const String& , const String& , BOOL );
+ const String& , const String& , bool );
/*************************************************************************
@@ -266,7 +266,7 @@ SwTblCalcPara::~SwTblCalcPara()
delete pBoxStk;
}
-BOOL SwTblCalcPara::CalcWithStackOverflow()
+bool SwTblCalcPara::CalcWithStackOverflow()
{
// falls ein StackUeberlauf erkannt wurde, sollte mit
// der letzten Box noch mal aufgesetzt werden. Irgend
@@ -311,7 +311,7 @@ SwTableFormula::SwTableFormula( const String& rFormel )
: sFormel( rFormel )
{
eNmType = EXTRNL_NAME;
- bValidValue = FALSE;
+ bValidValue = false;
}
SwTableFormula::~SwTableFormula()
@@ -850,7 +850,7 @@ const SwTableBox* lcl_RelToBox( const SwTable& rTbl,
String lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd,
const String& rRefBoxNm, const String& rGetStr,
- BOOL bExtrnlNm )
+ bool bExtrnlNm )
{
String sCpy( rRefBoxNm );
String sTmp( rGetStr );
@@ -997,7 +997,7 @@ void SwTableFormula::GetBoxes( const SwTableBox& rSttBox,
void SwTableFormula::_HasValidBoxes( const SwTable& rTbl, String& ,
String& rFirstBox, String* pLastBox, void* pPara ) const
{
- BOOL* pBValid = (BOOL*)pPara;
+ bool* pBValid = (bool*)pPara;
if( *pBValid ) // einmal falsch, immer falsch
{
SwTableBox* pSttBox = 0, *pEndBox = 0;
@@ -1038,13 +1038,13 @@ void SwTableFormula::_HasValidBoxes( const SwTable& rTbl, String& ,
if( ( pLastBox &&
( !pEndBox || !rTbl.GetTabSortBoxes().Seek_Entry( pEndBox ) ) ) ||
( !pSttBox || !rTbl.GetTabSortBoxes().Seek_Entry( pSttBox ) ) )
- *pBValid = FALSE;
+ *pBValid = false;
}
}
-BOOL SwTableFormula::HasValidBoxes() const
+bool SwTableFormula::HasValidBoxes() const
{
- BOOL bRet = TRUE;
+ bool bRet = true;
const SwNode* pNd = GetNodeOfFormula();
if( pNd && 0 != ( pNd = pNd->FindTableNode() ) )
ScanString( &SwTableFormula::_HasValidBoxes,
@@ -1152,7 +1152,7 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr,
if( TBL_SPLITTBL == rTblUpd.eFlags )
{
// wo liegen die Boxen, in der "alten" oder in der neuen Tabelle?
- BOOL bInNewTbl = FALSE;
+ bool bInNewTbl = false;
if( pLastBox )
{
// das ist die "erste" Box in der Selektion. Die bestimmt ob die
More information about the ooo-build-commit
mailing list