From 08c40a2474405b160aab96cabe115d8437d68f8a Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 11 Feb 2014 11:43:35 +0200 Subject: sal_Bool->bool Change-Id: I31fb9d5b49260fd1a8fc1312b01fd5632c97ab2e --- sd/inc/drawdoc.hxx | 6 +++--- sd/source/core/drawdoc.cxx | 4 ++-- sd/source/core/drawdoc2.cxx | 4 ++-- sd/source/core/drawdoc4.cxx | 2 +- sd/source/ui/dlg/LayerTabBar.cxx | 2 +- sd/source/ui/func/fucushow.cxx | 2 +- sd/source/ui/func/fupage.cxx | 2 +- sd/source/ui/func/fusldlg.cxx | 2 +- sd/source/ui/func/futempl.cxx | 10 +++++----- sd/source/ui/sidebar/DocumentHelper.cxx | 2 +- sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 2 +- sd/source/ui/unoidl/unolayer.cxx | 2 +- sd/source/ui/view/MediaObjectBar.cxx | 2 +- sd/source/ui/view/Outliner.cxx | 2 +- sd/source/ui/view/drviews2.cxx | 2 +- sd/source/ui/view/drviewsb.cxx | 4 ++-- sd/source/ui/view/drviewsg.cxx | 2 +- sd/source/ui/view/outlnvsh.cxx | 2 +- sd/source/ui/view/sdview2.cxx | 2 +- 19 files changed, 28 insertions(+), 28 deletions(-) (limited to 'sd') diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 695cf6bbee11..3921a9566a77 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -220,8 +220,8 @@ public: virtual SdrModel* AllocModel() const; virtual SdrPage* AllocPage(bool bMasterPage); - virtual bool IsReadOnly() const; - virtual void SetChanged(sal_Bool bFlag = sal_True); + virtual bool IsReadOnly() const; + virtual void SetChanged(bool bFlag = true) SAL_OVERRIDE; SfxItemPool& GetPool() { return( *pItemPool ); } @@ -684,7 +684,7 @@ private: DrawDocShell* mpDocShell; SdDrawDocument* mpDoc; sal_Bool mbIsEnableSetModified; - sal_Bool mbIsDocumentChanged; + bool mbIsDocumentChanged; }; } diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 04c49f370dba..f00fbaffb274 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -506,7 +506,7 @@ SdrPage* SdDrawDocument::AllocPage(bool bMasterPage) } // When the model has changed -void SdDrawDocument::SetChanged(sal_Bool bFlag) +void SdDrawDocument::SetChanged(bool bFlag) { if (mpDocSh) { @@ -676,7 +676,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode) UpdateAllLinks(); - SetChanged( sal_False ); + SetChanged( false ); } /** updates all links, only links in this document should by resolved */ diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 234b0824b39b..2051165eaf56 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -635,7 +635,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) mpWorkStartupTimer->SetTimeout(2000); mpWorkStartupTimer->Start(); - SetChanged(sal_False); + SetChanged(false); } } @@ -678,7 +678,7 @@ sal_Bool SdDrawDocument::CreateMissingNotesAndHandoutPages() bOK = sal_True; StopWorkStartupDelay(); - SetChanged(sal_False); + SetChanged(false); } return(bOK); diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 0d04d9e5e33b..4b8717ac0d7b 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -1347,7 +1347,7 @@ void ModifyGuard::init() } mbIsEnableSetModified = mpDocShell ? mpDocShell->IsEnableSetModified() : sal_False; - mbIsDocumentChanged = mpDoc ? mpDoc->IsChanged() : sal_False; + mbIsDocumentChanged = mpDoc ? mpDoc->IsChanged() : false; if( mbIsEnableSetModified ) mpDocShell->EnableSetModified( sal_False ); diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index 36c53ef424bf..5877251bbfbc 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -288,7 +288,7 @@ void LayerTabBar::EndRenaming() // the View then already has to know the Layer pView->SetActiveLayer(aNewName); pLayer->SetName(aNewName); - rDoc.SetChanged(sal_True); + rDoc.SetChanged(true); } } } diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx index ab408e2687ad..ab1ccd41af32 100644 --- a/sd/source/ui/func/fucushow.cxx +++ b/sd/source/ui/func/fucushow.cxx @@ -65,7 +65,7 @@ void FuCustomShowDlg::DoExecute( SfxRequest& ) sal_uInt16 nRet = pDlg->Execute(); if( pDlg->IsModified() ) { - mpDoc->SetChanged( sal_True ); + mpDoc->SetChanged( true ); sd::PresentationSettings& rSettings = mpDoc->getPresentationSettings(); rSettings.mbCustomShow = pDlg->IsCustomShow(); } diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 762c47daba9b..be5458a60499 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -453,7 +453,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) mpDoc->SetDefaultWritingMode( nVal == FRMDIR_HORI_RIGHT_TOP ? ::com::sun::star::text::WritingMode_RL_TB : ::com::sun::star::text::WritingMode_LR_TB ); } - mpDoc->SetChanged(sal_True); + mpDoc->SetChanged(true); // BackgroundFill of Masterpage: no hard attributes allowed SdrPage& rUsedMasterPage = mpPage->IsMasterPage() ? *mpPage : mpPage->TRG_GetMasterPage(); diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index b7fd1fc77d51..64a028a238b3 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -224,7 +224,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) // is something has changed, we set the modified flag if ( bValuesChanged ) - mpDoc->SetChanged( sal_True ); + mpDoc->SetChanged( true ); } delete pDlg; } diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index aec57f77a6d1..e282b7cbc577 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -207,7 +207,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) { pSSPool->Remove( pStyleSheet ); nRetMask = sal_True; - mpDoc->SetChanged(sal_True); + mpDoc->SetChanged(true); } else { @@ -245,7 +245,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) (pOldStyleSheet->GetFamily() == SD_STYLE_FAMILY_MASTERPAGE && mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW) ) { mpView->SetStyleSheet( (SfxStyleSheet*) pStyleSheet); - mpDoc->SetChanged(sal_True); + mpDoc->SetChanged(true); mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 ); } } @@ -571,7 +571,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) } } - mpDoc->SetChanged(sal_True); + mpDoc->SetChanged(true); } break; @@ -621,7 +621,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) } ( (SfxStyleSheet*) pStyleSheet )->Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) ); - mpDoc->SetChanged(sal_True); + mpDoc->SetChanged(true); mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 ); } @@ -648,7 +648,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq ) mpView->SetStyleSheet( (SfxStyleSheet*) pStyleSheet); ( (SfxStyleSheet*) pStyleSheet )->Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) ); - mpDoc->SetChanged(sal_True); + mpDoc->SetChanged(true); mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 ); } } diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index aa1bdbc4b737..c4bd96c069c3 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -150,7 +150,7 @@ SdPage* DocumentHelper::CopyMasterPageToLocalDocument ( // We are not interested in any automatisms for our modified internal // document. - rTargetDocument.SetChanged (sal_False); + rTargetDocument.SetChanged(false); return pNewMasterPage; } diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 23eb70583e3a..9961a19959bf 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -1035,7 +1035,7 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri // aTabControl.SetPageText( nPageId, rName ); // set document to modified state - pDocument->SetChanged( sal_True ); + pDocument->SetChanged( true ); // inform navigator about change SfxBoolItem aItem( SID_NAVIGATOR_INIT, true ); diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index a4639ea7a28f..f0ef6b8f3140 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -737,7 +737,7 @@ void SdLayerManager::UpdateLayerView( sal_Bool modify ) const throw() } if(modify) - mpModel->mpDoc->SetChanged(sal_True); + mpModel->mpDoc->SetChanged(true); } } diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index 4fed915dd9da..39eab0413ac7 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -148,7 +148,7 @@ void MediaObjectBar::Execute( SfxRequest& rReq ) //fdo #32598: after changing playback opts, set document's modified flag SdDrawDocument& rDoc = mpView->GetDoc(); - rDoc.SetChanged(sal_True); + rDoc.SetChanged(true); } } diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 34e61d943f6b..b400a2e1d525 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -351,7 +351,7 @@ void Outliner::EndSpelling (void) if(mpView && mpView->ISA(OutlineView)) static_cast(mpView)->PrepareClose(sal_False); if(mpDrawDocument && !mpDrawDocument->IsChanged()) - mpDrawDocument->SetChanged(sal_True); + mpDrawDocument->SetChanged(true); } // Now clear the modify flag to have a specified state of diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index dcf283925c11..679471c96c47 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1526,7 +1526,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) ResetActualLayer(); - GetDoc()->SetChanged(sal_True); + GetDoc()->SetChanged(true); GetViewFrame()->GetDispatcher()->Execute(SID_SWITCHLAYER, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index efca498a4001..d6dddd58a60d 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -117,7 +117,7 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName ) maTabControl.SetPageText( nPageId, rName ); // set document to modified state - GetDoc()->SetChanged( sal_True ); + GetDoc()->SetChanged( true ); // inform navigator about change SfxBoolItem aItem( SID_NAVIGATOR_INIT, true ); @@ -188,7 +188,7 @@ void DrawViewShell::ModifyLayer ( mpDrawView->SetLayerLocked( rLayerName, bIsLocked); mpDrawView->SetLayerPrintable(rLayerName, bIsPrintable); - GetDoc()->SetChanged(sal_True); + GetDoc()->SetChanged(true); GetLayerTabControl()->SetPageText(nCurPage, rLayerName); diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx index 5b3e4015779e..bb83db6737c8 100644 --- a/sd/source/ui/view/drviewsg.cxx +++ b/sd/source/ui/view/drviewsg.cxx @@ -68,7 +68,7 @@ void DrawViewShell::ExecIMap( SfxRequest& rReq ) else pIMapInfo->SetImageMap( rImageMap ); - GetDoc()->SetChanged( sal_True ); + GetDoc()->SetChanged( true ); } } } diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index cfdbfc7e8e48..654a74c57eb1 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -959,7 +959,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) if (pOlView->GetOutliner()->IsModified()) { - GetDoc()->SetChanged(sal_True); + GetDoc()->SetChanged(true); } // the status has to be set here because of overloading diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index d7317f4cc1eb..3e8d460d7606 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -337,7 +337,7 @@ void View::DoPaste (::Window* pWindow) if( !mrDoc.IsChanged() ) { if( pOutliner && pOutliner->IsModified() ) - mrDoc.SetChanged( sal_True ); + mrDoc.SetChanged( true ); } } } -- cgit