summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-10 11:09:59 +0200
committerNoel Grandin <noel@peralex.com>2014-03-11 08:18:24 +0200
commit6c97bc47177adc1c51f69f17e77b9fe2aeade122 (patch)
treef0ae47f9be3c2a72b3b197681ca65644bf82ecfe /sd/source
parentd1bffe3596d21f205cb7a2697bb5142f190b5627 (diff)
svx: sal_Bool->bool
Change-Id: I78da39fc553b2e5040ee6665377ea51a1c4d04d7
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/core/drawdoc.cxx6
-rw-r--r--sd/source/core/drawdoc3.cxx2
-rw-r--r--sd/source/core/sdpage.cxx6
-rw-r--r--sd/source/filter/ppt/pptin.cxx14
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx2
-rw-r--r--sd/source/ui/animations/motionpathtag.cxx16
-rw-r--r--sd/source/ui/annotations/annotationtag.cxx6
-rw-r--r--sd/source/ui/app/sdxfer.cxx2
-rw-r--r--sd/source/ui/dlg/dlgass.cxx6
-rw-r--r--sd/source/ui/docshell/docshel4.cxx6
-rw-r--r--sd/source/ui/func/fuconbez.cxx8
-rw-r--r--sd/source/ui/func/fuconrec.cxx6
-rw-r--r--sd/source/ui/func/fudraw.cxx50
-rw-r--r--sd/source/ui/func/fuediglu.cxx18
-rw-r--r--sd/source/ui/func/fuexpand.cxx2
-rw-r--r--sd/source/ui/func/fuformatpaintbrush.cxx6
-rw-r--r--sd/source/ui/func/fuinsert.cxx2
-rw-r--r--sd/source/ui/func/fupoor.cxx4
-rw-r--r--sd/source/ui/func/fusel.cxx12
-rw-r--r--sd/source/ui/func/futext.cxx12
-rw-r--r--sd/source/ui/inc/View.hxx16
-rw-r--r--sd/source/ui/inc/drawview.hxx2
-rw-r--r--sd/source/ui/table/tablefunction.cxx6
-rw-r--r--sd/source/ui/unoidl/unoobj.cxx2
-rw-r--r--sd/source/ui/unoidl/unopage.cxx12
-rw-r--r--sd/source/ui/view/Outliner.cxx4
-rw-r--r--sd/source/ui/view/drawview.cxx2
-rw-r--r--sd/source/ui/view/drviews2.cxx18
-rw-r--r--sd/source/ui/view/drviews3.cxx2
-rw-r--r--sd/source/ui/view/drviews5.cxx2
-rw-r--r--sd/source/ui/view/drviews7.cxx12
-rw-r--r--sd/source/ui/view/drviewsa.cxx4
-rw-r--r--sd/source/ui/view/drviewse.cxx6
-rw-r--r--sd/source/ui/view/drviewsj.cxx16
-rw-r--r--sd/source/ui/view/frmview.cxx12
-rw-r--r--sd/source/ui/view/sdview.cxx28
-rw-r--r--sd/source/ui/view/sdview2.cxx4
-rw-r--r--sd/source/ui/view/sdview3.cxx4
-rw-r--r--sd/source/ui/view/viewoverlaymanager.cxx6
39 files changed, 172 insertions, 172 deletions
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 32c592c26b02..144484e4318d 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -390,7 +390,7 @@ SdDrawDocument::~SdDrawDocument()
CloseBookmarkDoc();
SetAllocDocSh(false);
- ClearModel(sal_True);
+ ClearModel(true);
if (pLinkManager)
{
@@ -748,7 +748,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
if( iter == aOutlineList.begin())
// text frame listens to stylesheet of layer 1
- pObj->NbcSetStyleSheet(pSheet, sal_True);
+ pObj->NbcSetStyleSheet(pSheet, true);
}
}
}
@@ -762,7 +762,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
{
sd::Outliner* pInternalOutl = GetInternalOutliner(sal_True);
pPage->SetObjText( (SdrTextObj*) pObj, pInternalOutl, ePresObjKind, aString );
- pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( ePresObjKind ), sal_True );
+ pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( ePresObjKind ), true );
pInternalOutl->Clear();
}
}
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index b55510a91589..1bccb601148a 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1036,7 +1036,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsObject(
pPV = pBMView->ShowSdrPage(pPage);
}
- pBMView->MarkObj(pObj, pPV, sal_False);
+ pBMView->MarkObj(pObj, pPV, false);
}
}
}
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 19efb97b2190..adc8f73af4d0 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -411,7 +411,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const
// Tell the object EARLY that it is vertical to have the
// defaults for AutoGrowWidth/Height reversed
if(bVertical)
- ((SdrTextObj*)pSdrObj)->SetVerticalWriting(sal_True);
+ ((SdrTextObj*)pSdrObj)->SetVerticalWriting(true);
SfxItemSet aTempAttr( ((SdDrawDocument*) pModel)->GetPool() );
if( bVertical )
@@ -2227,7 +2227,7 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind,
SdrTextObj* pTextObject = dynamic_cast< SdrTextObj* >(pObj);
if( pTextObject )
{
- if( pTextObject->IsVerticalWriting() != (bVertical ? sal_True : sal_False) )
+ if( pTextObject->IsVerticalWriting() != bVertical )
{
pTextObject->SetVerticalWriting( bVertical );
@@ -2897,7 +2897,7 @@ bool SdPage::RestoreDefaultText( SdrObject* pObj )
}
pTextObj->SetTextEditOutliner( NULL ); // to make stylesheet settings work
- pTextObj->NbcSetStyleSheet( GetStyleSheetForPresObj(ePresObjKind), sal_True );
+ pTextObj->NbcSetStyleSheet( GetStyleSheetForPresObj(ePresObjKind), true );
pTextObj->SetEmptyPresObj(true);
bRet = true;
}
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 10d9e7210ff6..84f1deb75e88 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1480,7 +1480,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const sal_Bool bNewAnimat
if(pPage->TRG_HasMasterPage())
{
SetOfByte aVisibleLayers = pPage->TRG_GetMasterPageVisibleLayers();
- aVisibleLayers.Set(mnBackgroundObjectsLayerID, sal_False);
+ aVisibleLayers.Set(mnBackgroundObjectsLayerID, false);
pPage->TRG_SetMasterPageVisibleLayers(aVisibleLayers);
}
}
@@ -2169,7 +2169,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
{
pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE );
if ( pSheet )
- ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True );
+ ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, true );
DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for titleobject (SJ)" );
}
break;
@@ -2177,7 +2177,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
{
pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TEXT );
if ( pSheet )
- ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True );
+ ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, true );
DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for subtitleobject (SJ)" );
}
break;
@@ -2197,7 +2197,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
}
DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for outlinerobject (SJ)" );
if ( pSheet )
- ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True );
+ ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, true );
ppStyleSheetAry = &pStyleSheetAry[ 0 ];
}
break;
@@ -2208,7 +2208,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
{
pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE );
if ( pSheet )
- ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True );
+ ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, true );
DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for titleobject (SJ)" );
}
else
@@ -2216,7 +2216,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
pSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_NOTES );
DBG_ASSERT( pSheet, "ImplSdPPTImport::ApplyTextObj -> could not get stylesheet for notesobj (SJ)" );
if ( pSheet )
- ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, sal_True );
+ ((SdrAttrObj*)pText)->SdrAttrObj::NbcSetStyleSheet( pSheet, true );
}
}
break;
@@ -2280,7 +2280,7 @@ SdrObject* ImplSdPPTImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pObj
rItemSet.Put( pText->GetMergedItemSet() );
}
}
- pText->NbcSetStyleSheet( pSheet2, sal_False );
+ pText->NbcSetStyleSheet( pSheet2, false );
}
SfxItemSet aTempAttr( mpDoc->GetPool() );
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 18f0b90e17d3..958808ade2a6 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2245,7 +2245,7 @@ void CustomAnimationPane::markShapesFromSelectedEffects()
Reference< XShape > xShape( pEffect->getTargetShape() );
SdrObject* pObj = GetSdrObjectFromXShape( xShape );
if( pObj )
- pView->MarkObj(pObj, pView->GetSdrPageView(), sal_False, sal_False);
+ pView->MarkObj(pObj, pView->GetSdrPageView(), false, false);
}
}
}
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 90a3476da99e..58bb10d8ee2d 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -253,7 +253,7 @@ public:
SdPathHdl( const SmartTagReference& xTag, SdrPathObj* mpPathObj );
virtual ~SdPathHdl();
virtual void CreateB2dIAObject();
- virtual sal_Bool IsFocusHdl() const;
+ virtual bool IsFocusHdl() const;
virtual Pointer GetSdrDragPointer() const;
virtual bool isMarkable() const;
@@ -319,9 +319,9 @@ void SdPathHdl::CreateB2dIAObject()
-sal_Bool SdPathHdl::IsFocusHdl() const
+bool SdPathHdl::IsFocusHdl() const
{
- return sal_False;
+ return false;
}
@@ -517,7 +517,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl )
bool bClosed0(mpPathObj->IsClosedObj());
- sal_uInt32 nInsPointNum = mpPathObj->NbcInsPointOld(aPt, bNewObj, sal_True);
+ sal_uInt32 nInsPointNum = mpPathObj->NbcInsPointOld(aPt, bNewObj, true);
if(bClosed0 != mpPathObj->IsClosedObj())
{
@@ -794,7 +794,7 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt )
if(!bWasNoSnap)
((SdrDragStat&)mrView.GetDragStat()).SetNoSnap(true);
if(bWasSnapEnabled)
- mrView.SetSnapEnabled(sal_False);
+ mrView.SetSnapEnabled(false);
mrView.MovAction(aEndPoint);
mrView.EndDragObj();
@@ -879,7 +879,7 @@ sal_Bool MotionPathTag::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark )
{
SmartHdl* pHdl = dynamic_cast< SmartHdl* >( mrView.GetHdl( sal::static_int_cast< sal_uLong >( nHdlNum-- ) ) );
- if( pHdl && (pHdl->getTag().get() == this) && mrView.IsPointMarkable(*pHdl) && pHdl->IsSelected()==bUnmark)
+ if( pHdl && (pHdl->getTag().get() == this) && mrView.IsPointMarkable(*pHdl) && (pHdl->IsSelected() ? 1 : 0)==bUnmark)
{
Point aPos(pHdl->GetPos());
if( pRect==NULL || pRect->IsInside(aPos))
@@ -970,7 +970,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList )
if( isSelected() )
{
- mrView.GetSdrPageView()->SetHasMarkedObj(sal_True);
+ mrView.GetSdrPageView()->SetHasMarkedObj(true);
if( !mrView.IsFrameDragSingles() )
{
@@ -1006,7 +1006,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList )
{
pPlusHdl->SetObj(mpPathObj);
pPlusHdl->SetPageView(mrView.GetSdrPageView());
- pPlusHdl->SetPlusHdl(sal_True);
+ pPlusHdl->SetPlusHdl(true);
rHandlerList.AddHdl(pPlusHdl);
}
}
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index 6f5ce349571c..c96bef51f24e 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -166,7 +166,7 @@ public:
AnnotationHdl( const SmartTagReference& xTag, const Reference< XAnnotation >& xAnnotation, const Point& rPnt );
virtual ~AnnotationHdl();
virtual void CreateB2dIAObject();
- virtual sal_Bool IsFocusHdl() const;
+ virtual bool IsFocusHdl() const;
virtual Pointer GetSdrDragPointer() const;
virtual bool isMarkable() const;
@@ -257,9 +257,9 @@ void AnnotationHdl::CreateB2dIAObject()
-sal_Bool AnnotationHdl::IsFocusHdl() const
+bool AnnotationHdl::IsFocusHdl() const
{
- return sal_True;
+ return true;
}
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index a8dd1f739b1d..9913f2c5499f 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -676,7 +676,7 @@ void SdTransferable::SetPageBookmarks( const std::vector<OUString> &rPageBookmar
if( mpSdViewIntern )
mpSdViewIntern->HideSdrPage();
- mpSdDrawDocument->ClearModel(sal_False);
+ mpSdDrawDocument->ClearModel(false);
mpPageDocShell = NULL;
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 8b7df0406d26..8bed87aaf502 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1420,7 +1420,7 @@ void AssistentDlgImpl::UpdateUserData()
if( pObj )
{
pPage->SetObjText( pObj, NULL, PRESOBJ_TITLE, aTopic );
- pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ), sal_True );
+ pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ), true );
pObj->SetEmptyPresObj(false);
}
@@ -1437,7 +1437,7 @@ void AssistentDlgImpl::UpdateUserData()
if( pObj )
{
pPage->SetObjText( pObj, NULL, PRESOBJ_OUTLINE, aStrTmp );
- pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_OUTLINE ), sal_True );
+ pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_OUTLINE ), true );
pObj->SetEmptyPresObj(false);
}
else
@@ -1446,7 +1446,7 @@ void AssistentDlgImpl::UpdateUserData()
if( pObj )
{
pPage->SetObjText( pObj, NULL, PRESOBJ_TEXT, aStrTmp );
- pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_TEXT ), sal_True );
+ pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( PRESOBJ_TEXT ), true );
pObj->SetEmptyPresObj(false);
}
}
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 96d20b1bfd39..f90222a9d4f0 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -277,7 +277,7 @@ sal_Bool DrawDocShell::Load( SfxMedium& rMedium )
{
if( ( SFX_ITEM_SET == pSet->GetItemState(SID_PREVIEW ) ) && ( (SfxBoolItem&) ( pSet->Get( SID_PREVIEW ) ) ).GetValue() )
{
- mpDoc->SetStarDrawPreviewMode( sal_True );
+ mpDoc->SetStarDrawPreviewMode( true );
}
if( SFX_ITEM_SET == pSet->GetItemState(SID_DOC_STARTPRESENTATION)&&
@@ -419,7 +419,7 @@ sal_Bool DrawDocShell::ConvertFrom( SfxMedium& rMedium )
{
if( ( SFX_ITEM_SET == pSet->GetItemState(SID_PREVIEW ) ) && ( (SfxBoolItem&) ( pSet->Get( SID_PREVIEW ) ) ).GetValue() )
{
- mpDoc->SetStarDrawPreviewMode( sal_True );
+ mpDoc->SetStarDrawPreviewMode( true );
}
if( SFX_ITEM_SET == pSet->GetItemState(SID_DOC_STARTPRESENTATION)&&
@@ -829,7 +829,7 @@ sal_Bool DrawDocShell::GotoBookmark(const OUString& rBookmark)
pDrawViewShell->GetView()->UnmarkAll();
pDrawViewShell->GetView()->MarkObj(
pObj,
- pDrawViewShell->GetView()->GetSdrPageView(), sal_False);
+ pDrawViewShell->GetView()->GetSdrPageView(), false);
}
}
}
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index 473a8f966eb4..59b6f057d09d 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -109,11 +109,11 @@ sal_Bool FuConstructBezierPolygon::MouseButtonDown(const MouseEvent& rMEvt)
{
// here, we do not allow text input
aVEvt.eEvent = SDREVENT_BEGDRAGOBJ;
- mpView->EnableExtendedMouseEventDispatcher(sal_False);
+ mpView->EnableExtendedMouseEventDispatcher(false);
}
else
{
- mpView->EnableExtendedMouseEventDispatcher(sal_True);
+ mpView->EnableExtendedMouseEventDispatcher(true);
}
if (eHit == SDRHIT_MARKEDOBJECT && nEditMode == SID_BEZIER_INSERT)
@@ -238,7 +238,7 @@ sal_Bool FuConstructBezierPolygon::KeyInput(const KeyEvent& rKEvt)
void FuConstructBezierPolygon::Activate()
{
- mpView->EnableExtendedMouseEventDispatcher(sal_True);
+ mpView->EnableExtendedMouseEventDispatcher(true);
SdrObjKind eKind;
@@ -297,7 +297,7 @@ void FuConstructBezierPolygon::Activate()
void FuConstructBezierPolygon::Deactivate()
{
- mpView->EnableExtendedMouseEventDispatcher(sal_False);
+ mpView->EnableExtendedMouseEventDispatcher(false);
FuConstruct::Deactivate();
}
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index dcbb9bded9f3..6c04adeeb0f0 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -214,7 +214,7 @@ sal_Bool FuConstructRectangle::MouseButtonDown(const MouseEvent& rMEvt)
pObj->SetMergedItemSet(aAttr);
if( nSlotId == SID_DRAW_CAPTION_VERTICAL )
- ( (SdrTextObj*) pObj)->SetVerticalWriting( sal_True );
+ ( (SdrTextObj*) pObj)->SetVerticalWriting( true );
}
}
return bReturn;
@@ -890,8 +890,8 @@ SdrObject* FuConstructRectangle::CreateDefaultObject(const sal_uInt16 nID, const
{
if(pObj->ISA(SdrEdgeObj))
{
- ((SdrEdgeObj*)pObj)->SetTailPoint(sal_False, aStart);
- ((SdrEdgeObj*)pObj)->SetTailPoint(sal_True, aEnd);
+ ((SdrEdgeObj*)pObj)->SetTailPoint(false, aStart);
+ ((SdrEdgeObj*)pObj)->SetTailPoint(true, aEnd);
}
else
{
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 6974f6a56e5b..7b0612af17ce 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -133,46 +133,46 @@ sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
}
if (!mpView->IsSnapEnabled())
- mpView->SetSnapEnabled(sal_True);
- sal_Bool bSnapModPressed = rMEvt.IsMod1();
+ mpView->SetSnapEnabled(true);
+ bool bSnapModPressed = rMEvt.IsMod1();
- sal_Bool bGridSnap = pFrameView->IsGridSnap();
+ bool bGridSnap = pFrameView->IsGridSnap();
bGridSnap = (bSnapModPressed != bGridSnap);
if (mpView->IsGridSnap() != bGridSnap)
mpView->SetGridSnap(bGridSnap);
- sal_Bool bBordSnap = pFrameView->IsBordSnap();
+ bool bBordSnap = pFrameView->IsBordSnap();
bBordSnap = (bSnapModPressed != bBordSnap);
if (mpView->IsBordSnap() != bBordSnap)
mpView->SetBordSnap(bBordSnap);
- sal_Bool bHlplSnap = pFrameView->IsHlplSnap();
+ bool bHlplSnap = pFrameView->IsHlplSnap();
bHlplSnap = (bSnapModPressed != bHlplSnap);
if (mpView->IsHlplSnap() != bHlplSnap)
mpView->SetHlplSnap(bHlplSnap);
- sal_Bool bOFrmSnap = pFrameView->IsOFrmSnap();
+ bool bOFrmSnap = pFrameView->IsOFrmSnap();
bOFrmSnap = (bSnapModPressed != bOFrmSnap);
if (mpView->IsOFrmSnap() != bOFrmSnap)
mpView->SetOFrmSnap(bOFrmSnap);
- sal_Bool bOPntSnap = pFrameView->IsOPntSnap();
+ bool bOPntSnap = pFrameView->IsOPntSnap();
bOPntSnap = (bSnapModPressed != bOPntSnap);
if (mpView->IsOPntSnap() != bOPntSnap)
mpView->SetOPntSnap(bOPntSnap);
- sal_Bool bOConSnap = pFrameView->IsOConSnap();
+ bool bOConSnap = pFrameView->IsOConSnap();
bOConSnap = (bSnapModPressed != bOConSnap);
if (mpView->IsOConSnap() != bOConSnap)
mpView->SetOConSnap(bOConSnap);
- sal_Bool bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled();
+ bool bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled();
if (mpView->IsAngleSnapEnabled() != bAngleSnap)
mpView->SetAngleSnapEnabled(bAngleSnap);
@@ -180,7 +180,7 @@ sal_Bool FuDraw::MouseButtonDown(const MouseEvent& rMEvt)
if (mpView->IsOrtho() != bOrtho)
mpView->SetOrtho(bOrtho);
- sal_Bool bCenter = rMEvt.IsMod2();
+ bool bCenter = rMEvt.IsMod2();
if ( mpView->IsCreate1stPointAsCenter() != bCenter ||
mpView->IsResizeAtCenter() != bCenter )
@@ -249,46 +249,46 @@ sal_Bool FuDraw::MouseMove(const MouseEvent& rMEvt)
bOrtho = rMEvt.IsShift() != pFrameView->IsOrtho();
}
- sal_Bool bSnapModPressed = rMEvt.IsMod2();
+ bool bSnapModPressed = rMEvt.IsMod2();
mpView->SetDragWithCopy(rMEvt.IsMod1() && pFrameView->IsDragWithCopy());
- sal_Bool bGridSnap = pFrameView->IsGridSnap();
+ bool bGridSnap = pFrameView->IsGridSnap();
bGridSnap = (bSnapModPressed != bGridSnap);
if (mpView->IsGridSnap() != bGridSnap)
mpView->SetGridSnap(bGridSnap);
- sal_Bool bBordSnap = pFrameView->IsBordSnap();
+ bool bBordSnap = pFrameView->IsBordSnap();
bBordSnap = (bSnapModPressed != bBordSnap);
if (mpView->IsBordSnap() != bBordSnap)
mpView->SetBordSnap(bBordSnap);
- sal_Bool bHlplSnap = pFrameView->IsHlplSnap();
+ bool bHlplSnap = pFrameView->IsHlplSnap();
bHlplSnap = (bSnapModPressed != bHlplSnap);
if (mpView->IsHlplSnap() != bHlplSnap)
mpView->SetHlplSnap(bHlplSnap);
- sal_Bool bOFrmSnap = pFrameView->IsOFrmSnap();
+ bool bOFrmSnap = pFrameView->IsOFrmSnap();
bOFrmSnap = (bSnapModPressed != bOFrmSnap);
if (mpView->IsOFrmSnap() != bOFrmSnap)
mpView->SetOFrmSnap(bOFrmSnap);
- sal_Bool bOPntSnap = pFrameView->IsOPntSnap();
+ bool bOPntSnap = pFrameView->IsOPntSnap();
bOPntSnap = (bSnapModPressed != bOPntSnap);
if (mpView->IsOPntSnap() != bOPntSnap)
mpView->SetOPntSnap(bOPntSnap);
- sal_Bool bOConSnap = pFrameView->IsOConSnap();
+ bool bOConSnap = pFrameView->IsOConSnap();
bOConSnap = (bSnapModPressed != bOConSnap);
if (mpView->IsOConSnap() != bOConSnap)
mpView->SetOConSnap(bOConSnap);
- sal_Bool bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled();
+ bool bAngleSnap = rMEvt.IsShift() == !pFrameView->IsAngleSnapEnabled();
if (mpView->IsAngleSnapEnabled() != bAngleSnap)
mpView->SetAngleSnapEnabled(bAngleSnap);
@@ -296,7 +296,7 @@ sal_Bool FuDraw::MouseMove(const MouseEvent& rMEvt)
if (mpView->IsOrtho() != bOrtho)
mpView->SetOrtho(bOrtho);
- sal_Bool bCenter = rMEvt.IsMod2();
+ bool bCenter = rMEvt.IsMod2();
if ( mpView->IsCreate1stPointAsCenter() != bCenter ||
mpView->IsResizeAtCenter() != bCenter )
@@ -342,9 +342,9 @@ sal_Bool FuDraw::MouseButtonUp(const MouseEvent& rMEvt)
FrameView* pFrameView = mpViewShell->GetFrameView();
mpView->SetOrtho( pFrameView->IsOrtho() );
mpView->SetAngleSnapEnabled( pFrameView->IsAngleSnapEnabled() );
- mpView->SetSnapEnabled(sal_True);
- mpView->SetCreate1stPointAsCenter(sal_False);
- mpView->SetResizeAtCenter(sal_False);
+ mpView->SetSnapEnabled(true);
+ mpView->SetCreate1stPointAsCenter(false);
+ mpView->SetResizeAtCenter(false);
mpView->SetDragWithCopy(pFrameView->IsDragWithCopy());
mpView->SetGridSnap(pFrameView->IsGridSnap());
mpView->SetBordSnap(pFrameView->IsBordSnap());
@@ -452,7 +452,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
{
// mark last object
mpView->UnmarkAllObj();
- mpView->MarkNextObj(sal_False);
+ mpView->MarkNextObj(false);
if(mpView->AreObjectsMarked())
mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow);
@@ -470,7 +470,7 @@ sal_Bool FuDraw::KeyInput(const KeyEvent& rKEvt)
{
// mark first object
mpView->UnmarkAllObj();
- mpView->MarkNextObj(sal_True);
+ mpView->MarkNextObj(true);
if(mpView->AreObjectsMarked())
mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow);
@@ -777,7 +777,7 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt)
{
// hit group -> select subobject
mpView->UnMarkAll();
- mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), sal_True);
+ mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), true);
}
}
}
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index 033ab08fc09a..e7cfb70f64a0 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -67,7 +67,7 @@ rtl::Reference<FuPoor> FuEditGluePoints::Create( ViewShell* pViewSh, ::sd::Windo
void FuEditGluePoints::DoExecute( SfxRequest& rReq )
{
FuDraw::DoExecute( rReq );
- mpView->SetInsGluePointMode(sal_False);
+ mpView->SetInsGluePointMode(false);
mpViewShell->GetViewShellBase().GetToolBarManager()->AddToolBar(
ToolBarManager::TBG_FUNCTION,
ToolBarManager::msGluePointsToolBar);
@@ -78,7 +78,7 @@ FuEditGluePoints::~FuEditGluePoints()
{
mpView->BrkAction();
mpView->UnmarkAllGluePoints();
- mpView->SetInsGluePointMode(sal_False);
+ mpView->SetInsGluePointMode(false);
}
@@ -384,7 +384,7 @@ void FuEditGluePoints::Activate()
void FuEditGluePoints::Deactivate()
{
- mpView->SetGluePointEditMode( sal_False );
+ mpView->SetGluePointEditMode( false );
FuDraw::Deactivate();
}
@@ -438,37 +438,37 @@ void FuEditGluePoints::ReceiveRequest(SfxRequest& rReq)
case SID_GLUE_HORZALIGN_CENTER:
{
- mpView->SetMarkedGluePointsAlign(sal_False, SDRHORZALIGN_CENTER);
+ mpView->SetMarkedGluePointsAlign(false, SDRHORZALIGN_CENTER);
}
break;
case SID_GLUE_HORZALIGN_LEFT:
{
- mpView->SetMarkedGluePointsAlign(sal_False, SDRHORZALIGN_LEFT);
+ mpView->SetMarkedGluePointsAlign(false, SDRHORZALIGN_LEFT);
}
break;
case SID_GLUE_HORZALIGN_RIGHT:
{
- mpView->SetMarkedGluePointsAlign(sal_False, SDRHORZALIGN_RIGHT);
+ mpView->SetMarkedGluePointsAlign(false, SDRHORZALIGN_RIGHT);
}
break;
case SID_GLUE_VERTALIGN_CENTER:
{
- mpView->SetMarkedGluePointsAlign(sal_True, SDRVERTALIGN_CENTER);
+ mpView->SetMarkedGluePointsAlign(true, SDRVERTALIGN_CENTER);
}
break;
case SID_GLUE_VERTALIGN_TOP:
{
- mpView->SetMarkedGluePointsAlign(sal_True, SDRVERTALIGN_TOP);
+ mpView->SetMarkedGluePointsAlign(true, SDRVERTALIGN_TOP);
}
break;
case SID_GLUE_VERTALIGN_BOTTOM:
{
- mpView->SetMarkedGluePointsAlign(sal_True, SDRVERTALIGN_BOTTOM);
+ mpView->SetMarkedGluePointsAlign(true, SDRVERTALIGN_BOTTOM);
}
break;
}
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index bc9bcd57f758..5af78118f979 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -203,7 +203,7 @@ void FuExpandPage::DoExecute( SfxRequest& )
pTextObj->SetEmptyPresObj(false);
SfxStyleSheet* pSheet = pPage->GetStyleSheetForPresObj(PRESOBJ_TITLE);
- pTextObj->NbcSetStyleSheet(pSheet, sal_False);
+ pTextObj->NbcSetStyleSheet(pSheet, false);
sal_Int32 nChildCount = pOutl->GetChildCount(pPara);
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index 053be3d51f84..9966adffdc7b 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -141,7 +141,7 @@ sal_Bool FuFormatPaintBrush::MouseButtonDown(const MouseEvent& rMEvt)
{
sal_uInt16 nHitLog = sal_uInt16 ( mpWindow->PixelToLogic(Size(HITPIX,0)).Width() );
sal_Bool bToggle = sal_False;
- mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, sal_False);
+ mpView->MarkObj(mpWindow->PixelToLogic( rMEvt.GetPosPixel() ), nHitLog, bToggle, false);
return sal_True;
}
}
@@ -219,7 +219,7 @@ void FuFormatPaintBrush::Activate()
if( !mbOldIsQuickTextEditMode )
{
mpViewShell->GetFrameView()->SetQuickEdit(sal_True);
- mpView->SetQuickTextEditMode(sal_True);
+ mpView->SetQuickTextEditMode(true);
}
}
@@ -228,7 +228,7 @@ void FuFormatPaintBrush::Deactivate()
if( !mbOldIsQuickTextEditMode )
{
mpViewShell->GetFrameView()->SetQuickEdit(sal_False);
- mpView->SetQuickTextEditMode(sal_False);
+ mpView->SetQuickTextEditMode(false);
}
}
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 0a9cbce20b54..13f71bad655b 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -364,7 +364,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
bool bRet = true;
if( pPickObj )
- mpView->ReplaceObjectAtView(pPickObj, *pPV, pOleObj, sal_True );
+ mpView->ReplaceObjectAtView(pPickObj, *pPV, pOleObj, true );
else
bRet = mpView->InsertObjectAtView(pOleObj, *pPV, SDRINSERT_SETDEFLAYER);
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 15843061abe4..c3ef547d1266 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -654,7 +654,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt)
{
// Suppress default connects to inside object and object center
bOldSuppress = pEdgeObj->GetSuppressDefaultConnect();
- pEdgeObj->SetSuppressDefaultConnect(sal_True);
+ pEdgeObj->SetSuppressDefaultConnect(true);
}
if(bIsMoveOfConnectedHandle)
@@ -760,7 +760,7 @@ sal_Bool FuPoor::KeyInput(const KeyEvent& rKEvt)
if(!bWasNoSnap)
((SdrDragStat&)rDragStat).SetNoSnap(true);
if(bWasSnapEnabled)
- mpView->SetSnapEnabled(sal_False);
+ mpView->SetSnapEnabled(false);
mpView->MovAction(aEndPoint);
mpView->EndDragObj();
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 1dc415d6eb1e..529f135140b2 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -375,7 +375,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
bToggle = sal_True;
}
- bMarked = mpView->MarkObj(aMDPos, nHitLog, bToggle, sal_False);
+ bMarked = mpView->MarkObj(aMDPos, nHitLog, bToggle, false);
}
}
@@ -520,7 +520,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
}
else
{
- bMarked = mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), sal_False);
+ bMarked = mpView->MarkObj(aMDPos, nHitLog, rMEvt.IsShift(), false);
}
}
@@ -883,7 +883,7 @@ sal_Bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
std::abs(aPnt.Y() - aMDPos.Y()) < nDrgLog)
{
// Enter group
- mpView->MarkObj(aPnt, nHitLog, sal_False, rMEvt.IsMod1());
+ mpView->MarkObj(aPnt, nHitLog, false, rMEvt.IsMod1());
}
@@ -1176,11 +1176,11 @@ void FuSelection::SetEditMode(sal_uInt16 nMode)
if (nEditMode == SID_BEZIER_INSERT)
{
- mpView->SetInsObjPointMode(sal_True);
+ mpView->SetInsObjPointMode(true);
}
else
{
- mpView->SetInsObjPointMode(sal_False);
+ mpView->SetInsObjPointMode(false);
}
ForcePointer();
@@ -1355,7 +1355,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
{
// Assign verb
mpView->UnmarkAll();
- mpView->MarkObj(pObj, mpView->GetSdrPageView(), sal_False, sal_False);
+ mpView->MarkObj(pObj, mpView->GetSdrPageView(), false, false);
pDrViewSh->DoVerb((sal_Int16)pInfo->mnVerb);
bAnimated = sal_True;
}
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 361315283bf5..e0690f631b06 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -156,7 +156,7 @@ void FuText::disposing()
{
if(mpView)
{
- if(mpView->SdrEndTextEdit(sal_False) == SDRENDTEXTEDIT_DELETED)
+ if(mpView->SdrEndTextEdit(false) == SDRENDTEXTEDIT_DELETED)
mxTextObj.reset( 0 );
// reset the RequestHandler of the used Outliner to the handler of the document
@@ -254,7 +254,7 @@ sal_Bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
sal_Bool bReturn = FuDraw::MouseButtonDown(rMEvt);
- mpView->SetMarkHdlWhenTextEdit(sal_True);
+ mpView->SetMarkHdlWhenTextEdit(true);
SdrViewEvent aVEvt;
SdrHitKind eHit = mpView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
@@ -777,7 +777,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
sal_Bool bSnapEnabled = mpView->IsSnapEnabled();
if (bSnapEnabled)
- mpView->SetSnapEnabled(sal_False);
+ mpView->SetSnapEnabled(false);
aPnt.X() += nDrgLog + nDrgLog;
aPnt.Y() += nDrgLog + nDrgLog;
@@ -907,7 +907,7 @@ sal_Bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
sal_Bool FuText::KeyInput(const KeyEvent& rKEvt)
{
sal_Bool bReturn = sal_False;
- mpView->SetMarkHdlWhenTextEdit(sal_True);
+ mpView->SetMarkHdlWhenTextEdit(true);
KeyCode nCode = rKEvt.GetKeyCode();
sal_Bool bShift = nCode.IsShift();
@@ -1059,7 +1059,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag)
SdrOutliner* pOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, mpDoc );
if (bEmptyOutliner)
- mpView->SdrEndTextEdit(sal_True);
+ mpView->SdrEndTextEdit(true);
SdrTextObj* pTextObj = GetTextObj();
if( pTextObj )
@@ -1075,7 +1075,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, sal_Bool bQuickDrag)
pTextObj->setActiveText( pTextObj->CheckTextHit(aPnt ) );
}
- if (mpView->SdrBeginTextEdit(pTextObj, pPV, mpWindow, sal_True, pOutl) && mxTextObj->GetObjInventor() == SdrInventor)
+ if (mpView->SdrBeginTextEdit(pTextObj, pPV, mpWindow, true, pOutl) && mxTextObj->GetObjInventor() == SdrInventor)
{
bFirstObjCreated = sal_True;
DeleteDefaultText();
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index d8ce41627f3f..c270616eacce 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -119,11 +119,11 @@ public:
inline SdDrawDocument& GetDoc (void) const;
inline ViewShell* GetViewShell (void) const;
- virtual sal_Bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::Window* pWin = 0L, sal_Bool bIsNewObj = sal_False,
+ virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::Window* pWin = 0L, bool bIsNewObj = false,
SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L,
- sal_Bool bDontDeleteOutliner = sal_False, sal_Bool bOnlyOneView = sal_False, sal_Bool bGrabFocus = sal_True);
+ bool bDontDeleteOutliner = false, bool bOnlyOneView = false, bool bGrabFocus = true);
- virtual SdrEndTextEditKind SdrEndTextEdit(sal_Bool bDontDeleteReally = sal_False);
+ virtual SdrEndTextEditKind SdrEndTextEdit(bool bDontDeleteReally = false);
bool RestoreDefaultText( SdrTextObj* pTextObj );
@@ -170,7 +170,7 @@ public:
virtual void onAccessibilityOptionsChanged();
virtual SdrModel* GetMarkedObjModel() const;
- virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+ virtual bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
using SdrExchangeView::Paste;
/** returns true if we have an undo manager and there is an open list undo action */
@@ -183,12 +183,12 @@ public:
void updateHandles();
virtual SdrViewContext GetContext() const;
- virtual sal_Bool HasMarkablePoints() const;
+ virtual bool HasMarkablePoints() const;
virtual sal_uLong GetMarkablePointCount() const;
- virtual sal_Bool HasMarkedPoints() const;
+ virtual bool HasMarkedPoints() const;
virtual sal_uLong GetMarkedPointCount() const;
- virtual sal_Bool IsPointMarkable(const SdrHdl& rHdl) const;
- virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False);
+ virtual bool IsPointMarkable(const SdrHdl& rHdl) const;
+ virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false);
virtual void CheckPossibilities();
virtual sal_Bool MarkPoints(const ::Rectangle* pRect, sal_Bool bUnmark);
using SdrMarkView::MarkPoints;
diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx
index f231b37c21cc..06a41a69acf0 100644
--- a/sd/source/ui/inc/drawview.hxx
+++ b/sd/source/ui/inc/drawview.hxx
@@ -52,7 +52,7 @@ public:
void BlockPageOrderChangedHint(sal_Bool bBlock);
sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr = sal_False);
- virtual sal_Bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const;
+ virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const;
virtual void MakeVisible(const Rectangle& rRect, ::Window& rWin);
virtual void HideSdrPage(); // SdrPageView* pPV);
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index f082b2729ff4..cc07c595e5d1 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -160,7 +160,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
}
::sdr::table::SdrTableObj* pObj = new ::sdr::table::SdrTableObj( GetDoc(), aRect, nColumns, nRows );
- pObj->NbcSetStyleSheet( GetDoc()->GetDefaultStyleSheet(), sal_True );
+ pObj->NbcSetStyleSheet( GetDoc()->GetDefaultStyleSheet(), true );
apply_table_style( pObj, GetDoc(), sTableStyle );
SdrPageView* pPV = mpView->GetSdrPageView();
@@ -186,7 +186,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
GetParentWindow()->GrabFocus();
if( pPickObj )
- mpView->ReplaceObjectAtView(pPickObj, *pPV, pObj, sal_True );
+ mpView->ReplaceObjectAtView(pPickObj, *pPV, pObj, true );
else
mpView->InsertObjectAtView(pObj, *pPV, SDRINSERT_SETDEFLAYER);
@@ -261,7 +261,7 @@ void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel )
Point aPos;
Rectangle aRect (aPos, aSize);
::sdr::table::SdrTableObj* pObj = new ::sdr::table::SdrTableObj( pModel, aRect, 1, 1 );
- pObj->NbcSetStyleSheet( pModel->GetDefaultStyleSheet(), sal_True );
+ pObj->NbcSetStyleSheet( pModel->GetDefaultStyleSheet(), true );
OUString sTableStyle;
apply_table_style( pObj, pModel, sTableStyle );
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index bfd6b4a2cbea..119fe9e0aadb 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -1005,7 +1005,7 @@ void SdXShape::SetEmptyPresObj(bool bEmpty)
// really delete SdrOutlinerObj at pObj
pObj->NbcSetOutlinerParaObject(0L);
if( bVertical && PTR_CAST( SdrTextObj, pObj ) )
- ((SdrTextObj*)pObj)->SetVerticalWriting( sal_True );
+ ((SdrTextObj*)pObj)->SetVerticalWriting( true );
SdrGrafObj* pGraphicObj = PTR_CAST( SdrGrafObj, pObj );
if( pGraphicObj )
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 4f199891da26..52e3ac793391 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -403,7 +403,7 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap
{
SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel();
if( pDoc )
- pObj->NbcSetStyleSheet( pDoc->GetDefaultStyleSheet(), sal_True );
+ pObj->NbcSetStyleSheet( pDoc->GetDefaultStyleSheet(), true );
}
return pObj;
}
@@ -500,7 +500,7 @@ SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference< drawing::XShap
{
SdDrawDocument* pDoc = (SdDrawDocument*)GetPage()->GetModel();
if( pDoc )
- pPresObj->NbcSetStyleSheet( pDoc->GetDefaultStyleSheet(), sal_True );
+ pPresObj->NbcSetStyleSheet( pDoc->GetDefaultStyleSheet(), true );
GetPage()->InsertPresObj( pPresObj, eObjKind );
}
}
@@ -1563,7 +1563,7 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Referenc
_SelectObjectsInView( xShapes, pPageView );
- mpView->CombineMarkedObjects( sal_False );
+ mpView->CombineMarkedObjects( false );
mpView->AdjustMarkHdl();
const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
@@ -1594,7 +1594,7 @@ void SAL_CALL SdGenericDrawPage::split( const Reference< drawing::XShape >& xGro
SdrPageView* pPageView = mpView->ShowSdrPage( GetPage() );
_SelectObjectInView( xGroup, pPageView );
- mpView->DismantleMarkedObjects( sal_False );
+ mpView->DismantleMarkedObjects( false );
mpView->HideSdrPage();
GetModel()->SetModified();
@@ -1616,7 +1616,7 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference<
_SelectObjectsInView( xShapes, pPageView );
- mpView->CombineMarkedObjects( sal_True );
+ mpView->CombineMarkedObjects( true );
mpView->AdjustMarkHdl();
const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
@@ -1647,7 +1647,7 @@ void SAL_CALL SdGenericDrawPage::unbind( const Reference< drawing::XShape >& xSh
SdrPageView* pPageView = mpView->ShowSdrPage( GetPage() );
_SelectObjectInView( xShape, pPageView );
- mpView->DismantleMarkedObjects( sal_True );
+ mpView->DismantleMarkedObjects( true );
mpView->HideSdrPage();
GetModel()->SetModified();
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 9b264a8f163a..89b62d27fa01 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1377,7 +1377,7 @@ void Outliner::EnterEditMode (sal_Bool bGrabFocus)
mpTextObj->setActiveText( mnText );
// Turn on the edit mode for the text object.
- mpView->SdrBeginTextEdit(mpTextObj, pPV, mpWindow, sal_True, this, pOutlinerView, sal_True, sal_True, bGrabFocus);
+ mpView->SdrBeginTextEdit(mpTextObj, pPV, mpWindow, true, this, pOutlinerView, true, true, bGrabFocus);
SetUpdateMode(true);
mbFoundObject = true;
@@ -1522,7 +1522,7 @@ void Outliner::SetViewShell (const ::boost::shared_ptr<ViewShell>& rpViewShell)
void Outliner::HandleChangedSelection (void)
{
maMarkListCopy.clear();
- mbRestrictSearchToSelection = (mpView->AreObjectsMarked()==sal_True);
+ mbRestrictSearchToSelection = mpView->AreObjectsMarked();
if (mbRestrictSearchToSelection)
{
// Make a copy of the current mark list.
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 0b876b47d72e..8d54b697e5f6 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -492,7 +492,7 @@ void DrawView::PresPaint(const Region& rRegion)
* in slide show).
*/
-sal_Bool DrawView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
+bool DrawView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
{
return FmFormView::IsObjMarkable(pObj, pPV);
}
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 37c346a30f27..1477e494036c 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -662,7 +662,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if( rReq.GetSlot() == SID_CHANGEBEZIER )
{
WaitObject aWait( (Window*)GetActiveWindow() );
- mpDrawView->ConvertMarkedToPathObj(sal_False);
+ mpDrawView->ConvertMarkedToPathObj(false);
}
else
{
@@ -705,7 +705,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
else
{
WaitObject aWait( (Window*)GetActiveWindow() );
- mpDrawView->ConvertMarkedToPathObj(sal_True);
+ mpDrawView->ConvertMarkedToPathObj(true);
Invalidate(SID_CONVERT_TO_CONTOUR);
}
@@ -889,7 +889,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
if( nLevel == 1 )
// text frame listens on StyleSheet of level1
- pObj->NbcSetStyleSheet(pSheet, sal_False);
+ pObj->NbcSetStyleSheet(pSheet, false);
}
}
@@ -2161,7 +2161,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
else
{
WaitObject aWait( (Window*)GetActiveWindow() );
- mpDrawView->CombineMarkedObjects(sal_False);
+ mpDrawView->CombineMarkedObjects(false);
}
Cancel();
rReq.Done ();
@@ -2249,10 +2249,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
case SID_DISMANTLE: // BASIC
{
- if ( mpDrawView->IsDismantlePossible(sal_False) )
+ if ( mpDrawView->IsDismantlePossible(false) )
{
WaitObject aWait( (Window*)GetActiveWindow() );
- mpDrawView->DismantleMarkedObjects(sal_False);
+ mpDrawView->DismantleMarkedObjects(false);
}
Cancel();
rReq.Done ();
@@ -2269,7 +2269,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
else
{
WaitObject aWait( (Window*)GetActiveWindow() );
- mpDrawView->CombineMarkedObjects(sal_True);
+ mpDrawView->CombineMarkedObjects(true);
}
Cancel();
rReq.Done ();
@@ -2288,10 +2288,10 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
WaitObject aWait( (Window*)GetActiveWindow() );
mpDrawView->Break3DObj();
}
- else if ( mpDrawView->IsDismantlePossible(sal_True) )
+ else if ( mpDrawView->IsDismantlePossible(true) )
{
WaitObject aWait( (Window*)GetActiveWindow() );
- mpDrawView->DismantleMarkedObjects(sal_True);
+ mpDrawView->DismantleMarkedObjects(true);
}
else if ( mpDrawView->IsImportMtfPossible() )
{
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 813138ceaf15..9b076ed89541 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -977,7 +977,7 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
rSet.DisableItem( EE_PARA_TABS );
rSet.DisableItem( SID_RULER_TEXT_RIGHT_TO_LEFT );
- if( mpDrawView->IsResizeAllowed(sal_True) )
+ if( mpDrawView->IsResizeAllowed(true) )
{
Rectangle aResizeRect( maMarkRect );
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 5fbbf82dc9dc..2740a5279a68 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -235,7 +235,7 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView)
if (mpDrawView->IsSolidDragging() != pView->IsSolidDragging() )
mpDrawView->SetSolidDragging( pView->IsSolidDragging() );
- if (mpDrawView->IsQuickTextEditMode() != pView->IsQuickEdit())
+ if ((mpDrawView->IsQuickTextEditMode() ? 1 : 0) != pView->IsQuickEdit())
mpDrawView->SetQuickTextEditMode( pView->IsQuickEdit() );
// #i26631#
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 2b7d3c5e2d6f..94c6920e0242 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -230,7 +230,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem( SID_DRAW_TEXT_VERTICAL );
}
- bool bConvertToPathPossible = mpDrawView->IsConvertToPathObjPossible(sal_False);
+ bool bConvertToPathPossible = mpDrawView->IsConvertToPathObjPossible(false);
const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
const sal_uLong nMarkCount = rMarkList.GetMarkCount();
@@ -447,12 +447,12 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
else
{
// horizontal alignment
- sal_uInt16 nHorz = mpDrawView->GetMarkedGluePointsAlign( sal_False );
+ sal_uInt16 nHorz = mpDrawView->GetMarkedGluePointsAlign( false );
rSet.Put( SfxBoolItem( SID_GLUE_HORZALIGN_CENTER, nHorz == SDRHORZALIGN_CENTER ) );
rSet.Put( SfxBoolItem( SID_GLUE_HORZALIGN_LEFT, nHorz == SDRHORZALIGN_LEFT ) );
rSet.Put( SfxBoolItem( SID_GLUE_HORZALIGN_RIGHT, nHorz == SDRHORZALIGN_RIGHT ) );
// vertical alignment
- sal_uInt16 nVert = mpDrawView->GetMarkedGluePointsAlign( sal_True );
+ sal_uInt16 nVert = mpDrawView->GetMarkedGluePointsAlign( true );
rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_CENTER, nVert == SDRVERTALIGN_CENTER ) );
rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_TOP, nVert == SDRVERTALIGN_TOP ) );
rSet.Put( SfxBoolItem( SID_GLUE_VERTALIGN_BOTTOM, nVert == SDRVERTALIGN_BOTTOM ) );
@@ -505,7 +505,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
else
rSet.Put(SfxBoolItem(SID_GLUE_EDITMODE, false));
- if( !mpDrawView->IsMirrorAllowed( sal_True, sal_True ) )
+ if( !mpDrawView->IsMirrorAllowed( true, true ) )
{
rSet.DisableItem( SID_HORIZONTAL );
rSet.DisableItem( SID_VERTICAL );
@@ -655,10 +655,10 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
return;
}
- if( !( mpDrawView->IsConvertToPolyObjPossible(sal_False) || mpDrawView->IsVectorizeAllowed() ) )
+ if( !( mpDrawView->IsConvertToPolyObjPossible(false) || mpDrawView->IsVectorizeAllowed() ) )
rSet.DisableItem(SID_CHANGEPOLYGON);
- if( !( mpDrawView->IsConvertToPolyObjPossible(sal_False) || mpDrawView->IsConvertToContourPossible() ) )
+ if( !( mpDrawView->IsConvertToPolyObjPossible(false) || mpDrawView->IsConvertToContourPossible() ) )
rSet.DisableItem(SID_CONVERT_TO_CONTOUR);
if ( !mpDrawView->IsConvertTo3DObjPossible() )
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 7fc0e65e5f1b..da812e4d30f5 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -257,7 +257,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
mpDrawView = new DrawView(pDocSh, GetActiveWindow(), this);
mpView = mpDrawView; // Pointer of base class ViewShell
- mpDrawView->SetSwapAsynchron(sal_True); // Asynchronous load of graphics
+ mpDrawView->SetSwapAsynchron(true); // Asynchronous load of graphics
// We do not read the page kind from the frame view anymore so we have
// to set it in order to resync frame view and this view.
@@ -351,7 +351,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
// start selection function
SfxRequest aReq(SID_OBJECT_SELECT, 0, GetDoc()->GetItemPool());
FuPermanent(aReq);
- mpDrawView->SetFrameDragSingles(sal_True);
+ mpDrawView->SetFrameDragSingles(true);
if (pDocSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED)
{
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index b31f946112c6..fa2ef547b534 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -339,7 +339,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
{
// implicit transformation into bezier
WaitObject aWait( (Window*)GetActiveWindow() );
- mpDrawView->ConvertMarkedToPathObj(sal_False);
+ mpDrawView->ConvertMarkedToPathObj(false);
}
}
}
@@ -376,7 +376,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
{
// implicit transformation into bezier
WaitObject aWait( (Window*)GetActiveWindow() );
- mpDrawView->ConvertMarkedToPathObj(sal_False);
+ mpDrawView->ConvertMarkedToPathObj(false);
}
}
}
@@ -569,7 +569,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
{
// select first object
GetView()->UnmarkAllObj();
- GetView()->MarkNextObj(sal_True);
+ GetView()->MarkNextObj(true);
// ...and make it visible
if(GetView()->AreObjectsMarked())
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index 61e33f900463..a1bc9686f033 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -219,7 +219,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
}
if ( nInv == E3dInventor ||
- (!mpDrawView->IsConvertToPathObjPossible(sal_False) &&
+ (!mpDrawView->IsConvertToPathObjPossible(false) &&
!mpDrawView->IsShearAllowed() &&
!mpDrawView->IsDistortAllowed()) )
{
@@ -247,12 +247,12 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_DISMANTLE ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_BREAK ) )
{
- if ( !mpDrawView->IsDismantlePossible(sal_False) )
+ if ( !mpDrawView->IsDismantlePossible(false) )
{
rSet.DisableItem( SID_DISMANTLE );
}
- if ( !mpDrawView->IsDismantlePossible(sal_True) &&
+ if ( !mpDrawView->IsDismantlePossible(true) &&
!mpDrawView->IsImportMtfPossible() &&
!mpDrawView->IsBreak3DObjPossible() )
{
@@ -383,7 +383,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
}
if (b3dObj ||
- (!mpDrawView->IsConvertToPathObjPossible(sal_False) &&
+ (!mpDrawView->IsConvertToPathObjPossible(false) &&
!mpDrawView->IsShearAllowed() &&
!mpDrawView->IsDistortAllowed()) )
{
@@ -429,24 +429,24 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
}
}
- if ( !mpDrawView->IsDismantlePossible(sal_False) )
+ if ( !mpDrawView->IsDismantlePossible(false) )
{
rSet.DisableItem( SID_DISMANTLE );
}
- if ( !mpDrawView->IsDismantlePossible(sal_True) &&
+ if ( !mpDrawView->IsDismantlePossible(true) &&
!mpDrawView->IsImportMtfPossible() &&
!mpDrawView->IsBreak3DObjPossible() )
{
rSet.DisableItem( SID_BREAK );
}
- if ( !mpDrawView->IsCombinePossible(sal_False) )
+ if ( !mpDrawView->IsCombinePossible(false) )
{
rSet.DisableItem( SID_COMBINE );
rSet.DisableItem(SID_POLY_MERGE);
rSet.DisableItem(SID_POLY_SUBSTRACT);
rSet.DisableItem(SID_POLY_INTERSECT);
}
- if ( !mpDrawView->IsCombinePossible(sal_True) )
+ if ( !mpDrawView->IsCombinePossible(true) )
{
rSet.DisableItem( SID_CONNECT );
}
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index a0967763598f..855d91d5d1d7 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -61,14 +61,14 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
{
EndListening(*pDrawDoc);
- EnableExtendedKeyInputDispatcher(sal_False);
- EnableExtendedMouseEventDispatcher(sal_False);
- EnableExtendedCommandEventDispatcher(sal_False);
+ EnableExtendedKeyInputDispatcher(false);
+ EnableExtendedMouseEventDispatcher(false);
+ EnableExtendedCommandEventDispatcher(false);
SetGridFront( false );
SetHlplFront( false );
- SetOConSnap( sal_False );
- SetFrameDragSingles( sal_True );
+ SetOConSnap( false );
+ SetFrameDragSingles( true );
SetSlidesPerRow(4);
if( NULL == pFrameView )
@@ -219,7 +219,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
meHandoutEditMode = EM_MASTERPAGE;
SetViewShEditModeOnLoad(EM_PAGE);
mbLayerMode = sal_False;
- SetEliminatePolyPoints(sal_False);
+ SetEliminatePolyPoints(false);
mbDoubleClickTextEdit = sal_False;
mbClickChangeRotation = sal_False;
mnSlidesPerRow = 4;
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 7eb729c3ffbc..fe0fa9a27a0b 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -126,13 +126,13 @@ View::View(SdDrawDocument& rDrawDoc, OutputDevice* pOutDev,
// #i74769#, #i75172# Use default from the configuration
SetBufferedOutputAllowed(getOptionsDrawinglayer().IsPaintBuffer_DrawImpress());
- EnableExtendedKeyInputDispatcher(sal_False);
- EnableExtendedMouseEventDispatcher(sal_False);
- EnableExtendedCommandEventDispatcher(sal_False);
+ EnableExtendedKeyInputDispatcher(false);
+ EnableExtendedMouseEventDispatcher(false);
+ EnableExtendedCommandEventDispatcher(false);
- SetUseIncompatiblePathCreateInterface(sal_False);
- SetMarkHdlWhenTextEdit(sal_True);
- EnableTextEditOnObjectsWithoutTextIfTextTool(sal_True);
+ SetUseIncompatiblePathCreateInterface(false);
+ SetMarkHdlWhenTextEdit(true);
+ EnableTextEditOnObjectsWithoutTextIfTextTool(true);
SetMinMoveDistancePixel(2);
SetHitTolerancePixel(2);
@@ -653,11 +653,11 @@ static void SetSpellOptions( const SdDrawDocument& rDoc, sal_uLong& rCntrl )
rCntrl &= ~EE_CNTRL_ONLINESPELLING;
}
-sal_Bool View::SdrBeginTextEdit(
+bool View::SdrBeginTextEdit(
SdrObject* pObj, SdrPageView* pPV, ::Window* pWin,
- sal_Bool bIsNewObj,
+ bool bIsNewObj,
SdrOutliner* pOutl, OutlinerView* pGivenOutlinerView,
- sal_Bool bDontDeleteOutliner, sal_Bool bOnlyOneView, sal_Bool bGrabFocus )
+ bool bDontDeleteOutliner, bool bOnlyOneView, bool bGrabFocus )
{
GetViewShell()->GetViewShellBase().GetEventMultiplexer()->MultiplexEvent(
sd::tools::EventMultiplexerEvent::EID_BEGIN_TEXT_EDIT, (void*)pObj );
@@ -735,7 +735,7 @@ sal_Bool View::SdrBeginTextEdit(
}
/** ends current text editing */
-SdrEndTextEditKind View::SdrEndTextEdit(sal_Bool bDontDeleteReally )
+SdrEndTextEditKind View::SdrEndTextEdit(bool bDontDeleteReally )
{
SdrObjectWeakRef xObj( GetTextEditObject() );
@@ -1115,7 +1115,7 @@ SdrViewContext View::GetContext() const
return FmFormView::GetContext();
}
-sal_Bool View::HasMarkablePoints() const
+bool View::HasMarkablePoints() const
{
if( maSmartTags.HasMarkablePoints() )
return true;
@@ -1130,7 +1130,7 @@ sal_uLong View::GetMarkablePointCount() const
return nCount;
}
-sal_Bool View::HasMarkedPoints() const
+bool View::HasMarkedPoints() const
{
if( maSmartTags.HasMarkedPoints() )
return true;
@@ -1145,7 +1145,7 @@ sal_uLong View::GetMarkedPointCount() const
return nCount;
}
-sal_Bool View::IsPointMarkable(const SdrHdl& rHdl) const
+bool View::IsPointMarkable(const SdrHdl& rHdl) const
{
if( maSmartTags.IsPointMarkable( rHdl ) )
return true;
@@ -1153,7 +1153,7 @@ sal_Bool View::IsPointMarkable(const SdrHdl& rHdl) const
return FmFormView::IsPointMarkable( rHdl );
}
-sal_Bool View::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark )
+bool View::MarkPoint(SdrHdl& rHdl, bool bUnmark )
{
if( maSmartTags.MarkPoint( rHdl, bUnmark ) )
return true;
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 295663c355f3..f20058b03acb 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -719,7 +719,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar
ReadXFillExchangeData( *xStm, aFillData );
const Color aColor( ( (XFillColorItem&) aFillData.GetXFillAttrSetItem()->GetItemSet().Get( XATTR_FILLCOLOR ) ).GetColorValue() );
- static_cast< SdrHdlColor* >( pIAOHandle )->SetColor( aColor, sal_True );
+ static_cast< SdrHdlColor* >( pIAOHandle )->SetColor( aColor, true );
nRet = nDropAction;
}
}
@@ -979,7 +979,7 @@ SdrModel* View::GetMarkedObjModel() const
return FmFormView::GetMarkedObjModel();;
}
-sal_Bool View::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst /* =NULL */, sal_uInt32 nOptions /* =0 */)
+bool View::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst /* =NULL */, sal_uInt32 nOptions /* =0 */)
{
return FmFormView::Paste( rMod, rPos, pLst,nOptions );;
}
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index be8330fe27e9..f317d910dd1b 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -526,7 +526,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
Point aPosition = rGluePoint.GetAbsolutePos(*pConnObj);
aPosition.X() += aVector.A();
aPosition.Y() += aVector.B();
- pCloneEdge->SetTailPoint(sal_False, aPosition);
+ pCloneEdge->SetTailPoint(false, aPosition);
}
}
}
@@ -558,7 +558,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
Point aPosition = rGluePoint.GetAbsolutePos(*pConnObj);
aPosition.X() += aVector.A();
aPosition.Y() += aVector.B();
- pCloneEdge->SetTailPoint(sal_True, aPosition);
+ pCloneEdge->SetTailPoint(true, aPosition);
}
}
}
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index ab096ecde125..4e8d1ade10a8 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -139,7 +139,7 @@ public:
ImageButtonHdl( const SmartTagReference& xTag, /* sal_uInt16 nSID, const Image& rImage, const Image& rImageMO, */ const Point& rPnt );
virtual ~ImageButtonHdl();
virtual void CreateB2dIAObject();
- virtual sal_Bool IsFocusHdl() const;
+ virtual bool IsFocusHdl() const;
virtual Pointer GetPointer() const;
virtual bool isMarkable() const;
@@ -283,7 +283,7 @@ void ImageButtonHdl::CreateB2dIAObject()
-sal_Bool ImageButtonHdl::IsFocusHdl() const
+bool ImageButtonHdl::IsFocusHdl() const
{
return false;
}
@@ -333,7 +333,7 @@ bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHd
{
SdrPageView* pPV = mrView.GetSdrPageView();
mrView.UnmarkAllObj(pPV );
- mrView.MarkObj(mxPlaceholderObj.get(), pPV, sal_False);
+ mrView.MarkObj(mxPlaceholderObj.get(), pPV, false);
}
}