diff options
26 files changed, 41 insertions, 49 deletions
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 4fead783bcb7..1664e6921851 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 0dfa7b172373..28ab12cc9541 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 f688b5eeffa5..54cbf25b02cb 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 ee2c7be0dde0..8857a58b9c36 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 7e41893d4afb..ba12508a3aac 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 761453ea3ae3..8928367ac727 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 97341acdaadc..220955d522b5 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 759c856a5063..5b347df7f7da 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 39e5d2c9a985..a7a7395adc49 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 1aa2bd56ae54..90e9700c1bda 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 7e0410578fed..ec1c4c4bccc4 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 f45ebf0a2805..b5027d50e70f 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 b6cf98bc8bdd..0dd86918c4e3 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 f1305b91e3bd..fa84da7ba0fb 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 42530be1dea5..f96c004c1b7f 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 e5f51147198c..ab0f069acca2 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 9d0b32a2efe3..1875c49e2de4 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 f2af13a09a08..a8b12eca1566 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 462f0a6c9d20..cb68de1e3f3e 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 ec476a04bf26..5bd15b35d1bb 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 c18f4cf0dfc7..9b9b17baf741 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 ec583fc18371..faa763352e66 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 9c8b35d60930..636bfc946dfb 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 80f4c3a461d9..75c765da7613 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 452e720a79ea..ae8bf5be1409 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 2402fd3c56c7..7b698d1f1e0b 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; } |