diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-19 09:01:06 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-19 09:21:24 +0200 |
commit | 9278df2c21fed09b6b10465ca33b227ad7c49b41 (patch) | |
tree | 5dc447f593f0244e7e8c5848a8da34f25cc4aa41 /sfx2 | |
parent | 16752a8a773cf8096e28628237238a562016c4e5 (diff) |
sfx2: sal_Bool->bool
Change-Id: I73acb3a150b01114d32274a6842f6db9654b3e63
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/appmisc.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/appopen.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/sfxpicklist.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objserv.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objxtor.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/doc/printhelper.cxx | 14 | ||||
-rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/view/frame2.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm.cxx | 202 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm2.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/view/viewprn.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/view/viewsh.cxx | 78 |
13 files changed, 173 insertions, 173 deletions
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index d1c64c1f01d4..01402bb06bb5 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -131,7 +131,7 @@ SfxModule* SfxApplication::GetModule_Impl() { SfxModule* pModule = SfxModule::GetActiveModule(); if ( !pModule ) - pModule = SfxModule::GetActiveModule( SfxViewFrame::GetFirst( 0, sal_False ) ); + pModule = SfxModule::GetActiveModule( SfxViewFrame::GetFirst( 0, false ) ); if( pModule ) return pModule; else diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 57f383d197ac..2e73c243794d 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -1122,7 +1122,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { // try to find the SfxFrame for the controller SfxFrame* pCntrFrame = NULL; - for ( SfxViewShell* pShell = SfxViewShell::GetFirst( 0, sal_False ); pShell; pShell = SfxViewShell::GetNext( *pShell, 0, sal_False ) ) + for ( SfxViewShell* pShell = SfxViewShell::GetFirst( 0, false ); pShell; pShell = SfxViewShell::GetNext( *pShell, 0, false ) ) { if ( pShell->GetController() == xController ) { diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index fa2a848a8987..3752887eaac3 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -183,7 +183,7 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) return; // ignore hidden documents - if ( !SfxViewFrame::GetFirst( pDocSh, sal_True ) ) + if ( !SfxViewFrame::GetFirst( pDocSh, true ) ) return; OUString aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST); diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index d9b109dadda4..6b5544cf06aa 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1274,7 +1274,7 @@ void SfxObjectShell::ExecView_Impl(SfxRequest &rReq) { case SID_ACTIVATE: { - SfxViewFrame *pFrame = SfxViewFrame::GetFirst( this, sal_True ); + SfxViewFrame *pFrame = SfxViewFrame::GetFirst( this, true ); if ( pFrame ) pFrame->GetFrame().Appear(); rReq.SetReturnValue( SfxObjectItem( 0, pFrame ) ); diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 2d14e61ba26c..84b16e49f7be 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -495,7 +495,7 @@ SfxObjectShell* SfxObjectShell::GetFirst continue; if ( ( !pType || pSh->IsA(*pType) ) && - ( !bOnlyVisible || SfxViewFrame::GetFirst( pSh, sal_True ))) + ( !bOnlyVisible || SfxViewFrame::GetFirst( pSh, true ))) return pSh; } @@ -528,7 +528,7 @@ SfxObjectShell* SfxObjectShell::GetNext continue; if ( ( !pType || pSh->IsA(*pType) ) && - ( !bOnlyVisible || SfxViewFrame::GetFirst( pSh, sal_True ))) + ( !bOnlyVisible || SfxViewFrame::GetFirst( pSh, true ))) return pSh; } return 0; diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index d92a31fb80b1..2b1c529862d2 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -260,17 +260,17 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SfxPrintHelper::getPrinter() thro // search for any view of this document that is currently printing const Printer *pPrinter = NULL; - SfxViewFrame *pViewFrm = m_pData->m_pObjectShell.Is() ? SfxViewFrame::GetFirst( m_pData->m_pObjectShell, sal_False ) : 0; + SfxViewFrame *pViewFrm = m_pData->m_pObjectShell.Is() ? SfxViewFrame::GetFirst( m_pData->m_pObjectShell, false ) : 0; SfxViewFrame* pFirst = pViewFrm; while ( pViewFrm && !pPrinter ) { pPrinter = pViewFrm->GetViewShell()->GetActivePrinter(); - pViewFrm = SfxViewFrame::GetNext( *pViewFrm, m_pData->m_pObjectShell, sal_False ); + pViewFrm = SfxViewFrame::GetNext( *pViewFrm, m_pData->m_pObjectShell, false ); } // if no view is printing currently, use the permanent SfxPrinter instance if ( !pPrinter && pFirst ) - pPrinter = pFirst->GetViewShell()->GetPrinter(sal_True); + pPrinter = pFirst->GetViewShell()->GetPrinter(true); if ( !pPrinter ) return uno::Sequence< beans::PropertyValue >(); @@ -317,12 +317,12 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue > { // Get old Printer SfxViewFrame *pViewFrm = m_pData->m_pObjectShell.Is() ? - SfxViewFrame::GetFirst( m_pData->m_pObjectShell, sal_False ) : 0; + SfxViewFrame::GetFirst( m_pData->m_pObjectShell, false ) : 0; if ( !pViewFrm ) return; pViewSh = pViewFrm->GetViewShell(); - pPrinter = pViewSh->GetPrinter(sal_True); + pPrinter = pViewSh->GetPrinter(true); if ( !pPrinter ) return; @@ -592,7 +592,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& // get view for sfx printing capabilities SfxViewFrame *pViewFrm = m_pData->m_pObjectShell.Is() ? - SfxViewFrame::GetFirst( m_pData->m_pObjectShell, sal_False ) : 0; + SfxViewFrame::GetFirst( m_pData->m_pObjectShell, false ) : 0; if ( !pViewFrm ) return; SfxViewShell* pView = pViewFrm->GetViewShell(); @@ -765,7 +765,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& // It doesn'tmatter if it is a real printer used or we print to a local file // nor if we print to a temp file and move it afterwards by using the ucb. // That will be handled later. see pUCBPrintFile below! - pView->ExecPrint( aCheckedArgs, sal_True, sal_False ); + pView->ExecPrint( aCheckedArgs, true, false ); // Ok - may be execution before has finished (or started!) printing. // And may it was a printing to a file. diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 7fc23cb4ea3a..9881346341f1 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -3652,7 +3652,7 @@ void SAL_CALL SfxBaseModel::setVisualAreaSize( sal_Int64 nAspect, const awt::Siz if ( !m_pData->m_pObjectShell.Is() ) throw Exception(); // TODO: error handling - SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst( m_pData->m_pObjectShell, sal_False ); + SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst( m_pData->m_pObjectShell, false ); if ( pViewFrm && m_pData->m_pObjectShell->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED && !pViewFrm->GetFrame().IsInPlace() ) { Window* pWindow = VCLUnoHelper::GetWindow( pViewFrm->GetFrame().GetFrameInterface()->getContainerWindow() ); @@ -4206,9 +4206,9 @@ namespace sfx { namespace intern { SfxViewFrame* SfxBaseModel::FindOrCreateViewFrame_Impl( const Reference< XFrame >& i_rFrame, ::sfx::intern::ViewCreationGuard& i_rGuard ) const { SfxViewFrame* pViewFrame = NULL; - for ( pViewFrame = SfxViewFrame::GetFirst( GetObjectShell(), sal_False ); + for ( pViewFrame = SfxViewFrame::GetFirst( GetObjectShell(), false ); pViewFrame; - pViewFrame= SfxViewFrame::GetNext( *pViewFrame, GetObjectShell(), sal_False ) + pViewFrame= SfxViewFrame::GetNext( *pViewFrame, GetObjectShell(), false ) ) { if ( pViewFrame->GetFrame().GetFrameInterface() == i_rFrame ) @@ -4320,7 +4320,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController( const sal_Int16 nPluginMode = aDocumentLoadArgs.getOrDefault( "PluginMode", sal_Int16( 0 ) ); if ( nPluginMode == 1 ) { - pViewFrame->ForceOuterResize_Impl( sal_False ); + pViewFrame->ForceOuterResize_Impl( false ); pViewFrame->GetBindings().HidePopups( true ); SfxFrame& rFrame = pViewFrame->GetFrame(); diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 880b81ac2c3f..39bb8d273e41 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -111,7 +111,7 @@ bool SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) if ( pView->GetViewShell() && !pView->GetViewShell()->GetUIActiveIPClient_Impl() && !pFrame->IsInPlace() ) { OSL_TRACE("SfxFrame: GotFocus"); - pView->MakeActive_Impl( sal_False ); + pView->MakeActive_Impl( false ); } // if focus was on an external window, the clipboard content might have been changed @@ -126,12 +126,12 @@ bool SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) } else if ( rNEvt.GetType() == EVENT_EXECUTEDIALOG /*|| rNEvt.GetType() == EVENT_INPUTDISABLE*/ ) { - pView->SetModalMode( sal_True ); + pView->SetModalMode( true ); return true; } else if ( rNEvt.GetType() == EVENT_ENDEXECUTEDIALOG /*|| rNEvt.GetType() == EVENT_INPUTENABLE*/ ) { - pView->SetModalMode( sal_False ); + pView->SetModalMode( false ); return true; } @@ -175,7 +175,7 @@ bool SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt ) void SfxFrameWindow_Impl::GetFocus() { if ( pFrame && !pFrame->IsClosing_Impl() && pFrame->GetCurrentViewFrame() && pFrame->GetFrameInterface().is() ) - pFrame->GetCurrentViewFrame()->MakeActive_Impl( sal_True ); + pFrame->GetCurrentViewFrame()->MakeActive_Impl( true ); } void SfxFrameWindow_Impl::Resize() diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index a8b8d97ed625..641d43c2d3b2 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -360,7 +360,7 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::queryClosing( const la SfxViewShell* pShell = m_pController->GetViewShell_Impl(); if (pShell) { - bool bCanClose = pShell->PrepareClose( sal_False ); + bool bCanClose = pShell->PrepareClose( false ); if ( !bCanClose ) { if ( bDeliverOwnership && ( !pShell->GetWindow() || !pShell->GetWindow()->IsReallyVisible() ) ) @@ -448,7 +448,7 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const frame::F if ( aEvent.Action == frame::FrameAction_FRAME_UI_ACTIVATED ) { if ( !m_pController->GetViewShell_Impl()->GetUIActiveIPClient_Impl() ) - m_pController->GetViewShell_Impl()->GetViewFrame()->MakeActive_Impl( sal_False ); + m_pController->GetViewShell_Impl()->GetViewFrame()->MakeActive_Impl( false ); } else if ( aEvent.Action == frame::FrameAction_CONTEXT_CHANGED ) { @@ -727,7 +727,7 @@ Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const { SfxViewFrame *pFrame = m_pData->m_pViewShell->GetViewFrame(); if ( eSearchFlags & ( frame::FrameSearchFlag::CREATE )) - pFrame->SetChildWindow( SID_BROWSER, sal_True ); + pFrame->SetChildWindow( SID_BROWSER, true ); SfxChildWindow* pChildWin = pFrame->GetChildWindow( SID_BROWSER ); Reference < frame::XFrame > xFrame; if ( pChildWin ) @@ -1322,7 +1322,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) // force resize for OLE server to fix layout problems of writer and math // see i53651 if ( nPluginMode == 3 ) - pViewFrame->Resize( sal_True ); + pViewFrame->Resize( true ); } } else @@ -1335,7 +1335,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) pViewFrame->UpdateTitle(); if ( !rFrame.IsInPlace() ) - pViewFrame->Resize( sal_True ); + pViewFrame->Resize( true ); // if there's a JumpMark given, then, well, jump to it ::comphelper::NamedValueCollection aViewArgs( getCreationArguments() ); @@ -1398,7 +1398,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) Sequence< PropertyValue > aViewData; OSL_VERIFY( xViewData->getByIndex( nViewDataIndex ) >>= aViewData ); if ( aViewData.getLength() > 0 ) - m_pData->m_pViewShell->ReadUserDataSequence( aViewData, sal_True ); + m_pData->m_pViewShell->ReadUserDataSequence( aViewData, true ); } } catch (const Exception&) diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 1a5f1ec4e266..9e830f16793f 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -177,21 +177,21 @@ namespace } -static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHandler >& xHandler, const OUString& aPath, const SfxFilter* pFilter, sal_uInt32 nPasswordHash, const uno::Sequence< beans::PropertyValue > aInfo ) +static bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHandler >& xHandler, const OUString& aPath, const SfxFilter* pFilter, sal_uInt32 nPasswordHash, const uno::Sequence< beans::PropertyValue > aInfo ) { // TODO/LATER: In future the info should replace the direct hash completely - sal_Bool bResult = ( !nPasswordHash && !aInfo.getLength() ); + bool bResult = ( !nPasswordHash && !aInfo.getLength() ); OSL_ENSURE( pFilter && ( pFilter->GetFilterFlags() & SFX_FILTER_PASSWORDTOMODIFY ), "PasswordToModify feature is active for a filter that does not support it!" ); if ( pFilter && xHandler.is() ) { - sal_Bool bCancel = sal_False; - sal_Bool bFirstTime = sal_True; + bool bCancel = false; + bool bFirstTime = true; while ( !bResult && !bCancel ) { - sal_Bool bMSType = !pFilter->IsOwnFormat(); + bool bMSType = !pFilter->IsOwnFormat(); ::rtl::Reference< ::comphelper::DocPasswordRequest > pPasswordRequest( new ::comphelper::DocPasswordRequest( @@ -216,9 +216,9 @@ static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteracti } } else - bCancel = sal_True; + bCancel = true; - bFirstTime = sal_False; + bFirstTime = false; } } @@ -228,11 +228,11 @@ static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteracti void SfxViewFrame::SetDowning_Impl() { - pImp->bIsDowning = sal_True; + pImp->bIsDowning = true; } -sal_Bool SfxViewFrame::IsDowning_Impl() const +bool SfxViewFrame::IsDowning_Impl() const { return pImp->bIsDowning; } @@ -305,7 +305,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SfxFrame& rFrame = GetFrame(); if ( pParent == &rFrame && rFrame.GetChildFrameCount() ) { - sal_Bool bReloadAvailable = sal_False; + bool bReloadAvailable = false; SfxFrameIterator aIter( rFrame, false ); SfxFrame *pChild = aIter.FirstFrame(); while ( pChild ) @@ -314,7 +314,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SfxObjectShell *pShell = pChild->GetCurrentDocument(); if( pShell && pShell->Get_Impl()->bReloadAvailable ) { - bReloadAvailable = sal_True; + bReloadAvailable = true; pChild->GetCurrentViewFrame()->ExecuteSlot( rReq ); } pChild = pNext; @@ -382,7 +382,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) } sal_uInt16 nOpenMode; - sal_Bool bNeedsReload = sal_False; + bool bNeedsReload = false; if ( !pSh->IsReadOnly() ) { // Save and reload Readonly @@ -392,7 +392,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) { // the storing could let the medium be changed pMed = pSh->GetMedium(); - bNeedsReload = sal_True; + bNeedsReload = true; } else { @@ -463,10 +463,10 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) || pMed->IsRemote() ) ) || pVersionItem ) { - sal_Bool bOK = sal_False; + bool bOK = false; if ( !pVersionItem ) { - sal_Bool bHasStorage = pMed->HasStorage_Impl(); + bool bHasStorage = pMed->HasStorage_Impl(); // switching edit mode could be possible without reload if ( bHasStorage && pMed->GetStorage() == pSh->GetStorage() ) { @@ -487,7 +487,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) pMed->GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, !( nOpenMode & STREAM_WRITE ) ) ); if ( !pMed->GetErrorCode() ) - bOK = sal_True; + bOK = true; } if( !bOK ) @@ -580,11 +580,11 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) return; SfxObjectShellLock xOldObj( pSh ); - pImp->bReloading = sal_True; + pImp->bReloading = true; SFX_REQUEST_ARG(rReq, pURLItem, SfxStringItem, SID_FILE_NAME, false); // Open as editable? - sal_Bool bForEdit = !pSh->IsReadOnly(); + bool bForEdit = !pSh->IsReadOnly(); // If possible ask the User bool bDo = GetViewShell()->PrepareClose(); @@ -607,7 +607,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) else aURL = pMedium->GetName(); - sal_Bool bHandsOff = + bool bHandsOff = ( pMedium->GetURLObject().GetProtocol() == INET_PROT_FILE && !xOldObj->IsDocShared() ); // Emty existing SfxMDIFrames for this Document @@ -723,7 +723,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSavedOptions, SfxStringItem, SID_FILE_FILTEROPTIONS, false); SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSavedReferer, SfxStringItem, SID_REFERER, false); - sal_Bool bHasStorage = pMedium->HasStorage_Impl(); + bool bHasStorage = pMedium->HasStorage_Impl(); if( bHandsOff ) { if ( bHasStorage && pMedium->GetStorage() == xOldObj->GetStorage() ) @@ -830,7 +830,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) while ( !aViewFrames.empty() ) { Reference< util::XCloseable > xClose( aViewFrames.front().first, UNO_QUERY_THROW ); - xClose->close( sal_True ); + xClose->close( true ); aViewFrames.pop_front(); } } @@ -849,7 +849,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) // Record as not done rReq.Done(); rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), false)); - pImp->bReloading = sal_False; + pImp->bReloading = false; return; } } @@ -904,7 +904,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet ) { // If any ChildFrame is reloadable, the slot is enabled, // so you can perfom CTRL-Reload - sal_Bool bReloadAvailable = sal_False; + bool bReloadAvailable = false; SfxFrameIterator aFrameIter( *pFrame, true ); for( SfxFrame* pNextFrame = aFrameIter.FirstFrame(); pFrame; @@ -914,7 +914,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet ) SfxObjectShell *pShell = pFrame->GetCurrentDocument(); if( pShell && pShell->Get_Impl()->bReloadAvailable ) { - bReloadAvailable = sal_True; + bReloadAvailable = true; break; } pFrame = pNextFrame; @@ -936,32 +936,32 @@ void SfxViewFrame::ExecHistory_Impl( SfxRequest &rReq ) // Is there an Undo-Manager on the top Shell? SfxShell *pSh = GetDispatcher()->GetShell(0); ::svl::IUndoManager* pShUndoMgr = pSh->GetUndoManager(); - sal_Bool bOK = sal_False; + bool bOK = false; if ( pShUndoMgr ) { switch ( rReq.GetSlot() ) { case SID_CLEARHISTORY: pShUndoMgr->Clear(); - bOK = sal_True; + bOK = true; break; case SID_UNDO: pShUndoMgr->Undo(); GetBindings().InvalidateAll(false); - bOK = sal_True; + bOK = true; break; case SID_REDO: pShUndoMgr->Redo(); GetBindings().InvalidateAll(false); - bOK = sal_True; + bOK = true; break; case SID_REPEAT: if ( pSh->GetRepeatTarget() ) pShUndoMgr->Repeat( *pSh->GetRepeatTarget() ); - bOK = sal_True; + bOK = true; break; } } @@ -1119,7 +1119,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl() if ( pImp->bObjLocked ) { xDyingObjSh->OwnerLock( false ); - pImp->bObjLocked = sal_False; + pImp->bObjLocked = false; } } @@ -1127,7 +1127,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl() } -sal_Bool SfxViewFrame::Close() +bool SfxViewFrame::Close() { DBG_ASSERT( GetFrame().IsClosing_Impl() || !GetFrame().GetFrameInterface().is(), "ViewFrame closed too early!" ); @@ -1146,12 +1146,12 @@ sal_Bool SfxViewFrame::Close() GetDispatcher()->Lock(true); delete this; - return sal_True; + return true; } -void SfxViewFrame::DoActivate( sal_Bool bUI, SfxViewFrame* pOldFrame ) +void SfxViewFrame::DoActivate( bool bUI, SfxViewFrame* pOldFrame ) { SFX_APP(); @@ -1172,7 +1172,7 @@ void SfxViewFrame::DoActivate( sal_Bool bUI, SfxViewFrame* pOldFrame ) } -void SfxViewFrame::DoDeactivate(sal_Bool bUI, SfxViewFrame* pNewFrame ) +void SfxViewFrame::DoDeactivate(bool bUI, SfxViewFrame* pNewFrame ) { SFX_APP(); pDispatcher->DoDeactivate_Impl( bUI, pNewFrame ); @@ -1210,7 +1210,7 @@ void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh ) } -sal_Bool SfxViewFrame::SetBorderPixelImpl +bool SfxViewFrame::SetBorderPixelImpl ( const SfxViewShell* pVSh, const SvBorder& rBorder @@ -1249,7 +1249,7 @@ sal_Bool SfxViewFrame::SetBorderPixelImpl pVSh->GetWindow()->SetPosSizePixel( aEditArea.TopLeft(), aEditArea.GetSize() ); } - return sal_True; + return true; } @@ -1285,8 +1285,8 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) SfxBindings& rBind = GetBindings(); rBind.Invalidate( SID_RELOAD ); SfxDispatcher *pDispat = GetDispatcher(); - sal_Bool bWasReadOnly = pDispat->GetReadOnly_Impl(); - sal_Bool bIsReadOnly = xObjSh->IsReadOnly(); + bool bWasReadOnly = pDispat->GetReadOnly_Impl(); + bool bIsReadOnly = xObjSh->IsReadOnly(); if ( !bWasReadOnly != !bIsReadOnly ) { // Then also TITLE_CHANGED @@ -1373,7 +1373,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) // via API from another thread (Java). // According to MBA this call is not necessary anymore, // because each document has its own SfxBindings. - //GetDispatcher()->GetBindings()->InvalidateAll(sal_True); + //GetDispatcher()->GetBindings()->InvalidateAll(true); } break; @@ -1392,16 +1392,16 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh ) { - pImp->bResizeInToOut = sal_True; - pImp->bDontOverwriteResizeInToOut = sal_False; - pImp->bObjLocked = sal_False; + pImp->bResizeInToOut = true; + pImp->bDontOverwriteResizeInToOut = false; + pImp->bObjLocked = false; pImp->pFocusWin = 0; pImp->pActiveChild = NULL; pImp->nCurViewId = 0; - pImp->bReloading = sal_False; - pImp->bIsDowning = sal_False; - pImp->bModal = sal_False; - pImp->bEnabled = sal_True; + pImp->bReloading = false; + pImp->bIsDowning = false; + pImp->bModal = false; + pImp->bEnabled = true; pImp->nDocViewNo = 0; pImp->aMargin = Size( -1, -1 ); pImp->pWindow = 0; @@ -1413,7 +1413,7 @@ void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh ) xObjSh = pObjSh; if ( xObjSh.Is() && xObjSh->IsPreview() ) - SetQuietMode_Impl( sal_True ); + SetQuietMode_Impl( true ); if ( pObjSh ) { @@ -1533,7 +1533,7 @@ SfxViewFrame* SfxViewFrame::Current() SfxViewFrame* SfxViewFrame::GetFirst ( const SfxObjectShell* pDoc, - sal_Bool bOnlyIfVisible + bool bOnlyIfVisible ) { SfxApplication *pSfxApp = SFX_APP(); @@ -1558,7 +1558,7 @@ SfxViewFrame* SfxViewFrame::GetNext ( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc, - sal_Bool bOnlyIfVisible + bool bOnlyIfVisible ) { SfxApplication *pSfxApp = SFX_APP(); @@ -1643,7 +1643,7 @@ void SfxViewFrame::SetViewShell_Impl( SfxViewShell *pVSh ) // Hack: InPlaceMode if ( pVSh ) - pImp->bResizeInToOut = sal_False; + pImp->bResizeInToOut = false; } @@ -1659,14 +1659,14 @@ SfxViewFrame* SfxViewFrame::GetParentViewFrame_Impl() const } -void SfxViewFrame::ForceOuterResize_Impl(sal_Bool bOn) +void SfxViewFrame::ForceOuterResize_Impl(bool bOn) { if ( !pImp->bDontOverwriteResizeInToOut ) pImp->bResizeInToOut = !bOn; } -sal_Bool SfxViewFrame::IsResizeInToOut_Impl() const +bool SfxViewFrame::IsResizeInToOut_Impl() const { return pImp->bResizeInToOut; } @@ -1681,9 +1681,9 @@ void SfxViewFrame::GetDocNumber_Impl() -void SfxViewFrame::Enable( sal_Bool bEnable ) +void SfxViewFrame::Enable( bool bEnable ) { - if ( bEnable != pImp->bEnabled ) + if ( (bEnable ? 1 : 0) != pImp->bEnabled ) { pImp->bEnabled = bEnable; @@ -1731,12 +1731,12 @@ void SfxViewFrame::Show() { // First lock the objectShell so that UpdateTitle() is valid: - // IsVisible() == sal_True (:#) + // IsVisible() == true (:#) if ( xObjSh.Is() ) { xObjSh->GetMedium()->GetItemSet()->ClearItem( SID_HIDDEN ); if ( !pImp->bObjLocked ) - LockObjectShell_Impl( sal_True ); + LockObjectShell_Impl( true ); // Adjust Doc-Shell titel nummer, get unique view-no if ( 0 == pImp->nDocViewNo ) @@ -1756,15 +1756,15 @@ void SfxViewFrame::Show() } -sal_Bool SfxViewFrame::IsVisible() const +bool SfxViewFrame::IsVisible() const { return pImp->bObjLocked; } -void SfxViewFrame::LockObjectShell_Impl( sal_Bool bLock ) +void SfxViewFrame::LockObjectShell_Impl( bool bLock ) { - DBG_ASSERT( pImp->bObjLocked != bLock, "Wrong Locked status!" ); + DBG_ASSERT( pImp->bObjLocked != (bLock ? 1 : 0), "Wrong Locked status!" ); DBG_ASSERT( GetObjectShell(), "No Document!" ); GetObjectShell()->OwnerLock(bLock); @@ -1772,7 +1772,7 @@ void SfxViewFrame::LockObjectShell_Impl( sal_Bool bLock ) } -void SfxViewFrame::MakeActive_Impl( sal_Bool bGrabFocus ) +void SfxViewFrame::MakeActive_Impl( bool bGrabFocus ) { if ( GetViewShell() && !GetFrame().IsClosing_Impl() ) { @@ -1780,10 +1780,10 @@ void SfxViewFrame::MakeActive_Impl( sal_Bool bGrabFocus ) { if ( GetViewShell() ) { - sal_Bool bPreview = sal_False; + bool bPreview = false; if ( GetObjectShell()->IsPreview() ) { - bPreview = sal_True; + bPreview = true; } else { @@ -1825,7 +1825,7 @@ void SfxViewFrame::MakeActive_Impl( sal_Bool bGrabFocus ) -void SfxViewFrame::SetQuietMode_Impl( sal_Bool bOn ) +void SfxViewFrame::SetQuietMode_Impl( bool bOn ) { GetDispatcher()->SetQuietMode_Impl( bOn ); } @@ -1909,7 +1909,7 @@ SfxViewFrame* SfxViewFrame::LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell { // ensure the frame/window is visible Reference< XWindow > xContainerWindow( xFrame->getContainerWindow(), UNO_SET_THROW ); - xContainerWindow->setVisible( sal_True ); + xContainerWindow->setVisible( true ); } } catch( const Exception& ) @@ -2029,9 +2029,9 @@ SfxViewFrame* SfxViewFrame::Get( const Reference< XController>& i_rController, c } SfxViewFrame* pViewFrame = NULL; - for ( pViewFrame = SfxViewFrame::GetFirst( pDoc, sal_False ); + for ( pViewFrame = SfxViewFrame::GetFirst( pDoc, false ); pViewFrame; - pViewFrame = SfxViewFrame::GetNext( *pViewFrame, pDoc, sal_False ) + pViewFrame = SfxViewFrame::GetNext( *pViewFrame, pDoc, false ) ) { if ( pViewFrame->GetViewShell()->GetController() == i_rController ) @@ -2109,7 +2109,7 @@ void SfxViewFrame::SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId ) -sal_Bool SfxViewFrame::SwitchToViewShell_Impl +bool SfxViewFrame::SwitchToViewShell_Impl ( sal_uInt16 nViewIdOrNo, /* > 0 Registration-Id of the View, to which the @@ -2119,7 +2119,7 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl == 0 First use the Default view. */ - sal_Bool bIsIndex /* sal_True + bool bIsIndex /* true 'nViewIdOrNo' is no Registration-Id instead an Index of <SfxViewFrame> in <SfxObjectShell>. */ @@ -2134,11 +2134,11 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl [Return Value] - sal_Bool sal_True + bool true requested SfxViewShell was created and a possibly existing one deleted - sal_False + false SfxViewShell requested could not be created, the existing SfxViewShell thus continue to exist */ @@ -2154,8 +2154,8 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl if ( pOldSh ) { // ask whether it can be closed - if ( !pOldSh->PrepareClose( sal_True ) ) - return sal_False; + if ( !pOldSh->PrepareClose( true ) ) + return false; // remove sub shells from Dispatcher before switching to new ViewShell PopShellAndSubShells_Impl( *pOldSh ); @@ -2194,11 +2194,11 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl // the SfxCode is not able to cope with exceptions thrown while creating views // the code will crash in the stack unwinding procedure, so we shouldn't let exceptions go through here DBG_UNHANDLED_EXCEPTION(); - return sal_False; + return false; } DBG_ASSERT( SFX_APP()->GetViewFrames_Impl().size() == SFX_APP()->GetViewShells_Impl().size(), "Inconsistent view arrays!" ); - return sal_True; + return true; } @@ -2249,7 +2249,7 @@ void SfxViewFrame::ExecView_Impl ) { const sal_uInt16 nViewId = static_cast< const SfxUInt16Item* >( pItem )->GetValue(); - sal_Bool bSuccess = SwitchToViewShell_Impl( nViewId ); + bool bSuccess = SwitchToViewShell_Impl( nViewId ); rReq.SetReturnValue( SfxBoolItem( 0, bSuccess ) ); } break; @@ -2262,7 +2262,7 @@ void SfxViewFrame::ExecView_Impl case SID_VIEWSHELL4: { const sal_uInt16 nViewNo = rReq.GetSlot() - SID_VIEWSHELL0; - sal_Bool bSuccess = SwitchToViewShell_Impl( nViewNo, sal_True ); + bool bSuccess = SwitchToViewShell_Impl( nViewNo, true ); rReq.SetReturnValue( SfxBoolItem( 0, bSuccess ) ); break; } @@ -2322,13 +2322,13 @@ void SfxViewFrame::ExecView_Impl TODO: export special helper "framework::FrameListAnalyzer" within the framework module and use it here. */ -sal_Bool impl_maxOpenDocCountReached() +bool impl_maxOpenDocCountReached() { css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); boost::optional<sal_Int32> x(officecfg::Office::Common::Misc::MaxOpenDocuments::get(xContext)); // NIL means: count of allowed documents = infinite ! if (!x) - return sal_False; + return false; sal_Int32 nMaxDocs(x.get()); sal_Int32 nOpenDocs = 0; @@ -2476,7 +2476,7 @@ Window& SfxViewFrame::GetWindow() const return pImp->pWindow ? *pImp->pWindow : GetFrame().GetWindow(); } -sal_Bool SfxViewFrame::DoClose() +bool SfxViewFrame::DoClose() { return GetFrame().DoClose(); } @@ -2488,7 +2488,7 @@ OUString SfxViewFrame::GetActualPresentationURL_Impl() const return OUString(); } -void SfxViewFrame::SetModalMode( sal_Bool bModal ) +void SfxViewFrame::SetModalMode( bool bModal ) { pImp->bModal = bModal; if ( xObjSh.Is() ) @@ -2500,12 +2500,12 @@ void SfxViewFrame::SetModalMode( sal_Bool bModal ) } } -sal_Bool SfxViewFrame::IsInModalMode() const +bool SfxViewFrame::IsInModalMode() const { return pImp->bModal || GetFrame().GetWindow().IsInModalMode(); } -void SfxViewFrame::Resize( sal_Bool bForce ) +void SfxViewFrame::Resize( bool bForce ) { Size aSize = GetWindow().GetOutputSizePixel(); if ( bForce || aSize != pImp->aSize ) @@ -2529,7 +2529,7 @@ void SfxViewFrame::Resize( sal_Bool bForce ) #define LINE_SEP 0x0A -void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, sal_Bool bEraseTrailingEmptyLines ) +void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEraseTrailingEmptyLines ) { sal_Int32 nStartPos = 0; sal_Int32 nLine = 0; @@ -2650,7 +2650,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro ) pMethod->GetLineRange( nStart, nEnd ); sal_uIntPtr nlStart = nStart; sal_uIntPtr nlEnd = nEnd; - CutLines( aOUSource, nlStart-1, nlEnd-nlStart+1, sal_True ); + CutLines( aOUSource, nlStart-1, nlEnd-nlStart+1, true ); } } } @@ -2698,7 +2698,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro ) OUString sCode; OUStringBuffer sRoutine(10000); OUString sMacroName( aMacroName ); - sal_Bool bReplace = sal_False; + bool bReplace = false; // get module OUString sModule( aModuleName ); @@ -2715,7 +2715,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro ) sRoutine.append( sCode ); } - bReplace = sal_True; + bReplace = true; } // append new method @@ -2805,7 +2805,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) xRecorder = NULL; GetBindings().SetRecorder_Impl( xRecorder ); - SetChildWindow( SID_RECORDING_FLOATWINDOW, sal_False ); + SetChildWindow( SID_RECORDING_FLOATWINDOW, false ); if ( rReq.GetSlot() != SID_RECORDMACRO ) GetBindings().Invalidate( SID_RECORDMACRO ); } @@ -2824,7 +2824,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) aProp <<= xSupplier; xSet->setPropertyValue(sProperty,aProp); GetBindings().SetRecorder_Impl( xRecorder ); - SetChildWindow( SID_RECORDING_FLOATWINDOW, sal_True ); + SetChildWindow( SID_RECORDING_FLOATWINDOW, true ); } rReq.Done(); @@ -2856,7 +2856,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) OUString aStatusbarResString( "private:resource/statusbar/statusbar" ); // Evaluate parameter. SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, rReq.GetSlot(), false); - sal_Bool bShow( sal_True ); + bool bShow( true ); if ( !pShowItem ) bShow = xLayoutManager->isElementVisible( aStatusbarResString ); else @@ -3024,7 +3024,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet) else { OUString aStatusbarResString( "private:resource/statusbar/statusbar" ); - sal_Bool bShow = xLayoutManager->isElementVisible( aStatusbarResString ); + bool bShow = xLayoutManager->isElementVisible( aStatusbarResString ); rSet.Put( SfxBoolItem( nWhich, bShow )); } break; @@ -3084,8 +3084,8 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) return; Reference < XFrame > xFrame = GetFrame().GetTopFrame().GetFrameInterface(); Reference < XFrame > xBeamer( xFrame->findFrame( "_beamer", FrameSearchFlag::CHILDREN ) ); - sal_Bool bHasChild = xBeamer.is(); - sal_Bool bShow = pShowItem ? pShowItem->GetValue() : !bHasChild; + bool bHasChild = xBeamer.is(); + bool bShow = pShowItem ? pShowItem->GetValue() : !bHasChild; if ( pShowItem ) { if( bShow == bHasChild ) @@ -3096,7 +3096,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) if ( !bShow ) { - SetChildWindow( SID_BROWSER, sal_False ); + SetChildWindow( SID_BROWSER, false ); } else { @@ -3125,8 +3125,8 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) return; } - sal_Bool bHasChild = HasChildWindow(nSID); - sal_Bool bShow = pShowItem ? pShowItem->GetValue() : !bHasChild; + bool bHasChild = HasChildWindow(nSID); + bool bShow = pShowItem ? pShowItem->GetValue() : !bHasChild; GetDispatcher()->Update_Impl( true ); // Perform action. @@ -3233,7 +3233,7 @@ SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl( sal_uInt16 /*nId*/ ) return pWork; } -void SfxViewFrame::SetChildWindow(sal_uInt16 nId, sal_Bool bOn, sal_Bool bSetFocus ) +void SfxViewFrame::SetChildWindow(sal_uInt16 nId, bool bOn, bool bSetFocus ) { SfxWorkWindow* pWork = GetWorkWindow_Impl( nId ); if ( pWork ) @@ -3246,7 +3246,7 @@ void SfxViewFrame::ToggleChildWindow(sal_uInt16 nId) { SfxWorkWindow* pWork = GetWorkWindow_Impl( nId ); if ( pWork ) - pWork->ToggleChildWindow_Impl( nId, sal_True ); + pWork->ToggleChildWindow_Impl( nId, true ); } @@ -3259,21 +3259,21 @@ bool SfxViewFrame::HasChildWindow( sal_uInt16 nId ) -sal_Bool SfxViewFrame::KnowsChildWindow( sal_uInt16 nId ) +bool SfxViewFrame::KnowsChildWindow( sal_uInt16 nId ) { SfxWorkWindow* pWork = GetWorkWindow_Impl( nId ); - return pWork ? pWork->KnowsChildWindow_Impl(nId) : sal_False; + return pWork && pWork->KnowsChildWindow_Impl(nId); } -void SfxViewFrame::ShowChildWindow( sal_uInt16 nId, sal_Bool bVisible ) +void SfxViewFrame::ShowChildWindow( sal_uInt16 nId, bool bVisible ) { SfxWorkWindow* pWork = GetWorkWindow_Impl( nId ); if ( pWork ) { GetDispatcher()->Update_Impl(true); - pWork->ShowChildWindow_Impl(nId, bVisible, sal_True ); + pWork->ShowChildWindow_Impl(nId, bVisible, true ); } } diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index edade4ae15d8..de2cef6980ea 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -199,7 +199,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq ) case SID_ACTIVATE: { - MakeActive_Impl( sal_True ); + MakeActive_Impl( true ); rReq.SetReturnValue( SfxObjectItem( 0, this ) ); break; } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index f5eece378b2c..6a17d5b19c17 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -379,7 +379,7 @@ void SfxPrinterController::jobFinished( com::sun::star::view::PrintableState nSt // by a new one. The reason for this is that otherwise we would not get // the printer's SfxItemSet here to copy. Awkward, but at the moment there is no // other way here to get the item set. - SfxPrinter* pDocPrt = mpViewShell->GetPrinter(sal_True); + SfxPrinter* pDocPrt = mpViewShell->GetPrinter(true); if( pDocPrt ) { if( pDocPrt->GetName() == getPrinter()->GetName() ) @@ -571,7 +571,7 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter ) return pDocPrinter; } -void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rProps, sal_Bool bIsAPI, sal_Bool bIsDirect ) +void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rProps, bool bIsAPI, bool bIsDirect ) { // get the current selection; our controller should know it Reference< frame::XController > xController( GetController() ); @@ -616,7 +616,7 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro makeAny( OUString( pObjShell->GetTitle(0) ) ) ); // FIXME: job setup - SfxPrinter* pDocPrt = GetPrinter(sal_False); + SfxPrinter* pDocPrt = GetPrinter(false); JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : GetJobSetup(); if( bIsDirect ) aJobSetup.SetValue( OUString( "IsQuickJob" ), @@ -761,7 +761,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) case SID_PRINTER_NAME : // only for recorded macros { // get printer and printer settings from the document - SfxPrinter *pDocPrinter = GetPrinter(sal_True); + SfxPrinter *pDocPrinter = GetPrinter(true); // look for printer in parameters SFX_REQUEST_ARG( rReq, pPrinterItem, SfxStringItem, SID_PRINTER_NAME, false ); @@ -878,7 +878,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) } } -SfxPrinter* SfxViewShell::GetPrinter( sal_Bool /*bCreate*/ ) +SfxPrinter* SfxViewShell::GetPrinter( bool /*bCreate*/ ) { return 0; } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 59a0e8a54db9..424201586c36 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -414,7 +414,7 @@ OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFra void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient ) { - SfxInPlaceClientList* pClientList = GetIPClientList_Impl(sal_True); + SfxInPlaceClientList* pClientList = GetIPClientList_Impl(true); for( SfxInPlaceClientList::iterator it = pClientList->begin(); it != pClientList->end(); ++it ) { @@ -753,7 +753,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) VisAreaChanged(aVisArea); // the plugins might need change in their state - SfxInPlaceClientList *pClients = pView->GetIPClientList_Impl(sal_False); + SfxInPlaceClientList *pClients = pView->GetIPClientList_Impl(false); if ( pClients ) { for ( size_t n = 0; n < pClients->size(); n++) @@ -798,7 +798,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) bEnabled = bEnabled && !Application::GetSettings().GetMiscSettings().GetDisablePrinting(); if ( bEnabled ) { - SfxPrinter *pPrinter = GetPrinter(sal_False); + SfxPrinter *pPrinter = GetPrinter(false); if ( SID_PRINTDOCDIRECT == nSID ) { @@ -870,7 +870,7 @@ ErrCode SfxViewShell::DoVerb(long /*nVerb*/) -void SfxViewShell::OutplaceActivated( sal_Bool bActive, SfxInPlaceClient* /*pClient*/ ) +void SfxViewShell::OutplaceActivated( bool bActive, SfxInPlaceClient* /*pClient*/ ) { if ( !bActive ) GetFrame()->GetFrame().Appear(); @@ -923,7 +923,7 @@ SfxInPlaceClient* SfxViewShell::FindIPClient Window* pObjParentWin ) const { - SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False); + SfxInPlaceClientList *pClients = GetIPClientList_Impl(false); if ( !pClients ) return 0; @@ -951,7 +951,7 @@ SfxInPlaceClient* SfxViewShell::GetIPClient() const SfxInPlaceClient* SfxViewShell::GetUIActiveIPClient_Impl() const { // this method is needed as long as SFX still manages the border space for ChildWindows (see SfxFrame::Resize) - SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False); + SfxInPlaceClientList *pClients = GetIPClientList_Impl(false); if ( !pClients ) return 0; @@ -967,7 +967,7 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveIPClient_Impl() const SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const { - SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False); + SfxInPlaceClientList *pClients = GetIPClientList_Impl(false); if ( !pClients ) return 0; @@ -1197,7 +1197,7 @@ void SfxViewShell::SetWindow DiscardClients_Impl(); // Switch View-Port - sal_Bool bHadFocus = pWindow ? pWindow->HasChildPathFocus( true ) : sal_False; + bool bHadFocus = pWindow && pWindow->HasChildPathFocus( true ); pWindow = pViewPort; if( pWindow ) @@ -1277,7 +1277,7 @@ SfxViewShell::~SfxViewShell() bool SfxViewShell::PrepareClose ( - sal_Bool bUI // TRUE: Allow Dialog and so on, FALSE: silent-mode + bool bUI // TRUE: Allow Dialog and so on, FALSE: silent-mode ) { SfxPrinter *pPrinter = GetPrinter(); @@ -1316,9 +1316,9 @@ SfxViewShell* SfxViewShell::Get( const Reference< XController>& i_rController ) if ( !i_rController.is() ) return NULL; - for ( SfxViewShell* pViewShell = SfxViewShell::GetFirst( NULL, sal_False ); + for ( SfxViewShell* pViewShell = SfxViewShell::GetFirst( NULL, false ); pViewShell; - pViewShell = SfxViewShell::GetNext( *pViewShell, NULL, sal_False ) + pViewShell = SfxViewShell::GetNext( *pViewShell, NULL, false ) ) { if ( pViewShell->GetController() == i_rController ) @@ -1375,7 +1375,7 @@ OUString SfxViewShell::GetSelectionText -sal_Bool SfxViewShell::HasSelection( sal_Bool ) const +bool SfxViewShell::HasSelection( bool ) const /* [Description] @@ -1385,7 +1385,7 @@ sal_Bool SfxViewShell::HasSelection( sal_Bool ) const */ { - return sal_False; + return false; } void SfxViewShell::AddSubShell( SfxShell& rShell ) @@ -1436,7 +1436,7 @@ SfxShell* SfxViewShell::GetSubShell( sal_uInt16 nNo ) return NULL; } -void SfxViewShell::PushSubShells_Impl( sal_Bool bPush ) +void SfxViewShell::PushSubShells_Impl( bool bPush ) { SfxDispatcher *pDisp = pFrame->GetDispatcher(); if ( bPush ) @@ -1466,11 +1466,11 @@ void SfxViewShell::ReadUserData(const OUString&, bool ) { } -void SfxViewShell::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >&, sal_Bool ) +void SfxViewShell::ReadUserDataSequence ( const uno::Sequence < beans::PropertyValue >&, bool ) { } -void SfxViewShell::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >&, sal_Bool ) +void SfxViewShell::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue >&, bool ) { } @@ -1481,7 +1481,7 @@ void SfxViewShell::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue SfxViewShell* SfxViewShell::GetFirst ( const TypeId* pType, - sal_Bool bOnlyVisible + bool bOnlyVisible ) { // search for a SfxViewShell of the specified type @@ -1519,7 +1519,7 @@ SfxViewShell* SfxViewShell::GetNext ( const SfxViewShell& rPrev, const TypeId* pType, - sal_Bool bOnlyVisible + bool bOnlyVisible ) { SfxViewShellArr_Impl &rShells = SFX_APP()->GetViewShells_Impl(); @@ -1595,7 +1595,7 @@ void SfxViewShell::Notify( SfxBroadcaster& rBC, -sal_Bool SfxViewShell::ExecKey_Impl(const KeyEvent& aKey) +bool SfxViewShell::ExecKey_Impl(const KeyEvent& aKey) { if (!pImp->m_pAccExec.get()) { @@ -1678,7 +1678,7 @@ void SfxViewShell::GotFocus() const void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP ) { - SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False); + SfxInPlaceClientList *pClients = GetIPClientList_Impl(false); if ( !pClients ) return; @@ -1694,7 +1694,7 @@ void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP ) void SfxViewShell::DisconnectAllClients() { - SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False); + SfxInPlaceClientList *pClients = GetIPClientList_Impl(false); if ( !pClients ) return; @@ -1713,7 +1713,7 @@ void SfxViewShell::QueryObjAreaPixel( Rectangle& ) const void SfxViewShell::VisAreaChanged(const Rectangle& /*rVisArea*/) { - SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False); + SfxInPlaceClientList *pClients = GetIPClientList_Impl(false); if ( !pClients ) return; @@ -1732,9 +1732,9 @@ void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectan if ( GetObjectShell()->IsInClose() ) return; - sal_Bool bAlwaysActive = + bool bAlwaysActive = ( ( pIPClient->GetObjectMiscStatus() & embed::EmbedMisc::EMBED_ACTIVATEIMMEDIATELY ) != 0 ); - sal_Bool bActiveWhenVisible = + bool bActiveWhenVisible = ( ( pIPClient->GetObjectMiscStatus() & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE ) != 0 ); // this method is called when either a client is created or the "Edit/Plugins" checkbox is checked @@ -1774,7 +1774,7 @@ void SfxViewShell::DiscardClients_Impl() */ { - SfxInPlaceClientList *pClients = GetIPClientList_Impl(sal_False); + SfxInPlaceClientList *pClients = GetIPClientList_Impl(false); if ( !pClients ) return; @@ -1844,7 +1844,7 @@ void SfxViewShell::MarginChanged() -sal_Bool SfxViewShell::IsShowView_Impl() const +bool SfxViewShell::IsShowView_Impl() const { return pImp->m_bIsShowView; } @@ -1869,7 +1869,7 @@ void SfxViewShell::JumpToMark( const OUString& rMark ) -SfxInPlaceClientList* SfxViewShell::GetIPClientList_Impl( sal_Bool bCreate ) const +SfxInPlaceClientList* SfxViewShell::GetIPClientList_Impl( bool bCreate ) const { if ( !pIPClientList && bCreate ) ( (SfxViewShell*) this )->pIPClientList = new SfxInPlaceClientList; @@ -1947,10 +1947,10 @@ void Change( Menu* pMenu, SfxViewShell* pView ) } -sal_Bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const OUString& rMenuIdentifier, Menu*& rpOut, ui::ContextMenuExecuteEvent aEvent ) +bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const OUString& rMenuIdentifier, Menu*& rpOut, ui::ContextMenuExecuteEvent aEvent ) { rpOut = NULL; - sal_Bool bModified = sal_False; + bool bModified = false; // create container from menu aEvent.ActionTriggerContainer = ::framework::ActionTriggerHelper::CreateActionTriggerContainerFromMenu( @@ -1971,14 +1971,14 @@ sal_Bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const OUString& rM { case ui::ContextMenuInterceptorAction_CANCELLED : // interceptor does not want execution - return sal_False; + return false; case ui::ContextMenuInterceptorAction_EXECUTE_MODIFIED : // interceptor wants his modified menu to be executed - bModified = sal_True; + bModified = true; break; case ui::ContextMenuInterceptorAction_CONTINUE_MODIFIED : // interceptor has modified menu, but allows for calling other interceptors - bModified = sal_True; + bModified = true; continue; case ui::ContextMenuInterceptorAction_IGNORED : // interceptor is indifferent @@ -2005,7 +2005,7 @@ sal_Bool SfxViewShell::TryContextMenuInterception( Menu& rIn, const OUString& rM Change( rpOut, this ); } - return sal_True; + return true; } void SfxViewShell::TakeOwnership_Impl() @@ -2029,19 +2029,19 @@ bool SfxViewShell::HandleNotifyEvent_Impl( NotifyEvent& rEvent ) return false; } -sal_Bool SfxViewShell::HasKeyListeners_Impl() +bool SfxViewShell::HasKeyListeners_Impl() { return (pImp->m_pController.is()) - ? pImp->m_pController->HasKeyListeners_Impl() : sal_False; + && pImp->m_pController->HasKeyListeners_Impl(); } -sal_Bool SfxViewShell::HasMouseClickListeners_Impl() +bool SfxViewShell::HasMouseClickListeners_Impl() { return (pImp->m_pController.is()) - ? pImp->m_pController->HasMouseClickListeners_Impl() : sal_False; + && pImp->m_pController->HasMouseClickListeners_Impl(); } -sal_Bool SfxViewShell::Escape() +bool SfxViewShell::Escape() { return GetViewFrame()->GetBindings().Execute( SID_TERMINATE_INPLACEACTIVATION ); } @@ -2069,7 +2069,7 @@ uno::Reference< datatransfer::clipboard::XClipboardNotifier > SfxViewShell::GetC return xClipboardNotifier; } -void SfxViewShell::AddRemoveClipboardListener( const uno::Reference < datatransfer::clipboard::XClipboardListener >& rClp, sal_Bool bAdd ) +void SfxViewShell::AddRemoveClipboardListener( const uno::Reference < datatransfer::clipboard::XClipboardListener >& rClp, bool bAdd ) { try { |