diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-23 18:30:45 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-23 18:39:07 +0200 |
| commit | 22401181774dfb3882e7ad0335f1267d7885ff48 (patch) | |
| tree | cc31d4ef17eef1e76458e47cef8675458c8719ea | |
| parent | 6425f7ff616f9aaad8b4e279385ed3f5ab65bfe2 (diff) | |
Improved loplugin:literaltoboolconversion looking into cond. exprs.
...automatic rewriter fixes
Change-Id: I6b04ca80f08f8a71ff94e309fd52f44d736751ee
151 files changed, 307 insertions, 307 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 575ce6afc154..b994330fb627 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -2517,7 +2517,7 @@ RTLFUNC(IsArray) } else { - rPar.Get(0)->PutBool((rPar.Get(1)->GetType() & SbxARRAY) ? sal_True : sal_False ); + rPar.Get(0)->PutBool((rPar.Get(1)->GetType() & SbxARRAY) ? true : false ); } } diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index be21232d68f0..9e6ad47b3b74 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -1084,7 +1084,7 @@ static bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm, { pStrm->Seek( nFPos + nBlockLen ); } - return pStrm->GetErrorCode() ? sal_False : sal_True; + return pStrm->GetErrorCode() ? false : true; } static bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, @@ -1195,7 +1195,7 @@ static bool lcl_ReadSbxVariable( SbxVariable& rVar, SvStream* pStrm, { pStrm->Seek( nFPos + nBlockLen ); } - return pStrm->GetErrorCode() ? sal_False : sal_True; + return pStrm->GetErrorCode() ? false : true; } diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index 62bf3e2a3a46..f668b852ffcd 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -49,7 +49,7 @@ namespace cairocanvas { maFont->SetAlign( ALIGN_BASELINE ); maFont->SetCharSet( (rFontRequest.FontDescription.IsSymbolFont==com::sun::star::util::TriState_YES) ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); - maFont->SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? sal_True : sal_False ); + maFont->SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? true : false ); // TODO(F2): improve panose->vclenum conversion maFont->SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) ); diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index a7e6f48b9306..7efcd3196cae 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -51,7 +51,7 @@ namespace vclcanvas { maFont->SetAlign( ALIGN_BASELINE ); maFont->SetCharSet( (rFontRequest.FontDescription.IsSymbolFont==com::sun::star::util::TriState_YES) ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); - maFont->SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? sal_True : sal_False ); + maFont->SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? true : false ); // TODO(F2): improve panose->vclenum conversion maFont->SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) ); diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index a211f3de02bc..b43578b8e6a8 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -41,8 +41,8 @@ void lcl_enableRangeChoosing( bool bEnable, Dialog * pDialog ) { if( pDialog ) { - pDialog->Show( bEnable ? sal_False : sal_True ); - pDialog->SetModalInputMode( bEnable ? sal_False : sal_True ); + pDialog->Show( bEnable ? false : true ); + pDialog->SetModalInputMode( bEnable ? false : true ); } } diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index e2c30c5b1e08..f106decc7878 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -136,8 +136,8 @@ void lcl_enableRangeChoosing( bool bEnable, Dialog * pDialog ) { if( pDialog ) { - pDialog->Show( bEnable ? sal_False : sal_True ); - pDialog->SetModalInputMode( bEnable ? sal_False : sal_True ); + pDialog->Show( bEnable ? false : true ); + pDialog->SetModalInputMode( bEnable ? false : true ); } } diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 00f16fd7d7ac..7541f6726a19 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -46,8 +46,8 @@ namespace { if( pDialog ) { - pDialog->Show( bEnable ? sal_False : sal_True ); - pDialog->SetModalInputMode( bEnable ? sal_False : sal_True ); + pDialog->Show( bEnable ? false : true ); + pDialog->SetModalInputMode( bEnable ? false : true ); } } diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx index c776bd8a584f..ec619ee7db5d 100644 --- a/connectivity/source/drivers/kab/KStatement.cxx +++ b/connectivity/source/drivers/kab/KStatement.cxx @@ -272,8 +272,8 @@ KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNo pColumnRef->getChild(0)->getTokenValue(); bool bAscending = SQL_ISTOKEN(pAscendingDescending, DESC)? - sal_False: - sal_True; + false: + true; return new KabSimpleOrder(sColumnName, bAscending); } diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index fdfcd9162fc4..5cfb9b76c908 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -298,22 +298,22 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression OUString searchedValue = evStr->getValue(); if (evStr->getCond() == MQueryOp::Is) { SAL_INFO("connectivity.mork", "MQueryOp::Is; done"); - resultVector.push_back((currentValue == searchedValue) ? sal_True : sal_False); + resultVector.push_back((currentValue == searchedValue) ? true : false); } else if (evStr->getCond() == MQueryOp::IsNot) { SAL_INFO("connectivity.mork", "MQueryOp::IsNot; done"); - resultVector.push_back((currentValue == searchedValue) ? sal_False : sal_True); + resultVector.push_back((currentValue == searchedValue) ? false : true); } else if (evStr->getCond() == MQueryOp::EndsWith) { SAL_INFO("connectivity.mork", "MQueryOp::EndsWith; done"); - resultVector.push_back((currentValue.endsWith(searchedValue)) ? sal_True : sal_False); + resultVector.push_back((currentValue.endsWith(searchedValue)) ? true : false); } else if (evStr->getCond() == MQueryOp::BeginsWith) { SAL_INFO("connectivity.mork", "MQueryOp::BeginsWith; done"); - resultVector.push_back((currentValue.startsWith(searchedValue)) ? sal_True : sal_False); + resultVector.push_back((currentValue.startsWith(searchedValue)) ? true : false); } else if (evStr->getCond() == MQueryOp::Contains) { SAL_INFO("connectivity.mork", "MQueryOp::Contains; done"); - resultVector.push_back((currentValue.indexOf(searchedValue) == -1) ? sal_False : sal_True); + resultVector.push_back((currentValue.indexOf(searchedValue) == -1) ? false : true); } else if (evStr->getCond() == MQueryOp::DoesNotContain) { SAL_INFO("connectivity.mork", "MQueryOp::DoesNotContain; done"); - resultVector.push_back((currentValue.indexOf(searchedValue) == -1) ? sal_True : sal_False); + resultVector.push_back((currentValue.indexOf(searchedValue) == -1) ? true : false); } else if (evStr->getCond() == MQueryOp::RegExp) { SAL_INFO("connectivity.mork", "MQueryOp::RegExp; done"); utl::SearchParam param( @@ -326,10 +326,10 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression } } else if (evStr->getCond() == MQueryOp::Exists) { SAL_INFO("connectivity.mork", "MQueryOp::Exists; done"); - resultVector.push_back((currentValue.isEmpty()) ? sal_False : sal_True); + resultVector.push_back((currentValue.isEmpty()) ? false : true); } else if (evStr->getCond() == MQueryOp::DoesNotExist) { SAL_INFO("connectivity.mork", "MQueryOp::DoesNotExist; done"); - resultVector.push_back((currentValue.isEmpty()) ? sal_True : sal_False); + resultVector.push_back((currentValue.isEmpty()) ? true : false); } } else if ( (*evIter)->isExpr() ) { diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 1dbd644dae90..15ba21a468d6 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -437,9 +437,9 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox) } // pass on to the engine - m_pSearchEngine->SetWildcard(m_pcbWildCard->IsEnabled() ? m_pcbWildCard->IsChecked() : sal_False); - m_pSearchEngine->SetRegular(m_pcbRegular->IsEnabled() ? m_pcbRegular->IsChecked() : sal_False); - m_pSearchEngine->SetLevenshtein(m_pcbApprox->IsEnabled() ? m_pcbApprox->IsChecked() : sal_False); + m_pSearchEngine->SetWildcard(m_pcbWildCard->IsEnabled() ? m_pcbWildCard->IsChecked() : false); + m_pSearchEngine->SetRegular(m_pcbRegular->IsEnabled() ? m_pcbRegular->IsChecked() : false); + m_pSearchEngine->SetLevenshtein(m_pcbApprox->IsEnabled() ? m_pcbApprox->IsChecked() : false); // (disabled boxes have to be passed to the engine as sal_False) // adjust the Position-Listbox (which is not allowed during Wildcard-search) diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index a025522724c0..95c5990d4a5a 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -338,7 +338,7 @@ namespace offapp // the enabled flag SFX_ITEMSET_GET( _rSet, pEnabled, SfxBoolItem, SID_SB_POOLING_ENABLED, true ); OSL_ENSURE(pEnabled, "ConnectionPoolOptionsPage::implInitControls: missing the Enabled item!"); - m_pEnablePooling->Check(pEnabled ? pEnabled->GetValue() : sal_True); + m_pEnablePooling->Check(pEnabled ? pEnabled->GetValue() : true); m_pEnablePooling->SaveValue(); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 09cb920fc7f6..b31d3a1030ae 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1463,7 +1463,7 @@ IMPL_LINK( SvxBackgroundTabPage, LoadIdleHdl_Impl, Idle* , pIdle ) // new file chosen aBgdGraphicPath = pImportDlg->GetPath(); aBgdGraphicFilter = pImportDlg->GetCurrentFilter(); - bool bLink = ( nHtmlMode & HTMLMODE_ON ) || bLinkOnly ? sal_True : pImportDlg->IsAsLink(); + bool bLink = ( nHtmlMode & HTMLMODE_ON ) || bLinkOnly ? true : pImportDlg->IsAsLink(); m_pBtnLink->Check( bLink ); m_pBtnLink->Enable(); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index c69f73205163..a20e262ab793 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -568,12 +568,12 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet ) // horizontal alignment pItem = GetItem( *rSet, SID_ATTR_PAGE_EXT1 ); m_pHorzBox->Check( pItem ? static_cast<const SfxBoolItem*>(pItem)->GetValue() - : sal_False ); + : false ); // vertical alignment pItem = GetItem( *rSet, SID_ATTR_PAGE_EXT2 ); m_pVertBox->Check( pItem ? static_cast<const SfxBoolItem*>(pItem)->GetValue() - : sal_False ); + : false ); // set example window on the table m_pBspWin->SetTable( true ); @@ -589,7 +589,7 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet ) m_pAdaptBox->Show(); pItem = GetItem( *rSet, SID_ATTR_PAGE_EXT1 ); m_pAdaptBox->Check( pItem ? - static_cast<const SfxBoolItem*>(pItem)->GetValue() : sal_False ); + static_cast<const SfxBoolItem*>(pItem)->GetValue() : false ); //!!! hidden, because not implemented by StarDraw m_pLayoutBox->Hide(); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index b1fb6102f323..5fae3ff8f22d 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -744,7 +744,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet) else rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_POS ), - m_pPositionCB->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); + m_pPositionCB->GetState() == TRISTATE_TRUE ? true : false ) ); bModified = true; } @@ -755,7 +755,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet* rSet) else rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_SIZE ), - m_pSizeCB->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); + m_pSizeCB->GetState() == TRISTATE_TRUE ? true : false ) ); bModified = true; } diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 5de0107e010a..79cf18af1ac0 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -788,7 +788,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) { rOutAttrs->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_POS ), - m_pTsbPosProtect->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); + m_pTsbPosProtect->GetState() == TRISTATE_TRUE ? true : false ) ); } bModified = true; @@ -827,7 +827,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) else rOutAttrs->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_SIZE ), - m_pTsbSizeProtect->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); + m_pTsbSizeProtect->GetState() == TRISTATE_TRUE ? true : false ) ); bModified = true; } @@ -840,7 +840,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) else rOutAttrs->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_AUTOWIDTH ), - m_pTsbAutoGrowWidth->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); + m_pTsbAutoGrowWidth->GetState() == TRISTATE_TRUE ? true : false ) ); } bModified = true; } @@ -854,7 +854,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs ) else rOutAttrs->Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_AUTOHEIGHT ), - m_pTsbAutoGrowHeight->GetState() == TRISTATE_TRUE ? sal_True : sal_False ) ); + m_pTsbAutoGrowHeight->GetState() == TRISTATE_TRUE ? true : false ) ); } bModified = true; } diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index a90f33cc8fcd..941d8802b4d9 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -195,7 +195,7 @@ sal_Bool SAL_CALL ORowSetBase::wasNull( ) throw(SQLException, RuntimeException, bool ORowSetBase::impl_wasNull() { - return ((m_nLastColumnIndex != -1) && !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is()) ? ((*m_aCurrentRow)->get())[m_nLastColumnIndex].isNull() : sal_True; + return ((m_nLastColumnIndex != -1) && !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is()) ? ((*m_aCurrentRow)->get())[m_nLastColumnIndex].isNull() : true; } const ORowSetValue& ORowSetBase::getValue(sal_Int32 columnIndex) diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx index b96a36a610d2..3fd01d4f5afa 100644 --- a/dbaccess/source/filter/xml/xmlComponent.cxx +++ b/dbaccess/source/filter/xml/xmlComponent.cxx @@ -73,7 +73,7 @@ OXMLComponent::OXMLComponent( ODBFilter& rImport m_sName = m_sName.replace( '/', '_' ); break; case XML_TOK_AS_TEMPLATE: - m_bAsTemplate = (sValue == s_sTRUE ? sal_True : sal_False); + m_bAsTemplate = (sValue == s_sTRUE ? true : false); break; } } diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 7188a9562b53..f97686b12728 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -589,7 +589,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const break; case ID_BROWSER_CUT: aReturn.bEnabled = !isDataSourceReadOnly() && getContainer()->getSelectionCount() >= 1; - aReturn.bEnabled = aReturn.bEnabled && ( (ID_BROWSER_CUT == _nId && getContainer()->getElementType() == E_TABLE) ? getContainer()->isCutAllowed() : sal_True); + aReturn.bEnabled = aReturn.bEnabled && ( (ID_BROWSER_CUT == _nId && getContainer()->getElementType() == E_TABLE) ? getContainer()->isCutAllowed() : true); break; case ID_BROWSER_PASTE: switch( getContainer()->getElementType() ) diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index b007531d29c0..68159f616baa 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -276,7 +276,7 @@ void OTableGrantControl::InitController( CellControllerRef& /*rController*/, lon { // get the privileges from the user TTablePrivilegeMap::const_iterator aFind = findPrivilege(nRow); - m_pCheckCell->GetBox().Check(aFind != m_aPrivMap.end() ? isAllowed(nColumnId,aFind->second.nRights) : sal_False); + m_pCheckCell->GetBox().Check(aFind != m_aPrivMap.end() ? isAllowed(nColumnId,aFind->second.nRights) : false); } } diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 27c57af8fc3b..67ff416c3d0e 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -288,7 +288,7 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState) static_cast<OGenericAdministrationPage*>(pPage)->SetAdminDialog(this,this); pPage->SetText(ModuleRes(nStringId)); defaultButton( _nState == START_PAGE ? WZB_NEXT : WZB_FINISH ); - enableButtons( WZB_FINISH, _nState == START_PAGE ? sal_False : sal_True); + enableButtons( WZB_FINISH, _nState == START_PAGE ? false : true); pPage->Show(); } return pPage; diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 30240f286c08..e07d25477f79 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -559,7 +559,7 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState) defaultButton( _nState == PAGE_DBSETUPWIZARD_FINAL ? WZB_FINISH : WZB_NEXT ); enableButtons( WZB_FINISH, _nState == PAGE_DBSETUPWIZARD_FINAL ); - enableButtons( WZB_NEXT, _nState == PAGE_DBSETUPWIZARD_FINAL ? sal_False : sal_True); + enableButtons( WZB_NEXT, _nState == PAGE_DBSETUPWIZARD_FINAL ? false : true); pPage->Show(); } return pPage; diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index 5d2b824df208..b4056a4f354f 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -150,7 +150,7 @@ IMPL_LINK( OCopyTable, KeyClickHdl, Button*, /*pButton*/ ) bool OCopyTable::LeavePage() { - m_pParent->m_bCreatePrimaryKeyColumn = (m_bPKeyAllowed && m_pCB_PrimaryColumn->IsEnabled()) ? m_pCB_PrimaryColumn->IsChecked() : sal_False; + m_pParent->m_bCreatePrimaryKeyColumn = (m_bPKeyAllowed && m_pCB_PrimaryColumn->IsEnabled()) ? m_pCB_PrimaryColumn->IsChecked() : false; m_pParent->m_aKeyName = m_pParent->m_bCreatePrimaryKeyColumn ? m_pEdKeyName->GetText() : OUString(); m_pParent->setUseHeaderLine( m_pCB_UseHeaderLine->IsChecked() ); diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index eb76c32b4e95..c26f187575d4 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -1183,7 +1183,7 @@ OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTab if ((!pLhs || pLhs->ExistsAConn()) && (!pRhs || pRhs->ExistsAConn())) { - bool bFoundStart = _rpFirstAfter ? sal_False : sal_True; + bool bFoundStart = _rpFirstAfter ? false : true; ::std::vector<OTableConnection*>::const_iterator aIter = m_vTableConnection.begin(); ::std::vector<OTableConnection*>::const_iterator aEnd = m_vTableConnection.end(); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index fa78833bfb2a..ec4ac8a77cef 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -475,7 +475,7 @@ sal_Int32 OTableEditorCtrl::HasFieldName( const OUString& rFieldName ) Reference<XConnection> xCon = GetView()->getController().getConnection(); Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : Reference< XDatabaseMetaData>(); - ::comphelper::UStringMixEqual bCase(xMetaData.is() ? xMetaData->supportsMixedCaseQuotedIdentifiers() : sal_True); + ::comphelper::UStringMixEqual bCase(xMetaData.is() ? xMetaData->supportsMixedCaseQuotedIdentifiers() : true); ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_pRowList->begin(); ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_pRowList->end(); diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index e01e0654689f..6cdbbdec71ab 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -918,7 +918,7 @@ bool OTableController::checkColumns(bool _bNew) Reference< XDatabaseMetaData > xMetaData = getMetaData( ); DatabaseMetaData aMetaData( getConnection() ); - ::comphelper::UStringMixEqual bCase(xMetaData.is() ? xMetaData->supportsMixedCaseQuotedIdentifiers() : sal_True); + ::comphelper::UStringMixEqual bCase(xMetaData.is() ? xMetaData->supportsMixedCaseQuotedIdentifiers() : true); ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin(); ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end(); for(;aIter != aEnd;++aIter) @@ -1001,7 +1001,7 @@ void OTableController::alterColumns() // contains all columns names which are already handled those which are not in the list will be deleted Reference< XDatabaseMetaData> xMetaData = getMetaData( ); - ::std::map< OUString,sal_Bool,::comphelper::UStringMixLess> aColumns(xMetaData.is() ? xMetaData->supportsMixedCaseQuotedIdentifiers() : sal_True); + ::std::map< OUString,sal_Bool,::comphelper::UStringMixLess> aColumns(xMetaData.is() ? xMetaData->supportsMixedCaseQuotedIdentifiers() : true); ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aIter = m_vRowList.begin(); ::std::vector< ::boost::shared_ptr<OTableRow> >::iterator aEnd = m_vRowList.end(); // first look for columns where something other than the name changed @@ -1465,7 +1465,7 @@ OUString OTableController::createUniqueName(const OUString& _rName) OUString sName = _rName; Reference< XDatabaseMetaData> xMetaData = getMetaData( ); - ::comphelper::UStringMixEqual bCase(xMetaData.is() ? xMetaData->supportsMixedCaseQuotedIdentifiers() : sal_True); + ::comphelper::UStringMixEqual bCase(xMetaData.is() ? xMetaData->supportsMixedCaseQuotedIdentifiers() : true); ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin(); ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end(); diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index 919625967845..cecd7801e2e3 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -403,7 +403,7 @@ namespace drawinglayer // define various other FontAttribute aRetval.SetAlign(ALIGN_BASELINE); aRetval.SetCharSet(rFontAttribute.getSymbol() ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE); - aRetval.SetVertical(rFontAttribute.getVertical() ? sal_True : sal_False); + aRetval.SetVertical(rFontAttribute.getVertical() ? true : false); aRetval.SetWeight(static_cast<FontWeight>(rFontAttribute.getWeight())); aRetval.SetItalic(rFontAttribute.getItalic() ? ITALIC_NORMAL : ITALIC_NONE); aRetval.SetOutline(rFontAttribute.getOutline()); diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 4d67332c4829..5ca790b829c3 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -3085,7 +3085,7 @@ SvStream& EditEngineItemPool::Store( SvStream& rStream ) const long nVersion = rStream.GetVersion(); bool b31Format = ( nVersion && ( nVersion <= SOFFICE_FILEFORMAT_31 ) ) - ? sal_True : sal_False; + ? true : false; EditEngineItemPool* pThis = const_cast<EditEngineItemPool*>(this); if ( b31Format ) diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 61e8a34854cd..bfc2df22e55c 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -70,12 +70,12 @@ struct EPaM inline bool EPaM::operator < ( const EPaM& r ) const { return ( ( nPara < r.nPara ) || - ( ( nPara == r.nPara ) && nIndex < r.nIndex ) ) ? sal_True : sal_False; + ( ( nPara == r.nPara ) && nIndex < r.nIndex ) ) ? true : false; } inline bool EPaM::operator == ( const EPaM& r ) const { - return ( ( nPara == r.nPara ) && ( nIndex == r.nIndex ) ) ? sal_True : sal_False; + return ( ( nPara == r.nPara ) && ( nIndex == r.nIndex ) ) ? true : false; } struct ScriptTypePosInfo @@ -546,7 +546,7 @@ public: void SetInvalid() { bInvalid = true; } void SetValid() { bInvalid = false; } - bool IsEmpty() const { return (nEnd > nStart) ? sal_False : sal_True; } + bool IsEmpty() const { return (nEnd > nStart) ? false : true; } CharPosArrayType& GetCharPosArray() { return aPositions;} const CharPosArrayType& GetCharPosArray() const { return aPositions;} diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx index e3ab1dbe398f..db79813c9b41 100644 --- a/editeng/source/editeng/eertfpar.cxx +++ b/editeng/source/editeng/eertfpar.cxx @@ -127,12 +127,12 @@ SvParserState EditRTFParser::CallParser() // Problem: Paragraph attributes may not possibly be taken over // => Do Character attributes. - bool bSpecialBackward = aStart1PaM.GetNode()->Len() ? sal_False : sal_True; + bool bSpecialBackward = aStart1PaM.GetNode()->Len() ? false : true; if ( bOnlyOnePara || aStart1PaM.GetNode()->Len() ) mpEditEngine->ParaAttribsToCharAttribs( aStart2PaM.GetNode() ); aCurSel.Min() = mpEditEngine->ConnectParagraphs( aStart1PaM.GetNode(), aStart2PaM.GetNode(), bSpecialBackward ); - bSpecialBackward = aEnd1PaM.GetNode()->Len() ? sal_True : sal_False; + bSpecialBackward = aEnd1PaM.GetNode()->Len() ? true : false; // when bOnlyOnePara, then the node is gone on Connect. if ( !bOnlyOnePara && aEnd1PaM.GetNode()->Len() ) mpEditEngine->ParaAttribsToCharAttribs( aEnd2PaM.GetNode() ); diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 118fc01d27d1..e8dd94a96f22 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -945,7 +945,7 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor, sal_uInt16 unsigned char nCursorDir = CURSOR_DIRECTION_NONE; if ( IsInsertMode() && !aEditSelection.HasRange() && ( pEditEngine->pImpEditEngine->HasDifferentRTLLevels( aPaM.GetNode() ) ) ) { - sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTextPortionStart, nShowCursorFlags & GETCRSR_PREFERPORTIONSTART ? sal_True : sal_False ); + sal_uInt16 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTextPortionStart, nShowCursorFlags & GETCRSR_PREFERPORTIONSTART ? true : false ); const TextPortion* pTextPortion = pParaPortion->GetTextPortions()[nTextPortion]; sal_uInt16 nRTLLevel = pTextPortion->GetRightToLeft(); if ( nRTLLevel%2 ) @@ -1556,7 +1556,7 @@ bool ImpEditView::SetCursorAtPoint( const Point& rPointPixel ) SetEditSelection( aNewEditSelection ); } - bool bForceCursor = ( pDragAndDropInfo ? sal_False : sal_True ) && !pEditEngine->pImpEditEngine->IsInSelectionMode(); + bool bForceCursor = ( pDragAndDropInfo ? false : true ) && !pEditEngine->pImpEditEngine->IsInSelectionMode(); ShowCursor( bGotoCursor, bForceCursor ); return true; } diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 45dc28a27123..328f62218ee9 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -525,7 +525,7 @@ private: void InsertUndo( EditUndo* pUndo, bool bTryMerge = false ); void ResetUndoManager(); - bool HasUndoManager() const { return pUndoManager ? sal_True : sal_False; } + bool HasUndoManager() const { return pUndoManager ? true : false; } EditUndoSetAttribs* CreateAttribUndo( EditSelection aSel, const SfxItemSet& rSet ); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index b0593cde7b6b..1de08af8e87e 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -763,7 +763,7 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE KeyEvent aTranslatedKeyEvent = rKeyEvent.LogicalTextDirectionality( eTextDirection ); - bool bCtrl = aTranslatedKeyEvent.GetKeyCode().IsMod1() ? sal_True : sal_False; + bool bCtrl = aTranslatedKeyEvent.GetKeyCode().IsMod1() ? true : false; sal_uInt16 nCode = aTranslatedKeyEvent.GetKeyCode().GetCode(); if ( DoVisualCursorTraveling( aPaM.GetNode() ) ) @@ -954,7 +954,7 @@ EditPaM ImpEditEngine::CursorVisualStartEnd( EditView* pEditView, const EditPaM& sal_Int32 nTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex(), nTmp, true ); const TextPortion* pTextPortion = pParaPortion->GetTextPortions()[nTextPortion]; sal_Int32 nRTLLevel = pTextPortion->GetRightToLeft(); - bool bPortionRTL = (nRTLLevel%2) ? sal_True : sal_False; + bool bPortionRTL = (nRTLLevel%2) ? true : false; if ( bStart ) { @@ -1026,7 +1026,7 @@ EditPaM ImpEditEngine::CursorVisualLeftRight( EditView* pEditView, const EditPaM if ( bPortionBoundary && aPaM.GetIndex() && ( aPaM.GetIndex() < aPaM.GetNode()->Len() ) ) { sal_Int32 nTmp; - sal_Int32 nNextTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex()+1, nTmp, bLogicalBackward ? sal_False : sal_True ); + sal_Int32 nNextTextPortion = pParaPortion->GetTextPortions().FindPortion( aPaM.GetIndex()+1, nTmp, bLogicalBackward ? false : true ); const TextPortion* pNextTextPortion = pParaPortion->GetTextPortions()[nNextTextPortion]; nRTLLevelNextPortion = pNextTextPortion->GetRightToLeft(); } @@ -2374,7 +2374,7 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, sal_uInt8 n // Decide now if to delete selection (RESTOFCONTENTS) bool bSpecialBackward = ( ( nMode == DEL_LEFT ) && ( nDelMode == DELMODE_SIMPLE ) ) - ? sal_True : sal_False; + ? true : false; if ( aStatus.IsAnyOutliner() ) bSpecialBackward = false; @@ -2550,7 +2550,7 @@ EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel, EditPaM aPaM( rCurSel.Min() ); bool bDoOverwrite = ( bOverwrite && - ( aPaM.GetIndex() < aPaM.GetNode()->Len() ) ) ? sal_True : sal_False; + ( aPaM.GetIndex() < aPaM.GetNode()->Len() ) ) ? true : false; bool bUndoAction = ( rCurSel.HasRange() || bDoOverwrite ); @@ -2626,7 +2626,7 @@ EditPaM ImpEditEngine::InsertText( const EditSelection& rCurSel, if ( IsUndoEnabled() && !IsInUndo() ) { EditUndoInsertChars* pNewUndo = new EditUndoInsertChars(pEditEngine, CreateEPaM(aPaM), OUString(c)); - bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? sal_True : sal_False; + bool bTryMerge = ( !bDoOverwrite && ( c != ' ' ) ) ? true : false; InsertUndo( pNewUndo, bTryMerge ); } @@ -4151,7 +4151,7 @@ Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, sal_Int32 nIndex, if (nLineCount == 0) return Rectangle(); const EditLine* pLine = NULL; - bool bEOL = ( nFlags & GETCRSR_ENDOFLINE ) ? sal_True : sal_False; + bool bEOL = ( nFlags & GETCRSR_ENDOFLINE ) ? true : false; for (sal_Int32 nLine = 0; nLine < nLineCount; ++nLine) { const EditLine* pTmpLine = pPortion->GetLines()[nLine]; @@ -4199,7 +4199,7 @@ Rectangle ImpEditEngine::GetEditCursor( ParaPortion* pPortion, sal_Int32 nIndex, } else { - nX = GetXPos( pPortion, pLine, nIndex, ( nFlags & GETCRSR_PREFERPORTIONSTART ) ? sal_True : sal_False ); + nX = GetXPos( pPortion, pLine, nIndex, ( nFlags & GETCRSR_PREFERPORTIONSTART ) ? true : false ); } aEditCursor.Left() = aEditCursor.Right() = nX; diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index eb9f2ebb9265..0cc08265e92a 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -1818,7 +1818,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te nBreakPos++; } - bHangingPunctuation = ( nBreakPos > nMaxBreakPos ) ? sal_True : sal_False; + bHangingPunctuation = ( nBreakPos > nMaxBreakPos ) ? true : false; pLine->SetHangingPunctuation( bHangingPunctuation ); // Whether a separator or not, push the word after the separator through @@ -2526,7 +2526,7 @@ void ImpEditEngine::SetVertical( bool bVertical ) if ( IsVertical() != bVertical ) { GetEditDoc().SetVertical( bVertical ); - bool bUseCharAttribs = ( aStatus.GetControlWord() & EEControlBits::USECHARATTRIBS ) ? sal_True : sal_False; + bool bUseCharAttribs = ( aStatus.GetControlWord() & EEControlBits::USECHARATTRIBS ) ? true : false; GetEditDoc().CreateDefFont( bUseCharAttribs ); if ( IsFormatted() ) { @@ -4327,7 +4327,7 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_Int32 nPara, short nScriptType = GetI18NScriptType( EditPaM( pNode, nIndex+1 ) ); bCTL = nScriptType == i18n::ScriptType::COMPLEX; // this change was discussed in issue 37190 - bR2L = (GetRightToLeft( nPara, nIndex + 1) % 2) ? sal_True : sal_False; + bR2L = (GetRightToLeft( nPara, nIndex + 1) % 2) ? true : false; // it also works for issue 55927 } diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 6067a908d88c..5effa6ebd3ef 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -270,7 +270,7 @@ bool ImpEditEngine::WriteItemListAsRTF( ItemList& rLst, SvStream& rOutput, sal_I WriteItemAsRTF( *pAttrItem, rOutput, nPara, nPos,rFontTable, rColorList ); pAttrItem = rLst.Next(); } - return ( rLst.Count() ? sal_True : sal_False ); + return ( rLst.Count() ? true : false ); } static void lcl_FindValidAttribs( ItemList& rLst, ContentNode* pNode, sal_Int32 nIndex, sal_uInt16 nScriptType ) @@ -1031,7 +1031,7 @@ EditTextObject* ImpEditEngine::CreateTextObject( EditSelection aSel, SfxItemPool bool bOnlyFullParagraphs = ( aSel.Min().GetIndex() || ( aSel.Max().GetIndex() < aSel.Max().GetNode()->Len() ) ) ? - sal_False : sal_True; + false : true; // Templates are not saved! // (Only the name and family, template itself must be in App!) @@ -1053,7 +1053,7 @@ EditTextObject* ImpEditEngine::CreateTextObject( EditSelection aSel, SfxItemPool sal_Int32 nStartPos = 0; sal_Int32 nEndPos = pNode->Len(); - bool bEmptyPara = nEndPos ? sal_False : sal_True; + bool bEmptyPara = nEndPos ? false : true; if ( ( nNode == nStartNode ) && !bOnlyFullParagraphs ) nStartPos = aSel.Min().GetIndex(); @@ -1233,7 +1233,7 @@ EditSelection ImpEditEngine::InsertTextObject( const EditTextObject& rTextObject for (sal_Int32 n = 0; n < nContents; ++n, ++nPara) { const ContentInfo* pC = &rTextObject.mpImpl->GetContents()[n]; - bool bNewContent = aPaM.GetNode()->Len() ? sal_False: sal_True; + bool bNewContent = aPaM.GetNode()->Len() ? false: true; const sal_Int32 nStartPos = aPaM.GetIndex(); aPaM = ImpFastInsertText( aPaM, pC->GetText() ); @@ -1243,7 +1243,7 @@ EditSelection ImpEditEngine::InsertTextObject( const EditTextObject& rTextObject pPortion->MarkInvalid( nStartPos, pC->GetText().getLength() ); // Character attributes ... - bool bAllreadyHasAttribs = aPaM.GetNode()->GetCharAttribs().Count() ? sal_True : sal_False; + bool bAllreadyHasAttribs = aPaM.GetNode()->GetCharAttribs().Count() ? true : false; size_t nNewAttribs = pC->GetAttribs().size(); if ( nNewAttribs ) { @@ -1302,7 +1302,7 @@ EditSelection ImpEditEngine::InsertTextObject( const EditTextObject& rTextObject { // only style and ParaAttribs when new paragraph, or // completely internal ... - bParaAttribs = pC->GetParaAttribs().Count() ? sal_True : sal_False; + bParaAttribs = pC->GetParaAttribs().Count() ? true : false; if ( GetStyleSheetPool() && pC->GetStyle().getLength() ) { SfxStyleSheet* pStyle = static_cast<SfxStyleSheet*>(GetStyleSheetPool()->Find( pC->GetStyle(), pC->GetFamily() )); diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index b06466729bf4..f02266a20c53 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -127,7 +127,7 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) const sal_Size nOldPos = rStrm.Tell(); // Ignore Errorcode when reading Bitmap, // see comment in SvxBulletItem::Store() - bool bOldError = rStrm.GetError() ? sal_True : sal_False; + bool bOldError = rStrm.GetError() ? true : false; ReadDIB(aBmp, rStrm, true); if ( !bOldError && rStrm.GetError() ) diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx index 579c7ae4a88f..398c8aa11121 100644 --- a/editeng/source/items/paperinf.cxx +++ b/editeng/source/items/paperinf.cxx @@ -29,7 +29,7 @@ inline bool IsValidPrinter( const Printer* pPtr ) { - return pPtr->GetName().isEmpty() ? sal_False : sal_True; + return pPtr->GetName().isEmpty() ? false : true; } diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index 2f9ed1619b57..2f826de3f75a 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -100,7 +100,7 @@ bool SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const && nPropLineSpace == rLineSpace.nPropLineSpace) || (eInterLineSpace == SVX_INTER_LINE_SPACE_FIX && (nInterLineSpace == rLineSpace.nInterLineSpace)))) ? - 1 : 0; + true : false; } /* Who does still know why the LineSpacingItem is so complicated? diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx index 6d7d67deb365..6293cbb366a5 100644 --- a/editeng/source/misc/txtrange.cxx +++ b/editeng/source/misc/txtrange.cxx @@ -257,7 +257,7 @@ void SvxBoundArgs::NoteRange( bool bToggle ) DBG_ASSERT( nCount == 2 * aBoolArr.size(), "NoteRange: Incompatible Sizes" ); while( nIdx < nCount && (*pLongArr)[ nIdx ] < nMin ) ++nIdx; - bool bOdd = (nIdx % 2) ? sal_True : sal_False; + bool bOdd = (nIdx % 2) ? true : false; // No overlap with existing intervals? if( nIdx == nCount || ( !bOdd && nMax < (*pLongArr)[ nIdx ] ) ) { // Then a new one is inserted ... diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx index d4a9e13fe9f7..576643362cff 100644 --- a/editeng/source/outliner/paralist.cxx +++ b/editeng/source/outliner/paralist.cxx @@ -166,21 +166,21 @@ bool ParagraphList::HasChildren( Paragraph* pParagraph ) const { sal_Int32 n = GetAbsPos( pParagraph ); Paragraph* pNext = GetParagraph( ++n ); - return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) ) ? sal_True : sal_False; + return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) ) ? true : false; } bool ParagraphList::HasHiddenChildren( Paragraph* pParagraph ) const { sal_Int32 n = GetAbsPos( pParagraph ); Paragraph* pNext = GetParagraph( ++n ); - return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && !pNext->IsVisible() ) ? sal_True : sal_False; + return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && !pNext->IsVisible() ) ? true : false; } bool ParagraphList::HasVisibleChildren( Paragraph* pParagraph ) const { sal_Int32 n = GetAbsPos( pParagraph ); Paragraph* pNext = GetParagraph( ++n ); - return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && pNext->IsVisible() ) ? sal_True : sal_False; + return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && pNext->IsVisible() ) ? true : false; } sal_Int32 ParagraphList::GetChildCount( Paragraph* pParent ) const diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index d39d52cae899..b79159c8b9bf 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -202,7 +202,7 @@ public: void enterPluginCallback() { m_nCalledFromPlugin++; } void leavePluginCallback() { m_nCalledFromPlugin--; } - bool isDisposable() { return m_nCalledFromPlugin < 1 ? sal_True : sal_False; } + bool isDisposable() { return m_nCalledFromPlugin < 1 ? true : false; } DECL_LINK( secondLevelDispose, XPlugin_Impl* ); void addPluginEventListener( PluginEventListener* pListener ) diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index 023aa854344c..29db0ac5fee4 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -907,7 +907,7 @@ int Sane::GetRange( int n, double*& rpDouble ) rpDouble = 0; int nItems, i; - bool bIsFixed = mppOptions[n]->type == SANE_TYPE_FIXED ? sal_True : sal_False; + bool bIsFixed = mppOptions[n]->type == SANE_TYPE_FIXED ? true : false; dbg_msg( "Sane::GetRange of option %s ", mppOptions[n]->name ); if(mppOptions[n]->constraint_type == SANE_CONSTRAINT_RANGE ) diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx index 0a5a432c4cf2..f94402dd7561 100644 --- a/extensions/source/scanner/sane.hxx +++ b/extensions/source/scanner/sane.hxx @@ -112,9 +112,9 @@ public: ~Sane(); static bool IsSane() - { return pSaneLib ? sal_True : sal_False; } + { return pSaneLib ? true : false; } bool IsOpen() - { return maHandle ? sal_True : sal_False; } + { return maHandle ? true : false; } static int CountDevices() { return nDevices; } static OUString GetName( int n ) diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 9a4e50cf5484..84c00c223ac7 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -490,7 +490,7 @@ void SaneDlg::InitFields() OUString aOption=mrSane.GetOptionName( i ); bool bInsertAdvanced = mrSane.GetOptionCap( i ) & SANE_CAP_ADVANCED && - ! mpAdvancedBox->IsChecked() ? sal_False : sal_True; + ! mpAdvancedBox->IsChecked() ? false : true; if( mrSane.GetOptionType( i ) == SANE_TYPE_GROUP ) { if( bInsertAdvanced ) diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index a3a3a5b08d5a..fdf5806daf01 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -967,14 +967,14 @@ void EscherPropertyContainer::CreateLineProperties( bSwapLineEnds = true; } } - if ( GetLineArrow( bSwapLineEnds ? sal_False : sal_True, rXPropSet, eLineEnd, nArrowLength, nArrowWidth ) ) + if ( GetLineArrow( bSwapLineEnds ? false : true, rXPropSet, eLineEnd, nArrowLength, nArrowWidth ) ) { AddOpt( ESCHER_Prop_lineStartArrowLength, nArrowLength ); AddOpt( ESCHER_Prop_lineStartArrowWidth, nArrowWidth ); AddOpt( ESCHER_Prop_lineStartArrowhead, eLineEnd ); nLineFlags |= 0x100010; } - if ( GetLineArrow( bSwapLineEnds ? sal_True : sal_False, rXPropSet, eLineEnd, nArrowLength, nArrowWidth ) ) + if ( GetLineArrow( bSwapLineEnds ? true : false, rXPropSet, eLineEnd, nArrowLength, nArrowWidth ) ) { AddOpt( ESCHER_Prop_lineEndArrowLength, nArrowLength ); AddOpt( ESCHER_Prop_lineEndArrowWidth, nArrowWidth ); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index c1be035f3257..3f99bf1fb4e5 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -1508,7 +1508,7 @@ void DffPropertyReader::ApplyCustomShapeTextAttributes( SfxItemSet& rSet ) const rSet.Put( makeSdrTextUpperDistItem( nTextTop ) ); rSet.Put( makeSdrTextLowerDistItem( nTextBottom ) ); - rSet.Put( makeSdrTextWordWrapItem( (MSO_WrapMode)GetPropertyValue( DFF_Prop_WrapText, mso_wrapSquare ) != mso_wrapNone ? sal_True : sal_False ) ); + rSet.Put( makeSdrTextWordWrapItem( (MSO_WrapMode)GetPropertyValue( DFF_Prop_WrapText, mso_wrapSquare ) != mso_wrapNone ? true : false ) ); rSet.Put( makeSdrTextAutoGrowHeightItem( ( GetPropertyValue( DFF_Prop_FitTextToShape ) & 2 ) != 0 ) ); } @@ -5992,7 +5992,7 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, // Can the shape be replaced with a frame? // (provided that it is a TextBox and the text is not rotated) - bool bCanBeReplaced = (ULONG_MAX > nPosGroup) ? sal_False : sal_True; + bool bCanBeReplaced = (ULONG_MAX > nPosGroup) ? false : true; // we don't know yet whether it's a TextBox MSO_SPT eShapeType = mso_sptNil; diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index c47f9d546856..823a583d54ba 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -3671,7 +3671,7 @@ bool PPTNumberFormatCreator::GetNumberFormat( SdrPowerPointImport& rManager, Svx break; } } - return ( nHardCount ) ? sal_True : sal_False; + return ( nHardCount ) ? true : false; } void PPTNumberFormatCreator::ImplGetNumberFormat( SdrPowerPointImport& rManager, SvxNumberFormat& rNumberFormat, sal_uInt32 /*nLevel*/) diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 64224bddcaa3..00fd14ddee70 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -885,7 +885,7 @@ void ImpPDFTabOpnFtrPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) else if( mpRbPgLyContinueFacing->IsChecked() ) paParent->mnPageLayout = 3; - paParent->mbFirstPageLeft = ( mbUseCTLFont ) ? mpCbPgLyFirstOnLeft->IsChecked() : sal_False; + paParent->mbFirstPageLeft = ( mbUseCTLFont ) ? mpCbPgLyFirstOnLeft->IsChecked() : false; } diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 7ed8a0a617ef..049b6fc0bbe8 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -341,8 +341,8 @@ SVGExport::SVGExport( const char* pSVGDisableFontEmbedding = getenv( "SVG_DISABLE_FONT_EMBEDDING" ); OUString aEmbedFontEnv("${SVG_DISABLE_FONT_EMBEDDING}"); rtl::Bootstrap::expandMacros(aEmbedFontEnv); - mbIsEmbedFonts=pSVGDisableFontEmbedding ? sal_False : ( - aEmbedFontEnv.getLength() ? sal_False : sal_True); + mbIsEmbedFonts=pSVGDisableFontEmbedding ? false : ( + aEmbedFontEnv.getLength() ? false : true); } else { @@ -351,7 +351,7 @@ SVGExport::SVGExport( } // Native Decoration - mbIsUseNativeTextDecoration = mbIsUseTinyProfile ? sal_False : aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_NATIVEDECORATION, false); + mbIsUseNativeTextDecoration = mbIsUseTinyProfile ? false : aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_NATIVEDECORATION, false); // Tiny Opacity (supported from SVG Tiny 1.2) mbIsUseOpacity = aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_OPACITY, true); diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index acc4c37844dd..e5a712e43cd8 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.cxx @@ -310,12 +310,12 @@ namespace frm // our boolean flags sal_Int32 nFlags = _rxInStream->readLong( ); - m_bEnabled = ( nFlags & PERSIST_ENABLED ) ? sal_True : sal_False; + m_bEnabled = ( nFlags & PERSIST_ENABLED ) ? true : false; m_nIconSize = ( nFlags & PERSIST_LARGEICONS ) ? 1 : 0; - m_bShowPosition = ( nFlags & PERSIST_SHOW_POSITION ) ? sal_True : sal_False; - m_bShowNavigation = ( nFlags & PERSIST_SHOW_NAVIGATION ) ? sal_True : sal_False; - m_bShowActions = ( nFlags & PERSIST_SHOW_ACTIONS ) ? sal_True : sal_False; - m_bShowFilterSort = ( nFlags & PERSIST_SHOW_FILTERSORT ) ? sal_True : sal_False; + m_bShowPosition = ( nFlags & PERSIST_SHOW_POSITION ) ? true : false; + m_bShowNavigation = ( nFlags & PERSIST_SHOW_NAVIGATION ) ? true : false; + m_bShowActions = ( nFlags & PERSIST_SHOW_ACTIONS ) ? true : false; + m_bShowFilterSort = ( nFlags & PERSIST_SHOW_FILTERSORT ) ? true : false; // our strings m_sHelpText = _rxInStream->readUTF( ); diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 845791aaaf70..5981cb376eba 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1906,7 +1906,7 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,Menu* pAddonMenu,boo if ( pPopupMenu ) { Reference< XDispatchProvider > xDispatchProvider; - MenuBarManager* pSubMenuManager = new MenuBarManager( m_xContext, rFrame, m_xURLTransformer,xDispatchProvider, aModuleIdentifier, pPopupMenu, _bHandlePopUp ? sal_False : bDeleteChildren, _bHandlePopUp ? sal_False : bDeleteChildren ); + MenuBarManager* pSubMenuManager = new MenuBarManager( m_xContext, rFrame, m_xURLTransformer,xDispatchProvider, aModuleIdentifier, pPopupMenu, _bHandlePopUp ? false : bDeleteChildren, _bHandlePopUp ? false : bDeleteChildren ); Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY ); diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index 4ab8cd2a6b1e..e49e28b754ae 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -1071,7 +1071,7 @@ bool SAL_CALL LocaleDataImpl::isPhonetic( const Locale& rLocale, const OUString& algorithm ) throw(RuntimeException) { sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm); - return (indexArray && indexArray[4][0]) ? sal_True : sal_False; + return (indexArray && indexArray[4][0]) ? true : false; } OUString SAL_CALL diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx index e7994448dc85..6eba84df8f0c 100644 --- a/idl/source/objects/bastype.cxx +++ b/idl/source/objects/bastype.cxx @@ -69,8 +69,8 @@ SvStream& operator >> (SvStream & rStm, SvBOOL & rb ) { sal_uInt8 n; rStm.ReadUChar( n ); - rb.nVal = (n & 0x01) ? sal_True : sal_False; - rb.bSet = (n & 0x02) ? sal_True : sal_False; + rb.nVal = (n & 0x01) ? true : false; + rb.bSet = (n & 0x02) ? true : false; if( n & ~0x03 ) { rStm.SetError( SVSTREAM_FILEFORMAT_ERROR ); diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx index f076f9522067..75265b99d590 100644 --- a/idlc/source/astexpression.cxx +++ b/idlc/source/astexpression.cxx @@ -799,34 +799,34 @@ bool AstExpression::operator==(AstExpression *pExpr) switch (m_exprValue->et) { case ET_short: - bRet = (m_exprValue->u.sval == pExpr->getExprValue()->u.sval) ? sal_True : sal_False; + bRet = (m_exprValue->u.sval == pExpr->getExprValue()->u.sval) ? true : false; break; case ET_ushort: - bRet = (m_exprValue->u.usval == pExpr->getExprValue()->u.usval) ? sal_True : sal_False; + bRet = (m_exprValue->u.usval == pExpr->getExprValue()->u.usval) ? true : false; break; case ET_long: - bRet = (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? sal_True : sal_False; + bRet = (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? true : false; break; case ET_ulong: - bRet = (m_exprValue->u.ulval == pExpr->getExprValue()->u.ulval) ? sal_True : sal_False; + bRet = (m_exprValue->u.ulval == pExpr->getExprValue()->u.ulval) ? true : false; break; case ET_hyper: - bRet = (m_exprValue->u.hval == pExpr->getExprValue()->u.hval) ? sal_True : sal_False; + bRet = (m_exprValue->u.hval == pExpr->getExprValue()->u.hval) ? true : false; break; case ET_uhyper: - bRet = (m_exprValue->u.uhval == pExpr->getExprValue()->u.uhval) ? sal_True : sal_False; + bRet = (m_exprValue->u.uhval == pExpr->getExprValue()->u.uhval) ? true : false; break; case ET_float: - bRet = (m_exprValue->u.fval == pExpr->getExprValue()->u.fval) ? sal_True : sal_False; + bRet = (m_exprValue->u.fval == pExpr->getExprValue()->u.fval) ? true : false; break; case ET_double: - bRet = (m_exprValue->u.dval == pExpr->getExprValue()->u.dval) ? sal_True : sal_False; + bRet = (m_exprValue->u.dval == pExpr->getExprValue()->u.dval) ? true : false; break; case ET_byte: - bRet = (m_exprValue->u.byval == pExpr->getExprValue()->u.byval) ? sal_True : sal_False; + bRet = (m_exprValue->u.byval == pExpr->getExprValue()->u.byval) ? true : false; break; case ET_boolean: - bRet = (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? sal_True : sal_False; + bRet = (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? true : false; break; default: OSL_ASSERT(false); @@ -851,34 +851,34 @@ bool AstExpression::compare(AstExpression *pExpr) switch (m_exprValue->et) { case ET_short: - bRet = (m_exprValue->u.sval == pExpr->getExprValue()->u.sval) ? sal_True : sal_False; + bRet = (m_exprValue->u.sval == pExpr->getExprValue()->u.sval) ? true : false; break; case ET_ushort: - bRet = (m_exprValue->u.usval == pExpr->getExprValue()->u.usval) ? sal_True : sal_False; + bRet = (m_exprValue->u.usval == pExpr->getExprValue()->u.usval) ? true : false; break; case ET_long: - bRet = (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? sal_True : sal_False; + bRet = (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? true : false; break; case ET_ulong: - bRet = (m_exprValue->u.ulval == pExpr->getExprValue()->u.ulval) ? sal_True : sal_False; + bRet = (m_exprValue->u.ulval == pExpr->getExprValue()->u.ulval) ? true : false; break; case ET_hyper: - bRet = (m_exprValue->u.hval == pExpr->getExprValue()->u.hval) ? sal_True : sal_False; + bRet = (m_exprValue->u.hval == pExpr->getExprValue()->u.hval) ? true : false; break; case ET_uhyper: - bRet = (m_exprValue->u.uhval == pExpr->getExprValue()->u.uhval) ? sal_True : sal_False; + bRet = (m_exprValue->u.uhval == pExpr->getExprValue()->u.uhval) ? true : false; break; case ET_float: - bRet = (m_exprValue->u.fval == pExpr->getExprValue()->u.fval) ? sal_True : sal_False; + bRet = (m_exprValue->u.fval == pExpr->getExprValue()->u.fval) ? true : false; break; case ET_double: - bRet = (m_exprValue->u.dval == pExpr->getExprValue()->u.dval) ? sal_True : sal_False; + bRet = (m_exprValue->u.dval == pExpr->getExprValue()->u.dval) ? true : false; break; case ET_byte: - bRet = (m_exprValue->u.byval == pExpr->getExprValue()->u.byval) ? sal_True : sal_False; + bRet = (m_exprValue->u.byval == pExpr->getExprValue()->u.byval) ? true : false; break; case ET_boolean: - bRet = (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? sal_True : sal_False; + bRet = (m_exprValue->u.lval == pExpr->getExprValue()->u.lval) ? true : false; break; default: OSL_ASSERT(false); diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx index e1f0ab20f12e..93b2a74c0f00 100644 --- a/include/editeng/svxacorr.hxx +++ b/include/editeng/svxacorr.hxx @@ -329,7 +329,7 @@ public: long GetFlags() const { return nFlags; } inline SvxSwAutoFmtFlags& GetSwFlags() { return aSwFlags;} bool IsAutoCorrFlag( long nFlag ) const - { return nFlags & nFlag ? sal_True : sal_False; } + { return nFlags & nFlag ? true : false; } void SetAutoCorrFlag( long nFlag, bool bOn = true ); // Load, Set, Get - the replacement list diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 480f29cfa789..2202947b548b 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -588,7 +588,7 @@ protected: SdrPage* MakeBlancPage(bool bMaster) const; bool ReadFontCollection(); bool ForceFontCollection() const - { return pFonts!=NULL?sal_True:const_cast<SdrPowerPointImport*>(this)->ReadFontCollection(); } + { return pFonts!=NULL?true:const_cast<SdrPowerPointImport*>(this)->ReadFontCollection(); } PptSlidePersistList* GetPageList(PptPageKind ePageKind) const; sal_uInt32 GetAktPageId(); sal_uInt32 GetMasterPageId(sal_uInt16 nPageNum, PptPageKind ePageKind) const; diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 8cd389cc35e5..4f2db5a41376 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -104,7 +104,7 @@ public: SdrModel* GetSdrModel() const { return pModel; } SdrView* GetSdrView() const { return pView; } SdrObject* GetSelectedSdrObject() const; - bool IsChanged() const { return bSdrMode ? pModel->IsChanged() : sal_False; } + bool IsChanged() const { return bSdrMode ? pModel->IsChanged() : false; } void SetMousePosLink( const Link& rLink ) { aMousePosLink = rLink; } const Link& GetMousePosLink() const { return aMousePosLink; } diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx index c5564e700dec..cabff6bf0b59 100644 --- a/include/tools/bigint.hxx +++ b/include/tools/bigint.hxx @@ -114,7 +114,7 @@ public: operator sal_uInt16() const; operator sal_uIntPtr() const; - void Set( bool bSet ) { bIsSet = bSet ? sal_True : sal_False; } + void Set( bool bSet ) { bIsSet = bSet ? true : false; } bool IsSet() const { return (bool)bIsSet; } bool IsNeg() const; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx index f2f2ae0d7549..54ba4d048c16 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx @@ -94,7 +94,7 @@ bool SunVersion::init(const char *szVersion) (nPart < 2 && *pCur == '.') ) && ( //prevent 1.4.0. 1.4.0- - pCur + 1 == pEnd ? isdigit(*(pCur)) : 1) ) + pCur + 1 == pEnd ? isdigit(*(pCur)) : true) ) { int len = pCur - pLast; if (len >= 127) diff --git a/lotuswordpro/source/filter/lwpdivinfo.hxx b/lotuswordpro/source/filter/lwpdivinfo.hxx index f99d8079ffed..cb073d76a3c4 100644 --- a/lotuswordpro/source/filter/lwpdivinfo.hxx +++ b/lotuswordpro/source/filter/lwpdivinfo.hxx @@ -139,7 +139,7 @@ private: inline bool LwpDivInfo::HasContents() { - return (m_nFlags & DI_HASCONTENTS) ? sal_True : sal_False; + return (m_nFlags & DI_HASCONTENTS) ? true : false; } inline bool LwpDivInfo::IsOleDivision() @@ -152,7 +152,7 @@ inline bool LwpDivInfo::IsOleDivision() inline bool LwpDivInfo::IsScrollable() { - return (m_nFlags & DI_SCROLLABLE) ? sal_True : sal_False; + return (m_nFlags & DI_SCROLLABLE) ? true : false; } inline bool LwpDivInfo::IsGotoable() diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index 14036a2717c3..cc37eb468bed 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -109,7 +109,7 @@ void LwpVirtualLayout::Read() bool LwpVirtualLayout::MarginsSameAsParent() { - return m_nAttributes2 & STYLE2_MARGINSSAMEASPARENT ? sal_True : sal_False; + return m_nAttributes2 & STYLE2_MARGINSSAMEASPARENT ? true : false; } /** @@ -218,7 +218,7 @@ bool LwpVirtualLayout::HasProtection() */ bool LwpVirtualLayout::IsComplex() { - return m_nAttributes & STYLE_COMPLEX ? sal_True : sal_False; + return m_nAttributes & STYLE_COMPLEX ? true : false; } /** @@ -1054,7 +1054,7 @@ bool LwpMiddleLayout::IsSizeRightToContainer() else if (m_BasedOnStyle.obj().is()) { LwpMiddleLayout * pLayout = dynamic_cast<LwpMiddleLayout *>(m_BasedOnStyle.obj().get()); - return pLayout ? pLayout->IsSizeRightToContainer() : sal_False; + return pLayout ? pLayout->IsSizeRightToContainer() : false; } else return false; @@ -1073,7 +1073,7 @@ bool LwpMiddleLayout::IsSizeRightToContent() else if (m_BasedOnStyle.obj().is()) { LwpMiddleLayout * pLayout = dynamic_cast<LwpMiddleLayout *>(m_BasedOnStyle.obj().get()); - return pLayout ? pLayout->IsSizeRightToContent() : sal_False; + return pLayout ? pLayout->IsSizeRightToContent() : false; } else return false; @@ -1161,12 +1161,12 @@ bool LwpMiddleLayout::IsAutoGrow() return m_nDirection & ((LAY_AUTOGROW << SHIFT_UP) | (LAY_AUTOGROW << SHIFT_DOWN) | (LAY_AUTOGROW << SHIFT_RIGHT) | (LAY_AUTOGROW << SHIFT_LEFT)) - ? sal_True : sal_False; + ? true : false; } else if( !m_BasedOnStyle.IsNull() ) { LwpMiddleLayout* pLay = dynamic_cast<LwpMiddleLayout*> ( m_BasedOnStyle.obj().get() ); - return pLay ? pLay->IsAutoGrow() : sal_False; + return pLay ? pLay->IsAutoGrow() : false; } return LwpVirtualLayout::IsAutoGrow(); } @@ -1179,12 +1179,12 @@ bool LwpMiddleLayout::IsAutoGrowDown() { if(m_nOverrideFlag & OVER_SIZE) { - return m_nDirection & (LAY_AUTOGROW << SHIFT_DOWN) ? sal_True : sal_False; + return m_nDirection & (LAY_AUTOGROW << SHIFT_DOWN) ? true : false; } else if( !m_BasedOnStyle.IsNull() ) { LwpMiddleLayout* pLay = dynamic_cast<LwpMiddleLayout*> ( m_BasedOnStyle.obj().get() ); - return pLay ? pLay->IsAutoGrowDown() : sal_False; + return pLay ? pLay->IsAutoGrowDown() : false; } return LwpVirtualLayout::IsAutoGrowDown(); } @@ -1197,12 +1197,12 @@ bool LwpMiddleLayout::IsAutoGrowUp() { if(m_nOverrideFlag & OVER_SIZE) { - return m_nDirection & (LAY_AUTOGROW << SHIFT_UP) ? sal_True : sal_False; + return m_nDirection & (LAY_AUTOGROW << SHIFT_UP) ? true : false; } else if( !m_BasedOnStyle.IsNull() ) { LwpMiddleLayout* pLay = dynamic_cast<LwpMiddleLayout*> ( m_BasedOnStyle.obj().get() ); - return pLay ? pLay->IsAutoGrowUp() : sal_False; + return pLay ? pLay->IsAutoGrowUp() : false; } return LwpVirtualLayout::IsAutoGrowUp(); } @@ -1215,7 +1215,7 @@ bool LwpMiddleLayout::IsAutoGrowLeft() { if(m_nOverrideFlag & OVER_SIZE) { - return m_nDirection & (LAY_AUTOGROW << SHIFT_LEFT) ? sal_True : sal_False; + return m_nDirection & (LAY_AUTOGROW << SHIFT_LEFT) ? true : false; } else if( !m_BasedOnStyle.IsNull() ) { @@ -1234,12 +1234,12 @@ bool LwpMiddleLayout::IsAutoGrowRight() { if(m_nOverrideFlag & OVER_SIZE) { - return m_nDirection & (LAY_AUTOGROW << SHIFT_RIGHT) ? sal_True : sal_False; + return m_nDirection & (LAY_AUTOGROW << SHIFT_RIGHT) ? true : false; } else if( !m_BasedOnStyle.IsNull() ) { LwpMiddleLayout* pLay = dynamic_cast<LwpMiddleLayout*> ( m_BasedOnStyle.obj().get() ); - return pLay ? pLay->IsAutoGrowRight() : sal_False; + return pLay ? pLay->IsAutoGrowRight() : false; } return LwpVirtualLayout::IsAutoGrowRight(); } @@ -1316,7 +1316,7 @@ bool LwpMiddleLayout::IsProtected() else if( !m_BasedOnStyle.IsNull() ) { LwpMiddleLayout* pLay = dynamic_cast<LwpMiddleLayout*> ( m_BasedOnStyle.obj().get() ); - bProtected = pLay ? pLay->IsProtected() : sal_False; + bProtected = pLay ? pLay->IsProtected() : false; } else bProtected = LwpVirtualLayout::IsProtected(); @@ -1442,7 +1442,7 @@ bool LwpMiddleLayout::GetUsePrinterSettings() else if( !m_BasedOnStyle.IsNull() ) { LwpMiddleLayout* pLay = dynamic_cast<LwpMiddleLayout*> ( m_BasedOnStyle.obj().get() ); - return pLay ? pLay->GetUsePrinterSettings() : sal_False; + return pLay ? pLay->GetUsePrinterSettings() : false; } return false; } diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx index 50d7e9b641b3..d1c2e5f7189f 100644 --- a/lotuswordpro/source/filter/lwppara.cxx +++ b/lotuswordpro/source/filter/lwppara.cxx @@ -174,8 +174,8 @@ void LwpPara::Read() const int DISK_SIMPLE = 1; const int DISK_NOTIFY = 2; - Simple = (Flag & DISK_SIMPLE) ? sal_True : sal_False; - Notify = (Flag & DISK_NOTIFY) ? sal_True : sal_False; + Simple = (Flag & DISK_SIMPLE) ? true : false; + Notify = (Flag & DISK_NOTIFY) ? true : false; } if(!Simple) @@ -613,7 +613,7 @@ void LwpPara::RegisterStyle() * higher than our current level. */ // restart based on Outline level? - if (pNumbering && bLesser && (bHeading ? pNumbering->IsHeading() : sal_True)) + if (pNumbering && bLesser && (bHeading ? pNumbering->IsHeading() : true)) { if (nFoundLevel != 0xffff) { diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx index 8c72b4e4c6fa..ed66cf744858 100644 --- a/lotuswordpro/source/filter/lwptblcell.hxx +++ b/lotuswordpro/source/filter/lwptblcell.hxx @@ -290,19 +290,19 @@ LwpRowColumnQualifier::LwpRowColumnQualifier() inline bool LwpRowColumnQualifier::IsAfter() { - return cFlags & REF_AFTER ? sal_True : sal_False; + return cFlags & REF_AFTER ? true : false; } inline bool LwpRowColumnQualifier::IsBad() { - return cFlags & REF_BAD ? sal_True : sal_False; + return cFlags & REF_BAD ? true : false; } inline bool LwpRowColumnQualifier::IsAbsolute() { - return cFlags & REF_ABSOLUTE ? sal_True : sal_False; + return cFlags & REF_ABSOLUTE ? true : false; } /** * @brief diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx index 2020e9350cb7..e209557bedb9 100644 --- a/lotuswordpro/source/filter/lwptoc.cxx +++ b/lotuswordpro/source/filter/lwptoc.cxx @@ -337,7 +337,7 @@ void LwpTocSuperLayout::AddSourceStyle(XFIndex* pToc, LwpTocLevelData * pLevel, bool LwpTocSuperLayout::GetRightAlignPageNumber(sal_uInt16 index) { if (index < MAX_LEVELS) - return (m_nFlags[index] & TS_RIGHTALIGN) ? sal_True : sal_False; + return (m_nFlags[index] & TS_RIGHTALIGN) ? true : false; return false; } /** @@ -348,7 +348,7 @@ bool LwpTocSuperLayout::GetRightAlignPageNumber(sal_uInt16 index) bool LwpTocSuperLayout::GetUsePageNumber(sal_uInt16 index) { if (index < MAX_LEVELS) - return (m_nFlags[index] & TS_PAGENUMBER) ? sal_True : sal_False; + return (m_nFlags[index] & TS_PAGENUMBER) ? true : false; return false; } /** diff --git a/lotuswordpro/source/filter/lwptoc.hxx b/lotuswordpro/source/filter/lwptoc.hxx index 83031433a79c..84a859dcdbcb 100644 --- a/lotuswordpro/source/filter/lwptoc.hxx +++ b/lotuswordpro/source/filter/lwptoc.hxx @@ -153,9 +153,9 @@ public: void RegisterStyle() SAL_OVERRIDE; virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE; inline sal_uInt16 GetLevel(){return m_nLevel;} - inline bool GetUseText(){ return (m_nFlags & USETEXT) ? sal_True : sal_False;} + inline bool GetUseText(){ return (m_nFlags & USETEXT) ? true : false;} inline OUString GetSearchStyle(){return m_SearchName.str();} - inline bool GetUseLeadingText(){ return (m_nFlags & USENUMBER) ? sal_True : sal_False;} + inline bool GetUseLeadingText(){ return (m_nFlags & USENUMBER) ? true : false;} private: virtual ~LwpTocLevelData(); diff --git a/lotuswordpro/source/filter/lwptools.hxx b/lotuswordpro/source/filter/lwptools.hxx index f240214ed02a..584b418cba5a 100644 --- a/lotuswordpro/source/filter/lwptools.hxx +++ b/lotuswordpro/source/filter/lwptools.hxx @@ -135,11 +135,11 @@ inline sal_Int32 LwpTools::ConvertToUnits(const double& fInch) } inline bool LwpTools::IsOddNumber(sal_uInt16& nNumber) { - return (nNumber%2)? sal_True : sal_False; + return (nNumber%2)? true : false; } inline bool LwpTools::IsEvenNumber(sal_uInt16& nNumber) { - return (nNumber%2)? sal_False : sal_True; + return (nNumber%2)? false : true; } class BadSeek : public std::runtime_error diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 42df27df3017..50185a782b47 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -324,7 +324,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit() bool autoCommit = false; try { - autoCommit = m_settings.cppConnection->getAutoCommit() == true ? sal_True : sal_False; + autoCommit = m_settings.cppConnection->getAutoCommit() == true ? true : false; } catch (const sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); } diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index 9aa9d9323ec8..c37cfbcaab65 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -182,7 +182,7 @@ bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool ( OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); bool boolMetaData(false); try { - boolMetaData = (meta->*_Method)() ? sal_True : sal_False; + boolMetaData = (meta->*_Method)() ? true : false; } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this); } catch (const sql::InvalidArgumentException &) { @@ -198,7 +198,7 @@ bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool ( OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); bool boolMetaData(false); try { - boolMetaData = (meta->*_Method)( _arg ) ? sal_True : sal_False; + boolMetaData = (meta->*_Method)( _arg ) ? true : false; } catch (const sql::MethodNotImplementedException &) { mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this); } catch (const sql::InvalidArgumentException &) { diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx index 6b68f6e060b7..0de7c8f85ec0 100644 --- a/mysqlc/source/mysqlc_preparedstatement.cxx +++ b/mysqlc/source/mysqlc_preparedstatement.cxx @@ -179,7 +179,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute() bool success = false; try { - success = static_cast<sql::PreparedStatement *>(cppStatement)->execute()? sal_True:sal_False; + success = static_cast<sql::PreparedStatement *>(cppStatement)->execute()? true:false; } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx index 209d31a2f17c..5590acfd41ae 100644 --- a/mysqlc/source/mysqlc_statement.cxx +++ b/mysqlc/source/mysqlc_statement.cxx @@ -158,7 +158,7 @@ sal_Bool SAL_CALL OCommonStatement::execute(const rtl::OUString& sql) bool success = false; try { - success = cppStatement->execute(rtl::OUStringToOString(sSqlStatement, m_pConnection->getConnectionSettings().encoding).getStr())? sal_True:sal_False; + success = cppStatement->execute(rtl::OUStringToOString(sSqlStatement, m_pConnection->getConnectionSettings().encoding).getStr())? true:false; } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); } diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx index c4fbcfa00c5f..b596b4041611 100644 --- a/package/source/zipapi/XUnbufferedStream.cxx +++ b/package/source/zipapi/XUnbufferedStream.cxx @@ -81,8 +81,8 @@ XUnbufferedStream::XUnbufferedStream( if (mnZipSize < 0) throw ZipIOException("The stream seems to be broken!"); - bool bHaveEncryptData = ( rData.is() && rData->m_aSalt.getLength() && rData->m_aInitVector.getLength() && rData->m_nIterationCount != 0 ) ? sal_True : sal_False; - bool bMustDecrypt = ( nStreamMode == UNBUFF_STREAM_DATA && bHaveEncryptData && bIsEncrypted ) ? sal_True : sal_False; + bool bHaveEncryptData = ( rData.is() && rData->m_aSalt.getLength() && rData->m_aInitVector.getLength() && rData->m_nIterationCount != 0 ) ? true : false; + bool bMustDecrypt = ( nStreamMode == UNBUFF_STREAM_DATA && bHaveEncryptData && bIsEncrypted ) ? true : false; if ( bMustDecrypt ) { diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 0676ce5802ea..aaddc3a624c9 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -525,7 +525,7 @@ bool ZipPackageStream::saveChild( pTempEntry->nPathLen = (sal_Int16)( OUStringToOString( pTempEntry->sPath, RTL_TEXTENCODING_UTF8 ).getLength() ); const bool bToBeEncrypted = m_bToBeEncrypted && (rEncryptionKey.getLength() || m_bHaveOwnKey); - const bool bToBeCompressed = bToBeEncrypted ? sal_True : m_bToBeCompressed; + const bool bToBeCompressed = bToBeEncrypted ? true : m_bToBeCompressed; aPropSet[PKG_MNFST_MEDIATYPE].Name = sMediaTypeProperty; aPropSet[PKG_MNFST_MEDIATYPE].Value <<= GetMediaType( ); diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx index 0c6617d19895..dd9ac74b33b6 100644 --- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx +++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx @@ -68,12 +68,12 @@ SdrUndoAction* OReportUndoFactory::CreateUndoGeoObject( SdrObject& rObject ) SdrUndoAction* OReportUndoFactory::CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText ) { - return m_pUndoFactory->CreateUndoAttrObject( rObject, bStyleSheet1 ? sal_True : sal_False, bSaveText ? sal_True : sal_False ); + return m_pUndoFactory->CreateUndoAttrObject( rObject, bStyleSheet1 ? true : false, bSaveText ? true : false ); } SdrUndoAction* OReportUndoFactory::CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ) { - return m_pUndoFactory->CreateUndoRemoveObject( rObject, bOrdNumDirect ? sal_True : sal_False ); + return m_pUndoFactory->CreateUndoRemoveObject( rObject, bOrdNumDirect ? true : false ); } SdrUndoAction* OReportUndoFactory::CreateUndoInsertObject( SdrObject& rObject, bool /*bOrdNumDirect*/ ) @@ -93,7 +93,7 @@ SdrUndoAction* OReportUndoFactory::CreateUndoNewObject( SdrObject& rObject, bool SdrUndoAction* OReportUndoFactory::CreateUndoCopyObject( SdrObject& rObject, bool bOrdNumDirect ) { - return m_pUndoFactory->CreateUndoCopyObject( rObject, bOrdNumDirect ? sal_True : sal_False ); + return m_pUndoFactory->CreateUndoCopyObject( rObject, bOrdNumDirect ? true : false ); } SdrUndoAction* OReportUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1) @@ -103,7 +103,7 @@ SdrUndoAction* OReportUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, s SdrUndoAction* OReportUndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect ) { - return m_pUndoFactory->CreateUndoReplaceObject( rOldObject, rNewObject, bOrdNumDirect ? sal_True : sal_False ); + return m_pUndoFactory->CreateUndoReplaceObject( rOldObject, rNewObject, bOrdNumDirect ? true : false ); } SdrUndoAction* OReportUndoFactory::CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer ) diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index 047bd1dc9ea8..dbfcd9e039cc 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -977,7 +977,7 @@ bool ScPageScaleToItem::operator==( const SfxPoolItem& rCmp ) const { assert(SfxPoolItem::operator==(rCmp)); const ScPageScaleToItem& rPageCmp = static_cast< const ScPageScaleToItem& >( rCmp ); - return ((mnWidth == rPageCmp.mnWidth) && (mnHeight == rPageCmp.mnHeight)) ? 1 : 0; + return ((mnWidth == rPageCmp.mnWidth) && (mnHeight == rPageCmp.mnHeight)) ? true : false; } namespace { diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index bbc73c94126e..9566050e976f 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2416,7 +2416,7 @@ void ScPosWnd::DoEnter() SfxViewFrame* pViewFrm = pViewSh->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - SC_MOD()->SetRefDialog( nId, pWnd ? false : sal_True ); + SC_MOD()->SetRefDialog( nId, pWnd ? false : true ); } else { diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 5d52c71d4957..605e3ea2d929 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -812,7 +812,7 @@ bool ScValidationDlg::EnterRefStatus() if ( pWnd && pWnd->GetWindow()!= this ) pWnd = NULL; - SC_MOD()->SetRefDialog( nId, pWnd ? false : sal_True ); + SC_MOD()->SetRefDialog( nId, pWnd ? false : true ); return true; } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 2c84022e5c96..2af8c1a7ee48 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -2126,7 +2126,7 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const OUString& aPropertyName ) { // default for no model is TRUE ScDrawLayer* pModel = rDoc.GetDrawLayer(); - bool bOpenInDesign = pModel ? pModel->GetOpenInDesignMode() : sal_True; + bool bOpenInDesign = pModel ? pModel->GetOpenInDesignMode() : true; ScUnoHelpFunctions::SetBoolInAny( aRet, bOpenInDesign ); } else if ( aString == SC_UNO_AUTOCONTFOC ) diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index d371e949bf75..57cabd928ca7 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -4848,7 +4848,7 @@ uno::Any ScVbaRange::getShowDetail() throw ( css::uno::RuntimeException, std::ex if( (thisAddress.StartRow == thisAddress.EndRow && thisAddress.EndRow == aOutlineAddress.EndRow ) || (thisAddress.StartColumn == thisAddress.EndColumn && thisAddress.EndColumn == aOutlineAddress.EndColumn )) { - bool bColumn =thisAddress.StartRow == thisAddress.EndRow ? false:sal_True; + bool bColumn =thisAddress.StartRow == thisAddress.EndRow ? false:true; ScDocument& rDoc = getDocumentFromRange( mxRange ); ScOutlineTable* pOutlineTable = rDoc.GetOutlineTable(static_cast<SCTAB>(thisAddress.Sheet), true); const ScOutlineArray& rOutlineArray = bColumn ? pOutlineTable->GetColArray(): pOutlineTable->GetRowArray(); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 2fb91e4df0d8..0999e22c0574 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -905,7 +905,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; @@ -915,7 +915,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; case SID_DESCRIPTIVE_STATISTICS_DIALOG: @@ -924,7 +924,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; case SID_ANALYSIS_OF_VARIANCE_DIALOG: @@ -933,7 +933,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; case SID_CORRELATION_DIALOG: @@ -942,7 +942,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; case SID_COVARIANCE_DIALOG: @@ -951,7 +951,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; case SID_EXPONENTIAL_SMOOTHING_DIALOG: @@ -960,7 +960,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; case SID_MOVING_AVERAGE_DIALOG: @@ -969,7 +969,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; case SID_TTEST_DIALOG: @@ -978,7 +978,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; @@ -988,7 +988,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; @@ -998,7 +998,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; @@ -1008,7 +1008,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; @@ -1889,7 +1889,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; case FID_ADD_NAME: @@ -1898,7 +1898,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; @@ -2050,7 +2050,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 6e5bf8889827..2cc7924ee54e 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -559,7 +559,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } } break; @@ -580,7 +580,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } } break; @@ -686,7 +686,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index a30253474e15..716a15d77ad1 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -300,7 +300,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); rReq.Ignore(); } break; @@ -311,7 +311,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; @@ -375,7 +375,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; @@ -385,7 +385,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; @@ -395,7 +395,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 2cfa8262190d..ee2bbab0c035 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -138,7 +138,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) sal_uInt16 nId = ScPrintAreasDlgWrapper::GetChildWindowId(); SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; @@ -894,7 +894,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) sal_uInt16 nId = ScHighlightChgDlgWrapper::GetChildWindowId(); SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId ); - pScMod->SetRefDialog( nId, pWnd ? false : sal_True ); + pScMod->SetRefDialog( nId, pWnd ? false : true ); } break; diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index b7ae58282bbf..0f95a53ae448 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -246,7 +246,7 @@ void ScTabViewShell::GetState( SfxItemSet& rSet ) if ( pThisFrame->KnowsChildWindow( nId ) ) { SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId ); - rSet.Put( SfxBoolItem( nWhich, pWnd ? sal_True : false ) ); + rSet.Put( SfxBoolItem( nWhich, pWnd ? true : false ) ); } else rSet.DisableItem( nWhich ); diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index bc5cff707733..354184943304 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -95,7 +95,7 @@ void ScTabViewShell::SwitchBetweenRefDialogs(SfxModelessDialog* pDialog) SfxViewFrame* pViewFrm = GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - SC_MOD()->SetRefDialog( nId, pWnd ? false : sal_True ); + SC_MOD()->SetRefDialog( nId, pWnd ? false : true ); } else if( nSlotId == FID_ADD_NAME ) { @@ -105,7 +105,7 @@ void ScTabViewShell::SwitchBetweenRefDialogs(SfxModelessDialog* pDialog) SfxViewFrame* pViewFrm = GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); - SC_MOD()->SetRefDialog( nId, pWnd ? false : sal_True ); + SC_MOD()->SetRefDialog( nId, pWnd ? false : true ); } else { diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index b56b0eeffd3a..5cfad63e745e 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -1343,7 +1343,7 @@ void ModifyGuard::init() mpDocShell = mpDoc->GetDocSh(); } - mbIsEnableSetModified = mpDocShell ? mpDocShell->IsEnableSetModified() : sal_False; + mbIsEnableSetModified = mpDocShell ? mpDocShell->IsEnableSetModified() : false; mbIsDocumentChanged = mpDoc && mpDoc->IsChanged(); if( mbIsEnableSetModified ) diff --git a/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx index fe4ff3b40f65..2a72e26db237 100644 --- a/sd/source/core/undo/undoobjects.cxx +++ b/sd/source/core/undo/undoobjects.cxx @@ -198,7 +198,7 @@ void UndoObjectSetText::Redo() if( mpUndoAnimation ) mpUndoAnimation->Redo(); SdrUndoObjSetText::Redo(); - mxSdrObject->SetEmptyPresObj(mbNewEmptyPresObj ? sal_True : sal_False ); + mxSdrObject->SetEmptyPresObj(mbNewEmptyPresObj ? true : false ); } } @@ -330,7 +330,7 @@ void UndoGeoObject::Redo() } UndoAttrObject::UndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText ) -: SdrUndoAttrObj( rObject, bStyleSheet1 ? sal_True : sal_False, bSaveText ? sal_True : sal_False ) +: SdrUndoAttrObj( rObject, bStyleSheet1 ? true : false, bSaveText ? true : false ) , mxPage( rObject.GetPage() ) , mxSdrObject( &rObject ) { diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx index 6dd1305bb4c1..d9c302a0f024 100644 --- a/sd/source/filter/eppt/pptx-stylesheet.cxx +++ b/sd/source/filter/eppt/pptx-stylesheet.cxx @@ -423,7 +423,7 @@ bool PPTExStyleSheet::IsHardAttribute( sal_uInt32 nInstance, sal_uInt32 nLevel, switch ( eAttr ) { - case ParaAttr_BulletOn : return ( rPara.mbIsBullet ) ? ( nValue ) ? sal_False : sal_True : ( nValue ) ? sal_True : sal_False; + case ParaAttr_BulletOn : return ( rPara.mbIsBullet ) ? ( nValue ) ? false : true : ( nValue ) ? true : false; case ParaAttr_BuHardFont : case ParaAttr_BulletFont : return ( rPara.mnBulletFont != nValue ); case ParaAttr_BuHardColor : diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 36bc1973c72c..8ff4dc5a89cd 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -1412,7 +1412,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign ) pDesign->m_aEMail = pPage4_Email->GetText(); pDesign->m_aWWW = pPage4_WWW->GetText(); pDesign->m_aMisc = pPage4_Misc->GetText(); - pDesign->m_bDownload = m_bImpress?pPage4_Download->IsChecked():sal_False; + pDesign->m_bDownload = m_bImpress?pPage4_Download->IsChecked():false; if(pPage5_TextOnly->IsChecked()) pDesign->m_nButtonThema = -1; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 7ad5e3f30c03..46b957f51fd7 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -1377,7 +1377,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) (mpSet->getPropertyValue( nHandleDimColor ) != aDimColor) ) pSet->setPropertyValue( nHandleDimColor, aDimColor ); - bool bAfterEffectOnNextEffect = nPos != 2 ? sal_True : sal_False; + bool bAfterEffectOnNextEffect = nPos != 2 ? true : false; bool bOldAfterEffectOnNextEffect = !bAfterEffectOnNextEffect; if( mpSet->getPropertyState( nHandleAfterEffectOnNextEffect ) != STLPropertyState_AMBIGUOUS) @@ -1519,7 +1519,7 @@ void CustomAnimationEffectTabPage::openSoundFileDialog() aStrWarning = aStrWarning.replaceFirst("%", aFile); WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, aStrWarning ); aWarningBox.SetModalInputMode (true); - bQuitLoop = aWarningBox.Execute()==RET_RETRY ? sal_False : sal_True; + bQuitLoop = aWarningBox.Execute()==RET_RETRY ? false : true; bValidSoundFile=false; } @@ -1702,7 +1702,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(vcl::Window* pPar sal_Int16 nFill = 0; if( pSet->getPropertyValue( nHandleRewind ) >>= nFill ) { - mpCBXRewind->Check( (nFill == AnimationFill::REMOVE) ? sal_True : sal_False ); + mpCBXRewind->Check( (nFill == AnimationFill::REMOVE) ? true : false ); } else { diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 1e4cb028cb4e..ab056b967d82 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -2024,7 +2024,7 @@ IMPL_LINK( CustomAnimationPane, implControlHdl, Control*, pControl ) else if( pControl == mpCBAutoPreview ) { SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS); - pOptions->SetPreviewChangedEffects( mpCBAutoPreview->IsChecked() ? sal_True : sal_False ); + pOptions->SetPreviewChangedEffects( mpCBAutoPreview->IsChecked() ? true : false ); } updateControls(); diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 47b98b6dc326..680a49928585 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -1044,7 +1044,7 @@ IMPL_LINK_NOARG(SlideTransitionPane, LoopSoundBoxChecked) IMPL_LINK_NOARG(SlideTransitionPane, AutoPreviewClicked) { SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS); - pOptions->SetPreviewTransitions( mpCB_AUTO_PREVIEW->IsChecked() ? sal_True : sal_False ); + pOptions->SetPreviewTransitions( mpCB_AUTO_PREVIEW->IsChecked() ? true : false ); return 0; } diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index cbbbc345c59b..a1a445302f55 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -251,7 +251,7 @@ void AnnotationManagerImpl::ShowAnnotations( bool bShow ) SdOptions* pOptions = SD_MOD()->GetSdOptions(mpDoc->GetDocumentType()); if( pOptions ) - pOptions->SetShowComments( mbShowAnnotations ? sal_True : sal_False ); + pOptions->SetShowComments( mbShowAnnotations ? true : false ); UpdateTags(); } @@ -929,7 +929,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation aStr = aStr.replaceFirst("%1", aReplace); pMenu->SetItemText( SID_DELETEALLBYAUTHOR_POSTIT, aStr ); pMenu->EnableItem( SID_REPLYTO_POSTIT, (sAuthor != sCurrentAuthor) && !bReadOnly ); - pMenu->EnableItem( SID_DELETE_POSTIT, (xAnnotation.is() && !bReadOnly) ? sal_True : sal_False ); + pMenu->EnableItem( SID_DELETE_POSTIT, (xAnnotation.is() && !bReadOnly) ? true : false ); pMenu->EnableItem( SID_DELETEALLBYAUTHOR_POSTIT, !bReadOnly ); pMenu->EnableItem( SID_DELETEALL_POSTIT, !bReadOnly ); diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index 8b6875284bb8..09cb270a24d0 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -185,7 +185,7 @@ bool LayerTabBar::StartRenaming() } } - return bOK ? 1 : 0; + return bOK ? true : false; } TabBarAllowRenamingReturnCode LayerTabBar::AllowRenaming() diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 6344dba48642..5d54b1a4af91 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -613,12 +613,12 @@ bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos) bool bSet = false; bool bAnimationInfo = (!mpDocSh->ISA(GraphicDocShell) && - mpDoc->GetAnimationInfo(pObj)) ? sal_True:sal_False; + mpDoc->GetAnimationInfo(pObj)) ? true:false; bool bImageMapInfo = false; if (!bAnimationInfo) - bImageMapInfo = mpDoc->GetIMapInfo(pObj) ? sal_True:sal_False; + bImageMapInfo = mpDoc->GetIMapInfo(pObj) ? true:false; if (bAnimationInfo || bImageMapInfo) { diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 8253ee54c6a8..4e4618e7bfda 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -197,7 +197,7 @@ const SfxItemSet* FuPage::ExecuteDialog( ::vcl::Window* pParent ) SvxPageItem aPageItem( SID_ATTR_PAGE ); aPageItem.SetDescName( mpPage->GetName() ); aPageItem.SetPageUsage( (SvxPageUsage) SVX_PAGE_ALL ); - aPageItem.SetLandscape( mpPage->GetOrientation() == ORIENTATION_LANDSCAPE ? sal_True: sal_False ); + aPageItem.SetLandscape( mpPage->GetOrientation() == ORIENTATION_LANDSCAPE ? true: false ); aPageItem.SetNumType( mpDoc->GetPageNumType() ); aNewAttr.Put( aPageItem ); @@ -222,7 +222,7 @@ const SfxItemSet* FuPage::ExecuteDialog( ::vcl::Window* pParent ) // Applikation bool bScale = mpDoc->GetDocumentType() != DOCUMENT_TYPE_DRAW; - aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT1, bScale ? sal_True : sal_False ) ); + aNewAttr.Put( SfxBoolItem( SID_ATTR_PAGE_EXT1, bScale ? true : false ) ); bool bFullSize = mpPage->IsMasterPage() ? mpPage->IsBackgroundFullSize() : static_cast<SdPage&>(mpPage->TRG_GetMasterPage()).IsBackgroundFullSize(); diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index 9c24fc15d677..60abef032c08 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -120,7 +120,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq ) const SfxPoolItem *pItem = 0; if( SfxItemState::SET == pArgs->GetItemState( ATTR_NUMBER_NEWSTART, false, &pItem ) ) { - const bool bNewStart = static_cast<const SfxBoolItem*>(pItem)->GetValue() ? sal_True : sal_False; + const bool bNewStart = static_cast<const SfxBoolItem*>(pItem)->GetValue() ? true : false; pOutliner->SetParaIsNumberingRestart( eSelection.nStartPara, bNewStart ); } diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index 5de61d5a9694..53e4010878f6 100644 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -297,7 +297,7 @@ bool SmartTagSet::getContext( SdrViewContext& rContext ) const bool SmartTagSet::HasMarkablePoints() const { - return GetMarkablePointCount() != 0 ? sal_True : sal_False; + return GetMarkablePointCount() != 0 ? true : false; } sal_uLong SmartTagSet::GetMarkablePointCount() const @@ -309,7 +309,7 @@ sal_uLong SmartTagSet::GetMarkablePointCount() const bool SmartTagSet::HasMarkedPoints() const { - return GetMarkedPointCount() != 0 ? sal_True : sal_False; + return GetMarkedPointCount() != 0 ? true : false; } sal_uLong SmartTagSet::GetMarkedPointCount() const diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index ad840e455ade..dcba9be890ed 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -461,7 +461,7 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const : SdrObject* pObj = mpShape->GetSdrObject(); if( pObj ) { - SdAnimationInfo* pInfo = GetAnimationInfo((pEntry->nWID <= WID_THAT_NEED_ANIMINFO)?sal_True:sal_False); + SdAnimationInfo* pInfo = GetAnimationInfo((pEntry->nWID <= WID_THAT_NEED_ANIMINFO)?true:false); switch(pEntry->nWID) { @@ -972,7 +972,7 @@ void SdXShape::SetEmptyPresObj(bool bEmpty) if(!bEmpty) { OutlinerParaObject* pOutlinerParaObject = pObj->GetOutlinerParaObject(); - const bool bVertical = pOutlinerParaObject ? pOutlinerParaObject->IsVertical() : sal_False; + const bool bVertical = pOutlinerParaObject ? pOutlinerParaObject->IsVertical() : false; // really delete SdrOutlinerObj at pObj pObj->NbcSetOutlinerParaObject(0L); @@ -1409,7 +1409,7 @@ void SAL_CALL SdUnoEventsAccess::replaceByName( const OUString& aName, const uno pInfo->SetBookmark( aStrSoundURL ); if( eClickAction != presentation::ClickAction_SOUND ) pInfo->mbSecondSoundOn = !aStrSoundURL.isEmpty(); - pInfo->mbSecondPlayFull = nFound & FOUND_PLAYFULL ? bPlayFull : sal_False; + pInfo->mbSecondPlayFull = nFound & FOUND_PLAYFULL ? bPlayFull : false; bOk = true; } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 480262f97e5f..97b1042100be 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -1064,7 +1064,7 @@ void ViewShellBase::Implementation::ShowViewTabBar (bool bShow) if (mpViewTabBar.is() && mpViewTabBar->GetTabControl()->IsVisible() != bShow) { - mpViewTabBar->GetTabControl()->Show(bShow ? sal_True : sal_False); + mpViewTabBar->GetTabControl()->Show(bShow ? true : false); mrBase.Rearrange(); } } diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 35c8f3549358..9afeccc26b5b 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -1304,7 +1304,7 @@ bool View::ShouldToggleOn( continue; pOutliner->SetText(*(pText->GetOutlinerParaObject())); sal_Int16 nStatus = pOutliner->GetBulletsNumberingStatus(); - bToggleOn = ((bNormalBullet && nStatus != 0) || (!bNormalBullet && nStatus != 1)) ? sal_True : bToggleOn; + bToggleOn = ((bNormalBullet && nStatus != 0) || (!bNormalBullet && nStatus != 1)) ? true : bToggleOn; pOutliner->Clear(); } } @@ -1316,7 +1316,7 @@ bool View::ShouldToggleOn( continue; pOutliner->SetText(*pParaObj); sal_Int16 nStatus = pOutliner->GetBulletsNumberingStatus(); - bToggleOn = ((bNormalBullet && nStatus != 0) || (!bNormalBullet && nStatus != 1)) ? sal_True : bToggleOn; + bToggleOn = ((bNormalBullet && nStatus != 0) || (!bNormalBullet && nStatus != 1)) ? true : bToggleOn; pOutliner->Clear(); } } diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 0cb06ef6b2b3..a078414d21ff 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -845,7 +845,7 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv /* In order t ensure unique page names, we test the ones we want to insert. If necessary. we put them into and replacement list (bNameOK == sal_False -> User canceled). */ - bool bLink = ( NAVIGATOR_DRAGTYPE_LINK == pPageObjsTransferable->GetDragType() ? sal_True : sal_False ); + bool bLink = ( NAVIGATOR_DRAGTYPE_LINK == pPageObjsTransferable->GetDragType() ? true : false ); bool bNameOK = GetExchangeList( aExchangeList, aBookmarkList, 2 ); bool bReplace = false; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 3f90d2d381e4..6a949d021a98 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -633,7 +633,7 @@ void IndexTabPage_Impl::InitializeIndex() DBG_ASSERT( aRefList.getLength() == aAnchorList.getLength(),"reference list and title list of different length" ); - const bool insert = ( ( ndx = aKeywordPair.indexOf( ';' ) ) == -1 ? sal_False : sal_True ); + const bool insert = ( ( ndx = aKeywordPair.indexOf( ';' ) ) == -1 ? false : true ); if ( insert ) { @@ -927,9 +927,9 @@ SearchTabPage_Impl::SearchTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_ Any aUserItem = aViewOpt.GetUserItem( USERITEM_NAME ); if ( aUserItem >>= aUserData ) { - bool bChecked = ( 1 == aUserData.getToken(0, ';').toInt32() ) ? sal_True : sal_False; + bool bChecked = ( 1 == aUserData.getToken(0, ';').toInt32() ) ? true : false; m_pFullWordsCB->Check( bChecked ); - bChecked = ( 1 == aUserData.getToken(1, ';').toInt32() ) ? sal_True : sal_False; + bChecked = ( 1 == aUserData.getToken(1, ';').toInt32() ) ? true : false; m_pScopeCB->Check( bChecked ); for ( sal_uInt16 i = 2; i < comphelper::string::getTokenCount(aUserData, ';'); ++i ) diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index 2a533bb29ed8..f1f275dcaedd 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -159,7 +159,7 @@ short SvxOpenGraphicDialog::Execute() if ( nFound == USHRT_MAX ) { WarningBox aWarningBox( NULL, WB_3DLOOK | WB_RETRY_CANCEL, SfxResId( SvxOpenGrfErr2ResId(nImpRet) ).toString() ); - bQuitLoop = aWarningBox.Execute()==RET_RETRY ? sal_False : sal_True; + bQuitLoop = aWarningBox.Execute()==RET_RETRY ? false : true; } else { diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 0fd1dbcc4e6a..aa8be183d7e5 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -537,7 +537,7 @@ namespace sfx2 bool operator() ( const MapGroupEntry2GroupEntry::value_type& _rMapEntry ) { - return _rMapEntry.first == aLookingFor ? sal_True : sal_False; + return _rMapEntry.first == aLookingFor ? true : false; } }; diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 8de5c55b9ab5..cfb62890540e 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -1262,7 +1262,7 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem) if(!bWaterDisabled) //make sure the watercan is only activated when there is (only) one selection - bWaterDisabled = (pTreeBox || aFmtLb.GetSelectionCount() <= 1) ? sal_False : sal_True; + bWaterDisabled = (pTreeBox || aFmtLb.GetSelectionCount() <= 1) ? false : true; if(pItem && !bWaterDisabled) { @@ -1805,7 +1805,7 @@ sal_Int32 SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter( SfxObjectShell* nFilter = aFactoryProps.getUnpackedValueOrDefault( "ooSetupFactoryStyleFilter", nDefault ); m_bWantHierarchical = - (nFilter & SFXSTYLEBIT_HIERARCHY) ? sal_True : sal_False; + (nFilter & SFXSTYLEBIT_HIERARCHY) ? true : false; nFilter &= ~SFXSTYLEBIT_HIERARCHY; // clear it return nFilter; @@ -2155,10 +2155,10 @@ void SfxCommonTemplateDialog_Impl::EnableExample_Impl(sal_uInt16 nId, bool bEnab { if( nId == SID_STYLE_NEW_BY_EXAMPLE ) { - bNewByExampleDisabled = (pTreeBox || aFmtLb.GetSelectionCount() <= 1) ? !bEnable : sal_True; + bNewByExampleDisabled = (pTreeBox || aFmtLb.GetSelectionCount() <= 1) ? !bEnable : true; } else if( nId == SID_STYLE_UPDATE_BY_EXAMPLE ) - bUpdateByExampleDisabled = (pTreeBox || aFmtLb.GetSelectionCount() <= 1) ? !bEnable : sal_True; + bUpdateByExampleDisabled = (pTreeBox || aFmtLb.GetSelectionCount() <= 1) ? !bEnable : true; EnableItem(nId, bEnable); } @@ -2542,7 +2542,7 @@ void SfxCommonTemplateDialog_Impl::UpdateFamily_Impl() } bWaterDisabled = false; - bCanNew = (pTreeBox || aFmtLb.GetSelectionCount() <= 1) ? sal_True : sal_False; + bCanNew = (pTreeBox || aFmtLb.GetSelectionCount() <= 1) ? true : false; bTreeDrag = true; bUpdateByExampleDisabled = false; diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx index 3d07fb25dcc4..320d967e15a5 100644 --- a/sfx2/source/dialog/tplcitem.cxx +++ b/sfx2/source/dialog/tplcitem.cxx @@ -163,7 +163,7 @@ IMPL_STATIC_LINK(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl, { case 0 : case 1 : - pState = new SfxBoolItem(SID_STYLE_WATERCAN, pThis->nWaterCanState ? sal_True : sal_False); + pState = new SfxBoolItem(SID_STYLE_WATERCAN, pThis->nWaterCanState ? true : false); break; } pThis->rTemplateDlg.SetWaterCanState(pState); diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 8730b67812c5..52be422929ff 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -2172,7 +2172,7 @@ sal_Bool SAL_CALL SfxDocumentMetaData::isModified( ) checkInit(); css::uno::Reference<css::util::XModifiable> xMB(m_xUserDefined, css::uno::UNO_QUERY); - return m_isModified || (xMB.is() ? xMB->isModified() : sal_False); + return m_isModified || (xMB.is() ? xMB->isModified() : false); } void SAL_CALL SfxDocumentMetaData::setModified( sal_Bool bModified ) diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index ac24da5bfaf1..15c992f8a9d7 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -1351,7 +1351,7 @@ bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const OUString& aU aNewUINames.realloc( nNewLen ); - return bChanged ? WriteUINamesForTemplateDir_Impl( aUserPath, aNewUINames ) : sal_True; + return bChanged ? WriteUINamesForTemplateDir_Impl( aUserPath, aNewUINames ) : true; } diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index af5192e38a83..4800187f2553 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -931,7 +931,7 @@ Any SfxOleSection::GetAnyValue( sal_Int32 nPropId ) const else if( GetDoubleValue( fDouble, nPropId ) ) aValue <<= fDouble; else if( GetBoolValue( bBool, nPropId ) ) - ::comphelper::setBOOL( aValue, bBool ? sal_True : sal_False ); + ::comphelper::setBOOL( aValue, bBool ? true : false ); else if( GetStringValue( aString, nPropId ) ) aValue <<= aString; else if( GetFileTimeValue( aApiDateTime, nPropId ) ) diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 7ff72bc51530..c51aab017fb5 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1853,7 +1853,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA } SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false ); - bool bSalvage = pSalvageItem ? sal_True : sal_False; + bool bSalvage = pSalvageItem ? true : false; // load document if ( !m_pData->m_pObjectShell->DoLoad(pMedium) ) diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index 3b8acbce85f6..a08023149483 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -91,7 +91,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > GetDispatch() const; void Dispatch( const SfxItemSet* pSet, bool bForceSynchron = false ); bool IsControllerDirty() const - { return bCtrlDirty ? sal_True : sal_False; } + { return bCtrlDirty ? true : false; } SfxPoolItem* GetItem() const { return pLastItem; } void ClearCache(); diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index af144a19e510..973875b61e72 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -866,8 +866,8 @@ void SidebarController::ShowPopupMenu ( { const sal_Int32 nMenuIndex (nIndex+MID_FIRST_PANEL); pMenu->InsertItem(nMenuIndex, iItem->msDisplayName, MenuItemBits::RADIOCHECK); - pMenu->CheckItem(nMenuIndex, iItem->mbIsCurrentDeck ? sal_True : sal_False); - pMenu->EnableItem(nMenuIndex, (iItem->mbIsEnabled&&iItem->mbIsActive) ? sal_True : sal_False); + pMenu->CheckItem(nMenuIndex, iItem->mbIsCurrentDeck ? true : false); + pMenu->EnableItem(nMenuIndex, (iItem->mbIsEnabled&&iItem->mbIsActive) ? true : false); const sal_Int32 nSubMenuIndex (nIndex+MID_FIRST_HIDE); if (iItem->mbIsCurrentDeck) @@ -879,7 +879,7 @@ void SidebarController::ShowPopupMenu ( else { pCustomizationMenu->InsertItem(nSubMenuIndex, iItem->msDisplayName, MenuItemBits::CHECKABLE); - pCustomizationMenu->CheckItem(nSubMenuIndex, iItem->mbIsActive ? sal_True : sal_False); + pCustomizationMenu->CheckItem(nSubMenuIndex, iItem->mbIsActive ? true : false); } } diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index bdc0dee0bb50..86ff4288aac1 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -164,7 +164,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq ) case SID_SHOWPOPUPS : { SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, SID_SHOWPOPUPS, false); - bool bShow = pShowItem ? pShowItem->GetValue() : sal_True; + bool bShow = pShowItem ? pShowItem->GetValue() : true; SFX_REQUEST_ARG(rReq, pIdItem, SfxUInt16Item, SID_CONFIGITEMID, false); sal_uInt16 nId = pIdItem ? pIdItem->GetValue() : 0; diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx index 98bbbe4a8651..ff30bff74a95 100644 --- a/starmath/source/mathmlexport.cxx +++ b/starmath/source/mathmlexport.cxx @@ -302,7 +302,7 @@ bool SmXMLExportWrapper::WriteThroughComponent( SmXMLExport *pFilter = reinterpret_cast< SmXMLExport * >( sal::static_int_cast< sal_uIntPtr >( xFilterTunnel->getSomething( SmXMLExport::getUnoTunnelId() ))); - return pFilter ? pFilter->GetSuccess() : sal_True; + return pFilter ? pFilter->GetSuccess() : true; } diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index 1a7421595ef4..de49505ad463 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -176,7 +176,7 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl() else { bSystemMenuIcons = false; - bMenuIcons = m_eMenuIcons ? sal_True : sal_False; + bMenuIcons = m_eMenuIcons ? true : false; } // Copy values from list in right order to our internal member. @@ -249,7 +249,7 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) else { bSystemMenuIcons = false; - bMenuIcons = m_eMenuIcons ? sal_True : sal_False; + bMenuIcons = m_eMenuIcons ? true : false; } // Step over list of property names and get right value from coreesponding value list to set it on internal members! diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index 83eeb542f6ad..31534293e890 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -161,7 +161,7 @@ void FileControl::Resize() ( mnFlags & FileControlMode::RESIZEBUTTONBYPATHLEN ? ( maEdit.GetTextWidth( maEdit.GetText() ) <= aOutSz.Width() - nButtonTextWidth - ButtonBorder ) - : sal_True ) ) + : true ) ) ) { maButton.SetText( maButtonText ); diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index a22fd414fb9c..48b9d5a575d0 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -776,7 +776,7 @@ void ToolboxController::enable( bool bEnable ) sal_uInt16 nItemId = 0; if( getToolboxId( nItemId, &pToolBox ) ) { - pToolBox->EnableItem( nItemId, bEnable ? sal_True : sal_False ); + pToolBox->EnableItem( nItemId, bEnable ? true : false ); } } diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index c4a04f9ecc78..1a6f0ff0ba23 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -506,7 +506,7 @@ void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, while( nCount-- ) { UnoTreeListEntry* pEntry = getEntry( *pNodes++ ); - rTree.Select( pEntry, bSelect ? sal_True : sal_False ); + rTree.Select( pEntry, bSelect ? true : false ); } } } @@ -1329,7 +1329,7 @@ void TreeControlPeer::setProperty( const OUString& PropertyName, const Any& aVal { bool bEnabled = false; if( aValue >>= bEnabled ) - rTree.EnableInplaceEditing( bEnabled ? sal_True : sal_False ); + rTree.EnableInplaceEditing( bEnabled ? true : false ); break; } case BASEPROPERTY_TREE_INVOKESSTOPNODEEDITING: diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index c94ed569173f..d148e9adbc47 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -306,7 +306,7 @@ bool SvxSuperContourDlg::Close() bRet = false; } - return( bRet ? SfxFloatingWindow::Close() : sal_False ); + return( bRet ? SfxFloatingWindow::Close() : false ); } // Enabled or disabled all Controls diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 741379b07669..b90df70e737d 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -251,7 +251,7 @@ bool SvxIMapDlg::Close() bRet = false; } - return( bRet ? SfxModelessDialog::Close() : sal_False ); + return( bRet ? SfxModelessDialog::Close() : false ); } // Enabled or disable all Controls diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 1804086c1134..c0e565c1ec70 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -2348,7 +2348,7 @@ void SvxRuler::ApplyBorders() #endif // DEBUGLIN SfxBoolItem aFlag(SID_RULER_ACT_LINE_ONLY, - nDragType & DRAG_OBJECT_ACTLINE_ONLY ? sal_True : sal_False); + nDragType & DRAG_OBJECT_ACTLINE_ONLY ? true : false); sal_uInt16 nColId = mxRulerImpl->bIsTableRows ? (bHorz ? SID_RULER_ROWS : SID_RULER_ROWS_VERTICAL) : (bHorz ? SID_RULER_BORDERS : SID_RULER_BORDERS_VERTICAL); @@ -3021,7 +3021,7 @@ void SvxRuler::CalcMinMax() { if(mxObjectItem->HasLimits()) { - if(CalcLimits(nMaxLeft, nMaxRight, nIdx & 1? sal_False : sal_True)) + if(CalcLimits(nMaxLeft, nMaxRight, nIdx & 1? false : true)) { nMaxLeft = ConvertPosPixel(nMaxLeft); nMaxRight = ConvertPosPixel(nMaxRight); diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 40a34118d14a..70a173b9add7 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -689,7 +689,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) DrawRect_Impl(aRect, m_aTransColor, m_aAlignColor); // Frame View - bool bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? sal_True : bTrans; + bool bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? true : bTrans; DrawRect_Impl( aFrmRect, bDontFill? m_aTransColor : m_aBgCol, m_aFrameColor ); } diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index a295ea9094fa..c69cd50f04f8 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -955,7 +955,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe if ( eInspectorAction != eNone ) { FmInterfaceItem aIFaceItem( SID_FM_SHOW_PROPERTY_BROWSER, xColumnToInspect ); - SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? sal_False : sal_True ); + SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? false : true ); pCurrentFrame->GetBindings().GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SfxCallMode::ASYNCHRON, &aIFaceItem, &aShowItem, 0L ); diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 9d2d260a0362..ba536d1e723e 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -614,7 +614,7 @@ void FmFormShell::Execute(SfxRequest &rReq) { // PropertyBrowser anzeigen SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSlot, false); - bool bShow = pShowItem ? pShowItem->GetValue() : sal_True; + bool bShow = pShowItem ? pShowItem->GetValue() : true; InterfaceBag aOnlyTheForm; aOnlyTheForm.insert( Reference< XInterface >( GetImpl()->getCurrentForm(), UNO_QUERY ) ); @@ -628,7 +628,7 @@ void FmFormShell::Execute(SfxRequest &rReq) case SID_FM_CTL_PROPERTIES: { SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSlot, false); - bool bShow = pShowItem ? pShowItem->GetValue() : sal_True; + bool bShow = pShowItem ? pShowItem->GetValue() : true; OSL_ENSURE( GetImpl()->onlyControlsAreMarked(), "FmFormShell::Execute: ControlProperties should be disabled!" ); if ( bShow ) diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 6ee50910df2a..78e7331711d2 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -2734,7 +2734,7 @@ bool FmXFormShell::IsPropBrwOpen() const return false; return( ( m_pShell->GetViewShell() && m_pShell->GetViewShell()->GetViewFrame() ) ? - m_pShell->GetViewShell()->GetViewFrame()->HasChildWindow(SID_FM_SHOW_PROPERTIES) : sal_False ); + m_pShell->GetViewShell()->GetViewFrame()->HasChildWindow(SID_FM_SHOW_PROPERTIES) : false ); } diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index b7331257feb9..84789afbd88f 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -299,7 +299,7 @@ void FmFormView::ChangeDesignMode(bool bDesign) else { // set the auto focus to the first control (if indicated by the model to do so) - bool bForceControlFocus = pModel ? pModel->GetAutoControlFocus() : sal_False; + bool bForceControlFocus = pModel ? pModel->GetAutoControlFocus() : false; if (bForceControlFocus) pImpl->AutoFocus(); } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index ab7a51f2339e..70d1da989a65 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -1616,7 +1616,7 @@ bool FormController::determineLockState() const if (m_bFiltering || !xResultSet.is() || !isRowSetAlive(xResultSet)) return true; else - return (m_bCanInsert && m_bCurrentRecordNew) ? sal_False + return (m_bCanInsert && m_bCurrentRecordNew) ? false : xResultSet->isBeforeFirst() || xResultSet->isAfterLast() || xResultSet->rowDeleted() || !m_bCanUpdate; } diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 632ef57ed3f4..8c1a906d0eab 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -662,7 +662,7 @@ void ParaPropertyPanel::StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eSt mpTbxIndent_IncDec->EnableItem( nSID == SID_INC_INDENT ? nIdIncrIndent : nIdDecrIndent, - ( pState && eState == SfxItemState::UNKNOWN ) ? sal_True : sal_False ); + ( pState && eState == SfxItemState::UNKNOWN ) ? true : false ); } } diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 08c41d75b6d1..24b6923c5a56 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -1148,7 +1148,7 @@ void SdrCircObj::ImpSetCircInfoToAttr() SdrObject* SdrCircObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const { - const bool bFill(OBJ_CARC == meCircleKind ? sal_False : sal_True); + const bool bFill(OBJ_CARC == meCircleKind ? false : true); const basegfx::B2DPolygon aCircPolygon(ImpCalcXPolyCirc(meCircleKind, maRect, nStartAngle, nEndAngle)); SdrObject* pRet = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aCircPolygon), bFill, bBezier); diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 86d7c7defeed..52568f11a078 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -92,7 +92,7 @@ namespace maFont(rInfo.mrFont), maDblDXArray(), maLocale(rInfo.mpLocale ? *rInfo.mpLocale : ::com::sun::star::lang::Locale()), - mbRTL(rInfo.mrFont.IsVertical() ? sal_False : rInfo.IsRTL()) + mbRTL(rInfo.mrFont.IsVertical() ? false : rInfo.IsRTL()) { if(mnTextLength && rInfo.mpDXArray) { diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 1d764a8a169b..1ac3a8f28577 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -1736,32 +1736,32 @@ SdrUndoAction* SdrUndoFactory::CreateUndoGeoObject( SdrObject& rObject ) SdrUndoAction* SdrUndoFactory::CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText ) { - return new SdrUndoAttrObj( rObject, bStyleSheet1 ? sal_True : sal_False, bSaveText ? sal_True : sal_False ); + return new SdrUndoAttrObj( rObject, bStyleSheet1 ? true : false, bSaveText ? true : false ); } SdrUndoAction* SdrUndoFactory::CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoRemoveObj( rObject, bOrdNumDirect ? sal_True : sal_False ); + return new SdrUndoRemoveObj( rObject, bOrdNumDirect ? true : false ); } SdrUndoAction* SdrUndoFactory::CreateUndoInsertObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoInsertObj( rObject, bOrdNumDirect ? sal_True : sal_False ); + return new SdrUndoInsertObj( rObject, bOrdNumDirect ? true : false ); } SdrUndoAction* SdrUndoFactory::CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoDelObj( rObject, bOrdNumDirect ? sal_True : sal_False ); + return new SdrUndoDelObj( rObject, bOrdNumDirect ? true : false ); } SdrUndoAction* SdrUndoFactory::CreateUndoNewObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoNewObj( rObject, bOrdNumDirect ? sal_True : sal_False ); + return new SdrUndoNewObj( rObject, bOrdNumDirect ? true : false ); } SdrUndoAction* SdrUndoFactory::CreateUndoCopyObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoCopyObj( rObject, bOrdNumDirect ? sal_True : sal_False ); + return new SdrUndoCopyObj( rObject, bOrdNumDirect ? true : false ); } SdrUndoAction* SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1) @@ -1771,7 +1771,7 @@ SdrUndoAction* SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_u SdrUndoAction* SdrUndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect ) { - return new SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect ? sal_True : sal_False ); + return new SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect ? true : false ); } SdrUndoAction* SdrUndoFactory::CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer ) diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 3a717a46522e..440287eed77f 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -241,7 +241,7 @@ bool SvxTableController::onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWindow sal_uInt16 nAction = getKeyboardAction( rKEvt, pWindow ); - return executeAction( nAction, ( rKEvt.GetKeyCode().IsShift() ) ? sal_True : sal_False, pWindow ); + return executeAction( nAction, ( rKEvt.GetKeyCode().IsShift() ) ? true : false, pWindow ); } diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 07c4f6c0abb7..9a9a2ccb4eaa 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -1876,7 +1876,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c pObject->NbcMirror( aTop, aBottom ); // NbcMirroring is flipping the current mirror state, // so we have to set the correct state again - static_cast<SdrObjCustomShape*>(pObject)->SetMirroredX( bMirroredX ? sal_False : sal_True ); + static_cast<SdrObjCustomShape*>(pObject)->SetMirroredX( bMirroredX ? false : true ); } if ( bNeedsMirrorY ) { @@ -1885,7 +1885,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c pObject->NbcMirror( aLeft, aRight ); // NbcMirroring is flipping the current mirror state, // so we have to set the correct state again - static_cast<SdrObjCustomShape*>(pObject)->SetMirroredY( bMirroredY ? sal_False : sal_True ); + static_cast<SdrObjCustomShape*>(pObject)->SetMirroredY( bMirroredY ? false : true ); } if( pListCopy ) diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 377cf00d4eda..d2ffe9d53bc6 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -921,7 +921,7 @@ void SvxTextEditSourceImpl::unlock() bool SvxTextEditSourceImpl::IsValid() const { - return mpView && mpWindow ? sal_True : sal_False; + return mpView && mpWindow ? true : false; } Rectangle SvxTextEditSourceImpl::GetVisArea() diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 37bbcc387189..c22a271d9995 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -739,7 +739,7 @@ void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLSto { mxRootStorage = rXMLStorage; meCreateMode = eCreateMode; - mbDirect = ( ( GRAPHICHELPER_MODE_READ == meCreateMode ) ? bDirect : sal_True ); + mbDirect = ( ( GRAPHICHELPER_MODE_READ == meCreateMode ) ? bDirect : true ); } SvXMLGraphicHelper* SvXMLGraphicHelper::Create( const uno::Reference < embed::XStorage >& rXMLStorage, diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 75732f1a46d1..336050a18e0a 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2859,9 +2859,9 @@ void WW8Export::WriteFkpPlcUsw() if ( pFibData ) { pFib->fReadOnlyRecommended = - pFibData->getReadOnlyRecommended() ? 1 : 0; + pFibData->getReadOnlyRecommended() ? true : false; pFib->fWriteReservation = - pFibData->getWriteReservation() ? 1 : 0; + pFibData->getWriteReservation() ? true : false; } pFib->Write( Strm() ); // FIB diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx index f7e3fe6d0ad4..a0628c0f22b3 100644 --- a/toolkit/source/awt/vclxfont.cxx +++ b/toolkit/source/awt/vclxfont.cxx @@ -66,7 +66,7 @@ bool VCLXFont::ImplAssertValidFontMetric() pOutDev->SetFont( aOldFont ); } } - return mpFontMetric ? sal_True : sal_False; + return mpFontMetric ? true : false; } diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index a30695d5afd5..e0cedc4963ff 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -1140,7 +1140,7 @@ void VCLXRadioButton::setProperty( const OUString& PropertyName, const ::com::su sal_Int16 n = sal_Int16(); if ( Value >>= n ) { - bool b = n ? sal_True : sal_False; + bool b = n ? true : false; if ( pButton->IsRadioCheckEnabled() ) pButton->Check( b ); else @@ -1807,7 +1807,7 @@ void VCLXListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) if( pListBox ) { - bool bDropDown = ( pListBox->GetStyle() & WB_DROPDOWN ) ? sal_True : sal_False; + bool bDropDown = ( pListBox->GetStyle() & WB_DROPDOWN ) ? true : false; if ( bDropDown && !IsSynthesizingVCLEvent() && maActionListeners.getLength() ) { // Call ActionListener on DropDown event @@ -4690,7 +4690,7 @@ void VCLXFormattedSpinField::setStrictFormat( bool bStrict ) bool VCLXFormattedSpinField::isStrictFormat() { FormatterBase* pFormatter = GetFormatter(); - return pFormatter ? pFormatter->IsStrictFormat() : sal_False; + return pFormatter ? pFormatter->IsStrictFormat() : false; } diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index b4b4bc911942..8d7ec07416c4 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -150,7 +150,7 @@ bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) ) nPropId = BASEPROPERTY_FONTDESCRIPTOR; - return maData.find( nPropId ) != maData.end() ? sal_True : sal_False; + return maData.find( nPropId ) != maData.end() ? true : false; } ::com::sun::star::uno::Any UnoControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx index 0dd5367ce96e..e1144e463b4f 100644 --- a/toolkit/source/helper/property.cxx +++ b/toolkit/source/helper/property.cxx @@ -385,7 +385,7 @@ bool DoesDependOnOthers( sal_uInt16 nPropertyId ) { const ImplPropertyInfo* pImplPropertyInfo = ImplGetImplPropertyInfo( nPropertyId ); DBG_ASSERT( pImplPropertyInfo, "Invalid PropertyId!" ); - return pImplPropertyInfo ? pImplPropertyInfo->bDependsOnOthers : sal_False; + return pImplPropertyInfo ? pImplPropertyInfo->bDependsOnOthers : false; } bool CompareProperties( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx index 14b7dec3189c..d8658952590a 100644 --- a/toolkit/source/helper/unopropertyarrayhelper.cxx +++ b/toolkit/source/helper/unopropertyarrayhelper.cxx @@ -46,7 +46,7 @@ bool UnoPropertyArrayHelper::ImplHasProperty( sal_uInt16 nPropId ) const if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) ) nPropId = BASEPROPERTY_FONTDESCRIPTOR; - return maIDs.find( nPropId ) != maIDs.end() ? sal_True : sal_False; + return maIDs.find( nPropId ) != maIDs.end() ? true : false; } // ::cppu::IPropertyArrayHelper diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index 6087476da18f..5cdcbfe0e120 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -212,7 +212,7 @@ static bool lcl_ImplIsParent( vcl::Window* pParentWindow, vcl::Window* pPossible while ( pWindow && ( pWindow != pParentWindow ) ) pWindow = pWindow->GetParent(); - return pWindow ? sal_True : sal_False; + return pWindow ? true : false; } void UnoWrapper::WindowDestroyed( vcl::Window* pWindow ) diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx index cf0df72b08d4..fd21f55a8270 100644 --- a/tools/source/generic/bigint.cxx +++ b/tools/source/generic/bigint.cxx @@ -507,7 +507,7 @@ BigInt::BigInt( const OUString& rString ) p++; } if ( bIsBig ) - bIsNeg = bNeg ? sal_True : sal_False; + bIsNeg = bNeg ? true : false; else if( bNeg ) nVal = -nVal; } diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index d57ffa8aef21..dc2f9991f16a 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -852,8 +852,8 @@ Reference< XRow > FTPContent::getPropertyValues( xRow->appendBoolean(seqProp[i], aDirEntry.m_nMode & INETCOREFTP_FILEMODE_WRITE - ? 0 - : 1 ); + ? false + : true ); else if(Name == "IsDocument") xRow->appendBoolean(seqProp[i], (aDirEntry.m_nMode & diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx index 57ed05701bef..1b1cfa58cc13 100644 --- a/unotools/source/config/configvaluecontainer.cxx +++ b/unotools/source/config/configvaluecontainer.cxx @@ -234,7 +234,7 @@ namespace utl _rConfigLocation, _nLevels, ( _nAccessFlags & CVC_UPDATE_ACCESS ) ? OConfigurationTreeRoot::CM_UPDATABLE : OConfigurationTreeRoot::CM_READONLY, - ( _nAccessFlags & CVC_IMMEDIATE_UPDATE ) ? sal_False : sal_True + ( _nAccessFlags & CVC_IMMEDIATE_UPDATE ) ? false : true ); SAL_WARN_IF(!m_pImpl->aConfigRoot.isValid(), "unotools.config", "Could not access the configuration node located at " << _rConfigLocation); diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index 2df1103c734f..d57713095ef3 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -91,7 +91,7 @@ void SvtSearchOptions_Impl::Notify( const Sequence< OUString >& ) bool SvtSearchOptions_Impl::GetFlag( sal_uInt16 nOffset ) const { DBG_ASSERT( nOffset <= MAX_FLAGS_OFFSET, "offset out of range"); - return ((nFlags >> nOffset) & 0x01) ? sal_True : sal_False; + return ((nFlags >> nOffset) & 0x01) ? true : false; } void SvtSearchOptions_Impl::SetFlag( sal_uInt16 nOffset, bool bVal ) diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index b2688612a53f..73e89045c66f 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -526,7 +526,7 @@ SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext( { // draw:polygon or draw:polyline inside group context pContext = new SdXMLPolygonShapeContext( rImport, p_nPrefix, rLocalName, xAttrList, rShapes, - rTokenMap.Get(p_nPrefix, rLocalName) == XML_TOK_GROUP_POLYGON ? sal_True : sal_False, bTemporaryShape ); + rTokenMap.Get(p_nPrefix, rLocalName) == XML_TOK_GROUP_POLYGON ? true : false, bTemporaryShape ); break; } case XML_TOK_GROUP_PATH: diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index 27ae8593386a..63093896a604 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -443,7 +443,7 @@ SvXMLMetaExport::startElement(const OUString & i_rName, // finally, start the element // #i107240# no whitespace here, because the DOM may already contain // whitespace, which is not cleared when loading and thus accumulates. - mrExport.StartElement(i_rName, (m_level > 1) ? sal_False : sal_True); + mrExport.StartElement(i_rName, (m_level > 1) ? false : true); ++m_level; } diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx index 6c68a766fb75..aa2205dd6cb3 100644 --- a/xmloff/source/style/WordWrapPropertyHdl.cxx +++ b/xmloff/source/style/WordWrapPropertyHdl.cxx @@ -64,10 +64,10 @@ bool XMLWordWrapPropertyHdl::importXML( const OUString& rStrImpValue, Any& rValu if( nUPD == 300 ) { if( ( nBuildId > 0 ) && (nBuildId < 9316 ) ) - bValue = bValue ? sal_False : sal_True; // treat OOo 3.0 beta1 as OOo 2.x + bValue = bValue ? false : true; // treat OOo 3.0 beta1 as OOo 2.x } else if( ( nUPD == 680 ) || ( nUPD >= 640 && nUPD <= 645 ) ) - bValue = bValue ? sal_False : sal_True; + bValue = bValue ? false : true; } rValue <<= bValue; } diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx index 2343364dbaf9..95b207ac147f 100644 --- a/xmloff/source/text/txtlists.cxx +++ b/xmloff/source/text/txtlists.cxx @@ -329,7 +329,7 @@ bool XMLTextListsHelper::EqualsToTopListStyleOnStack( const OUString& sListId ) { return mpListStack != 0 ? sListId == mpListStack->back().second - : sal_False; + : false; } OUString @@ -472,7 +472,7 @@ XMLTextListsHelper::MakeNumRule( } } - bool bSetDefaults(io_pSetDefaults ? *io_pSetDefaults : sal_False); + bool bSetDefaults(io_pSetDefaults ? *io_pSetDefaults : false); if ( !xNumRules.is() ) { // If no style name has been specified for this style and for any diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index 461b8776ddb4..56bc8c6ceecc 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -1655,7 +1655,7 @@ XMLTransformerContext *Oasis2OOoTransformer::CreateUserDefinedContext( const XMLTransformerContext *pCurrent = GetCurrentContext(); return new XMLControlOASISTransformerContext( *this, rQName, pCurrent ? pCurrent->HasQName( XML_NAMESPACE_FORM, - XML_FORM ) : sal_False ); + XML_FORM ) : false ); } case XML_ETACTION_FORM_PROPERTY: return new XMLFormPropOASISTransformerContext( *this, rQName, diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx index c2c7371e5ef9..5329700f7587 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx @@ -204,7 +204,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun if( (*extns)->critical.data == NULL ) crit = false ; else - crit = ( (*extns)->critical.data[0] == 0xFF ) ? sal_True : sal_False ; + crit = ( (*extns)->critical.data[0] == 0xFF ) ? true : false ; pExtn->setCertExtn( (*extns)->value.data, (*extns)->value.len, reinterpret_cast<unsigned char *>(const_cast<char *>(objID.getStr())), objID.getLength(), crit ) ; xExtns[len] = pExtn ; @@ -238,7 +238,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun if( (*extns)->critical.data == NULL ) crit = false ; else - crit = ( (*extns)->critical.data[0] == 0xFF ) ? sal_True : sal_False ; + crit = ( (*extns)->critical.data[0] == 0xFF ) ? true : false ; pExtn->setCertExtn( (*extns)->value.data, (*extns)->value.len, (*extns)->id.data, (*extns)->id.len, crit ) ; break; } |