sw/inc/IDocumentContentOperations.hxx | 2 sw/inc/IDocumentFieldsAccess.hxx | 8 - sw/inc/crsrsh.hxx | 38 ++--- sw/inc/dcontact.hxx | 2 sw/inc/doc.hxx | 24 +-- sw/inc/docstyle.hxx | 2 sw/inc/docufld.hxx | 2 sw/inc/editsh.hxx | 4 sw/inc/flddropdown.hxx | 4 sw/inc/fmtcol.hxx | 22 --- sw/inc/modcfg.hxx | 2 sw/inc/ndnotxt.hxx | 2 sw/inc/node.hxx | 24 +-- sw/inc/pagedesc.hxx | 4 sw/inc/poolfmt.hxx | 4 sw/inc/redline.hxx | 2 sw/inc/shellio.hxx | 2 sw/inc/swatrset.hxx | 2 sw/inc/swtable.hxx | 4 sw/inc/tabcol.hxx | 2 sw/inc/tox.hxx | 2 sw/inc/viewopt.hxx | 106 +++++++--------- sw/inc/viewsh.hxx | 14 +- sw/source/core/access/acccontext.cxx | 6 sw/source/core/access/accdoc.cxx | 4 sw/source/core/access/accmap.cxx | 2 sw/source/core/access/accselectionhelper.cxx | 1 sw/source/core/access/acctable.cxx | 8 - sw/source/core/bastyp/calc.cxx | 2 sw/source/core/bastyp/swregion.cxx | 2 sw/source/core/crsr/crsrsh.cxx | 10 - sw/source/core/crsr/crstrvl.cxx | 2 sw/source/core/crsr/findattr.cxx | 48 +++---- sw/source/core/crsr/swcrsr.cxx | 6 sw/source/core/doc/DocumentContentOperationsManager.cxx | 4 sw/source/core/doc/docedt.cxx | 2 sw/source/core/doc/docfly.cxx | 2 sw/source/core/doc/docfmt.cxx | 10 - sw/source/core/doc/docftn.cxx | 4 sw/source/core/doc/docnum.cxx | 2 sw/source/core/doc/docruby.cxx | 4 sw/source/core/doc/notxtfrm.cxx | 2 sw/source/core/doc/tblafmt.cxx | 2 sw/source/core/doc/tblcpy.cxx | 2 sw/source/core/docnode/ndsect.cxx | 10 - sw/source/core/docnode/ndtbl1.cxx | 6 sw/source/core/docnode/node.cxx | 8 - sw/source/core/docnode/node2lay.cxx | 2 sw/source/core/draw/dcontact.cxx | 4 sw/source/core/draw/dflyobj.cxx | 2 sw/source/core/edit/autofmt.cxx | 2 sw/source/core/edit/edglss.cxx | 2 sw/source/core/edit/edlingu.cxx | 11 - sw/source/core/edit/ednumber.cxx | 5 sw/source/core/fields/ddefld.cxx | 4 sw/source/core/frmedt/fefly1.cxx | 2 sw/source/core/frmedt/feshview.cxx | 2 sw/source/core/frmedt/fetab.cxx | 2 sw/source/core/frmedt/fews.cxx | 4 sw/source/core/frmedt/tblsel.cxx | 16 +- sw/source/core/inc/DocumentRedlineManager.hxx | 4 sw/source/core/inc/DocumentSettingManager.hxx | 64 ++++----- sw/source/core/inc/acorrect.hxx | 4 sw/source/core/inc/flowfrm.hxx | 4 sw/source/core/inc/flyfrm.hxx | 12 - sw/source/core/inc/frame.hxx | 8 - sw/source/core/inc/swfont.hxx | 2 sw/source/core/layout/atrfrm.cxx | 35 ++--- sw/source/core/layout/calcmove.cxx | 8 - sw/source/core/layout/colfrm.cxx | 4 sw/source/core/layout/findfrm.cxx | 4 sw/source/core/layout/flowfrm.cxx | 27 +--- sw/source/core/layout/fly.cxx | 8 - sw/source/core/layout/flycnt.cxx | 6 sw/source/core/layout/flyincnt.cxx | 2 sw/source/core/layout/flylay.cxx | 17 +- sw/source/core/layout/frmtool.cxx | 35 ++--- sw/source/core/layout/ftnfrm.cxx | 12 - sw/source/core/layout/hffrm.cxx | 3 sw/source/core/layout/layact.cxx | 31 ++-- sw/source/core/layout/layouter.cxx | 4 sw/source/core/layout/newfrm.cxx | 4 sw/source/core/layout/objectformatter.cxx | 4 sw/source/core/layout/sectfrm.cxx | 2 sw/source/core/swg/SwXMLTextBlocks1.cxx | 1 sw/source/core/table/swnewtable.cxx | 2 sw/source/core/table/swtable.cxx | 2 sw/source/core/txtnode/ndtxt.cxx | 4 sw/source/core/txtnode/txtedt.cxx | 12 - sw/source/core/undo/undel.cxx | 2 sw/source/core/unocore/swunohelper.cxx | 2 sw/source/core/unocore/unoobj2.cxx | 12 - sw/source/core/unocore/unoparagraph.cxx | 2 sw/source/core/unocore/unoportenum.cxx | 2 sw/source/core/unocore/unorefmk.cxx | 2 sw/source/core/unocore/unosect.cxx | 2 sw/source/core/unocore/unotbl.cxx | 4 sw/source/core/view/viewsh.cxx | 2 sw/source/filter/basflt/shellio.cxx | 10 - sw/source/filter/html/css1atr.cxx | 4 sw/source/filter/html/htmlatr.cxx | 2 sw/source/filter/html/htmlcss1.cxx | 8 - sw/source/filter/html/htmlfldw.cxx | 6 sw/source/filter/html/htmlform.cxx | 2 sw/source/filter/html/htmltab.cxx | 4 sw/source/filter/html/htmltabw.cxx | 8 - sw/source/filter/html/parcss1.hxx | 4 sw/source/filter/html/svxcss1.cxx | 6 sw/source/filter/html/svxcss1.hxx | 4 sw/source/filter/html/swhtml.cxx | 6 sw/source/filter/inc/fltini.hxx | 2 sw/source/filter/ww8/rtfexport.cxx | 2 sw/source/filter/ww8/ww8par.cxx | 4 sw/source/filter/xml/XMLRedlineImportHelper.hxx | 2 sw/source/filter/xml/swxml.cxx | 2 sw/source/filter/xml/wrtxml.cxx | 2 sw/source/filter/xml/xmlfmte.cxx | 1 sw/source/filter/xml/xmlimp.cxx | 2 sw/source/filter/xml/xmlimp.hxx | 2 sw/source/filter/xml/xmltbli.cxx | 2 sw/source/ui/chrdlg/drpcps.cxx | 2 sw/source/ui/config/optload.cxx | 2 sw/source/ui/dbui/addresslistdialog.cxx | 2 sw/source/ui/dbui/mmaddressblockpage.cxx | 2 sw/source/ui/frmdlg/frmpage.cxx | 10 - sw/source/ui/frmdlg/wrap.cxx | 2 sw/source/ui/misc/glosbib.cxx | 2 sw/source/ui/misc/glossary.cxx | 2 sw/source/ui/table/tautofmt.cxx | 2 sw/source/ui/vba/vbalistformat.cxx | 2 sw/source/ui/vba/vbapagesetup.cxx | 12 - sw/source/ui/vba/vbaselection.cxx | 12 - sw/source/ui/vba/vbaview.cxx | 6 sw/source/ui/vba/vbawrapformat.cxx | 4 sw/source/uibase/app/docsh.cxx | 2 sw/source/uibase/config/modcfg.cxx | 4 sw/source/uibase/config/usrpref.cxx | 6 sw/source/uibase/dbui/dbmgr.cxx | 2 sw/source/uibase/dbui/mmconfigitem.cxx | 6 sw/source/uibase/dochdl/gloshdl.cxx | 6 sw/source/uibase/dochdl/swdtflvr.cxx | 6 sw/source/uibase/fldui/fldmgr.cxx | 4 sw/source/uibase/fldui/xfldui.cxx | 2 sw/source/uibase/inc/drawbase.hxx | 2 sw/source/uibase/inc/pview.hxx | 2 sw/source/uibase/inc/swcont.hxx | 4 sw/source/uibase/inc/wrtsh.hxx | 8 - sw/source/uibase/lingu/hhcwrp.cxx | 2 sw/source/uibase/lingu/hyp.cxx | 2 sw/source/uibase/lingu/olmenu.cxx | 6 sw/source/uibase/ribbar/drawbase.cxx | 8 - sw/source/uibase/ribbar/dselect.cxx | 4 sw/source/uibase/ribbar/inputwin.cxx | 2 sw/source/uibase/shells/basesh.cxx | 7 - sw/source/uibase/shells/textfld.cxx | 6 sw/source/uibase/shells/textglos.cxx | 2 sw/source/uibase/shells/textsh.cxx | 2 sw/source/uibase/shells/textsh1.cxx | 6 sw/source/uibase/uiview/view.cxx | 7 - sw/source/uibase/uiview/view2.cxx | 4 sw/source/uibase/uiview/viewling.cxx | 4 sw/source/uibase/uiview/viewprt.cxx | 4 sw/source/uibase/uiview/viewstat.cxx | 7 - sw/source/uibase/uiview/viewtab.cxx | 6 sw/source/uibase/uno/unoatxt.cxx | 2 sw/source/uibase/uno/unomailmerge.cxx | 4 sw/source/uibase/uno/unomod.cxx | 3 sw/source/uibase/uno/unotxdoc.cxx | 4 sw/source/uibase/uno/unotxvw.cxx | 6 sw/source/uibase/utlui/content.cxx | 4 sw/source/uibase/utlui/unotools.cxx | 4 sw/source/uibase/wrtsh/wrtsh1.cxx | 22 +-- 172 files changed, 550 insertions(+), 619 deletions(-)
New commits: commit 1e0c847a6049e923e40954fcc4339e6989d80a69 Author: Matteo Casalin <[email protected]> Date: Sun Nov 16 14:49:16 2014 +0100 sal_True/sal_False to true/false in calls to getWordBoundary Change-Id: I6116b4c2b8e03e819a430cbdcb7874af6508fb62 diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index e5c9073..c9a8b5d 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -1200,7 +1200,7 @@ bool SwCursor::IsInWordWT( sal_Int16 nWordType ) const pTxtNd->GetTxt(), nPtPos, g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ), nWordType, - sal_True ); + true ); bRet = aBoundary.startPos != aBoundary.endPos && aBoundary.startPos <= nPtPos && @@ -1242,7 +1242,7 @@ bool SwCursor::GoStartWordWT( sal_Int16 nWordType ) pTxtNd->GetTxt(), nPtPos, g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ), nWordType, - sal_False ).startPos; + false ).startPos; if (nPtPos < pTxtNd->GetTxt().getLength() && nPtPos >= 0) { @@ -1266,7 +1266,7 @@ bool SwCursor::GoEndWordWT( sal_Int16 nWordType ) pTxtNd->GetTxt(), nPtPos, g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ), nWordType, - sal_True ).endPos; + true ).endPos; if (nPtPos <= pTxtNd->GetTxt().getLength() && nPtPos >= 0 && GetPoint()->nContent.GetIndex() != nPtPos ) diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 7e99c27..a39b961 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -1315,7 +1315,7 @@ namespace //local functions originally from docfmt.cxx pTxtNd->GetTxt(), nPtPos, g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ), WordType::ANY_WORD /*ANYWORD_IGNOREWHITESPACES*/, - sal_True ); + true ); if( aBndry.startPos < nPtPos && nPtPos < aBndry.endPos ) { @@ -2513,7 +2513,7 @@ void DocumentContentOperationsManager::TransliterateText( pTNd->GetTxt(), nSttCnt, g_pBreakIt->GetLocale( pTNd->GetLang( nSttCnt ) ), WordType::ANY_WORD /*ANYWORD_IGNOREWHITESPACES*/, - sal_True ); + true ); if( aBndry.startPos < nSttCnt && nSttCnt < aBndry.endPos ) { diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index db36809..dbe7168 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -267,7 +267,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg, pTxtNd->GetTxt(), nPtPos, g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ), WordType::ANY_WORD /*ANYWORD_IGNOREWHITESPACES*/, - sal_True ); + true ); if( aBndry.startPos < nPtPos && nPtPos < aBndry.endPos ) { diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx index 3ea510d..8e07ca2 100644 --- a/sw/source/core/doc/docruby.cxx +++ b/sw/source/core/doc/docruby.cxx @@ -236,7 +236,7 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt rTxt, nStart, g_pBreakIt->GetLocale( pTNd->GetLang( nStart )), WordType::ANYWORD_IGNOREWHITESPACES, - sal_True ).startPos; + true ).startPos; if (nWordStt < nStart && nWordStt >= 0) { nStart = nWordStt; @@ -306,7 +306,7 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt rTxt, nStart, g_pBreakIt->GetLocale( pTNd->GetLang( nStart )), WordType::ANYWORD_IGNOREWHITESPACES, - sal_True ).endPos; + true ).endPos; if( 0 > nWordEnd || nWordEnd > nEnd || nWordEnd == nStart ) nWordEnd = nEnd; } diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index a7ea3cf..58164c6 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -681,7 +681,7 @@ OUString SwTxtNode::GetCurWord( sal_Int32 nPos ) const (void)bEnd; #endif aBndry = - rxBreak->getWordBoundary( m_Text, nPos, aLocale, nWordType, sal_True ); + rxBreak->getWordBoundary( m_Text, nPos, aLocale, nWordType, true ); // if no word was found use previous word (if any) if (aBndry.startPos == aBndry.endPos) @@ -836,7 +836,7 @@ bool SwScanner::NextWord() // get the word boundaries aBound = g_pBreakIt->GetBreakIter()->getWordBoundary( aText, nBegin, - g_pBreakIt->GetLocale( aCurrLang ), nWordType, sal_True ); + g_pBreakIt->GetLocale( aCurrLang ), nWordType, true ); OSL_ENSURE( aBound.endPos >= aBound.startPos, "broken aBound result" ); // we don't want to include preceding text @@ -1286,7 +1286,7 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, const SwViewOption& rV Boundary aBound = g_pBreakIt->GetBreakIter()->getWordBoundary( pNode->GetTxt(), nBegin, g_pBreakIt->GetLocale( eActLang ), - WordType::DICTIONARY_WORD, sal_True ); + WordType::DICTIONARY_WORD, true ); nBegin = aBound.startPos; } @@ -1678,12 +1678,12 @@ void SwTxtNode::TransliterateText( GetTxt(), nStt, g_pBreakIt->GetLocale( GetLang( nStt ) ), nWordType, - sal_True /*prefer forward direction*/); + true /*prefer forward direction*/); aEndBndry = g_pBreakIt->GetBreakIter()->getWordBoundary( GetTxt(), nEnd, g_pBreakIt->GetLocale( GetLang( nEnd ) ), nWordType, - sal_False /*prefer backward direction*/); + false /*prefer backward direction*/); // prevent backtracking to the previous word if selection is at word boundary if (aSttBndry.endPos <= nStt) diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx index 917a778..3061cb9 100644 --- a/sw/source/uibase/lingu/hhcwrp.cxx +++ b/sw/source/uibase/lingu/hhcwrp.cxx @@ -597,7 +597,7 @@ void SwHHCWrapper::Convert() const sal_Int32 nPos = m_pConvArgs->pStartIdx->GetIndex(); Boundary aBoundary( g_pBreakIt->GetBreakIter()-> getWordBoundary( aText, nPos, g_pBreakIt->GetLocale( m_pConvArgs->nConvSrcLang ), - WordType::DICTIONARY_WORD, sal_True ) ); + WordType::DICTIONARY_WORD, true ) ); // valid result found? if (aBoundary.startPos < aText.getLength() && commit 13b72a61cb3cb619e047fb47000a332f5d28190b Author: Matteo Casalin <[email protected]> Date: Sun Nov 16 14:33:31 2014 +0100 sal_Bool/sal_uInt16 to bool Change-Id: I54d404d98cff433735ede23ddf4944a4149f559c diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 1664e69..b6e30dd 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -601,7 +601,7 @@ void SwAccSingleTableSelHander_Impl::Unselect( sal_Int32, sal_Int32 ) class SwAccAllTableSelHander_Impl : public SwAccTableSelHander_Impl { - ::std::vector< sal_Bool > aSelected; + ::std::vector< bool > aSelected; sal_Int32 nCount; public: @@ -618,7 +618,7 @@ SwAccAllTableSelHander_Impl::~SwAccAllTableSelHander_Impl() } inline SwAccAllTableSelHander_Impl::SwAccAllTableSelHander_Impl( sal_Int32 nSize ) : - aSelected( nSize, sal_True ), + aSelected( nSize, true ), nCount( nSize ) { } @@ -655,7 +655,7 @@ void SwAccAllTableSelHander_Impl::Unselect( sal_Int32 nRowOrCol, { if( aSelected[static_cast< size_t >( nRowOrCol )] ) { - aSelected[static_cast< size_t >( nRowOrCol )] = sal_False; + aSelected[static_cast< size_t >( nRowOrCol )] = false; nCount--; } nExt--; diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx index 4096619..5842e58 100644 --- a/sw/source/core/doc/docftn.cxx +++ b/sw/source/core/doc/docftn.cxx @@ -284,7 +284,7 @@ void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo) { std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums)); if ( bFtnDesc ) - std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), sal_False)); + std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), false)); if ( bExtra ) { // For messages regarding ErgoSum etc. we save the extra code and use the @@ -352,7 +352,7 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo) if ( bFtnDesc ) { std::set<SwRootFrm*> aAllLayouts = GetAllLayouts(); - std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), sal_True)); + std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), true)); } if ( bExtra ) { diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index d333b6d..74b2829 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -661,17 +661,17 @@ static void RemoveScriptItems( SfxItemSet& rItemSet, sal_uInt16 nScript, RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT } }; - sal_uInt16 aClearItems[3] = { sal_False, sal_False, sal_False }; + bool aClearItems[3] = { false, false, false }; switch( nScript ) { case CSS1_SCRIPT_WESTERN: - aClearItems[1] = aClearItems[2] = sal_True; + aClearItems[1] = aClearItems[2] = true; break; case CSS1_SCRIPT_CJK: - aClearItems[0] = aClearItems[2] = sal_True; + aClearItems[0] = aClearItems[2] = true; break; case CSS1_SCRIPT_CTL: - aClearItems[0] = aClearItems[1] = sal_True; + aClearItems[0] = aClearItems[1] = true; break; case CSS1_SCRIPT_ALL: break; diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index e40d612..4434ddc 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -194,9 +194,9 @@ bool SwHTMLWrtTable::HasTabBackground( const SwTableLine& rLine, return bRet; } -static bool lcl_TableLine_HasTabBorders( const SwTableLine* pLine, sal_Bool *pBorders ); +static bool lcl_TableLine_HasTabBorders( const SwTableLine* pLine, bool *pBorders ); -static bool lcl_TableBox_HasTabBorders( const SwTableBox* pBox, sal_Bool *pBorders ) +static bool lcl_TableBox_HasTabBorders( const SwTableBox* pBox, bool *pBorders ) { if( *pBorders ) return false; @@ -222,7 +222,7 @@ static bool lcl_TableBox_HasTabBorders( const SwTableBox* pBox, sal_Bool *pBorde return !*pBorders; } -static bool lcl_TableLine_HasTabBorders( const SwTableLine* pLine, sal_Bool *pBorders ) +static bool lcl_TableLine_HasTabBorders( const SwTableLine* pLine, bool *pBorders ) { if( *pBorders ) return false; @@ -245,7 +245,7 @@ bool SwHTMLWrtTable::ShouldExpandSub( const SwTableBox *pBox, { // MIB 30.6.97: Wenn schon eine Box expandiert wurde, wird eine // weitere nur expandiert, wenn sie Umrandungen besitzt. - sal_Bool bBorders = sal_False; + bool bBorders = false; lcl_TableBox_HasTabBorders( pBox, &bBorders ); if( !bBorders ) bBorders = HasTabBackground( *pBox, true, true, true, true ); commit e71fd1a3c5957f305c10a58a31bf4d93e0959378 Author: Matteo Casalin <[email protected]> Date: Sun Nov 16 14:03:28 2014 +0100 Misused sal_True/sal_False to integer Change-Id: I3e5374145fb4a1bea1d1d900dc32380df4a408e9 diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index a9c43e8..f0317e2 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -2359,7 +2359,7 @@ void SwHTMLParser::NewSelect() if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.eHeightType ) { aSz.Height() = convertTwipToMm100( aCSS1PropInfo.nHeight ); - aTextSz.Height() = sal_False; + aTextSz.Height() = 0; bMinHeight = false; } if( aSz.Width() < MINFLY ) diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 142faf4..5780001 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -2025,7 +2025,7 @@ sal_uInt32 SwDBManager::GetSelectedRecordId() sal_uInt32 nRet = 0; OSL_ENSURE(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge"); if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is()) - return sal_False; + return 0; try { nRet = pImpl->pMergeData->xResultSet->getRow(); diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 4aea94f..7d458b2 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -959,7 +959,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut ) AddFormat( SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR ); AddFormat( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ); eBufferType = (TransferBufferType)( TRNSFR_INETFLD | eBufferType ); - nRet = sal_True; + nRet = 1; } } @@ -2740,7 +2740,7 @@ bool SwTransferable::_PasteFileList( TransferableDataHelper& rData, TransferableDataHelper aData( pHlp ); if( SwTransferable::_PasteFileName( aData, rSh, SOT_FORMAT_FILE, nAct, - pPt, sal_False, bMsg, 0 )) + pPt, 0, bMsg, 0 )) { if( bLink ) { commit 184d8aee0b76e77bbe0d8728e17a9d7249f5740e Author: Matteo Casalin <[email protected]> Date: Sat Nov 15 15:55:56 2014 +0100 sw: convert 'a ? sal_True : b' to 'a || b' Change-Id: I582edaf0e9c138822135c614f973ff205d751aa0 diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index c24eba8..ed2db72 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -538,7 +538,7 @@ SwXParagraphEnumeration::hasMoreElements() throw (uno::RuntimeException, std::ex { SolarMutexGuard aGuard; - return (m_pImpl->m_bFirstParagraph) ? sal_True : m_pImpl->m_xNextPara.is(); + return static_cast<sal_Bool>(m_pImpl->m_bFirstParagraph || m_pImpl->m_xNextPara.is()); } //!! compare to SwShellTableCrsr::FillRects() in viscrs.cxx @@ -1861,10 +1861,8 @@ SwXParaFrameEnumeration::hasMoreElements() throw (uno::RuntimeException, std::ex if (!m_pImpl->GetCursor()) throw uno::RuntimeException(); - return (m_pImpl->m_xNextObject.is()) - ? sal_True - : lcl_CreateNextObject(*m_pImpl->GetCursor(), - m_pImpl->m_xNextObject, m_pImpl->m_Frames); + return static_cast<sal_Bool>(m_pImpl->m_xNextObject.is() || + lcl_CreateNextObject(*m_pImpl->GetCursor(),m_pImpl->m_xNextObject, m_pImpl->m_Frames)); } uno::Any SAL_CALL SwXParaFrameEnumeration::nextElement() commit e7061b8ecbfc54f3980504b01df7c502039652df Author: Matteo Casalin <[email protected]> Date: Sat Nov 15 15:48:01 2014 +0100 sw: convert 'a ? sal_False : b' to '!a && b' Change-Id: I999404544b1ed35a19096df58172e62bd1685e75 diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index bfe012f..bd41531 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -1056,7 +1056,7 @@ HTMLTable::HTMLTable( SwHTMLParser* pPars, HTMLTable *pTopTab, nCellSpacing( pOptions->nCellSpacing ), nBoxes( 1 ), pCaptionStartNode( 0 ), - bTableAdjustOfTag( pTopTab ? sal_False : pOptions->bTableAdjust ), + bTableAdjustOfTag( !pTopTab && pOptions->bTableAdjust ), bIsParentHead( bParHead ), bHasParentSection( bHasParentSec ), bHasToFly( bHasToFlw ), diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 636bfc9..9002984 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -1697,7 +1697,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) GRAPHIC_NONE == rSh.GetIMapGraphic().GetType(); } } - bSet = bDisable ? sal_False : rWrap.IsContour(); + bSet = !bDisable && rWrap.IsContour(); break; case FN_WRAP_ANCHOR_ONLY: commit f65dea36d2778b7f626ac8b07cd057110a5c3a4b Author: Matteo Casalin <[email protected]> Date: Wed Nov 12 09:05:53 2014 +0100 sw: convert 'a ? b : sal_True' to '!a || b' Change-Id: I7177521a9bf9c845216e2b6c91d20df93b137987 diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx index f39361e..b486ad8 100644 --- a/sw/source/core/undo/undel.cxx +++ b/sw/source/core/undo/undel.cxx @@ -436,7 +436,7 @@ bool SwUndoDelete::SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd, bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM& rDelPam ) { // Is Undo greater than one Node (that is Start and EndString)? - if( pSttStr ? pSttStr->isEmpty() || pEndStr : sal_True ) + if( !pSttStr || pSttStr->isEmpty() || pEndStr ) return false; // only the deletion of single char's can be condensed diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 995584f..7904405 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -683,7 +683,7 @@ bool SwGlossaryHdl::IsReadOnly( const OUString* pGrpNm ) const else pGlossary = rStatGlossaries.GetGroupDoc(aCurGrp); - bool bRet = pGlossary ? pGlossary->IsReadOnly() : sal_True; + const bool bRet = !pGlossary || pGlossary->IsReadOnly(); if( pGrpNm || !pCurGrp ) delete pGlossary; return bRet; diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index e959174..3bd1eeb 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -391,7 +391,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq ) { Any aVal = xCtrlAcc->getValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0); OSL_ENSURE(aVal.hasValue(), "Value CBX_INSERT_AS_LINK not found"); - bAsLink = aVal.hasValue() ? *(sal_Bool*) aVal.getValue() : sal_True; + bAsLink = !aVal.hasValue() || *(sal_Bool*) aVal.getValue(); Any aTemplateValue = xCtrlAcc->getValue( ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE, ListboxControlActions::GET_SELECTED_ITEM ); @@ -426,7 +426,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq ) { Any aVal = xCtrlAcc->getValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0); OSL_ENSURE(aVal.hasValue(), "Value CBX_INSERT_AS_LINK not found"); - bAsLink = aVal.hasValue() ? *(sal_Bool*) aVal.getValue() : sal_True; + bAsLink = !aVal.hasValue() || *(sal_Bool*) aVal.getValue(); Any aTemplateValue = xCtrlAcc->getValue( ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE, ListboxControlActions::GET_SELECTED_ITEM ); diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index f2585c0..50dc5f8 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -4000,7 +4000,7 @@ SwViewOptionAdjust_Impl::AdjustViewOptions(SwPrintData const*const pPrtOptions) if (bContainsPlaceHolders) { // should always be printed in PDF export! - bVal = pPrtOptions ? pPrtOptions->bPrintTextPlaceholder : sal_True; + bVal = !pPrtOptions || pPrtOptions->bPrintTextPlaceholder; aRenderViewOptions.SetShowPlaceHolderFields( bVal ); } diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index 07d93e8..7f6682e 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -483,7 +483,7 @@ sal_Bool SAL_CALL SwXTextView::isFormDesignMode( ) throw (uno::RuntimeException SolarMutexGuard aGuard; SwView* pView2 = GetView(); FmFormShell* pFormShell = pView2 ? pView2->GetFormShell() : NULL; - return pFormShell ? pFormShell->IsDesignMode() : sal_True; + return static_cast<sal_Bool>(!pFormShell || pFormShell->IsDesignMode()); } void SAL_CALL SwXTextView::setFormDesignMode( sal_Bool _DesignMode ) throw (RuntimeException, std::exception) @@ -632,8 +632,8 @@ void SAL_CALL SwXTextView::setRubyList( } else if(pProperties[nProp].Name == UNO_NAME_RUBY_IS_ABOVE) { - bool bValue = pProperties[nProp].Value.hasValue() ? - *(sal_Bool*)pProperties[nProp].Value.getValue() : sal_True; + bool bValue = !pProperties[nProp].Value.hasValue() || + *(sal_Bool*)pProperties[nProp].Value.getValue(); pEntry->GetRubyAttr().SetPosition(bValue ? 0 : 1); } } diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 7b698d1..bd75cde 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1600,7 +1600,7 @@ void SwContentTree::Display( bool bActive ) bIsActive = bActive; bIsHidden = !bActive; SwWrtShell* pShell = GetWrtShell(); - bool bReadOnly = pShell ? pShell->GetView().GetDocShell()->IsReadOnly() : sal_True; + const bool bReadOnly = !pShell || pShell->GetView().GetDocShell()->IsReadOnly(); if(bReadOnly != bIsLastReadOnly) { bIsLastReadOnly = bReadOnly; commit 195fd6b5e3cfbf5359ea58663ae7c97f78ac4592 Author: Matteo Casalin <[email protected]> Date: Mon Nov 10 01:22:51 2014 +0100 sw: convert 'a ? sal_False : sal_True' to '!a' Change-Id: I8b3d1f7af217d36a9baf62df3e62f1361b8c57bb diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx index a8b12ec..1024081 100644 --- a/sw/source/ui/vba/vbaselection.cxx +++ b/sw/source/ui/vba/vbaselection.cxx @@ -240,7 +240,7 @@ SwVbaSelection::Move( const uno::Any& _unit, const uno::Any& _count, const uno:: if( nCount == 0 ) return; - bool bExpand = ( nExtend == word::WdMovementType::wdMove ) ? sal_False : sal_True; + bool bExpand = nExtend != word::WdMovementType::wdMove; switch( nUnit ) { diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index e7514f7..341fcd8 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -251,11 +251,7 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() : case 16: pValues[nProp] >>= bIsMailReplyTo; break; case 17: pValues[nProp] >>= sMailReplyTo; break; case 18: pValues[nProp] >>= sMailServer; break; - case 19: - bIsDefaultPort = - (pValues[nProp] >>= nMailPort) ? - sal_False : sal_True; - break; + case 19: bIsDefaultPort = !(pValues[nProp] >>= nMailPort); break; case 20: pValues[nProp] >>= bIsSecureConnection; break; case 21: pValues[nProp] >>= bIsAuthentication; break; case 22: pValues[nProp] >>= sMailUserName; break; diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 977d6e6..358937f 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -1517,7 +1517,7 @@ void SwView::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >& rSe pValue++;nIndex++; pValue->Name = "IsSelectedFrame"; - const sal_Bool bIsSelected = FRMTYPE_NONE == m_pWrtShell->GetSelFrmType() ? sal_False : sal_True; + const bool bIsSelected = FRMTYPE_NONE != m_pWrtShell->GetSelFrmType(); pValue->Value.setValue ( &bIsSelected, ::getBooleanCppuType() ); nIndex++; commit 93193e23750c2739f4e929cb28149509d97a4d8b Author: Matteo Casalin <[email protected]> Date: Mon Nov 10 01:08:39 2014 +0100 sw: convert 'a ? b : sal_False' to 'a && b' Change-Id: I4b7829a1abe1459f2e4915159588fd3e16a14eea diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 3cc2ca6..8021c19 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star::accessibility; void SwAccessibleContext::InitStates() { - bIsShowingState = GetMap() ? IsShowing( *(GetMap()) ) : sal_False; + bIsShowingState = GetMap() && IsShowing( *(GetMap()) ); SwViewShell *pVSh = GetMap()->GetShell(); bIsEditableState = pVSh && IsEditable( pVSh ); diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index e1220c6..27d40cc 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -879,7 +879,7 @@ void SwTableAutoFmt::StoreTableProperties(const SwTable &table) SwEditShell *pShell = pDoc->GetEditShell(); SwFmtRowSplit *pRowSplit = 0; pDoc->GetRowSplit(*pShell->getShellCrsr(false), pRowSplit); - m_bRowSplit = pRowSplit ? pRowSplit->GetValue() : sal_False; + m_bRowSplit = pRowSplit && pRowSplit->GetValue(); delete pRowSplit; pRowSplit = 0; diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 8857a58..f24d25b 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -437,9 +437,7 @@ bool SwNode::IsProtect() const if( pFlyFmt->GetProtect().IsCntntProtected() ) return true; const SwFmtAnchor& rAnchor = pFlyFmt->GetAnchor(); - return rAnchor.GetCntntAnchor() - ? rAnchor.GetCntntAnchor()->nNode.GetNode().IsProtect() - : sal_False; + return rAnchor.GetCntntAnchor() && rAnchor.GetCntntAnchor()->nNode.GetNode().IsProtect(); } if( 0 != ( pSttNd = FindFootnoteStartNode() ) ) diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index 6785e7f..f9c4553 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -414,9 +414,8 @@ uno::Any SwConvIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt ) bool SwHyphIter::IsAuto() { uno::Reference< beans::XPropertySet > xProp( ::GetLinguPropertySet() ); - return xProp.is() ? *(sal_Bool*)xProp->getPropertyValue( - OUString(UPN_IS_HYPH_AUTO) ).getValue() - : sal_False; + return xProp.is() && *(sal_Bool*)xProp->getPropertyValue( + OUString(UPN_IS_HYPH_AUTO) ).getValue(); } void SwHyphIter::ShowSelection() diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 18bcf01..44e9910 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -2384,7 +2384,7 @@ bool SwFEShell::IsAlignPossible() const SwDrawContact *pC = (SwDrawContact*)GetUserCall(pO); OSL_ENSURE( pC, "No SwDrawContact!"); //only as character bound drawings can be aligned - bRet = pC ? (pC->GetFmt()->GetAnchor().GetAnchorId() == FLY_AS_CHAR) : sal_False; + bRet = pC && pC->GetFmt()->GetAnchor().GetAnchorId() == FLY_AS_CHAR; } if ( bRet ) return Imp()->GetDrawView()->IsAlignPossible(); diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 01c707a..8648050 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -2342,7 +2342,7 @@ bool SwFEShell::IsMouseTableRightToLeft(const Point &rPt) const SwFrm *pFrm = (SwFrm *)GetBox( rPt ); const SwTabFrm* pTabFrm = pFrm ? pFrm->ImplFindTabFrm() : 0; OSL_ENSURE( pTabFrm, "Table not found" ); - return pTabFrm ? pTabFrm->IsRightToLeft() : sal_False; + return pTabFrm && pTabFrm->IsRightToLeft(); } bool SwFEShell::IsTableVertical() const diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx index 02deb0d..a7ea3cf 100644 --- a/sw/source/core/txtnode/txtedt.cxx +++ b/sw/source/core/txtnode/txtedt.cxx @@ -1326,7 +1326,7 @@ SwRect SwTxtFrm::_AutoSpell( const SwCntntNode* pActNode, const SwViewOption& rV // within the word LanguageType eActLang = aScanner.GetCurrentLanguage(); - bool bSpell = xSpell.is() ? xSpell->hasLanguage( eActLang ) : sal_False; + bool bSpell = xSpell.is() && xSpell->hasLanguage( eActLang ); if( bSpell && !rWord.isEmpty() ) { // check for: bAlter => xHyphWord.is() diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 8b91e84..dcfdf18 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -2114,7 +2114,7 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc) ((SfxPoolItem&)aSz).PutValue(*pWidth, MID_FRMSIZE_WIDTH); bPutSize = true; } - bool bTemp = pSzRel ? *(sal_Bool*)pSzRel->getValue() : sal_False; + bool bTemp = pSzRel && *(sal_Bool*)pSzRel->getValue(); if(pSzRel && bTemp && pRelWidth) { ((SfxPoolItem&)aSz).PutValue(*pRelWidth, MID_FRMSIZE_REL_WIDTH|CONVERT_TWIPS); diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index f32790c..049fdb17 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -1662,7 +1662,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc, // Size: If the only difference is the Landscape-Flag, // only export Portrait oder Landscape. Otherwise export size. - bool bRefLandscape = pRefPageDesc ? pRefPageDesc->GetLandscape() : sal_False; + bool bRefLandscape = pRefPageDesc && pRefPageDesc->GetLandscape(); Size aRefSz; const Size& rSz = rPageDesc.GetMaster().GetFrmSize().GetSize(); if( pRefPageDesc ) diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index 5bd15b3..9313aa9 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -916,7 +916,7 @@ void SwInsertConfig::Load() { if(pValues[nProp].hasValue()) { - bool bBool = nProp < INS_PROP_CAP_OBJECT_TABLE_ENABLE ? *(sal_Bool*)pValues[nProp].getValue() : sal_False; + bool bBool = nProp < INS_PROP_CAP_OBJECT_TABLE_ENABLE && *(sal_Bool*)pValues[nProp].getValue(); switch(nProp) { case INS_PROP_TABLE_HEADER: diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index fb8010a..88aa1f3 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -177,7 +177,7 @@ void SwContentViewConfig::Load() { if(pValues[nProp].hasValue()) { - bool bSet = nProp != 16 ? *(sal_Bool*)pValues[nProp].getValue() : sal_False; + bool bSet = nProp != 16 && *(sal_Bool*)pValues[nProp].getValue(); switch(nProp) { case 0: rParent.SetGraphic(bSet); break;// "Display/GraphicObject", @@ -433,7 +433,7 @@ void SwGridConfig::Load() { if(pValues[nProp].hasValue()) { - bool bSet = nProp < 3 ? *(sal_Bool*)pValues[nProp].getValue() : sal_False; + bool bSet = nProp < 3 && *(sal_Bool*)pValues[nProp].getValue(); sal_Int32 nSet = 0; if(nProp >= 3) pValues[nProp] >>= nSet; diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 4e62f0a..995584f 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -393,7 +393,7 @@ bool SwGlossaryHdl::ExpandGlossary() if(pWrtShell->IsSelection()) aShortName = pWrtShell->GetSelTxt(); } - return pGlossary ? Expand( aShortName, &rStatGlossaries, pGlossary ) : sal_False; + return pGlossary && Expand( aShortName, &rStatGlossaries, pGlossary ); } bool SwGlossaryHdl::Expand( const OUString& rShortName, @@ -693,7 +693,7 @@ bool SwGlossaryHdl::IsOld() const { SwTextBlocks *pGlossary = pCurGrp ? pCurGrp : rStatGlossaries.GetGroupDoc(aCurGrp); - bool bRet = pGlossary ? pGlossary->IsOld() : sal_False; + bool bRet = pGlossary && pGlossary->IsOld(); if( !pCurGrp ) delete pGlossary; return bRet; diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index def26f1..887fb91 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -733,9 +733,7 @@ bool SwFldMgr::GoNextPrev( bool bNext, SwFieldType* pTyp ) return pSh->MoveFldType( 0, bNext, RES_DBFLD ); } - return (pTyp && pSh) - ? pSh->MoveFldType( pTyp, bNext ) - : sal_False; + return pTyp && pSh && pSh->MoveFldType( pTyp, bNext ); } // insert field types diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx index a683fdb..1f1e2ff 100644 --- a/sw/source/uibase/lingu/hyp.cxx +++ b/sw/source/uibase/lingu/hyp.cxx @@ -54,7 +54,7 @@ SwHyphWrapper::SwHyphWrapper( SwView* pVw, bInfoBox( false ) { uno::Reference< linguistic2::XLinguProperties > xProp( GetLinguPropertySet() ); - bAutomatic = xProp.is() ? xProp->getIsHyphAuto() : sal_False; + bAutomatic = xProp.is() && xProp->getIsHyphAuto(); SetHyphen(); } diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 68ff90b..8a88076 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -269,7 +269,7 @@ void SwView::SpellStart( SvxSpellArea eWhich, SwConversionArgs *pConvArgs ) { Reference< XLinguProperties > xProp = ::GetLinguPropertySet(); - bool bIsWrapReverse = (!pConvArgs && xProp.is()) ? xProp->getIsWrapReverse() : sal_False; + bool bIsWrapReverse = !pConvArgs && xProp.is() && xProp->getIsWrapReverse(); SwDocPositions eStart = DOCPOS_START; SwDocPositions eEnde = DOCPOS_END; @@ -449,7 +449,7 @@ void SwView::HyphenateDocument() m_pWrtShell->StartUndo(UNDO_INSATTR); // valid later - bool bHyphSpecial = xProp.is() ? xProp->getIsHyphSpecial() : sal_False; + bool bHyphSpecial = xProp.is() && xProp->getIsHyphSpecial(); bool bSelection = ((SwCrsrShell*)m_pWrtShell)->HasSelection() || m_pWrtShell->GetCrsr() != m_pWrtShell->GetCrsr()->GetNext(); bool bOther = m_pWrtShell->HasOtherCnt() && bHyphSpecial && !bSelection; diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index 3d64f8b..59f18ac 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -191,11 +191,11 @@ void SwView::ExecutePrint(SfxRequest& rReq) { SwWrtShell* pSh = &GetWrtShell(); SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, false); - bool bSilent = pSilentItem ? pSilentItem->GetValue() : sal_False; + bool bSilent = pSilentItem && pSilentItem->GetValue(); SFX_REQUEST_ARG(rReq, pPrintFromMergeItem, SfxBoolItem, FN_QRY_MERGE, false); if(pPrintFromMergeItem) rReq.RemoveItem(FN_QRY_MERGE); - bool bFromMerge = pPrintFromMergeItem ? pPrintFromMergeItem->GetValue() : sal_False; + bool bFromMerge = pPrintFromMergeItem && pPrintFromMergeItem->GetValue(); SwMiscConfig aMiscConfig; bool bPrintSelection = false; if(!bSilent && !bFromMerge && diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index 2614c35..4ab522c 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -608,8 +608,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c IllegalArgumentException, WrappedTargetException, RuntimeException) { - bool bVal = HANDLE_VIEWSET_ZOOM != rInfo.mnHandle ? - *(sal_Bool*)rValue.getValue() : sal_False; + bool bVal = HANDLE_VIEWSET_ZOOM != rInfo.mnHandle && *(sal_Bool*)rValue.getValue(); // the API flag should not be set to the application's view settings switch( rInfo.mnHandle ) { diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 3cb41d5..f2585c0 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3989,7 +3989,7 @@ SwViewOptionAdjust_Impl::AdjustViewOptions(SwPrintData const*const pPrtOptions) aRenderViewOptions.SetLineBreak( false ); // breaks (type 1) aRenderViewOptions.SetPageBreak( false ); // breaks (type 2) aRenderViewOptions.SetColumnBreak( false ); // breaks (type 3) - bool bVal = pPrtOptions? pPrtOptions->bPrintHiddenText : sal_False; + bool bVal = pPrtOptions && pPrtOptions->bPrintHiddenText; if (bContainsHiddenChars) aRenderViewOptions.SetShowHiddenChar( bVal ); // hidden text if (bContainsHiddenFields) commit f2eb1eabd5d8e107eb2e6b65d7eec2ff6cbb906f Author: Matteo Casalin <[email protected]> Date: Sun Nov 9 22:58:58 2014 +0100 int + sal_True/sal_False ==> bool, and reduce scope of a static variable Change-Id: I8006aaa4474f086ce5381f59afcf7a5f15279b55 diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index ebae430..9ac06aa 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -691,7 +691,7 @@ bool SwAttrCheckArr::CheckStack() return nFound == aCmpSet.Count(); } -static int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr, +static bool lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr, SwPaM& rPam ) { sal_Int32 nEndPos; @@ -699,10 +699,10 @@ static int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr, if( !rTxtNd.HasHints() ) { if( !rCmpArr.Found() ) - return sal_False; + return false; nEndPos = rCmpArr.GetNdEnd(); lcl_SetAttrPam( rPam, rCmpArr.GetNdStt(), &nEndPos, true ); - return sal_True; + return true; } const SwpHints& rHtArr = rTxtNd.GetSwpHints(); @@ -720,7 +720,7 @@ static int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr, // found end lcl_SetAttrPam( rPam, rCmpArr.GetNdStt(), &pAttr->GetStart(), true ); - return sal_True; + return true; } // continue search break; @@ -731,7 +731,7 @@ static int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr, // found nEndPos = rCmpArr.GetNdEnd(); lcl_SetAttrPam( rPam, rCmpArr.GetNdStt(), &nEndPos, true ); - return sal_True; + return true; } } @@ -751,21 +751,21 @@ static int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr, // then we have our search area if( (nSttPos = rCmpArr.Start()) > (nEndPos = rCmpArr.End()) ) - return sal_False; + return false; lcl_SetAttrPam( rPam, nSttPos, &nEndPos, true ); - return sal_True; + return true; } if( !rCmpArr.CheckStack() || (nSttPos = rCmpArr.Start()) > (nEndPos = rCmpArr.End()) ) - return sal_False; + return false; lcl_SetAttrPam( rPam, nSttPos, &nEndPos, true ); - return sal_True; + return true; } -static int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr, +static bool lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr, SwPaM& rPam ) { sal_Int32 nEndPos; @@ -773,10 +773,10 @@ static int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr, if( !rTxtNd.HasHints() ) { if( !rCmpArr.Found() ) - return sal_False; + return false; nEndPos = rCmpArr.GetNdEnd(); lcl_SetAttrPam( rPam, rCmpArr.GetNdStt(), &nEndPos, false ); - return sal_True; + return true; } const SwpHints& rHtArr = rTxtNd.GetSwpHints(); @@ -796,7 +796,7 @@ static int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr, // found end nEndPos = rCmpArr.GetNdEnd(); lcl_SetAttrPam( rPam, nSttPos, &nEndPos, false ); - return sal_True; + return true; } // continue search @@ -808,7 +808,7 @@ static int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr, // found nEndPos = rCmpArr.GetNdEnd(); lcl_SetAttrPam( rPam, rCmpArr.GetNdStt(), &nEndPos, false ); - return sal_True; + return true; } } @@ -829,25 +829,25 @@ static int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr, // then we have our search area if( (nSttPos = rCmpArr.Start()) > (nEndPos = rCmpArr.End()) ) - return sal_False; + return false; lcl_SetAttrPam( rPam, nSttPos, &nEndPos, false ); - return sal_True; + return true; } if( !rCmpArr.CheckStack() || (nSttPos = rCmpArr.Start()) > (nEndPos = rCmpArr.End()) ) - return sal_False; + return false; lcl_SetAttrPam( rPam, nSttPos, &nEndPos, false ); - return sal_True; + return true; } -static int lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, bool bNoColls ) +static bool lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, bool bNoColls ) { // search only hard attribution? if( bNoColls && !rCNd.HasSwAttrSet() ) - return sal_False; + return false; const SfxItemSet& rNdSet = rCNd.GetSwAttrSet(); SfxItemIter aIter( rCmpSet ); @@ -862,21 +862,21 @@ static int lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, bool nWhich = rCmpSet.GetWhichByPos( aIter.GetCurPos() ); if( SfxItemState::SET != rNdSet.GetItemState( nWhich, !bNoColls, &pNdItem ) || CmpAttr( *pNdItem, rNdSet.GetPool()->GetDefaultItem( nWhich ) )) - return sal_False; + return false; } else { nWhich = pItem->Which(); if( !CmpAttr( rNdSet.Get( nWhich, !bNoColls ), *pItem )) - return sal_False; + return false; } if( aIter.IsAtEnd() ) break; pItem = aIter.NextItem(); } - return sal_True; // found + return true; // found } bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove, @@ -959,7 +959,7 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove, return bFound; } -typedef int (*FnSearchAttr)( const SwTxtNode&, SwAttrCheckArr&, SwPaM& ); +typedef bool (*FnSearchAttr)( const SwTxtNode&, SwAttrCheckArr&, SwPaM& ); bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove, const SwPaM *pRegion, bool bInReadOnly, bool bMoveFirst ) diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 1b465b5..db36809 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -495,7 +495,7 @@ void SwDoc::ResetAttrAtFormat( const sal_uInt16 nWhichId, delete pUndo; } -static int lcl_SetNewDefTabStops( SwTwips nOldWidth, SwTwips nNewWidth, +static bool lcl_SetNewDefTabStops( SwTwips nOldWidth, SwTwips nNewWidth, SvxTabStopItem& rChgTabStop ) { // Set the default values of all TabStops to the new value. @@ -505,7 +505,7 @@ static int lcl_SetNewDefTabStops( SwTwips nOldWidth, SwTwips nNewWidth, sal_uInt16 nOldCnt = rChgTabStop.Count(); if( !nOldCnt || nOldWidth == nNewWidth ) - return sal_False; + return false; // Find the default's beginning sal_uInt16 n; @@ -515,7 +515,7 @@ static int lcl_SetNewDefTabStops( SwTwips nOldWidth, SwTwips nNewWidth, ++n; if( n < nOldCnt ) // delete the DefTabStops rChgTabStop.Remove( n, nOldCnt - n ); - return sal_True; + return true; } /// Set the attribute as new default attribute in this document. @@ -614,7 +614,7 @@ void SwDoc::SetDefault( const SfxItemSet& rSet ) SwTwips nNewWidth = (*static_cast<const SvxTabStopItem*>(pTmpItem))[ 0 ].GetTabPos(), nOldWidth = static_cast<const SvxTabStopItem&>(aOld.Get(RES_PARATR_TABSTOP))[ 0 ].GetTabPos(); - int bChg = sal_False; + bool bChg = false; sal_uInt32 nMaxItems = GetAttrPool().GetItemCount2( RES_PARATR_TABSTOP ); for( sal_uInt32 n = 0; n < nMaxItems; ++n ) if( 0 != (pTmpItem = GetAttrPool().GetItem2( RES_PARATR_TABSTOP, n ) )) diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index a46ed52..1440448 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -102,7 +102,7 @@ public: // Search for fields. If no valid found, disconnect. SwMsgPoolItem aUpdateDDE( RES_UPDATEDDETBL ); - int bCallModify = sal_False; + bool bCallModify = false; rFldType.LockModify(); SwClientIter aIter( rFldType ); // TODO @@ -121,7 +121,7 @@ public: pSh->StartAction(); } pLast->ModifyNotification( 0, &aUpdateDDE ); - bCallModify = sal_True; + bCallModify = true; } } while( 0 != ( pLast = ++aIter )); diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index 000b16d..7672c1b 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -440,10 +440,8 @@ Writer& OutHTML_SwFmtFld( Writer& rWrt, const SfxPoolItem& rHt ) if( RES_SETEXPFLD == pFldTyp->Which() && (nsSwGetSetExpType::GSE_STRING & pFld->GetSubType()) ) { - int bOn = sal_False; - if (pFldTyp->GetName() == "HTML_ON") - bOn = sal_True; - else if (pFldTyp->GetName() != "HTML_OFF") + const bool bOn = pFldTyp->GetName() == "HTML_ON"; + if (!bOn && pFldTyp->GetName() != "HTML_OFF") return rWrt; OUString rTxt(comphelper::string::strip(pFld->GetPar2(), ' ')); diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 5d38837..be0a7d9 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -3132,8 +3132,6 @@ static CSS1PropEntry aCSS1PropFnTab[] = CSS1_PROP_ENTRY(so_language) }; -static int bSortedPropFns = sal_False; - extern "C" { static int SAL_CALL CSS1PropEntryCompare( const void *pFirst, const void *pSecond) @@ -3167,13 +3165,15 @@ void SvxCSS1Parser::ParseProperty( const OUString& rProperty, { OSL_ENSURE( pItemSet, "DeclarationParsed() without ItemSet" ); + static bool bSortedPropFns = false; + if( !bSortedPropFns ) { qsort( (void*) aCSS1PropFnTab, sizeof( aCSS1PropFnTab ) / sizeof( CSS1PropEntry ), sizeof( CSS1PropEntry ), CSS1PropEntryCompare ); - bSortedPropFns = sal_True; + bSortedPropFns = true; } OUString aTmp( rProperty.toAsciiLowerCase() ); diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index cde96b4..10575a7 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -633,7 +633,7 @@ void SwTextShell::StateField( SfxItemSet &rSet ) SwWrtShell& rSh = GetShell(); SfxWhichIter aIter( rSet ); const SwField* pField = 0; - int bGetField = sal_False; + bool bGetField = false; sal_uInt16 nWhich = aIter.FirstWhich(); while (nWhich) @@ -664,7 +664,7 @@ void SwTextShell::StateField( SfxItemSet &rSet ) if( !bGetField ) { pField = rSh.GetCurFld(); - bGetField = sal_True; + bGetField = true; } sal_uInt16 nTempWhich = pField ? pField->GetTyp()->Which() : USHRT_MAX; @@ -687,7 +687,7 @@ void SwTextShell::StateField( SfxItemSet &rSet ) if(!bGetField) { pField = rSh.GetCurFld(); - bGetField = sal_True; + bGetField = true; } if(!pField || pField->GetTyp()->Which() != RES_MACROFLD) rSet.DisableItem(nWhich); diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx index 939a6f8..c742606 100644 --- a/sw/source/uibase/uiview/viewstat.cxx +++ b/sw/source/uibase/uiview/viewstat.cxx @@ -68,7 +68,7 @@ void SwView::GetState(SfxItemSet &rSet) SfxWhichIter aIter(rSet); sal_uInt16 nWhich = aIter.FirstWhich(); sal_uInt16 eFrmType = FRMTYPE_NONE; - int bGetFrmType = sal_False; + bool bGetFrmType = false; bool bWeb = 0 != PTR_CAST(SwWebView, this); while(nWhich) @@ -96,7 +96,10 @@ void SwView::GetState(SfxItemSet &rSet) { // There are captions for graphics, OLE objects, frames and tables if( !bGetFrmType ) - eFrmType = m_pWrtShell->GetFrmType(0,true), bGetFrmType = sal_True; + { + eFrmType = m_pWrtShell->GetFrmType(0, true); + bGetFrmType = true; + } if (! ( ((eFrmType & FRMTYPE_FLY_ANY) && m_nSelectionType != nsSelectionType::SEL_DRW_TXT)|| m_nSelectionType & nsSelectionType::SEL_TBL || m_nSelectionType & nsSelectionType::SEL_DRW) ) diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index daa9d74..d49ce12 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -1746,7 +1746,7 @@ void SwWrtShell::ChangeHeaderOrFooter( for( sal_uInt16 nFrom = 0, nTo = GetPageDescCnt(); nFrom < nTo; ++nFrom ) { - int bChgd = sal_False; + bool bChgd = false; SwPageDesc aDesc( GetPageDesc( nFrom )); OUString sTmp(aDesc.GetName()); if( rStyleName.isEmpty() || rStyleName == sTmp ) @@ -1771,7 +1771,7 @@ void SwWrtShell::ChangeHeaderOrFooter( } if( bExecute ) { - bChgd = sal_True; + bChgd = true; SwFrmFmt &rMaster = aDesc.GetMaster(); if(bHeader) rMaster.SetFmtAttr( SwFmtHeader( bOn )); commit b60d741be60b0650949624fce5e234077157691e Author: Matteo Casalin <[email protected]> Date: Sun Nov 9 22:24:50 2014 +0100 EndDialog(sal_True) ==> EndDialog(RET_OK) Change-Id: I07a822a7c03a4746fd609ca6ea743b92253cf6de diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index ee34ac9..10a02a6 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -637,7 +637,7 @@ IMPL_LINK(SwAddressListDialog, TableSelectHdl_Impl, PushButton*, pButton) IMPL_LINK_NOARG(SwAddressListDialog, OKHdl_Impl) { - EndDialog(sal_True); + EndDialog(RET_OK); return 0; } diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index e20090f..179c64a 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -790,7 +790,7 @@ IMPL_LINK_NOARG(SwNewGlosNameDlg, Rename) m_pNewShort->GrabFocus(); } else - EndDialog(sal_True); + EndDialog(RET_OK); return 0; } commit a080c8f34d80b8c70764e7bde934f43c2fe4a109 Author: Matteo Casalin <[email protected]> Date: Sun Nov 9 22:18:34 2014 +0100 sw: avoid 'condition ? sal_True : sal_False' expressions Change-Id: Idd6c9f9752659fc5da575e5a3f0ffc15ce5dbe1c diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 4fead78..1664e69 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -495,7 +495,7 @@ bool SwAccessibleTableData_Impl::CompareExtents( if( maExtents.size() != rCmp.maExtents.size() ) return false; - return ::std::equal(maExtents.begin(), maExtents.end(), rCmp.maExtents.begin()) ? sal_True : sal_False; + return ::std::equal(maExtents.begin(), maExtents.end(), rCmp.maExtents.begin()); } SwAccessibleTableData_Impl::SwAccessibleTableData_Impl( SwAccessibleMap& rAccMap, diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 0dfa7b1..28ab12c 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -304,7 +304,7 @@ void SwCrsrShell::EndAction( const bool bIdleEnd, const bool DoSetPosX ) if( !m_nCrsrMove || ( 1 == m_nCrsrMove && m_bInCMvVisportChgd ) ) // display Cursor & Selektions again - ShowCrsrs( m_bSVCrsrVis ? sal_True : sal_False ); + ShowCrsrs( m_bSVCrsrVis ); } // call ChgCall if there is still one if( m_bCallChgLnk && m_bChgCallFlag && m_aChgLnk.IsSet() ) @@ -2154,7 +2154,7 @@ void SwCrsrShell::ShGetFcs( bool bUpdate ) UpdateCrsr( static_cast<sal_uInt16>( bUpdate ? SwCrsrShell::CHKRANGE|SwCrsrShell::SCROLLWIN : SwCrsrShell::CHKRANGE ) ); - ShowCrsrs( m_bSVCrsrVis ? sal_True : sal_False ); + ShowCrsrs( m_bSVCrsrVis ); } } @@ -2218,9 +2218,7 @@ void SwCrsrShell::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) bool SwCrsrShell::HasSelection() const { const SwPaM* pCrsr = getShellCrsr( true ); - return( IsTableMode() || ( pCrsr->HasMark() && - *pCrsr->GetPoint() != *pCrsr->GetMark()) - ? sal_True : sal_False ); + return IsTableMode() || ( pCrsr->HasMark() && *pCrsr->GetPoint() != *pCrsr->GetMark() ); } void SwCrsrShell::CallChgLnk() diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index f688b5e..54cbf25 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -1136,7 +1136,7 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt, SwCrsrMoveState aTmpState; aTmpState.bFieldInfo = true; aTmpState.bExactOnly = !( SwContentAtPos::SW_OUTLINE & rCntntAtPos.eCntntAtPos ); - aTmpState.bCntntCheck = (SwContentAtPos::SW_CONTENT_CHECK & rCntntAtPos.eCntntAtPos) ? sal_True : sal_False; + aTmpState.bCntntCheck = (SwContentAtPos::SW_CONTENT_CHECK & rCntntAtPos.eCntntAtPos) != 0; aTmpState.bSetInReadOnly = IsReadOnlyAvailable(); SwSpecialPos aSpecialPos; diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index ee2c7be..8857a58 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -1580,10 +1580,10 @@ bool SwCntntNode::GetAttr( SfxItemSet& rSet, bool bInParent ) const const SwAttrSet& rAttrSet = GetSwAttrSet(); if( bInParent ) - return rSet.Set( rAttrSet, true ) ? sal_True : sal_False; + return rSet.Set( rAttrSet, true ); rSet.Put( rAttrSet ); - return rSet.Count() ? sal_True : sal_False; + return rSet.Count() != 0; } sal_uInt16 SwCntntNode::ClearItemsFromAttrSet( const std::vector<sal_uInt16>& rWhichIds ) diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index 7e41893..ba12508 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -810,12 +810,9 @@ void SwEditShell::SetNumRuleStart( bool bFlag, SwPaM* pPaM ) bool SwEditShell::IsNumRuleStart( SwPaM* pPaM ) const { - bool bResult = false; SwPaM* pCrsr = pPaM ? pPaM : GetCrsr( ); const SwTxtNode* pTxtNd = pCrsr->GetNode().GetTxtNode(); - if( pTxtNd ) - bResult = pTxtNd->IsListRestart() ? sal_True : sal_False; - return bResult; + return pTxtNd && pTxtNd->IsListRestart(); } void SwEditShell::SetNodeNumStart( sal_uInt16 nStt, SwPaM* pPaM ) diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index 761453e..8928367 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -502,7 +502,7 @@ bool SwFEShell::Sort(const SwSortOptions& rOpt) } // call sorting on document - bRet = mpDoc->SortTbl(aBoxes, rOpt) ? sal_True : sal_False; + bRet = mpDoc->SortTbl(aBoxes, rOpt); } else { @@ -519,7 +519,7 @@ bool SwFEShell::Sort(const SwSortOptions& rOpt) const sal_Int32 nCntStt = pStart->nContent.GetIndex(); // Sorting - bRet = mpDoc->SortText(*pPam, rOpt) ? sal_True : sal_False; + bRet = mpDoc->SortText(*pPam, rOpt); // put selection again pPam->DeleteMark(); diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index 97341ac..220955d 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -643,7 +643,7 @@ bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd ) OSL_ENSURE( nLoopMax, "table layout is still invalid!" ); - return bValidChartSel ? sal_True : sal_False; + return bValidChartSel; } bool IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell ) @@ -651,14 +651,14 @@ bool IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell ) OSL_ENSURE( pCell->IsCellFrm(), "Frame without Gazelle" ); if( pCell->FindTabFrm()->IsVertical() ) - return ( rUnion.Right() >= pCell->Frm().Right() && + return rUnion.Right() >= pCell->Frm().Right() && rUnion.Left() <= pCell->Frm().Left() && (( rUnion.Top() <= pCell->Frm().Top()+20 && rUnion.Bottom() > pCell->Frm().Top() ) || ( rUnion.Top() >= pCell->Frm().Top() && - rUnion.Bottom() < pCell->Frm().Bottom() )) ? sal_True : sal_False ); + rUnion.Bottom() < pCell->Frm().Bottom() )); - return ( + return rUnion.Top() <= pCell->Frm().Top() && rUnion.Bottom() >= pCell->Frm().Bottom() && @@ -666,7 +666,7 @@ bool IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell ) rUnion.Right() > pCell->Frm().Left() ) || ( rUnion.Left() >= pCell->Frm().Left() && - rUnion.Right() < pCell->Frm().Right() )) ? sal_True : sal_False ); + rUnion.Right() < pCell->Frm().Right() )); } bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes ) @@ -823,7 +823,7 @@ bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes ) } } - return bFound ? sal_True : sal_False; + return bFound; } bool HasProtectedCells( const SwSelBoxes& rBoxes ) diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 759c856..5b347df 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -2863,7 +2863,7 @@ OUString SwTxtNode::GetNumString( const bool _bInclPrefixAndSuffixStrings, (style::NumberingType::NUMBER_NONE == rNumberType.GetNumberingType())) { return pRule->MakeNumString( GetNum()->GetNumberVector(), - _bInclPrefixAndSuffixStrings ? sal_True : sal_False, + _bInclPrefixAndSuffixStrings, false, _nRestrictToThisLevel ); } diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 39e5d2c..a7a7395 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -1328,7 +1328,7 @@ uno::Type SAL_CALL SwXParagraph::getElementType() throw (uno::RuntimeException, sal_Bool SAL_CALL SwXParagraph::hasElements() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - return (GetTxtNode()) ? sal_True : sal_False; + return static_cast<sal_Bool>(GetTxtNode() != nullptr); } uno::Reference< text::XText > SAL_CALL diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 1aa2bd5..90e9700 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -399,7 +399,7 @@ throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; - return (m_Portions.size() > 0) ? sal_True : sal_False; + return static_cast<sal_Bool>(m_Portions.size() > 0); } uno::Any SwXTextPortionEnumeration::nextElement() diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 7e04105..ec1c4c4 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -1234,7 +1234,7 @@ SwXMeta::hasElements() throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; - return m_pImpl->GetRegisteredIn() ? sal_True : sal_False; + return static_cast<sal_Bool>(m_pImpl->GetRegisteredIn() != nullptr); } // XEnumerationAccess diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index f45ebf0..b5027d5 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -351,7 +351,7 @@ void SwXMLDocStylesContext_Impl::EndElement() // are imported and finished. SwXMLImport& rSwImport = dynamic_cast<SwXMLImport&>( GetImport()); GetImport().GetTextImport()->SetOutlineStyles( - (rSwImport.GetStyleFamilyMask() & SFX_STYLE_FAMILY_PARA ) ? sal_True : sal_False); + (rSwImport.GetStyleFamilyMask() & SFX_STYLE_FAMILY_PARA ) != 0); } const SvXMLTokenMap& SwXMLImport::GetDocElemTokenMap() diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index b6cf98b..0dd8691 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -539,7 +539,7 @@ SwDropCapsPage::SwDropCapsPage(vcl::Window *pParent, const SfxItemSet &rSet) SetExchangeSupport(); const sal_uInt16 nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current()); - bHtmlMode = nHtmlMode & HTMLMODE_ON ? sal_True : sal_False; + bHtmlMode = (nHtmlMode & HTMLMODE_ON) != 0; // In the template dialog the text is not influenceable m_pTextText->Enable( !bFormat ); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index f1305b9..fa84da7 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -548,7 +548,7 @@ bool SwCaptionOptPage::FillItemSet( SfxItemSet* ) pModOpt->SetInsWithCaption( bHTMLMode, nCheckCount > 0 ); sal_Int32 nPos = m_pLbCaptionOrder->GetSelectEntryPos(); - pModOpt->SetCaptionOrderNumberingFirst(nPos == 1 ? sal_True : sal_False ); + pModOpt->SetCaptionOrderNumberingFirst(nPos == 1); return bRet; } diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 42530be..f96c004 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -702,7 +702,7 @@ void SwCustomizeAddressBlockDialog::UpdateImageButtons_Impl() m_pLeftIB->Enable(nMove & MOVE_ITEM_LEFT ); m_pRightIB->Enable(nMove & MOVE_ITEM_RIGHT ); m_pDownIB->Enable(nMove & MOVE_ITEM_DOWN); - m_pRemoveFieldIB->Enable(m_pDragED->HasCurrentItem() ? sal_True : sal_False); + m_pRemoveFieldIB->Enable(m_pDragED->HasCurrentItem()); SvTreeListEntry* pEntry = m_pAddressElementsLB->GetCurEntry(); m_pInsertFieldIB->Enable( pEntry && (0 < (sal_Int32)(sal_IntPtr)pEntry->GetUserData() || !m_pFieldCB->GetText().isEmpty())); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index e5f5114..ab0f069 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -852,7 +852,7 @@ void SwFrmPage::Reset( const SfxItemSet *rSet ) getFrmDlgParentShell(); nHtmlMode = ::GetHtmlMode(pSh->GetView().GetDocShell()); - bHtmlMode = nHtmlMode & HTMLMODE_ON ? sal_True : sal_False; + bHtmlMode = (nHtmlMode & HTMLMODE_ON) != 0; FieldUnit aMetric = ::GetDfltMetric(bHtmlMode); m_aWidthED.SetMetric(aMetric); @@ -2381,7 +2381,7 @@ void SwGrfExtPage::Reset(const SfxItemSet *rSet) { const SfxPoolItem* pItem; const sal_uInt16 nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current()); - bHtmlMode = nHtmlMode & HTMLMODE_ON ? sal_True : sal_False; + bHtmlMode = (nHtmlMode & HTMLMODE_ON) != 0; if( SfxItemState::SET == rSet->GetItemState( FN_PARAM_GRF_CONNECT, true, &pItem) && ((const SfxBoolItem *)pItem)->GetValue() ) @@ -2864,7 +2864,7 @@ void SwFrmAddPage::Reset(const SfxItemSet *rSet ) { const SfxPoolItem* pItem; sal_uInt16 nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current()); - bHtmlMode = nHtmlMode & HTMLMODE_ON ? sal_True : sal_False; + bHtmlMode = (nHtmlMode & HTMLMODE_ON) != 0; if (bHtmlMode) { pProtectFrame->Hide(); diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 9d0b32a..1875c49 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -170,7 +170,7 @@ void SwWrapTabPage::Reset(const SfxItemSet *rSet) } nHtmlMode = ::GetHtmlMode((const SwDocShell*)SfxObjectShell::Current()); - bHtmlMode = nHtmlMode & HTMLMODE_ON ? sal_True : sal_False; + bHtmlMode = (nHtmlMode & HTMLMODE_ON) != 0; FieldUnit aMetric = ::GetDfltMetric(bHtmlMode); SetMetric(*m_pLeftMarginED, aMetric); diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx index f2af13a..a8b12ec 100644 --- a/sw/source/ui/vba/vbaselection.cxx +++ b/sw/source/ui/vba/vbaselection.cxx @@ -131,7 +131,7 @@ SwVbaSelection::HomeKey( const uno::Any& _unit, const uno::Any& _extend ) throw sal_Int32 nExtend = word::WdMovementType::wdMove; _unit >>= nUnit; _extend >>= nExtend; - bool bExtend = ( nExtend == word::WdMovementType::wdExtend ) ? sal_True : sal_False; + bool bExtend = nExtend == word::WdMovementType::wdExtend; switch( nUnit ) { @@ -166,7 +166,7 @@ SwVbaSelection::EndKey( const uno::Any& _unit, const uno::Any& _extend ) throw ( sal_Int32 nExtend = word::WdMovementType::wdMove; _unit >>= nUnit; _extend >>= nExtend; - bool bExtend = ( nExtend == word::WdMovementType::wdExtend ) ? sal_True : sal_False; + bool bExtend = nExtend == word::WdMovementType::wdExtend; switch( nUnit ) { diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 462f0a6..cb68de1 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1074,7 +1074,7 @@ IMPL_LINK( SwDocShell, Ole2ModifiedHdl, void *, p ) // Bit 1: -> new state sal_IntPtr nStatus = (sal_IntPtr)p; if( IsEnableSetModified() ) - SetModified( (nStatus & 2) ? sal_True : sal_False ); + SetModified( (nStatus & 2) != 0 ); return 0; } diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index ec476a0..5bd15b3 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -1104,7 +1104,7 @@ void SwInsertConfig::Load() //#i61007# initialize caption order, right now only HUNGARIAN seems to need a different order SvtSysLocaleOptions aSysLocaleOptions; OUString sLang = aSysLocaleOptions.GetLocaleConfigString(); - bCaptionOrderNumberingFirst = ( !sLang.isEmpty() && sLang.matchAsciiL( "hu", 2 )) ? sal_True : sal_False; + bCaptionOrderNumberingFirst = !sLang.isEmpty() && sLang.matchAsciiL( "hu", 2 ); } } diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index c18f4cf..9b9b17b 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -403,8 +403,8 @@ SwSpellPopup::SwSpellPopup( } } } - EnableItem( MN_ADD_TO_DIC, ((nItemId - MN_DICTIONARIES_START) > 1)?sal_True:sal_False ); - EnableItem( MN_ADD_TO_DIC_SINGLE, ((nItemId - MN_DICTIONARIES_START) == 1)?sal_True:sal_False ); + EnableItem( MN_ADD_TO_DIC, (nItemId - MN_DICTIONARIES_START) > 1 ); + EnableItem( MN_ADD_TO_DIC_SINGLE, (nItemId - MN_DICTIONARIES_START) == 1 ); //ADD NEW LANGUAGE MENU ITEM diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index ec583fc..faa7633 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -198,7 +198,7 @@ void SwInputWindow::ShowWin() OSL_ENSURE(pWrtShell, "no WrtShell!"); // Cursor in table - bIsTable = pWrtShell->IsCrsrInTbl() ? sal_True : sal_False; + bIsTable = pWrtShell->IsCrsrInTbl(); if( bFirst ) pWrtShell->SelTblCells( LINK( this, SwInputWindow, diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 9c8b35d..636bfc9 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -684,8 +684,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) case FN_GOTO_PREV_OBJ: case FN_GOTO_NEXT_OBJ: { - bool bSuccess = rSh.GotoObj( - nSlot == FN_GOTO_NEXT_OBJ ? sal_True : sal_False); + bool bSuccess = rSh.GotoObj( nSlot == FN_GOTO_NEXT_OBJ ); rReq.SetReturnValue(SfxBoolItem(nSlot, bSuccess)); if (bSuccess && !rSh.IsSelFrmMode()) { @@ -2111,7 +2110,7 @@ void SwBaseShell::GetTxtFontCtrlState( SfxItemSet& rSet ) bool bVertical = rSh.IsInVerticalText(); aFont.SetOrientation(bVertical ? 2700 : 0); - aFont.SetVertical(bVertical ? sal_True : sal_False); + aFont.SetVertical(bVertical); GetView().GetEditWin().SetInputContext( InputContext( aFont, INPUTCONTEXT_TEXT | INPUTCONTEXT_EXTTEXTINPUT ) ); } diff --git a/sw/source/uibase/shells/textglos.cxx b/sw/source/uibase/shells/textglos.cxx index 80f4c3a..75c765d 100644 --- a/sw/source/uibase/shells/textglos.cxx +++ b/sw/source/uibase/shells/textglos.cxx @@ -109,7 +109,7 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq) if ( fnSetActGroup ) (*fnSetActGroup)( aGroup ); pGlosHdl->SetCurGroup(aGroup, true); - rReq.SetReturnValue(SfxBoolItem(nSlot, pGlosHdl->InsertGlossary( aName ) ? sal_True : sal_False)); + rReq.SetReturnValue(SfxBoolItem(nSlot, pGlosHdl->InsertGlossary( aName ))); rReq.Done(); } } diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index 452e720..ae8bf5b 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -1839,9 +1839,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) if ( IsTabColFromDoc() ) bColumn = rSh.GetCurMouseColNum( m_aTabColFromDocPos ) != 0; else - bColumn = (nFrmType & (FRMTYPE_COLUMN|FRMTYPE_FLY_ANY|FRMTYPE_COLSECTOUTTAB)) - ? sal_True - : sal_False; + bColumn = (nFrmType & (FRMTYPE_COLUMN|FRMTYPE_FLY_ANY|FRMTYPE_COLSECTOUTTAB)) != 0; if ( !bColumn ) { @@ -1868,7 +1866,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) } else { // Here only for table in multi-column pages and borders. - bool bSectOutTbl = (nFrmType & FRMTYPE_TABLE) ? sal_True : sal_False; + bool bSectOutTbl = (nFrmType & FRMTYPE_TABLE) != 0; bool bFrame = (nFrmType & FRMTYPE_FLY_ANY); bool bColSct = (nFrmType & ( bSectOutTbl ? FRMTYPE_COLSECTOUTTAB diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index 2402fd3..7b698d1 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -1938,7 +1938,7 @@ bool SwContentTree::ToggleToRoot() } } pConfig->SetRootType( nRootType ); - GetParentWindow()->aContentToolBox.CheckItem(FN_SHOW_ROOT, bIsRoot ? sal_True : sal_False); + GetParentWindow()->aContentToolBox.CheckItem(FN_SHOW_ROOT, bIsRoot); return bIsRoot; } commit 2abe293f085fc66eeaeeae85c9714a41a874cbcd Author: Matteo Casalin <[email protected]> Date: Sun Nov 9 20:49:05 2014 +0100 makeAny(sal_True/sal_False) to makeAny(true/false) in sw Change-Id: Ie368fecd39189dc6ea72737b0c695c55a2d350a9 diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx index aeee2a3..40e0761 100644 --- a/sw/source/core/unocore/swunohelper.cxx +++ b/sw/source/core/unocore/swunohelper.cxx @@ -70,7 +70,7 @@ bool UCB_DeleteFile( const OUString& rURL ) ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); aTempContent.executeCommand("delete", - ::com::sun::star::uno::makeAny( sal_True ) ); + ::com::sun::star::uno::makeAny( true ) ); bRemoved = true; } catch( ::com::sun::star::uno::Exception& ) diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index a682f7d..f94ce20 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -218,7 +218,7 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >& if ( bOASIS && docfunc::HasOutlineStyleToBeWrittenAsNormalListStyle( *pDoc ) ) { - xInfoSet->setPropertyValue( "OutlineStyleAsNormalListStyle", makeAny( sal_True ) ); + xInfoSet->setPropertyValue( "OutlineStyleAsNormalListStyle", makeAny( true ) ); } // filter arguments diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx index 78a498b..55ae07d 100644 --- a/sw/source/ui/vba/vbalistformat.cxx +++ b/sw/source/ui/vba/vbalistformat.cxx @@ -81,7 +81,7 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor } else { - xProps->setPropertyValue("ParaIsNumberingRestart", uno::makeAny( sal_False ) ); + xProps->setPropertyValue("ParaIsNumberingRestart", uno::makeAny( false ) ); } rListTemplate.applyListTemplate( xProps ); } diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx index 8c75691..d062473 100644 --- a/sw/source/ui/vba/vbapagesetup.cxx +++ b/sw/source/ui/vba/vbapagesetup.cxx @@ -61,7 +61,7 @@ double SAL_CALL SwVbaPageSetup::getHeaderDistance() throw (uno::RuntimeException bool isHeaderOn = false; mxPageProps->getPropertyValue("HeaderIsOn") >>= isHeaderOn; if( !isHeaderOn ) - mxPageProps->setPropertyValue("HeaderIsOn", uno::makeAny( sal_True ) ); + mxPageProps->setPropertyValue("HeaderIsOn", uno::makeAny( true ) ); return VbaPageSetupBase::getHeaderMargin(); } @@ -84,7 +84,7 @@ void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw mxPageProps->getPropertyValue("HeaderIsOn") >>= isHeaderOn; if( !isHeaderOn ) - mxPageProps->setPropertyValue("HeaderIsOn", uno::makeAny( sal_True ) ); + mxPageProps->setPropertyValue("HeaderIsOn", uno::makeAny( true ) ); mxPageProps->getPropertyValue("TopMargin") >>= aktTopMargin; mxPageProps->getPropertyValue("HeaderBodyDistance") >>= aktSpacing; @@ -104,7 +104,7 @@ double SAL_CALL SwVbaPageSetup::getFooterDistance() throw (uno::RuntimeException bool isFooterOn = false; mxPageProps->getPropertyValue("FooterIsOn") >>= isFooterOn; if( !isFooterOn ) - mxPageProps->setPropertyValue("FooterIsOn", uno::makeAny( sal_True ) ); + mxPageProps->setPropertyValue("FooterIsOn", uno::makeAny( true ) ); return VbaPageSetupBase::getFooterMargin(); } @@ -118,7 +118,7 @@ void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) throw mxPageProps->getPropertyValue("FooterIsOn") >>= isFooterOn; if( !isFooterOn ) - mxPageProps->setPropertyValue("FooterIsOn", uno::makeAny( sal_True ) ); + mxPageProps->setPropertyValue("FooterIsOn", uno::makeAny( true ) ); mxPageProps->getPropertyValue("BottomMargin") >>= aktBottomMargin; mxPageProps->getPropertyValue("FooterBodyDistance") >>= aktSpacing; @@ -173,8 +173,8 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status { nTopMargin += nHeaderHeight; nBottomMargin += nFooterHeight; - xStyleProps->setPropertyValue("HeaderIsOn", uno::makeAny( sal_False ) ); - xStyleProps->setPropertyValue("FooterIsOn", uno::makeAny( sal_False ) ); + xStyleProps->setPropertyValue("HeaderIsOn", uno::makeAny( false ) ); + xStyleProps->setPropertyValue("FooterIsOn", uno::makeAny( false ) ); } uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW ); if( xPageCursor->getPage() != 1 ) diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx index cc321ae..f2af13a 100644 --- a/sw/source/ui/vba/vbaselection.cxx +++ b/sw/source/ui/vba/vbaselection.cxx @@ -695,9 +695,9 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run uno::Reference< text::XTextTable > xTextTable; xCursorProps->getPropertyValue("TextTable") >>= xTextTable; if( xTextTable.is() ) - result = uno::makeAny( sal_True ); + result = uno::makeAny( true ); else - result = uno::makeAny( sal_False ); + result = uno::makeAny( false ); break; } case word::WdInformation::wdHeaderFooterType: diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx index bca5ca6..d268c4b 100644 --- a/sw/source/ui/vba/vbaview.cxx +++ b/sw/source/ui/vba/vbaview.cxx @@ -221,12 +221,12 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std:: case word::WdViewType::wdPrintView: case word::WdViewType::wdNormalView: { - mxViewSettings->setPropertyValue("ShowOnlineLayout", uno::makeAny( sal_False ) ); + mxViewSettings->setPropertyValue("ShowOnlineLayout", uno::makeAny( false ) ); break; } case word::WdViewType::wdWebView: { - mxViewSettings->setPropertyValue("ShowOnlineLayout", uno::makeAny( sal_True ) ); + mxViewSettings->setPropertyValue("ShowOnlineLayout", uno::makeAny( true ) ); break; } case word::WdViewType::wdPrintPreview: @@ -334,7 +334,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType ) xPageProps->getPropertyValue( aPropIsShared ) >>= isShared; if( !isOn ) { - xPageProps->setPropertyValue( aPropIsOn, uno::makeAny( sal_True ) ); + xPageProps->setPropertyValue( aPropIsOn, uno::makeAny( true ) ); xPageProps->setPropertyValue( aPropBodyDistance, uno::makeAny( DEFAULT_BODY_DISTANCE ) ); } if( !isShared ) diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx index 6944558..38002e5 100644 --- a/sw/source/ui/vba/vbawrapformat.cxx +++ b/sw/source/ui/vba/vbawrapformat.cxx @@ -62,13 +62,13 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException) case word::WdWrapType::wdWrapSquare: { eTextMode = text::WrapTextMode_PARALLEL; - m_xPropertySet->setPropertyValue("SurroundContour", uno::makeAny( sal_False ) ); + m_xPropertySet->setPropertyValue("SurroundContour", uno::makeAny( false ) ); break; } case word::WdWrapType::wdWrapTight: { eTextMode = text::WrapTextMode_PARALLEL; - m_xPropertySet->setPropertyValue("SurroundContour", uno::makeAny( sal_True ) ); + m_xPropertySet->setPropertyValue("SurroundContour", uno::makeAny( true ) ); break; } default: diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index 21cfa2e..c18f4cf 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -711,7 +711,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) { if (m_bGrammarResults) { - SvtLinguConfig().SetProperty( UPN_IS_GRAMMAR_INTERACTIVE, uno::makeAny( sal_True )); + SvtLinguConfig().SetProperty( UPN_IS_GRAMMAR_INTERACTIVE, uno::makeAny( true )); } m_pSh->Left(CRSR_SKIP_CHARS, false, 1, false ); { diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 3ffbba4..89f0871 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -385,7 +385,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) if ( eScroll == ScrollingAuto ) xSet->setPropertyValue("FrameIsAutoScroll", - uno::makeAny( sal_True ) ); + uno::makeAny( true ) ); else xSet->setPropertyValue("FrameIsScrollingMode", uno::makeAny( eScroll == ScrollingYes ) ); diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index 2fd78f0..4687312 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -633,7 +633,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( xRowSetPropSet->setPropertyValue( "Command", makeAny( aCurDataCommand ) ); xRowSetPropSet->setPropertyValue( "CommandType", makeAny( nCurDataCommandType ) ); xRowSetPropSet->setPropertyValue( "EscapeProcessing", makeAny( bCurEscapeProcessing ) ); - xRowSetPropSet->setPropertyValue( "ApplyFilter", makeAny( sal_True ) ); + xRowSetPropSet->setPropertyValue( "ApplyFilter", makeAny( true ) ); xRowSetPropSet->setPropertyValue( "Filter", makeAny( aCurFilter ) ); Reference< sdbc::XRowSet > xRowSet( xInstance, UNO_QUERY ); @@ -830,7 +830,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( return makeAny( Reference< XComponent >( xTextDoc->queryInterface( XComponent::static_type() ), css::uno::UNO_QUERY) ); } else - return makeAny( sal_True ); + return makeAny( true ); } void SAL_CALL SwXMailMerge::cancel() throw (com::sun::star::uno::RuntimeException, std::exception) diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 6d3c4ba..a3c19c0 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -181,7 +181,7 @@ static void disableScrollBars(uno::Reference< beans::XPropertySet > xViewProps, //To reproduce this problem, in edit->autotext and click through //the examples and see if the preview gets a horizontal scrollbar - uno::Any aFalseSet(uno::makeAny(sal_False)); + uno::Any aFalseSet(uno::makeAny(false)); xViewProps->setPropertyValue(UNO_NAME_SHOW_ONLINE_LAYOUT, aFalseSet); xViewProps->setPropertyValue(UNO_NAME_SHOW_HORI_SCROLL_BAR, aFalseSet); @@ -189,7 +189,7 @@ static void disableScrollBars(uno::Reference< beans::XPropertySet > xViewProps, if (bEnableOnlineMode) { - xViewProps->setPropertyValue(UNO_NAME_SHOW_ONLINE_LAYOUT, uno::makeAny(sal_True)); + xViewProps->setPropertyValue(UNO_NAME_SHOW_ONLINE_LAYOUT, uno::makeAny(true)); } } diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 48fc4cc..daa9d74 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -534,9 +534,9 @@ bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrmFm bDisableDataTableDialog ) { xProps->setPropertyValue("DisableDataTableDialog", - uno::makeAny( sal_False ) ); + uno::makeAny( false ) ); xProps->setPropertyValue("DisableComplexChartTypes", - uno::makeAny( sal_False ) ); + uno::makeAny( false ) ); uno::Reference< util::XModifiable > xModifiable( xProps, uno::UNO_QUERY ); if ( xModifiable.is() ) { commit fe4901829f7e1ff397945a7abd5af977a80978e9 Author: Matteo Casalin <[email protected]> Date: Sun Nov 9 20:00:53 2014 +0100 SetStrmStgPtr can return bool instead of sal_True/sal_False in an int Change-Id: I5348977de17d3f916cecabe4b5c3f7630a89667e diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 1027651..a1d024f 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -264,7 +264,7 @@ private: // Everyone who does not need the streams / storages open // has to overload the method (W4W!!). - virtual int SetStrmStgPtr(); + virtual bool SetStrmStgPtr(); }; class AsciiReader: public Reader diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 497d11c..052c607e 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -574,7 +574,7 @@ void Reader::MakeHTMLDummyTemplateDoc() // Users that do not need to open these Streams / Storages, // have to overload this method -int Reader::SetStrmStgPtr() +bool Reader::SetStrmStgPtr() { OSL_ENSURE( pMedium, "Where is the Media??" ); @@ -583,7 +583,7 @@ int Reader::SetStrmStgPtr() if( SW_STORAGE_READER & GetReaderType() ) { xStg = pMedium->GetStorage(); - return sal_True; + return true; } } else @@ -597,12 +597,12 @@ int Reader::SetStrmStgPtr() else if ( !(SW_STREAM_READER & GetReaderType()) ) { pStrm = NULL; - return sal_False; + return false; } - return sal_True; + return true; } - return sal_False; + return false; } int Reader::GetReaderType() diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index ce2e336..b47a601 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -173,16 +173,16 @@ OUString HTMLReader::GetTemplateName() const return OUString(); } -int HTMLReader::SetStrmStgPtr() +bool HTMLReader::SetStrmStgPtr() { OSL_ENSURE( pMedium, "Wo ist das Medium??" ); if( pMedium->IsRemote() || !pMedium->IsStorage() ) { pStrm = pMedium->GetInStream(); - return sal_True; + return true; } - return sal_False; + return false; } diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx index 480794b..2876154 100644 --- a/sw/source/filter/inc/fltini.hxx +++ b/sw/source/filter/inc/fltini.hxx @@ -32,7 +32,7 @@ class SwNodeIndex; class HTMLReader: public Reader { // wir wollen die Streams / Storages nicht geoeffnet haben - virtual int SetStrmStgPtr() SAL_OVERRIDE; + virtual bool SetStrmStgPtr() SAL_OVERRIDE; virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) SAL_OVERRIDE; virtual OUString GetTemplateName() const SAL_OVERRIDE; public: commit 9ba8304dad9473410fe5b30699fd4389e6a174aa Author: Matteo Casalin <[email protected]> Date: Sun Nov 9 18:39:00 2014 +0100 sal_True/sal_False to true/false in sw comments (also delete obsolete ones) Change-Id: Ifb29bd3e9c5dc7671c189fd9daa010305f7a85a4 diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 4a75581..3cc2ca6 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -593,11 +593,11 @@ uno::Reference< XAccessible> SAL_CALL { FireStateChangedEvent( AccessibleStateType::FOCUSED,true ); // OFFSCREEN == !SHOWING, should stay consistent - // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,sal_True ); + // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,true ); FireStateChangedEvent( AccessibleStateType::SHOWING,true ); FireStateChangedEvent( AccessibleStateType::BUSY,false ); // OFFSCREEN again? - // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,sal_False ); + // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,false ); } bBeginDocumentLoad = false; } diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 4afcba5..2fe410e 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -576,14 +576,14 @@ void SAL_CALL SwAccessibleDocument::notifyEvent( const ::com::sun::star::documen else if ( Event.EventName.equalsAscii( "LoadFinished" ) ) { // IA2 CWS. MT: OFFSCREEN == !SHOWING, should stay consistent - // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,sal_True ); + // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,true ); // MT: LoadFinished => Why not SHOWING == TRUE? FireStateChangedEvent( AccessibleStateType::SHOWING,false ); } else if ( Event.EventName.equalsAscii( "FormatFinished" ) ) { FireStateChangedEvent( AccessibleStateType::BUSY,false ); - // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,sal_False ); + // FireStateChangedEvent( AccessibleStateType::OFFSCREEN,false ); FireStateChangedEvent( AccessibleStateType::SHOWING,true ); } else diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 92e75a4..1d94b37 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -1439,7 +1439,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection() } //Marge with DoInvalidateShapeFocus -void SwAccessibleMap::DoInvalidateShapeSelection(bool bInvalidateFocusMode /*=sal_False*/) +void SwAccessibleMap::DoInvalidateShapeSelection(bool bInvalidateFocusMode /*=false*/) { SwAccessibleObjShape_Impl *pShapes = 0; SwAccessibleObjShape_Impl *pSelShape = 0; diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx index a55a44a..a2a8bd3 100644 --- a/sw/source/core/access/accselectionhelper.cxx +++ b/sw/source/core/access/accselectionhelper.cxx @@ -181,7 +181,6 @@ bool SwAccessibleSelectionHelper::isAccessibleChildSelected( void SwAccessibleSelectionHelper::clearAccessibleSelection( ) throw ( RuntimeException ) { - // return sal_False // we can't deselect } void SwAccessibleSelectionHelper::selectAllAccessibleChildren( ) diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index da6a6eb..e5271b3 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -400,7 +400,7 @@ SwSbxValue SwCalc::Calculate( const OUString& rStr ) /** ??? @param rVal ??? - @param bRound In previous times <bRound> had a default value of <sal_True>. + @param bRound In previous times <bRound> had a default value of <true>. There it should be only changed when calculating table cells, so that no rounding errors would occur while composing a formula. Now this parameter is ignored. diff --git a/sw/source/core/bastyp/swregion.cxx b/sw/source/core/bastyp/swregion.cxx index 1f57fe1..5e5cc6d 100644 --- a/sw/source/core/bastyp/swregion.cxx +++ b/sw/source/core/bastyp/swregion.cxx @@ -29,7 +29,7 @@ SwRegionRects::SwRegionRects( const SwRect &rStartRect, sal_uInt16 nInit ) : push_back( aOrigin ); } -// If <rDel> is sal_True then this Rect will be overwritten by <rRect> at +// If <rDel> is true then this Rect will be overwritten by <rRect> at // position <nPos>. Otherwise <rRect> is attached at the end. inline void SwRegionRects::InsertRect( const SwRect &rRect, const sal_uInt16 nPos, bool &rDel ) diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index cb0341f..0dfa7b1 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -2334,7 +2334,7 @@ bool SwCrsrShell::ExtendSelection( bool bEnd, sal_Int32 nCount ) /** Move visible cursor to given position in document. @param rPt The position to move the visible cursor to. - @return <sal_False> if SPoint was corrected by the layout. + @return <false> if SPoint was corrected by the layout. */ bool SwCrsrShell::SetVisCrsr( const Point &rPt ) { diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index f5d863f..4646ecc 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -732,7 +732,7 @@ void SwHyphArgs::SetPam( SwPaM *pPam ) const } } -// Returns sal_True if we can proceed. +// Returns true if we can proceed. static bool lcl_HyphenateNode( const SwNodePtr& rpNd, void* pArgs ) { // Hyphenate returns true if there is a hyphenation point and sets pPam diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx index 98a0347..67cddea 100644 --- a/sw/source/core/doc/docfly.cxx +++ b/sw/source/core/doc/docfly.cxx @@ -396,7 +396,7 @@ lcl_SetFlyFrmAttr(SwDoc & rDoc, ::sw::UndoGuard const undoGuard(rDoc.GetIDocumentUndoRedo()); // Is the anchor attribute included? - // If so, we pass it to a special method, which returns sal_True + // If so, we pass it to a special method, which returns true // if the Fly needs to be created anew, because we e.g change the FlyType. sal_Int8 const nMakeFrms = (SfxItemState::SET == rSet.GetItemState( RES_ANCHOR, false )) diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 4797a5b..3915fa8 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -1280,7 +1280,7 @@ bool SwDoc::NoNum( const SwPaM& rPam ) getIDocumentState().SetModified(); } else - bRet = false; // no Numbering or just always sal_True? + bRet = false; // no Numbering or just always true? } return bRet; } diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 9f45a32..8ee1638 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -252,7 +252,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const if( pGrfNd ) pGrfNd->SetFrameInPaint( true ); - // #i13147# - add 2nd parameter with value <sal_True> to + // #i13147# - add 2nd parameter with value <true> to // method call <FindFlyFrm().GetContour(..)> to indicate that it is called // for paint in order to avoid load of the intrinsic graphic. if ( ( !pOut->GetConnectMetaFile() || diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx index 0dd85ad..4836b63 100644 --- a/sw/source/core/doc/tblcpy.cxx +++ b/sw/source/core/doc/tblcpy.cxx @@ -558,7 +558,7 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox, SwPosition aMvPos( aInsIdx ); SwCntntNode* pCNd = pDoc->GetNodes().GoPrevious( &aMvPos.nNode ); aMvPos.nContent.Assign( pCNd, pCNd->Len() ); - pDoc->CorrAbs( aInsIdx, aEndNdIdx, aMvPos, /*sal_True*/false ); + pDoc->CorrAbs( aInsIdx, aEndNdIdx, aMvPos, false ); } // If we still have FlyFrames hanging around, delete them too diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index d70d70e..de1f3d4 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -696,9 +696,9 @@ void SwDoc::UpdateSection(sal_uInt16 const nPos, SwSectionData & rNewData, else sSectName.clear(); - /// In SwSection::operator=(..) class member bCondHiddenFlag is always set to sal_True. ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
