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 /cui | |
parent | 6425f7ff616f9aaad8b4e279385ed3f5ab65bfe2 (diff) |
Improved loplugin:literaltoboolconversion looking into cond. exprs.
...automatic rewriter fixes
Change-Id: I6b04ca80f08f8a71ff94e309fd52f44d736751ee
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/cuifmsearch.cxx | 6 | ||||
-rw-r--r-- | cui/source/options/connpooloptions.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/page.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/swpossizetabpage.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/transfrm.cxx | 8 |
6 files changed, 14 insertions, 14 deletions
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; } |