diff options
| author | Noel Grandin <noel@peralex.com> | 2014-03-24 15:42:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-03-25 14:32:56 +0200 |
| commit | 436cd900956b5fd0b6583954c002f8c28ca32698 (patch) | |
| tree | 00bf0fb7c6daa0041670ce5209e5912780520a66 | |
| parent | c849d750eb751d3f2b99d23cca1c8c08672ff379 (diff) | |
svtools: sal_Bool->bool
Change-Id: Ifd3e643dbc6755839ad4af73ae141fd115ddb4f4
95 files changed, 578 insertions, 576 deletions
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index dd849bf4e00a..78359a9f636c 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -482,7 +482,7 @@ namespace accessibility if ( !pEntry ) throw IndexOutOfBoundsException(); - getListBox()->Select( pEntry, sal_True ); + getListBox()->Select( pEntry, true ); } sal_Bool SAL_CALL AccessibleListBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) @@ -509,7 +509,7 @@ namespace accessibility { SvTreeListEntry* pEntry = getListBox()->GetEntry( i ); if ( getListBox()->IsSelected( pEntry ) ) - getListBox()->Select( pEntry, sal_False ); + getListBox()->Select( pEntry, false ); } } @@ -524,7 +524,7 @@ namespace accessibility { SvTreeListEntry* pEntry = getListBox()->GetEntry( i ); if ( !getListBox()->IsSelected( pEntry ) ) - getListBox()->Select( pEntry, sal_True ); + getListBox()->Select( pEntry, true ); } } @@ -577,7 +577,7 @@ namespace accessibility if ( !pEntry ) throw IndexOutOfBoundsException(); - getListBox()->Select( pEntry, sal_False ); + getListBox()->Select( pEntry, false ); } void AccessibleListBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 7385f5233e35..bb02fa38d5b5 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -874,7 +874,7 @@ namespace accessibility if ( !pEntry ) throw IndexOutOfBoundsException(); - getListBox()->Select( pEntry, sal_True ); + getListBox()->Select( pEntry, true ); } sal_Bool SAL_CALL AccessibleListBoxEntry::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) @@ -907,7 +907,7 @@ namespace accessibility { SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, i ); if ( getListBox()->IsSelected( pEntry ) ) - getListBox()->Select( pEntry, sal_False ); + getListBox()->Select( pEntry, false ); } } @@ -926,7 +926,7 @@ namespace accessibility { SvTreeListEntry* pEntry = getListBox()->GetEntry( pParent, i ); if ( !getListBox()->IsSelected( pEntry ) ) - getListBox()->Select( pEntry, sal_True ); + getListBox()->Select( pEntry, true ); } } @@ -998,7 +998,7 @@ namespace accessibility if ( !pEntry ) throw IndexOutOfBoundsException(); - getListBox()->Select( pEntry, sal_False ); + getListBox()->Select( pEntry, false ); } sal_Int32 SAL_CALL AccessibleListBoxEntry::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 92f346ded2f9..d7495b894c91 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -214,8 +214,8 @@ class WatchTreeListBox : public SvHeaderTabListBox OUString aEditingRes; protected: - virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); + virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ); + virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); bool ImplBasicEntryEdited( SvTreeListEntry* pEntry, const OUString& rResult ); SbxBase* ImplGetSBXForEntry( SvTreeListEntry* pEntry, bool& rbArrayElement ); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index c7e81a11daaf..b9d890011360 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -2277,7 +2277,7 @@ SbxBase* WatchTreeListBox::ImplGetSBXForEntry( SvTreeListEntry* pEntry, bool& rb return pSBX; } -sal_Bool WatchTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) +bool WatchTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) { WatchItem* pItem = (WatchItem*)pEntry->GetUserData(); @@ -2302,7 +2302,7 @@ sal_Bool WatchTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) return bEdit; } -sal_Bool WatchTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) +bool WatchTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { OUString aResult = comphelper::string::strip(rNewText, ' '); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index dc419081e548..462c894065e0 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -258,7 +258,7 @@ void CheckBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rTxt, } } -sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) +bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) { if (eMode != ObjectMode::Module) return false; @@ -304,7 +304,7 @@ sal_Bool CheckBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) return true; } -sal_Bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewName ) +bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewName ) { bool bValid = rNewName.getLength() <= 30 && IsValidSbxName(rNewName); OUString aOldName( GetEntryText( pEntry, 0 ) ); diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 83106acbc9b3..3f2d2d2cc7ac 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -69,7 +69,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeExtTreeListBox(Window *pPar ExtTreeListBox::~ExtTreeListBox () { } -sal_Bool ExtTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) +bool ExtTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) { bool bRet = false; @@ -95,7 +95,7 @@ sal_Bool ExtTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& ) return bRet; } -sal_Bool ExtTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) +bool ExtTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { if ( !IsValidSbxName(rNewText) ) { @@ -183,7 +183,7 @@ DragDropMode ExtTreeListBox::NotifyStartDrag( TransferDataContainer&, SvTreeList } -sal_Bool ExtTreeListBox::NotifyAcceptDrop( SvTreeListEntry* pEntry ) +bool ExtTreeListBox::NotifyAcceptDrop( SvTreeListEntry* pEntry ) { // don't drop on a BasicManager (nDepth == 0) sal_uInt16 nDepth = pEntry ? GetModel()->GetDepth( pEntry ) : 0; diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index 51daca740513..8783ee5abae2 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -97,11 +97,11 @@ public: class ExtTreeListBox : public TreeListBox { protected: - virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); + virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ); + virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvTreeListEntry* pEntry ); - virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* pEntry ); + virtual bool NotifyAcceptDrop( SvTreeListEntry* pEntry ); virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); @@ -134,8 +134,8 @@ public: bool IsChecked( sal_uLong nPos ) const; virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind eButtonKind); - virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); + virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSel ); + virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); void SetDocument( const ScriptDocument& rDocument ) { m_aDocument = rDocument; } diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 9e2a4532558e..aa150518affa 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -377,7 +377,7 @@ void DataSourceTabPage::updateControlsFromDialogModel() void DataSourceTabPage::fillSeriesListBox() { - m_pLB_SERIES->SetUpdateMode( sal_False ); + m_pLB_SERIES->SetUpdateMode( false ); Reference< XDataSeries > xSelected; SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected()); @@ -429,7 +429,7 @@ void DataSourceTabPage::fillSeriesListBox() if( bHasSelectedEntry && pSelectedEntry ) m_pLB_SERIES->Select( pSelectedEntry ); - m_pLB_SERIES->SetUpdateMode( sal_True ); + m_pLB_SERIES->SetUpdateMode( true ); } void DataSourceTabPage::fillRoleListBox() @@ -451,7 +451,7 @@ void DataSourceTabPage::fillRoleListBox() pSeriesEntry->m_xChartType )); // fill role list - m_pLB_ROLE->SetUpdateMode( sal_False ); + m_pLB_ROLE->SetUpdateMode( false ); m_pLB_ROLE->Clear(); m_pLB_ROLE->RemoveSelection(); @@ -469,7 +469,7 @@ void DataSourceTabPage::fillRoleListBox() m_pLB_ROLE->Select( m_pLB_ROLE->GetEntry( nRoleIndex )); } - m_pLB_ROLE->SetUpdateMode( sal_True ); + m_pLB_ROLE->SetUpdateMode( true ); if(pSeriesEntry->m_xChartType ->getSupportedPropertyRoles().getLength() == 0) diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 651e69430f54..f326ed90eca9 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1047,10 +1047,10 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Default) if (xReset.is()) xReset->reset(); - m_pEntriesBox->SetUpdateMode(sal_False); + m_pEntriesBox->SetUpdateMode(false); ResetConfig(); Init(m_xAct); - m_pEntriesBox->SetUpdateMode(sal_True); + m_pEntriesBox->SetUpdateMode(true); m_pEntriesBox->Invalidate(); m_pEntriesBox->Select(m_pEntriesBox->GetEntry(0, 0)); @@ -1147,7 +1147,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox ) if ( pUserData && pUserData->m_sCommand == sPossibleNewCommand ) { TAccInfo* pU1 = new TAccInfo(-1, -1, pUserData->m_aKey); - SvTreeListEntry* pE1 = m_pKeyBox->InsertEntry( pUserData->m_aKey.GetName(), 0L, sal_True, TREELIST_APPEND ); + SvTreeListEntry* pE1 = m_pKeyBox->InsertEntry( pUserData->m_aKey.GetName(), 0L, true, TREELIST_APPEND ); pE1->SetUserData(pU1); pE1->EnableChildrenOnDemand( false ); } @@ -1194,10 +1194,10 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl) if ( m_xAct.is() && ( xOld == m_xAct ) ) return 0; - m_pEntriesBox->SetUpdateMode( sal_False ); + m_pEntriesBox->SetUpdateMode( false ); ResetConfig(); Init(m_xAct); - m_pEntriesBox->SetUpdateMode( sal_True ); + m_pEntriesBox->SetUpdateMode( true ); m_pEntriesBox->Invalidate(); m_pGroupLBox->Init(m_xContext, m_xFrame, m_sModuleLongName, true); @@ -1266,10 +1266,10 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl) // open the configuration and update our UI css::uno::Reference< css::ui::XAcceleratorConfiguration > xTempAccMgr(xCfgMgr->getShortCutManager(), css::uno::UNO_QUERY_THROW); - m_pEntriesBox->SetUpdateMode(sal_False); + m_pEntriesBox->SetUpdateMode(false); ResetConfig(); Init(xTempAccMgr); - m_pEntriesBox->SetUpdateMode(sal_True); + m_pEntriesBox->SetUpdateMode(true); m_pEntriesBox->Invalidate(); m_pEntriesBox->Select(m_pEntriesBox->GetEntry(0, 0)); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index b16f1cb86d58..cf210e082262 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1429,9 +1429,9 @@ sal_Int8 SvxMenuEntriesListBox::AcceptDrop( const AcceptDropEvent& rEvt ) return SvTreeListBox::AcceptDrop( aNewAcceptDropEvent ); } -sal_Bool SvxMenuEntriesListBox::NotifyAcceptDrop( SvTreeListEntry* ) +bool SvxMenuEntriesListBox::NotifyAcceptDrop( SvTreeListEntry* ) { - return sal_True; + return true; } sal_Bool SvxMenuEntriesListBox::NotifyMoving( @@ -2043,7 +2043,7 @@ SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI( { pNewEntry = m_pContentsListBox->InsertEntry( OUString(aSeparatorStr), - 0, sal_False, nPos, pNewEntryData); + 0, false, nPos, pNewEntryData); } else { @@ -2055,12 +2055,12 @@ SvTreeListEntry* SvxConfigPage::InsertEntryIntoUI( if ( !!aImage ) { pNewEntry = m_pContentsListBox->InsertEntry( - aName, aImage, aImage, 0, sal_False, nPos, pNewEntryData ); + aName, aImage, aImage, 0, false, nPos, pNewEntryData ); } else { pNewEntry = m_pContentsListBox->InsertEntry( - aName, 0, sal_False, nPos, pNewEntryData ); + aName, 0, false, nPos, pNewEntryData ); } if ( pNewEntryData->IsPopup() || diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index a4cec40fb6e3..f1ffaa1ef67a 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -564,7 +564,7 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent const OUString& sModuleLongName, bool bEventMode) { - SetUpdateMode(sal_False); + SetUpdateMode(false); ClearAll(); // Remove all old entries from treelist box m_xFrame = xFrame; @@ -728,8 +728,9 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent } MakeVisible( GetEntry( 0,0 ) ); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } + Image SfxConfigGroupListBox::GetImage( Reference< browse::XBrowseNode > node, Reference< XComponentContext > xCtx, @@ -860,13 +861,13 @@ void SfxConfigGroupListBox::GroupSelected() { SvTreeListEntry *pEntry = FirstSelected(); SfxGroupInfo_Impl *pInfo = (SfxGroupInfo_Impl*) pEntry->GetUserData(); - pFunctionListBox->SetUpdateMode(sal_False); + pFunctionListBox->SetUpdateMode(false); pFunctionListBox->ClearAll(); if ( pInfo->nKind != SFX_CFGGROUP_FUNCTION && pInfo->nKind != SFX_CFGGROUP_SCRIPTCONTAINER && pInfo->nKind != SFX_CFGGROUP_STYLES ) { - pFunctionListBox->SetUpdateMode(sal_True); + pFunctionListBox->SetUpdateMode(true); return; } @@ -979,7 +980,7 @@ void SfxConfigGroupListBox::GroupSelected() if ( pFunctionListBox->GetEntryCount() ) pFunctionListBox->Select( pFunctionListBox->GetEntry( 0, 0 ) ); - pFunctionListBox->SetUpdateMode(sal_True); + pFunctionListBox->SetUpdateMode(true); } sal_Bool SfxConfigGroupListBox::Expand( SvTreeListEntry* pParent ) @@ -993,7 +994,7 @@ sal_Bool SfxConfigGroupListBox::Expand( SvTreeListEntry* pParent ) if ( nChildCount+1 > nEntries ) { - MakeVisible( pParent, sal_True ); + MakeVisible( pParent, true ); } else { diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 011e8e032ed9..e9853587de44 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -553,7 +553,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents) rListBox.MakeVisible( pE ); } - rListBox.SetUpdateMode( sal_True ); + rListBox.SetUpdateMode( true ); EnableButtons(); } @@ -694,7 +694,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* rListBox.GetModel()->InvalidateEntry( pE ); rListBox.Select( pE ); rListBox.MakeVisible( pE ); - rListBox.SetUpdateMode( sal_True ); + rListBox.SetUpdateMode( true ); pThis->EnableButtons(); return 0; diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 74a6bbcfc7f6..35380540a864 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -404,7 +404,7 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame m_bShowSlots = bShowSlots; m_xFrame.set(xFrame); - SetUpdateMode(sal_False); + SetUpdateMode(false); ClearAll(); Reference< XComponentContext > xContext( @@ -527,7 +527,7 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame } } MakeVisible( GetEntry( 0,0 ) ); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } Image SvxConfigGroupListBox::GetImage( @@ -623,12 +623,12 @@ void SvxConfigGroupListBox::GroupSelected() { SvTreeListEntry *pEntry = FirstSelected(); SvxGroupInfo_Impl *pInfo = (SvxGroupInfo_Impl*) pEntry->GetUserData(); - pFunctionListBox->SetUpdateMode(sal_False); + pFunctionListBox->SetUpdateMode(false); pFunctionListBox->ClearAll(); if ( pInfo->nKind != SVX_CFGGROUP_FUNCTION && pInfo->nKind != SVX_CFGGROUP_SCRIPTCONTAINER ) { - pFunctionListBox->SetUpdateMode(sal_True); + pFunctionListBox->SetUpdateMode(true); return; } @@ -794,7 +794,7 @@ void SvxConfigGroupListBox::GroupSelected() if ( pFunctionListBox->GetEntryCount() ) pFunctionListBox->Select( pFunctionListBox->GetEntry( 0, 0 ) ); - pFunctionListBox->SetUpdateMode(sal_True); + pFunctionListBox->SetUpdateMode(true); } sal_Bool SvxConfigGroupListBox::Expand( SvTreeListEntry* pParent ) @@ -808,7 +808,7 @@ sal_Bool SvxConfigGroupListBox::Expand( SvTreeListEntry* pParent ) if ( nChildCount+1 > nEntries ) { - MakeVisible( pParent, sal_True ); + MakeVisible( pParent, true ); } else { diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 77aff951ff2d..eb7ffba103b5 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -433,7 +433,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink pEntry = maLbTree.InsertEntry ( aStrDisplayname, aBmp, aBmp, pParentEntry, - sal_False, TREELIST_APPEND, + false, TREELIST_APPEND, (void*)pData ); nEntries++; } @@ -442,7 +442,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink // insert Displayname into treelist without bitmaps pEntry = maLbTree.InsertEntry ( aStrDisplayname, pParentEntry, - sal_False, TREELIST_APPEND, + false, TREELIST_APPEND, (void*)pData ); nEntries++; } @@ -452,7 +452,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink // insert Displayname into treelist without bitmaps pEntry = maLbTree.InsertEntry ( aStrDisplayname, pParentEntry, - sal_False, TREELIST_APPEND, + false, TREELIST_APPEND, (void*)pData ); nEntries++; } diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index a529574c7c29..b7c95ffac19c 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -163,7 +163,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) sal_uInt16 nObjectType = pLink->GetObjType(); if((OBJECT_CLIENT_FILE & nObjectType) != OBJECT_CLIENT_FILE) { - pSvTabListBox->SelectAll(sal_False); + pSvTabListBox->SelectAll(false); pSvTabListBox->Select(pEntry); nSelectionCount = 1; } @@ -177,7 +177,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox ) pLink = (SvBaseLink*)pEntry->GetUserData(); DBG_ASSERT(pLink, "Wo ist der Link?"); if( (OBJECT_CLIENT_FILE & pLink->GetObjType()) != OBJECT_CLIENT_FILE ) - pSvTabListBox->Select( pEntry, sal_False ); + pSvTabListBox->Select( pEntry, false ); } } @@ -329,7 +329,7 @@ IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl) { SvTreeListEntry* pSelEntry = rListBox.FirstSelected(); if( pE != pSelEntry ) - rListBox.Select( pSelEntry, sal_False ); + rListBox.Select( pSelEntry, false ); rListBox.Select( pE ); rListBox.MakeVisible( pE ); } @@ -502,7 +502,7 @@ IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer ) { (void)pTimer; - Links().SetUpdateMode(sal_False); + Links().SetUpdateMode(false); for( sal_uLong nPos = Links().GetEntryCount(); nPos; ) { SvTreeListEntry* pBox = Links().GetEntry( --nPos ); @@ -515,7 +515,7 @@ IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer ) Links().SetEntryText( sCur, pBox, 3 ); } } - Links().SetUpdateMode(sal_True); + Links().SetUpdateMode(true); return 0; } @@ -540,13 +540,13 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink ) if( bLinkFnd ) { - Links().SetUpdateMode(sal_False); + Links().SetUpdateMode(false); Links().GetModel()->Remove( Links().GetEntry( nPos ) ); SvTreeListEntry* pToUnselect = Links().FirstSelected(); InsertEntry( *_pLink, nPos, sal_True ); if(pToUnselect) - Links().Select(pToUnselect, sal_False); - Links().SetUpdateMode(sal_True); + Links().Select(pToUnselect, false); + Links().SetUpdateMode(true); } else { @@ -585,7 +585,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr ) if( pNewMgr ) // update has to be stopped before clear - Links().SetUpdateMode( sal_False ); + Links().SetUpdateMode( false ); Links().Clear(); pLinkMgr = pNewMgr; @@ -613,7 +613,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr ) Links().Select( pEntry ); LinksSelectHdl( 0 ); } - Links().SetUpdateMode( sal_True ); + Links().SetUpdateMode( true ); Links().Invalidate(); } } diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 90cac374df88..df8fc2c0887d 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -155,7 +155,7 @@ void SFTreeListBox::deleteAllTree() void SFTreeListBox::Init( const OUString& language ) { - SetUpdateMode( sal_False ); + SetUpdateMode( false ); deleteAllTree(); @@ -245,7 +245,7 @@ void SFTreeListBox::Init( const OUString& language ) SAL_WNODEPRECATED_DECLARATIONS_POP } - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } Reference< XInterface > diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 23e6b56c7816..194654823346 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -297,7 +297,7 @@ bool SvxThesaurusDialog::UpdateAlternativesBox_Impl() const sal_Int32 nMeanings = aMeanings.getLength(); const uno::Reference< linguistic2::XMeaning > *pMeanings = aMeanings.getConstArray(); - m_pAlternativesCT->SetUpdateMode( sal_False ); + m_pAlternativesCT->SetUpdateMode( false ); // clear old user data of control before creating new ones via AddEntry below m_pAlternativesCT->ClearExtraData(); @@ -317,7 +317,7 @@ bool SvxThesaurusDialog::UpdateAlternativesBox_Impl() m_pAlternativesCT->AddEntry( -1, pSynonyms[k], false ); } - m_pAlternativesCT->SetUpdateMode( sal_True ); + m_pAlternativesCT->SetUpdateMode( true ); return nMeanings > 0; } diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 14d9e0fa0d6b..370c893ee1eb 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -326,7 +326,7 @@ public: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* pEntry ); + virtual bool NotifyAcceptDrop( SvTreeListEntry* pEntry ); virtual sal_Bool NotifyMoving( SvTreeListEntry*, SvTreeListEntry*, SvTreeListEntry*&, sal_uLong& ); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 4bd0cd91258e..84a4868c6639 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -194,7 +194,7 @@ sal_Bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& ) void SvxFontSubstTabPage::Reset( const SfxItemSet& ) { - m_pCheckLB->SetUpdateMode(sal_False); + m_pCheckLB->SetUpdateMode(false); m_pCheckLB->Clear(); FontList aFntLst( Application::GetDefaultDevice() ); @@ -217,7 +217,7 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet& ) } CheckEnable(); - m_pCheckLB->SetUpdateMode(sal_True); + m_pCheckLB->SetUpdateMode(true); //fill font name box first m_pNonPropFontsOnlyCB->Check( diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 80504a5395fb..df029f024529 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -181,10 +181,10 @@ void CuiAboutConfigTabPage::Reset(/* const SfxItemSet&*/ ) m_vectorOfModified.clear(); m_pPrefBox->GetModel()->SetSortMode( SortNone ); - m_pPrefBox->SetUpdateMode(sal_False); + m_pPrefBox->SetUpdateMode(false); Reference< XNameAccess > xConfigAccess = getConfigAccess( "/", sal_False ); FillItems( xConfigAccess ); - m_pPrefBox->SetUpdateMode(sal_True); + m_pPrefBox->SetUpdateMode(true); } sal_Bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ ) diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index e7c0911e722b..6a060430121d 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -534,7 +534,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId ) aStr += "\t"; aStr += pEntry[i]->getReplacementText(); } - pWordsLB->InsertEntry(aStr, 0, sal_False, nPos == TREELIST_ENTRY_NOTFOUND ? TREELIST_APPEND : nPos); + pWordsLB->InsertEntry(aStr, 0, false, nPos == TREELIST_ENTRY_NOTFOUND ? TREELIST_APPEND : nPos); } if (pWordsLB->GetEntryCount()) @@ -631,7 +631,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) { // insert new entry in list-box etc... - pWordsLB->SetUpdateMode(sal_False); + pWordsLB->SetUpdateMode(false); sal_uLong _nPos = TREELIST_ENTRY_NOTFOUND; if(pReplaceFT->IsVisible()) @@ -649,13 +649,13 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) else { _nPos = GetLBInsertPos( aNewWord ); - SvTreeListEntry* pInsEntry = pWordsLB->InsertEntry(sEntry, 0, sal_False, + SvTreeListEntry* pInsEntry = pWordsLB->InsertEntry(sEntry, 0, false, _nPos == TREELIST_ENTRY_NOTFOUND ? TREELIST_APPEND : _nPos); pNewEntry = pInsEntry; } pWordsLB->MakeVisible( pNewEntry ); - pWordsLB->SetUpdateMode(sal_True); + pWordsLB->SetUpdateMode(true); // if the request came from the ReplaceEdit, give focus to the ShortEdit if(pReplaceED->HasFocus()) pWordED->GrabFocus(); @@ -732,7 +732,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) if(!bFound) { - pWordsLB->SelectAll(sal_False); + pWordsLB->SelectAll(false); pFirstSel = 0; aNewReplaceText = sNew; diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index a1c10e088d61..cf9bc8d45f54 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -228,7 +228,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& ) { SvtFilterOptions& rOpt = SvtFilterOptions::Get(); - m_pCheckLB->SetUpdateMode(sal_False); + m_pCheckLB->SetUpdateMode(false); m_pCheckLB->Clear(); SvtModuleOptions aModuleOpt; @@ -279,7 +279,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& ) } } } - m_pCheckLB->SetUpdateMode( sal_True ); + m_pCheckLB->SetUpdateMode( true ); } void OfaMSFilterTabPage2::InsertEntry( const OUString& _rTxt, sal_IntPtr _nType ) diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index b804422077a1..bb3f0ed983b5 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -538,7 +538,7 @@ void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo ) void SvxJavaOptionsPage::HandleCheckEntry( SvTreeListEntry* _pEntry ) { - m_pJavaList->Select( _pEntry, sal_True ); + m_pJavaList->Select( _pEntry, true ); SvButtonState eState = m_pJavaList->GetCheckButtonState( _pEntry ); if ( SV_BUTTON_CHECKED == eState ) diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index d0cac4e3cc4d..b2f7c1ee5736 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1371,7 +1371,7 @@ void SvxLinguTabPage::AddDicBoxEntry( const uno::Reference< XDictionary > &rxDic, sal_uInt16 nIdx ) { - m_pLinguDicsCLB->SetUpdateMode(sal_False); + m_pLinguDicsCLB->SetUpdateMode(false); OUString aTxt( ::GetDicInfoStr( rxDic->getName(), LanguageTag( rxDic->getLocale() ).getLanguageType(), @@ -1386,14 +1386,14 @@ void SvxLinguTabPage::AddDicBoxEntry( lcl_SetCheckButton( pEntry, aData.IsChecked() ); } - m_pLinguDicsCLB->SetUpdateMode(sal_True); + m_pLinguDicsCLB->SetUpdateMode(true); } void SvxLinguTabPage::UpdateDicBox_Impl() { - m_pLinguDicsCLB->SetUpdateMode(sal_False); + m_pLinguDicsCLB->SetUpdateMode(false); m_pLinguDicsCLB->Clear(); sal_Int32 nDics = aDics.getLength(); @@ -1405,7 +1405,7 @@ void SvxLinguTabPage::UpdateDicBox_Impl() AddDicBoxEntry( rDic, (sal_uInt16)i ); } - m_pLinguDicsCLB->SetUpdateMode(sal_True); + m_pLinguDicsCLB->SetUpdateMode(true); } @@ -1450,7 +1450,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) SvtLinguConfig aLngCfg; - m_pLinguOptionsCLB->SetUpdateMode(sal_False); + m_pLinguOptionsCLB->SetUpdateMode(false); m_pLinguOptionsCLB->Clear(); SvTreeList *pModel = m_pLinguOptionsCLB->GetModel(); @@ -1539,7 +1539,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pModel->Insert( pEntry ); lcl_SetCheckButton( pEntry, bVal ); - m_pLinguOptionsCLB->SetUpdateMode(sal_True); + m_pLinguOptionsCLB->SetUpdateMode(true); } @@ -2296,7 +2296,7 @@ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) if (nCurPos != TREELIST_ENTRY_NOTFOUND && 0 != (pEntry = m_pModulesCLB->GetEntry(nCurPos))) { - m_pModulesCLB->SetUpdateMode(sal_False); + m_pModulesCLB->SetUpdateMode(false); SvTreeList *pModel = m_pModulesCLB->GetModel(); ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData(); @@ -2312,7 +2312,7 @@ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) m_pModulesCLB->CheckEntryPos(nDestPos, bIsChecked ); m_pModulesCLB->SelectEntryPos(nDestPos ); SelectHdl_Impl(m_pModulesCLB); - m_pModulesCLB->SetUpdateMode(sal_True); + m_pModulesCLB->SetUpdateMode(true); } return 0; } diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx index 47d37eb2f73c..fd7de8f3d505 100644 --- a/cui/source/options/radiobtnbox.cxx +++ b/cui/source/options/radiobtnbox.cxx @@ -66,7 +66,7 @@ void SvxRadioButtonListBox::KeyInput( const KeyEvent& rKEvt ) void SvxRadioButtonListBox::HandleEntryChecked( SvTreeListEntry* _pEntry ) { - Select( _pEntry, sal_True ); + Select( _pEntry, true ); SvButtonState eState = GetCheckButtonState( _pEntry ); if ( SV_BUTTON_CHECKED == eState ) diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 1a23f7da634d..287c1a525e5b 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -779,7 +779,7 @@ void OfaTreeOptionsDialog::InitTreeAndHandler() WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE | WB_QUICK_SEARCH ); aTreeLB.SetSpaceBetweenEntries( 0 ); aTreeLB.SetSelectionMode( SINGLE_SELECTION ); - aTreeLB.SetSublistOpenWithLeftRight( sal_True ); + aTreeLB.SetSublistOpenWithLeftRight( true ); aTreeLB.SetExpandedHdl( LINK( this, OfaTreeOptionsDialog, ExpandedHdl_Impl ) ); aTreeLB.SetSelectHdl( LINK( this, OfaTreeOptionsDialog, ShowPageHdl_Impl ) ); aBackPB.SetClickHdl( LINK( this, OfaTreeOptionsDialog, BackHdl_Impl ) ); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 9b2223718f94..848190c048b5 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -232,7 +232,7 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); const long nFlags = pAutoCorrect->GetFlags(); - m_pCheckLB->SetUpdateMode(sal_False); + m_pCheckLB->SetUpdateMode(false); m_pCheckLB->Clear(); m_pCheckLB->InsertEntry(m_sInput); @@ -254,7 +254,7 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) m_pCheckLB->CheckEntryPos( nPos++, 0 != (nFlags & IgnoreDoubleSpace) ); m_pCheckLB->CheckEntryPos( nPos++, 0 != (nFlags & CorrectCapsLock) ); - m_pCheckLB->SetUpdateMode(sal_True); + m_pCheckLB->SetUpdateMode(true); } /*********************************************************************/ @@ -608,7 +608,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); const long nFlags = pAutoCorrect->GetFlags(); - m_pCheckLB->SetUpdateMode(sal_False); + m_pCheckLB->SetUpdateMode(false); m_pCheckLB->Clear(); // The following entries have to be inserted in the same order @@ -678,7 +678,7 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) m_pCheckLB->CheckEntryPos( CREATE_TABLE, CBCOL_SECOND, pOpt->bCreateTable ); m_pCheckLB->CheckEntryPos( REPLACE_STYLES, CBCOL_SECOND, pOpt->bReplaceStyles ); - m_pCheckLB->SetUpdateMode(sal_True); + m_pCheckLB->SetUpdateMode(true); } IMPL_LINK(OfaSwAutoFmtOptionsPage, SelectHdl, OfaACorrCheckListBox*, pBox) @@ -1030,7 +1030,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, { SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); SvxAutocorrWordList* pWordList = pAutoCorrect->LoadAutocorrWordList(eLang); - m_pReplaceTLB->SetUpdateMode(sal_False); + m_pReplaceTLB->SetUpdateMode(false); SvxAutocorrWordList::Content aContent = pWordList->getSortedContent(); for( SvxAutocorrWordList::Content::const_iterator it = aContent.begin(); it != aContent.end(); ++it ) @@ -1055,7 +1055,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool bFromReset, } m_pNewReplacePB->Enable(false); m_pDeleteReplacePB->Enable(false); - m_pReplaceTLB->SetUpdateMode(sal_True); + m_pReplaceTLB->SetUpdateMode(true); } SfxViewShell* pViewShell = SfxViewShell::Current(); @@ -1212,7 +1212,7 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn) bool bKeepSourceFormatting = !bReplaceEditChanged && !m_pTextOnlyCB->IsChecked(); NewEntry(m_pShortED->GetText(), m_pReplaceED->GetText(), bKeepSourceFormatting); - m_pReplaceTLB->SetUpdateMode(sal_False); + m_pReplaceTLB->SetUpdateMode(false); sal_uLong nPos = TREELIST_ENTRY_NOTFOUND; sEntry += "\t"; sEntry += m_pReplaceED->GetText(); @@ -1241,7 +1241,7 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn) } m_pReplaceTLB->MakeVisible( pInsEntry ); - m_pReplaceTLB->SetUpdateMode( sal_True ); + m_pReplaceTLB->SetUpdateMode( true ); // if the request came from the ReplaceEdit, give focus to the ShortEdit if(m_pReplaceED->HasFocus()) { @@ -1302,7 +1302,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt) } if( !bFound ) { - m_pReplaceTLB->SelectAll( sal_False ); + m_pReplaceTLB->SelectAll( false ); pFirstSel = 0; m_pNewReplacePB->SetText( sNew ); if( bReplaceEditChanged ) @@ -1906,7 +1906,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& ) { SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); - m_pSwCheckLB->SetUpdateMode( sal_False ); + m_pSwCheckLB->SetUpdateMode( false ); m_pSwCheckLB->Clear(); m_pSwCheckLB->GetModel()->Insert(CreateEntry(sNonBrkSpace, CBCOL_BOTH )); @@ -1917,7 +1917,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& ) m_pSwCheckLB->CheckEntryPos( REPLACE_1ST, CBCOL_FIRST, pOpt->bChgOrdinalNumber ); m_pSwCheckLB->CheckEntryPos( REPLACE_1ST, CBCOL_SECOND, 0 != (nFlags & ChgOrdinalNumber) ); - m_pSwCheckLB->SetUpdateMode( sal_True ); + m_pSwCheckLB->SetUpdateMode( true ); } // Initialize the non Sw options diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 63bc895156ab..85d51c0e4588 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -336,7 +336,7 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) rListBox.GetModel()->InvalidateEntry( pE ); rListBox.Select( pE ); rListBox.MakeVisible( pE ); - rListBox.SetUpdateMode( sal_True ); + rListBox.SetUpdateMode( true ); pThis->EnableButtons(); return 0; diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 871c47cdfcf0..4c380af2f37a 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -812,7 +812,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt short aPrivCat; m_pLbFormat->Clear(); - m_pLbFormat->SetUpdateMode( sal_False ); + m_pLbFormat->SetUpdateMode( false ); if( rEntries.empty() ) return; @@ -862,7 +862,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt } } } - m_pLbFormat->SetUpdateMode( sal_True ); + m_pLbFormat->SetUpdateMode( true ); rEntries.clear(); } diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index de119aab1b82..cd648c31191f 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -269,7 +269,7 @@ void OAppDetailPageHelper::selectAll() int nPos = getVisibleControlIndex(); if ( nPos < E_ELEMENT_TYPE_COUNT ) { - m_pLists[nPos]->SelectAll(sal_True); + m_pLists[nPos]->SelectAll(true); } } @@ -429,7 +429,7 @@ void OAppDetailPageHelper::selectElements(const Sequence< OUString>& _aNames) if ( nPos < E_ELEMENT_TYPE_COUNT ) { DBTreeListBox& rTree = *m_pLists[nPos]; - rTree.SelectAll(sal_False); + rTree.SelectAll(false); const OUString* pIter = _aNames.getConstArray(); const OUString* pEnd = pIter + _aNames.getLength(); for(;pIter != pEnd;++pIter) @@ -577,7 +577,7 @@ SvTreeListEntry* OAppDetailPageHelper::getEntry( const Point& _aPosPixel) const SvTreeListEntry* pReturn = NULL; int nPos = getVisibleControlIndex(); if ( nPos < E_ELEMENT_TYPE_COUNT ) - pReturn = m_pLists[nPos]->GetEntry( _aPosPixel,sal_True ); + pReturn = m_pLists[nPos]->GetEntry( _aPosPixel, true ); return pReturn; } @@ -607,7 +607,7 @@ void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xCon SvTreeListEntry* pEntry = m_pLists[E_TABLE]->First(); if ( pEntry ) m_pLists[E_TABLE]->Expand(pEntry); - m_pLists[E_TABLE]->SelectAll(sal_False); + m_pLists[E_TABLE]->SelectAll(false); } setDetailPage(m_pLists[E_TABLE]); @@ -669,7 +669,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA { fillNames( _xContainer, _eType, nImageId, NULL ); - m_pLists[_eType]->SelectAll(sal_False); + m_pLists[_eType]->SelectAll(false); } setDetailPage(m_pLists[_eType]); } @@ -736,7 +736,7 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine Reference<XNameAccess> xSubElements(_xContainer->getByName(*pIter),UNO_QUERY); if ( xSubElements.is() ) { - pEntry = pList->InsertEntry( *pIter, _pParent, sal_False, TREELIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) ); + pEntry = pList->InsertEntry( *pIter, _pParent, false, TREELIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) ); getBorderWin().getView()->getAppController().containerFound( Reference< XContainer >( xSubElements, UNO_QUERY ) ); fillNames( xSubElements, _eType, _nImageId, pEntry ); } @@ -868,7 +868,7 @@ SvTreeListEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const OUS if ( xContainer.is() ) { const sal_Int32 nFolderIndicator = lcl_getFolderIndicatorForType( _eType ); - pRet = pTreeView->InsertEntry( _rName, pEntry, sal_False, TREELIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) ); + pRet = pTreeView->InsertEntry( _rName, pEntry, false, TREELIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) ); fillNames( xContainer, _eType, nImageId, pRet ); } else diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index f886d8d1207c..61dd85d40505 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -499,7 +499,7 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList ) } m_aCreation.Show(); - m_aCreation.SelectAll(sal_False); + m_aCreation.SelectAll(false); m_aHelpText.Show(); m_aDescription.Show(); m_aFL.Show(); diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index c4a6c0ad38db..d7c1fb6f680a 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2064,7 +2064,7 @@ void SbaTableQueryBrowser::implAddDatasource(const OUString& _rDbName, Image& _r OUString sDSDisplayName, sDataSourceId; getDataSourceDisplayName_isURL( _rDbName, sDSDisplayName, sDataSourceId ); - SvTreeListEntry* pDatasourceEntry = m_pTreeView->getListBox().InsertEntry( sDSDisplayName, _rDbImage, _rDbImage, NULL, sal_False ); + SvTreeListEntry* pDatasourceEntry = m_pTreeView->getListBox().InsertEntry( sDSDisplayName, _rDbImage, _rDbImage, NULL, false ); DBTreeListUserData* pDSData = new DBTreeListUserData; pDSData->eType = etDatasource; pDSData->sAccessor = sDataSourceId; @@ -2078,7 +2078,7 @@ void SbaTableQueryBrowser::implAddDatasource(const OUString& _rDbName, Image& _r m_pTreeView->getListBox().InsertEntry( _rQueryName, _rQueryImage, _rQueryImage, pDatasourceEntry, - sal_True /*ChildrenOnDemand*/, TREELIST_APPEND, pQueriesData ); + true /*ChildrenOnDemand*/, TREELIST_APPEND, pQueriesData ); } // the child for the tables container @@ -2088,7 +2088,7 @@ void SbaTableQueryBrowser::implAddDatasource(const OUString& _rDbName, Image& _r m_pTreeView->getListBox().InsertEntry( _rTableName, _rTableImage, _rTableImage, pDatasourceEntry, - sal_True /*ChildrenOnDemand*/, TREELIST_APPEND, pTablesData ); + true /*ChildrenOnDemand*/, TREELIST_APPEND, pTablesData ); } } diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index d4615353283e..31e149ba0fde 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -178,7 +178,7 @@ void DBTreeListBox::SelectHdl() void DBTreeListBox::MouseButtonDown( const MouseEvent& rMEvt ) { - sal_Bool bHitEmptySpace = (NULL == GetEntry(rMEvt.GetPosPixel(), sal_True)); + sal_Bool bHitEmptySpace = (NULL == GetEntry(rMEvt.GetPosPixel(), true)); if (bHitEmptySpace && (rMEvt.GetClicks() == 2) && rMEvt.IsMod1()) Control::MouseButtonDown(rMEvt); else @@ -382,12 +382,12 @@ void DBTreeListBox::KeyInput( const KeyEvent& rKEvt ) SvTreeListBox::KeyInput(rKEvt); } -sal_Bool DBTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& /*_aSelection*/) +bool DBTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& /*_aSelection*/) { return m_aEditingHandler.Call(pEntry) != 0; } -sal_Bool DBTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) +bool DBTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { DBTreeEditedEntry aEntry; aEntry.pEntry = pEntry; @@ -399,10 +399,10 @@ sal_Bool DBTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rN } SetEntryText(pEntry,aEntry.aNewText); - return sal_False; // we never want that the base change our text + return false; // we never want that the base change our text } -sal_Bool DBTreeListBox::DoubleClickHdl() +bool DBTreeListBox::DoubleClickHdl() { long nResult = aDoubleClickHdl.Call( this ); // continue default processing if the DoubleClickHandler didn't handle it diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 1aef2959c7a0..830139fabf44 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -271,7 +271,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn sRootEntryText = ModuleRes(STR_ALL_VIEWS); else sRootEntryText = ModuleRes(STR_ALL_TABLES_AND_VIEWS); - InsertEntry( sRootEntryText, NULL, sal_False, TREELIST_APPEND, reinterpret_cast< void* >( DatabaseObjectContainer::TABLES ) ); + InsertEntry( sRootEntryText, NULL, false, TREELIST_APPEND, reinterpret_cast< void* >( DatabaseObjectContainer::TABLES ) ); } if ( _rTables.empty() ) @@ -317,7 +317,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn { SvTreeListEntry* pFolder = GetEntryPosByName( *folder, pRootEntry ); if ( !pFolder ) - pFolder = InsertEntry( *folder, pRootEntry, sal_False, TREELIST_APPEND, reinterpret_cast< void* >( nFolderType ) ); + pFolder = InsertEntry( *folder, pRootEntry, false, TREELIST_APPEND, reinterpret_cast< void* >( nFolderType ) ); } } } @@ -448,7 +448,7 @@ SvTreeListEntry* OTableTreeListBox::implAddEntry( { SvTreeListEntry* pFolder = GetEntryPosByName( rFirstName, pParentEntry ); if ( !pFolder ) - pFolder = InsertEntry( rFirstName, pParentEntry, sal_False, TREELIST_APPEND, reinterpret_cast< void* >( nFirstFolderType ) ); + pFolder = InsertEntry( rFirstName, pParentEntry, false, TREELIST_APPEND, reinterpret_cast< void* >( nFirstFolderType ) ); pParentEntry = pFolder; } @@ -456,14 +456,14 @@ SvTreeListEntry* OTableTreeListBox::implAddEntry( { SvTreeListEntry* pFolder = GetEntryPosByName( rSecondName, pParentEntry ); if ( !pFolder ) - pFolder = InsertEntry( rSecondName, pParentEntry, sal_False, TREELIST_APPEND, reinterpret_cast< void* >( nSecondFolderType ) ); + pFolder = InsertEntry( rSecondName, pParentEntry, false, TREELIST_APPEND, reinterpret_cast< void* >( nSecondFolderType ) ); pParentEntry = pFolder; } SvTreeListEntry* pRet = NULL; if ( !_bCheckName || !GetEntryPosByName( sName, pParentEntry ) ) { - pRet = InsertEntry( sName, pParentEntry, sal_False, TREELIST_APPEND ); + pRet = InsertEntry( sName, pParentEntry, false, TREELIST_APPEND ); Image aImage; m_xImageProvider->getImages( _rTableName, DatabaseObject::TABLE, aImage ); diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index b942f75c85d9..c5e5ca648043 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -88,7 +88,8 @@ namespace dbaui } extern sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const OUString& _sAllowedChars); - sal_Bool DbaIndexList::EditedEntry( SvTreeListEntry* _pEntry, const OUString& _rNewText ) + + bool DbaIndexList::EditedEntry( SvTreeListEntry* _pEntry, const OUString& _rNewText ) { // first check if this is valid SQL92 name if ( isSQL92CheckEnabled(m_xConnection) ) @@ -102,26 +103,26 @@ namespace dbaui sAlias != _rNewText : !_rNewText.equalsIgnoreAsciiCase(sAlias)) - return sal_False; + return false; } } if (!SvTreeListBox::EditedEntry(_pEntry, _rNewText)) - return sal_False; + return false; OUString sOldText = GetEntryText(_pEntry); SvTreeListBox::SetEntryText(_pEntry, _rNewText); - sal_Bool bValid = sal_True; + bool bValid = true; if (m_aEndEditHdl.IsSet()) bValid = (0 != m_aEndEditHdl.Call(_pEntry)); if (bValid) - return sal_True; + return true; SvTreeListBox::SetEntryText(_pEntry, sOldText); - return sal_False; + return false; } void DbaIndexList::enableSelectHandler() diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index a6cd82afee5c..b1cc1db680f4 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -115,10 +115,10 @@ namespace dbaui virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp, SvLBoxButtonKind eButtonKind); // enable editing for tables/views and queries - virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); + virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); + virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); - virtual sal_Bool DoubleClickHdl(); + virtual bool DoubleClickHdl(); virtual PopupMenu* CreateContextMenu( void ); virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ); diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 61e3e676f29a..93f15784b649 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -69,7 +69,7 @@ namespace dbaui } protected: - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); + virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); private: using SvTreeListBox::Select; diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 3f11d2b4488a..4f13c7ee031a 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -253,7 +253,7 @@ IMPL_LINK( OWizNameMatching, TableListClickHdl, void*, /*NOTINTERESTEDIN*/ ) sal_uLong nNewPos = m_CTRL_LEFT.GetModel()->GetAbsPos(m_CTRL_LEFT.GetFirstEntryInView()); if ( nNewPos - nPos == 1 ) --nNewPos; - m_CTRL_RIGHT.MakeVisible(m_CTRL_RIGHT.GetEntry(nNewPos),sal_True); + m_CTRL_RIGHT.MakeVisible(m_CTRL_RIGHT.GetEntry(nNewPos), true); m_CTRL_RIGHT.Select(pOldEntry,sal_True); } } @@ -287,7 +287,7 @@ IMPL_LINK( OWizNameMatching, TableListRightSelectHdl, void*, /*NOTINTERESTEDIN*/ sal_uLong nNewPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(m_CTRL_RIGHT.GetFirstEntryInView()); if ( nNewPos - nPos == 1 ) nNewPos--; - m_CTRL_LEFT.MakeVisible(m_CTRL_LEFT.GetEntry(nNewPos),sal_True); + m_CTRL_LEFT.MakeVisible(m_CTRL_LEFT.GetEntry(nNewPos), true); m_CTRL_LEFT.Select(pOldEntry,sal_True); } } @@ -380,7 +380,7 @@ void OColumnTreeBox::FillListBox( const ODatabaseExport::TColumnVector& _rList) ODatabaseExport::TColumnVector::const_iterator aEnd = _rList.end(); for(;aIter != aEnd;++aIter) { - SvTreeListEntry* pEntry = InsertEntry((*aIter)->first,0,sal_False,TREELIST_APPEND,(*aIter)->second); + SvTreeListEntry* pEntry = InsertEntry((*aIter)->first, 0, false, TREELIST_APPEND, (*aIter)->second); SvButtonState eState = !(m_bReadOnly && (*aIter)->second->IsAutoIncrement()) ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED; SetCheckButtonState( pEntry, eState ); } diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 3c04399e47c2..197402e15e7a 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -861,11 +861,11 @@ void OJoinTableView::DeselectConn(OTableConnection* pConn) // deselect the corresponding entries in the ListBox of the table window OTableWindow* pWin = pConn->GetSourceWin(); if (pWin && pWin->GetListBox()) - pWin->GetListBox()->SelectAll(sal_False); + pWin->GetListBox()->SelectAll(false); pWin = pConn->GetDestWin(); if (pWin && pWin->GetListBox()) - pWin->GetListBox()->SelectAll(sal_False); + pWin->GetListBox()->SelectAll(false); pConn->Deselect(); m_pSelectedConn = NULL; @@ -888,8 +888,8 @@ void OJoinTableView::SelectConn(OTableConnection* pConn) OTableWindowListBox* pDestBox = pConnDest->GetListBox(); if (pSourceBox && pDestBox) { - pSourceBox->SelectAll(sal_False); - pDestBox->SelectAll(sal_False); + pSourceBox->SelectAll(false); + pDestBox->SelectAll(false); SvTreeListEntry* pFirstSourceVisible = pSourceBox->GetFirstEntryInView(); SvTreeListEntry* pFirstDestVisible = pDestBox->GetFirstEntryInView(); @@ -903,14 +903,14 @@ void OJoinTableView::SelectConn(OTableConnection* pConn) SvTreeListEntry* pSourceEntry = pSourceBox->GetEntryFromText((*aIter)->GetData()->GetSourceFieldName()); if (pSourceEntry) { - pSourceBox->Select(pSourceEntry, sal_True); + pSourceBox->Select(pSourceEntry, true); pSourceBox->MakeVisible(pSourceEntry); } SvTreeListEntry* pDestEntry = pDestBox->GetEntryFromText((*aIter)->GetData()->GetDestFieldName()); if (pDestEntry) { - pDestBox->Select(pDestEntry, sal_True); + pDestBox->Select(pDestEntry, true); pDestBox->MakeVisible(pDestEntry); } diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 52471586b0f7..b0e7fea3ef51 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -285,7 +285,7 @@ sal_Bool OTableWindow::Init() clearListBox(); sal_Bool bSuccess = FillListBox(); if ( bSuccess ) - m_pListBox->SelectAll( sal_False ); + m_pListBox->SelectAll( false ); impl_updateImage(); @@ -495,7 +495,7 @@ void OTableWindow::setActive(sal_Bool _bActive) SetBoldTitle( _bActive ); m_bActive = _bActive; if (!_bActive && m_pListBox && m_pListBox->GetSelectionCount() != 0) - m_pListBox->SelectAll(sal_False); + m_pListBox->SelectAll(false); } void OTableWindow::Remove() diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index c692f65eadbc..edec47ca2245 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -169,7 +169,7 @@ IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ ) { ScrollOutputArea( -1 ); pEntry = GetEntry( m_aMousePos ); - Select( pEntry, sal_True ); + Select( pEntry, true ); } return 0; @@ -185,7 +185,7 @@ IMPL_LINK( OTableWindowListBox, ScrollDownHdl, SvTreeListBox*, /*pBox*/ ) { ScrollOutputArea( 1 ); pEntry = GetEntry( m_aMousePos ); - Select( pEntry, sal_True ); + Select( pEntry, true ); } return 0; @@ -218,7 +218,7 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) // remove the selection if the dragging operation is leaving the window if (_rEvt.mbLeaving) - SelectAll(sal_False); + SelectAll(false); else { // hit test @@ -260,8 +260,8 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) // automatically select right entry when dragging if ((FirstSelected() != pEntry) || (FirstSelected() && NextSelected(FirstSelected()))) - SelectAll(sal_False); - Select(pEntry, sal_True); + SelectAll(false); + Select(pEntry, true); // one cannot drop on the first (*) entry if(!( m_pTabWin->GetData()->IsShowAll() && (pEntry==First()) )) @@ -331,8 +331,8 @@ void OTableWindowListBox::GetFocus() if ( GetSelectionCount() == 0 || GetCurEntry() != FirstSelected() ) { if ( FirstSelected() ) - Select(FirstSelected(), sal_False); - Select(GetCurEntry(), sal_True); + Select(FirstSelected(), false); + Select(GetCurEntry(), true); } else ShowFocusRect(FirstSelected()); diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index 22772136b5b0..d9a1a2685279 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -124,14 +124,14 @@ namespace pcr if (m_pInitialSelection) { - m_aControlTree.MakeVisible(m_pInitialSelection, sal_True); - m_aControlTree.Select(m_pInitialSelection, sal_True); + m_aControlTree.MakeVisible(m_pInitialSelection, true); + m_aControlTree.Select(m_pInitialSelection, true); } else { - m_aControlTree.MakeVisible(m_aControlTree.First(), sal_True); + m_aControlTree.MakeVisible(m_aControlTree.First(), true); if (m_aControlTree.FirstSelected()) - m_aControlTree.Select(m_aControlTree.FirstSelected(), sal_False); + m_aControlTree.Select(m_aControlTree.FirstSelected(), false); m_aNoAssignment.Check(true); } diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 64ee7a75dc31..762f9e77a8cf 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -193,7 +193,7 @@ namespace pcr aName = ::comphelper::getString( xControl->getPropertyValue( PROPERTY_NAME ) ); // TODO: do Basic controls have a name? aImage = GetImage( xControl ); - m_pLB_Controls->InsertEntry( aName, aImage, aImage, 0, sal_False, TREELIST_APPEND, xControl.get() ); + m_pLB_Controls->InsertEntry( aName, aImage, aImage, 0, false, TREELIST_APPEND, xControl.get() ); } } else @@ -349,7 +349,7 @@ namespace pcr void* pData = pSelEntryPrev->GetUserData(); GetModel()->Remove( pSelEntryPrev ); - InsertEntry( aSelEntryPrevText, aImage, aImage, 0, sal_False, nSelEntryPos, pData ); + InsertEntry( aSelEntryPrevText, aImage, aImage, 0, false, nSelEntryPos, pData ); pSelEntry = NextSelected( pSelEntry ); } @@ -380,7 +380,7 @@ namespace pcr aImage = GetExpandedEntryBmp(pSelEntryNext); GetModel()->Remove( pSelEntryNext ); - InsertEntry( aSelEntryNextText, aImage, aImage, 0, sal_False, nSelEntryPos, pData ); + InsertEntry( aSelEntryNextText, aImage, aImage, 0, false, nSelEntryPos, pData ); pSelEntry = PrevSelected( pSelEntry ); } diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index 15acbea0ab1c..559c9d004bf8 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -49,7 +49,7 @@ SvTreeListEntry* StructListBox::InsertStaticEntry( const Image& rEntryImg, SvTreeListEntry* pParent, sal_uLong nPos, IFormulaToken* pToken ) { - SvTreeListEntry* pEntry = InsertEntry( rText, rEntryImg, rEntryImg, pParent, sal_False, nPos, pToken ); + SvTreeListEntry* pEntry = InsertEntry( rText, rEntryImg, rEntryImg, pParent, false, nPos, pToken ); return pEntry; } @@ -118,7 +118,7 @@ SvTreeListEntry* StructPage::InsertEntry( const OUString& rText, SvTreeListEntry switch( nFlag ) { case STRUCT_FOLDER: - pEntry = aTlbStruct.InsertEntry( rText, pParent, sal_False, nPos, pIFormulaToken ); + pEntry = aTlbStruct.InsertEntry( rText, pParent, false, nPos, pIFormulaToken ); break; case STRUCT_END: pEntry = aTlbStruct.InsertStaticEntry( rText, maImgEnd, pParent, nPos, pIFormulaToken ); diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index 96d38f328919..a084f568597b 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -74,7 +74,7 @@ public: long GetLogicTab( sal_uInt16 nTab ); virtual SvTreeListEntry* InsertEntry( const OUString& rText, SvTreeListEntry* pParent = 0, - sal_Bool bChildrenOnDemand = sal_False, + bool bChildrenOnDemand = false, sal_uLong nPos=TREELIST_APPEND, void* pUserData = 0, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); @@ -82,7 +82,7 @@ public: const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = 0, - sal_Bool bChildrenOnDemand = sal_False, + bool bChildrenOnDemand = false, sal_uLong nPos = TREELIST_APPEND, void* pUserData = 0, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx index d8cf1ae4e8f4..4bb7f0a0ba58 100644 --- a/include/svtools/treelist.hxx +++ b/include/svtools/treelist.hxx @@ -74,7 +74,7 @@ class SVT_DLLPUBLIC SvTreeList sal_uInt16 nRefCount; - sal_Bool bAbsPositionsValid; + bool bAbsPositionsValid; SvTreeListEntry* FirstVisible() const { return First(); } SvTreeListEntry* NextVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; @@ -83,8 +83,8 @@ class SVT_DLLPUBLIC SvTreeList SvTreeListEntry* NextVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16& rDelta ) const; SvTreeListEntry* PrevVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16& rDelta ) const; - sal_Bool IsEntryVisible( const SvListView*,SvTreeListEntry* pEntry ) const; - SvTreeListEntry* GetEntryAtVisPos( const SvListView*,sal_uLong nVisPos ) const; + bool IsEntryVisible( const SvListView*,SvTreeListEntry* pEntry ) const; + SvTreeListEntry* GetEntryAtVisPos( const SvListView*,sal_uLong nVisPos ) const; sal_uLong GetVisiblePos( const SvListView*,SvTreeListEntry* pEntry ) const; sal_uLong GetVisibleCount( SvListView* ) const; sal_uLong GetVisibleChildCount( const SvListView*,SvTreeListEntry* pParent ) const; @@ -94,8 +94,8 @@ class SVT_DLLPUBLIC SvTreeList SvTreeListEntry* PrevSelected( const SvListView*,SvTreeListEntry* pEntry ) const; SvTreeListEntry* LastSelected( const SvListView*) const; - sal_Bool Select( SvListView*,SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); - void SelectAll( SvListView*,sal_Bool bSelect ); // Does not call Select Handler + bool Select( SvListView*,SvTreeListEntry* pEntry, bool bSelect=true ); + void SelectAll( SvListView*, bool bSelect ); // Does not call Select Handler sal_uLong GetChildSelectionCount( const SvListView*,SvTreeListEntry* pParent ) const; void Expand( SvListView*,SvTreeListEntry* pParent ); @@ -237,7 +237,7 @@ class SVT_DLLPUBLIC SvListView sal_uLong nVisibleCount; sal_uLong nSelectionCount; - sal_Bool bVisPositionsValid; + bool bVisPositionsValid; SVT_DLLPRIVATE void InitTable(); SVT_DLLPRIVATE void RemoveViewData( SvTreeListEntry* pParent ); @@ -261,7 +261,7 @@ protected: void CollapseListEntry( SvTreeListEntry* pParent ) { pModel->Collapse((SvListView*)this,pParent); } - sal_Bool SelectListEntry( SvTreeListEntry* pEntry, sal_Bool bSelect ) + bool SelectListEntry( SvTreeListEntry* pEntry, bool bSelect ) { return pModel->Select((SvListView*)this,pEntry,bSelect); } public: @@ -330,18 +330,18 @@ public: { return pModel->GetChildSelectionCount((SvListView*)this,pParent); } // Does not call the Select Handler - virtual void SelectAll( sal_Bool bSelect, sal_Bool ) + virtual void SelectAll( bool bSelect, bool ) { pModel->SelectAll((SvListView*)this, bSelect); } - sal_Bool IsEntryVisible( SvTreeListEntry* pEntry ) const + bool IsEntryVisible( SvTreeListEntry* pEntry ) const { return pModel->IsEntryVisible((SvListView*)this,pEntry); } - sal_Bool IsExpanded( SvTreeListEntry* pEntry ) const; - sal_Bool IsSelected( SvTreeListEntry* pEntry ) const; - void SetEntryFocus( SvTreeListEntry* pEntry, sal_Bool bFocus ); + bool IsExpanded( SvTreeListEntry* pEntry ) const; + bool IsSelected( SvTreeListEntry* pEntry ) const; + void SetEntryFocus( SvTreeListEntry* pEntry, bool bFocus ); const SvViewDataEntry* GetViewData( const SvTreeListEntry* pEntry ) const; SvViewDataEntry* GetViewData( SvTreeListEntry* pEntry ); - sal_Bool HasViewData() const + bool HasViewData() const { return maDataTable.size() > 1; } // There's always a ROOT virtual SvViewDataEntry* CreateViewData( SvTreeListEntry* pEntry ); diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index bac80fcf59a1..470c4468611b 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -126,12 +126,12 @@ public: void SetUserData( void* pPtr ) { pUserData = pPtr; } void* GetUserData() const { return pUserData; } - sal_Bool IsDynamic() const { return (sal_Bool)((nFlags & SV_LBOXTAB_DYNAMIC)!=0); } + bool IsDynamic() const { return ((nFlags & SV_LBOXTAB_DYNAMIC)!=0); } void SetPos( long nNewPos) { nPos = nNewPos; } long GetPos() const { return nPos; } long CalcOffset( long nItemLength, long nTabWidth ); - sal_Bool IsEditable() const { return (sal_Bool)((nFlags & SV_LBOXTAB_EDITABLE)!=0); } - sal_Bool IsPushable() const { return (sal_Bool)((nFlags & SV_LBOXTAB_PUSHABLE)!=0); } + bool IsEditable() const { return ((nFlags & SV_LBOXTAB_EDITABLE)!=0); } + bool IsPushable() const { return ((nFlags & SV_LBOXTAB_PUSHABLE)!=0); } }; // ********************************************************************* @@ -279,10 +279,10 @@ private: protected: - sal_Bool CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 ); - void ImplShowTargetEmphasis( SvTreeListEntry* pEntry, sal_Bool bShow); - void EnableSelectionAsDropTarget( sal_Bool bEnable = sal_True, - sal_Bool bWithChildren = sal_True ); + bool CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 ); + void ImplShowTargetEmphasis( SvTreeListEntry* pEntry, bool bShow); + void EnableSelectionAsDropTarget( bool bEnable = true, + bool bWithChildren = true ); // Standard impl returns 0; must be overloaded by derived classes which support D'n'D using Window::GetDropTarget; virtual SvTreeListEntry* GetDropTarget( const Point& ); @@ -302,10 +302,10 @@ protected: // In-place editing SvInplaceEdit2* pEdCtrl; void EditText( const OUString&, const Rectangle&,const Selection&); - void EditText( const OUString&, const Rectangle&,const Selection&, sal_Bool bMulti); + void EditText( const OUString&, const Rectangle&,const Selection&, bool bMulti); void EditTextMultiLine( const OUString&, const Rectangle&,const Selection&); void CancelTextEditing(); - sal_Bool EditingCanceled() const; + bool EditingCanceled() const; bool IsEmptyTextAllowed() const; // Return value must be derived from SvViewDataEntry! @@ -362,9 +362,9 @@ public: SvTreeListEntry* NextSibling( SvTreeListEntry* pEntry ) const; SvTreeListEntry* PrevSibling( SvTreeListEntry* pEntry ) const; - sal_Bool CopySelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget ); - sal_Bool MoveSelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget ); - sal_Bool MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, SvTreeListEntry* pTarget, sal_Bool bAllowCopyFallback ); + bool CopySelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget ); + bool MoveSelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget ); + bool MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, SvTreeListEntry* pTarget, bool bAllowCopyFallback ); void RemoveSelection(); DragDropMode GetDragDropMode() const { return nDragDropMode; } @@ -445,8 +445,8 @@ public: virtual bool ExpandingHdl(); virtual void SelectHdl(); virtual void DeselectHdl(); - virtual sal_Bool DoubleClickHdl(); - sal_Bool IsTravelSelect() const { return (sal_Bool)((nImpFlags&SVLBOX_IS_TRAVELSELECT)!=0);} + virtual bool DoubleClickHdl(); + bool IsTravelSelect() const { return ((nImpFlags&SVLBOX_IS_TRAVELSELECT)!=0);} SvTreeListEntry* GetHdlEntry() const { return pHdlEntry; } SvLBoxItem* GetHdlItem() const; @@ -462,7 +462,7 @@ public: virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvTreeListEntry* ); virtual void DragFinished( sal_Int8 nDropAction ); - virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* ); + virtual bool NotifyAcceptDrop( SvTreeListEntry* ); void SetDragOptions( sal_Int8 nOptions ) { nDragOptions = nOptions; } sal_Int8 GetDragOptions() const { return nDragOptions; } @@ -473,14 +473,14 @@ public: virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ); virtual SvTreeListEntry* CreateEntry() const; // To create new Entries - // Return value: sal_True == Ok, sal_False == Cancel + // Return value: sal_True == Ok, sal_False == Cancel, 2==some hack virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, // D'n'D DropPosition in this->GetModel() SvTreeListEntry* pEntry, // Entry to be moved from GetSourceListBox()->GetModel() SvTreeListEntry*& rpNewParent, // New TargetParent sal_uLong& rNewChildPos); // The TargetParent's position in Childlist - // Return value: sal_True == Ok, sal_False == Cancel + // Return value: sal_True == Ok, sal_False == Cancel, 2==some hack virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, // D'n'D DropPosition in this->GetModel() SvTreeListEntry* pEntry, // Entry to be copied from GetSourceListBox()->GetModel() @@ -535,8 +535,8 @@ protected: SVT_DLLPRIVATE void ImpEntryInserted( SvTreeListEntry* pEntry ); SVT_DLLPRIVATE long PaintEntry1( SvTreeListEntry*, long nLine, - sal_uInt16 nTabFlagMask=0xffff, - sal_Bool bHasClipRegion=sal_False ); + sal_uInt16 nTabFlagMask=0xffff, + bool bHasClipRegion=false ); SVT_DLLPRIVATE void InitTreeView(); SVT_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvTreeListEntry*, long nX, SvLBoxTab** ppTab, @@ -585,15 +585,15 @@ protected: virtual void PreparePaint( SvTreeListEntry* ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void InitSettings(sal_Bool bFont,sal_Bool bForeground,sal_Bool bBackground); - sal_Bool IsCellFocusEnabled() const; + void InitSettings(bool bFont, bool bForeground, bool bBackground); + bool IsCellFocusEnabled() const; bool SetCurrentTabPos( sal_uInt16 _nNewPos ); - sal_uInt16 GetCurrentTabPos() const; + sal_uInt16 GetCurrentTabPos() const; void CallImplEventListeners(sal_uLong nEvent, void* pData); void ImplEditEntry( SvTreeListEntry* pEntry ); - sal_Bool AreChildrenTransient() const; + bool AreChildrenTransient() const; void SetChildrenNotTransient(); void AdjustEntryHeightAndRecalc( const Font& rFont ); @@ -628,7 +628,7 @@ public: } virtual SvTreeListEntry* InsertEntry( const OUString& rText, SvTreeListEntry* pParent = 0, - sal_Bool bChildrenOnDemand = sal_False, + bool bChildrenOnDemand = false, sal_uLong nPos=TREELIST_APPEND, void* pUserData = 0, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); @@ -636,7 +636,7 @@ public: const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = 0, - sal_Bool bChildrenOnDemand = sal_False, + bool bChildrenOnDemand = false, sal_uLong nPos = TREELIST_APPEND, void* pUserData = 0, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); @@ -662,14 +662,14 @@ public: Link GetCheckButtonHdl() const { return aCheckButtonHdl; } virtual void CheckButtonHdl(); - void SetSublistOpenWithReturn( sal_Bool bMode = sal_True ); // open/close sublist with return/enter - void SetSublistOpenWithLeftRight( sal_Bool bMode = sal_True ); // open/close sublist with cursor left/right + void SetSublistOpenWithReturn( bool bMode = true ); // open/close sublist with return/enter + void SetSublistOpenWithLeftRight( bool bMode = true ); // open/close sublist with cursor left/right void EnableInplaceEditing( bool bEnable ); // Edits the Entry's first StringItem, 0 == Cursor void EditEntry( SvTreeListEntry* pEntry = NULL ); - virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); + virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); + virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); virtual void Paint( const Rectangle& rRect ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); @@ -679,7 +679,7 @@ public: virtual void Resize(); virtual void GetFocus(); virtual void LoseFocus(); - void SetUpdateMode( sal_Bool ); + void SetUpdateMode( bool ); virtual void ModelHasCleared(); virtual void ModelHasInserted( SvTreeListEntry* pEntry ); @@ -691,11 +691,11 @@ public: virtual void ModelHasRemoved( SvTreeListEntry* pEntry ); void ModelHasEntryInvalidated( SvTreeListEntry* pEntry ); - void ShowTargetEmphasis( SvTreeListEntry*, sal_Bool bShow ); + void ShowTargetEmphasis( SvTreeListEntry*, bool bShow ); void ScrollOutputArea( short nDeltaEntries ); short GetEntryHeight() const { return nEntryHeight; } - void SetEntryHeight( short nHeight, sal_Bool bAlways = sal_False ); + void SetEntryHeight( short nHeight, bool bAlways = false ); Size GetOutputSizePixel() const; short GetIndent() const { return nIndent; } void SetIndent( short nIndent ); @@ -706,7 +706,7 @@ public: Point GetEntryPosition( SvTreeListEntry* ) const; void ShowEntry( SvTreeListEntry* ); // !!!OBSOLETE, use MakeVisible void MakeVisible( SvTreeListEntry* pEntry ); - void MakeVisible( SvTreeListEntry* pEntry, sal_Bool bMoveToTop ); + void MakeVisible( SvTreeListEntry* pEntry, bool bMoveToTop ); void SetCollapsedNodeBmp( const Image& ); void SetExpandedNodeBmp( const Image& ); @@ -715,9 +715,9 @@ public: void SetFont( const Font& rFont ); using Window::SetCursor; - void SetCursor( SvTreeListEntry* pEntry, sal_Bool bForceNoSelect = sal_False ); + void SetCursor( SvTreeListEntry* pEntry, bool bForceNoSelect = false ); - SvTreeListEntry* GetEntry( const Point& rPos, sal_Bool bHit = sal_False ) const; + SvTreeListEntry* GetEntry( const Point& rPos, bool bHit = false ) const; void PaintEntry( SvTreeListEntry* ); long PaintEntry( SvTreeListEntry*, long nLine, @@ -732,11 +732,11 @@ public: void SetDragDropMode( DragDropMode ); void SetSelectionMode( SelectionMode ); - sal_Bool Expand( SvTreeListEntry* pParent ); - sal_Bool Collapse( SvTreeListEntry* pParent ); - virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); - sal_uLong SelectChildren( SvTreeListEntry* pParent, sal_Bool bSelect ); - virtual void SelectAll( sal_Bool bSelect, sal_Bool bPaint = sal_True ); + bool Expand( SvTreeListEntry* pParent ); + bool Collapse( SvTreeListEntry* pParent ); + virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ); + sal_uLong SelectChildren( SvTreeListEntry* pParent, bool bSelect ); + virtual void SelectAll( bool bSelect, bool bPaint = true ); void SetCurEntry( SvTreeListEntry* _pEntry ); SvTreeListEntry* GetCurEntry() const; @@ -758,7 +758,7 @@ public: void RepaintScrollBars() const; ScrollBar* GetVScroll(); ScrollBar* GetHScroll(); - void EnableAsyncDrag( sal_Bool b ); + void EnableAsyncDrag( bool b ); SvTreeListEntry* GetFirstEntryInView() const; SvTreeListEntry* GetNextEntryInView(SvTreeListEntry*) const; @@ -772,8 +772,8 @@ public: virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ); void EnableContextMenuHandling( void ); - void EnableContextMenuHandling( sal_Bool bEnable ); - sal_Bool IsContextMenuHandlingEnabled( void ) const; + void EnableContextMenuHandling( bool bEnable ); + bool IsContextMenuHandlingEnabled( void ) const; void EnableList( bool _bEnable ); @@ -800,8 +800,8 @@ class SvInplaceEdit2 Accelerator aAccEscape; Timer aTimer; Edit* pEdit; - sal_Bool bCanceled; - sal_Bool bAlreadyInCallBack; + bool bCanceled; + bool bAlreadyInCallBack; void CallCallBackHdl_Impl(); DECL_LINK( Timeout_Impl, void * ); @@ -811,14 +811,14 @@ class SvInplaceEdit2 public: SvInplaceEdit2( Window* pParent, const Point& rPos, const Size& rSize, const OUString& rData, const Link& rNotifyEditEnd, - const Selection&, sal_Bool bMultiLine = sal_False ); + const Selection&, bool bMultiLine = false ); ~SvInplaceEdit2(); - sal_Bool KeyInput( const KeyEvent& rKEvt ); + bool KeyInput( const KeyEvent& rKEvt ); void LoseFocus(); - sal_Bool EditingCanceled() const { return bCanceled; } + bool EditingCanceled() const { return bCanceled; } OUString GetText() const; OUString GetSavedValue() const; - void StopEditing( sal_Bool bCancel = sal_False ); + void StopEditing( bool bCancel = false ); void Hide(); }; diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx index 386e68383e2a..e1e98b30a8dd 100644 --- a/include/svx/checklbx.hxx +++ b/include/svx/checklbx.hxx @@ -38,7 +38,7 @@ private: using SvTreeListBox::InsertEntry; // Avoid ambiguity with new InsertEntry: virtual SvTreeListEntry* InsertEntry( const OUString& rText, SvTreeListEntry* pParent, - sal_Bool bChildrenOnDemand, + bool bChildrenOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind ); diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index cf982895fbb1..75e6a65bfc85 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -274,7 +274,7 @@ namespace const OUString* pEntries = _rEntries.getConstArray(); sal_Int32 nEntries = _rEntries.getLength(); for ( sal_Int32 i = 0; i < nEntries; ++i, ++pEntries ) - _rListBox.InsertEntry( *pEntries,NULL,sal_False,TREELIST_APPEND,new ColumnInfo(*pEntries) ); + _rListBox.InsertEntry( *pEntries,NULL,false,TREELIST_APPEND,new ColumnInfo(*pEntries) ); } void lcl_addToList( OAddFieldWindowListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns ) { @@ -288,9 +288,9 @@ namespace if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) ) xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel; if ( !sLabel.isEmpty() ) - _rListBox.InsertEntry( sLabel,NULL,sal_False,TREELIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); + _rListBox.InsertEntry( sLabel,NULL,false,TREELIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); else - _rListBox.InsertEntry( *pEntries,NULL,sal_False,TREELIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); + _rListBox.InsertEntry( *pEntries,NULL,false,TREELIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); } } } @@ -456,9 +456,9 @@ void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_LABEL) ) xColumn->getPropertyValue(PROPERTY_LABEL) >>= sLabel; if ( !sLabel.isEmpty() ) - m_pListBox->InsertEntry( sLabel,NULL,sal_False,TREELIST_APPEND,new ColumnInfo(sName,sLabel) ); + m_pListBox->InsertEntry( sLabel,NULL,false,TREELIST_APPEND,new ColumnInfo(sName,sLabel) ); else - m_pListBox->InsertEntry( sName,NULL,sal_False,TREELIST_APPEND,new ColumnInfo(sName,sLabel) ); + m_pListBox->InsertEntry( sName,NULL,false,TREELIST_APPEND,new ColumnInfo(sName,sLabel) ); } } } diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index f424dff3ca06..7e0710e09cb8 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -278,8 +278,8 @@ void NavigatorTree::Command( const CommandEvent& rEvt ) break; if ( !IsSelected(ptClickedOn) ) { - SelectAll(sal_False); - Select(ptClickedOn, sal_True); + SelectAll(false); + Select(ptClickedOn, true); SetCurEntry(ptClickedOn); } } @@ -477,11 +477,11 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw ( SvTreeListEntry* pEntry = find(xSelection); if ( pEntry && !IsSelected(pEntry) ) { - Select(pEntry, sal_True); + Select(pEntry, true); SetCurEntry(pEntry); } else if ( !pEntry ) - SelectAll(sal_False,sal_False); + SelectAll(false,false); } else { @@ -492,7 +492,7 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw ( SvTreeListEntry* pEntry = find(*pIter); if ( pEntry && !IsSelected(pEntry) ) { - Select(pEntry, sal_True); + Select(pEntry, true); SetCurEntry(pEntry); } } @@ -506,10 +506,10 @@ SvTreeListEntry* NavigatorTree::insertEntry(const OUString& _sName,SvTreeListEnt if ( _nImageId ) { const Image aImage( m_aNavigatorImages.GetImage( _nImageId ) ); - pEntry = InsertEntry(_sName,aImage,aImage,_pParent,sal_False,_nPosition,_pData); + pEntry = InsertEntry(_sName,aImage,aImage,_pParent,false,_nPosition,_pData); } else - pEntry = InsertEntry(_sName,_pParent,sal_False,_nPosition,_pData); + pEntry = InsertEntry(_sName,_pParent,false,_nPosition,_pData); return pEntry; } diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 981b4e5d6e19..a418e4850de9 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1515,7 +1515,7 @@ void ScCheckListMenuWindow::initMembers() { if ( !maMembers[ i ].mbDate ) { - maChecks.InsertEntry(maMembers[i].maName, NULL, sal_False, TREELIST_APPEND, NULL, + maChecks.InsertEntry(maMembers[i].maName, NULL, false, TREELIST_APPEND, NULL, SvLBoxButtonKind_enabledCheckbox ); } diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 05b1fbe61067..732caafeaa8e 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -656,7 +656,7 @@ void ScConflictsDlg::KeepAllHandler( bool bMine ) } maLbConflicts.SetUpdateMode( false ); maLbConflicts.Clear(); - maLbConflicts.SetUpdateMode( sal_True ); + maLbConflicts.SetUpdateMode( true ); SetPointer( Pointer( POINTER_ARROW ) ); EndDialog( RET_OK ); } diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 97a63b8fd083..d7f28acabfe3 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -298,7 +298,7 @@ void ScSolverOptionsDialog::FillListBox() pModel->Insert( pEntry ); } - m_pLbSettings->SetUpdateMode(sal_True); + m_pLbSettings->SetUpdateMode(true); } void ScSolverOptionsDialog::ReadFromComponent() diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 08e19e38b264..095c1a6d795c 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -730,12 +730,12 @@ void ScContentTree::ObjectFresh( sal_uInt16 nType, SvTreeListEntry* pEntry ) return; // anderes Dokument angezeigt if(nType ==SC_CONTENT_GRAPHIC||nType ==SC_CONTENT_OLEOBJECT||nType ==SC_CONTENT_DRAWING) { - SetUpdateMode(sal_False); + SetUpdateMode(false); ClearType( nType ); GetDrawNames( nType/*, nId*/ ); if( !pEntry ) ApplySettings(); - SetUpdateMode(sal_True); + SetUpdateMode(true); if( pEntry ) { SvTreeListEntry* pParent = pRootNodes[nType]; @@ -756,7 +756,7 @@ void ScContentTree::ObjectFresh( sal_uInt16 nType, SvTreeListEntry* pEntry ) if( pOldEntry ) { Expand(pParent); - Select( pOldEntry,sal_True); + Select( pOldEntry, true); } } } @@ -804,7 +804,7 @@ void ScContentTree::Refresh( sal_uInt16 nType ) GetLinkNames(); ApplySettings(); - SetUpdateMode(sal_True); + SetUpdateMode(true); } void ScContentTree::GetTableNames() @@ -1630,7 +1630,7 @@ void ScContentTree::ApplySettings() if( pRootNodes[ nEntry ] ) { // expand - sal_Bool bExp = pSettings->IsExpanded( nEntry ); + bool bExp = pSettings->IsExpanded( nEntry ); if( bExp != IsExpanded( pRootNodes[ nEntry ] ) ) { if( bExp ) diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index 0e946f04115e..ffb38577b9dc 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -589,7 +589,7 @@ void stl_append_effect_func::operator()(CustomAnimationEffectPtr pEffect) void CustomAnimationList::update() { mbIgnorePaint = true; - SetUpdateMode( sal_False ); + SetUpdateMode( false ); CustomAnimationListEntry* pEntry = 0; @@ -752,7 +752,7 @@ void CustomAnimationList::update() } mbIgnorePaint = false; - SetUpdateMode( sal_True ); + SetUpdateMode( true ); Invalidate(); } @@ -830,7 +830,7 @@ void CustomAnimationList::onSelectionChanged( Any aSelection ) { try { - SelectAll(sal_False); + SelectAll(false); if( aSelection.hasValue() ) { @@ -930,7 +930,7 @@ EffectSequence CustomAnimationList::getSelection() const -sal_Bool CustomAnimationList::DoubleClickHdl() +bool CustomAnimationList::DoubleClickHdl() { mpController->onDoubleClick(); return false; diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index cd0fb5bae939..8aeb811d0c81 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -67,7 +67,7 @@ public: // overrides virtual void SelectHdl(); - virtual sal_Bool DoubleClickHdl(); + virtual bool DoubleClickHdl(); virtual void Paint( const Rectangle& rRect ); diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 96006e00f292..32438f81630b 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1751,7 +1751,7 @@ void CustomAnimationPane::onChange( bool bCreate ) { if( bCreate ) { - mpCustomAnimationList->SelectAll( sal_False ); + mpCustomAnimationList->SelectAll( false ); // gather shapes from the selection std::vector< Any >::iterator aIter( aTargets.begin() ); diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 1561111ab371..7c83709e77da 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -370,7 +370,7 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p ) { OUString aStr = m_pLbPages->GetSelectEntry( i ); pEntry = m_pLbCustomPages->InsertEntry( aStr, - 0, sal_False, nPosCP ); + 0, false, nPosCP ); m_pLbCustomPages->Select( pEntry ); SdPage* pPage = rDoc.GetSdPage( (sal_uInt16) m_pLbPages-> diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index eb759625df3d..76cd0f442115 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -498,7 +498,7 @@ IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu ) { // patch, prevents endless loop if( maTlbObjects.GetSelectionCount() > 1 ) - maTlbObjects.SelectAll( sal_False ); + maTlbObjects.SelectAll( false ); maTlbObjects.SetSelectionMode( SINGLE_SELECTION ); } @@ -994,7 +994,7 @@ void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId, if( pNavigatorWin->maTlbObjects.GetSelectionMode() == MULTIPLE_SELECTION ) { // because otherwise it is always additional select - pNavigatorWin->maTlbObjects.SelectAll( sal_False ); + pNavigatorWin->maTlbObjects.SelectAll( false ); } pNavigatorWin->maTlbObjects.SelectEntry( aPageName ); } diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 08f7e5c04c39..7c8d9d2d25f7 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -593,7 +593,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium, Image aImgDocClosed=Image( BitmapEx( SdResId( BMP_DOC_CLOSED ) ) ); // insert document name - InsertEntry( maDocName, aImgDocOpen, aImgDocClosed, NULL, sal_True, TREELIST_APPEND, + InsertEntry( maDocName, aImgDocOpen, aImgDocClosed, NULL, true, TREELIST_APPEND, reinterpret_cast< void* >( 1 ) ); } @@ -624,7 +624,7 @@ void SdPageObjsTLB::AddShapeList ( aIcon, aIcon, pParentEntry, - sal_False, + false, TREELIST_APPEND, pUserData); @@ -673,7 +673,7 @@ void SdPageObjsTLB::AddShapeList ( maImgOle, maImgOle, pEntry, - sal_False, + false, TREELIST_APPEND, pObj ); @@ -707,7 +707,7 @@ void SdPageObjsTLB::AddShapeList ( maImgGraphic, maImgGraphic, pEntry, - sal_False, + false, TREELIST_APPEND, pObj ); @@ -756,7 +756,7 @@ void SdPageObjsTLB::AddShapeList ( rIconProvider.maImgObjects, rIconProvider.maImgObjects, pEntry, - sal_False, + false, TREELIST_APPEND, pObj ); @@ -972,7 +972,7 @@ void SdPageObjsTLB::RequestingChildren( SvTreeListEntry* pFileEntry ) aImgPage, aImgPage, pFileEntry, - sal_False, + false, TREELIST_APPEND, reinterpret_cast< void* >( 1 ) ); @@ -1188,26 +1188,26 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel) // Select all entries and disable them as drop targets. SetSelectionMode(MULTIPLE_SELECTION); - SetCursor(NULL, sal_False); - SelectAll(sal_True, sal_False); - EnableSelectionAsDropTarget(sal_False, sal_True); + SetCursor(NULL, false); + SelectAll(true, false); + EnableSelectionAsDropTarget(false, true); // Enable only the entries as drop targets that are children of the // page under the mouse. SvTreeListEntry* pParent = GetRootLevelParent(pEntry); if (pParent != NULL) { - SelectAll(sal_False, sal_False); - Select(pParent, sal_True); + SelectAll(false, false); + Select(pParent, true); // for (SvTreeListEntry*pChild=FirstChild(pParent); pChild!=NULL; pChild=NextSibling(pChild)) // Select(pChild, sal_True); - EnableSelectionAsDropTarget(sal_True, sal_True);//sal_False); + EnableSelectionAsDropTarget(true, true);//sal_False); } // Set selection back to the entry under the mouse. - SelectAll(sal_False,sal_False); + SelectAll(false, false); SetSelectionMode(SINGLE_SELECTION); - Select(pEntry, sal_True); + Select(pEntry, true); // We can delete the Navigator from ExecuteDrag (when switching to // another document type), but that would kill the StarView MouseMove @@ -1343,7 +1343,7 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent) SvTreeListEntry* pEntry = GetDropTarget(rEvent.maPosPixel); if (rEvent.mbLeaving || !CheckDragAndDropMode( this, rEvent.mnAction )) { - ImplShowTargetEmphasis( pTargetEntry, sal_False ); + ImplShowTargetEmphasis( pTargetEntry, false ); } else if( !GetDragDropMode() ) { @@ -1356,16 +1356,16 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent) // Draw emphasis. if (pEntry != pTargetEntry || !(nImpFlags & SVLBOX_TARGEMPH_VIS)) { - ImplShowTargetEmphasis( pTargetEntry, sal_False ); + ImplShowTargetEmphasis( pTargetEntry, false ); pTargetEntry = pEntry; - ImplShowTargetEmphasis( pTargetEntry, sal_True ); + ImplShowTargetEmphasis( pTargetEntry, true ); } } } // Hide emphasis when there is no valid drop action. if (nResult == DND_ACTION_NONE) - ImplShowTargetEmphasis(pTargetEntry, sal_False); + ImplShowTargetEmphasis(pTargetEntry, false); return nResult; } diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index b52a0c0dcb56..63a015b69eb9 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -337,7 +337,7 @@ void SdTPAction::Reset( const SfxItemSet& rAttrs ) case presentation::ClickAction_BOOKMARK: { if( !m_pLbTree->SelectEntry( aFileName ) ) - m_pLbTree->SelectAll( sal_False ); + m_pLbTree->SelectAll( false ); } break; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 216d53a5acf8..03d761149652 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -326,7 +326,7 @@ void ContentListBox_Impl::InitRoot() OUString aURL = aRow.getToken( 0, '\t', nIdx ); sal_Unicode cFolder = aRow.getToken( 0, '\t', nIdx )[0]; bool bIsFolder = ( '1' == cFolder ); - SvTreeListEntry* pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, NULL, sal_True ); + SvTreeListEntry* pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, NULL, true ); if ( bIsFolder ) pEntry->SetUserData( new ContentEntry_Impl( aURL, sal_True ) ); } @@ -370,7 +370,7 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) SvTreeListEntry* pEntry = NULL; if ( bIsFolder ) { - pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, pParent, sal_True ); + pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, pParent, true ); pEntry->SetUserData( new ContentEntry_Impl( aURL, sal_True ) ); } else diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 38fa3151aab9..eb332ee46f59 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -231,7 +231,7 @@ void DropListBox_Impl::MouseButtonDown( const MouseEvent& rMEvt ) { nModifier = rMEvt.GetModifier(); - sal_Bool bHitEmptySpace = ( NULL == GetEntry( rMEvt.GetPosPixel(), sal_True ) ); + sal_Bool bHitEmptySpace = ( NULL == GetEntry( rMEvt.GetPosPixel(), true ) ); if( bHitEmptySpace && ( rMEvt.GetClicks() == 2 ) && rMEvt.IsMod1() ) Control::MouseButtonDown( rMEvt ); else @@ -513,7 +513,7 @@ PopupMenu* StyleTreeListBox_Impl::CreateContextMenu() return pDialog->CreateContextMenu(); } -sal_Bool StyleTreeListBox_Impl::DoubleClickHdl() +bool StyleTreeListBox_Impl::DoubleClickHdl() /* [Description] @@ -522,7 +522,7 @@ sal_Bool StyleTreeListBox_Impl::DoubleClickHdl() */ { aDoubleClickLink.Call(this); - return sal_False; + return false; } @@ -623,7 +623,7 @@ void StyleTreeListBox_Impl::ExpandedHdl() { SvTreeListEntry *pEntry = GetHdlEntry(); if(!IsExpanded(pEntry) && pCurEntry != GetCurEntry()) - SelectAll( sal_False ); + SelectAll( false ); pCurEntry = 0; } @@ -1112,7 +1112,7 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr) } } else - pTreeBox->SelectAll( sal_False ); + pTreeBox->SelectAll( false ); } else { @@ -1139,7 +1139,7 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr) if ( !bSelect ) { - aFmtLb.SelectAll( sal_False ); + aFmtLb.SelectAll( false ); EnableEdit(sal_False); EnableHide( sal_False ); EnableShow( sal_False ); @@ -1210,7 +1210,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox() MakeTree_Impl(aArr); ExpandedEntries_t aEntries; pTreeBox->MakeExpanded_Impl(aEntries); - pTreeBox->SetUpdateMode( sal_False ); + pTreeBox->SetUpdateMode( false ); pTreeBox->Clear(); const sal_uInt16 nCount = aArr.size(); for(sal_uInt16 i = 0; i < nCount; ++i) @@ -1229,7 +1229,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox() pTreeBox->Expand( pEntry ); } - pTreeBox->SetUpdateMode( sal_True ); + pTreeBox->SetUpdateMode( true ); OUString aStyle; if(pState) // Select current entry @@ -1366,11 +1366,11 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) if( nPos < nCount || pEntry ) { // Fills the display box - aFmtLb.SetUpdateMode(sal_False); + aFmtLb.SetUpdateMode(false); aFmtLb.Clear(); for(nPos = 0; nPos < nCount; ++nPos) - aFmtLb.InsertEntry(aStrings[nPos], 0, sal_False, nPos); + aFmtLb.InsertEntry(aStrings[nPos], 0, false, nPos); aFmtLb.SetUpdateMode(true); } diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 60747b28b828..cf85a309dcb6 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -436,10 +436,10 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton ) aItems[0] = &aComment; aItems[1] = NULL; pViewFrame->GetBindings().ExecuteSynchron( SID_SAVEDOC, aItems, 0 ); - m_pVersionBox->SetUpdateMode( sal_False ); + m_pVersionBox->SetUpdateMode( false ); m_pVersionBox->Clear(); Init_Impl(); - m_pVersionBox->SetUpdateMode( sal_True ); + m_pVersionBox->SetUpdateMode( true ); } delete pDlg; @@ -448,10 +448,10 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton ) { pObjShell->GetMedium()->RemoveVersion_Impl( ((SfxVersionInfo*) pEntry->GetUserData())->aName ); pObjShell->SetModified( true ); - m_pVersionBox->SetUpdateMode( sal_False ); + m_pVersionBox->SetUpdateMode( false ); m_pVersionBox->Clear(); Init_Impl(); - m_pVersionBox->SetUpdateMode( sal_True ); + m_pVersionBox->SetUpdateMode( true ); } else if (pButton == m_pOpenButton && pEntry) { diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index f064bba49301..14caad6a3c47 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -100,7 +100,7 @@ private: protected: virtual void Command( const CommandEvent& rMEvt ); virtual bool Notify( NotifyEvent& rNEvt ); - virtual sal_Bool DoubleClickHdl(); + virtual bool DoubleClickHdl(); virtual bool ExpandingHdl(); virtual void ExpandedHdl(); virtual sal_Bool NotifyMoving(SvTreeListEntry* pTarget, diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index e40faf408db1..cabdd0e484ca 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -189,7 +189,7 @@ private: bool Kill( const OUString& rURL ); protected: - virtual sal_Bool DoubleClickHdl(); + virtual bool DoubleClickHdl(); virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const; public: @@ -198,7 +198,7 @@ public: virtual void Resize(); virtual void KeyInput( const KeyEvent& rKEvt ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); + virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); void ClearAll(); HeaderBar* GetHeaderBar() const { return mpHeaderBar; } @@ -966,7 +966,7 @@ void ViewTabListBox_Impl::DeleteEntries() } -sal_Bool ViewTabListBox_Impl::EditedEntry( SvTreeListEntry* pEntry, +bool ViewTabListBox_Impl::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { bool bRet = false; @@ -1064,10 +1064,10 @@ void ViewTabListBox_Impl::DoQuickSearch( const sal_Unicode& rChar ) } -sal_Bool ViewTabListBox_Impl::DoubleClickHdl() +bool ViewTabListBox_Impl::DoubleClickHdl() { SvHeaderTabListBox::DoubleClickHdl(); - return sal_False; + return false; // this means "do no additional handling". Especially this means that the SvImpLBox does not // recognize that the entry at the double click position change after the handler call (which is // the case if in the handler, our content was replaced) @@ -1974,7 +1974,7 @@ void SvtFileView_Impl::InitSelection() mpView->SelectAll( false ); SvTreeListEntry* pFirst = mpView->First(); if ( pFirst ) - mpView->SetCursor( pFirst, sal_True ); + mpView->SetCursor( pFirst, true ); } @@ -1982,7 +1982,7 @@ void SvtFileView_Impl::OpenFolder_Impl() { ::osl::MutexGuard aGuard( maMutex ); - mpView->SetUpdateMode( sal_False ); + mpView->SetUpdateMode( false ); mpView->ClearAll(); std::vector< SortingData_Impl* >::iterator aIt; @@ -2005,7 +2005,7 @@ void SvtFileView_Impl::OpenFolder_Impl() InitSelection(); ++mnSuspendSelectCallback; - mpView->SetUpdateMode( sal_True ); + mpView->SetUpdateMode( true ); --mnSuspendSelectCallback; ResetCursor(); @@ -2017,9 +2017,9 @@ void SvtFileView_Impl::ResetCursor() // deselect SvTreeListEntry* pEntry = mpView->FirstSelected(); if ( pEntry ) - mpView->Select( pEntry, sal_False ); + mpView->Select( pEntry, false ); // set cursor to the first entry - mpView->SetCursor( mpView->First(), sal_True ); + mpView->SetCursor( mpView->First(), true ); mpView->Update(); } diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 7c131d44733d..80fd9c04479e 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -175,7 +175,7 @@ void SvTabListBox::SetTab( sal_uInt16 nTab,long nValue,MapUnit eMapUnit ) } SvTreeListEntry* SvTabListBox::InsertEntry( const OUString& rText, SvTreeListEntry* pParent, - sal_Bool /*bChildrenOnDemand*/, + bool /*bChildrenOnDemand*/, sal_uLong nPos, void* pUserData, SvLBoxButtonKind ) { @@ -186,7 +186,7 @@ SvTreeListEntry* SvTabListBox::InsertEntry( const OUString& rText, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent, - sal_Bool /*bChildrenOnDemand*/, + bool /*bChildrenOnDemand*/, sal_uLong nPos, void* pUserData, SvLBoxButtonKind ) { @@ -216,7 +216,7 @@ SvTreeListEntry* SvTabListBox::InsertEntryToColumn(const OUString& rStr,SvTreeLi } else aCurEntry = OUString(); - return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUser ); + return SvTreeListBox::InsertEntry( aFirstStr, pParent, false, nPos, pUser ); } SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const OUString& rStr, @@ -246,7 +246,7 @@ SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const OUString& rStr, return SvTreeListBox::InsertEntry( aFirstStr, rExpandedEntryBmp, rCollapsedEntryBmp, - pParent, sal_False, nPos, pUser ); + pParent, false, nPos, pUser ); } SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const OUString& rStr, sal_uLong nPos, @@ -768,13 +768,13 @@ bool SvHeaderTabListBox::IsCellFocusable() const bool SvHeaderTabListBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn ) { - bool bRet = ( IsCellFocusEnabled() == sal_True ); + bool bRet = IsCellFocusEnabled(); if ( bRet ) { // first set cursor to _nRow - SetCursor( GetEntry( _nRow ), sal_True ); + SetCursor( GetEntry( _nRow ), true ); // then set the focus into _nColumn - bRet = ( SetCurrentTabPos( _nColumn ) == true ); + bRet = SetCurrentTabPos( _nColumn ); } return bRet; } diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 94dae1cf5921..bb38545aa2d1 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -27,7 +27,7 @@ SvTreeList::SvTreeList() { nEntryCount = 0; - bAbsPositionsValid = sal_False; + bAbsPositionsValid = false; nRefCount = 1; pRootItem = new SvTreeListEntry; eSortMode = SortNone; @@ -83,15 +83,15 @@ void SvTreeList::RemoveView( SvListView* pView ) // an entry is visible if all parents are expanded -sal_Bool SvTreeList::IsEntryVisible( const SvListView* pView, SvTreeListEntry* pEntry ) const +bool SvTreeList::IsEntryVisible( const SvListView* pView, SvTreeListEntry* pEntry ) const { DBG_ASSERT(pView&&pEntry,"IsVisible:Invalid Params"); - sal_Bool bRetVal=sal_False; + bool bRetVal = false; do { if ( pEntry == pRootItem ) { - bRetVal=sal_True; + bRetVal = true; break; } pEntry = pEntry->pParent; @@ -270,7 +270,7 @@ sal_uLong SvTreeList::Copy(SvTreeListEntry* pSrcEntry,SvTreeListEntry* pTargetPa if ( !pTargetParent ) pTargetParent = pRootItem; - bAbsPositionsValid = sal_False; + bAbsPositionsValid = false; sal_uLong nCloneCount = 0; SvTreeListEntry* pClonedEntry = Clone( pSrcEntry, nCloneCount ); @@ -529,11 +529,11 @@ SvTreeListEntry* SvTreeList::Prev( SvTreeListEntry* pActEntry, sal_uInt16* pDept DBG_ASSERT(pActEntry!=0,"Entry?"); sal_uInt16 nDepth = 0; - int bWithDepth = sal_False; + bool bWithDepth = false; if ( pDepth ) { nDepth = *pDepth; - bWithDepth = sal_True; + bWithDepth = true; } SvTreeListEntries* pActualList = &pActEntry->pParent->maChildren; @@ -617,7 +617,7 @@ sal_uLong SvTreeList::GetVisibleCount( SvListView* pView ) const } #endif ((SvListView*)pView)->nVisibleCount = nPos; - ((SvListView*)pView)->bVisPositionsValid = sal_True; + ((SvListView*)pView)->bVisPositionsValid = true; return nPos; } @@ -631,11 +631,11 @@ SvTreeListEntry* SvTreeList::NextVisible(const SvListView* pView,SvTreeListEntry return 0; sal_uInt16 nDepth = 0; - int bWithDepth = sal_False; + bool bWithDepth = false; if ( pActDepth ) { nDepth = *pActDepth; - bWithDepth = sal_True; + bWithDepth = true; } SvTreeListEntries* pActualList = &pActEntry->pParent->maChildren; @@ -690,11 +690,11 @@ SvTreeListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvTreeListEntr DBG_ASSERT(pView&&pActEntry,"PrevVis:View/Entry?"); sal_uInt16 nDepth = 0; - int bWithDepth = sal_False; + bool bWithDepth = false; if ( pActDepth ) { nDepth = *pActDepth; - bWithDepth = sal_True; + bWithDepth = true; } SvTreeListEntries* pActualList = &pActEntry->pParent->maChildren; @@ -946,7 +946,7 @@ void SvTreeList::Expand( SvListView* pView, SvTreeListEntry* pEntry ) // if parent is visible, invalidate status data if ( pView->IsExpanded( pParent ) ) { - pView->bVisPositionsValid = sal_False; + pView->bVisPositionsValid = false; pView->nVisibleCount = 0; } } @@ -966,18 +966,18 @@ void SvTreeList::Collapse( SvListView* pView, SvTreeListEntry* pEntry ) if ( pView->IsExpanded(pParent) ) { pView->nVisibleCount = 0; - pView->bVisPositionsValid = sal_False; + pView->bVisPositionsValid = false; } } -sal_Bool SvTreeList::Select( SvListView* pView, SvTreeListEntry* pEntry, sal_Bool bSelect ) +bool SvTreeList::Select( SvListView* pView, SvTreeListEntry* pEntry, bool bSelect ) { DBG_ASSERT(pView&&pEntry,"Select:View/Entry?"); SvViewDataEntry* pViewData = pView->GetViewData( pEntry ); if ( bSelect ) { if ( pViewData->IsSelected() || !pViewData->IsSelectable() ) - return sal_False; + return false; else { pViewData->SetSelected(true); @@ -987,14 +987,14 @@ sal_Bool SvTreeList::Select( SvListView* pView, SvTreeListEntry* pEntry, sal_Boo else { if ( !pViewData->IsSelected() ) - return sal_False; + return false; else { pViewData->SetSelected(false); pView->nSelectionCount--; } } - return sal_True; + return true; } bool SvTreeList::Remove( const SvTreeListEntry* pEntry ) @@ -1048,7 +1048,7 @@ bool SvTreeList::Remove( const SvTreeListEntry* pEntry ) return true; } -void SvTreeList::SelectAll( SvListView* pView, sal_Bool bSelect ) +void SvTreeList::SelectAll( SvListView* pView, bool bSelect ) { DBG_ASSERT(pView,"SelectAll:NoView"); SvTreeListEntry* pEntry = First(); @@ -1145,7 +1145,7 @@ SvListView::SvListView() pModel = 0; nSelectionCount = 0; nVisibleCount = 0; - bVisPositionsValid = sal_False; + bVisPositionsValid = false; } @@ -1198,7 +1198,7 @@ void SvListView::Clear() maDataTable.clear(); nSelectionCount = 0; nVisibleCount = 0; - bVisPositionsValid = sal_False; + bVisPositionsValid = false; if( pModel ) { // insert root entry @@ -1211,11 +1211,11 @@ void SvListView::Clear() void SvListView::SetModel( SvTreeList* pNewModel ) { - sal_Bool bBroadcastCleared = sal_False; + bool bBroadcastCleared = false; if ( pModel ) { pModel->RemoveView( this ); - bBroadcastCleared = sal_True; + bBroadcastCleared = true; ModelNotification( LISTACTION_CLEARING,0,0,0 ); if ( pModel->GetRefCount() == 0 ) delete pModel; @@ -1276,7 +1276,7 @@ void SvListView::ActionMoving( SvTreeListEntry* pEntry,SvTreeListEntry*,sal_uLon } // vorlaeufig nVisibleCount = 0; - bVisPositionsValid = sal_False; + bVisPositionsValid = false; } void SvListView::ActionMoved( SvTreeListEntry* /* pEntry */ , @@ -1284,7 +1284,7 @@ void SvListView::ActionMoved( SvTreeListEntry* /* pEntry */ , sal_uLong /* nChildPos */ ) { nVisibleCount = 0; - bVisPositionsValid = sal_False; + bVisPositionsValid = false; } void SvListView::ActionInserted( SvTreeListEntry* pEntry ) @@ -1300,7 +1300,7 @@ void SvListView::ActionInserted( SvTreeListEntry* pEntry ) if ( nVisibleCount && pModel->IsEntryVisible( this, pEntry )) { nVisibleCount = 0; - bVisPositionsValid = sal_False; + bVisPositionsValid = false; } } @@ -1309,7 +1309,7 @@ void SvListView::ActionInsertedTree( SvTreeListEntry* pEntry ) if ( pModel->IsEntryVisible( this, pEntry )) { nVisibleCount = 0; - bVisPositionsValid = sal_False; + bVisPositionsValid = false; } // iterate over entry and its children SvTreeListEntry* pCurEntry = pEntry; @@ -1363,7 +1363,7 @@ void SvListView::ActionRemoving( SvTreeListEntry* pEntry ) #endif nVisibleCount -= nVisibleRemoved; } - bVisPositionsValid = sal_False; + bVisPositionsValid = false; maDataTable.erase(pEntry); RemoveViewData( pEntry ); @@ -1425,7 +1425,7 @@ void SvListView::ModelNotification( sal_uInt16 nActionId, SvTreeListEntry* pEntr ModelHasEntryInvalidated( pEntry1 ); break; case LISTACTION_RESORTED: - bVisPositionsValid = sal_False; + bVisPositionsValid = false; break; case LISTACTION_RESORTING: break; @@ -1438,7 +1438,7 @@ void SvListView::InitViewData( SvViewDataEntry*, SvTreeListEntry* ) { } -sal_Bool SvListView::IsExpanded( SvTreeListEntry* pEntry ) const +bool SvListView::IsExpanded( SvTreeListEntry* pEntry ) const { DBG_ASSERT(pEntry,"IsExpanded:No Entry"); SvDataTable::const_iterator itr = maDataTable.find(pEntry); @@ -1448,7 +1448,7 @@ sal_Bool SvListView::IsExpanded( SvTreeListEntry* pEntry ) const return itr->second->IsExpanded(); } -sal_Bool SvListView::IsSelected( SvTreeListEntry* pEntry ) const +bool SvListView::IsSelected( SvTreeListEntry* pEntry ) const { DBG_ASSERT(pEntry,"IsExpanded:No Entry"); SvDataTable::const_iterator itr = maDataTable.find(pEntry ); @@ -1457,7 +1457,7 @@ sal_Bool SvListView::IsSelected( SvTreeListEntry* pEntry ) const return itr->second->IsSelected(); } -void SvListView::SetEntryFocus( SvTreeListEntry* pEntry, sal_Bool bFocus ) +void SvListView::SetEntryFocus( SvTreeListEntry* pEntry, bool bFocus ) { DBG_ASSERT(pEntry,"SetEntryFocus:No Entry"); SvDataTable::iterator itr = maDataTable.find(pEntry); @@ -1495,7 +1495,7 @@ sal_Int32 SvTreeList::Compare(const SvTreeListEntry* pLeft, const SvTreeListEntr void SvTreeList::Resort() { Broadcast( LISTACTION_RESORTING ); - bAbsPositionsValid = sal_False; + bAbsPositionsValid = false; ResortChildren( pRootItem ); Broadcast( LISTACTION_RESORTED ); } diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index c65bc33daf65..78dd3e783ffe 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -20,7 +20,7 @@ /* TODO: - delete anchor in SelectionEngine when selecting manually - - SelectAll( sal_False ) => only repaint the delselected entries + - SelectAll( false ) => only repaint the delselected entries */ #include <svtools/treelistbox.hxx> @@ -121,12 +121,12 @@ SvInplaceEdit2::SvInplaceEdit2 const OUString& rData, const Link& rNotifyEditEnd, const Selection& rSelection, - sal_Bool bMulti + bool bMulti ) : aCallBackHdl ( rNotifyEditEnd ), - bCanceled ( sal_False ), - bAlreadyInCallBack ( sal_False ) + bCanceled ( false ), + bAlreadyInCallBack ( false ) { @@ -182,7 +182,7 @@ void SvInplaceEdit2::Hide() IMPL_LINK_NOARG_INLINE_START(SvInplaceEdit2, ReturnHdl_Impl) { - bCanceled = sal_False; + bCanceled = false; CallCallBackHdl_Impl(); return 1; } @@ -190,14 +190,14 @@ IMPL_LINK_NOARG_INLINE_END(SvInplaceEdit2, ReturnHdl_Impl) IMPL_LINK_NOARG_INLINE_START(SvInplaceEdit2, EscapeHdl_Impl) { - bCanceled = sal_True; + bCanceled = true; CallCallBackHdl_Impl(); return 1; } IMPL_LINK_NOARG_INLINE_END(SvInplaceEdit2, EscapeHdl_Impl) -sal_Bool SvInplaceEdit2::KeyInput( const KeyEvent& rKEvt ) +bool SvInplaceEdit2::KeyInput( const KeyEvent& rKEvt ) { KeyCode aCode = rKEvt.GetKeyCode(); sal_uInt16 nCode = aCode.GetCode(); @@ -205,19 +205,19 @@ sal_Bool SvInplaceEdit2::KeyInput( const KeyEvent& rKEvt ) switch ( nCode ) { case KEY_ESCAPE: - bCanceled = sal_True; + bCanceled = true; CallCallBackHdl_Impl(); - return sal_True; + return true; case KEY_RETURN: - bCanceled = sal_False; + bCanceled = false; CallCallBackHdl_Impl(); - return sal_True; + return true; } - return sal_False; + return false; } -void SvInplaceEdit2::StopEditing( sal_Bool bCancel ) +void SvInplaceEdit2::StopEditing( bool bCancel ) { if ( !bAlreadyInCallBack ) { @@ -232,7 +232,7 @@ void SvInplaceEdit2::LoseFocus() && ((!Application::GetFocusWindow()) || !pEdit->IsChild( Application::GetFocusWindow()) ) ) { - bCanceled = sal_False; + bCanceled = false; aTimer.SetTimeout(10); aTimer.SetTimeoutHdl(LINK(this,SvInplaceEdit2,Timeout_Impl)); aTimer.Start(); @@ -251,7 +251,7 @@ void SvInplaceEdit2::CallCallBackHdl_Impl() aTimer.Stop(); if ( !bAlreadyInCallBack ) { - bAlreadyInCallBack = sal_True; + bAlreadyInCallBack = true; GetpApp()->RemoveAccel( &aAccReturn ); GetpApp()->RemoveAccel( &aAccEscape ); pEdit->Hide(); @@ -497,46 +497,46 @@ void SvTreeListBox::DeselectHdl() aDeselectHdl.Call( this ); } -sal_Bool SvTreeListBox::DoubleClickHdl() +bool SvTreeListBox::DoubleClickHdl() { aDoubleClickHdl.Call( this ); - return sal_True; + return true; } -sal_Bool SvTreeListBox::CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 nAction ) +bool SvTreeListBox::CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 nAction ) { if ( pSource == this ) { if ( !(nDragDropMode & (SV_DRAGDROP_CTRL_MOVE | SV_DRAGDROP_CTRL_COPY) ) ) - return sal_False; // D&D locked within list + return false; // D&D locked within list if( DND_ACTION_MOVE == nAction ) { if ( !(nDragDropMode & SV_DRAGDROP_CTRL_MOVE) ) - return sal_False; // no local move + return false; // no local move } else { if ( !(nDragDropMode & SV_DRAGDROP_CTRL_COPY)) - return sal_False; // no local copy + return false; // no local copy } } else { if ( !(nDragDropMode & SV_DRAGDROP_APP_DROP ) ) - return sal_False; // no drop + return false; // no drop if ( DND_ACTION_MOVE == nAction ) { if ( !(nDragDropMode & SV_DRAGDROP_APP_MOVE) ) - return sal_False; // no global move + return false; // no global move } else { if ( !(nDragDropMode & SV_DRAGDROP_APP_COPY)) - return sal_False; // no global copy + return false; // no global copy } } - return sal_True; + return true; } @@ -581,7 +581,7 @@ sal_Bool SvTreeListBox::NotifyMoving( { rpNewParent = 0; rNewChildPos = 0; - return sal_True; + return true; } if ( !pTarget->HasChildren() && !pTarget->HasChildrenOnDemand() ) { @@ -600,7 +600,7 @@ sal_Bool SvTreeListBox::NotifyMoving( else rNewChildPos = TREELIST_APPEND; } - return sal_True; + return true; } sal_Bool SvTreeListBox::NotifyCopying( @@ -629,12 +629,12 @@ SvTreeListEntry* SvTreeListBox::PrevSibling( SvTreeListEntry* pEntry ) const } // return: all entries copied -sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget ) +bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget ) { nCurEntrySelPos = 0; // selection counter for NotifyMoving/Copying - sal_Bool bSuccess = sal_True; + bool bSuccess = true; std::vector<SvTreeListEntry*> aList; - sal_Bool bClone = (sal_Bool)( (sal_uLong)(pSource->GetModel()) != (sal_uLong)GetModel() ); + bool bClone = ( (sal_uLong)(pSource->GetModel()) != (sal_uLong)GetModel() ); Link aCloneLink( pModel->GetCloneLink() ); pModel->SetCloneLink( LINK(this, SvTreeListBox, CloneHdl_Impl )); @@ -644,7 +644,7 @@ sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvTreeListEntry* while ( pSourceEntry ) { // children are copied automatically - pSource->SelectChildren( pSourceEntry, sal_False ); + pSource->SelectChildren( pSourceEntry, false ); aList.push_back( pSourceEntry ); pSourceEntry = pSource->NextSelected( pSourceEntry ); } @@ -671,7 +671,7 @@ sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvTreeListEntry* } } else - bSuccess = sal_False; + bSuccess = false; if( bOk == (sal_Bool)2 ) // HACK: make visible moved entry? MakeVisible( pSourceEntry ); @@ -681,17 +681,17 @@ sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvTreeListEntry* } // return: all entries were moved -sal_Bool SvTreeListBox::MoveSelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget ) +bool SvTreeListBox::MoveSelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget ) { - return MoveSelectionCopyFallbackPossible( pSource, pTarget, sal_False ); + return MoveSelectionCopyFallbackPossible( pSource, pTarget, false ); } -sal_Bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, SvTreeListEntry* pTarget, sal_Bool bAllowCopyFallback ) +bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, SvTreeListEntry* pTarget, bool bAllowCopyFallback ) { nCurEntrySelPos = 0; // selection counter for NotifyMoving/Copying - sal_Bool bSuccess = sal_True; + bool bSuccess = true; std::vector<SvTreeListEntry*> aList; - sal_Bool bClone = (sal_Bool)( (sal_uLong)(pSource->GetModel()) != (sal_uLong)GetModel() ); + bool bClone = ( (sal_uLong)(pSource->GetModel()) != (sal_uLong)GetModel() ); Link aCloneLink( pModel->GetCloneLink() ); if ( bClone ) pModel->SetCloneLink( LINK(this, SvTreeListBox, CloneHdl_Impl )); @@ -700,7 +700,7 @@ sal_Bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSourc while ( pSourceEntry ) { // children are automatically moved - pSource->SelectChildren( pSourceEntry, sal_False ); + pSource->SelectChildren( pSourceEntry, false ); aList.push_back( pSourceEntry ); pSourceEntry = pSource->NextSelected( pSourceEntry ); } @@ -737,7 +737,7 @@ sal_Bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSourc } } else - bSuccess = sal_False; + bSuccess = false; if( bOk == (sal_Bool)2 ) // HACK: make moved entry visible? MakeVisible( pSourceEntry ); @@ -793,7 +793,7 @@ void SvTreeListBox::ViewDataInitialized( SvTreeListEntry* ) { } -void SvTreeListBox::ImplShowTargetEmphasis( SvTreeListEntry* pEntry, sal_Bool bShow) +void SvTreeListBox::ImplShowTargetEmphasis( SvTreeListEntry* pEntry, bool bShow) { if ( bShow && (nImpFlags & SVLBOX_TARGEMPH_VIS) ) return; @@ -948,7 +948,7 @@ void SvTreeListBox::InitViewData( SvViewDataEntry* pData, SvTreeListEntry* pEntr -void SvTreeListBox::EnableSelectionAsDropTarget( sal_Bool bEnable, sal_Bool bWithChildren ) +void SvTreeListBox::EnableSelectionAsDropTarget( bool bEnable, bool bWithChildren ) { sal_uInt16 nRefDepth; SvTreeListEntry* pTemp; @@ -995,11 +995,11 @@ void SvTreeListBox::EnableSelectionAsDropTarget( sal_Bool bEnable, sal_Bool bWit void SvTreeListBox::EditText( const OUString& rStr, const Rectangle& rRect, const Selection& rSel ) { - EditText( rStr, rRect, rSel, sal_False ); + EditText( rStr, rRect, rSel, false ); } void SvTreeListBox::EditText( const OUString& rStr, const Rectangle& rRect, - const Selection& rSel, sal_Bool bMulti ) + const Selection& rSel, bool bMulti ) { if( pEdCtrl ) delete pEdCtrl; @@ -1038,7 +1038,7 @@ IMPL_LINK_NOARG(SvTreeListBox, TextEditEndedHdl_Impl) void SvTreeListBox::CancelTextEditing() { if ( pEdCtrl ) - pEdCtrl->StopEditing( sal_True ); + pEdCtrl->StopEditing( true ); nImpFlags &= (~SVLBOX_IN_EDT); } @@ -1116,7 +1116,7 @@ void SvTreeListBox::SelectSearchEntry( const void* _pEntry ) if ( !pEntry ) return; - SelectAll( sal_False ); + SelectAll( false ); SetCurEntry( pEntry ); Select( pEntry ); } @@ -1175,11 +1175,11 @@ void SvTreeListBox::ReadDragServerInfo(const Point&, SvLBoxDDInfo* ) { } -sal_Bool SvTreeListBox::EditingCanceled() const +bool SvTreeListBox::EditingCanceled() const { if( pEdCtrl && pEdCtrl->EditingCanceled() ) - return sal_True; - return sal_False; + return true; + return false; } @@ -1190,7 +1190,7 @@ sal_Int8 SvTreeListBox::AcceptDrop( const AcceptDropEvent& rEvt ) if( rEvt.mbLeaving || !CheckDragAndDropMode( pDDSource, rEvt.mnAction ) ) { - ImplShowTargetEmphasis( pTargetEntry, sal_False ); + ImplShowTargetEmphasis( pTargetEntry, false ); } else if( !nDragDropMode ) { @@ -1217,12 +1217,12 @@ sal_Int8 SvTreeListBox::AcceptDrop( const AcceptDropEvent& rEvt ) // **** draw emphasis **** if( DND_ACTION_NONE == nRet ) - ImplShowTargetEmphasis( pTargetEntry, sal_False ); + ImplShowTargetEmphasis( pTargetEntry, false ); else if( pEntry != pTargetEntry || !(nImpFlags & SVLBOX_TARGEMPH_VIS) ) { - ImplShowTargetEmphasis( pTargetEntry, sal_False ); + ImplShowTargetEmphasis( pTargetEntry, false ); pTargetEntry = pEntry; - ImplShowTargetEmphasis( pTargetEntry, sal_True ); + ImplShowTargetEmphasis( pTargetEntry, true ); } } return nRet; @@ -1233,9 +1233,9 @@ sal_Int8 SvTreeListBox::ExecuteDrop( const ExecuteDropEvent& rEvt, SvTreeListBox sal_Int8 nRet = DND_ACTION_NONE; DBG_ASSERT( pSourceView, "SvTreeListBox::ExecuteDrop(): no source view" ); - pSourceView->EnableSelectionAsDropTarget( sal_True, sal_True ); + pSourceView->EnableSelectionAsDropTarget( true, true ); - ImplShowTargetEmphasis( pTargetEntry, sal_False ); + ImplShowTargetEmphasis( pTargetEntry, false ); pDDTarget = this; SvLBoxDDInfo aDDInfo; @@ -1272,7 +1272,7 @@ sal_Int8 SvTreeListBox::ExecuteDrop( const ExecuteDropEvent& rEvt, SvTreeListBox } else if( DND_ACTION_COPYMOVE == rEvt.mnAction ) { - if ( MoveSelectionCopyFallbackPossible( aDDInfo.pSource, pTarget, sal_True ) ) + if ( MoveSelectionCopyFallbackPossible( aDDInfo.pSource, pTarget, true ) ) nRet = rEvt.mnAction; } } @@ -1329,7 +1329,7 @@ void SvTreeListBox::StartDrag( sal_Int8, const Point& rPosPixel ) pDDSource = this; pDDTarget = 0; - sal_Bool bOldUpdateMode = Control::IsUpdateMode(); + bool bOldUpdateMode = Control::IsUpdateMode(); Control::SetUpdateMode( true ); Update(); Control::SetUpdateMode( bOldUpdateMode ); @@ -1337,8 +1337,8 @@ void SvTreeListBox::StartDrag( sal_Int8, const Point& rPosPixel ) // Disallow using the selection and its children as drop targets. // Important: If the selection of the SourceListBox is changed in the // DropHandler, the entries have to be allowed as drop targets again: - // (GetSourceListBox()->EnableSelectionAsDropTarget( sal_True, sal_True );) - EnableSelectionAsDropTarget( sal_False, sal_True /* with children */ ); + // (GetSourceListBox()->EnableSelectionAsDropTarget( true, true );) + EnableSelectionAsDropTarget( false, true /* with children */ ); pContainer->StartDrag( this, nDragOptions, GetDragFinishedHdl() ); } @@ -1349,7 +1349,7 @@ nAction #endif ) { - EnableSelectionAsDropTarget( sal_True, sal_True ); + EnableSelectionAsDropTarget( true, true ); #ifndef UNX if( (nAction == DND_ACTION_MOVE) && ( (pDDTarget && @@ -1360,7 +1360,7 @@ nAction } #endif - ImplShowTargetEmphasis( pTargetEntry, sal_False ); + ImplShowTargetEmphasis( pTargetEntry, false ); pDDSource = 0; pDDTarget = 0; pTargetEntry = 0; @@ -1372,9 +1372,9 @@ DragDropMode SvTreeListBox::NotifyStartDrag( TransferDataContainer&, SvTreeListE return (DragDropMode)0xffff; } -sal_Bool SvTreeListBox::NotifyAcceptDrop( SvTreeListEntry* ) +bool SvTreeListBox::NotifyAcceptDrop( SvTreeListEntry* ) { - return sal_True; + return true; } // Handler and methods for Drag - finished handler. @@ -1460,7 +1460,7 @@ void SvTreeListBox::InitTreeView() SetSpaceBetweenEntries( 0 ); SetLineColor(); - InitSettings( sal_True, sal_True, sal_True ); + InitSettings( true, true, true ); ImplInitStyle(); SetTabs(); } @@ -1598,12 +1598,12 @@ void SvTreeListBox::DisconnectFromModel() pImp->SetModel( GetModel() ); } -void SvTreeListBox::SetSublistOpenWithReturn( sal_Bool b ) +void SvTreeListBox::SetSublistOpenWithReturn( bool b ) { pImp->bSubLstOpRet = b; } -void SvTreeListBox::SetSublistOpenWithLeftRight( sal_Bool b ) +void SvTreeListBox::SetSublistOpenWithLeftRight( bool b ) { pImp->bSubLstOpLR = b; } @@ -1661,8 +1661,8 @@ void SvTreeListBox::SetTabs() nTreeFlags &= (~TREEFLAG_RECALCTABS); nFocusWidth = -1; const WinBits nStyle( GetStyle() ); - sal_Bool bHasButtons = (nStyle & WB_HASBUTTONS)!=0; - sal_Bool bHasButtonsAtRoot = (nStyle & (WB_HASLINESATROOT | + bool bHasButtons = (nStyle & WB_HASBUTTONS)!=0; + bool bHasButtonsAtRoot = (nStyle & (WB_HASLINESATROOT | WB_HASBUTTONSATROOT))!=0; long nStartPos = TAB_STARTPOS; long nNodeWidthPixel = GetExpandedNodeBmp().GetSizePixel().Width(); @@ -1809,7 +1809,7 @@ IMPL_LINK_INLINE_END( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pData SvTreeListEntry* SvTreeListBox::InsertEntry( const OUString& rText, SvTreeListEntry* pParent, - sal_Bool bChildrenOnDemand, sal_uLong nPos, + bool bChildrenOnDemand, sal_uLong nPos, void* pUser, SvLBoxButtonKind eButtonKind ) @@ -1842,7 +1842,7 @@ SvTreeListEntry* SvTreeListBox::InsertEntry( SvTreeListEntry* SvTreeListBox::InsertEntry( const OUString& rText, const Image& aExpEntryBmp, const Image& aCollEntryBmp, - SvTreeListEntry* pParent, sal_Bool bChildrenOnDemand, sal_uLong nPos, void* pUser, + SvTreeListEntry* pParent, bool bChildrenOnDemand, sal_uLong nPos, void* pUser, SvLBoxButtonKind eButtonKind ) { nTreeFlags |= TREEFLAG_MANINS; @@ -2130,14 +2130,14 @@ void SvTreeListBox::SetNodeBitmaps( const Image& rCollapsedNodeBmp, const Image& SetTabs(); } -sal_Bool SvTreeListBox::EditingEntry( SvTreeListEntry*, Selection& ) +bool SvTreeListBox::EditingEntry( SvTreeListEntry*, Selection& ) { - return sal_True; + return true; } -sal_Bool SvTreeListBox::EditedEntry( SvTreeListEntry* /*pEntry*/,const OUString& /*rNewText*/) +bool SvTreeListBox::EditedEntry( SvTreeListEntry* /*pEntry*/,const OUString& /*rNewText*/) { - return sal_True; + return true; } void SvTreeListBox::EnableInplaceEditing( bool bOn ) @@ -2183,7 +2183,7 @@ void SvTreeListBox::KeyInput( const KeyEvent& rKEvt ) void SvTreeListBox::RequestingChildren( SvTreeListEntry* pParent ) { if( !pParent->HasChildren() ) - InsertEntry( OUString("<dummy>"), pParent, sal_False, TREELIST_APPEND ); + InsertEntry( OUString("<dummy>"), pParent, false, TREELIST_APPEND ); } void SvTreeListBox::GetFocus() @@ -2243,7 +2243,7 @@ void SvTreeListBox::ModelHasCleared() SvListView::ModelHasCleared(); } -void SvTreeListBox::ShowTargetEmphasis( SvTreeListEntry* pEntry, sal_Bool /*bShow*/ ) +void SvTreeListBox::ShowTargetEmphasis( SvTreeListEntry* pEntry, bool /*bShow*/ ) { pImp->PaintDDCursor( pEntry ); } @@ -2335,7 +2335,7 @@ void SvTreeListBox::SetEntryHeight( SvTreeListEntry* pEntry ) } } -void SvTreeListBox::SetEntryHeight( short nHeight, sal_Bool bAlways ) +void SvTreeListBox::SetEntryHeight( short nHeight, bool bAlways ) { if( bAlways || nHeight > nEntryHeight ) @@ -2373,10 +2373,10 @@ void SvTreeListBox::AdjustEntryHeight( const Font& rFont ) } } -sal_Bool SvTreeListBox::Expand( SvTreeListEntry* pParent ) +bool SvTreeListBox::Expand( SvTreeListEntry* pParent ) { pHdlEntry = pParent; - sal_Bool bExpanded = sal_False; + bool bExpanded = false; sal_uInt16 nFlags; if( pParent->HasChildrenOnDemand() ) @@ -2386,7 +2386,7 @@ sal_Bool SvTreeListBox::Expand( SvTreeListEntry* pParent ) nImpFlags |= SVLBOX_IS_EXPANDING; if( ExpandingHdl() ) { - bExpanded = sal_True; + bExpanded = true; ExpandListEntry( pParent ); pImp->EntryExpanded( pParent ); pHdlEntry = pParent; @@ -2414,15 +2414,15 @@ sal_Bool SvTreeListBox::Expand( SvTreeListEntry* pParent ) return bExpanded; } -sal_Bool SvTreeListBox::Collapse( SvTreeListEntry* pParent ) +bool SvTreeListBox::Collapse( SvTreeListEntry* pParent ) { nImpFlags &= ~SVLBOX_IS_EXPANDING; pHdlEntry = pParent; - sal_Bool bCollapsed = sal_False; + bool bCollapsed = false; if( ExpandingHdl() ) { - bCollapsed = sal_True; + bCollapsed = true; pImp->CollapsingEntry( pParent ); CollapseListEntry( pParent ); pImp->EntryCollapsed( pParent ); @@ -2439,10 +2439,10 @@ sal_Bool SvTreeListBox::Collapse( SvTreeListEntry* pParent ) return bCollapsed; } -sal_Bool SvTreeListBox::Select( SvTreeListEntry* pEntry, sal_Bool bSelect ) +bool SvTreeListBox::Select( SvTreeListEntry* pEntry, bool bSelect ) { DBG_ASSERT(pEntry,"Select: Null-Ptr"); - sal_Bool bRetVal = SelectListEntry( pEntry, bSelect ); + bool bRetVal = SelectListEntry( pEntry, bSelect ); DBG_ASSERT(IsSelected(pEntry)==bSelect,"Select failed"); if( bRetVal ) { @@ -2459,7 +2459,7 @@ sal_Bool SvTreeListBox::Select( SvTreeListEntry* pEntry, sal_Bool bSelect ) return bRetVal; } -sal_uLong SvTreeListBox::SelectChildren( SvTreeListEntry* pParent, sal_Bool bSelect ) +sal_uLong SvTreeListBox::SelectChildren( SvTreeListEntry* pParent, bool bSelect ) { pImp->DestroyAnchor(); sal_uLong nRet = 0; @@ -2475,7 +2475,7 @@ sal_uLong SvTreeListBox::SelectChildren( SvTreeListEntry* pParent, sal_Bool bSel return nRet; } -void SvTreeListBox::SelectAll( sal_Bool bSelect, sal_Bool ) +void SvTreeListBox::SelectAll( bool bSelect, bool ) { pImp->SelAllDestrAnch( bSelect, @@ -2609,7 +2609,7 @@ void SvTreeListBox::MouseMove( const MouseEvent& rMEvt ) } -void SvTreeListBox::SetUpdateMode( sal_Bool bUpdate ) +void SvTreeListBox::SetUpdateMode( bool bUpdate ) { pImp->SetUpdateMode( bUpdate ); } @@ -2626,7 +2626,7 @@ void SvTreeListBox::SetSpaceBetweenEntries( short nOffsLogic ) } } -void SvTreeListBox::SetCursor( SvTreeListEntry* pEntry, sal_Bool bForceNoSelect ) +void SvTreeListBox::SetCursor( SvTreeListEntry* pEntry, bool bForceNoSelect ) { pImp->SetCursor(pEntry, bForceNoSelect); } @@ -2656,7 +2656,7 @@ void SvTreeListBox::MakeVisible( SvTreeListEntry* pEntry ) pImp->MakeVisible(pEntry); } -void SvTreeListBox::MakeVisible( SvTreeListEntry* pEntry, sal_Bool bMoveToTop ) +void SvTreeListBox::MakeVisible( SvTreeListEntry* pEntry, bool bMoveToTop ) { pImp->MakeVisible( pEntry, bMoveToTop ); } @@ -2683,9 +2683,9 @@ void SvTreeListBox::EditItemText( SvTreeListEntry* pEntry, SvLBoxString* pItem, if( IsSelected( pEntry )) { pImp->ShowCursor( false ); - SelectListEntry( pEntry, sal_False ); + SelectListEntry( pEntry, false ); PaintEntry( pEntry ); - SelectListEntry( pEntry, sal_True ); + SelectListEntry( pEntry, true ); pImp->ShowCursor( true ); } pEdEntry = pEntry; @@ -2763,14 +2763,14 @@ void SvTreeListBox::ImplEditEntry( SvTreeListEntry* pEntry ) Selection aSel( SELECTION_MIN, SELECTION_MAX ); if( pItem && EditingEntry( pEntry, aSel ) ) { - SelectAll( sal_False ); + SelectAll( false ); MakeVisible( pEntry ); EditItemText( pEntry, pItem, aSel ); } } } -sal_Bool SvTreeListBox::AreChildrenTransient() const +bool SvTreeListBox::AreChildrenTransient() const { return pImp->AreChildrenTransient(); } @@ -2827,7 +2827,7 @@ SvTreeListEntry* SvTreeListBox::GetDropTarget( const Point& rPos ) } -SvTreeListEntry* SvTreeListBox::GetEntry( const Point& rPos, sal_Bool bHit ) const +SvTreeListEntry* SvTreeListBox::GetEntry( const Point& rPos, bool bHit ) const { SvTreeListEntry* pEntry = pImp->GetEntry( rPos ); if( pEntry && bHit ) @@ -2887,12 +2887,12 @@ long SvTreeListBox::PaintEntry(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nTa } long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nTabFlags, - sal_Bool bHasClipRegion ) + bool bHasClipRegion ) { Rectangle aRect; // multi purpose - sal_Bool bHorSBar = pImp->HasHorScrollBar(); + bool bHorSBar = pImp->HasHorScrollBar(); PreparePaint( pEntry ); pImp->UpdateContextBmpWidthMax( pEntry ); @@ -2917,7 +2917,7 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nT Color aBackupColor = GetFillColor(); bool bCurFontIsSel = false; - sal_Bool bInUse = pEntry->HasInUseEmphasis(); + bool bInUse = pEntry->HasInUseEmphasis(); // if a ClipRegion was set from outside, we don't have to reset it const WinBits nWindowStyle = GetStyle(); const bool bResetClipRegion = !bHasClipRegion; @@ -2933,7 +2933,7 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nT if( !bHasClipRegion && nWindowStyle & WB_HSCROLL ) { SetClipRegion( Region(pImp->GetClipRegionRect()) ); - bHasClipRegion = sal_True; + bHasClipRegion = true; } SvViewDataEntry* pViewDataEntry = GetViewDataEntry( pEntry ); @@ -2976,7 +2976,7 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nT if( !bHasClipRegion && nX + aSize.Width() >= nMaxRight ) { SetClipRegion( Region(pImp->GetClipRegionRect()) ); - bHasClipRegion = sal_True; + bHasClipRegion = true; } aEntryPos.X() = nX; aEntryPos.Y() = nLine; @@ -3147,7 +3147,7 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nT nStyle |= IMAGE_DRAW_DISABLE; //native - sal_Bool bNativeOK = sal_False; + bool bNativeOK = false; if ( IsNativeControlSupported( CTRL_LISTNODE, PART_ENTIRE_CONTROL) ) { ImplControlValue aControlValue; @@ -3219,7 +3219,7 @@ Rectangle SvTreeListBox::GetFocusRect( SvTreeListEntry* pEntry, long nLine ) nNextTabPos += 50; } - sal_Bool bUserSelection = (sal_Bool)( nTreeFlags & TREEFLAG_USESEL ) != 0; + bool bUserSelection = ( nTreeFlags & TREEFLAG_USESEL ) != 0; if( !bUserSelection ) { if( pTab && nCurTab < pEntry->ItemCount() ) @@ -3658,13 +3658,13 @@ void SvTreeListBox::ModelNotification( sal_uInt16 nActionId, SvTreeListEntry* pE break; case LISTACTION_RESORTING: - SetUpdateMode( sal_False ); + SetUpdateMode( false ); break; case LISTACTION_RESORTED: // after a selection: show first entry and also keep the selection - MakeVisible( (SvTreeListEntry*)pModel->First(), sal_True ); - SetUpdateMode( sal_True ); + MakeVisible( (SvTreeListEntry*)pModel->First(), true ); + SetUpdateMode( true ); break; case LISTACTION_CLEARED: @@ -3694,7 +3694,7 @@ ScrollBar *SvTreeListBox::GetHScroll() return &((SvTreeListBox*)this)->pImp->aHorSBar; } -void SvTreeListBox::EnableAsyncDrag( sal_Bool b ) +void SvTreeListBox::EnableAsyncDrag( bool b ) { pImp->EnableAsyncDrag( b ); } @@ -3749,9 +3749,9 @@ void SvTreeListBox::DataChanged( const DataChangedEvent& rDCEvt ) { if( (rDCEvt.GetType()==DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - nEntryHeight = 0; // _together_ with sal_True of 1. par (bFont) of InitSettings() a zero-height + nEntryHeight = 0; // _together_ with true of 1. par (bFont) of InitSettings() a zero-height // forces complete recalc of heights! - InitSettings( sal_True, sal_True, sal_True ); + InitSettings( true, true, true ); Invalidate(); } else @@ -3769,7 +3769,7 @@ void SvTreeListBox::StateChanged( StateChangedType eType ) ImplInitStyle(); } -void SvTreeListBox::InitSettings(sal_Bool bFont,sal_Bool bForeground,sal_Bool bBackground) +void SvTreeListBox::InitSettings(bool bFont, bool bForeground, bool bBackground) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); if( bFont ) @@ -3795,7 +3795,7 @@ void SvTreeListBox::InitSettings(sal_Bool bFont,sal_Bool bForeground,sal_Bool bB pCheckButtonData->SetDefaultImages( this ); } -sal_Bool SvTreeListBox::IsCellFocusEnabled() const +bool SvTreeListBox::IsCellFocusEnabled() const { return pImp->IsCellFocusEnabled(); } @@ -3833,14 +3833,14 @@ void SvTreeListBox::EnableContextMenuHandling( void ) pImp->bContextMenuHandling = true; } -void SvTreeListBox::EnableContextMenuHandling( sal_Bool b ) +void SvTreeListBox::EnableContextMenuHandling( bool b ) { DBG_ASSERT( pImp, "-SvTreeListBox::EnableContextMenuHandling(): No implementation!" ); pImp->bContextMenuHandling = b; } -sal_Bool SvTreeListBox::IsContextMenuHandlingEnabled( void ) const +bool SvTreeListBox::IsContextMenuHandlingEnabled( void ) const { DBG_ASSERT( pImp, "-SvTreeListBox::IsContextMenuHandlingEnabled(): No implementation!" ); diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index b2c282bca892..8fb3a1c15173 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -91,8 +91,8 @@ public: virtual void RequestingChildren( SvTreeListEntry* pParent ); - virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); + virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); + virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); DECL_LINK(OnSelectionChangeHdl, void *); DECL_LINK(OnExpandingHdl, void *); @@ -500,7 +500,7 @@ void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, } if( bSetSelection ) - rTree.SelectAll( sal_False ); + rTree.SelectAll( false ); if( pNodes && nCount ) { @@ -595,7 +595,7 @@ void SAL_CALL TreeControlPeer::removeSelection( const Any& rSelection ) throw (I void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; - getTreeListBoxOrThrow().SelectAll( sal_False ); + getTreeListBoxOrThrow().SelectAll( false ); } @@ -861,7 +861,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x Reference< XTreeNode > xNode; const Point aPos( x, y ); - UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( rTree.GetEntry( aPos, sal_True ) ); + UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( rTree.GetEntry( aPos, true ) ); if( pEntry ) xNode = pEntry->mxNode; @@ -879,7 +879,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_ Reference< XTreeNode > xNode; const Point aPos( x, y ); - UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( rTree.GetEntry( aPos, sal_True ) ); + UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( rTree.GetEntry( aPos, true ) ); if( pEntry ) xNode = pEntry->mxNode; @@ -1555,16 +1555,16 @@ void UnoTreeListBoxImpl::RequestingChildren( SvTreeListEntry* pParent ) -sal_Bool UnoTreeListBoxImpl::EditingEntry( SvTreeListEntry* pEntry, Selection& ) +bool UnoTreeListBoxImpl::EditingEntry( SvTreeListEntry* pEntry, Selection& ) { - return mxPeer.is() ? mxPeer->onEditingEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ) ) : false; + return mxPeer.is() && mxPeer->onEditingEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ) ); } -sal_Bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) +bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { - return mxPeer.is() ? mxPeer->onEditedEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ), rNewText ) : false; + return mxPeer.is() && mxPeer->onEditedEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ), rNewText ); } diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index c10def8df75a..d6482442c7d4 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -89,7 +89,7 @@ void SvxCheckListBox::InsertEntry( const OUString& rStr, sal_uLong nPos, void* pUserData, SvLBoxButtonKind eButtonKind ) { - SvTreeListBox::InsertEntry( rStr, NULL, sal_False, nPos, pUserData, + SvTreeListBox::InsertEntry( rStr, NULL, false, nPos, pUserData, eButtonKind ); } @@ -220,7 +220,7 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt ) if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) { SvTreeListBox::MouseButtonDown( rMEvt ); - Select( pEntry, sal_True ); + Select( pEntry, true ); return; } else @@ -267,7 +267,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt ) -SvTreeListEntry* SvxCheckListBox::InsertEntry( const OUString& rText, SvTreeListEntry* pParent, sal_Bool bChildrenOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind ) +SvTreeListEntry* SvxCheckListBox::InsertEntry( const OUString& rText, SvTreeListEntry* pParent, bool bChildrenOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind ) { return SvTreeListBox::InsertEntry( rText, pParent, bChildrenOnDemand, nPos, pUserData, eButtonKind ); } diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index ca7122118861..173dd3f6305a 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -343,7 +343,7 @@ SvTreeListEntry* SvxRedlinTable::InsertEntry(const OUString& rStr,RedlinData *pU const OUString aFirstStr( rStr.getToken(0, '\t', nIndex ) ); aCurEntry = nIndex>0 ? rStr.copy(nIndex) : OUString(); - return SvSimpleTable::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData ); + return SvSimpleTable::InsertEntry( aFirstStr, pParent, false, nPos, pUserData ); } SvTreeListEntry* SvxRedlinTable::CreateEntry() const diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 4ac7a25ed32c..63b2747a4671 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -1007,7 +1007,7 @@ RecoveryDialog::RecoveryDialog(Window* pParent, // mark first item SvTreeListEntry* pFirst = m_aFileListLB.First(); if (pFirst) - m_aFileListLB.SetCursor(pFirst, sal_True); + m_aFileListLB.SetCursor(pFirst, true); } @@ -1280,7 +1280,7 @@ void RecoveryDialog::stepNext(TURLInfo* pItem) if (pInfo->ID != pItem->ID) continue; - m_aFileListLB.SetCursor(pEntry, sal_True); + m_aFileListLB.SetCursor(pEntry, true); m_aFileListLB.MakeVisible(pEntry); m_aFileListLB.Invalidate(); m_aFileListLB.Update(); diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index fbd455c45afd..d60b9069bd53 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -122,7 +122,7 @@ void SvxFontListBox::SelectEntryPos( sal_uLong nPos, bool bSelect ) void SvxFontListBox::SetNoSelection() { - SelectAll( sal_False, sal_True ); + SelectAll( false, true ); } sal_uLong SvxFontListBox::GetSelectEntryPos() const diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 7e82487dc103..baf0c666a117 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -385,7 +385,7 @@ namespace svxform { ItemNode* pNode = new ItemNode( xChild ); SvTreeListEntry* pEntry = m_aItemList.InsertEntry( - sName, aExpImg, aCollImg, _pParent, sal_False, TREELIST_APPEND, pNode ); + sName, aExpImg, aCollImg, _pParent, false, TREELIST_APPEND, pNode ); if ( xChild->hasAttributes() ) { Reference< css::xml::dom::XNamedNodeMap > xMap = xChild->getAttributes(); @@ -401,7 +401,7 @@ namespace svxform m_xUIHelper->getNodeDisplayName( xAttr, bShowDetails ); m_aItemList.InsertEntry( sAttrName, aExpImg, aCollImg, - pEntry, sal_False, TREELIST_APPEND, pNode ); + pEntry, false, TREELIST_APPEND, pNode ); } } } @@ -444,7 +444,7 @@ namespace svxform xSubmissions->insert( makeAny( xNewSubmission ) ); Reference< XPropertySet > xNewPropSet( xNewSubmission, UNO_QUERY ); SvTreeListEntry* pEntry = AddEntry( xNewPropSet ); - m_aItemList.Select( pEntry, sal_True ); + m_aItemList.Select( pEntry, true ); bIsDocModified = true; } catch ( Exception& ) @@ -571,7 +571,7 @@ namespace svxform { SvTreeListEntry* pNewEntry = AddEntry( pNode, bIsElement ); m_aItemList.MakeVisible( pNewEntry ); - m_aItemList.Select( pNewEntry, sal_True ); + m_aItemList.Select( pNewEntry, true ); bIsDocModified = true; } else @@ -597,7 +597,7 @@ namespace svxform if ( RET_OK == nReturn ) { SvTreeListEntry* pNewEntry = AddEntry( xNewBinding ); - m_aItemList.Select( pNewEntry, sal_True ); + m_aItemList.Select( pNewEntry, true ); bIsDocModified = true; } else @@ -763,7 +763,7 @@ namespace svxform DBG_UNHANDLED_EXCEPTION(); } return m_aItemList.InsertEntry( - sName, aImage, aImage, pParent, sal_False, TREELIST_APPEND, _pNewNode ); + sName, aImage, aImage, pParent, false, TREELIST_APPEND, _pNewNode ); } @@ -782,7 +782,7 @@ namespace svxform { // ID _rEntry->getPropertyValue( PN_SUBMISSION_ID ) >>= sTemp; - pEntry = m_aItemList.InsertEntry( sTemp, aImage, aImage, NULL, sal_False, TREELIST_APPEND, pNode ); + pEntry = m_aItemList.InsertEntry( sTemp, aImage, aImage, NULL, false, TREELIST_APPEND, pNode ); // Action _rEntry->getPropertyValue( PN_SUBMISSION_ACTION ) >>= sTemp; OUString sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_ACTION ); @@ -826,7 +826,7 @@ namespace svxform _rEntry->getPropertyValue( PN_BINDING_EXPR ) >>= sTemp; sName += sTemp; pEntry = m_aItemList.InsertEntry( - sName, aImage, aImage, NULL, sal_False, TREELIST_APPEND, pNode ); + sName, aImage, aImage, NULL, false, TREELIST_APPEND, pNode ); } catch ( Exception& ) { @@ -1140,7 +1140,7 @@ namespace svxform ItemNode* pNode = new ItemNode( xPropSet ); m_aItemList.InsertEntry( - sEntry, aImage1, aImage2, NULL, sal_False, TREELIST_APPEND, pNode ); + sEntry, aImage1, aImage2, NULL, false, TREELIST_APPEND, pNode ); } } } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 9867bf71fc48..b930613fec6f 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1193,7 +1193,7 @@ void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControl SvTreeListEntry* pEntry = FindEntry(m_pModel->GetCurrentForm()); if (pEntry && !IsExpanded(pEntry)) { - SelectAll(sal_False); + SelectAll(false); if (!IsExpanded(pEntry)) Expand(pEntry); @@ -1209,23 +1209,23 @@ void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControl } -sal_Bool FmFilterNavigator::EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ) +bool FmFilterNavigator::EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ) { m_pEditingCurrently = pEntry; if (!SvTreeListBox::EditingEntry( pEntry, rSelection )) - return sal_False; + return false; return pEntry && ((FmFilterData*)pEntry->GetUserData())->ISA(FmFilterItem); } -sal_Bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) +bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { DBG_ASSERT(pEntry == m_pEditingCurrently, "FmFilterNavigator::EditedEntry: suspicious entry!"); m_pEditingCurrently = NULL; if (EditingCanceled()) - return sal_True; + return true; DBG_ASSERT(((FmFilterData*)pEntry->GetUserData())->ISA(FmFilterItem), "FmFilterNavigator::EditedEntry() wrong entry"); @@ -1248,7 +1248,7 @@ sal_Bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString // which are connected to this particular entry m_pModel->SetTextForItem( static_cast< FmFilterItem* >( pEntry->GetUserData() ), aText ); - SetCursor( pEntry, sal_True ); + SetCursor( pEntry, true ); SetEntryText( pEntry, aText ); } else @@ -1259,10 +1259,10 @@ sal_Bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString aError.Details = aErrorMsg; displayException(aError, this); - return sal_False; + return false; } } - return sal_True; + return true; } @@ -1432,7 +1432,7 @@ sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt ) // search the container where to add the items FmFilterItems* pTargetItems = getTargetItems(pDropTarget); - SelectAll(sal_False); + SelectAll(false); SvTreeListEntry* pEntry = FindEntry(pTargetItems); Select(pEntry, sal_True); SetCurEntry(pEntry); @@ -1464,7 +1464,7 @@ void FmFilterNavigator::InitEntry(SvTreeListEntry* pEntry, sal_Bool FmFilterNavigator::Select( SvTreeListEntry* pEntry, sal_Bool bSelect ) { - if (bSelect == IsSelected(pEntry)) // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;) + if (bSelect == (IsSelected(pEntry) ? 1 : 0)) // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;) return sal_True; if (SvTreeListBox::Select(pEntry, bSelect)) @@ -1552,7 +1552,7 @@ void FmFilterNavigator::Insert(FmFilterData* pItem, sal_uLong nPos) // insert the item SvTreeListEntry* pParentEntry = FindEntry( pParent ); - InsertEntry( pItem->GetText(), pItem->GetImage(), pItem->GetImage(), pParentEntry, sal_False, nPos, pItem ); + InsertEntry( pItem->GetText(), pItem->GetImage(), pItem->GetImage(), pParentEntry, false, nPos, pItem ); if ( pParentEntry ) Expand( pParentEntry ); } @@ -1672,7 +1672,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt ) if (!IsSelected(pClicked)) { - SelectAll(sal_False); + SelectAll(false); Select(pClicked, sal_True); SetCurEntry(pClicked); } @@ -1883,7 +1883,7 @@ void FmFilterNavigator::DeleteSelection() } // Remove the selection - SelectAll(sal_False); + SelectAll(false); for (::std::vector<SvTreeListEntry*>::reverse_iterator i = aEntryList.rbegin(); // link problems with operator == diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index aa5f631bb88c..e9e6f22f9db2 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -324,7 +324,7 @@ namespace svxform break; if ( !IsSelected(ptClickedOn) ) { - SelectAll(sal_False); + SelectAll(false); Select(ptClickedOn, sal_True); SetCurEntry(ptClickedOn); } @@ -348,7 +348,7 @@ namespace svxform if ( (m_arrCurrentSelection.size() > 1) && m_bRootSelected ) { Select( m_pRootEntry, sal_False ); - SetCursor( *m_arrCurrentSelection.begin(), sal_True); + SetCursor( *m_arrCurrentSelection.begin(), true); } sal_Bool bSingleSelection = (m_arrCurrentSelection.size() == 1); @@ -596,7 +596,7 @@ namespace svxform // Default-Eintrag "Formulare" Image aRootImage( m_aNavigatorImages.GetImage( RID_SVXIMG_FORMS ) ); m_pRootEntry = InsertEntry( SVX_RESSTR(RID_STR_FORMS), aRootImage, aRootImage, - NULL, sal_False, 0, NULL ); + NULL, false, 0, NULL ); } else if (!m_bMarkingObjects && rHint.ISA(FmNavRequestSelectHint)) { // wenn m_bMarkingObjects sal_True ist, markiere ich gerade selber Objekte, und da der ganze Mechanismus dahinter synchron ist, @@ -623,12 +623,12 @@ namespace svxform if( !pParentEntry ) pNewEntry = InsertEntry( pEntryData->GetText(), pEntryData->GetNormalImage(), pEntryData->GetNormalImage(), - m_pRootEntry, sal_False, nRelPos, pEntryData ); + m_pRootEntry, false, nRelPos, pEntryData ); else pNewEntry = InsertEntry( pEntryData->GetText(), pEntryData->GetNormalImage(), pEntryData->GetNormalImage(), - pParentEntry, sal_False, nRelPos, pEntryData ); + pParentEntry, false, nRelPos, pEntryData ); // Wenn Root-Eintrag Root expandieren @@ -957,7 +957,7 @@ namespace svxform // das sollte das AcceptDrop abgefangen haben // da ich gleich die Zielobjekte alle selektieren will (und nur die) - SelectAll(sal_False); + SelectAll(false); Sequence< Reference< XInterface > > aControls = _rData.hiddenControls(); sal_Int32 nCount = aControls.getLength(); @@ -1312,10 +1312,10 @@ namespace svxform } - sal_Bool NavigatorTree::EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ) + bool NavigatorTree::EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ) { if (!SvTreeListBox::EditingEntry( pEntry, rSelection )) - return sal_False; + return false; return (pEntry && (pEntry->GetUserData() != NULL)); // die Wurzel, die ich nicht umbenennen darf, hat als UserData NULL @@ -1467,20 +1467,20 @@ namespace svxform } - sal_Bool NavigatorTree::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) + bool NavigatorTree::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) { if (EditingCanceled()) - return sal_True; + return true; GrabFocus(); FmEntryData* pEntryData = (FmEntryData*)pEntry->GetUserData(); - sal_Bool bRes = GetNavModel()->Rename( pEntryData, rNewText); + bool bRes = GetNavModel()->Rename( pEntryData, rNewText); if( !bRes ) { m_pEditEntry = pEntry; nEditEvent = Application::PostUserEvent( LINK(this, NavigatorTree, OnEdit) ); } else - SetCursor(pEntry, sal_True); + SetCursor(pEntry, true); return bRes; } @@ -1894,7 +1894,7 @@ namespace svxform LockSelectionHandling(); if (arredToSelect.empty()) { - SelectAll(sal_False); + SelectAll(false); } else { @@ -1942,7 +1942,7 @@ namespace svxform { Select(pLoop, sal_True); MakeVisible(pLoop); - SetCursor(pLoop, sal_True); + SetCursor(pLoop, true); } pLoop = Next( pLoop ); @@ -2050,7 +2050,7 @@ namespace svxform sal_Bool NavigatorTree::Select( SvTreeListEntry* pEntry, sal_Bool bSelect ) { - if (bSelect == IsSelected(pEntry)) // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;) + if (bSelect == (IsSelected(pEntry) ? 1 : 0)) // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;) return sal_True; return SvTreeListBox::Select(pEntry, bSelect ); diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 7e7d3d3aebbf..a560d01442d7 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -103,9 +103,9 @@ static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< conta if ( xColumn->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) ) xColumn->getPropertyValue(FM_PROP_LABEL) >>= sLabel; if ( !sLabel.isEmpty() ) - _rListBox.InsertEntry( sLabel,NULL,sal_False,TREELIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); + _rListBox.InsertEntry( sLabel, NULL, false, TREELIST_APPEND, new ColumnInfo(*pEntries,sLabel) ); else - _rListBox.InsertEntry( *pEntries,NULL,sal_False,TREELIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); + _rListBox.InsertEntry( *pEntries, NULL, false, TREELIST_APPEND, new ColumnInfo(*pEntries,sLabel) ); } } @@ -139,10 +139,10 @@ sal_Int8 FmFieldWinListBox::ExecuteDrop( const ExecuteDropEvent& /*rEvt*/ ) } -sal_Bool FmFieldWinListBox::DoubleClickHdl() +bool FmFieldWinListBox::DoubleClickHdl() { if ( pTabWin->createSelectionControls() ) - return sal_True; + return true; return SvTreeListBox::DoubleClickHdl(); } diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 1ee7cf3151b2..c5a813cad1c8 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -272,8 +272,8 @@ protected: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind); virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); - virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); + virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection ); + virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 5359d42bfc20..e305515bc0ae 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -525,9 +525,9 @@ namespace svxform NavigatorTreeModel* GetNavModel() const { return m_pNavModel; } SvTreeListEntry* FindEntry( FmEntryData* pEntryData ); - virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); + virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); - virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); + virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual void KeyInput( const KeyEvent& rKEvt ); diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index 32a9672d1e51..a42be7aeecfb 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -52,7 +52,7 @@ protected: virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); // SvTreeListBox - virtual sal_Bool DoubleClickHdl(); + virtual bool DoubleClickHdl(); using SvTreeListBox::ExecuteDrop; }; diff --git a/sw/source/core/uibase/dbui/dbtree.cxx b/sw/source/core/uibase/dbui/dbtree.cxx index 7eb15a02c677..9f240d9aa40a 100644 --- a/sw/source/core/uibase/dbui/dbtree.cxx +++ b/sw/source/core/uibase/dbui/dbtree.cxx @@ -222,7 +222,7 @@ void SwDBTreeList::InitTreeList() for(long i = 0; i < nCount; i++) { OUString sDBName(pDBNames[i]); - InsertEntry(sDBName, aImg, aImg, NULL, sal_True); + InsertEntry(sDBName, aImg, aImg, NULL, true); } OUString sDBName(sDefDBName.getToken(0, DB_DELIM)); OUString sTableName(sDefDBName.getToken(1, DB_DELIM)); @@ -235,7 +235,7 @@ void SwDBTreeList::InitTreeList() void SwDBTreeList::AddDataSource(const OUString& rSource) { Image aImg = aImageList.GetImage(IMG_DB); - SvTreeListEntry* pEntry = InsertEntry(rSource, aImg, aImg, NULL, sal_True); + SvTreeListEntry* pEntry = InsertEntry(rSource, aImg, aImg, NULL, true); SvTreeListBox::Select(pEntry); } @@ -248,7 +248,7 @@ void SwDBTreeList::ShowColumns(sal_Bool bShowCol) OUString sColumnName; const OUString sDBName(GetDBName(sTableName, sColumnName)); - SetUpdateMode(sal_False); + SetUpdateMode(false); SvTreeListEntry* pEntry = First(); @@ -268,7 +268,7 @@ void SwDBTreeList::ShowColumns(sal_Bool bShowCol) { Select(sDBName, sTableName, sColumnName); // force RequestingChildren } - SetUpdateMode(sal_True); + SetUpdateMode(true); } } diff --git a/sw/source/core/uibase/inc/conttree.hxx b/sw/source/core/uibase/inc/conttree.hxx index d51152a344e7..11d39b9db697 100644 --- a/sw/source/core/uibase/inc/conttree.hxx +++ b/sw/source/core/uibase/inc/conttree.hxx @@ -116,7 +116,7 @@ protected: virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvTreeListEntry* ); - virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* ); + virtual bool NotifyAcceptDrop( SvTreeListEntry* ); virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, @@ -194,7 +194,7 @@ public: virtual void GetFocus(); virtual void KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); + virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ); virtual sal_Int32 GetEntryRealChildrenNum( SvTreeListEntry* pEntry ) const; }; @@ -275,7 +275,7 @@ protected: virtual void DragFinished( sal_Int8 ); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, SvTreeListEntry* ); - virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* ); + virtual bool NotifyAcceptDrop( SvTreeListEntry* ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void KeyInput(const KeyEvent& rKEvt); diff --git a/sw/source/core/uibase/inc/glossary.hxx b/sw/source/core/uibase/inc/glossary.hxx index 98f441620528..2e343a329bab 100644 --- a/sw/source/core/uibase/inc/glossary.hxx +++ b/sw/source/core/uibase/inc/glossary.hxx @@ -59,7 +59,7 @@ class SwGlTreeListBox : public SvTreeListBox virtual DragDropMode NotifyStartDrag( TransferDataContainer& rContainer, SvTreeListEntry* ); - virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* ); + virtual bool NotifyAcceptDrop( SvTreeListEntry* ); virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, diff --git a/sw/source/core/uibase/misc/redlndlg.cxx b/sw/source/core/uibase/misc/redlndlg.cxx index ebb8b6ee8853..7497e3f2e56c 100644 --- a/sw/source/core/uibase/misc/redlndlg.cxx +++ b/sw/source/core/uibase/misc/redlndlg.cxx @@ -222,7 +222,7 @@ SwRedlineAcceptDlg::~SwRedlineAcceptDlg() void SwRedlineAcceptDlg::Init(sal_uInt16 nStart) { SwWait aWait( *::GetActiveView()->GetDocShell(), false ); - pTable->SetUpdateMode(sal_False); + pTable->SetUpdateMode(false); aUsedSeqNo.clear(); if (nStart) @@ -238,11 +238,11 @@ void SwRedlineAcceptDlg::Init(sal_uInt16 nStart) InsertParents(nStart); InitAuthors(); - pTable->SetUpdateMode(sal_True); + pTable->SetUpdateMode(true); // #i69618# this moves the list box to the right position, visually SvTreeListEntry* pSelEntry = pTable->FirstSelected(); if( pSelEntry ) - pTable->MakeVisible( pSelEntry, sal_True ); //#i70937#, force the scroll + pTable->MakeVisible( pSelEntry, true ); //#i70937#, force the scroll } void SwRedlineAcceptDlg::InitAuthors() @@ -455,7 +455,7 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, sal_Bool bChild) return USHRT_MAX; } - pTable->SetUpdateMode(sal_False); + pTable->SetUpdateMode(false); SwView *pView = ::GetActiveView(); SwWrtShell* pSh = pView->GetWrtShellPtr(); sal_uInt16 nAutoFmt = HasRedlineAutoFmt() ? nsRedlineType_t::REDLINE_FORM_AUTOFMT : 0; @@ -488,7 +488,7 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, sal_Bool bChild) // insert new children InsertChildren(pParent, rRedln, nAutoFmt); - pTable->SetUpdateMode(sal_True); + pTable->SetUpdateMode(true); return nStart; } @@ -501,7 +501,7 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, sal_Bool bChild) { // remove entries from nStart to i-1 RemoveParents(nStart, i - 1); - pTable->SetUpdateMode(sal_True); + pTable->SetUpdateMode(true); return nStart - 1; } } @@ -516,12 +516,12 @@ sal_uInt16 SwRedlineAcceptDlg::CalcDiff(sal_uInt16 nStart, sal_Bool bChild) { // insert entries from nStart to i-1 InsertParents(nStart, i - 1); - pTable->SetUpdateMode(sal_True); + pTable->SetUpdateMode(true); return nStart - 1; } } - pTable->SetUpdateMode(sal_True); + pTable->SetUpdateMode(true); Init(nStart); // adjust all entries until the end return USHRT_MAX; } diff --git a/sw/source/core/uibase/utlui/content.cxx b/sw/source/core/uibase/utlui/content.cxx index 2204074ce791..735ad8863416 100644 --- a/sw/source/core/uibase/utlui/content.cxx +++ b/sw/source/core/uibase/utlui/content.cxx @@ -1334,13 +1334,13 @@ void SwContentTree::RequestingChildren( SvTreeListEntry* pParent ) sEntry = sSpace; if(!pChild || (nLevel == 0)) pChild = InsertEntry(sEntry, pParent, - sal_False, TREELIST_APPEND,(void*)pCnt); + false, TREELIST_APPEND,(void*)pCnt); else { //back search parent. if(((SwOutlineContent*)pCntType->GetMember(i-1))->GetOutlineLevel() < nLevel) pChild = InsertEntry(sEntry, pChild, - sal_False, TREELIST_APPEND, (void*)pCnt); + false, TREELIST_APPEND, (void*)pCnt); else { pChild = Prev(pChild); @@ -1353,7 +1353,7 @@ void SwContentTree::RequestingChildren( SvTreeListEntry* pParent ) } if(pChild) pChild = InsertEntry(sEntry, pChild, - sal_False, TREELIST_APPEND, (void*)pCnt); + false, TREELIST_APPEND, (void*)pCnt); } } } @@ -1370,7 +1370,7 @@ void SwContentTree::RequestingChildren( SvTreeListEntry* pParent ) if (sEntry.isEmpty()) sEntry = sSpace; SvTreeListEntry* pChild = InsertEntry(sEntry, pParent, - sal_False, TREELIST_APPEND, (void*)pCnt); + false, TREELIST_APPEND, (void*)pCnt); //If object is marked , the corresponding entry is set true, //else the corresponding entry is set false . @@ -1601,7 +1601,7 @@ void SwContentTree::Display( bool bActive ) } } Clear(); - SetUpdateMode( sal_False ); + SetUpdateMode( false ); if(bActive && !bIsConstant && !bIsActive) bIsActive = bActive; bIsHidden = !bActive; @@ -1688,7 +1688,7 @@ void SwContentTree::Display( bool bActive ) const Image& rImage = aEntryImages.GetImage(20000 + nRootType); SvTreeListEntry* pParent = InsertEntry( (*ppRootContentT)->GetName(), rImage, rImage, - 0, sal_False, TREELIST_APPEND, *ppRootContentT); + 0, false, TREELIST_APPEND, *ppRootContentT); if(nRootType != CONTENT_TYPE_OUTLINE) { @@ -1701,7 +1701,7 @@ void SwContentTree::Display( bool bActive ) if(sEntry.isEmpty()) sEntry = sSpace; InsertEntry( sEntry, pParent, - sal_False, TREELIST_APPEND, (void*)pCnt); + false, TREELIST_APPEND, (void*)pCnt); } } } @@ -1752,7 +1752,7 @@ void SwContentTree::Display( bool bActive ) } } } - SetUpdateMode( sal_True ); + SetUpdateMode( true ); ScrollBar* pVScroll = GetVScroll(); if(GetEntryCount() == nOldEntryCount && nOldScrollPos && pVScroll && pVScroll->IsVisible() @@ -1768,9 +1768,9 @@ void SwContentTree::Display( bool bActive ) void SwContentTree::Clear() { - SetUpdateMode(sal_False); + SetUpdateMode(false); SvTreeListBox::Clear(); - SetUpdateMode(sal_True); + SetUpdateMode(true); } bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer, @@ -2556,7 +2556,7 @@ sal_Bool SwContentTree::NotifyCopying( SvTreeListEntry* pTarget, // No drop before the first entry - it's a SwContentType -sal_Bool SwContentTree::NotifyAcceptDrop( SvTreeListEntry* pEntry) +bool SwContentTree::NotifyAcceptDrop( SvTreeListEntry* pEntry) { return pEntry != 0; } @@ -2567,7 +2567,7 @@ sal_Bool SwContentTree::NotifyAcceptDrop( SvTreeListEntry* pEntry) void SwContentTree::MouseButtonDown( const MouseEvent& rMEvt ) { Point aPos( rMEvt.GetPosPixel()); - SvTreeListEntry* pEntry = GetEntry( aPos, sal_True ); + SvTreeListEntry* pEntry = GetEntry( aPos, true ); if( !pEntry && rMEvt.IsLeft() && rMEvt.IsMod1() && (rMEvt.GetClicks() % 2) == 0) Control::MouseButtonDown( rMEvt ); else @@ -3008,10 +3008,10 @@ void SwContentTree::ShowActualView() // Here are the buttons for moving outlines are en-/disabled. -sal_Bool SwContentTree::Select( SvTreeListEntry* pEntry, sal_Bool bSelect ) +bool SwContentTree::Select( SvTreeListEntry* pEntry, bool bSelect ) { if(!pEntry) - return sal_False; + return false; sal_Bool bEnable = sal_False; SvTreeListEntry* pParentEntry = GetParent(pEntry); while(pParentEntry && (!lcl_IsContentType(pParentEntry))) diff --git a/sw/source/core/uibase/utlui/glbltree.cxx b/sw/source/core/uibase/utlui/glbltree.cxx index 43d6667e3f48..259eef188958 100644 --- a/sw/source/core/uibase/utlui/glbltree.cxx +++ b/sw/source/core/uibase/utlui/glbltree.cxx @@ -189,12 +189,12 @@ sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) SvTreeListEntry* pLast = (SvTreeListEntry*)LastVisible(); if(pEmphasisEntry) { - ImplShowTargetEmphasis( Prev(pEmphasisEntry), sal_False ); + ImplShowTargetEmphasis( Prev(pEmphasisEntry), false ); pEmphasisEntry = 0; } else if(bLastEntryEmphasis && pLast) { - ImplShowTargetEmphasis( pLast, sal_False); + ImplShowTargetEmphasis( pLast, false); } SvTreeListEntry* pDropEntry = bLastEntryEmphasis ? 0 : GetEntry(rEvt.maPosPixel); @@ -273,12 +273,12 @@ sal_Int8 SwGlobalTree::AcceptDrop( const AcceptDropEvent& rEvt ) { if( pEmphasisEntry ) { - ImplShowTargetEmphasis( Prev(pEmphasisEntry), sal_False ); + ImplShowTargetEmphasis( Prev(pEmphasisEntry), false ); pEmphasisEntry = 0; } else if(bLastEntryEmphasis && pLast) { - ImplShowTargetEmphasis( pLast, sal_False); + ImplShowTargetEmphasis( pLast, false); } bLastEntryEmphasis = false; } @@ -302,10 +302,10 @@ sal_Int8 SwGlobalTree::AcceptDrop( const AcceptDropEvent& rEvt ) nRet = DND_ACTION_LINK; if(pEmphasisEntry && pEmphasisEntry != pDropEntry) - ImplShowTargetEmphasis( Prev(pEmphasisEntry), sal_False ); + ImplShowTargetEmphasis( Prev(pEmphasisEntry), false ); else if(pLast && bLastEntryEmphasis && pDropEntry) { - ImplShowTargetEmphasis( pLast, sal_False); + ImplShowTargetEmphasis( pLast, false); bLastEntryEmphasis = false; } @@ -559,7 +559,7 @@ sal_Bool SwGlobalTree::NotifyCopying( SvTreeListEntry* /*pTarget*/, return sal_False; } -sal_Bool SwGlobalTree::NotifyAcceptDrop( SvTreeListEntry* pEntry) +bool SwGlobalTree::NotifyAcceptDrop( SvTreeListEntry* pEntry) { return pEntry != 0; } @@ -582,7 +582,7 @@ void SwGlobalTree::DragFinished( sal_Int8 nAction ) void SwGlobalTree::MouseButtonDown( const MouseEvent& rMEvt ) { Point aPos( rMEvt.GetPosPixel()); - SvTreeListEntry* pEntry = GetEntry( aPos, sal_True ); + SvTreeListEntry* pEntry = GetEntry( aPos, true ); if( !pEntry && rMEvt.IsLeft() && rMEvt.IsMod1() && (rMEvt.GetClicks() % 2) == 0) Control::MouseButtonDown( rMEvt ); else @@ -639,7 +639,7 @@ void SwGlobalTree::Display(bool bOnlyUpdateUserData) } else { - SetUpdateMode( sal_False ); + SetUpdateMode( false ); SvTreeListEntry* pOldSelEntry = FirstSelected(); OUString sEntryName; // Name of the entry sal_uLong nSelPos = TREELIST_ENTRY_NOTFOUND; @@ -682,7 +682,7 @@ void SwGlobalTree::Display(bool bOnlyUpdateUserData) break; } SvTreeListEntry* pEntry = InsertEntry(sEntry, aImage, aImage, - 0, sal_False, TREELIST_APPEND, pCont); + 0, false, TREELIST_APPEND, pCont); if(sEntry == sEntryName) { pSelEntry = pEntry; @@ -700,7 +700,7 @@ void SwGlobalTree::Display(bool bOnlyUpdateUserData) Select(First()); else SelectHdl(); - SetUpdateMode( sal_True ); + SetUpdateMode( true ); } } diff --git a/sw/source/core/uibase/utlui/navipi.cxx b/sw/source/core/uibase/utlui/navipi.cxx index 53e2c67c9d64..0bc04f1193fd 100644 --- a/sw/source/core/uibase/utlui/navipi.cxx +++ b/sw/source/core/uibase/utlui/navipi.cxx @@ -563,7 +563,7 @@ void SwNavigationPI::_ZoomOut() } SvTreeListEntry* pFirst = aContentTree.FirstSelected(); if(pFirst) - aContentTree.Select(pFirst, sal_True); // Enable toolbox + aContentTree.Select(pFirst, true); // Enable toolbox pConfig->SetSmall( sal_False ); aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX); } @@ -592,7 +592,7 @@ void SwNavigationPI::_ZoomIn() pFloat->SetOutputSizePixel(aSz); SvTreeListEntry* pFirst = aContentTree.FirstSelected(); if(pFirst) - aContentTree.Select(pFirst, sal_True); // Enable toolbox + aContentTree.Select(pFirst, true); // Enable toolbox pConfig->SetSmall( sal_True ); aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, false); } @@ -776,7 +776,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, aContentTree.SetDragDropMode( SV_DRAGDROP_CTRL_MOVE | SV_DRAGDROP_CTRL_COPY | SV_DRAGDROP_ENABLE_TOP ); - aContentTree.EnableAsyncDrag(sal_True); + aContentTree.EnableAsyncDrag(true); aContentTree.ShowTree(); aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, true); diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 2cf644655bea..b391a0f15ecb 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -254,12 +254,12 @@ IMPL_LINK( SwCondCollPage, AssignRemoveHdl, PushButton*, pBtn) if ( bAssEnabled ) sSel += m_pStyleLB->GetSelectEntry(); - m_pTbLinks->SetUpdateMode(sal_False); + m_pTbLinks->SetUpdateMode(false); m_pTbLinks->GetModel()->Remove(pE); pE = m_pTbLinks->InsertEntryToColumn(sSel, nPos); m_pTbLinks->Select(pE); m_pTbLinks->MakeVisible(pE); - m_pTbLinks->SetUpdateMode(sal_True); + m_pTbLinks->SetUpdateMode(true); return 0; } diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 3fc2b01c6d82..3ca25c94974c 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -1190,8 +1190,8 @@ DDListBox::DDListBox(Window* pParent, WinBits nStyle) SetStyle( GetStyle() | /*WB_HASBUTTONS|WB_HASBUTTONSATROOT|*/ WB_CLIPCHILDREN ); SetSelectionMode( SINGLE_SELECTION ); - SetDragDropMode( SV_DRAGDROP_CTRL_COPY ); - EnableAsyncDrag(sal_True); + SetDragDropMode( SV_DRAGDROP_CTRL_COPY ); + EnableAsyncDrag(true); // expand selection to the complete width of the ListBox SetHighlightRange(); Show(); diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 0ea22ff059b0..7c50ac050ae6 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -88,8 +88,8 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent, m_aTableLB.SetStyle( m_aTableLB.GetStyle() | WB_CLIPCHILDREN ); m_aTableLB.SetSpaceBetweenEntries(3); m_aTableLB.SetSelectionMode( SINGLE_SELECTION ); - m_aTableLB.SetDragDropMode( 0 ); - m_aTableLB.EnableAsyncDrag(sal_False); + m_aTableLB.SetDragDropMode( 0 ); + m_aTableLB.EnableAsyncDrag(false); m_aPreviewPB.SetClickHdl(LINK(this, SwSelectDBTableDialog, PreviewHdl)); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index b2394e9ddc9e..0443390cbf3d 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -657,7 +657,7 @@ IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) if(!bPasswdValid) { pEntry = pBox->FirstSelected(); - pBox->SelectAll( sal_False ); + pBox->SelectAll( false ); pBox->Select( pEntry ); GetFirstEntryHdl(pBox); return 0; diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 299f3b2fb2a0..372c6794ac63 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -94,7 +94,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet& ) Init(); // general initialisation // initialise TypeListBox - m_pTypeTLB->SetUpdateMode(sal_False); + m_pTypeTLB->SetUpdateMode(false); m_pTypeTLB->Clear(); pSelEntry = 0; @@ -192,7 +192,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet& ) if ( pSelEntry ) TypeHdl(); - m_pTypeTLB->SetUpdateMode(sal_True); + m_pTypeTLB->SetUpdateMode(true); m_pTypeTLB->SetSelectHdl(LINK(this, SwFldDokInfPage, TypeHdl)); m_pTypeTLB->SetDoubleClickHdl(LINK(this, SwFldDokInfPage, InsertHdl)); m_pSelectionLB->SetSelectHdl(LINK(this, SwFldDokInfPage, SubTypeHdl)); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 9236ef145cb0..0eb5cf156fb3 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -479,7 +479,7 @@ void SwFldRefPage::UpdateSubType() m_pSelectionLB->SetUpdateMode(false); m_pSelectionLB->Clear(); // #i83479# - m_pSelectionToolTipLB->SetUpdateMode(sal_False); + m_pSelectionToolTipLB->SetUpdateMode(false); m_pSelectionToolTipLB->Clear(); bool bShowSelectionToolTipLB( false ); @@ -632,7 +632,7 @@ void SwFldRefPage::UpdateSubType() m_pSelectionLB->Show( !bShowSelectionToolTipLB ); if ( bShowSelectionToolTipLB ) { - m_pSelectionToolTipLB->SetUpdateMode(sal_True); + m_pSelectionToolTipLB->SetUpdateMode(true); bool bEnable = m_pSelectionToolTipLB->GetEntryCount() != 0; m_pSelection->Enable( bEnable ); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 87e11099f8c3..eedcf5118dc0 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -664,7 +664,7 @@ IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl) ------------------------------------------------------------------------*/ void SwGlossaryDlg::Init() { - m_pCategoryBox->SetUpdateMode( sal_False ); + m_pCategoryBox->SetUpdateMode( false ); m_pCategoryBox->Clear(); // display text block regions const sal_uInt16 nCnt = pGlossaryHdl->GetGroupCnt(); @@ -743,7 +743,7 @@ void SwGlossaryDlg::Init() m_pCategoryBox->Resize(); m_pCategoryBox->GetModel()->Resort(); - m_pCategoryBox->SetUpdateMode( sal_True ); + m_pCategoryBox->SetUpdateMode( true ); m_pCategoryBox->Update(); const SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get(); @@ -926,7 +926,7 @@ DragDropMode SwGlTreeListBox::NotifyStartDrag( return eRet; } -sal_Bool SwGlTreeListBox::NotifyAcceptDrop( SvTreeListEntry* pEntry) +bool SwGlTreeListBox::NotifyAcceptDrop( SvTreeListEntry* pEntry) { // TODO: Readonly - check still missing! SvTreeListEntry* pSrcParent = GetParent(pEntry) ? GetParent(pEntry) : pEntry; |