diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-25 14:19:24 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-02-27 12:30:26 +0200 |
commit | 57779aa0195d77239b339c6dbe17209b3f0cc4ee (patch) | |
tree | fb07a1ccf2c6394da9d4c63ca0ae139af9669e8a /sd | |
parent | editeng: sal_Bool->bool (diff) | |
download | core-57779aa0195d77239b339c6dbe17209b3f0cc4ee.tar.gz core-57779aa0195d77239b339c6dbe17209b3f0cc4ee.zip |
editeng: sal_Bool->bool
Change-Id: Id4174904487fc153d8e80471da7c829c52092f78
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/Outliner.hxx | 4 | ||||
-rw-r--r-- | sd/source/core/drawdoc.cxx | 8 | ||||
-rw-r--r-- | sd/source/core/drawdoc4.cxx | 4 | ||||
-rw-r--r-- | sd/source/core/sdpage.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotationwindow.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/func/fubullet.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/func/fuexpand.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/func/fusumry.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/func/futext.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/view/DocumentRenderer.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/Outliner.cxx | 22 | ||||
-rw-r--r-- | sd/source/ui/view/drawview.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/drviews2.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/view/drviewse.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/outlnvs2.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/outlnvsh.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/view/outlview.cxx | 16 | ||||
-rw-r--r-- | sd/source/ui/view/sdview2.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/sdview3.cxx | 4 |
20 files changed, 63 insertions, 63 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index afd57abd52e5..12cd4bb8b9e2 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -150,7 +150,7 @@ public: void EndSpelling (void); /** callback for textconversion */ - sal_Bool ConvertNextDocument (void); + bool ConvertNextDocument (void); /** Starts the text conversion (hangul/hanja or Chinese simplified/traditional) for the current viewshell */ @@ -526,7 +526,7 @@ private: required. When all text objects have been processed then <FALSE/> is returned. */ - virtual sal_Bool SpellNextDocument (void); + virtual bool SpellNextDocument (void); /** Show the given message box and make it modal. It is assumed that the parent of the given dialog is NULL, i.e. the application diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 5e84b13281ea..29514062728a 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -800,8 +800,8 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool // This outliner is only used to create special text objects. As no // information about portions is saved in this outliner, the update mode // can/should always remain sal_False. - mpInternalOutliner->SetUpdateMode( sal_False ); - mpInternalOutliner->EnableUndo( sal_False ); + mpInternalOutliner->SetUpdateMode( false ); + mpInternalOutliner->EnableUndo( false ); if (mpDocSh) mpInternalOutliner->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) ); @@ -810,8 +810,8 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool mpInternalOutliner->SetStyleSheetPool((SfxStyleSheetPool*)GetStyleSheetPool()); } - DBG_ASSERT( !mpInternalOutliner || ( mpInternalOutliner->GetUpdateMode() == sal_False ) , "InternalOutliner: UpdateMode = sal_True !" ); - DBG_ASSERT( !mpInternalOutliner || ( mpInternalOutliner->IsUndoEnabled() == sal_False ), "InternalOutliner: Undo = sal_True !" ); + DBG_ASSERT( !mpInternalOutliner || ( ! mpInternalOutliner->GetUpdateMode() ) , "InternalOutliner: UpdateMode = sal_True !" ); + DBG_ASSERT( !mpInternalOutliner || ( ! mpInternalOutliner->IsUndoEnabled() ), "InternalOutliner: Undo = sal_True !" ); // If you add stuff here, always clear it out. // Advantages: diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index d92c342c1f77..85a9fa3e4aa2 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -884,7 +884,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj) { mbHasOnlineSpellErrors = false; ::sd::Outliner* pOutl = GetInternalOutliner(sal_True); - pOutl->SetUpdateMode(sal_True); + pOutl->SetUpdateMode(true); Link aEvtHdl = pOutl->GetStatusEventHdl(); pOutl->SetStatusEventHdl(LINK(this, SdDrawDocument, OnlineSpellEventHdl)); @@ -925,7 +925,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj) } pOutl->SetStatusEventHdl(aEvtHdl); - pOutl->SetUpdateMode(sal_False); + pOutl->SetUpdateMode(false); pOutl->Init( nOldOutlMode ); mbHasOnlineSpellErrors = false; } diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 64d9d1407ec0..2fa462c74de7 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -2375,14 +2375,14 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO pOutl->SetRefDevice( SD_MOD()->GetRefDevice( *( (SdDrawDocument*) GetModel() )->GetDocSh() ) ); pOutl->SetEditTextObjectPool(pPool); pOutl->SetStyleSheetPool((SfxStyleSheetPool*)GetModel()->GetStyleSheetPool()); - pOutl->EnableUndo(sal_False); - pOutl->SetUpdateMode( sal_False ); + pOutl->EnableUndo(false); + pOutl->SetUpdateMode( false ); } sal_uInt16 nOutlMode = pOutl->GetMode(); Size aPaperSize = pOutl->GetPaperSize(); sal_Bool bUpdateMode = pOutl->GetUpdateMode(); - pOutl->SetUpdateMode(sal_False); + pOutl->SetUpdateMode(false); pOutl->SetParaAttribs( 0, pOutl->GetEmptyItemSet() ); // Always set the object's StyleSheet at the Outliner to diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 88b9cae50598..730ab2b703a6 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -459,7 +459,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq ) boost::scoped_ptr< ::Outliner > pOutliner( new ::Outliner(GetAnnotationPool(),OUTLINERMODE_TEXTOBJECT) ); mpDoc->SetCalcFieldValueHdl( pOutliner.get() ); - pOutliner->SetUpdateMode( sal_True ); + pOutliner->SetUpdateMode( true ); OUString aStr(SD_RESSTR(STR_ANNOTATION_REPLY)); OUString sAuthor( xAnnotation->getAuthor() ); diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 700f316a5ada..0ffcf5d591c7 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -321,7 +321,7 @@ void AnnotationWindow::InitControls() mpOutliner = new ::Outliner(GetAnnotationPool(),OUTLINERMODE_TEXTOBJECT); Doc()->SetCalcFieldValueHdl( mpOutliner ); - mpOutliner->SetUpdateMode( sal_True ); + mpOutliner->SetUpdateMode( true ); Rescale(); OutputDevice* pDev = Doc()->GetRefDevice(); @@ -348,11 +348,11 @@ void AnnotationWindow::InitControls() mpOutliner->SetControlWord(nCntrl); Engine()->SetModifyHdl( Link() ); - Engine()->EnableUndo( sal_False ); + Engine()->EnableUndo( false ); Engine()->ClearModifyFlag(); Engine()->GetUndoManager().Clear(); - Engine()->EnableUndo( sal_True ); + Engine()->EnableUndo( true ); Engine()->SetModifyHdl( LINK( this, AnnotationWindow, ModifyHdl ) ); Invalidate(); diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index c9719ccb533b..caa7043ef759 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -121,7 +121,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) { // prevent flickering pOV->HideCursor(); - pOL->SetUpdateMode(sal_False); + pOL->SetUpdateMode(false); // remove old selected text pOV->InsertText( aEmptyStr ); @@ -133,7 +133,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) // insert given text OUString aStr( cMark ); - pOV->InsertText( aStr, sal_True); + pOV->InsertText( aStr, true); ESelection aSel = pOV->GetSelection(); aSel.nStartPara = aSel.nEndPara; @@ -143,7 +143,7 @@ void FuBullet::InsertFormattingMark( sal_Unicode cMark ) rUndoMgr.LeaveListAction(); // restart repainting - pOL->SetUpdateMode(sal_True); + pOL->SetUpdateMode(true); pOV->ShowCursor(); } } @@ -245,7 +245,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) { // prevent flicker pOV->HideCursor(); - pOL->SetUpdateMode(sal_False); + pOL->SetUpdateMode(false); /* remember old attributes: To do that, remove selected area before (it has to go anyway). @@ -260,7 +260,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) ::svl::IUndoManager& rUndoMgr = pOL->GetUndoManager(); rUndoMgr.EnterListAction(SD_RESSTR(STR_UNDO_INSERT_SPECCHAR), aEmptyStr ); - pOV->InsertText(aChars, sal_True); + pOV->InsertText(aChars, true); // set attributes (set font) SfxItemSet aSet(pOL->GetEmptyItemSet()); @@ -284,7 +284,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) rUndoMgr.LeaveListAction(); // show it again - pOL->SetUpdateMode(sal_True); + pOL->SetUpdateMode(true); pOV->ShowCursor(); } } diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index eb5bd40a915f..bc9bcd57f758 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -89,8 +89,8 @@ void FuExpandPage::DoExecute( SfxRequest& ) { ::sd::Outliner* pOutl = new ::sd::Outliner( mpDoc, OUTLINERMODE_OUTLINEOBJECT ); - pOutl->SetUpdateMode(sal_False); - pOutl->EnableUndo(sal_False); + pOutl->SetUpdateMode(false); + pOutl->EnableUndo(false); if (mpDocSh) pOutl->SetRefDevice( SD_MOD()->GetRefDevice( *mpDocSh ) ); diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index 6ee996c8611c..f1493534e360 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -159,8 +159,8 @@ void FuSummaryPage::DoExecute( SfxRequest& ) pNotesPage->setHeaderFooterSettings(pActualNotesPage->getHeaderFooterSettings()); pOutl = new ::sd::Outliner( mpDoc, OUTLINERMODE_OUTLINEOBJECT ); - pOutl->SetUpdateMode(sal_False); - pOutl->EnableUndo(sal_False); + pOutl->SetUpdateMode(false); + pOutl->EnableUndo(false); if (mpDocSh) pOutl->SetRefDevice(SD_MOD()->GetRefDevice( *mpDocSh )); diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index f232be019230..5555d3ab1cd8 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -1059,7 +1059,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag) { OutlinerParaObject* pOPO = pTextObj->GetOutlinerParaObject(); if( ( pOPO && pOPO->IsVertical() ) || (nSlotId == SID_ATTR_CHAR_VERTICAL) || (nSlotId == SID_TEXT_FITTOSIZE_VERTICAL) ) - pOutl->SetVertical( sal_True ); + pOutl->SetVertical( true ); if( pTextObj->getTextCount() > 1 ) { @@ -1147,12 +1147,12 @@ sal_Bool FuText::DeleteDefaultText() SfxStyleSheet* pSheet = pOutliner->GetStyleSheet( 0 ); sal_Bool bIsUndoEnabled = pOutliner->IsUndoEnabled(); if( bIsUndoEnabled ) - pOutliner->EnableUndo(sal_False); + pOutliner->EnableUndo(false); pOutliner->SetText( OUString(), pOutliner->GetParagraph( 0 ) ); if( bIsUndoEnabled ) - pOutliner->EnableUndo(sal_True); + pOutliner->EnableUndo(true); if (pSheet && (ePresObjKind == PRESOBJ_NOTES || ePresObjKind == PRESOBJ_TEXT)) diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 2eaf443b6622..efe362661d36 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1142,7 +1142,7 @@ namespace { pOutliner->Init(OUTLINERMODE_OUTLINEVIEW); pOutliner->SetPaperSize(aOutRect.GetSize()); - pOutliner->SetUpdateMode(sal_True); + pOutliner->SetUpdateMode(true); pOutliner->Clear(); pOutliner->SetText(*mpParaObject); @@ -1663,7 +1663,7 @@ private: const Size aSavedPaperSize (pOutliner->GetPaperSize()); const MapMode aSavedMapMode (pOutliner->GetRefMapMode()); pOutliner->SetPaperSize(aOutRect.GetSize()); - pOutliner->SetUpdateMode(sal_True); + pOutliner->SetUpdateMode(true); long nPageH = aOutRect.GetHeight(); diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index a34406f0a9d9..9b264a8f163a 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -343,7 +343,7 @@ void Outliner::EndSpelling (void) mpImpl->ReleaseOutlinerView(); } - SetUpdateMode(sal_True); + SetUpdateMode(true); } // Before clearing the modify flag use it as a hint that @@ -373,7 +373,7 @@ void Outliner::EndSpelling (void) -sal_Bool Outliner::SpellNextDocument (void) +bool Outliner::SpellNextDocument (void) { ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); if (pViewShell->ISA(OutlineViewShell)) @@ -401,7 +401,7 @@ sal_Bool Outliner::SpellNextDocument (void) ClearModifyFlag(); } - return mbEndOfSearch ? sal_False : sal_True; + return mbEndOfSearch; } @@ -776,7 +776,7 @@ void Outliner::DetectChange (void) if (pPageView != NULL) mpView->UnmarkAllObj (pPageView); mpView->SdrEndTextEdit(); - SetUpdateMode(sal_False); + SetUpdateMode(false); OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); if (pOutlinerView != NULL) pOutlinerView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) ); @@ -988,7 +988,7 @@ void Outliner::ProvideNextTextObject (void) { DBG_UNHANDLED_EXCEPTION(); } - SetUpdateMode(sal_False); + SetUpdateMode(false); OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); if (pOutlinerView != NULL) pOutlinerView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) ); @@ -1379,7 +1379,7 @@ void Outliner::EnterEditMode (sal_Bool bGrabFocus) // Turn on the edit mode for the text object. mpView->SdrBeginTextEdit(mpTextObj, pPV, mpWindow, sal_True, this, pOutlinerView, sal_True, sal_True, bGrabFocus); - SetUpdateMode(sal_True); + SetUpdateMode(true); mbFoundObject = true; } } @@ -1581,10 +1581,10 @@ void Outliner::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLan */ void Outliner::PrepareConversion (void) { - SetUpdateMode(sal_True); + SetUpdateMode(true); if( HasConvertibleTextPortion( mnConversionLanguage ) ) { - SetUpdateMode(sal_False); + SetUpdateMode(false); mbStringFound = true; mbMatchMayExist = true; @@ -1596,7 +1596,7 @@ void Outliner::PrepareConversion (void) } else { - SetUpdateMode(sal_False); + SetUpdateMode(false); } } @@ -1643,7 +1643,7 @@ void Outliner::EndConversion() -sal_Bool Outliner::ConvertNextDocument() +bool Outliner::ConvertNextDocument() { ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); if (pViewShell && pViewShell->ISA(OutlineViewShell) ) @@ -1796,7 +1796,7 @@ void Outliner::Implementation::ProvideOutlinerView ( mpOutlineView->SetControlWord(nStat); if (bInsert) rOutliner.InsertView( mpOutlineView ); - rOutliner.SetUpdateMode(sal_False); + rOutliner.SetUpdateMode(false); mpOutlineView->SetOutputArea (Rectangle (Point(), Size(1, 1))); rOutliner.SetPaperSize( Size(1, 1) ); rOutliner.SetText(OUString(), rOutliner.GetParagraph(0)); diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 18c7a088518a..0b876b47d72e 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -176,7 +176,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet, OutlinerView* pOV = GetTextEditOutlinerView(); ::Outliner* pOutliner = pOV->GetOutliner(); - pOutliner->SetUpdateMode(sal_False); + pOutliner->SetUpdateMode(false); mpDocSh->SetWaitCursor( sal_True ); // replace placeholder by template name @@ -237,7 +237,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet, } mpDocSh->SetWaitCursor( sal_False ); - pOV->GetOutliner()->SetUpdateMode(sal_True); + pOV->GetOutliner()->SetUpdateMode(true); mpDocSh->GetUndoManager()->LeaveListAction(); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 679471c96c47..b0eeb9e3b852 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -830,7 +830,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) ::Outliner* pOutl = mpDrawView->GetTextEditOutliner(); if (pOutl) { - pOutl->RemoveFields(sal_True, (TypeId) SvxURLField::StaticType()); + pOutl->RemoveFields(true, (TypeId) SvxURLField::StaticType()); } pSet = new SfxItemSet( GetPool(), EE_ITEMS_START, EE_ITEMS_END ); @@ -1898,10 +1898,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) pRectObj->SetMergedItem(SdrTextAutoGrowWidthItem(sal_True)); pOutl->UpdateFields(); - pOutl->SetUpdateMode( sal_True ); + pOutl->SetUpdateMode( true ); Size aSize( pOutl->CalcTextSize() ); aSize.Width() *= nMul; - pOutl->SetUpdateMode( sal_False ); + pOutl->SetUpdateMode( false ); Point aPos; Rectangle aRect( aPos, GetActiveWindow()->GetOutputSizePixel() ); diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 9ef7de839d39..b31f946112c6 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -1525,9 +1525,9 @@ void DrawViewShell::InsertURLField(const OUString& rURL, const OUString& rText, SdrRectObj* pRectObj = new SdrRectObj(OBJ_TEXT); pOutl->UpdateFields(); - pOutl->SetUpdateMode( sal_True ); + pOutl->SetUpdateMode( true ); Size aSize(pOutl->CalcTextSize()); - pOutl->SetUpdateMode( sal_False ); + pOutl->SetUpdateMode( false ); Point aPos; diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 8d1703c3bd06..305b71cabd7e 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -435,7 +435,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) case SID_SET_DEFAULT: { - pOutlinerView->RemoveAttribs(sal_True); // sal_True = also paragraph attributes + pOutlinerView->RemoveAttribs(true); // sal_True = also paragraph attributes Cancel(); rReq.Done(); } diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 7531dfa0917c..b44e1df27f43 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -155,7 +155,7 @@ void OutlineViewShell::Construct(DrawDocShell* ) ReadFrameViewData(mpFrameView); ::Outliner* pOutl = pOlView->GetOutliner(); - pOutl->SetUpdateMode(sal_True); + pOutl->SetUpdateMode(true); if (!bModified) { @@ -1136,7 +1136,7 @@ long OutlineViewShell::VirtHScrollHdl(ScrollBar* pHScroll) pOutlinerView->HideCursor(); pOutlinerView->Scroll(-nDelta, 0); - pOutlinerView->ShowCursor(sal_False); + pOutlinerView->ShowCursor(false); pOlView->InvalidateSlideNumberArea(); return 0; @@ -1160,7 +1160,7 @@ long OutlineViewShell::VirtVScrollHdl(ScrollBar* pVScroll) pOutlinerView->HideCursor(); pOutlinerView->Scroll(0, -nDelta); - pOutlinerView->ShowCursor(sal_False); + pOutlinerView->ShowCursor(false); pOlView->InvalidateSlideNumberArea(); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index a12427f8bd03..7ddf67d7aba7 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -122,7 +122,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window* pWindow, OutlineViewSh mpOutlinerView[0] = new OutlinerView(&mrOutliner, pWindow); Rectangle aNullRect; mpOutlinerView[0]->SetOutputArea(aNullRect); - mrOutliner.SetUpdateMode(sal_False); + mrOutliner.SetUpdateMode(false); mrOutliner.InsertView(mpOutlinerView[0], LIST_APPEND); onUpdateStyleSettings( true ); @@ -197,7 +197,7 @@ OutlineView::~OutlineView() // uninitialize Outliner: enable color display ResetLinks(); sal_uLong nCntrl = mrOutliner.GetControlWord(); - mrOutliner.SetUpdateMode(sal_False); // otherwise there will be drawn on SetControlWord + mrOutliner.SetUpdateMode(false); // otherwise there will be drawn on SetControlWord mrOutliner.SetControlWord(nCntrl & ~EE_CNTRL_NOCOLORS); SvtAccessibilityOptions aOptions; mrOutliner.ForceAutoColor( aOptions.GetIsAutomaticFontColor() ); @@ -1097,7 +1097,7 @@ sal_Bool OutlineView::GetAttributes( SfxItemSet& rTargetSet, sal_Bool ) const void OutlineView::FillOutliner() { mrOutliner.GetUndoManager().Clear(); - mrOutliner.EnableUndo(sal_False); + mrOutliner.EnableUndo(false); ResetLinks(); mrOutliner.SetUpdateMode(false); @@ -1183,16 +1183,16 @@ void OutlineView::FillOutliner() // place cursor at the start Paragraph* pFirstPara = mrOutliner.GetParagraph( 0 ); - mpOutlinerView[0]->Select( pFirstPara, sal_True, sal_False ); - mpOutlinerView[0]->Select( pFirstPara, sal_False, sal_False ); + mpOutlinerView[0]->Select( pFirstPara, true, false ); + mpOutlinerView[0]->Select( pFirstPara, false, false ); // select title of slide that was selected if (pTitleToSelect) - mpOutlinerView[0]->Select(pTitleToSelect, sal_True, sal_False); + mpOutlinerView[0]->Select(pTitleToSelect, true, false); SetLinks(); - mrOutliner.EnableUndo(sal_True); + mrOutliner.EnableUndo(true); mrOutliner.SetUpdateMode(true); } @@ -1313,7 +1313,7 @@ void OutlineView::SetActualPage( SdPage* pActual ) // if we found a paragraph, select its text at the outliner view Paragraph* pPara = GetParagraphForPage( mrOutliner, pActual ); if( pPara ) - mpOutlinerView[0]->Select( pPara, sal_True, sal_False ); + mpOutlinerView[0]->Select( pPara, true, false ); } } diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index dc36ec97c9a2..295663c355f3 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -317,7 +317,7 @@ void View::DoPaste (::Window* pWindow) { sal_Bool bOldUpdateMode = pOutliner->GetUpdateMode(); - pOutliner->SetUpdateMode( sal_False ); + pOutliner->SetUpdateMode( false ); const EditEngine& rEdit = pOutliner->GetEditEngine(); const sal_Int32 nParaCount = rEdit.GetParagraphCount(); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 7cf130ca4a0e..be8330fe27e9 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -1379,7 +1379,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if( aRect.IsInside( aPos ) || ( !bDrag && IsTextEdit() ) ) { // mba: clipboard always must contain absolute URLs (could be from alien source) - pOLV->Read( *xStm, OUString(), EE_FORMAT_BIN, sal_False, mpDocSh->GetHeaderAttributes() ); + pOLV->Read( *xStm, OUString(), EE_FORMAT_BIN, false, mpDocSh->GetHeaderAttributes() ); bReturn = true; } } @@ -1414,7 +1414,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if( aRect.IsInside( aPos ) || ( !bDrag && IsTextEdit() ) ) { // mba: clipboard always must contain absolute URLs (could be from alien source) - pOLV->Read( *xStm, OUString(), EE_FORMAT_RTF, sal_False, mpDocSh->GetHeaderAttributes() ); + pOLV->Read( *xStm, OUString(), EE_FORMAT_RTF, false, mpDocSh->GetHeaderAttributes() ); bReturn = true; } } |