From e8f8f24c8415898c787bbfb629247ed62e73a2b9 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 21 Feb 2014 12:53:51 +0100 Subject: vcl: sal_Bool -> bool Change-Id: I2a3e3d3e3266ea0f0fafdd91362076a4aa160f0e --- sfx2/inc/srchdlg.hxx | 2 +- sfx2/source/appl/newhelp.cxx | 10 ++++---- sfx2/source/appl/sfxhelp.cxx | 4 ++-- sfx2/source/control/thumbnailview.cxx | 10 ++++---- sfx2/source/dialog/backingcomp.cxx | 2 +- sfx2/source/dialog/basedlgs.cxx | 8 +++---- sfx2/source/dialog/dinfdlg.cxx | 4 ++-- sfx2/source/dialog/dockwin.cxx | 34 ++++++++++++++-------------- sfx2/source/dialog/navigat.cxx | 4 ++-- sfx2/source/dialog/printopt.cxx | 18 +++++++-------- sfx2/source/dialog/recfloat.cxx | 2 +- sfx2/source/dialog/securitypage.cxx | 6 ++--- sfx2/source/dialog/splitwin.cxx | 16 ++++++------- sfx2/source/dialog/srchdlg.cxx | 4 ++-- sfx2/source/dialog/taskpane.cxx | 6 ++--- sfx2/source/dialog/templdlg.cxx | 4 ++-- sfx2/source/doc/guisaveas.cxx | 2 +- sfx2/source/doc/new.cxx | 4 ++-- sfx2/source/doc/objcont.cxx | 2 +- sfx2/source/inc/recfloat.hxx | 2 +- sfx2/source/menu/virtmenu.cxx | 2 +- sfx2/source/sidebar/SidebarController.cxx | 8 +++---- sfx2/source/sidebar/SidebarDockingWindow.cxx | 6 ++--- sfx2/source/sidebar/SidebarDockingWindow.hxx | 2 +- sfx2/source/sidebar/TabBar.cxx | 6 ++--- sfx2/source/toolbox/tbxitem.cxx | 8 +++---- sfx2/source/view/ipclient.cxx | 2 +- sfx2/source/view/viewfrm.cxx | 6 ++--- sfx2/source/view/viewsh.cxx | 4 ++-- 29 files changed, 94 insertions(+), 94 deletions(-) (limited to 'sfx2') diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index 1e6bd3bb2f02..3adfb9f2bb17 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -73,7 +73,7 @@ public: void SetFocusOnEdit(); - virtual sal_Bool Close(); + virtual bool Close(); virtual void Move(); virtual void StateChanged( StateChangedType nStateChange ); }; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index a8dba1d974c7..2a1ebe90f8a0 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -470,8 +470,8 @@ IndexBox_Impl::IndexBox_Impl( Window* pParent, const ResId& rResId ) : ComboBox( pParent, rResId ) { - EnableAutocomplete( sal_True ); - EnableUserDraw( sal_True ); + EnableAutocomplete( true ); + EnableUserDraw( true ); } // ----------------------------------------------------------------------- @@ -490,7 +490,7 @@ void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) rUDEvt.GetDevice()->DrawText( aPos, ( nPos !=-1 ) ? aEntry.copy( nPos + 1 ) : aEntry ); } else - DrawEntry( rUDEvt, sal_False, sal_True, sal_True ); + DrawEntry( rUDEvt, false, true, true ); } // ----------------------------------------------------------------------- @@ -617,7 +617,7 @@ void IndexTabPage_Impl::InitializeIndex() append[k] = ' '; sfx2::KeywordInfo aInfo; - aIndexCB.SetUpdateMode( sal_False ); + aIndexCB.SetUpdateMode( false ); try { @@ -714,7 +714,7 @@ void IndexTabPage_Impl::InitializeIndex() OSL_FAIL( "IndexTabPage_Impl::InitializeIndex(): unexpected exception" ); } - aIndexCB.SetUpdateMode( sal_True ); + aIndexCB.SetUpdateMode( true ); if ( !sKeyword.isEmpty() ) aKeywordLink.Call( this ); diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 209de19721b3..59005019f08b 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -494,12 +494,12 @@ static bool impl_hasHelpInstalled( const OUString &rLang = OUString() ) return !aFactories.empty(); } -sal_Bool SfxHelp::SearchKeyword( const OUString& rKeyword ) +bool SfxHelp::SearchKeyword( const OUString& rKeyword ) { return Start_Impl( OUString(), NULL, rKeyword ); } -sal_Bool SfxHelp::Start( const OUString& rURL, const Window* pWindow ) +bool SfxHelp::Start( const OUString& rURL, const Window* pWindow ) { return Start_Impl( rURL, pWindow, OUString() ); } diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 300fc9f658b3..12a458f8c338 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -64,7 +64,7 @@ ThumbnailView::ThumbnailView (Window *pParent, WinBits nWinStyle, bool bDisableT ThumbnailView::~ThumbnailView() { com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> - xComponent(GetAccessible(sal_False), + xComponent(GetAccessible(false), com::sun::star::uno::UNO_QUERY); if (xComponent.is()) @@ -497,7 +497,7 @@ ThumbnailViewItem* ThumbnailView::ImplGetVisibleItem( sal_uInt16 nVisiblePos ) void ThumbnailView::ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue ) { - ThumbnailViewAcc* pAcc = ThumbnailViewAcc::getImplementation( GetAccessible( sal_False ) ); + ThumbnailViewAcc* pAcc = ThumbnailViewAcc::getImplementation( GetAccessible( false ) ); if( pAcc ) pAcc->FireAccessibleEvent( nEventId, rOldValue, rNewValue ); @@ -505,7 +505,7 @@ void ThumbnailView::ImplFireAccessibleEvent( short nEventId, const ::com::sun::s bool ThumbnailView::ImplHasAccessibleListeners() { - ThumbnailViewAcc* pAcc = ThumbnailViewAcc::getImplementation( GetAccessible( sal_False ) ); + ThumbnailViewAcc* pAcc = ThumbnailViewAcc::getImplementation( GetAccessible( false ) ); return( pAcc && pAcc->HasAccessibleListeners() ); } @@ -899,7 +899,7 @@ void ThumbnailView::GetFocus() } // Tell the accessible object that we got the focus. - ThumbnailViewAcc* pAcc = ThumbnailViewAcc::getImplementation( GetAccessible( sal_False ) ); + ThumbnailViewAcc* pAcc = ThumbnailViewAcc::getImplementation( GetAccessible( false ) ); if( pAcc ) pAcc->GetFocus(); @@ -913,7 +913,7 @@ void ThumbnailView::LoseFocus() Control::LoseFocus(); // Tell the accessible object that we lost the focus. - ThumbnailViewAcc* pAcc = ThumbnailViewAcc::getImplementation( GetAccessible( sal_False ) ); + ThumbnailViewAcc* pAcc = ThumbnailViewAcc::getImplementation( GetAccessible( false ) ); if( pAcc ) pAcc->LoseFocus(); } diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index 1e0e19bba4ac..e515b1483bfb 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -422,7 +422,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f // disable full screen mode of the frame! if (pParent && pParent->IsFullScreenMode()) { - pParent->ShowFullScreenMode(sal_False); + pParent->ShowFullScreenMode(false); pParent->SetMenuBarMode(MENUBAR_MODE_NORMAL); } diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 609f81af92b6..1e3f6d12f692 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -382,7 +382,7 @@ SfxModelessDialog::~SfxModelessDialog() //------------------------------------------------------------------------- -sal_Bool SfxModelessDialog::Close() +bool SfxModelessDialog::Close() /* [Description] @@ -398,7 +398,7 @@ sal_Bool SfxModelessDialog::Close() pBindings->GetDispatcher_Impl()->Execute( pImp->pMgr->GetType(), SFX_CALLMODE_RECORD|SFX_CALLMODE_SYNCHRON, &aValue, 0L ); - return sal_True; + return true; } //------------------------------------------------------------------------- @@ -497,7 +497,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, //------------------------------------------------------------------------- -sal_Bool SfxFloatingWindow::Close() +bool SfxFloatingWindow::Close() /* [Description] @@ -513,7 +513,7 @@ sal_Bool SfxFloatingWindow::Close() pBindings->GetDispatcher_Impl()->Execute( pImp->pMgr->GetType(), SFX_CALLMODE_RECORD|SFX_CALLMODE_SYNCHRON, &aValue, 0L ); - return sal_True; + return true; } // ----------------------------------------------------------------------- diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 7ee19bf4d9ef..e27c15fa072c 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1118,7 +1118,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet ) TriState eState = (TriState)m_bUseUserData; if ( STATE_DONTKNOW == eState ) - m_pUseUserDataCB->EnableTriState( sal_True ); + m_pUseUserDataCB->EnableTriState( true ); m_pUseUserDataCB->SetState( eState ); m_pUseUserDataCB->SaveValue(); @@ -2486,7 +2486,7 @@ void CmisPropertiesControl::checkAutoVScroll() return; if (nBits & WB_AUTOVSCROLL) { - sal_Bool bShow = m_rVertScroll.GetRangeMax() > m_rVertScroll.GetVisibleSize(); + bool bShow = m_rVertScroll.GetRangeMax() > m_rVertScroll.GetVisibleSize(); if (bShow != m_rVertScroll.IsVisible()) m_rVertScroll.Show(bShow); } diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 35c160776e40..be4ff1b51937 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -82,7 +82,7 @@ public: virtual bool Notify( NotifyEvent& rNEvt ); virtual void Resize(); virtual void Resizing( Size& rSize ); - virtual sal_Bool Close(); + virtual bool Close(); }; namespace @@ -303,7 +303,7 @@ void SfxTitleDockingWindow::Resizing( Size &rSize ) m_pWrappedWindow->SetSizePixel( GetOutputSizePixel() ); } -sal_Bool SfxTitleDockingWindow::Close() +bool SfxTitleDockingWindow::Close() { return SfxDockingWindow::Close(); } @@ -485,7 +485,7 @@ void SfxDockingWindow::Resize() //------------------------------------------------------------------------- -sal_Bool SfxDockingWindow::PrepareToggleFloatingMode() +bool SfxDockingWindow::PrepareToggleFloatingMode() /* [Description] @@ -498,19 +498,19 @@ sal_Bool SfxDockingWindow::PrepareToggleFloatingMode() { if (!pImp->bConstructed) - return sal_True; + return true; if ( (Application::IsInModalMode() && IsFloatingMode()) || !pMgr ) - return sal_False; + return false; if ( pImp->bDockingPrevented ) - return sal_False; + return false; if (!IsFloatingMode()) { // Test, if FloatingMode is permitted. if ( CheckAlignment(GetAlignment(),SFX_ALIGN_NOALIGNMENT) != SFX_ALIGN_NOALIGNMENT ) - return sal_False; + return false; if ( pImp->pSplitWin ) { @@ -525,15 +525,15 @@ sal_Bool SfxDockingWindow::PrepareToggleFloatingMode() // Test if it is allowed to dock, if (CheckAlignment(GetAlignment(),pImp->GetLastAlignment()) == SFX_ALIGN_NOALIGNMENT) - return sal_False; + return false; // Test, if the Workwindow allows for docking at the moment. SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl(); if ( !pWorkWin->IsDockingAllowed() || !pWorkWin->IsInternalDockingAllowed() ) - return sal_False; + return false; } - return sal_True; + return true; } //------------------------------------------------------------------------- @@ -656,7 +656,7 @@ void SfxDockingWindow::StartDocking() //------------------------------------------------------------------------- -sal_Bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect ) +bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect ) /* [Description] @@ -667,7 +667,7 @@ sal_Bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect ) */ { if ( Application::IsInModalMode() ) - return sal_True; + return true; if ( !pImp->bConstructed || !pMgr ) { @@ -677,7 +677,7 @@ sal_Bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect ) SfxWorkWindow *pWorkWin = pBindings->GetWorkWindow_Impl(); if ( pImp->bDockingPrevented || !pWorkWin->IsInternalDockingAllowed() ) - return sal_False; + return false; sal_Bool bFloatMode = sal_False; @@ -694,7 +694,7 @@ sal_Bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect ) // Mouse is not within OuterRect: must be FloatingWindow // Is this allowed? if (CheckAlignment(pImp->GetDockAlignment(),SFX_ALIGN_NOALIGNMENT) != SFX_ALIGN_NOALIGNMENT) - return sal_False; + return false; bFloatMode = sal_True; if ( SFX_ALIGN_NOALIGNMENT != pImp->GetDockAlignment() ) { @@ -1667,7 +1667,7 @@ SfxChildAlignment SfxDockingWindow::CheckAlignment(SfxChildAlignment, //------------------------------------------------------------------------- -sal_Bool SfxDockingWindow::Close() +bool SfxDockingWindow::Close() /* [Description] @@ -1679,12 +1679,12 @@ sal_Bool SfxDockingWindow::Close() { // Execute with Parameters, since Toggle is ignored by some ChildWindows. if ( !pMgr ) - return sal_True; + return true; SfxBoolItem aValue( pMgr->GetType(), false); pBindings->GetDispatcher_Impl()->Execute( pMgr->GetType(), SFX_CALLMODE_RECORD | SFX_CALLMODE_ASYNCHRON, &aValue, 0L ); - return sal_True; + return true; } //------------------------------------------------------------------------- diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index 423df7d9758e..31cebecbddef 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -72,14 +72,14 @@ void SfxNavigator::Resizing( Size &rSize ) pCon->Resizing( rSize ); } -sal_Bool SfxNavigator::Close() +bool SfxNavigator::Close() { SfxChildWindowContext *pCon = GetChildWindow_Impl()->GetContext_Impl(); DBG_ASSERT( pCon, "No Context!" ); if ( !pCon || pCon->Close() ) return SfxDockingWindow::Close(); else - return sal_False; + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index dcd496c5998e..8a01e66b2505 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -66,11 +66,11 @@ SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage( Window* pParent, con if( bOutputForPrinter ) { - m_pPrinterOutputRB->Check( sal_True ); + m_pPrinterOutputRB->Check( true ); } else { - m_pPrintFileOutputRB->Check( sal_True ); + m_pPrintFileOutputRB->Check( true ); m_pPDFCB->Disable(); } @@ -172,27 +172,27 @@ void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCu m_pReduceTransparencyCB->Check( pCurrentOptions->IsReduceTransparency() ); if( pCurrentOptions->GetReducedTransparencyMode() == PRINTER_TRANSPARENCY_AUTO ) - m_pReduceTransparencyAutoRB->Check( sal_True ); + m_pReduceTransparencyAutoRB->Check( true ); else - m_pReduceTransparencyNoneRB->Check( sal_True ); + m_pReduceTransparencyNoneRB->Check( true ); m_pReduceGradientsCB->Check( pCurrentOptions->IsReduceGradients() ); if( pCurrentOptions->GetReducedGradientMode() == PRINTER_GRADIENT_STRIPES ) - m_pReduceGradientsStripesRB->Check( sal_True ); + m_pReduceGradientsStripesRB->Check( true ); else - m_pReduceGradientsColorRB->Check( sal_True ); + m_pReduceGradientsColorRB->Check( true ); m_pReduceGradientsStepCountNF->SetValue( pCurrentOptions->GetReducedGradientStepCount() ); m_pReduceBitmapsCB->Check( pCurrentOptions->IsReduceBitmaps() ); if( pCurrentOptions->GetReducedBitmapMode() == PRINTER_BITMAP_OPTIMAL ) - m_pReduceBitmapsOptimalRB->Check( sal_True ); + m_pReduceBitmapsOptimalRB->Check( true ); else if( pCurrentOptions->GetReducedBitmapMode() == PRINTER_BITMAP_NORMAL ) - m_pReduceBitmapsNormalRB->Check( sal_True ); + m_pReduceBitmapsNormalRB->Check( true ); else - m_pReduceBitmapsResolutionRB->Check( sal_True ); + m_pReduceBitmapsResolutionRB->Check( true ); const sal_uInt16 nDPI = pCurrentOptions->GetReducedBitmapResolution(); diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index b60e37848f4d..a9d91171ac6e 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -216,7 +216,7 @@ SfxRecordingFloat_Impl::~SfxRecordingFloat_Impl() } } -sal_Bool SfxRecordingFloat_Impl::Close() +bool SfxRecordingFloat_Impl::Close() { sal_Bool bRet = SfxFloatingWindow::Close(); return bRet; diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index 4b45f68d3829..33ac0bda80ca 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -314,10 +314,10 @@ void SfxSecurityPage_Impl::Reset_Impl( const SfxItemSet & ) // A Calc document that is shared will have 'm_eRedlingMode == RL_NONE' // In shared documents change recording and protection must be disabled, // similar to documents that do not support change recording at all. - m_pRecordChangesCB->Check( sal_False ); + m_pRecordChangesCB->Check( false ); m_pRecordChangesCB->Disable(); - m_pProtectPB->Check( sal_False ); - m_pUnProtectPB->Check( sal_False ); + m_pProtectPB->Check( false ); + m_pUnProtectPB->Check( false ); m_pProtectPB->Disable(); m_pUnProtectPB->Disable(); } diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index f229df6e8fe5..2b9847da4f63 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -60,7 +60,7 @@ namespace { { if ( mbUpdateMode ) { - mrSplitWindow.SetUpdateMode( sal_False ); + mrSplitWindow.SetUpdateMode( false ); } } @@ -68,7 +68,7 @@ namespace { { if ( mbUpdateMode ) { - mrSplitWindow.SetUpdateMode( sal_True ); + mrSplitWindow.SetUpdateMode( true ); } } @@ -132,7 +132,7 @@ friend class SfxSplitWindow; SetAlign( pOwner->GetAlign() ); Actualize(); ShowAutoHideButton( pOwner->IsAutoHideButtonVisible() ); - ShowFadeInHideButton( sal_True ); + ShowFadeInHideButton( true ); } ~SfxEmptySplitWin_Impl() @@ -227,8 +227,8 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, { if ( bWithButtons ) { - ShowAutoHideButton( sal_False ); // no autohide button (pin) anymore - ShowFadeOutButton( sal_True ); + ShowAutoHideButton( false ); // no autohide button (pin) anymore + ShowFadeOutButton( true ); } // Set SV-Alignment @@ -1014,7 +1014,7 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer) pEmptyWin->bEndAutoHide = sal_False; if ( !Application::IsInModalMode() && !PopupMenu::IsInExecute() && - !pEmptyWin->bSplit && !HasChildPathFocus( sal_True ) ) + !pEmptyWin->bSplit && !HasChildPathFocus( true ) ) { // While a modal dialog or a popup menu is open or while the // Splitting is done, in any case, do not close. Even as long @@ -1139,7 +1139,7 @@ void SfxSplitWindow::SetPinned_Impl( sal_Bool bOn ) Point aPos( GetPosPixel() ); aPos = GetParent()->OutputToScreenPixel( aPos ); SetFloatingPos( aPos ); - SetFloatingMode( sal_True ); + SetFloatingMode( true ); GetFloatingWindow()->SetOutputSizePixel( GetOutputSizePixel() ); if ( pEmptyWin->bFadeIn ) @@ -1149,7 +1149,7 @@ void SfxSplitWindow::SetPinned_Impl( sal_Bool bOn ) { pEmptyWin->nState &= ~1; SetOutputSizePixel( GetFloatingWindow()->GetOutputSizePixel() ); - SetFloatingMode( sal_False ); + SetFloatingMode( false ); if ( pEmptyWin->bFadeIn ) { diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index 6fe71ea9cfe0..324de6c3b269 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -92,7 +92,7 @@ void SearchDialog::LoadConfig() } } else - m_pWrapAroundBox->Check( sal_True ); + m_pWrapAroundBox->Check( true ); } void SearchDialog::SaveConfig() @@ -139,7 +139,7 @@ void SearchDialog::SetFocusOnEdit() m_pSearchEdit->GrabFocus(); } -sal_Bool SearchDialog::Close() +bool SearchDialog::Close() { sal_Bool bRet = ModelessDialog::Close(); m_aCloseHdl.Call( this ); diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index b7307f8da04a..48db4d06e10b 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -1021,11 +1021,11 @@ namespace sfx2 switch ( i_pMenu->GetCurItemId() ) { case MID_UNLOCK_TASK_PANEL: - m_rDockingWindow.SetFloatingMode( sal_True ); + m_rDockingWindow.SetFloatingMode( true ); break; case MID_LOCK_TASK_PANEL: - m_rDockingWindow.SetFloatingMode( sal_False ); + m_rDockingWindow.SetFloatingMode( false ); break; case MID_LAYOUT_DRAWERS: @@ -1246,7 +1246,7 @@ namespace sfx2 SfxResId( STR_SFX_UNDOCK ).toString() ); - pMenu->RemoveDisabledEntries( sal_False, sal_False ); + pMenu->RemoveDisabledEntries( false, false ); return pMenu; } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 764661ddcc30..fbb51f8844b5 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -1298,7 +1298,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) if((nFlags & UPDATE_FAMILY) == UPDATE_FAMILY) // Update view type list (Hierarchical, All, etc. { CheckItem(nActFamily, sal_True); // check Button in Toolbox - aFilterLb.SetUpdateMode(sal_False); + aFilterLb.SetUpdateMode(false); aFilterLb.Clear(); //insert hierarchical at the beginning sal_uInt16 nPos = aFilterLb.InsertEntry(SfxResId(STR_STYLE_FILTER_HIERARCHICAL).toString(), 0); @@ -1330,7 +1330,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) // show maximum 14 entries aFilterLb.SetDropDownLineCount( MAX_FILTER_ENTRIES ); - aFilterLb.SetUpdateMode(sal_True); + aFilterLb.SetUpdateMode(true); } else { diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 47f44a3b5f48..32d1c5773371 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -1713,7 +1713,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel // Launch PDF viewer if ( nStoreMode & PDFEXPORT_REQUESTED ) { FilterConfigItem aItem( "Office.Common/Filter/PDF/Export/" ); - sal_Bool aViewPDF = aItem.ReadBool( "ViewPDFAfterExport", sal_False ); + sal_Bool aViewPDF = aItem.ReadBool( "ViewPDFAfterExport", false ); if ( aViewPDF==sal_True ) { uno::Reference xSystemShellExecute(SystemShellExecute::create( ::comphelper::getProcessComponentContext() ) ); diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index efb8bc5eb099..13417a5d5265 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -282,7 +282,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox *, pBox ) const sal_uInt16 nRegion = pBox->GetSelectEntryPos(); const sal_uInt16 nCount = aTemplates.GetRegionCount()? aTemplates.GetCount(nRegion): 0; - aTemplateLb.SetUpdateMode(sal_False); + aTemplateLb.SetUpdateMode(false); aTemplateLb.Clear(); OUString aSel = aRegionLb.GetSelectEntry(); sal_Int32 nc = aSel.indexOf('('); @@ -293,7 +293,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox *, pBox ) for (sal_uInt16 i = 0; i < nCount; ++i) aTemplateLb.InsertEntry(aTemplates.GetName(nRegion, i)); aTemplateLb.SelectEntryPos(0); - aTemplateLb.SetUpdateMode(sal_True); + aTemplateLb.SetUpdateMode(true); aTemplateLb.Invalidate(); aTemplateLb.Update(); TemplateSelect(&aTemplateLb); diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 250976621077..31bb6c819372 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -127,7 +127,7 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const ::boost::shared_ptr pFile(new GDIMetaFile); VirtualDevice aDevice; - aDevice.EnableOutput( sal_False ); + aDevice.EnableOutput( false ); MapMode aMode( ((SfxObjectShell*)this)->GetMapUnit() ); aDevice.SetMapMode( aMode ); diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx index 18b7f9bd644a..dfb3a59ac56d 100644 --- a/sfx2/source/inc/recfloat.hxx +++ b/sfx2/source/inc/recfloat.hxx @@ -46,7 +46,7 @@ public: SfxChildWindow* pChildWin , Window* pParent ); virtual ~SfxRecordingFloat_Impl(); - virtual sal_Bool Close(); + virtual bool Close(); virtual void FillInfo( SfxChildWinInfo& rInfo ) const; virtual void StateChanged( StateChangedType nStateChange ); diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 507b647572b8..8f1a3a1319e3 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -101,7 +101,7 @@ void SfxMenuImageControl_Impl::Update() const SfxSlot* pSlot = pPool->GetSlot( nslotId ); if ( pSlot && pSlot->IsMode( SFX_SLOT_IMAGEROTATION ) ) { - pSVMenu->SetItemImageMirrorMode( nslotId, sal_False ); + pSVMenu->SetItemImageMirrorMode( nslotId, false ); pSVMenu->SetItemImageAngle( nslotId, lRotation ); } diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 8d86e65132c1..cac4b7ea8d3a 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -913,7 +913,7 @@ void SidebarController::ShowPopupMenu ( { // Don't allow the currently visible deck to be disabled. pCustomizationMenu->InsertItem(nSubMenuIndex, iItem->msDisplayName, MIB_RADIOCHECK); - pCustomizationMenu->CheckItem(nSubMenuIndex, sal_True); + pCustomizationMenu->CheckItem(nSubMenuIndex, true); } else { @@ -936,7 +936,7 @@ void SidebarController::ShowPopupMenu ( pMenu->InsertItem(MID_CUSTOMIZATION, SFX2_RESSTR(STRING_CUSTOMIZATION)); pMenu->SetPopupMenu(MID_CUSTOMIZATION, pCustomizationMenu); - pMenu->RemoveDisabledEntries(sal_False, sal_False); + pMenu->RemoveDisabledEntries(false, false); return pMenu; } @@ -957,11 +957,11 @@ IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu) switch (nIndex) { case MID_UNLOCK_TASK_PANEL: - mpParentWindow->SetFloatingMode(sal_True); + mpParentWindow->SetFloatingMode(true); break; case MID_LOCK_TASK_PANEL: - mpParentWindow->SetFloatingMode(sal_False); + mpParentWindow->SetFloatingMode(false); break; case MID_RESTORE_DEFAULT: diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx index 9a87d6791082..a8c0441c41c0 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.cxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx @@ -87,16 +87,16 @@ SfxChildWindow* SidebarDockingWindow::GetChildWindow (void) -sal_Bool SidebarDockingWindow::Close (void) +bool SidebarDockingWindow::Close (void) { if (mpSidebarController.is()) { // Do not close the floating window. // Dock it and close just the deck instead. - SetFloatingMode(sal_False); + SetFloatingMode(false); mpSidebarController->RequestCloseDeck(); mpSidebarController->NotifyResize(); - return sal_False; + return false; } else return SfxDockingWindow::Close(); diff --git a/sfx2/source/sidebar/SidebarDockingWindow.hxx b/sfx2/source/sidebar/SidebarDockingWindow.hxx index d8078de68806..5a1aea82d534 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.hxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.hxx @@ -40,7 +40,7 @@ public: WinBits nBits); virtual ~SidebarDockingWindow (void); - virtual sal_Bool Close (void); + virtual bool Close (void); SfxChildWindow* GetChildWindow (void); diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 1a81b6d293df..29b377fdccc8 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -242,9 +242,9 @@ void TabBar::HighlightDeck (const ::rtl::OUString& rsDeckId) ++iItem) { if (iItem->msDeckId.equals(rsDeckId)) - iItem->mpButton->Check(sal_True); + iItem->mpButton->Check(true); else - iItem->mpButton->Check(sal_False); + iItem->mpButton->Check(false); } } @@ -404,7 +404,7 @@ IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG) mpMenuButton->GetPosPixel(), mpMenuButton->GetSizePixel()), aMenuData); - mpMenuButton->Check(sal_False); + mpMenuButton->Check(false); return 0; } diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 99dc1f0b7a6d..b51353c97617 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -1285,13 +1285,13 @@ void SfxPopupWindow::AddStatusListener( const OUString& rCommandURL ) //-------------------------------------------------------------------- -sal_Bool SfxPopupWindow::Close() +bool SfxPopupWindow::Close() { m_bFloating = sal_False; FloatingWindow::Close(); Delete(); - return sal_True; + return true; } //-------------------------------------------------------------------- @@ -1448,13 +1448,13 @@ SfxPopupWindow* SfxRecentFilesToolBoxControl::CreatePopupWindow() { xPopupController->setPopupMenu( xPopupMenu ); - rBox.SetItemDown( nItemId, sal_True ); + rBox.SetItemDown( nItemId, true ); Reference< awt::XWindowPeer > xPeer( getParent(), uno::UNO_QUERY ); if ( xPeer.is() ) xPopupMenu->execute( xPeer, VCLUnoHelper::ConvertToAWTRect( aRect ), 0 ); - rBox.SetItemDown( nItemId, sal_False ); + rBox.SetItemDown( nItemId, false ); } return 0; diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 19d61a51304f..98c61b4c8902 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -1046,7 +1046,7 @@ void SfxInPlaceClient::DeactivateObject() if ( xController.is() ) { Window* pWindow = VCLUnoHelper::GetWindow( xController->getFrame()->getContainerWindow() ); - bHasFocus = pWindow->HasChildPathFocus( sal_True ); + bHasFocus = pWindow->HasChildPathFocus( true ); } } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 4fdea3d050a7..2d39b8805e69 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1079,7 +1079,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl() DBG_ASSERT( xObjSh.Is(), "no SfxObjectShell to release!" ); GetFrame().ReleasingComponent_Impl( sal_True ); - if ( GetWindow().HasChildPathFocus( sal_True ) ) + if ( GetWindow().HasChildPathFocus( true ) ) { DBG_ASSERT( !GetActiveChildFrame_Impl(), "Wrong active child frame!" ); GetWindow().GrabFocus(); @@ -1708,7 +1708,7 @@ void SfxViewFrame::Enable( sal_Bool bEnable ) if ( !bEnable ) pImp->bWindowWasEnabled = pWindow->IsInputEnabled(); if ( !bEnable || pImp->bWindowWasEnabled ) - pWindow->EnableInput( bEnable, sal_True ); + pWindow->EnableInput( bEnable, true ); } // cursor and focus @@ -2916,7 +2916,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) } } - sal_Bool bNewFullScreenMode = pItem ? pItem->GetValue() : !pWork->IsFullScreenMode(); + bool bNewFullScreenMode = pItem ? pItem->GetValue() : !pWork->IsFullScreenMode(); if ( bNewFullScreenMode != pWork->IsFullScreenMode() ) { Reference< ::com::sun::star::beans::XPropertySet > xLMPropSet( xLayoutManager, UNO_QUERY ); diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 10d58803375b..f7a83e3319a8 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -1206,13 +1206,13 @@ void SfxViewShell::SetWindow DiscardClients_Impl(); // Switch View-Port - sal_Bool bHadFocus = pWindow ? pWindow->HasChildPathFocus( sal_True ) : sal_False; + sal_Bool bHadFocus = pWindow ? pWindow->HasChildPathFocus( true ) : sal_False; pWindow = pViewPort; if( pWindow ) { // Disable automatic GUI mirroring (right-to-left) for document windows - pWindow->EnableRTL( sal_False ); + pWindow->EnableRTL( false ); } if ( bHadFocus && pWindow ) -- cgit