diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:02:43 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:26:29 +0100 |
commit | ee883319f2fd2aa5494597d2b53e60d6343c787e (patch) | |
tree | a6ba55bb98f449b5f039d2723f1e7e6ee833f1d3 /cui/source/dialogs | |
parent | 9cc60839f3f3a9dfcf52d5eb76b7d36c1fbc751a (diff) |
bool improvements
Change-Id: Ibb509cb162e53e03d42cb50eb30dd1d175991dd6
Diffstat (limited to 'cui/source/dialogs')
-rw-r--r-- | cui/source/dialogs/SpellDialog.cxx | 20 | ||||
-rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 12 | ||||
-rw-r--r-- | cui/source/dialogs/cuifmsearch.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/hldocntp.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/hlinettp.cxx | 20 | ||||
-rw-r--r-- | cui/source/dialogs/hltpbase.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/hyphen.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/insdlg.cxx | 12 | ||||
-rw-r--r-- | cui/source/dialogs/splitcelldlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/thesdlg.cxx | 6 |
11 files changed, 44 insertions, 44 deletions
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 323c0b7b33ff..5637894a37c6 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -403,7 +403,7 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent sal_Int32 nIdx = 0; do { - aControls[nIdx]->Enable(sal_True); + aControls[nIdx]->Enable(true); } while(aControls[++nIdx]); @@ -412,7 +412,7 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent { //remove undo if a new sentence is active m_pSentenceED->ResetUndo(); - m_pUndoPB->Enable(sal_False); + m_pUndoPB->Enable(false); } } } @@ -426,7 +426,7 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG ) pThis->m_pAutoCorrPB->Show(pThis->rParent.HasAutoCorrection()); pThis->SpellContinue_Impl(); pThis->m_pSentenceED->ResetUndo(); - pThis->m_pUndoPB->Enable(sal_False); + pThis->m_pUndoPB->Enable(false); // get current language pThis->UpdateBoxes_Impl(); @@ -657,7 +657,7 @@ IMPL_LINK_NOARG(SpellDialog, UndoHdl) { m_pSentenceED->Undo(); if(!m_pSentenceED->GetUndoActionCount()) - m_pUndoPB->Enable(sal_False); + m_pUndoPB->Enable(false); return 0; } @@ -669,9 +669,9 @@ IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl*, pAction ) case SPELLUNDO_CHANGE_TEXTENGINE: { if(pAction->IsEnableChangePB()) - m_pChangePB->Enable(sal_False); + m_pChangePB->Enable(false); if(pAction->IsEnableChangeAllPB()) - m_pChangeAllPB->Enable(sal_False); + m_pChangeAllPB->Enable(false); } break; case SPELLUNDO_CHANGE_NEXTERROR: @@ -857,7 +857,7 @@ int SpellDialog::InitUserDicts() && (!xStor.is() || !xStor->isReadonly()) ) { pMenu->InsertItem( nItemId, xDicTmp->getName() ); - bEnable = sal_True; + bEnable = true; uno::Reference< lang::XServiceInfo > xSvcInfo( xDicTmp, uno::UNO_QUERY ); if (xSvcInfo.is()) @@ -1036,7 +1036,7 @@ void SpellDialog::InvalidateDialog() sal_Int16 i = 0; while(aDisableArr[i]) { - aDisableArr[i]->Enable(sal_False); + aDisableArr[i]->Enable(false); i++; } SfxModelessDialog::Deactivate(); @@ -1142,7 +1142,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) if(!bHasReplaced) m_pSentenceED->ClearModifyFlag(); m_pSentenceED->ResetUndo(); - m_pUndoPB->Enable(sal_False); + m_pUndoPB->Enable(false); bRet = nStartPosition > 0; } return bRet; @@ -2005,7 +2005,7 @@ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) sal_Int32 nIdx = 0; do { - aControls[nIdx]->Enable(sal_False); + aControls[nIdx]->Enable(false); } while(aControls[++nIdx]); diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 1b90b53d9689..782421f95aa9 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -70,22 +70,22 @@ SvxCharacterMap::SvxCharacterMap( Window* pParent, sal_Bool bOne_, const SfxItem //lock the size request of this widget to double the height of the label m_pShowText->set_height_request(m_pSymbolText->get_preferred_size().Height() * 3); - SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, FN_PARAM_1, sal_False ); + SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, FN_PARAM_1, false ); if ( pItem ) bOne = pItem->GetValue(); init(); - SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, sal_False ); + SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, false ); if ( pCharItem ) SetChar( pCharItem->GetValue() ); - SFX_ITEMSET_ARG( pSet, pDisableItem, SfxBoolItem, FN_PARAM_2, sal_False ); + SFX_ITEMSET_ARG( pSet, pDisableItem, SfxBoolItem, FN_PARAM_2, false ); if ( pDisableItem && pDisableItem->GetValue() ) DisableFontSelection(); - SFX_ITEMSET_ARG( pSet, pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False ); - SFX_ITEMSET_ARG( pSet, pFontNameItem, SfxStringItem, SID_FONT_NAME, sal_False ); + SFX_ITEMSET_ARG( pSet, pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, false ); + SFX_ITEMSET_ARG( pSet, pFontNameItem, SfxStringItem, SID_FONT_NAME, false ); if ( pFontItem ) { Font aTmpFont( pFontItem->GetFamilyName(), pFontItem->GetStyleName(), GetCharFont().GetSize() ); @@ -351,7 +351,7 @@ void SvxCharacterMap::init() if ( m_pFontLB->GetEntryPos( aToken ) != LISTBOX_ENTRY_NOTFOUND ) { aDefStr = aToken; - bFound = sal_True; + bFound = true; break; } } diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index e9ac03d1bb5b..5893b9f68725 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -641,7 +641,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) { // this means we're preparing for starting a search // In this case, EnableSearchForDependees disabled the search button // But as we're about to use it for cancelling the search, we really need to enable it, again - m_pbSearchAgain.Enable( sal_True ); + m_pbSearchAgain.Enable( true ); } } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 2dfba19c33fa..e8e019b6bf07 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -841,9 +841,9 @@ namespace svx { // default state: try both direction m_aHangulOnly.Check( sal_False ); - m_aHangulOnly.Enable( sal_True ); + m_aHangulOnly.Enable( true ); m_aHanjaOnly.Check( sal_False ); - m_aHanjaOnly.Enable( sal_True ); + m_aHanjaOnly.Enable( true ); if (!_bTryBothDirections) { diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index c5ac9ff1640a..c9a377d144c3 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -78,7 +78,7 @@ sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OU bIsValidURL = aURLObject.GetProtocol() != INET_PROT_NOT_VALID; if ( bIsValidURL ) { - OUString aBase( aURLObject.getName( INetURLObject::LAST_SEGMENT, sal_False ) ); + OUString aBase( aURLObject.getName( INetURLObject::LAST_SEGMENT, false ) ); if ( aBase.isEmpty() || ( aBase[0] == '.' ) ) bIsValidURL = sal_False; } diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index ddaf9865cf98..35cf1ca3b069 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -69,12 +69,12 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, /////////////////////////////////////// // set defaults maRbtLinktypInternet.Check (); - maFtLogin.Show( sal_False ); - maFtPassword.Show( sal_False ); - maEdLogin.Show( sal_False ); - maEdPassword.Show( sal_False ); - maCbAnonymous.Show( sal_False ); - maBtBrowse.Enable( sal_True ); + maFtLogin.Show( false ); + maFtPassword.Show( false ); + maEdLogin.Show( false ); + maEdPassword.Show( false ); + maCbAnonymous.Show( false ); + maBtBrowse.Enable( true ); /////////////////////////////////////// // overload handlers @@ -407,11 +407,11 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl) SfxStringItem aName( SID_FILE_NAME, OUString("http://") ); SfxStringItem aRefererItem( SID_REFERER, OUString("private:user") ); - SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_True ); - SfxBoolItem aSilent( SID_SILENT, sal_True ); - SfxBoolItem aReadOnly( SID_DOC_READONLY, sal_True ); + SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, true ); + SfxBoolItem aSilent( SID_SILENT, true ); + SfxBoolItem aReadOnly( SID_DOC_READONLY, true ); - SfxBoolItem aBrowse( SID_BROWSE, sal_True ); + SfxBoolItem aBrowse( SID_BROWSE, true ); const SfxPoolItem *ppItems[] = { &aName, &aNewView, &aSilent, &aReadOnly, &aRefererItem, &aBrowse, NULL }; (((SvxHpLinkDlg*)mpDialog)->GetBindings())->Execute( SID_OPENDOC, ppItems, 0, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD ); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 29774ddacb60..5cd21e4c2f6b 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -353,7 +353,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl) */ sal_Bool bIsInputEnabled = GetParent()->IsInputEnabled(); if ( bIsInputEnabled ) - GetParent()->EnableInput( sal_False ); + GetParent()->EnableInput( false ); SfxMacroAssignDlg aDlg( this, mxDocumentFrame, *pItemSet ); // add events @@ -370,7 +370,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl) SFX_EVENT_MOUSEOUT_OBJECT); if ( bIsInputEnabled ) - GetParent()->EnableInput( sal_True ); + GetParent()->EnableInput( true ); // execute dlg DisableClose( sal_True ); short nRet = aDlg.Execute(); diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index ed436b6cf0dd..c051582387ad 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -376,7 +376,7 @@ IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, EMPTYARG /*pButt catch (uno::Exception &e) { (void) e; - DBG_ASSERT( 0, "Hyphenate All failed" ); + DBG_ASSERT( false, "Hyphenate All failed" ); } } return 0; @@ -510,7 +510,7 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( // disable controls if service is not available if (!xHyphenator.is()) - Enable( sal_False ); + Enable( false ); } diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 1be69603b484..7319f4a64ede 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -126,7 +126,7 @@ IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl) } catch( const IllegalArgumentException& ) { - DBG_ASSERT( 0, "caught IllegalArgumentException when registering filter\n" ); + DBG_ASSERT( false, "caught IllegalArgumentException when registering filter\n" ); } if( xFilePicker->execute() == ExecutableDialogResults::OK ) @@ -368,7 +368,7 @@ IMPL_LINK_NOARG(SvInsertPlugInDialog, BrowseHdl) } catch( IllegalArgumentException& ) { - DBG_ASSERT( 0, "caught IllegalArgumentException when registering filter\n" ); + DBG_ASSERT( false, "caught IllegalArgumentException when registering filter\n" ); } if( xFilePicker->execute() == ExecutableDialogResults::OK ) @@ -547,8 +547,8 @@ short SfxInsertFloatingFrameDialog::Execute() { m_pCBMarginWidthDefault->Check( sal_True ); m_pNMMarginWidth->SetText( OUString::number(DEFAULT_MARGIN_WIDTH) ); - m_pFTMarginWidth->Enable( sal_False ); - m_pNMMarginWidth->Enable( sal_False ); + m_pFTMarginWidth->Enable( false ); + m_pNMMarginWidth->Enable( false ); } else m_pNMMarginWidth->SetText( OUString::number( nSize ) ); @@ -560,8 +560,8 @@ short SfxInsertFloatingFrameDialog::Execute() { m_pCBMarginHeightDefault->Check( sal_True ); m_pNMMarginHeight->SetText( OUString::number(DEFAULT_MARGIN_HEIGHT) ); - m_pFTMarginHeight->Enable( sal_False ); - m_pNMMarginHeight->Enable( sal_False ); + m_pFTMarginHeight->Enable( false ); + m_pNMMarginHeight->Enable( false ); } else m_pNMMarginHeight->SetText( OUString::number( nSize ) ); diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index 978f06b0735f..8c809e93d3bd 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -39,7 +39,7 @@ SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, m_pVertBox->SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl )); if( mnMaxVertical < 2 ) - m_pVertBox->Enable(sal_False); + m_pVertBox->Enable(false); //exchange the meaning of horizontal and vertical for vertical text if(bIsTableVertical) diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 0aecd5210397..354eec47add1 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -220,7 +220,7 @@ SvTreeListEntry * ThesaurusAlternativesCtrl::AddEntry( sal_Int32 nVal, const OUS } pEntry->AddItem( new SvLBoxString( pEntry, 0, OUString() ) ); // add empty column aText += rText; - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0 ) ); // otherwise crash + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false ) ); // otherwise crash pEntry->AddItem( new AlternativesString( *this, pEntry, 0, aText ) ); SetExtraData( pEntry, AlternativesExtraData( rText, bIsHeader ) ); @@ -482,7 +482,7 @@ SvxThesaurusDialog::SvxThesaurusDialog( LookUp( aTmp2 ); m_pAlternativesCT->GrabFocus(); - m_pLeftBtn->Enable( sal_False ); + m_pLeftBtn->Enable( false ); // fill language menu button list SvtLanguageTable aLangTab; @@ -513,7 +513,7 @@ SvxThesaurusDialog::SvxThesaurusDialog( // disable controls if service is missing if (!xThesaurus.is()) - Enable( sal_False ); + Enable( false ); } IMPL_LINK( SvxThesaurusDialog, ReplaceBtnHdl_Impl, Button *, EMPTYARG /*pBtn*/ ) |