From ee883319f2fd2aa5494597d2b53e60d6343c787e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 28 Jan 2014 20:02:43 +0100 Subject: bool improvements Change-Id: Ibb509cb162e53e03d42cb50eb30dd1d175991dd6 --- cui/source/options/cfgchart.cxx | 2 +- cui/source/options/connpoolsettings.cxx | 8 ++--- cui/source/options/dbregistersettings.cxx | 4 +-- cui/source/options/fontsubs.cxx | 2 +- cui/source/options/optaboutconfig.cxx | 6 ++-- cui/source/options/optasian.cxx | 16 ++++----- cui/source/options/optchart.cxx | 4 +-- cui/source/options/optdict.cxx | 12 +++---- cui/source/options/optfltr.cxx | 2 +- cui/source/options/optgdlg.cxx | 28 +++++++-------- cui/source/options/opthtml.cxx | 4 +-- cui/source/options/optinet2.cxx | 60 +++++++++++++++---------------- cui/source/options/optlingu.cxx | 8 ++--- cui/source/options/optupdt.cxx | 6 ++-- cui/source/options/webconninfo.cxx | 10 +++--- 15 files changed, 86 insertions(+), 86 deletions(-) (limited to 'cui/source/options') diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 5a3606468014..71e289380c0b 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -300,7 +300,7 @@ bool SvxChartColorTableItem::operator==( const SfxPoolItem& rAttr ) const return (this->m_aColorTable == rCTItem->GetColorList()); } - return 0; + return false; } void SvxChartColorTableItem::SetOptions( SvxChartOptions* pOpts ) const diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index 12d8fadffdd1..63a75b2f4f26 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -67,10 +67,10 @@ namespace offapp { const DriverPoolingSettingsItem* pItem = PTR_CAST(DriverPoolingSettingsItem, &_rCompare); if (!pItem) - return sal_False; + return false; if (m_aSettings.size() != pItem->m_aSettings.size()) - return sal_False; + return false; DriverPoolingSettings::const_iterator aOwn = m_aSettings.begin(); DriverPoolingSettings::const_iterator aOwnEnd = m_aSettings.end(); @@ -78,13 +78,13 @@ namespace offapp while (aOwn < aOwnEnd) { if (*aOwn != *aForeign) - return sal_False; + return false; ++aForeign; ++aOwn; } - return sal_True; + return true; } //-------------------------------------------------------------------- diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx index a3f993ed5011..6dac6e67c836 100644 --- a/cui/source/options/dbregistersettings.cxx +++ b/cui/source/options/dbregistersettings.cxx @@ -42,10 +42,10 @@ namespace svx { const DatabaseMapItem* pItem = PTR_CAST(DatabaseMapItem, &_rCompare); if ( !pItem ) - return sal_False; + return false; if ( m_aRegistrations.size() != pItem->m_aRegistrations.size() ) - return sal_False; + return false; return m_aRegistrations == pItem->m_aRegistrations; } diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 06afeb592f8d..b44a347a64f4 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -122,7 +122,7 @@ SvTreeListEntry* SvxFontSubstTabPage::CreateEntry(OUString& rFont1, OUString& rF if( !pCheckButtonData ) pCheckButtonData = new SvLBoxButtonData( m_pCheckLB ); - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false)); // Sonst Puff! pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 3d0919ec3db6..18981dd62b60 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -111,10 +111,10 @@ void CuiCustomMultilineEdit::KeyInput( const KeyEvent& rKeyEvent ) //Select all, Copy, Paste, Cut, Undo Keys if ( !bValid && ( rKeyCode.IsMod1() && ( KEY_A == nKey || KEY_C == nKey || KEY_V == nKey || KEY_X == nKey || KEY_Z == nKey ) ) ) - bValid = sal_True; + bValid = true; } else - bValid = sal_True; + bValid = true; if( bValid ) Edit::KeyInput( rKeyEvent ); } @@ -165,7 +165,7 @@ void CuiAboutConfigTabPage::InsertEntry(const OUString& rProp, const OUString& r { SvTreeListEntry* pEntry = new SvTreeListEntry; - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); //It is needed, otherwise causes crash + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false)); //It is needed, otherwise causes crash pEntry->AddItem( new SvLBoxString( pEntry, 0, rProp)); pEntry->AddItem( new SvLBoxString( pEntry, 0, rStatus)); pEntry->AddItem( new SvLBoxString( pEntry, 0, rType)); diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 2c86765bb31d..988527052a36 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -254,14 +254,14 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& ) } else { - m_pLanguageFT->Enable(sal_False); - m_pLanguageLB->Enable(sal_False); - m_pStandardCB->Enable(sal_False); - m_pStartFT->Enable(sal_False); - m_pStartED->Enable(sal_False); - m_pEndFT->Enable(sal_False); - m_pEndED->Enable(sal_False); - m_pHintFT->Enable(sal_False); + m_pLanguageFT->Enable(false); + m_pLanguageLB->Enable(false); + m_pStandardCB->Enable(false); + m_pStartFT->Enable(false); + m_pStartED->Enable(false); + m_pEndFT->Enable(false); + m_pEndED->Enable(false); + m_pHintFT->Enable(false); } if(bKernWesternText) m_pCharKerningRB->Check(sal_True); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 35f2e267ab09..313c7e135b22 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -176,7 +176,7 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, ResetToDefaults) m_pLbChartColors->GetFocus(); m_pLbChartColors->SelectEntryPos( 0 ); - m_pPBRemove->Enable( sal_True ); + m_pPBRemove->Enable( true ); } return 0L; @@ -197,7 +197,7 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor) m_pLbChartColors->GetFocus(); m_pLbChartColors->SelectEntryPos( pColorConfig->GetColorList().size() - 1 ); - m_pPBRemove->Enable( sal_True ); + m_pPBRemove->Enable( true ); } return 0L; diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index bde7de1589e2..ba626c4958ab 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -300,8 +300,8 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( // check if dictionary is read-only SetDicReadonly_Impl(xDic); sal_Bool bEnable = !IsDicReadonly_Impl(); - pNewReplacePB->Enable( sal_False ); - pDeletePB->Enable( sal_False ); + pNewReplacePB->Enable( false ); + pDeletePB->Enable( false ); pLangFT->Enable( bEnable ); pLangLB->Enable( bEnable ); ShowWords_Impl( nPos ); @@ -406,8 +406,8 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl) if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { - pNewReplacePB->Enable( sal_False ); - pDeletePB->Enable( sal_False ); + pNewReplacePB->Enable( false ); + pDeletePB->Enable( false ); // display dictionary ShowWords_Impl( nPos ); // enable or disable new and delete button according to file attributes @@ -551,8 +551,8 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox) // entries in the list box should exactly correspond to those from the // dictionary. Thus: - pNewReplacePB->Enable(sal_False); - pDeletePB->Enable( sal_True && !IsDicReadonly_Impl() ); + pNewReplacePB->Enable(false); + pDeletePB->Enable( true && !IsDicReadonly_Impl() ); } return 0; }; diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 30409b4e8007..3b78b3bc3cf2 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -295,7 +295,7 @@ void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, sal_IntPtr _nType, if( !pCheckButtonData ) pCheckButtonData = new SvLBoxButtonData( m_pCheckLB ); - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false)); pEntry->AddItem( new SvLBoxButton( pEntry, loadEnabled? SvLBoxButtonKind_enabledCheckbox : SvLBoxButtonKind_disabledCheckbox, 0, pCheckButtonData ) ); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 4862ef06361c..2aedac056ade 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -323,7 +323,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) } else { - m_pYearFrame->Enable(sal_False); + m_pYearFrame->Enable(false); } } @@ -1191,9 +1191,9 @@ static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBool sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) { // lock configuration broadcasters so that we can coordinate the notifications - pLangConfig->aSysLocaleOptions.BlockBroadcasts( sal_True ); - pLangConfig->aLanguageOptions.BlockBroadcasts( sal_True ); - pLangConfig->aLinguConfig.BlockBroadcasts( sal_True ); + pLangConfig->aSysLocaleOptions.BlockBroadcasts( true ); + pLangConfig->aLanguageOptions.BlockBroadcasts( true ); + pLangConfig->aLinguConfig.BlockBroadcasts( true ); /* * Sequence checking only matters when CTL support is enabled. @@ -1281,7 +1281,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) // this will happen after releasing the lock on the ConfigurationBroadcaster at // the end of this method pLangConfig->aSysLocaleOptions.SetLocaleConfigString( sNewLang ); - rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, sal_True ) ); + rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, true ) ); sal_uInt16 nNewType = SvtLanguageOptions::GetScriptTypeOfLanguage( eNewLocale ); bool bNewCJK = ( nNewType & SCRIPTTYPE_ASIAN ) != 0; @@ -1389,8 +1389,8 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) const sal_uInt16 STATE_COUNT = 2; SfxBoolItem* pBoolItems[STATE_COUNT]; - pBoolItems[0] = new SfxBoolItem(SID_VERTICALTEXT_STATE, sal_False); - pBoolItems[1] = new SfxBoolItem(SID_TEXT_FITTOSIZE_VERTICAL, sal_False); + pBoolItems[0] = new SfxBoolItem(SID_VERTICALTEXT_STATE, false); + pBoolItems[1] = new SfxBoolItem(SID_TEXT_FITTOSIZE_VERTICAL, false); SfxVoidItem* pInvalidItems[STATE_COUNT]; pInvalidItems[0] = new SfxVoidItem(SID_VERTICALTEXT_STATE); @@ -1407,7 +1407,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) const sal_uInt16 STATE_COUNT = 1; SfxBoolItem* pBoolItems[STATE_COUNT]; - pBoolItems[0] = new SfxBoolItem(SID_CTLFONT_STATE, sal_False); + pBoolItems[0] = new SfxBoolItem(SID_CTLFONT_STATE, false); SfxVoidItem* pInvalidItems[STATE_COUNT]; pInvalidItems[0] = new SfxVoidItem(SID_CTLFONT_STATE); lcl_UpdateAndDelete(pInvalidItems, pBoolItems, STATE_COUNT); @@ -1419,9 +1419,9 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet ) // first release the lock on the ConfigurationBroadcaster for Locale changes // it seems that our code relies on the fact that before other changes like e.g. currency // are broadcasted locale changes have been done - pLangConfig->aSysLocaleOptions.BlockBroadcasts( sal_False ); - pLangConfig->aLanguageOptions.BlockBroadcasts( sal_False ); - pLangConfig->aLinguConfig.BlockBroadcasts( sal_False ); + pLangConfig->aSysLocaleOptions.BlockBroadcasts( false ); + pLangConfig->aLanguageOptions.BlockBroadcasts( false ); + pLangConfig->aLinguConfig.BlockBroadcasts( false ); return sal_False; } @@ -1485,7 +1485,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) LanguageType eCurLangCTL = LANGUAGE_NONE; SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current(); //collect the configuration values first - m_pCurrentDocCB->Enable(sal_False); + m_pCurrentDocCB->Enable(false); // Any aWestLang; Any aCJKLang; @@ -1514,7 +1514,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) //overwrite them by the values provided by the DocShell if(pCurrentDocShell) { - m_pCurrentDocCB->Enable(sal_True); + m_pCurrentDocCB->Enable(true); m_pCurrentDocCB->Check(bLanguageCurrentDoc_Impl); const SfxPoolItem* pLang; if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, sal_False, &pLang)) @@ -1579,7 +1579,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, sal_False, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() ) { m_pWesternLanguageLB->GrabFocus(); - m_pCurrentDocCB->Enable(sal_True); + m_pCurrentDocCB->Enable(true); m_pCurrentDocCB->Check(sal_True); } } diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 753f2a0b457c..1e0957fb9b35 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -199,9 +199,9 @@ IMPL_LINK(OfaHtmlTabPage, ExportHdl_Impl, ListBox*, pBox) case HTML_CFG_MSIE: case HTML_CFG_NS40 : case HTML_CFG_WRITER : - aPrintExtensionCB->Enable(sal_True); + aPrintExtensionCB->Enable(true); break; - default: aPrintExtensionCB->Enable(sal_False); + default: aPrintExtensionCB->Enable(false); } return 0; diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index f3486ac66124..fe2d6b0423bb 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -116,7 +116,7 @@ void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent ) if ( !bValid && ( rKeyCode.IsMod1() && ( KEY_A == nKey || KEY_C == nKey || KEY_V == nKey || KEY_X == nKey || KEY_Z == nKey ) ) ) // Erase, Copy, Paste, Select All und Undo soll funktionieren - bValid = sal_True; + bValid = true; } if (bValid) Edit::KeyInput(rKEvent); @@ -647,11 +647,11 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl) xMasterPasswd->removeMasterPassword(); if ( xMasterPasswd->changeMasterPassword( Reference< task::XInteractionHandler >() ) ) { - m_pMasterPasswordPB->Enable( sal_True ); + m_pMasterPasswordPB->Enable( true ); m_pMasterPasswordCB->Check( sal_True ); - m_pMasterPasswordCB->Enable( sal_True ); - m_pMasterPasswordFT->Enable( sal_True ); - m_pShowConnectionsPB->Enable( sal_True ); + m_pMasterPasswordCB->Enable( true ); + m_pMasterPasswordFT->Enable( true ); + m_pShowConnectionsPB->Enable( true ); } else { @@ -668,16 +668,16 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl) { xMasterPasswd->allowPersistentStoring( sal_False ); m_pMasterPasswordCB->Check( sal_True ); - m_pMasterPasswordPB->Enable( sal_False ); - m_pMasterPasswordCB->Enable( sal_False ); - m_pMasterPasswordFT->Enable( sal_False ); - m_pShowConnectionsPB->Enable( sal_False ); + m_pMasterPasswordPB->Enable( false ); + m_pMasterPasswordCB->Enable( false ); + m_pMasterPasswordFT->Enable( false ); + m_pShowConnectionsPB->Enable( false ); } else { m_pSavePasswordsCB->Check( sal_True ); - m_pMasterPasswordPB->Enable( sal_True ); - m_pShowConnectionsPB->Enable( sal_True ); + m_pMasterPasswordPB->Enable( true ); + m_pShowConnectionsPB->Enable( true ); } } } @@ -716,28 +716,28 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl) { if ( xMasterPasswd->isPersistentStoringAllowed() && xMasterPasswd->changeMasterPassword( Reference< task::XInteractionHandler >() ) ) { - m_pMasterPasswordPB->Enable( sal_True ); - m_pMasterPasswordFT->Enable( sal_True ); + m_pMasterPasswordPB->Enable( true ); + m_pMasterPasswordFT->Enable( true ); } else { m_pMasterPasswordCB->Check( sal_False ); - m_pMasterPasswordPB->Enable( sal_True ); - m_pMasterPasswordFT->Enable( sal_True ); + m_pMasterPasswordPB->Enable( true ); + m_pMasterPasswordFT->Enable( true ); } } else { if ( xMasterPasswd->isPersistentStoringAllowed() && xMasterPasswd->useDefaultMasterPassword( Reference< task::XInteractionHandler >() ) ) { - m_pMasterPasswordPB->Enable( sal_False ); - m_pMasterPasswordFT->Enable( sal_False ); + m_pMasterPasswordPB->Enable( false ); + m_pMasterPasswordFT->Enable( false ); } else { m_pMasterPasswordCB->Check( sal_True ); - m_pMasterPasswordPB->Enable( sal_True ); - m_pShowConnectionsPB->Enable( sal_True ); + m_pMasterPasswordPB->Enable( true ); + m_pShowConnectionsPB->Enable( true ); } } } @@ -821,11 +821,11 @@ void SvxSecurityTabPage::InitControls() m_pCertFrame->Hide(); #endif - m_pMasterPasswordPB->Enable( sal_False ); - m_pMasterPasswordCB->Enable( sal_False ); + m_pMasterPasswordPB->Enable( false ); + m_pMasterPasswordCB->Enable( false ); m_pMasterPasswordCB->Check( sal_True ); - m_pMasterPasswordFT->Enable( sal_False ); - m_pShowConnectionsPB->Enable( sal_False ); + m_pMasterPasswordFT->Enable( false ); + m_pShowConnectionsPB->Enable( false ); // initialize the password saving checkbox try @@ -835,23 +835,23 @@ void SvxSecurityTabPage::InitControls() if ( xMasterPasswd->isPersistentStoringAllowed() ) { - m_pMasterPasswordCB->Enable( sal_True ); - m_pShowConnectionsPB->Enable( sal_True ); + m_pMasterPasswordCB->Enable( true ); + m_pShowConnectionsPB->Enable( true ); m_pSavePasswordsCB->Check( sal_True ); if ( xMasterPasswd->isDefaultMasterPasswordUsed() ) m_pMasterPasswordCB->Check( sal_False ); else { - m_pMasterPasswordPB->Enable( sal_True ); + m_pMasterPasswordPB->Enable( true ); m_pMasterPasswordCB->Check( sal_True ); - m_pMasterPasswordFT->Enable( sal_True ); + m_pMasterPasswordFT->Enable( true ); } } } catch (const Exception&) { - m_pSavePasswordsCB->Enable( sal_False ); + m_pSavePasswordsCB->Enable( false ); } } @@ -1256,8 +1256,8 @@ sal_Bool SvxEMailTabPage::FillItemSet( SfxItemSet& ) void SvxEMailTabPage::Reset( const SfxItemSet& ) { - m_pMailerURLED->Enable(sal_True ); - m_pMailerURLPB->Enable(sal_True ); + m_pMailerURLED->Enable(true ); + m_pMailerURLPB->Enable(true ); if (pImpl->aMailConfig.bROProgram) m_pMailerURLFI->Show(); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 4d1be954f1f4..20c79749a762 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1852,7 +1852,7 @@ SvTreeListEntry* SvxLinguTabPage::CreateEntry( OUString& rTxt, sal_uInt16 nCol ) pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); if (CBCOL_SECOND == nCol) pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // empty column - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false)); pEntry->AddItem( new BrwString_Impl( pEntry, 0, rTxt ) ); return pEntry; @@ -1911,8 +1911,8 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) aPrioDownPB.SetClickHdl( LINK( this, SvxEditModulesDlg, UpDownHdl_Impl )); aBackPB .SetClickHdl( LINK( this, SvxEditModulesDlg, BackHdl_Impl )); // in case of not installed language modules - aPrioUpPB .Enable( sal_False ); - aPrioDownPB.Enable( sal_False ); + aPrioUpPB .Enable( false ); + aPrioDownPB.Enable( false ); if ( SvtExtendedSecurityOptions().GetOpenHyperlinkMode() != SvtExtendedSecurityOptions::OPEN_NEVER ) @@ -1978,7 +1978,7 @@ SvTreeListEntry* SvxEditModulesDlg::CreateEntry( OUString& rTxt, sal_uInt16 nCol pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); if (CBCOL_SECOND == nCol) pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // empty column - pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), false)); pEntry->AddItem( new BrwStringDic_Impl( pEntry, 0, rTxt ) ); return pEntry; diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index d9e72472401b..a6a9eec5bbe6 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -246,9 +246,9 @@ void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& ) m_xUpdateAccess->getByName( "AutoDownloadEnabled" ) >>= bValue; m_pAutoDownloadCheckBox->Check(bValue); - m_pDestPathLabel->Enable(sal_True); - m_pDestPath->Enable(sal_True); - m_pChangePathButton->Enable(sal_True); + m_pDestPathLabel->Enable(true); + m_pDestPath->Enable(true); + m_pChangePathButton->Enable(true); OUString sValue, aPath; m_xUpdateAccess->getByName( "DownloadDestination" ) >>= sValue; diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 03a7a79fe6b0..27b4cc9acac0 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -134,8 +134,8 @@ WebConnectionInfoDialog::WebConnectionInfoDialog(Window* pParent) m_pChangeBtn->SetClickHdl( LINK( this, WebConnectionInfoDialog, ChangePasswordHdl ) ); m_pPasswordsLB->SetSelectHdl( LINK( this, WebConnectionInfoDialog, EntrySelectedHdl ) ); - m_pRemoveBtn->Enable( sal_False ); - m_pChangeBtn->Enable( sal_False ); + m_pRemoveBtn->Enable( false ); + m_pChangeBtn->Enable( false ); HeaderBarClickedHdl( NULL ); } @@ -301,12 +301,12 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl) SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry(); if ( !pEntry ) { - m_pRemoveBtn->Enable( sal_False ); - m_pChangeBtn->Enable( sal_False ); + m_pRemoveBtn->Enable( false ); + m_pChangeBtn->Enable( false ); } else { - m_pRemoveBtn->Enable( sal_True ); + m_pRemoveBtn->Enable( true ); // url container entries (-> use system credentials) have // no password -- cgit