summaryrefslogtreecommitdiff
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
parentd1bffe3596d21f205cb7a2697bb5142f190b5627 (diff)
svx: sal_Bool->bool
Change-Id: I78da39fc553b2e5040ee6665377ea51a1c4d04d7
-rw-r--r--basctl/source/dlged/dlgedmod.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_TextEdit.cxx6
-rw-r--r--chart2/source/controller/main/ShapeController.cxx16
-rw-r--r--chart2/source/view/main/DrawModelWrapper.cxx2
-rw-r--r--cui/source/tabpages/tpline.cxx4
-rw-r--r--filter/source/msfilter/escherex.cxx2
-rw-r--r--filter/source/msfilter/msdffimp.cxx4
-rw-r--r--include/svx/cube3d.hxx2
-rw-r--r--include/svx/fmview.hxx2
-rw-r--r--include/svx/lathe3d.hxx2
-rw-r--r--include/svx/obj3d.hxx2
-rw-r--r--include/svx/polygn3d.hxx2
-rw-r--r--include/svx/sphere3d.hxx2
-rw-r--r--include/svx/svdcrtv.hxx66
-rw-r--r--include/svx/svddrgv.hxx92
-rw-r--r--include/svx/svdedtv.hxx138
-rw-r--r--include/svx/svdedxv.hxx42
-rw-r--r--include/svx/svdetc.hxx14
-rw-r--r--include/svx/svdglev.hxx28
-rw-r--r--include/svx/svdhdl.hxx68
-rw-r--r--include/svx/svdhlpln.hxx2
-rw-r--r--include/svx/svdmark.hxx62
-rw-r--r--include/svx/svdmodel.hxx27
-rw-r--r--include/svx/svdmrkv.hxx148
-rw-r--r--include/svx/svdoashp.hxx34
-rw-r--r--include/svx/svdoattr.hxx4
-rw-r--r--include/svx/svdobj.hxx12
-rw-r--r--include/svx/svdocapt.hxx12
-rw-r--r--include/svx/svdocirc.hxx2
-rw-r--r--include/svx/svdoedge.hxx40
-rw-r--r--include/svx/svdograf.hxx4
-rw-r--r--include/svx/svdogrp.hxx2
-rw-r--r--include/svx/svdomeas.hxx10
-rw-r--r--include/svx/svdoole2.hxx18
-rw-r--r--include/svx/svdopath.hxx26
-rw-r--r--include/svx/svdorect.hxx2
-rw-r--r--include/svx/svdotable.hxx10
-rw-r--r--include/svx/svdotext.hxx46
-rw-r--r--include/svx/svdouno.hxx6
-rw-r--r--include/svx/svdovirt.hxx2
-rw-r--r--include/svx/svdpage.hxx2
-rw-r--r--include/svx/svdpagv.hxx24
-rw-r--r--include/svx/svdpntv.hxx78
-rw-r--r--include/svx/svdpoev.hxx4
-rw-r--r--include/svx/svdpool.hxx2
-rw-r--r--include/svx/svdsnpv.hxx90
-rw-r--r--include/svx/svdsob.hxx12
-rw-r--r--include/svx/svdundo.hxx6
-rw-r--r--include/svx/svdview.hxx32
-rw-r--r--include/svx/svdviter.hxx8
-rw-r--r--include/svx/svdxcgv.hxx18
-rw-r--r--include/svx/view3d.hxx4
-rw-r--r--reportdesign/source/core/sdr/RptModel.cxx2
-rw-r--r--reportdesign/source/core/sdr/RptObject.cxx4
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx4
-rw-r--r--reportdesign/source/ui/report/SectionView.cxx4
-rw-r--r--reportdesign/source/ui/report/ViewsWindow.cxx4
-rw-r--r--reportdesign/source/ui/report/dlgedfunc.cxx8
-rw-r--r--sc/source/core/data/drwlayer.cxx2
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx2
-rw-r--r--sc/source/ui/drawfunc/drawsh2.cxx2
-rw-r--r--sc/source/ui/drawfunc/drawsh5.cxx4
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx2
-rw-r--r--sc/source/ui/drawfunc/fuconpol.cxx4
-rw-r--r--sc/source/ui/drawfunc/fudraw.cxx8
-rw-r--r--sc/source/ui/drawfunc/futext.cxx6
-rw-r--r--sc/source/ui/inc/drawview.hxx24
-rw-r--r--sc/source/ui/view/drawview.cxx18
-rw-r--r--sc/source/ui/view/notemark.cxx2
-rw-r--r--sc/source/ui/view/tabview5.cxx2
-rw-r--r--sc/source/ui/view/tabvwsh2.cxx2
-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
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx2
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeEngine.cxx2
-rw-r--r--svx/source/dialog/contwnd.cxx6
-rw-r--r--svx/source/dialog/graphctl.cxx12
-rw-r--r--svx/source/dialog/imapwnd.cxx8
-rw-r--r--svx/source/engine3d/cube3d.cxx2
-rw-r--r--svx/source/engine3d/dragmt3d.cxx2
-rw-r--r--svx/source/engine3d/lathe3d.cxx2
-rw-r--r--svx/source/engine3d/obj3d.cxx2
-rw-r--r--svx/source/engine3d/polygn3d.cxx2
-rw-r--r--svx/source/engine3d/sphere3d.cxx2
-rw-r--r--svx/source/engine3d/view3d.cxx22
-rw-r--r--svx/source/engine3d/view3d1.cxx2
-rw-r--r--svx/source/form/fmmodel.cxx4
-rw-r--r--svx/source/form/fmview.cxx8
-rw-r--r--svx/source/form/fmvwimp.cxx4
-rw-r--r--svx/source/form/navigatortree.cxx8
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx10
-rw-r--r--svx/source/sdr/properties/textproperties.cxx4
-rw-r--r--svx/source/svdraw/svdattr.cxx2
-rw-r--r--svx/source/svdraw/svdcrtv.cxx56
-rw-r--r--svx/source/svdraw/svddrgv.cxx110
-rw-r--r--svx/source/svdraw/svdedtv.cxx58
-rw-r--r--svx/source/svdraw/svdedtv1.cxx80
-rw-r--r--svx/source/svdraw/svdedtv2.cxx78
-rw-r--r--svx/source/svdraw/svdedxv.cxx124
-rw-r--r--svx/source/svdraw/svdetc.cxx24
-rw-r--r--svx/source/svdraw/svdglev.cxx63
-rw-r--r--svx/source/svdraw/svdhdl.cxx80
-rw-r--r--svx/source/svdraw/svdibrow.cxx2
-rw-r--r--svx/source/svdraw/svdlayer.cxx6
-rw-r--r--svx/source/svdraw/svdmark.cxx102
-rw-r--r--svx/source/svdraw/svdmodel.cxx41
-rw-r--r--svx/source/svdraw/svdmrkv.cxx144
-rw-r--r--svx/source/svdraw/svdmrkv1.cxx112
-rw-r--r--svx/source/svdraw/svdoashp.cxx122
-rw-r--r--svx/source/svdraw/svdoattr.cxx6
-rw-r--r--svx/source/svdraw/svdobj.cxx12
-rw-r--r--svx/source/svdraw/svdocapt.cxx12
-rw-r--r--svx/source/svdraw/svdocirc.cxx4
-rw-r--r--svx/source/svdraw/svdoedge.cxx26
-rw-r--r--svx/source/svdraw/svdograf.cxx2
-rw-r--r--svx/source/svdraw/svdogrp.cxx2
-rw-r--r--svx/source/svdraw/svdomeas.cxx14
-rw-r--r--svx/source/svdraw/svdoole2.cxx70
-rw-r--r--svx/source/svdraw/svdopath.cxx24
-rw-r--r--svx/source/svdraw/svdorect.cxx4
-rw-r--r--svx/source/svdraw/svdotext.cxx156
-rw-r--r--svx/source/svdraw/svdotextpathdecomposition.cxx2
-rw-r--r--svx/source/svdraw/svdotxed.cxx14
-rw-r--r--svx/source/svdraw/svdotxtr.cxx8
-rw-r--r--svx/source/svdraw/svdouno.cxx4
-rw-r--r--svx/source/svdraw/svdovirt.cxx2
-rw-r--r--svx/source/svdraw/svdpagv.cxx36
-rw-r--r--svx/source/svdraw/svdpntv.cxx38
-rw-r--r--svx/source/svdraw/svdpoev.cxx6
-rw-r--r--svx/source/svdraw/svdsnpv.cxx40
-rw-r--r--svx/source/svdraw/svdundo.cxx34
-rw-r--r--svx/source/svdraw/svdview.cxx132
-rw-r--r--svx/source/svdraw/svdviter.cxx18
-rw-r--r--svx/source/svdraw/svdxcgv.cxx64
-rw-r--r--svx/source/table/cell.cxx2
-rw-r--r--svx/source/table/svdotable.cxx20
-rw-r--r--svx/source/table/tablecontroller.cxx16
-rw-r--r--svx/source/unodraw/unoshap2.cxx10
-rw-r--r--svx/source/unodraw/unoshtxt.cxx2
-rw-r--r--sw/source/core/doc/docdesc.cxx2
-rw-r--r--sw/source/core/doc/docdraw.cxx2
-rw-r--r--sw/source/core/draw/dcontact.cxx2
-rw-r--r--sw/source/core/draw/drawdoc.cxx2
-rw-r--r--sw/source/core/draw/dview.cxx24
-rw-r--r--sw/source/core/frmedt/fecopy.cxx2
-rw-r--r--sw/source/core/frmedt/fefly1.cxx4
-rw-r--r--sw/source/core/frmedt/feshview.cxx8
-rw-r--r--sw/source/core/inc/dview.hxx2
-rw-r--r--sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx4
-rw-r--r--sw/source/core/uibase/docvw/edtwin.cxx2
-rw-r--r--sw/source/core/uibase/lingu/sdrhhcwrap.cxx6
-rw-r--r--sw/source/core/uibase/ribbar/conform.cxx8
-rw-r--r--sw/source/core/uibase/ribbar/conrect.cxx2
-rw-r--r--sw/source/core/uibase/ribbar/drawbase.cxx14
-rw-r--r--sw/source/core/uibase/shells/drawdlg.cxx10
-rw-r--r--sw/source/core/uibase/shells/drawsh.cxx2
-rw-r--r--sw/source/core/uibase/shells/drwtxtex.cxx4
-rw-r--r--sw/source/core/uibase/shells/drwtxtsh.cxx2
-rw-r--r--sw/source/core/uibase/shells/textdrw.cxx2
-rw-r--r--sw/source/core/uibase/uiview/pview.cxx2
-rw-r--r--sw/source/core/uibase/uiview/view.cxx4
-rw-r--r--sw/source/core/uibase/uiview/viewdraw.cxx6
-rw-r--r--sw/source/core/uibase/utlui/content.cxx2
-rw-r--r--sw/source/core/view/viewimp.cxx4
-rw-r--r--sw/source/core/view/viewsh.cxx6
202 files changed, 1951 insertions, 1958 deletions
diff --git a/basctl/source/dlged/dlgedmod.cxx b/basctl/source/dlged/dlgedmod.cxx
index 4c83b53e3eac..e95a62862071 100644
--- a/basctl/source/dlged/dlgedmod.cxx
+++ b/basctl/source/dlged/dlgedmod.cxx
@@ -29,7 +29,7 @@ DBG_NAME(DlgEdModel)
TYPEINIT1(DlgEdModel,SdrModel);
DlgEdModel::DlgEdModel()
- :SdrModel(NULL, NULL)
+ :SdrModel()
{
DBG_CTOR(DlgEdModel,0);
}
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index ea3b24a417b0..ace308d08fdd 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -76,11 +76,11 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
sal_Bool bEdit = m_pDrawViewWrapper->SdrBeginTextEdit( pTextObj
, m_pDrawViewWrapper->GetPageView()
, m_pChartWindow
- , sal_False //bIsNewObj
+ , false //bIsNewObj
, pOutliner
, 0L //pOutlinerView
- , sal_True //bDontDeleteOutliner
- , sal_True //bOnlyOneView
+ , true //bDontDeleteOutliner
+ , true //bOnlyOneView
);
if(bEdit)
{
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index f5cbd24b4b9c..e16c66435831 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -262,7 +262,7 @@ void ShapeController::executeDispatch_FormatLine()
sal_Bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
if ( bHasMarked )
{
- pDrawViewWrapper->MergeAttrFromMarked( aAttr, sal_False );
+ pDrawViewWrapper->MergeAttrFromMarked( aAttr, false );
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
@@ -275,11 +275,11 @@ void ShapeController::executeDispatch_FormatLine()
const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
if ( bHasMarked )
{
- pDrawViewWrapper->SetAttrToMarked( *pOutAttr, sal_False );
+ pDrawViewWrapper->SetAttrToMarked( *pOutAttr, false );
}
else
{
- pDrawViewWrapper->SetDefaultAttr( *pOutAttr, sal_False );
+ pDrawViewWrapper->SetDefaultAttr( *pOutAttr, false );
}
}
}
@@ -301,7 +301,7 @@ void ShapeController::executeDispatch_FormatArea()
sal_Bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
if ( bHasMarked )
{
- pDrawViewWrapper->MergeAttrFromMarked( aAttr, sal_False );
+ pDrawViewWrapper->MergeAttrFromMarked( aAttr, false );
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
@@ -318,11 +318,11 @@ void ShapeController::executeDispatch_FormatArea()
const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
if ( bHasMarked )
{
- pDrawViewWrapper->SetAttrToMarked( *pOutAttr, sal_False );
+ pDrawViewWrapper->SetAttrToMarked( *pOutAttr, false );
}
else
{
- pDrawViewWrapper->SetDefaultAttr( *pOutAttr, sal_False );
+ pDrawViewWrapper->SetDefaultAttr( *pOutAttr, false );
}
}
}
@@ -344,7 +344,7 @@ void ShapeController::executeDispatch_TextAttributes()
sal_Bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
if ( bHasMarked )
{
- pDrawViewWrapper->MergeAttrFromMarked( aAttr, sal_False );
+ pDrawViewWrapper->MergeAttrFromMarked( aAttr, false );
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
@@ -360,7 +360,7 @@ void ShapeController::executeDispatch_TextAttributes()
}
else
{
- pDrawViewWrapper->SetDefaultAttr( *pOutAttr, sal_False );
+ pDrawViewWrapper->SetDefaultAttr( *pOutAttr, false );
}
}
}
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index 8fd5bbe561c8..6d6954cb22ef 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -103,7 +103,7 @@ namespace chart
{
DrawModelWrapper::DrawModelWrapper( const uno::Reference<uno::XComponentContext>& /*xContext*/ )
- : SdrModel( SvtPathOptions().GetPalettePath() )
+ : SdrModel( SvtPathOptions().GetPalettePath(), NULL, NULL, false, false )
, m_pChartItemPool(0)
, m_xMainDrawPage(0)
, m_xHiddenDrawPage(0)
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 883d7e55dae2..b6529fe0e523 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -314,7 +314,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
{
VirtualDevice aVDev;
aVDev.SetMapMode(MapMode(MAP_100TH_MM));
- SdrModel* pModel = new SdrModel(NULL, NULL, LOADREFCOUNTS);
+ SdrModel* pModel = new SdrModel;
pModel->GetItemPool().FreezeIdRanges();
// Page
SdrPage* pPage = new SdrPage( *pModel, false );
@@ -1117,7 +1117,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
VirtualDevice aVDev;
aVDev.SetMapMode(MapMode(MAP_100TH_MM));
- SdrModel* pModel = new SdrModel(NULL, NULL, LOADREFCOUNTS);
+ SdrModel* pModel = new SdrModel;
pModel->GetItemPool().FreezeIdRanges();
SdrPage* pPage = new SdrPage( *pModel, false );
pPage->SetSize(Size(1000,1000));
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 06652f15f741..0831b666e7a4 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4779,7 +4779,7 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( sal_Bool bFirst )
}
else if ( nGluePointType == com::sun::star::drawing::EnhancedCustomShapeGluePointType::SEGMENTS )
{
- SdrObject* pPoly = pCustoShape->DoConvertToPolyObj( sal_True, true );
+ SdrObject* pPoly = pCustoShape->DoConvertToPolyObj( true, true );
if ( pPoly && pPoly->ISA( SdrPathObj ) )
{
sal_Int16 a, b, nIndex = 0;
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 079a165ae9fb..016939675bfe 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4594,7 +4594,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
Point aRight( aLeft.X() + 1000, aLeft.Y() );
pRet->NbcMirror( aLeft, aRight );
}
- basegfx::B2DPolyPolygon aPoly( SdrObjCustomShape::GetLineGeometry( (SdrObjCustomShape*)pRet, sal_True ) );
+ basegfx::B2DPolyPolygon aPoly( SdrObjCustomShape::GetLineGeometry( (SdrObjCustomShape*)pRet, true ) );
SdrObject::Free( pRet );
pRet = new SdrEdgeObj();
@@ -5218,7 +5218,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
pTextObj->SetModel(pSdrModel);
if (bVerticalText)
- pTextObj->SetVerticalWriting(sal_True);
+ pTextObj->SetVerticalWriting(true);
if (nTextRotationAngle)
{
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index e03866e16d4f..53507026f72b 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -62,7 +62,7 @@ public:
E3dCubeObj();
virtual sal_uInt16 GetObjIdentifier() const;
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
virtual E3dCubeObj* Clone() const;
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index 7770b138ca64..02103ca1bf1c 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -109,7 +109,7 @@ public:
// for copying complete form structures, not only control models
virtual SdrModel* GetMarkedObjModel() const;
using E3dView::Paste;
- 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);
virtual sal_Bool MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin );
diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index ae2f2b2eb9e3..1c3dbbddeb2a 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -94,7 +94,7 @@ private:
virtual E3dLatheObj* Clone() const;
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
// TakeObjName...() is for the display in the UI, for example "3 frames selected".
virtual OUString TakeObjNameSingul() const;
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 18ec02f4603d..1a59ea45fad4 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -138,7 +138,7 @@ protected:
public:
TYPEINFO();
virtual void RecalcSnapRect();
- virtual void SetRectsDirty(sal_Bool bNotMyself = sal_False);
+ virtual void SetRectsDirty(bool bNotMyself = false);
virtual ~E3dObject();
diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx
index bb139374d9b0..7769a1703a08 100644
--- a/include/svx/polygn3d.hxx
+++ b/include/svx/polygn3d.hxx
@@ -58,7 +58,7 @@ public:
const basegfx::B2DPolyPolygon& GetPolyTexture2D() const { return aPolyTexture2D; }
virtual sal_uInt16 GetObjIdentifier() const;
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
virtual E3dPolygonObj* Clone() const;
diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx
index b130916b37dd..06c6147de76d 100644
--- a/include/svx/sphere3d.hxx
+++ b/include/svx/sphere3d.hxx
@@ -56,7 +56,7 @@ public:
{ return ((const Svx3DVerticalSegmentsItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue(); }
virtual sal_uInt16 GetObjIdentifier() const;
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
virtual E3dSphereObj* Clone() const;
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index 92af4e19d514..728f0321a6cc 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -46,15 +46,15 @@ protected:
Pointer aAktCreatePointer;
- sal_Int32 nAutoCloseDistPix;
- sal_Int32 nFreeHandMinDistPix;
- sal_uInt32 nAktInvent; // set the current ones
- sal_uInt16 nAktIdent; // Obj for re-creating
+ sal_Int32 nAutoCloseDistPix;
+ sal_Int32 nFreeHandMinDistPix;
+ sal_uInt32 nAktInvent; // set the current ones
+ sal_uInt16 nAktIdent; // Obj for re-creating
- unsigned bAutoTextEdit : 1; // Textedit after we start the creation of a text frame
- unsigned b1stPointAsCenter : 1;
- unsigned bUseIncompatiblePathCreateInterface : 1;
- unsigned bAutoClosePolys : 1;
+ bool bAutoTextEdit : 1; // Textedit after we start the creation of a text frame
+ bool b1stPointAsCenter : 1;
+ bool bUseIncompatiblePathCreateInterface : 1;
+ bool bAutoClosePolys : 1;
void ImpClearConnectMarker();
@@ -62,12 +62,12 @@ private:
SVX_DLLPRIVATE void ImpClearVars();
protected:
- sal_Bool ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
+ bool ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
sal_Int16 nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject);
- void ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/);
- void HideCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/);
- sal_Bool CheckEdgeMode();
+ void ShowCreateObj(/*OutputDevice* pOut, bool bFull*/);
+ void HideCreateObj(/*OutputDevice* pOut, bool bFull*/);
+ bool CheckEdgeMode();
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -75,7 +75,7 @@ protected:
virtual ~SdrCreateView();
public:
- virtual sal_Bool IsAction() const;
+ virtual bool IsAction() const;
virtual void MovAction(const Point& rPnt);
virtual void EndAction();
virtual void BckAction();
@@ -89,9 +89,9 @@ public:
// If the MeasureLayer is not set (empty string), then use the active layer for measuring.
void SetEditMode(SdrViewEditMode eMode) { SdrDragView::SetEditMode(eMode); CheckEdgeMode(); }
- void SetEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetEditMode(bOn); CheckEdgeMode(); }
- void SetCreateMode(sal_Bool bOn=sal_True) { SdrDragView::SetCreateMode(bOn); CheckEdgeMode(); }
- void SetGluePointEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); }
+ void SetEditMode(bool bOn=true) { SdrDragView::SetEditMode(bOn); CheckEdgeMode(); }
+ void SetCreateMode(bool bOn=true) { SdrDragView::SetCreateMode(bOn); CheckEdgeMode(); }
+ void SetGluePointEditMode(bool bOn=true) { SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); }
// Determine whether a text tool is activated
bool IsTextTool() const;
@@ -108,32 +108,32 @@ public:
sal_uInt16 GetCurrentObjIdentifier() const { return nAktIdent; }
// Beginning the regular Create
- sal_Bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
- sal_Bool BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject);
+ bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
+ bool BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject);
void MovCreateObj(const Point& rPnt);
- sal_Bool EndCreateObj(SdrCreateCmd eCmd);
+ bool EndCreateObj(SdrCreateCmd eCmd);
void BckCreateObj(); // go back one polygon point
void BrkCreateObj();
- sal_Bool IsCreateObj() const { return pAktCreate!=NULL; }
+ bool IsCreateObj() const { return pAktCreate!=NULL; }
SdrObject* GetCreateObj() const { return pAktCreate; }
// BegCreateCaptionObj() creates a SdrCaptionObj (legend item).
// rObjSiz is the initial size of the legend text frame.
// Only the length of the tip is dragged
- sal_Bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
+ bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
// If TextEditAfterCreate is sal_True (the default),
// then after the creation of a TextFrame object (OBJ_TEXT,
// OBJ_TEXTEXT, OBJ_OUTLINERTEXT, OBJ_TITLETEXT, OBJ_CAPTION)
// automatically start a TextEdit (SdrObjEditView: SdrBeginTextEdit)
- sal_Bool IsTextEditAfterCreate() const { return bAutoTextEdit; }
- void SetTextEditAfterCreate(sal_Bool bOn) { bAutoTextEdit = bOn; }
+ bool IsTextEditAfterCreate() const { return bAutoTextEdit; }
+ void SetTextEditAfterCreate(bool bOn) { bAutoTextEdit = bOn; }
// Create a circle/rectangle/text frame with the first Point being
// the center of the object instead of the upper-left corner.
// Persistent flag. Default = FALSE.
- sal_Bool IsCreate1stPointAsCenter() const { return b1stPointAsCenter; }
- void SetCreate1stPointAsCenter(sal_Bool bOn) { b1stPointAsCenter = bOn; }
+ bool IsCreate1stPointAsCenter() const { return b1stPointAsCenter; }
+ void SetCreate1stPointAsCenter(bool bOn) { b1stPointAsCenter = bOn; }
// For polylines (OBJ_PLIN) and freehand lines (OBJ_FREELINE). If this
// Flag is sal_True, these two types of objects are implicitly closed, and
@@ -141,8 +141,8 @@ public:
// the distance between the start point and end point of the
// Object <= nAutoCloseDistPix pixels.
// Default = TRUE.
- sal_Bool IsAutoClosePolys() const { return bAutoClosePolys; }
- void SetAutoClosePolys(sal_Bool bOn) { bAutoClosePolys=bOn; }
+ bool IsAutoClosePolys() const { return bAutoClosePolys; }
+ void SetAutoClosePolys(bool bOn) { bAutoClosePolys=bOn; }
// Default = 5 Pixel
sal_uInt16 GetAutoCloseDistPix() const { return sal_uInt16(nAutoCloseDistPix); }
@@ -162,18 +162,18 @@ public:
// This flag should be regarded as temporary. The affected applications should
// be changed soon.
// Default = sal_False;
- sal_Bool IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; }
- void SetUseIncompatiblePathCreateInterface(sal_Bool bOn) { bUseIncompatiblePathCreateInterface = bOn; }
+ bool IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; }
+ void SetUseIncompatiblePathCreateInterface(bool bOn) { bUseIncompatiblePathCreateInterface = bOn; }
void SetConnectMarker(const SdrObjConnection& rCon, const SdrPageView& rPV);
void HideConnectMarker();
// Attributes of the object that is in the process of being created
/* new interface src537 */
- sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
+ bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr=false) const;
- sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
- SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const;
- sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
+ bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll);
+ SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const;
+ bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr);
};
#endif // INCLUDED_SVX_SVDCRTV_HXX
diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx
index f7f0bc5786dd..4dfbf79a3f2e 100644
--- a/include/svx/svddrgv.hxx
+++ b/include/svx/svddrgv.hxx
@@ -71,7 +71,7 @@ protected:
virtual void SetMarkHandles();
void ShowDragObj();
void HideDragObj();
- sal_Bool ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, const Point& rPnt, sal_Bool bNewObj, OutputDevice* pOut);
+ bool ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point& rPnt, bool bNewObj, OutputDevice* pOut);
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -79,7 +79,7 @@ protected:
virtual ~SdrDragView();
public:
- virtual sal_Bool IsAction() const;
+ virtual bool IsAction() const;
virtual void MovAction(const Point& rPnt);
virtual void EndAction();
virtual void BckAction();
@@ -96,68 +96,68 @@ public:
// Bei Returncode sal_False konnte ich die Position nicht bestimmen
// (z.B. Punktverschiebung, Mehrfachselektion, Schieben der
// Spiegelschse, ...)
- sal_Bool TakeDragObjAnchorPos(Point& rPos, sal_Bool bTopRight = sal_False ) const;
+ bool TakeDragObjAnchorPos(Point& rPos, bool bTopRight = false ) const;
// Wird pForcedMeth uebergeben, so wird pHdl, ... nicht ausgewerten, sondern diese
// Drag-Methode verwendet. Die Instanz geht dabei ins Eigentum der View ueber und
// wird zum Ende des Draggings destruiert.
- virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL);
+ virtual bool BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL);
void MovDragObj(const Point& rPnt);
- sal_Bool EndDragObj(sal_Bool bCopy=sal_False);
+ bool EndDragObj(bool bCopy=false);
void BrkDragObj();
- sal_Bool IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !bInsGluePoint; }
+ bool IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !bInsGluePoint; }
SdrHdl* GetDragHdl() const { return pDragHdl; }
SdrDragMethod* GetDragMethod() const { return mpCurrentSdrDragMethod; }
- sal_Bool IsDraggingPoints() const { return eDragHdl==HDL_POLY; }
- sal_Bool IsDraggingGluePoints() const { return eDragHdl==HDL_GLUE; }
+ bool IsDraggingPoints() const { return eDragHdl==HDL_POLY; }
+ bool IsDraggingGluePoints() const { return eDragHdl==HDL_GLUE; }
// Wer das beim BegDrag oder mittendrin schon festlegen will.
// (Wird bei jedem BegDrag auf sal_False zurueckgesetzt, also nach
// BegDrag setzen.)
- void SetDragWithCopy(sal_Bool bOn) { bDragWithCopy = bOn; }
- sal_Bool IsDragWithCopy() const { return bDragWithCopy; }
+ void SetDragWithCopy(bool bOn) { bDragWithCopy = bOn; }
+ bool IsDragWithCopy() const { return bDragWithCopy; }
- void SetInsertGluePoint(sal_Bool bOn) { bInsGluePoint = bOn; }
- sal_Bool IsInsertGluePoint() const { return bInsGluePoint; }
+ void SetInsertGluePoint(bool bOn) { bInsGluePoint = bOn; }
+ bool IsInsertGluePoint() const { return bInsGluePoint; }
// Interaktives einfuegen eines neuen Punktes. nIdx=0 => vor dem ersten Punkt.
bool IsInsObjPointPossible() const;
- sal_Bool BegInsObjPoint(const Point& rPnt, sal_Bool bNewObj) { return ImpBegInsObjPoint(sal_False, 0L, rPnt, bNewObj, 0L); }
+ bool BegInsObjPoint(const Point& rPnt, bool bNewObj) { return ImpBegInsObjPoint(false, 0L, rPnt, bNewObj, 0L); }
void MovInsObjPoint(const Point& rPnt) { MovDragObj(rPnt); }
- sal_Bool EndInsObjPoint(SdrCreateCmd eCmd);
+ bool EndInsObjPoint(SdrCreateCmd eCmd);
void BrkInsObjPoint() { BrkDragObj(); }
- sal_Bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; }
+ bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; }
// Fuer die App zum Verwalten des Status. GetPreferredPointer() wird
// spaeter vielleicht einen passenden Pointer dafuer liefern
- void SetInsObjPointMode(sal_Bool bOn) { bInsObjPointMode = bOn; }
- sal_Bool IsInsObjPointMode() const { return bInsObjPointMode; }
+ void SetInsObjPointMode(bool bOn) { bInsObjPointMode = bOn; }
+ bool IsInsObjPointMode() const { return bInsObjPointMode; }
- sal_Bool IsInsGluePointPossible() const;
- sal_Bool BegInsGluePoint(const Point& rPnt);
+ bool IsInsGluePointPossible() const;
+ bool BegInsGluePoint(const Point& rPnt);
void MovInsGluePoint(const Point& rPnt) { MovDragObj(rPnt); }
- sal_Bool EndInsGluePoint() { return EndDragObj(); }
+ bool EndInsGluePoint() { return EndDragObj(); }
void BrkInsGluePoint() { BrkDragObj(); }
- sal_Bool IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; }
+ bool IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; }
// Fuer die App zum Verwalten des Status. GetPreferredPointer() wird
// spaeter vielleicht einen passenden Pointer dafuer liefern
- void SetInsGluePointMode(sal_Bool bOn) { bInsGluePointMode = bOn; }
- sal_Bool IsInsGluePointMode() const { return bInsGluePointMode; }
+ void SetInsGluePointMode(bool bOn) { bInsGluePointMode = bOn; }
+ bool IsInsGluePointMode() const { return bInsGluePointMode; }
// Begrenzungslinien ueber's gesamte Win waehrend des Draggens
// Persistent. Default=FALSE.
- void SetDragStripes(sal_Bool bOn);
- sal_Bool IsDragStripes() const { return bDragStripes; }
+ void SetDragStripes(bool bOn);
+ bool IsDragStripes() const { return bDragStripes; }
// Handles waehrend des Draggens verstecken
- //HMHvoid SetDragHdlHide(sal_Bool bOn);
+ //HMHvoid SetDragHdlHide(bool bOn);
//HMHBOOL IsDragHdlHide() const { return bNoDragHdl; }
// Beim Draggen von Polygonpunkten und Klebepunkten
// die Maus verstecken. Default=FALSE
- void SetMouseHideWhileDraggingPoints(sal_Bool bOn) { bMouseHideWhileDraggingPoints = bOn; }
- sal_Bool IsMouseHideWhileDraggingPoints() const { return bMouseHideWhileDraggingPoints; }
+ void SetMouseHideWhileDraggingPoints(bool bOn) { bMouseHideWhileDraggingPoints = bOn; }
+ bool IsMouseHideWhileDraggingPoints() const { return bMouseHideWhileDraggingPoints; }
// Beim Draggen werden i.d.R. die Konturen der markierten Objekte
// als Xor-Polygone dargestellt. Wird dieses Flag hier gesetzt,
@@ -166,8 +166,8 @@ public:
// hat diese Einstellung keine Auswirkung.
// Auch waerend des Draggens umschaltbar.
// Default=Off
- void SetNoDragXorPolys(sal_Bool bOn);
- sal_Bool IsNoDragXorPolys() const { return bNoDragXorPolys; }
+ void SetNoDragXorPolys(bool bOn);
+ bool IsNoDragXorPolys() const { return bNoDragXorPolys; }
// Uebersteigt die Anzahl der markierten Objekte den hier eingestellten
// Wert, wird implizit (temporaer) auf NoDragPolys geschaltet.
@@ -190,13 +190,13 @@ public:
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Verbinder an Objektscheitelpunkte ankleben
// Default=sal_True=Ja
- void SetAutoVertexConnectors(sal_Bool bOn) { bAutoVertexCon = bOn; }
- sal_Bool IsAutoVertexConnectors() const { return bAutoVertexCon; }
+ void SetAutoVertexConnectors(bool bOn) { bAutoVertexCon = bOn; }
+ bool IsAutoVertexConnectors() const { return bAutoVertexCon; }
// Verbinder an Objektecken ankleben
// Default=sal_False=Nein
- void SetAutoCornerConnectors(sal_Bool bOn) { bAutoCornerCon = bOn; }
- sal_Bool IsAutoCornerConnectors() const { return bAutoCornerCon; }
+ void SetAutoCornerConnectors(bool bOn) { bAutoCornerCon = bOn; }
+ bool IsAutoCornerConnectors() const { return bAutoCornerCon; }
// Dragging von verbundenen Objekten (Nodes):
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -205,7 +205,7 @@ public:
// Gummibaender sondern komplette Neuberechnunen sind beim Draggen sichtbar.
// Diese detalierte Darstellung ist eh nur beim MoveDrag moeglich.
// Defaultwert ist 10
- sal_Bool IsDetailedEdgeDragging() const { return bDetailedEdgeDragging; }
+ bool IsDetailedEdgeDragging() const { return bDetailedEdgeDragging; }
sal_uInt16 GetDetailedEdgeDraggingLimit() const { return nDetailedEdgeDraggingLimit; }
@@ -214,7 +214,7 @@ public:
// Gemeint sind hier die "Gummibaender", die weniger Rechenzeit benoetigen
// als die kompletten Neuberechnungen beim DetailedEdgeDragging.
// Defaultwert ist 100
- sal_Bool IsRubberEdgeDragging() const { return bRubberEdgeDragging; }
+ bool IsRubberEdgeDragging() const { return bRubberEdgeDragging; }
// Verbinderhandling also zu deutsch wie folgt (bei Defaulteinstellungen):
// - Sind bis max 10 Verbinder betroffen werden diese bei jedem
@@ -230,25 +230,25 @@ public:
// markierte Objekt immer ein Moven ein, unabhaengig vom gesetzten DragMode.
// Dieses Flag ist persistent und sollte von der App fuer den Anwender
// konfigurierbar sein!
- void SetMarkedHitMovesAlways(sal_Bool bOn) { bMarkedHitMovesAlways = bOn; }
- sal_Bool IsMarkedHitMovesAlways() const { return bMarkedHitMovesAlways; }
+ void SetMarkedHitMovesAlways(bool bOn) { bMarkedHitMovesAlways = bOn; }
+ bool IsMarkedHitMovesAlways() const { return bMarkedHitMovesAlways; }
// Beim Draggen der Spiegelachse das Spiegelbild der markierten Objekte
// als Xor darstellen? Persistent. Noch nicht implementiert. Default TRUE.
- void SetMirrRefDragObj(sal_Bool bOn) { bMirrRefDragObj = bOn; }
- sal_Bool IsMirrRefDragObj() const { return bMirrRefDragObj; }
+ void SetMirrRefDragObj(bool bOn) { bMirrRefDragObj = bOn; }
+ bool IsMirrRefDragObj() const { return bMirrRefDragObj; }
- sal_Bool IsOrthoDesired() const;
+ bool IsOrthoDesired() const;
// Beim Resize die Mitte als Referenz
// Default=FALSE.
- sal_Bool IsResizeAtCenter() const { return bResizeAtCenter; }
- void SetResizeAtCenter(sal_Bool bOn) { bResizeAtCenter = bOn; }
+ bool IsResizeAtCenter() const { return bResizeAtCenter; }
+ void SetResizeAtCenter(bool bOn) { bResizeAtCenter = bOn; }
// Symmetrisches Crook
// Default=FALSE.
- sal_Bool IsCrookAtCenter() const { return bCrookAtCenter; }
- void SetCrookAtCenter(sal_Bool bOn) { bCrookAtCenter = bOn; }
+ bool IsCrookAtCenter() const { return bCrookAtCenter; }
+ void SetCrookAtCenter(bool bOn) { bCrookAtCenter = bOn; }
// Begrenzung des Arbeitsbereichs. Die Begrenzung bezieht sich auf die
// View, nicht auf die einzelnen PageViews. Von der View wird diese
@@ -276,7 +276,7 @@ public:
// Rundungsfehler auftreten koennen, wodurch das LimitRect minnimal
// ueberschritten werden koennte...
// Implementiert fuer Move und Resize.
- virtual sal_Bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
+ virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
};
#endif // INCLUDED_SVX_SVDDRGV_HXX
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 376c78d3a0c9..1331498c0b6c 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -119,12 +119,12 @@ protected:
void ImpBroadcastEdgesOfMarkedNodes();
// Konvertierung der markierten Objekte in Poly bzw. Bezier.
- void ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea);
+ void ImpConvertTo(bool bPath, bool bLineToArea);
// Konvertiert ein Obj, wirft bei Erfolg das alte as seiner Liste und
// fuegt das neue an dessen Position ein. Inkl Undo. Es wird weder ein
// MarkEntry noch ein ModelChgBroadcast generiert.
- SdrObject* ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bool bLineToArea);
+ SdrObject* ImpConvertOneObj(SdrObject* pObj, bool bPath, bool bLineToArea);
// Setzen der beiden Flags bToTopPossible und bToBtmPossible.
// bToTopPossibleDirty und bToBtmPossibleDirty werden dabei gleichzeitig
@@ -135,20 +135,20 @@ protected:
void ImpCopyAttributes(const SdrObject* pSource, SdrObject* pDest) const;
// fuer CombineMarkedObjects
- sal_Bool ImpCanConvertForCombine1(const SdrObject* pObj) const;
- sal_Bool ImpCanConvertForCombine(const SdrObject* pObj) const;
- basegfx::B2DPolyPolygon ImpGetPolyPolygon1(const SdrObject* pObj, sal_Bool bCombine) const;
- basegfx::B2DPolyPolygon ImpGetPolyPolygon(const SdrObject* pObj, sal_Bool bCombine) const;
+ bool ImpCanConvertForCombine1(const SdrObject* pObj) const;
+ bool ImpCanConvertForCombine(const SdrObject* pObj) const;
+ basegfx::B2DPolyPolygon ImpGetPolyPolygon1(const SdrObject* pObj, bool bCombine) const;
+ basegfx::B2DPolyPolygon ImpGetPolyPolygon(const SdrObject* pObj, bool bCombine) const;
basegfx::B2DPolygon ImpCombineToSinglePolygon(const basegfx::B2DPolyPolygon& rPolyPolygon) const;
// fuer DismantleMarkedObjects
- sal_Bool ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPpolygon, sal_Bool bMakeLines) const;
- sal_Bool ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines) const;
- void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, sal_Bool bMakeLines);
+ bool ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPpolygon, bool bMakeLines) const;
+ bool ImpCanDismantle(const SdrObject* pObj, bool bMakeLines) const;
+ void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, bool bMakeLines);
void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode,
- sal_Bool bVertical, sal_Bool bNoContortion, sal_Bool bRotate, const Rectangle& rMarkRect);
- void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion);
- sal_Bool ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const;
+ bool bVertical, bool bNoContortion, bool bRotate, const Rectangle& rMarkRect);
+ void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion);
+ bool ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const;
void ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID);
// Entfernt alle Obj der MarkList aus ihren ObjLists inkl Undo.
@@ -201,24 +201,24 @@ public:
void ForceMarkedObjToAnotherPage();
void ForceMarkedToAnotherPage() { ForceMarkedObjToAnotherPage(); }
- sal_Bool IsReadOnly() const { ForcePossibilities(); return bReadOnly; }
+ bool IsReadOnly() const { ForcePossibilities(); return bReadOnly; }
// Loeschen aller markierten Objekte
void DeleteMarkedObj();
- sal_Bool IsDeleteMarkedObjPossible() const { ForcePossibilities(); return bDeletePossible; }
+ bool IsDeleteMarkedObjPossible() const { ForcePossibilities(); return bDeletePossible; }
// Logisch- umschliessendes Rect aller markierten Objekte setzen.
// Das das wirklich geschieht ist nicht garantiert, denn eine
// waagerechte Linie hat z.B. immer eine Hoehe von 0.
- void SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy=sal_False);
+ void SetMarkedObjRect(const Rectangle& rRect, bool bCopy=false);
void MoveMarkedObj(const Size& rSiz, bool bCopy=false);
void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
void ResizeMultMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, const bool bCopy, const bool bWdh, const bool bHgt);
long GetMarkedObjRotate() const;
void RotateMarkedObj(const Point& rRef, long nWink, bool bCopy=false);
void MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool bCopy=false);
- void MirrorMarkedObjHorizontal(sal_Bool bCopy=sal_False);
- void MirrorMarkedObjVertical(sal_Bool bCopy=sal_False);
+ void MirrorMarkedObjHorizontal(bool bCopy=false);
+ void MirrorMarkedObjVertical(bool bCopy=false);
long GetMarkedObjShear() const;
void ShearMarkedObj(const Point& rRef, long nWink, bool bVShear=false, bool bCopy=false);
void CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false);
@@ -226,28 +226,28 @@ public:
// Markierte Objekte kopieren und anstelle der alten markieren
void CopyMarkedObj();
- void SetAllMarkedRect(const Rectangle& rRect, sal_Bool bCopy=sal_False) { SetMarkedObjRect(rRect,bCopy); }
- void MoveAllMarked(const Size& rSiz, sal_Bool bCopy=sal_False) { MoveMarkedObj (rSiz,bCopy); }
- void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, sal_Bool bCopy=sal_False) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); }
+ void SetAllMarkedRect(const Rectangle& rRect, bool bCopy=false) { SetMarkedObjRect(rRect,bCopy); }
+ void MoveAllMarked(const Size& rSiz, bool bCopy=false) { MoveMarkedObj (rSiz,bCopy); }
+ void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); }
long GetAllMarkedRotate() const { return GetMarkedObjRotate(); }
- void RotateAllMarked(const Point& rRef, long nWink, sal_Bool bCopy=sal_False) { RotateMarkedObj(rRef,nWink,bCopy); }
- void MirrorAllMarked(const Point& rRef1, const Point& rRef2, sal_Bool bCopy=sal_False) { MirrorMarkedObj(rRef1,rRef2,bCopy); }
- void MirrorAllMarkedHorizontal(sal_Bool bCopy=sal_False) { MirrorMarkedObjHorizontal(bCopy); }
- void MirrorAllMarkedVertical(sal_Bool bCopy=sal_False) { MirrorMarkedObjVertical(bCopy); }
+ void RotateAllMarked(const Point& rRef, long nWink, bool bCopy=false) { RotateMarkedObj(rRef,nWink,bCopy); }
+ void MirrorAllMarked(const Point& rRef1, const Point& rRef2, bool bCopy=false) { MirrorMarkedObj(rRef1,rRef2,bCopy); }
+ void MirrorAllMarkedHorizontal(bool bCopy=false) { MirrorMarkedObjHorizontal(bCopy); }
+ void MirrorAllMarkedVertical(bool bCopy=false) { MirrorMarkedObjVertical(bCopy); }
long GetAllMarkedShear() const { return GetMarkedObjShear(); }
- void ShearAllMarked(const Point& rRef, long nWink, sal_Bool bVShear=sal_False, sal_Bool bCopy=sal_False) { ShearMarkedObj(rRef,nWink,bVShear,bCopy); }
- void CrookAllMarked(const Point& rRef, const Point& rRad, SdrCrookMode eMode, sal_Bool bVertical=sal_False, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False) { CrookMarkedObj(rRef,rRad,eMode,bVertical,bNoContortion,bCopy); }
+ void ShearAllMarked(const Point& rRef, long nWink, bool bVShear=false, bool bCopy=false) { ShearMarkedObj(rRef,nWink,bVShear,bCopy); }
+ void CrookAllMarked(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false) { CrookMarkedObj(rRef,rRad,eMode,bVertical,bNoContortion,bCopy); }
void CopyMarked() { CopyMarkedObj(); }
- sal_Bool IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; }
- sal_Bool IsResizeAllowed(sal_Bool bProp=sal_False) const;
- sal_Bool IsRotateAllowed(sal_Bool b90Deg=sal_False) const;
- sal_Bool IsMirrorAllowed(sal_Bool b45Deg=sal_False, sal_Bool b90Deg=sal_False) const;
- sal_Bool IsTransparenceAllowed() const;
- sal_Bool IsGradientAllowed() const;
- sal_Bool IsShearAllowed() const;
- sal_Bool IsEdgeRadiusAllowed() const;
- sal_Bool IsCrookAllowed(sal_Bool bNoContortion=sal_False) const;
- sal_Bool IsDistortAllowed(sal_Bool bNoContortion=sal_False) const;
+ bool IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; }
+ bool IsResizeAllowed(bool bProp=false) const;
+ bool IsRotateAllowed(bool b90Deg=false) const;
+ bool IsMirrorAllowed(bool b45Deg=false, bool b90Deg=false) const;
+ bool IsTransparenceAllowed() const;
+ bool IsGradientAllowed() const;
+ bool IsShearAllowed() const;
+ bool IsEdgeRadiusAllowed() const;
+ bool IsCrookAllowed(bool bNoContortion=false) const;
+ bool IsDistortAllowed(bool bNoContortion=false) const;
// Vereinigen mehrerer Objekte zu einem PolyPolygon:
// - Rechtecke/Kreise/Text... werden implizit gewandelt.
@@ -259,7 +259,7 @@ public:
// eine Bitmap oder ein OLE-Objekt, wird die gesamte Gruppe nicht
// beruecksichtigt.
// bNoPolyPoly=TRUE: Alles wird zu einem einzigen Polygon zusammengefasst
- void CombineMarkedObjects(sal_Bool bNoPolyPoly = sal_True);
+ void CombineMarkedObjects(bool bNoPolyPoly = true);
// for combining multiple polygons, with direct support of the modes
// SID_POLY_MERGE, SID_POLY_SUBSTRACT, SID_POLY_INTERSECT
@@ -273,9 +273,9 @@ public:
// Memberobjekten um PathObjs handelt.
// bMakeLines=TRUE: alle Polygone werden in einzelne Linien bzw.
// Beziersegmente zerlegt
- void DismantleMarkedObjects(sal_Bool bMakeLines=sal_False);
- sal_Bool IsCombinePossible(sal_Bool bNoPolyPoly=sal_False) const;
- sal_Bool IsDismantlePossible(sal_Bool bMakeLines=sal_False) const;
+ void DismantleMarkedObjects(bool bMakeLines=false);
+ bool IsCombinePossible(bool bNoPolyPoly=false) const;
+ bool IsDismantlePossible(bool bMakeLines=false) const;
// Ein neues bereits fertig konstruiertes Obj einfuegen. Das Obj gehoert
// anschliessend dem Model. Nach dem Einfuegen wird das neue Objekt
@@ -284,7 +284,7 @@ public:
// wenn der Ziel-Layer gesperrt oder nicht sichtbar ist. In diesem Fall
// returniert die Methode mit FALSE.
// Die Methode generiert u.a. auch eine Undo-Action.
- sal_Bool InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions=0);
+ bool InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions=0);
// Ein Zeichenobjekt durch ein neues ersetzen. *pNewObj gehoert
// anschliessend mir, *pOldObj wandert ins Undo.
@@ -294,13 +294,13 @@ public:
// ReplaceObject(...);
// EndUndo();
- void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark=sal_True);
+ void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, bool bMark=true);
- void SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll);
- void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const;
- void MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const;
- SfxItemSet GetAttrFromMarked(sal_Bool bOnlyHardAttr) const;
- void SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll);
+ void SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll);
+ void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, bool bOnlyHardAttr) const;
+ void MergeAttrFromMarked(SfxItemSet& rAttr, bool bOnlyHardAttr) const;
+ SfxItemSet GetAttrFromMarked(bool bOnlyHardAttr) const;
+ void SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll);
// Geometrische Attribute (Position, Groesse, Drehwinkel)
// Bei der Position wird ein evtl. gesetzter PageOrigin beruecksichtigt.
@@ -315,14 +315,14 @@ public:
SfxStyleSheet* GetStyleSheetFromMarked() const;
// z.Zt. noch ohne Undo :(
- void SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
+ void SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr);
/* new interface src537 */
- sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const;
+ bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const;
- sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
- SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const;
- sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
+ bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll);
+ SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const;
+ bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr);
// Alle markierten Objekte zu einer Gruppe zusammenfassen.
// Anschliessend wird die neue Gruppe markiert. Bei einer
@@ -340,25 +340,25 @@ public:
// zusaetzlich markiert.
void UnGroupMarked();
- sal_Bool IsGroupPossible() const { ForcePossibilities(); return bGroupPossible; }
- sal_Bool IsUnGroupPossible() const { ForcePossibilities(); return bUnGroupPossible; }
- sal_Bool IsGroupEnterPossible() const { ForcePossibilities(); return bGrpEnterPossible; }
+ bool IsGroupPossible() const { ForcePossibilities(); return bGroupPossible; }
+ bool IsUnGroupPossible() const { ForcePossibilities(); return bUnGroupPossible; }
+ bool IsGroupEnterPossible() const { ForcePossibilities(); return bGrpEnterPossible; }
- // Markierte Objekte in Polygone/Bezierkurven verwandeln. Die sal_Bool-
+ // Markierte Objekte in Polygone/Bezierkurven verwandeln. Die bool-
// Funktionen returnen sal_True, wenn wenigstens eins der markierten
// Objekte gewandelt werden kann. Memberobjekte von Gruppenobjekten
// werden ebenfalls gewandelt. Naehere Beschreibung siehe SdrObj.HXX.
- sal_Bool IsConvertToPathObjPossible(sal_Bool bLineToArea) const { ForcePossibilities(); return sal_Bool(bLineToArea ? bCanConvToPathLineToArea : bCanConvToPath); }
- sal_Bool IsConvertToPolyObjPossible(sal_Bool bLineToArea) const { ForcePossibilities(); return sal_Bool(bLineToArea ? bCanConvToPolyLineToArea : bCanConvToPoly); }
- sal_Bool IsConvertToContourPossible() const { ForcePossibilities(); return bCanConvToContour; }
- void ConvertMarkedToPathObj(sal_Bool bLineToArea);
- void ConvertMarkedToPolyObj(sal_Bool bLineToArea);
+ bool IsConvertToPathObjPossible(bool bLineToArea) const { ForcePossibilities(); return bLineToArea ? bCanConvToPathLineToArea : bCanConvToPath; }
+ bool IsConvertToPolyObjPossible(bool bLineToArea) const { ForcePossibilities(); return bLineToArea ? bCanConvToPolyLineToArea : bCanConvToPoly; }
+ bool IsConvertToContourPossible() const { ForcePossibilities(); return bCanConvToContour; }
+ void ConvertMarkedToPathObj(bool bLineToArea);
+ void ConvertMarkedToPolyObj(bool bLineToArea);
// Alle markierten Objekte untereinander ausrichten. Normalerweise werden
// das SnapRect der Obj verwendet. Ist bBoundRects=sal_True, werden stattdessen
// die BoundRects ausgerichtet.
- void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_Bool bBoundRects=sal_False);
- sal_Bool IsAlignPossible() const;
+ void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, bool bBoundRects=false);
+ bool IsAlignPossible() const;
// Markierte Objekte etwas nach "oben" holen
void MovMarkedToTop();
@@ -389,9 +389,9 @@ public:
// sal_True liefert, MovMarkedToTop() jedoch nichts aendert (z.B. bei
// Mehrfachselektion), weil eine von der abgeleiteten View ueber
// GetMaxToTopObj() auferlegte Restriktion dies verhindert.
- sal_Bool IsToTopPossible() const { ForcePossibilities(); return bToTopPossible; }
- sal_Bool IsToBtmPossible() const { ForcePossibilities(); return bToBtmPossible; }
- sal_Bool IsReverseOrderPossible() const { ForcePossibilities(); return bReverseOrderPossible; }
+ bool IsToTopPossible() const { ForcePossibilities(); return bToTopPossible; }
+ bool IsToBtmPossible() const { ForcePossibilities(); return bToBtmPossible; }
+ bool IsReverseOrderPossible() const { ForcePossibilities(); return bReverseOrderPossible; }
// Ueber diese Methoden stellt die View fest, wie weit ein Objekt
// nach vorn bzw. nach hinten gestellt werden darf (Z-Order). Das
@@ -410,14 +410,14 @@ public:
// liefern, konvertiert diese Methode das Metafile in Drawingobjekte.
// Die SdrGrafObjs/SdrOle2Objs werden dann durch die neue Objekte ersetzt.
void DoImportMarkedMtf(SvdProgressInfo *pProgrInfo=NULL);
- sal_Bool IsImportMtfPossible() const { ForcePossibilities(); return bImportMtfPossible; }
+ bool IsImportMtfPossible() const { ForcePossibilities(); return bImportMtfPossible; }
// Wird der Modus VirtualObjectBundling eingeschaltet, werden beim
// ToTop/ToBtm virtuelle Objekte die dasselbe Objekt referenzieren
// in ihrer Z-Order buendig zusammengehalten (Writer).
// Defaulteinstellung ist sal_False=ausgeschaltet.
- void SetVirtualObjectBundling(sal_Bool bOn) { bBundleVirtObj=bOn; }
- sal_Bool IsVirtualObjectBundling() const { return bBundleVirtObj; }
+ void SetVirtualObjectBundling(bool bOn) { bBundleVirtObj=bOn; }
+ bool IsVirtualObjectBundling() const { return bBundleVirtObj; }
// von der SdrMarkView ueberladen fuer den internen gebrauch
virtual void MarkListHasChanged();
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 2fbbe6c6ff1f..c01b34f8de3f 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -112,7 +112,7 @@ protected:
// Feststellen, ob der gesamte Text markiert ist. Liefert auch sal_True wenn
// kein Text vorhanden ist.
- sal_Bool ImpIsTextEditAllSelected() const;
+ bool ImpIsTextEditAllSelected() const;
void ImpMakeTextCursorAreaVisible();
// Handler fuer AutoGrowing Text bei aktivem Outliner
@@ -140,7 +140,7 @@ public:
void TextEditDrawing(SdrPaintWindow& rPaintWindow) const;
// Actionhandling fuer Macromodus
- virtual sal_Bool IsAction() const;
+ virtual bool IsAction() const;
virtual void MovAction(const Point& rPnt);
virtual void EndAction();
virtual void BrkAction();
@@ -155,8 +155,8 @@ public:
// QuickTextEditMode bedeutet, dass Objekte mit Text sofort beim Anklicken
// editiert werden sollen. Default=TRUE. Persistent.
- void SetQuickTextEditMode(sal_Bool bOn) { bQuickTextEditMode=bOn; }
- sal_Bool IsQuickTextEditMode() const { return bQuickTextEditMode; }
+ void SetQuickTextEditMode(bool bOn) { bQuickTextEditMode=bOn; }
+ bool IsQuickTextEditMode() const { return bQuickTextEditMode; }
// Starten des TextEditMode. Ist pWin==NULL, wird das erste an der View
// angemeldete Win verwendet.
@@ -172,29 +172,29 @@ public:
// dieser Instanz und ausserdem auch den StatusEventHdl.
// Ebenso kann eine spezifische OutlinerView vorgegeben werden.
- 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);
// bDontDeleteReally ist ein Spezialparameter fuer den Writer.
// Ist dieses Flag gesetzt, dann wird ein evtl. leeres Textobjekt
// nicht geloescht. Stattdessen gibt es dann einen Returncode
// SDRENDTEXTEDIT_SHOULDBEDELETED (anstelle von SDRENDTEXTEDIT_BEDELETED)
// der besagt, dass das Objekt geloescht werden sollte.
- virtual SdrEndTextEditKind SdrEndTextEdit(sal_Bool bDontDeleteReally = sal_False);
+ virtual SdrEndTextEditKind SdrEndTextEdit(bool bDontDeleteReally = false);
virtual bool IsTextEdit() const;
// Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb der
// des Objektbereichs oder der OutlinerView liegt.
- sal_Bool IsTextEditHit(const Point& rHit, short nTol) const;
+ bool IsTextEditHit(const Point& rHit, short nTol) const;
// Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb des
// Handle-dicken Rahmens liegt, der die OutlinerView bei TextFrames
// umschliesst.
- sal_Bool IsTextEditFrameHit(const Point& rHit) const;
+ bool IsTextEditFrameHit(const Point& rHit) const;
// Bei aktiver Selektion, also zwischen MouseButtonDown und
// MouseButtonUp liefert diese Methode immer TRUE.
- sal_Bool IsTextEditInSelectionMode() const;
+ bool IsTextEditInSelectionMode() const;
// Wer das z.Zt. im TextEdit befindliche Objekt braucht:
SdrObject* GetTextEditObject() const { return mxTextEditObj.get(); }
@@ -224,11 +224,11 @@ public:
virtual sal_uInt16 GetScriptType() const;
/* new interface src537 */
- sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
+ bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr=false) const;
- sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
- SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const;
- sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
+ bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll);
+ SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const;
+ bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr);
// Intern: Beim Splitteraufziehen neue OutlinerView...
virtual void AddWindowToPaintView(OutputDevice* pNewWin);
@@ -243,15 +243,15 @@ public:
// Persistent. Default TRUE. SvDraw wertet das Flag u.a. bei
// SdrView::GetPreferredPointer() aus. Hat nur Wirkung, wenn das Dokument
// Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==sal_True).
- void SetMacroMode(sal_Bool bOn) { bMacroMode=bOn; }
- sal_Bool IsMacroMode() const { return bMacroMode; }
- sal_Bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin);
- sal_Bool BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); }
+ void SetMacroMode(bool bOn) { bMacroMode=bOn; }
+ bool IsMacroMode() const { return bMacroMode; }
+ bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin);
+ bool BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); }
void MovMacroObj(const Point& rPnt);
void BrkMacroObj();
- sal_Bool EndMacroObj();
- sal_Bool IsMacroObj() const { return pMacroObj!=NULL; }
- sal_Bool IsMacroObjDown() const { return bMacroDown; }
+ bool EndMacroObj();
+ bool IsMacroObj() const { return pMacroObj!=NULL; }
+ bool IsMacroObjDown() const { return bMacroDown; }
/** fills the given any with a XTextCursor for the current text selection.
Leaves the any untouched if there currently is no text selected */
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 54e4346f2a88..918205e36fc6 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -29,7 +29,7 @@
// ExchangeFormat-Id der DrawingEngine holen. Daten koennen dann per
-// static sal_Bool CopyData(pData,nLen,nFormat);
+// static bool CopyData(pData,nLen,nFormat);
// bereitgestellt werden, wobei pData/nLen einen SvMemoryStream beschreiben in
// dem ein SdrModel gestreamt wird an dem fuer die Zeitdauer des Streamens das
// Flag SdrModel::SetStreamingSdrModel(sal_True) gesetzt wird.
@@ -112,7 +112,7 @@ SVX_DLLPUBLIC bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol);
// Ein ItemSet auf Outliner- bzw. EditEngine-Items durchsuchen
// Liefert sal_True, wenn der Set solchen Items enthaelt.
-sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal_Bool* pbOnlyEE=NULL);
+bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnlyEE=NULL);
// zurueck erhaelt man einen neuen WhichTable den
// man dann irgendwann mit delete platthauen muss.
@@ -148,13 +148,13 @@ public:
void Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount );
- sal_Bool SetNextObject();
+ bool SetNextObject();
void SetActionCount( sal_uIntPtr _nActionCount );
void SetInsertCount( sal_uIntPtr _nInsertCount );
- sal_Bool ReportActions( sal_uIntPtr nAnzActions );
- sal_Bool ReportInserts( sal_uIntPtr nAnzInserts );
+ bool ReportActions( sal_uIntPtr nAnzActions );
+ bool ReportInserts( sal_uIntPtr nAnzInserts );
sal_uIntPtr GetSumActionCount() const { return nSumActionCount; };
sal_uIntPtr GetSumCurAction() const { return nSumCurAction; };
@@ -167,7 +167,7 @@ public:
sal_uIntPtr GetInsertCount() const { return nInsertCount; };
sal_uIntPtr GetCurInsert() const { return nCurInsert; };
- sal_Bool ReportRescales( sal_uIntPtr nAnzRescales );
+ bool ReportRescales( sal_uIntPtr nAnzRescales );
};
@@ -201,7 +201,7 @@ class OLEObjCache : public std::vector<SdrOle2Obj*>
AutoTimer* pTimer;
void UnloadOnDemand();
- sal_Bool UnloadObj( SdrOle2Obj* pObj );
+ bool UnloadObj( SdrOle2Obj* pObj );
DECL_LINK( UnloadCheckHdl, AutoTimer* );
public:
diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx
index 8576da69e678..8a9e420815a2 100644
--- a/include/svx/svdglev.hxx
+++ b/include/svx/svdglev.hxx
@@ -37,7 +37,7 @@ class SVX_DLLPUBLIC SdrGlueEditView: public SdrPolyEditView
void ImpCopyMarkedGluePoints();
typedef void (*PGlueDoFunc)(SdrGluePoint&, const SdrObject* pObj, const void*, const void*, const void*, const void*, const void*);
typedef void (*PGlueTrFunc)(Point&, const void*, const void*, const void*, const void*, const void*);
- void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL);
+ void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL);
void ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL);
protected:
@@ -51,14 +51,14 @@ public:
// Moegliche Werte fuer nThisEsc sind z.Zt.
// SDRESC_LEFT, SDRESC_RIGHT, SDRESC_TOP und SDRESC_BOTTOM
TRISTATE IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const;
- void SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bOn);
- sal_Bool IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
+ void SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, bool bOn);
+ bool IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
// Checken/setzen, ob die Klebepunktpositionen relativ zur
// Objektgroesse sind (Percent=sal_True) oder nicht (Percent=sal_False)
TRISTATE IsMarkedGluePointsPercent() const;
- void SetMarkedGluePointsPercent(sal_Bool bOn);
- sal_Bool IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
+ void SetMarkedGluePointsPercent(bool bOn);
+ bool IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
// bVert=FALSE: Horizontales Alignment checken/setzen
// SDRHORZALIGN_CENTER
@@ -70,9 +70,9 @@ public:
// SDRVERTALIGN_TOP
// SDRVERTALIGN_BOTTOM
// SDRVERTALIGN_DONTCARE (nur bei Get())
- sal_uInt16 GetMarkedGluePointsAlign(sal_Bool bVert) const;
- void SetMarkedGluePointsAlign(sal_Bool bVert, sal_uInt16 nAlign);
- sal_Bool IsSetMarkedGluePointsAlignPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
+ sal_uInt16 GetMarkedGluePointsAlign(bool bVert) const;
+ void SetMarkedGluePointsAlign(bool bVert, sal_uInt16 nAlign);
+ bool IsSetMarkedGluePointsAlignPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
// Alle merkierten Klebepunkte entfernen
void DeleteMarkedGluePoints();
@@ -80,12 +80,12 @@ public:
void MoveMarkedGluePoints (const Size& rSiz, bool bCopy=false);
void ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
void RotateMarkedGluePoints(const Point& rRef, long nWink, bool bCopy=false);
- void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, sal_Bool bCopy=sal_False);
- void MirrorMarkedGluePointsHorizontal(sal_Bool bCopy=sal_False);
- void MirrorMarkedGluePointsVertical(sal_Bool bCopy=sal_False);
- void ShearMarkedGluePoints(const Point& rRef, long nWink, sal_Bool bVShear=sal_False, sal_Bool bCopy=sal_False);
- void CrookMarkedGluePoints(const Point& rRef, const Point& rRad, SdrCrookMode eMode, sal_Bool bVertical=sal_False, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False);
- void DistortMarkedGluePoints(const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False);
+ void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, bool bCopy=false);
+ void MirrorMarkedGluePointsHorizontal(bool bCopy=false);
+ void MirrorMarkedGluePointsVertical(bool bCopy=false);
+ void ShearMarkedGluePoints(const Point& rRef, long nWink, bool bVShear=false, bool bCopy=false);
+ void CrookMarkedGluePoints(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false);
+ void DistortMarkedGluePoints(const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion=false, bool bCopy=false);
void AlignMarkedGluePoints(SdrHorAlign eHor, SdrVertAlign eVert);
};
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index fd7cdf65c1dd..fcb9587f10d4 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -162,9 +162,9 @@ protected:
sal_uInt32 nPPntNum; // Punktnummer des Polygons
sal_uInt32 nSourceHdlNum; // ist noch vollstaendig zu implementieren
- unsigned bSelect : 1; // Ein selektierter Polygonpunkt?
- unsigned b1PixMore : 1; // True=Handle wird 1 Pixel groesser dargestellt
- unsigned bPlusHdl : 1; // u.a. fuer Hld-Paint Optimierung bei MarkPoint/UnmarkPoint, ...
+ bool bSelect : 1; // Ein selektierter Polygonpunkt?
+ bool b1PixMore : 1; // True=Handle wird 1 Pixel groesser dargestellt
+ bool bPlusHdl : 1; // u.a. fuer Hld-Paint Optimierung bei MarkPoint/UnmarkPoint, ...
bool mbMoveOutside; // forces this handle to be moved outside of the selection rectangle
@@ -203,14 +203,14 @@ public:
SdrObject* GetObj() const { return pObj; }
void SetObj(SdrObject* pNewObj);
- sal_Bool IsSelected() const { return bSelect; }
- void SetSelected(sal_Bool bJa=sal_True);
+ bool IsSelected() const { return bSelect; }
+ void SetSelected(bool bJa=true);
- void Set1PixMore(sal_Bool bJa=sal_True);
+ void Set1PixMore(bool bJa=true);
void SetDrehWink(long n);
- sal_Bool IsCornerHdl() const { return eKind==HDL_UPLFT || eKind==HDL_UPRGT || eKind==HDL_LWLFT || eKind==HDL_LWRGT; }
- sal_Bool IsVertexHdl() const { return eKind==HDL_UPPER || eKind==HDL_LOWER || eKind==HDL_LEFT || eKind==HDL_RIGHT; }
+ bool IsCornerHdl() const { return eKind==HDL_UPLFT || eKind==HDL_UPRGT || eKind==HDL_LWLFT || eKind==HDL_LWRGT; }
+ bool IsVertexHdl() const { return eKind==HDL_UPPER || eKind==HDL_LOWER || eKind==HDL_LEFT || eKind==HDL_RIGHT; }
void SetObjHdlNum(sal_uInt32 nNum) { nObjHdlNum=nNum; }
sal_uInt32 GetObjHdlNum() const { return nObjHdlNum; }
@@ -221,8 +221,8 @@ public:
void SetPointNum(sal_uInt32 nNum) { nPPntNum=nNum; }
sal_uInt32 GetPointNum() const { return nPPntNum; }
- void SetPlusHdl(sal_Bool bOn) { bPlusHdl=bOn; }
- sal_Bool IsPlusHdl() const { return bPlusHdl; }
+ void SetPlusHdl(bool bOn) { bPlusHdl=bOn; }
+ bool IsPlusHdl() const { return bPlusHdl; }
void SetSourceHdlNum(sal_uInt32 nNum) { nSourceHdlNum=nNum; }
sal_uInt32 GetSourceHdlNum() const { return nSourceHdlNum; }
@@ -231,7 +231,7 @@ public:
bool IsHdlHit(const Point& rPnt) const;
// #97016# II
- virtual sal_Bool IsFocusHdl() const;
+ virtual bool IsFocusHdl() const;
void SetMoveOutside( bool bMoveOutside );
@@ -264,7 +264,7 @@ private:
Link aColorChangeHdl;
// use luminance values only
- unsigned bUseLuminance : 1;
+ bool bUseLuminance : 1;
// create marker for this kind
SVX_DLLPRIVATE virtual void CreateB2dIAObject();
@@ -275,13 +275,13 @@ private:
SVX_DLLPRIVATE void CallColorChangeLink();
public:
- explicit SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), sal_Bool bLum = sal_False);
+ explicit SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), bool bLum = false);
virtual ~SdrHdlColor();
- sal_Bool IsUseLuminance() const { return bUseLuminance; }
+ bool IsUseLuminance() const { return bUseLuminance; }
Color GetColor() const { return aMarkerColor; }
- void SetColor(Color aNew, sal_Bool bCallLink = sal_False);
+ void SetColor(Color aNew, bool bCallLink = false);
const Size& GetSize() const { return aMarkerSize; }
void SetSize(const Size& rNew);
@@ -303,7 +303,7 @@ private:
Point a2ndPos;
// is this a gradient or a transparence
- unsigned bGradient : 1;
+ bool bGradient : 1;
// select which handle to move
bool bMoveSingleHandle : 1;
@@ -313,10 +313,10 @@ private:
virtual void CreateB2dIAObject();
public:
- SdrHdlGradient(const Point& rRef1, const Point& rRef2, sal_Bool bGrad = sal_True);
+ SdrHdlGradient(const Point& rRef1, const Point& rRef2, bool bGrad = true);
virtual ~SdrHdlGradient();
- sal_Bool IsGradient() const { return bGradient; }
+ bool IsGradient() const { return bGradient; }
// set the associated color handles
void SetColorHandles(SdrHdlColor* pL1, SdrHdlColor* pL2) { pColHdl1 = pL1; pColHdl2 = pL2; }
@@ -330,7 +330,7 @@ public:
DECL_LINK(ColorChangeHdl, SdrHdl*);
// transformation call, create gradient from this handle
- void FromIAOToItem(SdrObject* pObj, sal_Bool bSetItemOnObject, sal_Bool bUndo);
+ void FromIAOToItem(SdrObject* pObj, bool bSetItemOnObject, bool bUndo);
// selection flags for interaction
bool IsMoveSingleHandle() const { return bMoveSingleHandle; }
@@ -403,7 +403,7 @@ public:
void SetLineCode(SdrEdgeLineCode eCode);
SdrEdgeLineCode GetLineCode() const { return eLineCode; }
- sal_Bool IsHorzDrag() const;
+ bool IsHorzDrag() const;
virtual Pointer GetPointer() const;
};
@@ -446,15 +446,15 @@ protected:
std::deque<SdrHdl*> aList;
sal_uInt16 nHdlSize;
- unsigned bRotateShear : 1;
- unsigned bDistortShear : 1;
- unsigned bMoveOutside : 1; // Handles nach aussen ruecken (fuer TextEdit)
+ bool bRotateShear : 1;
+ bool bDistortShear : 1;
+ bool bMoveOutside : 1; // Handles nach aussen ruecken (fuer TextEdit)
private:
SVX_DLLPRIVATE SdrHdlList(const SdrHdlList&): aList() {}
SVX_DLLPRIVATE void operator=(const SdrHdlList&) {}
- SVX_DLLPRIVATE sal_Bool operator==(const SdrHdlList&) const { return sal_False; }
- SVX_DLLPRIVATE sal_Bool operator!=(const SdrHdlList&) const { return sal_False; }
+ SVX_DLLPRIVATE bool operator==(const SdrHdlList&) const { return false; }
+ SVX_DLLPRIVATE bool operator!=(const SdrHdlList&) const { return false; }
public:
explicit SdrHdlList(SdrMarkView* pV);
@@ -462,7 +462,7 @@ public:
void Clear();
// #97016# II
- void TravelFocusHdl(sal_Bool bForward);
+ void TravelFocusHdl(bool bForward);
SdrHdl* GetFocusHdl() const;
void SetFocusHdl(SdrHdl* pNew);
void ResetFocusHdl();
@@ -479,22 +479,22 @@ public:
sal_uIntPtr GetHdlNum(const SdrHdl* pHdl) const;
void SetHdlSize(sal_uInt16 nSiz);
sal_uInt16 GetHdlSize() const { return nHdlSize; }
- void SetMoveOutside(sal_Bool bOn);
- sal_Bool IsMoveOutside() const { return bMoveOutside; }
- void SetRotateShear(sal_Bool bOn);
- sal_Bool IsRotateShear() const { return bRotateShear; }
- void SetDistortShear(sal_Bool bOn);
- sal_Bool IsDistortShear() const { return bDistortShear; }
+ void SetMoveOutside(bool bOn);
+ bool IsMoveOutside() const { return bMoveOutside; }
+ void SetRotateShear(bool bOn);
+ bool IsRotateShear() const { return bRotateShear; }
+ void SetDistortShear(bool bOn);
+ bool IsDistortShear() const { return bDistortShear; }
// AddHdl uebernimmt das Handle in sein Eigentum. Es muss
// also auf dem Heap stehen, da Clear() ein delete macht.
- void AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin=sal_False);
+ void AddHdl(SdrHdl* pHdl, bool bAtBegin=false);
SdrHdl* RemoveHdl(sal_uIntPtr nNum);
void RemoveAllByKind(SdrHdlKind eKind);
// Zuletzt eingefuegte Handles werden am ehesten getroffen
// (wenn Handles uebereinander liegen).
- SdrHdl* IsHdlListHit(const Point& rPnt, sal_Bool bBack=sal_False, sal_Bool bNext=sal_False, SdrHdl* pHdl0=NULL) const;
+ SdrHdl* IsHdlListHit(const Point& rPnt, bool bBack=false, bool bNext=false, SdrHdl* pHdl0=NULL) const;
SdrHdl* GetHdl(SdrHdlKind eKind1) const;
};
diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx
index 4a23d575da01..f5b31fa7fa9a 100644
--- a/include/svx/svdhlpln.hxx
+++ b/include/svx/svdhlpln.hxx
@@ -41,7 +41,7 @@ class SdrHelpLine {
// #i27493#
// Helper method to draw a hor or ver two-colored dashed line
void ImpDrawDashedTwoColorLine(OutputDevice& rOut, sal_Int32 nStart, sal_Int32 nEnd, sal_Int32 nFixPos,
- sal_Int32 nStepWidth, Color aColA, Color aColB, sal_Bool bHorizontal) const;
+ sal_Int32 nStepWidth, Color aColA, Color aColB, bool bHorizontal) const;
public:
explicit SdrHelpLine(SdrHelpLineKind eNewKind=SDRHELPLINE_POINT): eKind(eNewKind) {}
diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx
index fc9417d572fd..15d8735b593c 100644
--- a/include/svx/svdmark.hxx
+++ b/include/svx/svdmark.hxx
@@ -46,8 +46,8 @@ protected:
SdrUShortCont* mpPoints; // Selected Points
SdrUShortCont* mpLines; // Selected Line
SdrUShortCont* mpGluePoints; // Selected Gluepoints (their Id's)
- sal_Bool mbCon1; // for Connectors
- sal_Bool mbCon2; // for Connectors
+ bool mbCon1; // for Connectors
+ bool mbCon2; // for Connectors
sal_uInt16 mnUser; // E.g. for CopyObjects, also copy Edges
public:
@@ -59,8 +59,8 @@ public:
virtual void ObjectInDestruction(const SdrObject& rObject);
SdrMark& operator=(const SdrMark& rMark);
- sal_Bool operator==(const SdrMark& rMark) const;
- sal_Bool operator!=(const SdrMark& rMark) const
+ bool operator==(const SdrMark& rMark) const;
+ bool operator!=(const SdrMark& rMark) const
{
return !(operator==(rMark));
}
@@ -78,22 +78,22 @@ public:
mpPageView = pNewPageView;
}
- void SetCon1(sal_Bool bOn)
+ void SetCon1(bool bOn)
{
mbCon1 = bOn;
}
- sal_Bool IsCon1() const
+ bool IsCon1() const
{
return mbCon1;
}
- void SetCon2(sal_Bool bOn)
+ void SetCon2(bool bOn)
{
mbCon2 = bOn;
}
- sal_Bool IsCon2() const
+ bool IsCon2() const
{
return mbCon2;
}
@@ -172,25 +172,25 @@ protected:
OUString maPointName;
OUString maGluePointName;
- sal_Bool mbPointNameOk;
- sal_Bool mbGluePointNameOk;
- sal_Bool mbNameOk;
- sal_Bool mbSorted;
+ bool mbPointNameOk;
+ bool mbGluePointNameOk;
+ bool mbNameOk;
+ bool mbSorted;
private:
- SVX_DLLPRIVATE sal_Bool operator==(const SdrMarkList& rCmpMarkList) const;
+ SVX_DLLPRIVATE bool operator==(const SdrMarkList& rCmpMarkList) const;
SVX_DLLPRIVATE void ImpForceSort();
private:
- SVX_DLLPRIVATE const OUString& GetPointMarkDescription(sal_Bool bGlue) const;
+ SVX_DLLPRIVATE const OUString& GetPointMarkDescription(bool bGlue) const;
public:
SdrMarkList()
: maList(),
- mbPointNameOk(sal_False),
- mbGluePointNameOk(sal_False),
- mbNameOk(sal_False),
- mbSorted(sal_True)
+ mbPointNameOk(false),
+ mbGluePointNameOk(false),
+ mbNameOk(false),
+ mbSorted(true)
{
}
@@ -209,7 +209,7 @@ public:
void ForceSort() const;
void SetUnsorted()
{
- mbSorted = sal_False;
+ mbSorted = false;
}
sal_uLong GetMarkCount() const
@@ -219,18 +219,18 @@ public:
SdrMark* GetMark(sal_uLong nNum) const;
sal_uLong FindObject(const SdrObject* pObj) const;
- void InsertEntry(const SdrMark& rMark, sal_Bool bChkSort = sal_True);
+ void InsertEntry(const SdrMark& rMark, bool bChkSort = true);
void DeleteMark(sal_uLong nNum);
void ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum);
- void Merge(const SdrMarkList& rSrcList, sal_Bool bReverse = sal_False);
- sal_Bool DeletePageView(const SdrPageView& rPV);
- sal_Bool InsertPageView(const SdrPageView& rPV);
+ void Merge(const SdrMarkList& rSrcList, bool bReverse = false);
+ bool DeletePageView(const SdrPageView& rPV);
+ bool InsertPageView(const SdrPageView& rPV);
void SetNameDirty()
{
- mbNameOk = sal_False;
- mbPointNameOk = sal_False;
- mbGluePointNameOk = sal_False;
+ mbNameOk = false;
+ mbPointNameOk = false;
+ mbGluePointNameOk = false;
}
// A verbal description of selected objects e.g.:
@@ -238,17 +238,17 @@ public:
const OUString& GetMarkDescription() const;
const OUString& GetPointMarkDescription() const
{
- return GetPointMarkDescription(sal_False);
+ return GetPointMarkDescription(false);
}
const OUString& GetGluePointMarkDescription() const
{
- return GetPointMarkDescription(sal_True);
+ return GetPointMarkDescription(true);
}
// pPage=0L: Selection of everything! Respect Pages
- sal_Bool TakeBoundRect(SdrPageView* pPageView, Rectangle& rRect) const;
- sal_Bool TakeSnapRect(SdrPageView* pPageView, Rectangle& rRect) const;
+ bool TakeBoundRect(SdrPageView* pPageView, Rectangle& rRect) const;
+ bool TakeSnapRect(SdrPageView* pPageView, Rectangle& rRect) const;
// Es werden saemtliche Entries kopiert!
void operator=(const SdrMarkList& rLst);
@@ -267,7 +267,7 @@ namespace sdr
std::vector<SdrObject*> maAllMarkedObjects;
// bitfield
- unsigned mbEdgesOfMarkedNodesDirty : 1;
+ bool mbEdgesOfMarkedNodesDirty : 1;
SVX_DLLPRIVATE void ImpForceEdgesOfMarkedNodes();
SVX_DLLPRIVATE void ImplCollectCompleteSelection(SdrObject* pObj);
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 16603fbf2764..524c86c37b9c 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -265,7 +265,7 @@ private:
SVX_DLLPRIVATE bool operator==(const SdrModel& rCmpModel) const;
SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo);
SVX_DLLPRIVATE void ImpSetUIUnit();
- SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit = sal_False );
+ SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool bInit = false );
SVX_DLLPRIVATE void ImpReformatAllTextObjects();
SVX_DLLPRIVATE void ImpReformatAllEdgeObjects(); // #103122#
SVX_DLLPRIVATE void ImpCreateTables();
@@ -291,12 +291,11 @@ public:
// Zeichenobjekte verwenden moechte. Setzt man degegen nur vom abstrakten
// Basisobjekt SdrObject abgeleitete Objekte ein, so ist man frei in der
// Wahl des Pools.
- explicit SdrModel(SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
- explicit SdrModel(const OUString& rPath, SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
- SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
- SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
+ explicit SdrModel();
+ explicit SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts);
+ explicit SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts);
virtual ~SdrModel();
- void ClearModel(sal_Bool bCalledFromDestructor);
+ void ClearModel(bool bCalledFromDestructor);
// Hier kann man erfragen, ob das Model gerade eingrstreamt wird
bool IsLoading() const { return false /*BFS01 bLoading */; }
@@ -620,8 +619,8 @@ public:
SfxStyleSheetBasePool* GetStyleSheetPool() const { return mxStyleSheetPool.get(); }
void SetStyleSheetPool(SfxStyleSheetBasePool* pPool) { mxStyleSheetPool=pPool; }
- void SetStarDrawPreviewMode(sal_Bool bPreview);
- sal_Bool IsStarDrawPreviewMode() { return bStarDrawPreviewMode; }
+ void SetStarDrawPreviewMode(bool bPreview);
+ bool IsStarDrawPreviewMode() { return bStarDrawPreviewMode; }
bool GetDisableTextEditUsesCommonUndoManager() const { return mbDisableTextEditUsesCommonUndoManager; }
void SetDisableTextEditUsesCommonUndoManager(bool bNew) { mbDisableTextEditUsesCommonUndoManager = bNew; }
@@ -640,18 +639,18 @@ public:
void SetCharCompressType( sal_uInt16 nType );
sal_uInt16 GetCharCompressType() const { return mnCharCompressType; }
- void SetKernAsianPunctuation( sal_Bool bEnabled );
- sal_Bool IsKernAsianPunctuation() const { return (sal_Bool)mbKernAsianPunctuation; }
+ void SetKernAsianPunctuation( bool bEnabled );
+ bool IsKernAsianPunctuation() const { return mbKernAsianPunctuation; }
- void SetAddExtLeading( sal_Bool bEnabled );
- sal_Bool IsAddExtLeading() const { return (sal_Bool)mbAddExtLeading; }
+ void SetAddExtLeading( bool bEnabled );
+ bool IsAddExtLeading() const { return mbAddExtLeading; }
void ReformatAllTextObjects();
SdrOutliner* createOutliner( sal_uInt16 nOutlinerMode );
void disposeOutliner( SdrOutliner* pOutliner );
- sal_Bool IsWriter() const { return !bMyPool; }
+ bool IsWriter() const { return !bMyPool; }
/** returns the numbering type that is used to format page fields in drawing shapes */
virtual SvxNumType GetPageNumType() const;
@@ -702,7 +701,7 @@ typedef tools::WeakReference< SdrModel > SdrModelWeakRef;
+---+---+ +---+---+ +----+----+ +----+----+ +-----+------+ +------+-----+
|SdrObj | |SdrObj | |SdrLayer | |SdrLayer | |SdrLayerSet | |SdrLayerSet |
+-------+ +-------+ +---------+ +---------+ +------------+ +------------+
-This class: SdrModel is the head of the data modells for the StarView Drawing Engine.
+This class: SdrModel is the head of the data models for the StarView Drawing Engine.
///////////////////////////////////////////////////////////////////////////////////////////////// */
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 5dd5f9177f7c..d6832923dfd8 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -159,15 +159,15 @@ protected:
virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay) const;
virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const;
virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj,const SdrMarkList * pMarkList) const;
- sal_Bool ImpIsFrameHandles() const;
+ bool ImpIsFrameHandles() const;
void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal=0, sal_uInt16 nOpt=0) const;
// Generates a string including degrees symbol, from an angel specification in 1/100deg
- sal_Bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark);
- virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark);
- sal_Bool MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark);
+ bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark);
+ virtual bool MarkPoints(const Rectangle* pRect, bool bUnmark);
+ bool MarkGluePoints(const Rectangle* pRect, bool bUnmark);
- void SetMoveOutside(sal_Bool bOn);
+ void SetMoveOutside(bool bOn);
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -175,7 +175,7 @@ protected:
virtual ~SdrMarkView();
public:
- virtual sal_Bool IsAction() const;
+ virtual bool IsAction() const;
virtual void MovAction(const Point& rPnt);
virtual void EndAction();
virtual void BckAction();
@@ -184,27 +184,27 @@ public:
virtual void ClearPageView();
virtual void HideSdrPage();
- virtual sal_Bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const;
+ virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const;
// Returns sal_True if objects, points or glue points are selected by drawing a frame
// (as long as the frame is drawn).
- sal_Bool IsMarking() const { return IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); }
+ bool IsMarking() const { return IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); }
// Marking objects by drawing of a selection frame
- sal_Bool BegMarkObj(const Point& rPnt, sal_Bool bUnmark = sal_False);
+ bool BegMarkObj(const Point& rPnt, bool bUnmark = false);
void MovMarkObj(const Point& rPnt);
- sal_Bool EndMarkObj();
+ bool EndMarkObj();
void BrkMarkObj();
- sal_Bool IsMarkObj() const { return (0L != mpMarkObjOverlay); }
+ bool IsMarkObj() const { return (0L != mpMarkObjOverlay); }
// DragModes: SDRDRAG_CREATE,SDRDRAG_MOVE,SDRDRAG_RESIZE,SDRDRAG_ROTATE,SDRDRAG_MIRROR,SDRDRAG_SHEAR,SDRDRAG_CROOK
// Move==Resize
// The interface might maybe be changed in the future because of Ortho-Drag
void SetDragMode(SdrDragMode eMode);
SdrDragMode GetDragMode() const { return eDragMode; }
- sal_Bool ChkDragMode(SdrDragMode eMode) const;
+ bool ChkDragMode(SdrDragMode eMode) const;
void SetFrameHandles(bool bOn);
- sal_Bool IsFrameHandles() const { return bForceFrameHandles; }
+ bool IsFrameHandles() const { return bForceFrameHandles; }
sal_uIntPtr GetMarkableObjCount() const;
@@ -215,20 +215,20 @@ public:
void SetEditMode(SdrViewEditMode eMode);
SdrViewEditMode GetEditMode() const { return eEditMode; }
- void SetEditMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_EDIT:SDREDITMODE_CREATE); }
- sal_Bool IsEditMode() const { return eEditMode==SDREDITMODE_EDIT; }
- void SetCreateMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_CREATE:SDREDITMODE_EDIT); }
- sal_Bool IsCreateMode() const { return eEditMode==SDREDITMODE_CREATE; }
- void SetGluePointEditMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); }
- sal_Bool IsGluePointEditMode() const { return eEditMode==SDREDITMODE_GLUEPOINTEDIT; }
+ void SetEditMode(bool bOn=true) { SetEditMode(bOn?SDREDITMODE_EDIT:SDREDITMODE_CREATE); }
+ bool IsEditMode() const { return eEditMode==SDREDITMODE_EDIT; }
+ void SetCreateMode(bool bOn=true) { SetEditMode(bOn?SDREDITMODE_CREATE:SDREDITMODE_EDIT); }
+ bool IsCreateMode() const { return eEditMode==SDREDITMODE_CREATE; }
+ void SetGluePointEditMode(bool bOn=true) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); }
+ bool IsGluePointEditMode() const { return eEditMode==SDREDITMODE_GLUEPOINTEDIT; }
void SetDesignMode(bool bOn = true);
- sal_Bool IsDesignMode() const { return bDesignMode; }
+ bool IsDesignMode() const { return bDesignMode; }
- void SetFrameDragSingles(sal_Bool bOn=sal_True) { SetFrameHandles(bOn); }
- sal_Bool IsFrameDragSingles() const { return IsFrameHandles(); }
+ void SetFrameDragSingles(bool bOn=true) { SetFrameHandles(bOn); }
+ bool IsFrameDragSingles() const { return IsFrameHandles(); }
- sal_Bool HasMarkableObj() const;
+ bool HasMarkableObj() const;
// migrate selections
@@ -247,12 +247,12 @@ public:
SdrObject* GetMarkedObjectByIndex(sal_uIntPtr nNum) const { return (GetMarkedObjectList().GetMark(nNum))->GetMarkedSdrObj(); }
sal_uIntPtr GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); }
void SortMarkedObjects() const { GetMarkedObjectList().ForceSort(); }
- sal_Bool AreObjectsMarked() const { return (0L != GetMarkedObjectList().GetMarkCount()); }
+ bool AreObjectsMarked() const { return (0L != GetMarkedObjectList().GetMarkCount()); }
OUString GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); }
OUString GetDescriptionOfMarkedPoints() const { return GetMarkedObjectList().GetPointMarkDescription(); }
OUString GetDescriptionOfMarkedGluePoints() const { return GetMarkedObjectList().GetGluePointMarkDescription(); }
- sal_Bool GetBoundRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { return GetMarkedObjectList().TakeBoundRect(pPageView, rRect); }
- sal_Bool GetSnapRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { return GetMarkedObjectList().TakeSnapRect(pPageView, rRect); }
+ bool GetBoundRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { return GetMarkedObjectList().TakeBoundRect(pPageView, rRect); }
+ bool GetSnapRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { return GetMarkedObjectList().TakeSnapRect(pPageView, rRect); }
// Get a list of all those links which are connected to marked nodes,
// but which are not marked themselves.
@@ -269,8 +269,8 @@ public:
void showMarkHandles();
bool areMarkHandlesHidden() const { return mbMarkHandlesHidden; }
- sal_Bool IsMarkedHit(const Point& rPnt, short nTol=-2) const { return IsMarkedObjHit(rPnt,nTol); }
- sal_Bool IsMarkedObjHit(const Point& rPnt, short nTol=-2) const;
+ bool IsMarkedHit(const Point& rPnt, short nTol=-2) const { return IsMarkedObjHit(rPnt,nTol); }
+ bool IsMarkedObjHit(const Point& rPnt, short nTol=-2) const;
// Pick: Supported options for nOptions are SEARCH_NEXT, SEARCH_BACKWARD (ni)
SdrHdl* PickHandle(const Point& rPnt, sal_uIntPtr nOptions=0, SdrHdl* pHdl0=NULL) const;
@@ -279,37 +279,37 @@ public:
// SDRSEARCH_DEEP SDRSEARCH_ALSOONMASTER SDRSEARCH_TESTMARKABLE SDRSEARCH_TESTTEXTEDIT
// SDRSEARCH_WITHTEXT SDRSEARCH_TESTTEXTAREA SDRSEARCH_BACKWARD SDRSEARCH_MARKED
// SDRSEARCH_WHOLEPAGE
- virtual sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum=NULL, sal_uInt16* pnPassNum=NULL) const;
- virtual sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const;
- // sal_Bool PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); }
- sal_Bool MarkObj(const Point& rPnt, short nTol=-2, sal_Bool bToggle=sal_False, sal_Bool bDeep=sal_False);
+ virtual bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum=NULL, sal_uInt16* pnPassNum=NULL) const;
+ virtual bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const;
+ // bool PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); }
+ bool MarkObj(const Point& rPnt, short nTol=-2, bool bToggle=false, bool bDeep=false);
// Pick: Supported options for nOptions are SDRSEARCH_PASS2BOUND und SDRSEARCH_PASS3NEAREST
- sal_Bool PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum=NULL, sal_uIntPtr nOptions=0) const;
+ bool PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum=NULL, sal_uIntPtr nOptions=0) const;
// Selects the most upper of the marked objects (O1) and scans from there
// towards bottom direction, selecting the first non-marked object (O2).
// In case of success the marking of O1 is deleted, a marking is created at
// O2 and TRUE is returned. With the parameter bPrev=sal_True the scan
// direction is turned to the other direction.
- sal_Bool MarkNextObj(sal_Bool bPrev=sal_False);
+ bool MarkNextObj(bool bPrev=false);
// Selects the most upper of the marked objects which is hit by rPnt/nTol
// and scans from there to bottom direction, selecting the first non-marked
// object (O2). In case of success the marking of O1 is deleted, a marking
// is created at O2 and sal_True is returned. With the parameter
// bPrev=sal_True the scan direction is turned to the other direction.
- sal_Bool MarkNextObj(const Point& rPnt, short nTol=-2, sal_Bool bPrev=sal_False);
+ bool MarkNextObj(const Point& rPnt, short nTol=-2, bool bPrev=false);
// Mark all objects within a rectangular area
// Just objects are marked which are inclosed completely
- sal_Bool MarkObj(const Rectangle& rRect, sal_Bool bUnmark=sal_False);
- void MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark=sal_False, sal_Bool bImpNoSetMarkHdl=sal_False);
+ bool MarkObj(const Rectangle& rRect, bool bUnmark=false);
+ void MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark=false, bool bImpNoSetMarkHdl=false);
void MarkAllObj(SdrPageView* pPV=NULL); // pPage=NULL => all displayed pages
void UnmarkAllObj(SdrPageView* pPV=NULL); // pPage=NULL => all displayed pages
// This function is time-consuming intensive, as the MarkList has to be scanned.
- sal_Bool IsObjMarked(SdrObject* pObj) const;
+ bool IsObjMarked(SdrObject* pObj) const;
// void MarkAll(SdrPageView* pPV=NULL) { MarkAllObj(pPV); } -> replace with inline
void UnMarkAll(SdrPageView* pPV=NULL) { UnmarkAllObj(pPV); }
@@ -320,33 +320,33 @@ public:
sal_uInt16 GetMarkHdlSizePixel() const;
void SetMarkHdlSizePixel(sal_uInt16 nSiz);
- virtual sal_Bool HasMarkablePoints() const;
+ virtual bool HasMarkablePoints() const;
virtual sal_uIntPtr GetMarkablePointCount() const;
- virtual sal_Bool HasMarkedPoints() const;
+ virtual bool HasMarkedPoints() const;
virtual sal_uIntPtr GetMarkedPointCount() const;
// There might be points which can't be marked:
- 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);
/** should only be used from outside svx for special ui elements */
- sal_Bool MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark);
+ bool MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark);
// Mark all points within this rectangular alle Punkte (View coordinates)
- sal_Bool MarkPoints(const Rectangle& rRect, sal_Bool bUnmark=sal_False) { return MarkPoints(&rRect,bUnmark); }
- sal_Bool UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,sal_True); }
- sal_Bool UnMarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,sal_True); }
- sal_Bool IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return &rHdl!=NULL && rHdl.IsSelected(); }
- sal_Bool MarkAllPoints() { return MarkPoints(NULL,sal_False); }
- sal_Bool UnmarkAllPoints() { return MarkPoints(NULL,sal_True); }
- sal_Bool UnMarkAllPoints() { return MarkPoints(NULL,sal_True); }
+ bool MarkPoints(const Rectangle& rRect, bool bUnmark=false) { return MarkPoints(&rRect,bUnmark); }
+ bool UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,true); }
+ bool UnMarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,true); }
+ bool IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return &rHdl!=NULL && rHdl.IsSelected(); }
+ bool MarkAllPoints() { return MarkPoints(NULL,false); }
+ bool UnmarkAllPoints() { return MarkPoints(NULL,true); }
+ bool UnMarkAllPoints() { return MarkPoints(NULL,true); }
// Selects the first marked point (P1) which is hit by rPnt
// and from there it searches the first non-marked point(P2).
// In case of success the marking of
// P1 is deleted, a mark is set at P2 and sal_True is returned.
// With the parameter bPrev=sal_True the scan direction is turned to the other direction.
- sal_Bool MarkNextPoint(const Point& rPnt, sal_Bool bPrev=sal_False);
+ bool MarkNextPoint(const Point& rPnt, bool bPrev=false);
// Search for the number of the suitable handle. In case of empty search result,
// CONTAINER_ENTRY_NOTFOUND is returned.
@@ -356,23 +356,23 @@ public:
// Draw a selection frame for marking of points.
// This routine will just be started in case that HasMarkablePoints() returns sal_True.
- sal_Bool BegMarkPoints(const Point& rPnt, sal_Bool bUnmark = sal_False);
+ bool BegMarkPoints(const Point& rPnt, bool bUnmark = false);
void MovMarkPoints(const Point& rPnt);
- sal_Bool EndMarkPoints();
+ bool EndMarkPoints();
void BrkMarkPoints();
- sal_Bool IsMarkPoints() const { return (0L != mpMarkPointsOverlay); }
+ bool IsMarkPoints() const { return (0L != mpMarkPointsOverlay); }
// Select that additional handles are displayed permanently.
void SetPlusHandlesAlwaysVisible(bool bOn);
- sal_Bool IsPlusHandlesAlwaysVisible() const { return bPlusHdlAlways; }
+ bool IsPlusHandlesAlwaysVisible() const { return bPlusHdlAlways; }
// Are Handles visible during TextEdit (in double size)?
// Persistent, default=FALSE
- void SetMarkHdlWhenTextEdit(sal_Bool bOn) { bMarkHdlWhenTextEdit=bOn; }
- sal_Bool IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; }
+ void SetMarkHdlWhenTextEdit(bool bOn) { bMarkHdlWhenTextEdit=bOn; }
+ bool IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; }
- sal_Bool HasMarkableGluePoints() const;
- sal_Bool HasMarkedGluePoints() const;
+ bool HasMarkableGluePoints() const;
+ bool HasMarkedGluePoints() const;
// A gluepoint is clearly identified by the SdrObject
// (to which it belongs) as well as by a sal_uInt16 nId (as each SdrObject may consist of
@@ -385,38 +385,38 @@ public:
// Attention: With each change of the glue point status the handle list is re-calculated.
// All previously saved SdrHdl* became invalid by this, the same with the point IDs!
// Pick: Supported options for nOptions are SEARCH_NEXT, SEARCH_BACKWARD
- sal_Bool PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const;
- sal_Bool MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV, sal_Bool bUnmark=sal_False);
- sal_Bool UnmarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV) { return MarkGluePoint(pObj,nId,pPV,sal_True); }
- sal_Bool IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const;
+ bool PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const;
+ bool MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV, bool bUnmark=false);
+ bool UnmarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV) { return MarkGluePoint(pObj,nId,pPV,true); }
+ bool IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const;
// Get the Hdl (handle) of a marked GluePoint. Non-marked
// GluePoints don`t have handles
SdrHdl* GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const;
- sal_Bool IsGluePoint(const SdrHdl& rHdl) const { return &rHdl!=NULL && rHdl.GetKind()==HDL_GLUE; }
+ bool IsGluePoint(const SdrHdl& rHdl) const { return &rHdl!=NULL && rHdl.GetKind()==HDL_GLUE; }
// Mark all points within this rectangular (View coordinates)
- sal_Bool MarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,sal_False); }
- sal_Bool UnmarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,sal_True); }
- sal_Bool MarkAllGluePoints() { return MarkGluePoints(NULL,sal_False); }
- sal_Bool UnmarkAllGluePoints() { return MarkGluePoints(NULL,sal_True); }
+ bool MarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,false); }
+ bool UnmarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,true); }
+ bool MarkAllGluePoints() { return MarkGluePoints(NULL,false); }
+ bool UnmarkAllGluePoints() { return MarkGluePoints(NULL,true); }
// Selects the first marked point (P1) which is hit by rPnt
// and from there it searches the first non-marked point(P2).
// In case of success the marking of
// P1 is deleted, a mark is set at P2 and sal_True is returned.
// With the parameter bPrev=sal_True the scan direction is turned to the other direction.
- sal_Bool MarkNextGluePoint(const Point& rPnt, sal_Bool bPrev=sal_False);
+ bool MarkNextGluePoint(const Point& rPnt, bool bPrev=false);
// Draw a selection frame for glue point marking.
// This routine will just be started in case that HasMarkablePoints() returns sal_True.
// The GlueEditMode sal_True is disregarded.
- // sal_Bool BegMarkGluePoints(const Point& rPnt, OutputDevice* pOut);
- sal_Bool BegMarkGluePoints(const Point& rPnt, sal_Bool bUnmark = sal_False);
+ // bool BegMarkGluePoints(const Point& rPnt, OutputDevice* pOut);
+ bool BegMarkGluePoints(const Point& rPnt, bool bUnmark = false);
void MovMarkGluePoints(const Point& rPnt);
- sal_Bool EndMarkGluePoints();
+ bool EndMarkGluePoints();
void BrkMarkGluePoints();
- sal_Bool IsMarkGluePoints() const { return (0L != mpMarkGluePointsOverlay); }
+ bool IsMarkGluePoints() const { return (0L != mpMarkGluePointsOverlay); }
// bRestraintPaint=sal_False causes the handles not to be drawn immediately.
// AdjustMarkHdl is just called in case of changes; usually this causes an Invalidate
@@ -444,7 +444,7 @@ public:
// objects may not be processed in the meantime (until the next
// LeaveGroup()). With markings which overlaps pages, every page is processed
// separately. The method returns sal_True, if at least one group was entered.
- sal_Bool EnterMarkedGroup();
+ bool EnterMarkedGroup();
// Get the center point of the last Crook-Dragging. Den kann man
// bei einem anschliessenden Rotate sinnvoll als Drehmittelpunkt setzen.
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index ca6be6ca6f7f..be3c7a753761 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -49,8 +49,8 @@ class SdrAShapeObjGeoData : public SdrTextObjGeoData
{
public:
- sal_Bool bMirroredX;
- sal_Bool bMirroredY;
+ bool bMirroredX;
+ bool bMirroredY;
double fObjectRotation;
com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue >
@@ -125,9 +125,9 @@ public:
// #i37011#
const SdrObject* GetSdrObjectFromCustomShape() const;
const SdrObject* GetSdrObjectShadowFromCustomShape() const;
- sal_Bool GetTextBounds( Rectangle& rTextBound ) const;
- sal_Bool IsTextPath() const;
- static basegfx::B2DPolyPolygon GetLineGeometry( const SdrObjCustomShape* pCustomShape, const sal_Bool bBezierAllowed );
+ bool GetTextBounds( Rectangle& rTextBound ) const;
+ bool IsTextPath() const;
+ static basegfx::B2DPolyPolygon GetLineGeometry( const SdrObjCustomShape* pCustomShape, const bool bBezierAllowed );
protected:
@@ -135,13 +135,13 @@ protected:
public:
- sal_Bool UseNoFillStyle() const;
+ bool UseNoFillStyle() const;
- sal_Bool IsMirroredX() const;
- sal_Bool IsMirroredY() const;
- bool IsPostRotate() const;
- void SetMirroredX( const sal_Bool bMirroredX );
- void SetMirroredY( const sal_Bool bMirroredY );
+ bool IsMirroredX() const;
+ bool IsMirroredY() const;
+ bool IsPostRotate() const;
+ void SetMirroredX( const bool bMirroredX );
+ void SetMirroredY( const bool bMirroredY );
double GetObjectRotation() const;
double GetExtraTextRotation( const bool bPreRotation = false ) const;
@@ -168,7 +168,7 @@ public:
DEFAULT_HANDLES,
DEFAULT_TEXTFRAMES
};
- sal_Bool IsDefaultGeometry( const DefaultType eDefaultType ) const;
+ bool IsDefaultGeometry( const DefaultType eDefaultType ) const;
virtual sal_uInt16 GetObjIdentifier() const;
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
@@ -197,7 +197,7 @@ public:
virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const;
- virtual void NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr );
+ virtual void NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr );
// special drag methods
virtual bool hasSpecialDrag() const;
@@ -213,8 +213,8 @@ public:
virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true);
virtual bool IsAutoGrowHeight() const;
virtual bool IsAutoGrowWidth() const;
- virtual void SetVerticalWriting( sal_Bool bVertical );
- virtual sal_Bool BegTextEdit( SdrOutliner& rOutl );
+ virtual void SetVerticalWriting( bool bVertical );
+ virtual bool BegTextEdit( SdrOutliner& rOutl );
virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
virtual void EndTextEdit( SdrOutliner& rOutl );
virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const;
@@ -233,7 +233,7 @@ public:
virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject);
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
virtual void SetPage( SdrPage* pNewPage );
@@ -242,7 +242,7 @@ public:
virtual void RestGeoData(const SdrObjGeoData &rGeo);
// need to take fObjectRotation instead of aGeo.nWink, replace it temporary
- virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const;
+ virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const;
virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon);
virtual const SdrGluePointList* GetGluePointList() const;
diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx
index daae14673dd1..d01f57d73d47 100644
--- a/include/svx/svdoattr.hxx
+++ b/include/svx/svdoattr.hxx
@@ -66,10 +66,10 @@ public:
TYPEINFO();
// Detects if bFilledObj && Fill != FillNone
- sal_Bool HasFill() const;
+ bool HasFill() const;
// Detects if Line != LineNone
- sal_Bool HasLine() const;
+ bool HasLine() const;
virtual const Rectangle& GetSnapRect() const;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 76f0e2155f05..a6558b9b3fae 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -428,7 +428,7 @@ protected:
// This is needed for instance for NbcMove, because usually one moves SnapRect and aOutRect
// at the same time to avoid recomputation.
public:
- virtual void SetRectsDirty(sal_Bool bNotMyself = false);
+ virtual void SetRectsDirty(bool bNotMyself = false);
protected:
// override if the class inherits from SdrObjPlusData:
@@ -725,7 +725,7 @@ public:
// The points of those objects are selected (if necessary multiselection),
// deleted, inserted, or as a multiselection moved or rotated...
// Only such objects can have PlusHandles (e.g. the weights of an Bezier curve).
- virtual sal_Bool IsPolyObj() const;
+ virtual bool IsPolyObj() const;
virtual sal_uInt32 GetPointCount() const;
virtual Point GetPoint(sal_uInt32 i) const;
void SetPoint(const Point& rPnt, sal_uInt32 i);
@@ -764,13 +764,13 @@ public:
// if bDontRemoveHardAttr is false, set all attributes, which were set in the style sheet, to their default value
// if true, all hard attributes keep their values
void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
- virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr);
+ virtual void NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr);
SfxStyleSheet* GetStyleSheet() const;
virtual bool HasTextEdit() const;
// returns true if TextEditMode started
- virtual sal_Bool BegTextEdit(SdrOutliner& rOutl);
+ virtual bool BegTextEdit(SdrOutliner& rOutl);
virtual void EndTextEdit(SdrOutliner& rOutl);
// keep text in outliner's format
@@ -870,7 +870,7 @@ public:
// In the case of the conversion from TextObj to PathObj,
// both modi (bLineToArea=true/false) would be identical.
// The methods' default implementations report "I'm unable to do this" (false/null).
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
SdrObject* ConvertToPolyObj(bool bBezier, bool bLineToArea) const;
// convert this path object to contour object; bForceLineDash converts even
@@ -964,7 +964,7 @@ public:
//
// gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon
// with the base geometry and returns TRUE. Otherwise it returns FALSE.
- virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const;
+ virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const;
// sets the base geometry of the object using infos contained in the homogen 3x3 matrix.
// If it's an SdrPathObj it will use the provided geometry information. The Polygon has
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index f87ea5d06f93..9db626919cf1 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -61,8 +61,8 @@ protected:
private:
Polygon aTailPoly; // the whole tail polygon
- sal_Bool mbSpecialTextBoxShadow; // for calc special shadow, default FALSE
- sal_Bool mbFixedTail; // for calc note box fixed tail, default FALSE
+ bool mbSpecialTextBoxShadow; // for calc special shadow, default FALSE
+ bool mbFixedTail; // for calc note box fixed tail, default FALSE
Point maFixedTailPos; // for calc note box fixed tail position.
private:
@@ -85,11 +85,11 @@ public:
virtual SdrCaptionObj* Clone() const;
// for calc: special shadow only for text box
- void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = sal_True; }
- sal_Bool GetSpecialTextBoxShadow() const { return mbSpecialTextBoxShadow; }
+ void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = true; }
+ bool GetSpecialTextBoxShadow() const { return mbSpecialTextBoxShadow; }
// for calc: fixed note tail position.
- void SetFixedTail() { mbFixedTail = sal_True; }
+ void SetFixedTail() { mbFixedTail = true; }
virtual OUString TakeObjNameSingul() const;
virtual OUString TakeObjNamePlural() const;
@@ -138,7 +138,7 @@ protected:
virtual void RestGeoData(const SdrObjGeoData& rGeo);
public:
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
const Point& GetTailPos() const;
void SetTailPos(const Point& rPos);
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index c4e6b23fce1c..3286d55037dd 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -115,7 +115,7 @@ public:
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear);
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
protected:
virtual SdrObjGeoData* NewGeoData() const;
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index 51417e5ca439..3c9bead8aba1 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -67,14 +67,14 @@ public:
void ResetVars();
bool TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsolutePos) const;
- inline void SetBestConnection( sal_Bool rB ) { bBestConn = rB; };
- inline void SetBestVertex( sal_Bool rB ) { bBestVertex = rB; };
- inline void SetAutoVertex( sal_Bool rB ) { bAutoVertex = rB; };
+ inline void SetBestConnection( bool rB ) { bBestConn = rB; };
+ inline void SetBestVertex( bool rB ) { bBestVertex = rB; };
+ inline void SetAutoVertex( bool rB ) { bAutoVertex = rB; };
inline void SetConnectorId( sal_uInt16 nId ) { nConId = nId; };
- inline sal_Bool IsBestConnection() const { return bBestConn; };
- inline sal_Bool IsBestVertex() const { return bBestVertex; };
- inline sal_Bool IsAutoVertex() const { return bAutoVertex; };
+ inline bool IsBestConnection() const { return bBestConn; };
+ inline bool IsBestVertex() const { return bBestVertex; };
+ inline bool IsAutoVertex() const { return bAutoVertex; };
inline sal_uInt16 GetConnectorId() const { return nConId; };
inline SdrObject* GetObject() const { return pObj; }
};
@@ -133,8 +133,8 @@ public:
SdrObjConnection aCon1; // Verbindungszustand des Linienanfangs
SdrObjConnection aCon2; // Verbindungszustand des Linienendes
XPolygon* pEdgeTrack;
- sal_Bool bEdgeTrackDirty;// sal_True=Verbindungsverlauf muss neu berechnet werden.
- sal_Bool bEdgeTrackUserDefined;
+ bool bEdgeTrackDirty;// sal_True=Verbindungsverlauf muss neu berechnet werden.
+ bool bEdgeTrackUserDefined;
SdrEdgeInfoRec aEdgeInfo;
public:
@@ -189,11 +189,11 @@ protected:
public:
// #109007#
// Interface to default connect suppression
- void SetSuppressDefaultConnect(sal_Bool bNew) { mbSuppressDefaultConnect = bNew; }
- sal_Bool GetSuppressDefaultConnect() const { return mbSuppressDefaultConnect; }
+ void SetSuppressDefaultConnect(bool bNew) { mbSuppressDefaultConnect = bNew; }
+ bool GetSuppressDefaultConnect() const { return mbSuppressDefaultConnect; }
// #110649#
- sal_Bool IsBoundRectCalculationRunning() const { return mbBoundRectCalculationRunning; }
+ bool IsBoundRectCalculationRunning() const { return mbBoundRectCalculationRunning; }
protected:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
@@ -281,11 +281,11 @@ public:
virtual void BrkCreate(SdrDragStat& rStat);
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const;
virtual Pointer GetCreatePointer() const;
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
virtual sal_uInt32 GetSnapPointCount() const;
virtual Point GetSnapPoint(sal_uInt32 i) const;
- virtual sal_Bool IsPolyObj() const;
+ virtual bool IsPolyObj() const;
virtual sal_uInt32 GetPointCount() const;
virtual Point GetPoint(sal_uInt32 i) const;
virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i);
@@ -301,12 +301,12 @@ public:
void Reformat();
// helper methods for the StarOffice api
- Point GetTailPoint( sal_Bool bTail ) const;
- void SetTailPoint( sal_Bool bTail, const Point& rPt );
- void setGluePointIndex( sal_Bool bTail, sal_Int32 nId = -1 );
- sal_Int32 getGluePointIndex( sal_Bool bTail );
+ Point GetTailPoint( bool bTail ) const;
+ void SetTailPoint( bool bTail, const Point& rPt );
+ void setGluePointIndex( bool bTail, sal_Int32 nId = -1 );
+ sal_Int32 getGluePointIndex( bool bTail );
- virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const;
+ virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const;
virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon);
// for geometry access
@@ -327,11 +327,11 @@ public:
// Objektaustrittswinkel.
// Der Winkel, in dem die Verbindungslinie aus dem Objekt austreten darf.
//
-// sal_Bool EdgeEscAsRay Default FALSE
+// bool EdgeEscAsRay Default FALSE
// sal_True= die Verbindungslinie tritt aus dem Obj Strahlenfoermig aus.
// Also Winkelvorgabe durch die Strecke ObjMitte/Konnektor.
//
-// sal_Bool EdgeEscUseObjAngle Default FALSE
+// bool EdgeEscUseObjAngle Default FALSE
// Objektdrehwinkelberuecksichtigung.
// sal_True= Bei der Bestimmung des Objektaustrittswinkels wird der
// Drehwinkel des Objekts als Offset beruecksichtigt.
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index eab2bf82d81c..5fe8dfdc3ee6 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -47,7 +47,7 @@ namespace sdr
class SdrGrafObjGeoData : public SdrTextObjGeoData
{
public:
- sal_Bool bMirrored;
+ bool bMirrored;
SdrGrafObjGeoData()
: bMirrored(false)
@@ -180,7 +180,7 @@ public:
bool isEmbeddedSvg() const;
GDIMetaFile getMetafileFromEmbeddedSvg() const;
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false );
diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx
index 4e0883c61ba2..6717a79dd18c 100644
--- a/include/svx/svdogrp.hxx
+++ b/include/svx/svdogrp.hxx
@@ -107,7 +107,7 @@ public:
virtual void NbcReformatText();
virtual void ReformatText();
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
};
#endif // INCLUDED_SVX_SVDOGRP_HXX
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index da1aa4ec0f6c..d177663fae0f 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -77,7 +77,7 @@ protected:
void ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol) const;
basegfx::B2DPolyPolygon ImpCalcXPoly(const ImpMeasurePoly& rPol) const;
void ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) const;
- void SetTextDirty() { bTextDirty=true; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(sal_True); } }
+ void SetTextDirty() { bTextDirty=true; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(true); } }
void UndirtyText() const;
virtual SdrObjGeoData* NewGeoData() const;
@@ -127,14 +127,14 @@ public:
virtual sal_uInt32 GetSnapPointCount() const;
virtual Point GetSnapPoint(sal_uInt32 i) const;
- virtual sal_Bool IsPolyObj() const;
+ virtual bool IsPolyObj() const;
virtual sal_uInt32 GetPointCount() const;
virtual Point GetPoint(sal_uInt32 i) const;
virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i);
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
- virtual sal_Bool BegTextEdit(SdrOutliner& rOutl);
+ virtual bool BegTextEdit(SdrOutliner& rOutl);
virtual const Size& GetTextSize() const;
virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false,
Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const;
@@ -148,7 +148,7 @@ public:
bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, OUString& rRet) const;
// #i97878#
- virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const;
+ virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const;
virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon);
};
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index 5efa9e84e242..c6fbf3210be4 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -154,10 +154,10 @@ public:
virtual void NbcSetLogicRect(const Rectangle& rRect);
virtual void SetGeoData(const SdrObjGeoData& rGeo);
- static sal_Bool CanUnloadRunningObj( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj,
+ static bool CanUnloadRunningObj( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj,
sal_Int64 nAspect );
- static sal_Bool Unload( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect );
- sal_Bool Unload();
+ static bool Unload( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect );
+ bool Unload();
void Connect();
void Disconnect();
void ObjectLoaded();
@@ -165,10 +165,10 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getXModel() const;
// #109985#
- sal_Bool IsChart() const;
- sal_Bool IsCalc() const;
+ bool IsChart() const;
+ bool IsCalc() const;
- sal_Bool UpdateLinkURL_Impl();
+ bool UpdateLinkURL_Impl();
void BreakFileLink_Impl();
void DisconnectFileLink_Impl();
void CheckFileLink_Impl();
@@ -179,8 +179,8 @@ public:
const OUString& aMediaType );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetParentXModel() const;
- sal_Bool CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScaleHeight, Size& aObjAreaSize );
- sal_Bool AddOwnLightClient();
+ bool CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScaleHeight, Size& aObjAreaSize );
+ bool AddOwnLightClient();
// handy to get the empty replacement graphic without accessing all the old stuff
static Graphic GetEmptyOLEReplacementGraphic();
@@ -188,7 +188,7 @@ public:
void SetWindow(const com::sun::star::uno::Reference < com::sun::star::awt::XWindow >& _xWindow);
// #i118485# missing converter added
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
};
#endif // INCLUDED_SVX_SVDOOLE2_HXX
diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx
index 9acd5bfadc35..3ff166553e10 100644
--- a/include/svx/svdopath.hxx
+++ b/include/svx/svdopath.hxx
@@ -60,15 +60,15 @@ protected:
protected:
// helper functions for GET, SET, INS etc. PNT
- void ImpSetClosed(sal_Bool bClose);
+ void ImpSetClosed(bool bClose);
void ImpForceKind();
void ImpForceLineWink();
ImpPathForDragAndCreate& impGetDAC() const;
void impDeleteDAC() const;
public:
- static sal_Bool ImpFindPolyPnt(const basegfx::B2DPolyPolygon& rPoly, sal_uInt32 nAbsPnt, sal_uInt32& rPolyNum, sal_uInt32& rPointNum);
- virtual void SetRectsDirty(sal_Bool bNotMyself = sal_False);
+ static bool ImpFindPolyPnt(const basegfx::B2DPolyPolygon& rPoly, sal_uInt32 nAbsPnt, sal_uInt32& rPolyNum, sal_uInt32& rPointNum);
+ virtual void SetRectsDirty(bool bNotMyself = false);
double GetBrightness() { return mdBrightness; }
public:
@@ -122,14 +122,14 @@ public:
virtual sal_uInt32 GetSnapPointCount() const;
virtual Point GetSnapPoint(sal_uInt32 i) const;
- virtual sal_Bool IsPolyObj() const;
+ virtual bool IsPolyObj() const;
virtual sal_uInt32 GetPointCount() const;
virtual Point GetPoint(sal_uInt32 nHdlNum) const;
virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 nHdlNum);
// insert point
- sal_uInt32 NbcInsPointOld(const Point& rPos, sal_Bool bNewObj, sal_Bool bHideHim);
- sal_uInt32 NbcInsPoint(sal_uInt32 i, const Point& rPos, sal_Bool bNewObj, sal_Bool bHideHim);
+ sal_uInt32 NbcInsPointOld(const Point& rPos, bool bNewObj, bool bHideHim);
+ sal_uInt32 NbcInsPoint(sal_uInt32 i, const Point& rPos, bool bNewObj, bool bHideHim);
// rip at given point
SdrObject* RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index);
@@ -140,7 +140,7 @@ protected:
virtual void RestGeoData(const SdrObjGeoData& rGeo);
public:
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
// Bezier-polygon getter/setter
const basegfx::B2DPolyPolygon& GetPathPoly() const { return maPathPolygon; }
@@ -148,11 +148,11 @@ public:
void NbcSetPathPoly(const basegfx::B2DPolyPolygon& rPathPoly);
// special functions for Bezier-polygon handling
- sal_Bool IsClosed() const { return meKind==OBJ_POLY || meKind==OBJ_PATHPOLY || meKind==OBJ_PATHFILL || meKind==OBJ_FREEFILL || meKind==OBJ_SPLNFILL; }
- sal_Bool IsLine() const { return meKind==OBJ_PLIN || meKind==OBJ_PATHPLIN || meKind==OBJ_PATHLINE || meKind==OBJ_FREELINE || meKind==OBJ_SPLNLINE || meKind==OBJ_LINE; }
- sal_Bool IsFreeHand() const { return meKind==OBJ_FREELINE || meKind==OBJ_FREEFILL; }
- sal_Bool IsBezier() const { return meKind==OBJ_PATHLINE || meKind==OBJ_PATHFILL; }
- sal_Bool IsSpline() const { return meKind==OBJ_SPLNLINE || meKind==OBJ_SPLNFILL; }
+ bool IsClosed() const { return meKind==OBJ_POLY || meKind==OBJ_PATHPOLY || meKind==OBJ_PATHFILL || meKind==OBJ_FREEFILL || meKind==OBJ_SPLNFILL; }
+ bool IsLine() const { return meKind==OBJ_PLIN || meKind==OBJ_PATHPLIN || meKind==OBJ_PATHLINE || meKind==OBJ_FREELINE || meKind==OBJ_SPLNLINE || meKind==OBJ_LINE; }
+ bool IsFreeHand() const { return meKind==OBJ_FREELINE || meKind==OBJ_FREEFILL; }
+ bool IsBezier() const { return meKind==OBJ_PATHLINE || meKind==OBJ_PATHFILL; }
+ bool IsSpline() const { return meKind==OBJ_SPLNLINE || meKind==OBJ_SPLNFILL; }
// close/open path
// if opening, move end point by "nOpenDistance"
@@ -165,7 +165,7 @@ public:
//
// gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon
// with the base geometry and returns TRUE. Otherwise it returns FALSE.
- virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const;
+ virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const;
// sets the base geometry of the object using infos contained in the homogen 3x3 matrix.
// If it's an SdrPathObj it will use the provided geometry information. The Polygon has
// to use (0,0) as upper left and will be scaled to the given size in the matrix.
diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx
index 021394e72789..f2510afbb9e3 100644
--- a/include/svx/svdorect.hxx
+++ b/include/svx/svdorect.hxx
@@ -116,7 +116,7 @@ public:
virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const;
virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const;
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
};
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 4a8502cb08d9..8a1f46ad710a 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -174,7 +174,7 @@ public:
// #i121917#
virtual bool HasText() const;
- sal_Bool IsTextEditActive() const { return (pEdtOutl != 0L); }
+ bool IsTextEditActive() const { return (pEdtOutl != 0L); }
bool IsTextEditActive( const sdr::table::CellPos& rPos );
/** returns true only if we are in edit mode and the user actually changed anything */
@@ -243,7 +243,7 @@ public:
virtual void NbcMove(const Size& rSiz);
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
- virtual sal_Bool BegTextEdit(SdrOutliner& rOutl);
+ virtual bool BegTextEdit(SdrOutliner& rOutl);
virtual void EndTextEdit(SdrOutliner& rOutl);
virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
virtual void TakeTextEditArea(const sdr::table::CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
@@ -259,8 +259,8 @@ public:
void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; }
- virtual sal_Bool IsVerticalWriting() const;
- virtual void SetVerticalWriting(sal_Bool bVertical);
+ virtual bool IsVerticalWriting() const;
+ virtual void SetVerticalWriting(bool bVertical);
com::sun::star::text::WritingMode GetWritingMode() const;
@@ -277,7 +277,7 @@ public:
// gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon
// with the base geometry and returns TRUE. Otherwise it returns FALSE.
- virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const;
+ virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const;
// sets the base geometry of the object using infos contained in the homogen 3x3 matrix.
// If it's an SdrPathObj it will use the provided geometry information. The Polygon has
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 2329d16e339b..91a935c83c33 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -148,7 +148,7 @@ private:
}
// This method is only allowed for sdr::properties::TextProperties
- SVX_DLLPRIVATE void SetPortionInfoChecked(sal_Bool bNew)
+ SVX_DLLPRIVATE void SetPortionInfoChecked(bool bNew)
{
bPortionInfoChecked = bNew;
}
@@ -218,15 +218,15 @@ protected:
// wird dann hoizontal und vertikal an aRect zentriert. Bei bTextFrame=
// sal_True wird der Text in aRect hineinformatiert. Der eigentliche Textrahmen
// ist durch ein SdrRectObj mit bTextFrame=sal_True realisiert.
- sal_Bool bTextFrame : 1;
- sal_Bool bPortionInfoChecked : 1; // Fuer Optimierung von Textobjekten
- sal_Bool bNoShear : 1; // Obj darf nicht gesheart werden (->Graf+Ole+TextFrame)
- sal_Bool bNoRotate : 1; // Obj darf nicht gedreht werden (->Ole)
- sal_Bool bNoMirror : 1; // Obj darf nicht gespiegelt werden (->Ole,TextFrame)
- sal_Bool bTextSizeDirty : 1;
+ bool bTextFrame : 1;
+ bool bPortionInfoChecked : 1; // Fuer Optimierung von Textobjekten
+ bool bNoShear : 1; // Obj darf nicht gesheart werden (->Graf+Ole+TextFrame)
+ bool bNoRotate : 1; // Obj darf nicht gedreht werden (->Ole)
+ bool bNoMirror : 1; // Obj darf nicht gespiegelt werden (->Ole,TextFrame)
+ bool bTextSizeDirty : 1;
// #101684#
- sal_Bool mbInEditMode : 1; // Is this text object in edit mode?
+ bool mbInEditMode : 1; // Is this text object in edit mode?
// Fuer Objekt mit freier Groesse im Draw (Mengentext). Das Flag wird vom
// der App beim Create gesetzt.
@@ -237,18 +237,18 @@ protected:
// Resize in der Breite kann sein:
// - Interaktives Resize in Einfach- oder Mehrfachselektion
// - Positions+Groesse Dialog
- sal_Bool bDisableAutoWidthOnDragging : 1;
+ bool bDisableAutoWidthOnDragging : 1;
// #111096#
// Allow text suppression
- sal_Bool mbTextHidden : 1;
+ bool mbTextHidden : 1;
// #111096#
// Flag for allowing text animation. Default is sal_true.
- sal_Bool mbTextAnimationAllowed : 1;
+ bool mbTextAnimationAllowed : 1;
// flag for preventing recursive onEditOutlinerStatusEvent calls
- sal_Bool mbInDownScale : 1;
+ bool mbInDownScale : 1;
SdrOutliner& ImpGetDrawOutliner() const;
@@ -273,7 +273,7 @@ private:
protected:
bool ImpCanConvTextToCurve() const;
- SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, sal_Bool bClosed, sal_Bool bBezier, sal_Bool bNoSetAttr = sal_False) const;
+ SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, bool bClosed, bool bBezier, bool bNoSetAttr = false) const;
SdrObject* ImpConvertAddText(SdrObject* pObj, bool bBezier) const;
void ImpSetTextStyleSheetListeners();
void ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg) const;
@@ -281,10 +281,10 @@ protected:
void ImpCheckShear();
Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
void ImpSetTextEditParams() const;
- void SetTextSizeDirty() { bTextSizeDirty=sal_True; }
+ void SetTextSizeDirty() { bTextSizeDirty=true; }
// rAnchorRect ist InOut-Parameter!
- void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const;
+ void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, bool bLineWidth ) const;
virtual SdrObjGeoData* NewGeoData() const;
virtual void SaveGeoData(SdrObjGeoData& rGeo) const;
@@ -307,7 +307,7 @@ public:
TYPEINFO();
// #101684#
- sal_Bool IsInEditMode() const { return mbInEditMode; }
+ bool IsInEditMode() const { return mbInEditMode; }
// via eCharSet kann der CharSet der vorliegenden Datei uebergeben werden.
// Bei RTL_TEXTENCODING_DONTKNOW wird der CharSet der aktuellen Plattform verwendet.
@@ -340,7 +340,7 @@ public:
virtual bool HasText() const;
bool HasEditText() const;
- sal_Bool IsTextEditActive() const { return (pEdtOutl != 0L); }
+ bool IsTextEditActive() const { return (pEdtOutl != 0L); }
/** returns the currently active text. */
virtual SdrText* getActiveText() const;
@@ -460,7 +460,7 @@ public:
virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear);
virtual bool HasTextEdit() const;
- virtual sal_Bool BegTextEdit(SdrOutliner& rOutl);
+ virtual bool BegTextEdit(SdrOutliner& rOutl);
virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
virtual void EndTextEdit(SdrOutliner& rOutl);
virtual sal_uInt16 GetOutlinerViewAnchorMode() const;
@@ -476,7 +476,7 @@ public:
virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos,
bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, OUString& rRet) const;
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; }
@@ -512,8 +512,8 @@ public:
*/
void UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaintRect ) const;
void ForceOutlinerParaObject();
- virtual sal_Bool IsVerticalWriting() const;
- virtual void SetVerticalWriting(sal_Bool bVertical);
+ virtual bool IsVerticalWriting() const;
+ virtual void SetVerticalWriting(bool bVertical);
/** called from the SdrObjEditView during text edit when the status of the edit outliner changes */
virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus );
@@ -528,7 +528,7 @@ public:
// gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon
// with the base geometry and returns TRUE. Otherwise it returns FALSE.
- virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const;
+ virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const;
// sets the base geometry of the object using infos contained in the homogen 3x3 matrix.
// If it's an SdrPathObj it will use the provided geometry information. The Polygon has
@@ -547,7 +547,7 @@ public:
// #111096#
// Access to TextAnimationAllowed flag
- void SetTextAnimationAllowed(sal_Bool bNew);
+ void SetTextAnimationAllowed(bool bNew);
// #i8824#
// Set single item at the local ItemSet. *Does not use* AllowItemChange(),
diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx
index 32180a86c1ae..4d366cf64f41 100644
--- a/include/svx/svdouno.hxx
+++ b/include/svx/svdouno.hxx
@@ -53,7 +53,7 @@ class SVX_DLLPUBLIC SdrUnoObj : public SdrRectObj
OUString aUnoControlModelTypeName;
OUString aUnoControlTypeName;
- sal_Bool bOwnUnoControlModel;
+ bool bOwnUnoControlModel;
protected:
::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > xUnoControlModel; // kann auch von aussen gesetzt werden
@@ -66,10 +66,10 @@ private:
public:
TYPEINFO();
- explicit SdrUnoObj(const OUString& rModelName, sal_Bool bOwnsModel = sal_True);
+ explicit SdrUnoObj(const OUString& rModelName, bool bOwnsModel = true);
SdrUnoObj(const OUString& rModelName,
const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac,
- sal_Bool bOwnsModel = sal_True);
+ bool bOwnsModel = true);
virtual ~SdrUnoObj();
virtual void SetPage(SdrPage* pNewPage);
diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx
index 79347b99c484..1fe569246f92 100644
--- a/include/svx/svdovirt.hxx
+++ b/include/svx/svdovirt.hxx
@@ -127,7 +127,7 @@ public:
virtual sal_uInt32 GetSnapPointCount() const;
virtual Point GetSnapPoint(sal_uInt32 i) const;
- virtual sal_Bool IsPolyObj() const;
+ virtual bool IsPolyObj() const;
virtual sal_uInt32 GetPointCount() const;
virtual Point GetPoint(sal_uInt32 i) const;
virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i);
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 465c540f1454..a573365b071d 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -525,7 +525,7 @@ public:
virtual void SetModel(SdrModel* pNewModel);
// New MasterPage interface
- sal_Bool TRG_HasMasterPage() const { return (0L != mpMasterPageDescriptor); }
+ bool TRG_HasMasterPage() const { return (0L != mpMasterPageDescriptor); }
void TRG_SetMasterPage(SdrPage& rNew);
void TRG_ClearMasterPage();
SdrPage& TRG_GetMasterPage() const;
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index ae516010d1c9..0785eded905b 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -71,8 +71,8 @@ private:
Rectangle aMarkBound; // wird
Rectangle aMarkSnap; // von
- sal_Bool mbHasMarked;
- sal_Bool mbVisible;
+ bool mbHasMarked;
+ bool mbVisible;
SetOfByte aLayerVisi; // Menge der sichtbaren Layer
SetOfByte aLayerLock; // Menge der nicht editierbaren Layer
@@ -157,7 +157,7 @@ public:
*/
void SetDesignMode( bool _bDesignMode ) const;
- sal_Bool IsVisible() const { return mbVisible; }
+ bool IsVisible() const { return mbVisible; }
// Invalidiert den gesamten Bereich der Page
void InvalidateAllWin();
@@ -187,8 +187,8 @@ public:
// Betretene Gruppe und Liste setzen
void SetAktGroupAndList(SdrObject* pNewGroup, SdrObjList* pNewList);
- sal_Bool HasMarkedObjPageView() const { return mbHasMarked; }
- void SetHasMarkedObj(sal_Bool bOn) { mbHasMarked = bOn; }
+ bool HasMarkedObjPageView() const { return mbHasMarked; }
+ void SetHasMarkedObj(bool bOn) { mbHasMarked = bOn; }
const Rectangle& MarkBound() const { return aMarkBound; }
const Rectangle& MarkSnap() const { return aMarkSnap; }
@@ -198,14 +198,14 @@ public:
void SetLayerVisible(const OUString& rName, bool bShow = true) { SetLayer(rName, aLayerVisi, bShow); if(!bShow) AdjHdl(); InvalidateAllWin(); }
bool IsLayerVisible(const OUString& rName) const { return IsLayer(rName, aLayerVisi); }
- void SetLayerLocked(const OUString& rName, sal_Bool bLock = sal_True) { SetLayer(rName, aLayerLock, bLock); if(bLock) AdjHdl(); }
- sal_Bool IsLayerLocked(const OUString& rName) const { return IsLayer(rName,aLayerLock); }
+ void SetLayerLocked(const OUString& rName, bool bLock = true) { SetLayer(rName, aLayerLock, bLock); if(bLock) AdjHdl(); }
+ bool IsLayerLocked(const OUString& rName) const { return IsLayer(rName,aLayerLock); }
- void SetLayerPrintable(const OUString& rName, sal_Bool bPrn = sal_True) { SetLayer(rName, aLayerPrn, bPrn); }
- sal_Bool IsLayerPrintable(const OUString& rName) const { return IsLayer(rName, aLayerPrn); }
+ void SetLayerPrintable(const OUString& rName, bool bPrn = true) { SetLayer(rName, aLayerPrn, bPrn); }
+ bool IsLayerPrintable(const OUString& rName) const { return IsLayer(rName, aLayerPrn); }
// PV stellt eine RefPage oder eine SubList eines RefObj dar oder Model ist ReadOnly
- sal_Bool IsReadOnly() const;
+ bool IsReadOnly() const;
// der Origin bezieht sich immer auf die obere linke Ecke der Page
const Point& GetPageOrigin() const { return aPgOrg; }
@@ -234,13 +234,13 @@ public:
// Liefert sal_True, wenn Layer des Obj sichtbar und nicht gesperrt.
// Beim Gruppenobjekt muss wenigstens ein Member sichtbar sein,
// gesperrt sein darf keiner.
- sal_Bool IsObjMarkable(SdrObject* pObj) const;
+ bool IsObjMarkable(SdrObject* pObj) const;
// Betreten (Editieren) einer Objektgruppe. Anschliessend liegen alle
// Memberobjekte der Gruppe im direkten Zugriff. Alle anderen Objekte
// koennen waerendessen nicht bearbeitet werden (bis zum naechsten
// LeaveGroup()). (wie MsDos chdir bla).
- sal_Bool EnterGroup(SdrObject* pObj);
+ bool EnterGroup(SdrObject* pObj);
// Verlassen einer betretenen Objektgruppe. (wie MsDos chdir ..)
void LeaveOneGroup();
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index c7c61bad46ae..751120655708 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -183,7 +183,7 @@ protected:
bool bSwapAsynchron : 1;
bool bPrintPreview : 1;
- // sal_Bool fuer die Verwaltung des anzuzeigenden Status
+ // bool fuer die Verwaltung des anzuzeigenden Status
// Gruppe Betreten/Verlassen. Default ist sal_True, wird aber
// beispielsweise beim Chart auf sal_False gesetzt, da dort
// die Ghosted-Effekte zur Darstellug unerwuenscht sind.
@@ -224,7 +224,7 @@ public:
void SetBufferedOverlayAllowed(bool bNew);
// allow page painting at all?
- sal_Bool IsPagePaintingAllowed() const;
+ bool IsPagePaintingAllowed() const;
void SetPagePaintingAllowed(bool bNew);
protected:
@@ -258,12 +258,12 @@ protected:
void ImpSetGlueVisible2(bool bOn) { if (bGlueVisible2!=bOn) { bGlueVisible2=bOn; if (!bGlueVisible && !bGlueVisible3 && !bGlueVisible4) GlueInvalidate(); } }
void ImpSetGlueVisible3(bool bOn) { if (bGlueVisible3!=bOn) { bGlueVisible3=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible4) GlueInvalidate(); } }
void ImpSetGlueVisible4(bool bOn) { if (bGlueVisible4!=bOn) { bGlueVisible4=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible3) GlueInvalidate(); } }
- sal_Bool ImpIsGlueVisible2() const { return bGlueVisible2; }
- sal_Bool ImpIsGlueVisible3() const { return bGlueVisible3; }
- sal_Bool ImpIsGlueVisible4() const { return bGlueVisible4; }
+ bool ImpIsGlueVisible2() const { return bGlueVisible2; }
+ bool ImpIsGlueVisible3() const { return bGlueVisible3; }
+ bool ImpIsGlueVisible4() const { return bGlueVisible4; }
public:
- sal_Bool ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; }
+ bool ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; }
protected:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
@@ -289,7 +289,7 @@ public:
virtual void ClearPageView();
SdrModel* GetModel() const { return pMod; }
- virtual sal_Bool IsAction() const;
+ virtual bool IsAction() const;
virtual void MovAction(const Point& rPnt);
virtual void EndAction();
virtual void BckAction();
@@ -317,8 +317,8 @@ public:
sal_uInt16 getMinMovLog() const { return nMinMovLog; }
// Flag zur Visualisierung von Gruppen abfragen/testen
- sal_Bool DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; }
- void SetVisualizeEnteredGroup(sal_Bool bNew) { bVisualizeEnteredGroup = bNew; }
+ bool DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; }
+ void SetVisualizeEnteredGroup(bool bNew) { bVisualizeEnteredGroup = bNew; }
// Am DragStatus laesst sich beispielsweise erfragen, welche
// entfernung bereits gedraggd wurde, etc.
@@ -356,10 +356,10 @@ public:
void SetLayerVisible(const OUString& rName, bool bShow=true);
bool IsLayerVisible(const OUString& rName) const;
- void SetLayerLocked(const OUString& rName, sal_Bool bLock=sal_True);
+ void SetLayerLocked(const OUString& rName, bool bLock=true);
bool IsLayerLocked(const OUString& rName) const;
- void SetLayerPrintable(const OUString& rName, sal_Bool bPrn=sal_True);
+ void SetLayerPrintable(const OUString& rName, bool bPrn=true);
bool IsLayerPrintable(const OUString& rName) const;
// PrePaint call forwarded from app windows
@@ -398,14 +398,14 @@ protected:
Region OptimizeDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect);
public:
- sal_Bool IsPageVisible() const { return bPageVisible; } // Seite (weisse Flaeche) malen oder nicht
- sal_Bool IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht
- sal_Bool IsBordVisible() const { return bBordVisible; } // Seitenrandlinie malen oder nicht
- sal_Bool IsGridVisible() const { return bGridVisible; } // Rastergitter malen oder nicht
- sal_Bool IsGridFront() const { return bGridFront ; } // Rastergitter ueber die Objekte druebermalen oder dahinter
- sal_Bool IsHlplVisible() const { return bHlplVisible; } // Hilfslinien der Seiten malen oder nicht
- sal_Bool IsHlplFront() const { return bHlplFront ; } // Hilfslinie ueber die Objekte druebermalen oder dahinter
- sal_Bool IsGlueVisible() const { return bGlueVisible; } // Konnektoren der objekte sichtbar oder nicht
+ bool IsPageVisible() const { return bPageVisible; } // Seite (weisse Flaeche) malen oder nicht
+ bool IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht
+ bool IsBordVisible() const { return bBordVisible; } // Seitenrandlinie malen oder nicht
+ bool IsGridVisible() const { return bGridVisible; } // Rastergitter malen oder nicht
+ bool IsGridFront() const { return bGridFront ; } // Rastergitter ueber die Objekte druebermalen oder dahinter
+ bool IsHlplVisible() const { return bHlplVisible; } // Hilfslinien der Seiten malen oder nicht
+ bool IsHlplFront() const { return bHlplFront ; } // Hilfslinie ueber die Objekte druebermalen oder dahinter
+ bool IsGlueVisible() const { return bGlueVisible; } // Konnektoren der objekte sichtbar oder nicht
Color GetGridColor() const;
void SetPageVisible(bool bOn = true) { bPageVisible=bOn; InvalidateAllWin(); }
void SetPageBorderVisible(bool bOn = true) { bPageBorderVisible=bOn; InvalidateAllWin(); }
@@ -417,7 +417,7 @@ public:
void SetGlueVisible(bool bOn = true) { if (bGlueVisible!=bOn) { bGlueVisible=bOn; if (!bGlueVisible2 && !bGlueVisible3 && !bGlueVisible4) GlueInvalidate(); } }
void SetGridColor( Color aColor );
- sal_Bool IsPreviewRenderer() const { return (sal_Bool )mbPreviewRenderer; }
+ bool IsPreviewRenderer() const { return mbPreviewRenderer; }
void SetPreviewRenderer(bool bOn) { mbPreviewRenderer=bOn; }
// access methods for calc and sw hide object modes
@@ -436,7 +436,7 @@ public:
const Size& GetGridFine() const { return aGridFin; }
void InvalidateAllWin();
- void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=sal_False);
+ void InvalidateAllWin(const Rectangle& rRect, bool bPlus1Pix=false);
// Wenn die View kein Invalidate() an den Fenstern durchfuehren soll, muss
// man diese beiden folgenden Methoden ueberladen und entsprechend anders
@@ -460,13 +460,13 @@ public:
// DefaultAttribute an der View: Neu erzeugte Objekte bekommen diese
// Attribute direkt nach dem Erzeugen erstmal zugewiesen.
- void SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll);
+ void SetDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll);
const SfxItemSet& GetDefaultAttr() const { return aDefaultAttr; }
- void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
+ void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr);
SfxStyleSheet* GetDefaultStyleSheet() const { return pDefaultStyleSheet; }
- void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll);
- void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const;
+ void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll);
+ void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, bool bOnlyHardAttr) const;
// use this mode as mode to draw all internal GraphicManager objects with
sal_uIntPtr GetGraphicManagerDrawMode() const { return nGraphicManagerDrawMode; }
@@ -477,24 +477,24 @@ public:
// Nach Abschluss des Nachladens wird das Objekt dann angezeigt.
// Hat nur z.Zt. Wirkung, wenn SwapGraphics am Model eingeschaltet ist.
// Default=FALSE. Flag ist nicht persistent.
- sal_Bool IsSwapAsynchron() const { return bSwapAsynchron; }
- void SetSwapAsynchron(sal_Bool bJa=sal_True) { bSwapAsynchron=bJa; }
+ bool IsSwapAsynchron() const { return bSwapAsynchron; }
+ void SetSwapAsynchron(bool bJa=true) { bSwapAsynchron=bJa; }
virtual sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
virtual sal_Bool MouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; }
virtual sal_Bool MouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; }
virtual sal_Bool MouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; }
virtual sal_Bool Command(const CommandEvent& /*rCEvt*/, Window* /*pWin*/) { return sal_False; }
- sal_Bool Cut(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; }
- sal_Bool Yank(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; }
- sal_Bool Paste(Window* /*pWin*/=NULL, sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; }
+ bool Cut(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; }
+ bool Yank(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; }
+ bool Paste(Window* /*pWin*/=NULL, sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return false; }
/* new interface src537 */
- sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
+ bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr=false) const;
- sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
- SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const;
- sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
+ bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll);
+ SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const;
+ bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr);
virtual void MakeVisible(const Rectangle& rRect, Window& rWin);
@@ -504,8 +504,8 @@ public:
// Animation aktivieren/deaktivieren fuer ::Paint
// wird z.Zt. ausgewertet von SdrGrafObj, wenn in dem eine Animation steckt
// Das Unterbinden der automatischen Animation wird z.B. fuer die Dia-Show benoetigt
- sal_Bool IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == eAnimationMode ); }
- void SetAnimationEnabled( sal_Bool bEnable=sal_True );
+ bool IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == eAnimationMode ); }
+ void SetAnimationEnabled( bool bEnable=true );
// set/unset pause state for animations
bool IsAnimationPause() const { return bAnimationPause; }
@@ -520,8 +520,8 @@ public:
// bei bShow=sal_False wird der Browser destruiert
#ifdef DBG_UTIL
- void ShowItemBrowser(sal_Bool bShow=sal_True);
- sal_Bool IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((Window*)pItemBrowser)->IsVisible(); }
+ void ShowItemBrowser(bool bShow=true);
+ bool IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((Window*)pItemBrowser)->IsVisible(); }
Window* GetItemBrowser() const { return (Window*)pItemBrowser; }
#endif
@@ -530,7 +530,7 @@ public:
void VisAreaChanged(const OutputDevice* pOut=NULL);
void VisAreaChanged(const SdrPageWindow& rWindow);
- sal_Bool IsPrintPreview() const { return bPrintPreview; }
+ bool IsPrintPreview() const { return bPrintPreview; }
void SetPrintPreview(bool bOn = true) { bPrintPreview=bOn; }
const svtools::ColorConfig& getColorConfig() const;
diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx
index 700607c8056c..f3b79e13c8c1 100644
--- a/include/svx/svdpoev.hxx
+++ b/include/svx/svdpoev.hxx
@@ -30,8 +30,8 @@ class SVX_DLLPUBLIC SdrPolyEditView: public SdrEditView, public IPolyPolygonEdit
friend class SdrEditView;
protected:
- sal_Bool bSetMarkedPointsSmoothPossible : 1;
- sal_Bool bSetMarkedSegmentsKindPossible : 1;
+ bool bSetMarkedPointsSmoothPossible : 1;
+ bool bSetMarkedSegmentsKindPossible : 1;
SdrPathSmoothKind eMarkedPointsSmooth;
SdrPathSegmentKind eMarkedSegmentsKind;
diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx
index d2fd7799e2dd..93b23fd14781 100644
--- a/include/svx/svdpool.hxx
+++ b/include/svx/svdpool.hxx
@@ -32,7 +32,7 @@ class XFillAttrSetItem;
class SVX_DLLPUBLIC SdrItemPool : public XOutdevItemPool
{
public:
- SdrItemPool(SfxItemPool* pMaster = 0L, sal_Bool bLoadRefCounts = sal_True);
+ SdrItemPool(SfxItemPool* pMaster = 0L, bool bLoadRefCounts = true);
SdrItemPool(const SdrItemPool& rPool);
protected:
virtual ~SdrItemPool();
diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx
index 879a72423b03..feee90765a76 100644
--- a/include/svx/svdsnpv.hxx
+++ b/include/svx/svdsnpv.hxx
@@ -91,7 +91,7 @@ protected:
virtual ~SdrSnapView();
public:
- virtual sal_Bool IsAction() const;
+ virtual bool IsAction() const;
virtual void MovAction(const Point& rPnt);
virtual void EndAction();
virtual void BckAction();
@@ -120,66 +120,66 @@ public:
void CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const;
// Alle Fangeinstellungen sind Persistent.
- sal_Bool IsSnapEnabled() const { return bSnapEnab; }
- sal_Bool IsGridSnap() const { return bGridSnap; } // Fang auf Rastergitter
- sal_Bool IsBordSnap() const { return bBordSnap; } // Fang auf Seitenraender
- sal_Bool IsHlplSnap() const { return bHlplSnap; } // Fang auf Hilfslinien
- sal_Bool IsOFrmSnap() const { return bOFrmSnap; } // Fang auf LogFram von umgebenden Zeichenobjekten
- sal_Bool IsOPntSnap() const { return bOPntSnap; } // Fang auf ausgepraegte Punkte von umgebenden Zeichenobjekten
- sal_Bool IsOConSnap() const { return bOConSnap; } // Fang auf Konnektoren der Zeichenobjekte
- void SetSnapEnabled(sal_Bool bOn) { bSnapEnab=bOn; }
- void SetGridSnap(sal_Bool bOn) { bGridSnap=bOn; }
- void SetBordSnap(sal_Bool bOn) { bBordSnap=bOn; }
- void SetHlplSnap(sal_Bool bOn) { bHlplSnap=bOn; }
- void SetOFrmSnap(sal_Bool bOn) { bOFrmSnap=bOn; }
- void SetOPntSnap(sal_Bool bOn) { bOPntSnap=bOn; }
- void SetOConSnap(sal_Bool bOn) { bOConSnap=bOn; }
+ bool IsSnapEnabled() const { return bSnapEnab; }
+ bool IsGridSnap() const { return bGridSnap; } // Fang auf Rastergitter
+ bool IsBordSnap() const { return bBordSnap; } // Fang auf Seitenraender
+ bool IsHlplSnap() const { return bHlplSnap; } // Fang auf Hilfslinien
+ bool IsOFrmSnap() const { return bOFrmSnap; } // Fang auf LogFram von umgebenden Zeichenobjekten
+ bool IsOPntSnap() const { return bOPntSnap; } // Fang auf ausgepraegte Punkte von umgebenden Zeichenobjekten
+ bool IsOConSnap() const { return bOConSnap; } // Fang auf Konnektoren der Zeichenobjekte
+ void SetSnapEnabled(bool bOn) { bSnapEnab=bOn; }
+ void SetGridSnap(bool bOn) { bGridSnap=bOn; }
+ void SetBordSnap(bool bOn) { bBordSnap=bOn; }
+ void SetHlplSnap(bool bOn) { bHlplSnap=bOn; }
+ void SetOFrmSnap(bool bOn) { bOFrmSnap=bOn; }
+ void SetOPntSnap(bool bOn) { bOPntSnap=bOn; }
+ void SetOConSnap(bool bOn) { bOConSnap=bOn; }
// Normalerweise werden beim Move-Dragging von Zeichenobjekten alle
// 4 Ecken des Object-SnapRects gefangen. Folgende Einstellmoeglichkeit,
// wenn man nur auf die linke obere Ecke fangen will (z.B. DialogEditor):
// Persistent, Default=FALSE.
- void SetMoveSnapOnlyTopLeft(sal_Bool bOn) { bMoveSnapOnlyTopLeft=bOn; }
- sal_Bool IsMoveSnapOnlyTopLeft() const { return bMoveSnapOnlyTopLeft; }
+ void SetMoveSnapOnlyTopLeft(bool bOn) { bMoveSnapOnlyTopLeft=bOn; }
+ bool IsMoveSnapOnlyTopLeft() const { return bMoveSnapOnlyTopLeft; }
// Hilfslinien fixiert (nicht verschiebbar)
// Persistent, Default=FALSE.
- sal_Bool IsHlplFixed() const { return bHlplFixed; }
- void SetHlplFixed(sal_Bool bOn) { bHlplFixed=bOn; }
+ bool IsHlplFixed() const { return bHlplFixed; }
+ void SetHlplFixed(bool bOn) { bHlplFixed=bOn; }
- sal_Bool IsMoveMFrmSnap() const { return bMoveMFrmSnap; } // Fang des LogFram aller markierten Objekte
- sal_Bool IsMoveOFrmSnap() const { return bMoveOFrmSnap; } // Fang aller LogFram der markierten Objekte
- sal_Bool IsMoveOPntSnap() const { return bMoveOPntSnap; } // Fang ausgepraegter Punkte der markierten Objekte
- sal_Bool IsMoveOConSnap() const { return bMoveOConSnap; } // Fang der Konnektoren der markierten Objekte
+ bool IsMoveMFrmSnap() const { return bMoveMFrmSnap; } // Fang des LogFram aller markierten Objekte
+ bool IsMoveOFrmSnap() const { return bMoveOFrmSnap; } // Fang aller LogFram der markierten Objekte
+ bool IsMoveOPntSnap() const { return bMoveOPntSnap; } // Fang ausgepraegter Punkte der markierten Objekte
+ bool IsMoveOConSnap() const { return bMoveOConSnap; } // Fang der Konnektoren der markierten Objekte
- void SetMoveMFrmSnap(sal_Bool bOn) { bMoveMFrmSnap=bOn; }
- void SetMoveOFrmSnap(sal_Bool bOn) { bMoveOFrmSnap=bOn; }
- void SetMoveOPntSnap(sal_Bool bOn) { bMoveOPntSnap=bOn; }
- void SetMoveOConSnap(sal_Bool bOn) { bMoveOConSnap=bOn; }
+ void SetMoveMFrmSnap(bool bOn) { bMoveMFrmSnap=bOn; }
+ void SetMoveOFrmSnap(bool bOn) { bMoveOFrmSnap=bOn; }
+ void SetMoveOPntSnap(bool bOn) { bMoveOPntSnap=bOn; }
+ void SetMoveOConSnap(bool bOn) { bMoveOConSnap=bOn; }
// #114409#-1 Migrate PageOrigin
- sal_Bool BegSetPageOrg(const Point& rPnt);
+ bool BegSetPageOrg(const Point& rPnt);
void MovSetPageOrg(const Point& rPnt);
- sal_Bool EndSetPageOrg();
+ bool EndSetPageOrg();
void BrkSetPageOrg();
- sal_Bool IsSetPageOrg() const { return (0L != mpPageOriginOverlay); }
+ bool IsSetPageOrg() const { return (0L != mpPageOriginOverlay); }
// HitTest. Bei sal_True steht in rnHelpLineNum die Nummer der Hilfslinie und in rpPV
// die zugehoerige PageView.
- sal_Bool PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const;
+ bool PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const;
// Verschieben einer vorhandenen Hilfslinie. nHelpLineNum und pPV von PickHelpLine verwenden.
- sal_Bool BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV);
+ bool BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV);
// Interaktives einfuegen einer neuen Hilfslinie
- sal_Bool BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind);
+ bool BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind);
Pointer GetDraggedHelpLinePointer() const;
// Aendern des Hilfslinientyps waerend des draggens
// void SetDraggedHelpLineKind(SdrHelpLineKind eNewKind);
void MovDragHelpLine(const Point& rPnt);
- sal_Bool EndDragHelpLine();
+ bool EndDragHelpLine();
void BrkDragHelpLine();
- sal_Bool IsDragHelpLine() const { return (0L != mpHelpLineOverlay); }
+ bool IsDragHelpLine() const { return (0L != mpHelpLineOverlay); }
// SnapAngle ist fuer Winkel im Kreis, RotateDragging, ...
// Der Winkelfang wird unterdrueckt, wenn er mit
@@ -193,8 +193,8 @@ public:
// - Shear (Dragging)
// - Kreisbogen/-sektor/-abschnitt Winkel (Create und Dragging)
// Persistent.
- void SetAngleSnapEnabled(sal_Bool bOn) { bAngleSnapEnab=bOn; }
- sal_Bool IsAngleSnapEnabled() const { return bAngleSnapEnab; }
+ void SetAngleSnapEnabled(bool bOn) { bAngleSnapEnab=bOn; }
+ bool IsAngleSnapEnabled() const { return bAngleSnapEnab; }
void SetSnapAngle(long nWink) { nSnapAngle=nWink; }
long GetSnapAngle() const { return nSnapAngle; }
@@ -238,16 +238,16 @@ public:
// nur das Zentrum der markierten Objekte transformiert. Groesse, Form
// und Drehwinkel der Objekte bleiben erhalten, nur ihre Positionen
// aendern sich. Persistent. Default=FALSE. (ni)
- void SetMoveOnlyDragging(sal_Bool bOn) { bMoveOnlyDragging=bOn; }
- sal_Bool IsMoveOnlyDragging() const { return bMoveOnlyDragging; }
+ void SetMoveOnlyDragging(bool bOn) { bMoveOnlyDragging=bOn; }
+ bool IsMoveOnlyDragging() const { return bMoveOnlyDragging; }
// Slant anstelle von Shear anwenden. Persistent. Default=FALSE.
- void SetSlantButShear(sal_Bool bOn) { bSlantButShear=bOn; }
- sal_Bool IsSlantButShear() const { return bSlantButShear; }
+ void SetSlantButShear(bool bOn) { bSlantButShear=bOn; }
+ bool IsSlantButShear() const { return bSlantButShear; }
// Objekte bei Crook nicht verzerren. Persistent. Default=FALSE. (ni)
- void SetCrookNoContortion(sal_Bool bOn) { bCrookNoContortion=bOn; }
- sal_Bool IsCrookNoContortion() const { return bCrookNoContortion; }
+ void SetCrookNoContortion(bool bOn) { bCrookNoContortion=bOn; }
+ bool IsCrookNoContortion() const { return bCrookNoContortion; }
// Crook-Modus. Persistent. Default=SDRCROOK_ROTATE. (ni)
void SetCrookMode(SdrCrookMode eMode) { eCrookMode=eMode; }
@@ -256,8 +256,8 @@ public:
// Special fuer IBM: Beim Draggen eines Polygonpunkts wird dieser
// geloescht, wenn seine beiden angrenzenden Linien eh' fast eine
// durchgehende Linie sind.
- void SetEliminatePolyPoints(sal_Bool bOn) { bEliminatePolyPoints=bOn; }
- sal_Bool IsEliminatePolyPoints() const { return bEliminatePolyPoints; }
+ void SetEliminatePolyPoints(bool bOn) { bEliminatePolyPoints=bOn; }
+ bool IsEliminatePolyPoints() const { return bEliminatePolyPoints; }
void SetEliminatePolyPointLimitAngle(long nAngle) { nEliminatePolyPointLimitAngle=nAngle; }
long GetEliminatePolyPointLimitAngle() const { return nEliminatePolyPointLimitAngle; }
};
diff --git a/include/svx/svdsob.hxx b/include/svx/svdsob.hxx
index e049b5b96294..da66a2a477d7 100644
--- a/include/svx/svdsob.hxx
+++ b/include/svx/svdsob.hxx
@@ -37,17 +37,17 @@ protected:
sal_uInt8 aData[32];
public:
- explicit SetOfByte(sal_Bool bInitVal = sal_False)
+ explicit SetOfByte(bool bInitVal = false)
{
memset(aData, bInitVal ? 0xFF : 0x00, sizeof(aData));
}
- sal_Bool operator==(const SetOfByte& rCmpSet) const
+ bool operator==(const SetOfByte& rCmpSet) const
{
return (memcmp(aData, rCmpSet.aData, sizeof(aData)) == 0);
}
- sal_Bool operator!=(const SetOfByte& rCmpSet) const
+ bool operator!=(const SetOfByte& rCmpSet) const
{
return (memcmp(aData, rCmpSet.aData, sizeof(aData))!=0);
}
@@ -62,7 +62,7 @@ public:
aData[a/8] &= ~(1<<a%8);
}
- void Set(sal_uInt8 a, sal_Bool b)
+ void Set(sal_uInt8 a, bool b)
{
if(b)
Set(a);
@@ -70,7 +70,7 @@ public:
Clear(a);
}
- sal_Bool IsSet(sal_uInt8 a) const
+ bool IsSet(sal_uInt8 a) const
{
return (aData[a/8] & 1<<a%8) != 0;
}
@@ -85,7 +85,7 @@ public:
memset(aData, 0x00, sizeof(aData));
}
- sal_Bool IsEmpty() const;
+ bool IsEmpty() const;
void operator&=(const SetOfByte& r2ndSet);
void operator|=(const SetOfByte& r2ndSet);
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index c51e77ed3e33..55aaebe17d8c 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -416,7 +416,7 @@ protected:
OutlinerParaObject* pOldText;
OutlinerParaObject* pNewText;
bool bNewTextAvailable;
- sal_Bool bEmptyPresObj;
+ bool bEmptyPresObj;
sal_Int32 mnText;
public:
@@ -677,7 +677,7 @@ public:
class SdrUndoPageMasterPage : public SdrUndoPage
{
protected:
- sal_Bool mbOldHadMasterPage;
+ bool mbOldHadMasterPage;
SetOfByte maOldSet;
sal_uInt16 maOldMasterPageNumber;
@@ -712,7 +712,7 @@ public:
class SVX_DLLPUBLIC SdrUndoPageChangeMasterPage : public SdrUndoPageMasterPage
{
protected:
- sal_Bool mbNewHadMasterPage;
+ bool mbNewHadMasterPage;
SetOfByte maNewSet;
sal_uInt16 maNewMasterPageNumber;
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index 3da285411b55..bfe5bc8bfc0c 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -179,20 +179,20 @@ public:
// pSdrView->DoMouseEvent(aVEvt);
// SetPointer(GetPreferredPointer(...))
// CaptureMouse(...)
- void EnableExtendedMouseEventDispatcher(sal_Bool bOn) { bNoExtendedMouseDispatcher = !bOn; }
- sal_Bool IsExtendedMouseEventDispatcherEnabled() const { return bNoExtendedMouseDispatcher; }
+ void EnableExtendedMouseEventDispatcher(bool bOn) { bNoExtendedMouseDispatcher = !bOn; }
+ bool IsExtendedMouseEventDispatcherEnabled() const { return bNoExtendedMouseDispatcher; }
- void EnableExtendedKeyInputDispatcher(sal_Bool bOn) { bNoExtendedKeyDispatcher=!bOn; }
- sal_Bool IsExtendedKeyInputDispatcherEnabled() const { return bNoExtendedKeyDispatcher; }
+ void EnableExtendedKeyInputDispatcher(bool bOn) { bNoExtendedKeyDispatcher=!bOn; }
+ bool IsExtendedKeyInputDispatcherEnabled() const { return bNoExtendedKeyDispatcher; }
- void EnableExtendedCommandEventDispatcher(sal_Bool bOn) { bNoExtendedCommandDispatcher=!bOn; }
- sal_Bool IsExtendedCommandEventDispatcherEnabled() const { return bNoExtendedCommandDispatcher; }
+ void EnableExtendedCommandEventDispatcher(bool bOn) { bNoExtendedCommandDispatcher=!bOn; }
+ bool IsExtendedCommandEventDispatcherEnabled() const { return bNoExtendedCommandDispatcher; }
- void EnableTextEditOnObjectsWithoutTextIfTextTool(sal_Bool bOn) { bTextEditOnObjectsWithoutTextIfTextTool=bOn; }
- sal_Bool IsEnableTextEditOnObjectsWithoutTextIfTextToolEnabled() const { return bTextEditOnObjectsWithoutTextIfTextTool; }
+ void EnableTextEditOnObjectsWithoutTextIfTextTool(bool bOn) { bTextEditOnObjectsWithoutTextIfTextTool=bOn; }
+ bool IsEnableTextEditOnObjectsWithoutTextIfTextToolEnabled() const { return bTextEditOnObjectsWithoutTextIfTextTool; }
- void SetMasterPagePaintCaching(sal_Bool bOn);
- sal_Bool IsMasterPagePaintCaching() const { return mbMasterPagePaintCaching; }
+ void SetMasterPagePaintCaching(bool bOn);
+ bool IsMasterPagePaintCaching() const { return mbMasterPagePaintCaching; }
sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
@@ -202,21 +202,21 @@ public:
virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
- sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll=sal_False) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); }
- sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr=sal_False) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); }
+ bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll=false) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); }
+ bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr=false) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); }
/* new interface src537 */
- sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
+ bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr=false) const;
SfxStyleSheet* GetStyleSheet() const;
// unvollstaendige Implementation:
// Das OutputDevice ist notwendig, damit ich die HandleSize ermitteln kann.
// Bei NULL wird das 1. angemeldete Win verwendet.
- Pointer GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier=0, sal_Bool bLeftDown=sal_False) const;
+ Pointer GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier=0, bool bLeftDown=false) const;
SdrHitKind PickAnything(const MouseEvent& rMEvt, sal_uInt16 nMouseDownOrMoveOrUp, SdrViewEvent& rVEvt) const;
SdrHitKind PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) const;
- sal_Bool DoMouseEvent(const SdrViewEvent& rVEvt);
+ bool DoMouseEvent(const SdrViewEvent& rVEvt);
virtual SdrViewContext GetContext() const;
// Die Methoden beruecksichtigen den jeweiligen Kontex:
@@ -237,7 +237,7 @@ public:
// bAddMark=TRUE: zur bestehenden Selektion hinzumarkieren (->Shift)
// bUnmark=TRUE: Bereits selektierte Objekte/Punkte/Klebepunkte die innerhalb
// des aufgezogenen Rahmens liegen werden deselektiert.
- sal_Bool BegMark(const Point& rPnt, sal_Bool bAddMark=sal_False, sal_Bool bUnmark=sal_False);
+ bool BegMark(const Point& rPnt, bool bAddMark=false, bool bUnmark=false);
// Folgende Actions sind moeglich:
// - ObjectCreating
diff --git a/include/svx/svdviter.hxx b/include/svx/svdviter.hxx
index 8bee35f2c424..a5cf00479284 100644
--- a/include/svx/svdviter.hxx
+++ b/include/svx/svdviter.hxx
@@ -73,16 +73,16 @@ class SVX_DLLPUBLIC SdrViewIter
sal_uInt32 mnOutDevNum;
// bitfield
- unsigned mbNoMasterPage : 1;
+ bool mbNoMasterPage : 1;
private:
SVX_DLLPRIVATE void ImpInitVars();
SVX_DLLPRIVATE SdrView* ImpFindView();
- SVX_DLLPRIVATE sal_Bool ImpCheckPageView(SdrPageView* pPV) const;
+ SVX_DLLPRIVATE bool ImpCheckPageView(SdrPageView* pPV) const;
public:
- SdrViewIter(const SdrPage* pPage, sal_Bool bNoMasterPage = sal_False);
- SdrViewIter(const SdrObject* pObject, sal_Bool bNoMasterPage = sal_False);
+ SdrViewIter(const SdrPage* pPage, bool bNoMasterPage = false);
+ SdrViewIter(const SdrObject* pObject, bool bNoMasterPage = false);
SdrView* FirstView();
SdrView* NextView();
diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx
index 010df2e0af0e..fa18cb5631b5 100644
--- a/include/svx/svdxcgv.hxx
+++ b/include/svx/svdxcgv.hxx
@@ -33,10 +33,10 @@ protected:
void ImpGetPasteObjList(Point& rPos, SdrObjList*& rpLst);
void ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions);
- sal_Bool ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const;
+ bool ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const;
// liefert True, wenn rPt geaendert wurde
- sal_Bool ImpLimitToWorkArea(Point& rPt) const;
+ bool ImpLimitToWorkArea(Point& rPt) const;
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -103,16 +103,16 @@ public:
// View angezeigt wird.
// Gueltige Werte fuer nOptions sind SDRINSERT_DONTMARK und
// SDRINSERT_ADDMARK (siehe svdedtv.hxx).
- virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
- sal_Bool Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
- sal_Bool Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, 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);
+ bool Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+ bool Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
- sal_Bool Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT );
+ bool Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT );
- sal_Bool Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT );
+ bool Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT );
- sal_Bool Paste( Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT );
- sal_Bool PasteClipboard( OutputDevice* pOut = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT, sal_uInt32 nOptions = 0 );
+ bool Paste( Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT );
+ bool PasteClipboard( OutputDevice* pOut = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT, sal_uInt32 nOptions = 0 );
};
#endif // INCLUDED_SVX_SVDXCGV_HXX
diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx
index 943cdb39cbbe..db502f55f785 100644
--- a/include/svx/view3d.hxx
+++ b/include/svx/view3d.hxx
@@ -86,7 +86,7 @@ public:
// Access to the default attributes.
E3dDefaultAttributes& Get3DDefaultAttributes() { return a3DDefaultAttr; }
- virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL);
+ virtual bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL);
virtual void CheckPossibilities();
// Get/Set Event
@@ -98,7 +98,7 @@ public:
// On Paste: We need to insert the objects of the Scene, but not the Scene itself
using SdrView::Paste;
- 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);
// #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...)
bool ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset);
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 58c80ab0e3ac..97914fe00011 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -48,7 +48,7 @@ TYPEINIT1(OReportModel,SdrModel);
OReportModel::OReportModel(::reportdesign::OReportDefinition* _pReportDefinition) :
- SdrModel(SvtPathOptions().GetPalettePath(),NULL,_pReportDefinition)
+ SdrModel(SvtPathOptions().GetPalettePath(),NULL,_pReportDefinition, false, false)
,m_pController(NULL)
,m_pReportDefinition(_pReportDefinition)
{
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index ec5082a1ca6b..2ffd70f56673 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -613,7 +613,7 @@ TYPEINIT1(OUnoObject, SdrUnoObj);
OUnoObject::OUnoObject(const OUString& _sComponentName
,const OUString& rModelName
,sal_uInt16 _nObjectType)
- :SdrUnoObj(rModelName, sal_True)
+ :SdrUnoObj(rModelName, true)
,OObjectBase(_sComponentName)
,m_nObjectType(_nObjectType)
{
@@ -624,7 +624,7 @@ OUnoObject::OUnoObject(const OUString& _sComponentName
OUnoObject::OUnoObject(const uno::Reference< report::XReportComponent>& _xComponent
,const OUString& rModelName
,sal_uInt16 _nObjectType)
- :SdrUnoObj(rModelName, sal_True)
+ :SdrUnoObj(rModelName, true)
,OObjectBase(_xComponent)
,m_nObjectType(_nObjectType)
{
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 27f1a4ca5fea..e3c45673a4fc 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -192,7 +192,7 @@ void OReportSection::fill()
// without the following call, no grid is painted
m_pView->ShowSdrPage( m_pPage );
- m_pView->SetMoveSnapOnlyTopLeft( sal_True );
+ m_pView->SetMoveSnapOnlyTopLeft( true );
ODesignView* pDesignView = m_pParent->getViewsWindow()->getView()->getReportView();
// #i93595# Adapted grid to a more coarse grid and subdivisions for better visualisation. This
@@ -209,7 +209,7 @@ void OReportSection::fill()
m_pView->SetGridSnap( pDesignView->isGridSnap() );
m_pView->SetGridFront( false );
- m_pView->SetDragStripes( sal_True );
+ m_pView->SetDragStripes( true );
m_pView->SetPageVisible();
sal_Int32 nColor = m_xSection->getBackColor();
if ( nColor == (sal_Int32)COL_TRANSPARENT )
diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx
index 526ed9688ce1..78df59de958e 100644
--- a/reportdesign/source/ui/report/SectionView.cxx
+++ b/reportdesign/source/ui/report/SectionView.cxx
@@ -46,7 +46,7 @@ OSectionView::OSectionView( SdrModel* pModel, OReportSection* _pSectionWindow, O
SetBufferedOverlayAllowed(true);
SetPageBorderVisible(false);
SetBordVisible();
- SetQuickTextEditMode(sal_False);
+ SetQuickTextEditMode(false);
}
@@ -155,7 +155,7 @@ void OSectionView::ObjectRemovedInAliveMode( const SdrObject* _pObject )
{
SdrPageView* pPgView = GetSdrPageView();
BrkAction();
- MarkObj( pSdrObj, pPgView, sal_True );
+ MarkObj( pSdrObj, pPgView, true );
break;
}
}
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 9ca6852ab092..19cf7ab9c90a 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -1252,7 +1252,7 @@ void OViewsWindow::EndDragObj(sal_Bool _bControlKeyPressed, const OSectionView*
rReportSection.Copy(aAllreadyCopiedObjects,true);
}
else
- pInSection->EndDragObj(sal_False);
+ pInSection->EndDragObj(false);
}
if ( aAllreadyCopiedObjects.getLength() )
@@ -1596,7 +1596,7 @@ void OViewsWindow::handleKey(const KeyCode& _rCode)
if ( !bWasNoSnap )
((SdrDragStat&)rDragStat).SetNoSnap( true );
if ( bWasSnapEnabled )
- rView.SetSnapEnabled( sal_False );
+ rView.SetSnapEnabled( false );
Rectangle aNewRect;
bool bCheck = false;
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 163c3aef5136..cf302d6ff523 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -654,14 +654,14 @@ bool DlgEdFunc::setMovementPointer(const MouseEvent& rMEvt)
DlgEdFuncInsert::DlgEdFuncInsert( OReportSection* _pParent ) :
DlgEdFunc( _pParent )
{
- m_rView.SetCreateMode( sal_True );
+ m_rView.SetCreateMode( true );
}
DlgEdFuncInsert::~DlgEdFuncInsert()
{
- m_rView.SetEditMode( sal_True );
+ m_rView.SetEditMode( true );
}
@@ -726,7 +726,7 @@ sal_Bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
{
m_pParent->getSectionWindow()->getViewsWindow()->BrkAction();
// BrkAction disables the create mode
- m_rView.SetCreateMode( sal_True );
+ m_rView.SetCreateMode( true );
return sal_True;
}
@@ -859,7 +859,7 @@ sal_Bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
}
else
{
- m_rView.SdrBeginTextEdit( aVEvt.pRootObj,m_rView.GetSdrPageView(),m_pParent,sal_False );
+ m_rView.SdrBeginTextEdit( aVEvt.pRootObj,m_rView.GetSdrPageView(),m_pParent, false );
}
}
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index d58723d09ec8..a0877eb0ddb1 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -291,7 +291,7 @@ ScDrawLayer::~ScDrawLayer()
{
Broadcast(SdrHint(HINT_MODELCLEARED));
- ClearModel(sal_True);
+ ClearModel(true);
delete pUndoGroup;
if( !--nInst )
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 30e1e7630ec4..9543614def5e 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -121,7 +121,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
case SID_TEXT_STANDARD: // Harte Textattributierung loeschen
{
SfxItemSet aEmptyAttr(GetPool(), EE_ITEMS_START, EE_ITEMS_END);
- pView->SetAttributes(aEmptyAttr, sal_True);
+ pView->SetAttributes(aEmptyAttr, true);
}
break;
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index 1d39426d5025..7ff85f14e5a6 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -140,7 +140,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl
// call IsMirrorAllowed first to make sure ForcePossibilities (and thus CheckMarked)
// is called before GetMarkCount, so the nMarkCount value is valid for the rest of this method.
- if (!pView->IsMirrorAllowed(sal_True,sal_True))
+ if (!pView->IsMirrorAllowed(true,true))
{
rSet.DisableItem( SID_MIRROR_HORIZONTAL );
rSet.DisableItem( SID_MIRROR_VERTICAL );
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 4370c18e826a..52e524dcf3a6 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -408,7 +408,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
rBindings.Invalidate( SID_OBJECT_MIRROR );
if (eMode == SDRDRAG_ROTATE && !pView->IsFrameDragSingles())
{
- pView->SetFrameDragSingles( sal_True );
+ pView->SetFrameDragSingles( true );
rBindings.Invalidate( SID_BEZIER_EDIT );
}
}
@@ -425,7 +425,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
rBindings.Invalidate( SID_OBJECT_MIRROR );
if (eMode == SDRDRAG_MIRROR && !pView->IsFrameDragSingles())
{
- pView->SetFrameDragSingles( sal_True );
+ pView->SetFrameDragSingles( true );
rBindings.Invalidate( SID_BEZIER_EDIT );
}
}
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index db575fc90a27..1bb6833a9fcd 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -785,7 +785,7 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
pOutView->Paint( Rectangle() );
SfxItemSet aEmptyAttr( *aEditAttr.GetPool(), EE_ITEMS_START, EE_ITEMS_END );
- pView->SetAttributes( aEmptyAttr, sal_True );
+ pView->SetAttributes( aEmptyAttr, true );
if ( pOutView )
{
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index a3d00092ff47..12183dd164bf 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -73,7 +73,7 @@ bool FuConstPolygon::MouseButtonDown(const MouseEvent& rMEvt)
}
else
{
- pView->EnableExtendedMouseEventDispatcher(sal_True);
+ pView->EnableExtendedMouseEventDispatcher(true);
}
if ( pView->MouseButtonDown(rMEvt, pWindow) )
@@ -150,7 +150,7 @@ bool FuConstPolygon::KeyInput(const KeyEvent& rKEvt)
void FuConstPolygon::Activate()
{
- pView->EnableExtendedMouseEventDispatcher(sal_True);
+ pView->EnableExtendedMouseEventDispatcher(true);
SdrObjKind eKind;
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 4ded30bf1b4a..6d7df46c5a07 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -81,8 +81,8 @@ void FuDraw::DoModifiers(const MouseEvent& rMEvt)
sal_Bool bAlt = rMEvt.IsMod2();
bool bOrtho = bShift;
- sal_Bool bAngleSnap = bShift;
- sal_Bool bCenter = bAlt;
+ bool bAngleSnap = bShift;
+ bool bCenter = bAlt;
// #i33136#
if(doConstructOrthogonal())
@@ -107,7 +107,7 @@ void FuDraw::ResetModifiers()
ScViewData* pViewData = pViewShell->GetViewData();
const ScViewOptions& rOpt = pViewData->GetOptions();
const ScGridOptions& rGrid = rOpt.GetGridOptions();
- sal_Bool bGridOpt = rGrid.GetUseGridSnap();
+ bool bGridOpt = rGrid.GetUseGridSnap();
if (pView->IsOrtho())
pView->SetOrtho(false);
@@ -392,7 +392,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
{
// mark first object
pView->UnmarkAllObj();
- pView->MarkNextObj(sal_True);
+ pView->MarkNextObj(true);
// II
if(pView->AreObjectsMarked())
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index a56f6c03a454..fed6aa1b2324 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -221,7 +221,7 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt)
pO->SetVertical( bVertical );
//!?? ohne uebergebenen Outliner stimmen die Defaults nicht ???!?
- if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, sal_True, pO) )
+ if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, true, pO) )
{
// EditEngine-UndoManager anmelden
pViewShell->SetDrawTextUndo( &pO->GetUndoManager() );
@@ -504,7 +504,7 @@ bool FuText::MouseButtonUp(const MouseEvent& rMEvt)
SdrTextObj* pText = (SdrTextObj*)pObj;
SfxItemSet aSet(pDrDoc->GetItemPool());
- pText->SetVerticalWriting(sal_True);
+ pText->SetVerticalWriting(true);
aSet.Put(SdrTextAutoGrowWidthItem(true));
aSet.Put(SdrTextAutoGrowHeightItem(false));
@@ -754,7 +754,7 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel,
pO->SetVertical( bVertical );
//!?? ohne uebergebenen Outliner stimmen die Defaults nicht ???!?
- if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, sal_True, pO) )
+ if ( pView->SdrBeginTextEdit(pObj, pPV, pWindow, true, pO) )
{
// EditEngine-UndoManager anmelden
pViewShell->SetDrawTextUndo( &pO->GetUndoManager() );
diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index 2b7100a70e41..306c6f8ce7e7 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -70,18 +70,18 @@ public:
virtual void DeleteMarked();
- virtual sal_Bool SdrBeginTextEdit(
- SdrObject* pObj,
- SdrPageView* pPV = 0L,
- ::Window* pWin = 0L,
- sal_Bool bIsNewObj = sal_False,
- SdrOutliner* pGivenOutliner = 0L,
- OutlinerView* pGivenOutlinerView = 0L,
- sal_Bool bDontDeleteOutliner = sal_False,
- sal_Bool bOnlyOneView = sal_False,
- sal_Bool bGrabFocus = sal_True);
-
- virtual SdrEndTextEditKind SdrEndTextEdit( sal_Bool bDontDeleteReally = sal_False );
+ virtual bool SdrBeginTextEdit(
+ SdrObject* pObj,
+ SdrPageView* pPV = 0L,
+ ::Window* pWin = 0L,
+ bool bIsNewObj = false,
+ SdrOutliner* pGivenOutliner = 0L,
+ OutlinerView* pGivenOutlinerView = 0L,
+ bool bDontDeleteOutliner = false,
+ bool bOnlyOneView = false,
+ bool bGrabFocus = true);
+
+ virtual SdrEndTextEditKind SdrEndTextEdit( bool bDontDeleteReally = false );
void MarkDropObj( SdrObject* pObj );
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index ea82c505cd80..c2def963ea64 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -91,7 +91,7 @@ void ScDrawView::Construct()
SetLayerLocked( pLayer->GetName(), bProt || !bEx );
pLayer = rAdmin.GetLayerPerID(SC_LAYER_INTERN);
if (pLayer)
- SetLayerLocked( pLayer->GetName(), sal_True );
+ SetLayerLocked( pLayer->GetName(), true );
pLayer = rAdmin.GetLayerPerID(SC_LAYER_FRONT);
if (pLayer)
{
@@ -108,7 +108,7 @@ void ScDrawView::Construct()
SetLayerVisible( pLayer->GetName(), false);
}
- SetSwapAsynchron(sal_True);
+ SetSwapAsynchron(true);
}
else
{
@@ -540,16 +540,16 @@ void ScDrawView::MarkListHasChanged()
}
-sal_Bool ScDrawView::SdrBeginTextEdit(
+bool ScDrawView::SdrBeginTextEdit(
SdrObject* pObj,
SdrPageView* pPV,
::Window* pWinL,
- sal_Bool bIsNewObj,
+ bool bIsNewObj,
SdrOutliner* pGivenOutliner,
OutlinerView* pGivenOutlinerView,
- sal_Bool bDontDeleteOutliner,
- sal_Bool bOnlyOneView,
- sal_Bool bGrabFocus )
+ bool bDontDeleteOutliner,
+ bool bOnlyOneView,
+ bool bGrabFocus )
{
const sal_Bool bRet = FmFormView::SdrBeginTextEdit(
pObj, pPV, pWinL, bIsNewObj,
@@ -573,7 +573,7 @@ sal_Bool ScDrawView::SdrBeginTextEdit(
}
-SdrEndTextEditKind ScDrawView::SdrEndTextEdit( sal_Bool bDontDeleteReally )
+SdrEndTextEditKind ScDrawView::SdrEndTextEdit( bool bDontDeleteReally )
{
const SdrEndTextEditKind eRet = FmFormView::SdrEndTextEdit( bDontDeleteReally );
@@ -707,7 +707,7 @@ bool ScDrawView::SelectCurrentViewObject( const OUString& rName )
{
SdrLayer* pLayer = GetModel()->GetLayerAdmin().GetLayerPerID(SC_LAYER_BACK);
if (pLayer)
- SetLayerLocked( pLayer->GetName(), sal_False );
+ SetLayerLocked( pLayer->GetName(), false );
}
SdrPageView* pPV = GetSdrPageView();
bUnMark = IsObjMarked(pFound);
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index 20c503a19b18..75e5cec3533a 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -80,7 +80,7 @@ IMPL_LINK_NOARG(ScNoteMarker, TimeHdl)
{
SvtPathOptions aPathOpt;
OUString aPath = aPathOpt.GetPalettePath();
- pModel = new SdrModel(aPath);
+ pModel = new SdrModel(aPath, NULL, NULL, false, false);
pModel->SetScaleUnit(MAP_100TH_MM);
SfxItemPool& rPool = pModel->GetItemPool();
rPool.SetDefaultMetric(SFX_MAPUNIT_100TH_MM);
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 25e771efca61..3564485d21ab 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -318,7 +318,7 @@ void ScTabView::UpdateLayerLocks()
pDrawView->SetLayerLocked( pLayer->GetName(), bProt || !bEx || bShared );
pLayer = rAdmin.GetLayerPerID(SC_LAYER_INTERN);
if (pLayer)
- pDrawView->SetLayerLocked( pLayer->GetName(), sal_True );
+ pDrawView->SetLayerLocked( pLayer->GetName(), true );
pLayer = rAdmin.GetLayerPerID(SC_LAYER_FRONT);
if (pLayer)
pDrawView->SetLayerLocked( pLayer->GetName(), bProt || bShared );
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index cf0ec07d2990..7b6855398080 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -213,7 +213,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq)
{
// select first object
pView->UnmarkAllObj();
- pView->MarkNextObj(sal_True);
+ pView->MarkNextObj(true);
// ...and make it visible
if(pView->AreObjectsMarked())
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);
}
}
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 537fe41b2340..61bc65eeca61 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -241,7 +241,7 @@ void AccessibleShape::UpdateStates (void)
// XXX fix_me this has to be done with an extra interface later on
if ( m_pShape && maShapeTreeInfo.GetSdrView() )
{
- bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape) == sal_True;
+ bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape);
}
if (bShapeIsSelected)
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 2204c5bc4924..0a919c949755 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -352,7 +352,7 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render()
double a = nRotateAngle * F_PI18000;
pRenderedShape->NbcRotate( pSdrObjCustomShape->GetSnapRect().Center(), nRotateAngle, sin( a ), cos( a ) );
}
- pRenderedShape->NbcSetStyleSheet( pSdrObjCustomShape->GetStyleSheet(), sal_True );
+ pRenderedShape->NbcSetStyleSheet( pSdrObjCustomShape->GetStyleSheet(), true );
pRenderedShape->RecalcSnapRect();
}
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index ab9b980452e2..7ebde92e253b 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -85,7 +85,7 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly )
if ( nPolyCount )
{
pView->MarkAll();
- pView->CombineMarkedObjects( sal_False );
+ pView->CombineMarkedObjects( false );
}
pModel->SetChanged( false );
@@ -123,13 +123,13 @@ void ContourWindow::InitSdrModel()
aSet.Put( XFillColorItem( "", TRANSCOL ) );
aSet.Put( XFillTransparenceItem( 50 ) );
pView->SetAttributes( aSet );
- pView->SetFrameDragSingles( sal_True );
+ pView->SetFrameDragSingles( true );
}
void ContourWindow::SdrObjCreated( const SdrObject& )
{
pView->MarkAll();
- pView->CombineMarkedObjects( sal_False );
+ pView->CombineMarkedObjects( false );
}
bool ContourWindow::IsContourChanged() const
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index d0a769ba58c9..aa8d603c2260 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -163,11 +163,11 @@ void GraphCtrl::InitSdrModel()
// Creating a View
pView = new GraphCtrlView( pModel, this );
pView->SetWorkArea( Rectangle( Point(), aGraphSize ) );
- pView->EnableExtendedMouseEventDispatcher( sal_True );
+ pView->EnableExtendedMouseEventDispatcher( true );
pView->ShowSdrPage(pView->GetModel()->GetPage(0));
- pView->SetFrameDragSingles( sal_True );
+ pView->SetFrameDragSingles( true );
pView->SetMarkedPointsSmooth( SDRPATHSMOOTH_SYMMETRIC );
- pView->SetEditMode( sal_True );
+ pView->SetEditMode( true );
// #i72889# set neeeded flags
pView->SetPagePaintingAllowed(false);
@@ -394,7 +394,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
{
// mark last object
pView->UnmarkAllObj();
- pView->MarkNextObj(sal_False);
+ pView->MarkNextObj(false);
bProc = true;
}
@@ -406,7 +406,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
if ( aCode.IsMod1() )
{
pView->UnmarkAllObj();
- pView->MarkNextObj(sal_True);
+ pView->MarkNextObj(true);
bProc = true;
}
@@ -528,7 +528,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
if(!bWasNoSnap)
((SdrDragStat&)rDragStat).SetNoSnap(true);
if(bWasSnapEnabled)
- pView->SetSnapEnabled(sal_False);
+ pView->SetSnapEnabled(false);
pView->MovAction(aEndPoint);
pView->EndDragObj();
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index bd7e209c46f4..d048f8c16d7e 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -279,7 +279,7 @@ void IMapWindow::InitSdrModel()
aSet.Put( XFillColorItem( "", TRANSCOL ) );
aSet.Put( XFillTransparenceItem( 50 ) );
pView->SetAttributes( aSet );
- pView->SetFrameDragSingles( sal_True );
+ pView->SetFrameDragSingles( true );
}
void IMapWindow::SdrObjCreated( const SdrObject& rObj )
@@ -591,7 +591,7 @@ void IMapWindow::SetCurrentObjState( sal_Bool bActive )
aSet.Put( XLineColorItem( "", Color( COL_BLACK ) ) );
}
- pView->SetAttributes( aSet, sal_False );
+ pView->SetAttributes( aSet, false );
}
}
@@ -816,7 +816,7 @@ void IMapWindow::SelectFirstObject()
{
GrabFocus();
pView->UnmarkAllObj();
- pView->MarkNextObj(sal_True);
+ pView->MarkNextObj(true);
}
}
@@ -825,7 +825,7 @@ void IMapWindow::StartPolyEdit()
GrabFocus();
if( !pView->AreObjectsMarked() )
- pView->MarkNextObj(sal_True);
+ pView->MarkNextObj(true);
const SdrHdlList& rHdlList = pView->GetHdlList();
SdrHdl* pHdl = rHdlList.GetFocusHdl();
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 25ab29476f2b..024daf287585 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -69,7 +69,7 @@ sal_uInt16 E3dCubeObj::GetObjIdentifier() const
// Convert the object into a group object consisting of 6 polygons
-SdrObject *E3dCubeObj::DoConvertToPolyObj(sal_Bool /*bBezier*/, bool /*bAddText*/) const
+SdrObject *E3dCubeObj::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const
{
return NULL;
}
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index 4abfbcd710cc..9e77190b6b64 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -374,7 +374,7 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt)
}
long nSnap = 0;
- if(!getSdrDragView().IsRotateAllowed(sal_False))
+ if(!getSdrDragView().IsRotateAllowed(false))
nSnap = 90;
if(nSnap != 0)
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 4f40c8576e5a..dec0b7987448 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -115,7 +115,7 @@ E3dLatheObj* E3dLatheObj::Clone() const
// Convert the object to group object consisting of n polygons
-SdrObject *E3dLatheObj::DoConvertToPolyObj(sal_Bool /*bBezier*/, bool /*bAddText*/) const
+SdrObject *E3dLatheObj::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const
{
return NULL;
}
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 24a802c83777..653f117ce0a0 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -225,7 +225,7 @@ SdrAttrObj* E3dObject::GetBreakObj()
// SetRectsDirty must be done through the local SdrSubList
-void E3dObject::SetRectsDirty(sal_Bool bNotMyself)
+void E3dObject::SetRectsDirty(bool bNotMyself)
{
// call parent
SdrAttrObj::SetRectsDirty(bNotMyself);
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index a0cd8e738321..4fefa881e9ab 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -218,7 +218,7 @@ void E3dPolygonObj::SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyText
// Convert the object into a group object consisting of 6 polygons
-SdrObject *E3dPolygonObj::DoConvertToPolyObj(sal_Bool /*bBezier*/, bool /*bAddText*/) const
+SdrObject *E3dPolygonObj::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const
{
return NULL;
}
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 8454600aa89f..edea521824bd 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -95,7 +95,7 @@ sal_uInt16 E3dSphereObj::GetObjIdentifier() const
// Convert the object into a group object consisting of n polygons
-SdrObject *E3dSphereObj::DoConvertToPolyObj(sal_Bool /*bBezier*/, bool /*bAddText*/) const
+SdrObject *E3dSphereObj::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const
{
return NULL;
}
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index dc68ab1b719e..645adc8006be 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -397,7 +397,7 @@ SdrModel* E3dView::GetMarkedObjModel() const
if(pScene && !IsObjMarked(pScene) && GetSdrPageView())
{
- ((E3dView*)this)->MarkObj(pScene, GetSdrPageView(), sal_False, sal_True);
+ ((E3dView*)this)->MarkObj(pScene, GetSdrPageView(), false, true);
}
}
}
@@ -441,9 +441,9 @@ SdrModel* E3dView::GetMarkedObjModel() const
// When pasting objects have to integrated if a scene is inserted, but
// not the scene itself
-sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
+bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
{
- sal_Bool bRetval = sal_False;
+ bool bRetval = false;
// Get list
Point aPos(rPos);
@@ -451,7 +451,7 @@ sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLs
ImpGetPasteObjList(aPos, pDstList);
if(!pDstList)
- return sal_False;
+ return false;
// Get owner of the list
SdrObject* pOwner = pDstList->GetOwnerObj();
@@ -587,7 +587,7 @@ bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDs
pNewCompoundObj->SetModel(pDstScene->GetModel());
pNewCompoundObj->SetPage(pDstScene->GetPage());
pNewCompoundObj->NbcSetLayer(pCompoundObj->GetLayer());
- pNewCompoundObj->NbcSetStyleSheet(pCompoundObj->GetStyleSheet(), sal_True);
+ pNewCompoundObj->NbcSetStyleSheet(pCompoundObj->GetStyleSheet(), true);
pDstScene->Insert3DObj(pNewCompoundObj);
bRetval = true;
@@ -619,8 +619,8 @@ bool E3dView::IsConvertTo3DObjPossible() const
bRetval = !bAny3D
&& (
- IsConvertToPolyObjPossible(sal_False)
- || IsConvertToPathObjPossible(sal_False)
+ IsConvertToPolyObjPossible(false)
+ || IsConvertToPathObjPossible(false)
|| IsImportMtfPossible());
return bRetval;
}
@@ -759,7 +759,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo
p3DObj->SetMergedItemSet(aSet);
- p3DObj->NbcSetStyleSheet(pObj->GetStyleSheet(), sal_True);
+ p3DObj->NbcSetStyleSheet(pObj->GetStyleSheet(), true);
// Insert a new extrude object
pScene->Insert3DObj(p3DObj);
@@ -968,8 +968,8 @@ void E3dView::ConvertMarkedObjTo3D(bool bExtrude, basegfx::B2DPoint aPnt1, baseg
// all the old objects
SdrObject* pRepObj = GetMarkedObjectByIndex(0);
SdrPageView* pPV = GetSdrPageViewOfMarkedByIndex(0);
- MarkObj(pRepObj, pPV, sal_True);
- ReplaceObjectAtView(pRepObj, *pPV, pScene, sal_False);
+ MarkObj(pRepObj, pPV, true);
+ ReplaceObjectAtView(pRepObj, *pPV, pScene, false);
DeleteMarked();
MarkObj(pScene, pPV);
@@ -1184,7 +1184,7 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
// Start drag, create for 3D objects before possibly drag method
-sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
+bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
SdrHdl* pHdl, short nMinMov,
SdrDragMethod* pForcedMeth)
{
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index 8c129ec082ef..c601a5fd76d7 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -115,7 +115,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, sal_Bool /*bOnly3DAttr*/
else
{
// get attributes from all selected objects
- MergeAttrFromMarked(aSet, sal_False);
+ MergeAttrFromMarked(aSet, false);
// calc flags for SID_ATTR_3D_INTERN
const SdrMarkList& rMarkList = GetMarkedObjectList();
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index d62dd25807ec..7765c47e75de 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -59,7 +59,7 @@ struct FmFormModelImplData
|*
\************************************************************************/
FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers)
- : SdrModel(pPool, pPers, LOADREFCOUNTS)
+ : SdrModel(pPool, pPers, false, LOADREFCOUNTS)
, m_pImpl(NULL)
, m_pObjShell(0)
, m_bOpenInDesignMode(false)
@@ -76,7 +76,7 @@ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers)
|*
\************************************************************************/
FmFormModel::FmFormModel(const OUString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers)
- : SdrModel(rPath, pPool, pPers)
+ : SdrModel(rPath, pPool, pPers, false, LOADREFCOUNTS)
, m_pImpl(NULL)
, m_pObjShell(0)
, m_bOpenInDesignMode(false)
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 0a2c7329c2e6..9f00a6b42cb8 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -173,7 +173,7 @@ void FmFormView::MarkListHasChanged()
pImpl->m_xWindow->removeFocusListener(pImpl);
pImpl->m_xWindow = NULL;
}
- SetMoveOutside(sal_False);
+ SetMoveOutside(false);
//OLMRefreshAllIAOManagers();
}
@@ -229,7 +229,7 @@ void FmFormView::DeleteWindowFromPaintView(OutputDevice* pNewWin)
void FmFormView::ChangeDesignMode(bool bDesign)
{
- if ((bDesign ? 1 : 0) == IsDesignMode())
+ if (bDesign == IsDesignMode())
return;
FmFormModel* pModel = PTR_CAST(FmFormModel, GetModel());
@@ -380,7 +380,7 @@ SdrModel* FmFormView::GetMarkedObjModel() const
}
-sal_Bool FmFormView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
+bool FmFormView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
{
return E3dView::Paste(rMod, rPos, pLst, nOptions);
}
@@ -515,7 +515,7 @@ sal_Bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
pImpl->m_xWindow = xWindow;
// add as listener to get notified when ESC will be pressed inside the grid
pImpl->m_xWindow->addFocusListener(pImpl);
- SetMoveOutside(sal_True);
+ SetMoveOutside(true);
//OLMRefreshAllIAOManagers();
xWindow->setFocus();
bDone = sal_True;
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 91aefdb3ab39..57f3eeda0253 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1754,14 +1754,14 @@ void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark )
if ( !bMixed )
{
// all objects in the group are form objects
- m_pView->MarkObj( pMark->GetMarkedSdrObj(), pMark->GetPageView(), sal_True /* unmark! */ );
+ m_pView->MarkObj( pMark->GetMarkedSdrObj(), pMark->GetPageView(), true /* unmark! */ );
}
}
else
{
if ( pObj->GetObjInventor() == FmFormInventor )
{ // this is a form layer object
- m_pView->MarkObj( pMark->GetMarkedSdrObj(), pMark->GetPageView(), sal_True /* unmark! */ );
+ m_pView->MarkObj( pMark->GetMarkedSdrObj(), pMark->GetPageView(), true /* unmark! */ );
}
}
}
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 271295451596..4f68afe508ab 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -2092,10 +2092,10 @@ namespace svxform
continue;
Reference< XFormComponent > xControlModel( pFormObject->GetUnoControlModel(),UNO_QUERY );
- if ( xControlModel.is() && aObjects.find(xControlModel) != aObjects.end() && bMark != pFormView->IsObjMarked( pSdrObject ) )
+ if ( xControlModel.is() && aObjects.find(xControlModel) != aObjects.end() && bMark != (pFormView->IsObjMarked( pSdrObject ) ? 1 : 0) )
{
// unfortunately, the writer doesn't like marking an already-marked object, again, so reset the mark first
- pFormView->MarkObj( pSdrObject, pPageView, !bMark, sal_False );
+ pFormView->MarkObj( pSdrObject, pPageView, !bMark, false );
}
} // while ( aIter.IsMore() )
if ( bMark )
@@ -2161,9 +2161,9 @@ namespace svxform
continue;
// mark the object
- if ( bMark != pFormView->IsObjMarked( pSdrObject ) )
+ if ( bMark != (pFormView->IsObjMarked( pSdrObject ) ? 1 : 0) )
// unfortunately, the writer doesn't like marking an already-marked object, again, so reset the mark first
- pFormView->MarkObj( pSdrObject, pPageView, !bMark, sal_False );
+ pFormView->MarkObj( pSdrObject, pPageView, !bMark, false );
if ( !bMarkHandles || !bMark )
continue;
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index f173f8b8a2d9..9b2976cec051 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -105,7 +105,7 @@ namespace sdr
SdrObject& rObj = GetSdrObject();
rObj.SetBoundRectDirty();
- rObj.SetRectsDirty(sal_True);
+ rObj.SetRectsDirty(true);
}
mpStyleSheet = 0L;
@@ -157,7 +157,7 @@ namespace sdr
SdrObject& rObj = GetSdrObject();
rObj.SetBoundRectDirty();
- rObj.SetRectsDirty(sal_True);
+ rObj.SetRectsDirty(true);
rObj.SetChanged();
}
@@ -239,7 +239,7 @@ namespace sdr
SdrObject& rObj = GetSdrObject();
rObj.SetBoundRectDirty();
- rObj.SetRectsDirty(sal_True);
+ rObj.SetRectsDirty(true);
}
SfxStyleSheet* AttributeProperties::GetStyleSheet() const
@@ -514,7 +514,7 @@ namespace sdr
// set necessary changes like in RemoveStyleSheet()
GetSdrObject().SetBoundRectDirty();
- GetSdrObject().SetRectsDirty(sal_True);
+ GetSdrObject().SetRectsDirty(true);
mpStyleSheet = NULL;
}
@@ -585,7 +585,7 @@ namespace sdr
// in the ItemSet parts because GetBoundRect() may calculate a new
Rectangle aBoundRect = rObj.GetLastBoundRect();
- rObj.SetRectsDirty(sal_True);
+ rObj.SetRectsDirty(true);
// tell the object about the change
rObj.SetChanged();
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 487718836f21..abd41ed1d448 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -559,7 +559,7 @@ namespace sdr
if(SFX_HINT_DATACHANGED == nId)
{
- rObj.SetPortionInfoChecked(sal_False);
+ rObj.SetPortionInfoChecked(false);
sal_Int32 nText = rTextProvider.getTextCount();
while( --nText > 0 )
@@ -583,7 +583,7 @@ namespace sdr
if(SFX_HINT_DYING == nId)
{
- rObj.SetPortionInfoChecked(sal_False);
+ rObj.SetPortionInfoChecked(false);
sal_Int32 nText = rTextProvider.getTextCount();
while( --nText > 0 )
{
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 570d5f4c75e6..6a7b0f7d43d5 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -114,7 +114,7 @@ using namespace ::com::sun::star;
SdrItemPool::SdrItemPool(
SfxItemPool* _pMaster,
- sal_Bool bLoadRefCounts)
+ bool bLoadRefCounts)
: XOutdevItemPool(_pMaster, SDRATTR_START, SDRATTR_END, bLoadRefCounts)
{
// prepare some constants
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index da1407a5d027..6be494f89ef7 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -198,11 +198,11 @@ void SdrCreateView::ImpClearVars()
nAktIdent=OBJ_NONE;
pAktCreate=NULL;
pCreatePV=NULL;
- bAutoTextEdit=sal_False;
- b1stPointAsCenter=sal_False;
+ bAutoTextEdit=false;
+ b1stPointAsCenter=false;
aAktCreatePointer=Pointer(POINTER_CROSS);
- bUseIncompatiblePathCreateInterface=sal_False;
- bAutoClosePolys=sal_True;
+ bUseIncompatiblePathCreateInterface=false;
+ bAutoClosePolys=true;
nAutoCloseDistPix=5;
nFreeHandMinDistPix=10;
@@ -224,7 +224,7 @@ SdrCreateView::~SdrCreateView()
SdrObject::Free( pAktCreate );
}
-sal_Bool SdrCreateView::IsAction() const
+bool SdrCreateView::IsAction() const
{
return SdrDragView::IsAction() || pAktCreate!=NULL;
}
@@ -271,18 +271,18 @@ void SdrCreateView::TakeActionRect(Rectangle& rRect) const
}
}
-sal_Bool SdrCreateView::CheckEdgeMode()
+bool SdrCreateView::CheckEdgeMode()
{
if (pAktCreate!=NULL)
{
// is managed by EdgeObj
- if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return sal_False;
+ if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return false;
}
if (!IsCreateMode() || nAktInvent!=SdrInventor || nAktIdent!=OBJ_EDGE)
{
ImpClearConnectMarker();
- return sal_False;
+ return false;
}
else
{
@@ -386,10 +386,10 @@ void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent)
ImpSetGlueVisible3(IsEdgeTool());
}
-sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
+bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
short nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject)
{
- sal_Bool bRet=sal_False;
+ bool bRet=false;
UnmarkAllObj();
BrkAction();
@@ -442,7 +442,7 @@ sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, c
}
if (pAktCreate!=NULL)
{
- if (pDefaultStyleSheet!=NULL) pAktCreate->NbcSetStyleSheet(pDefaultStyleSheet, sal_False);
+ if (pDefaultStyleSheet!=NULL) pAktCreate->NbcSetStyleSheet(pDefaultStyleSheet, false);
// SW uses a naked SdrObject for frame construction. Normally, such an
// object should not be created. Since it is possible to use it as a helper
@@ -509,7 +509,7 @@ sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, c
if (pAktCreate->BegCreate(aDragStat))
{
ShowCreateObj(/*pOut,sal_True*/);
- bRet=sal_True;
+ bRet=true;
}
else
{
@@ -523,12 +523,12 @@ sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, c
return bRet;
}
-sal_Bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
+bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
{
return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,pPV,Rectangle(), 0L);
}
-sal_Bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject)
+bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject)
{
sal_uInt32 nInvent(nAktInvent);
sal_uInt16 nIdent(nAktIdent);
@@ -542,7 +542,7 @@ sal_Bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMi
return ImpBegCreateObj(nInvent, nIdent, rPnt, 0L, nMinMov, 0L, Rectangle(), pPreparedFactoryObject);
}
-sal_Bool SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz,
+bool SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz,
OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
{
return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov,pPV,
@@ -592,9 +592,9 @@ void SdrCreateView::MovCreateObj(const Point& rPnt)
}
}
-sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
+bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
{
- sal_Bool bRet=sal_False;
+ bool bRet=false;
SdrObject* pObjMerk=pAktCreate;
SdrPageView* pPVMerk=pCreatePV;
@@ -605,7 +605,7 @@ sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
if (nAnz<=1 && eCmd==SDRCREATE_FORCEEND)
{
BrkCreateObj(); // objects with only a single point don't exist (at least today)
- return sal_False; // sal_False = event not interpreted
+ return false; // sal_False = event not interpreted
}
bool bPntsEq=nAnz>1;
@@ -661,7 +661,7 @@ sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
// delete object, its content is cloned and inserted
SdrObject::Free( pObjMerk );
pObjMerk = 0L;
- bRet = sal_False;
+ bRet = false;
bSceneIntoScene = true;
}
}
@@ -673,7 +673,7 @@ sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
}
pCreatePV=NULL;
- bRet=sal_True; // sal_True = event interpreted
+ bRet=true; // sal_True = event interpreted
}
else
{
@@ -693,7 +693,7 @@ sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
HideCreateObj();
ShowCreateObj();
aDragStat.ResetMinMoved(); // NextPoint is at MovCreateObj()
- bRet=sal_True;
+ bRet=true;
}
}
if (bRet && pObjMerk!=NULL && IsTextEditAfterCreate())
@@ -701,7 +701,7 @@ sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
SdrTextObj* pText=PTR_CAST(SdrTextObj,pObjMerk);
if (pText!=NULL && pText->IsTextFrame())
{
- SdrBeginTextEdit(pText, pPVMerk, (Window*)0L, sal_True, (SdrOutliner*)0L, (OutlinerView*)0L);
+ SdrBeginTextEdit(pText, pPVMerk, (Window*)0L, true, (SdrOutliner*)0L, (OutlinerView*)0L);
}
}
}
@@ -878,12 +878,12 @@ void SdrCreateView::HideCreateObj()
-sal_Bool SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
+bool SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const
{
if(pAktCreate)
{
rTargetSet.Put(pAktCreate->GetMergedItemSet());
- return sal_True;
+ return true;
}
else
{
@@ -891,13 +891,13 @@ sal_Bool SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHard
}
}
-sal_Bool SdrCreateView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
+bool SdrCreateView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll)
{
if(pAktCreate)
{
pAktCreate->SetMergedItemSetAndBroadcast(rSet, bReplaceAll);
- return sal_True;
+ return true;
}
else
{
@@ -917,12 +917,12 @@ SfxStyleSheet* SdrCreateView::GetStyleSheet() const
}
}
-sal_Bool SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
+bool SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr)
{
if (pAktCreate!=NULL)
{
pAktCreate->SetStyleSheet(pStyleSheet,bDontRemoveHardAttr);
- return sal_True;
+ return true;
}
else
{
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 3c0a96bb195d..35753127b286 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -92,7 +92,7 @@ SdrDragView::~SdrDragView()
{
}
-sal_Bool SdrDragView::IsAction() const
+bool SdrDragView::IsAction() const
{
return (mpCurrentSdrDragMethod || SdrExchangeView::IsAction());
}
@@ -110,7 +110,7 @@ void SdrDragView::EndAction()
{
if (mpCurrentSdrDragMethod)
{
- EndDragObj(sal_False);
+ EndDragObj(false);
}
SdrExchangeView::EndAction();
}
@@ -156,7 +156,7 @@ void SdrDragView::TakeActionRect(Rectangle& rRect) const
}
}
-sal_Bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, sal_Bool bTR ) const
+bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, bool bTR ) const
{
Rectangle aR;
TakeActionRect(aR);
@@ -186,25 +186,25 @@ sal_Bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, sal_Bool bTR ) const
}
}
}
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
-sal_Bool SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const
+bool SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const
{
- return sal_False;
+ return false;
}
-sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth)
+bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth)
{
BrkAction();
bool bRet=false;
{
- SetDragWithCopy(sal_False);
+ SetDragWithCopy(false);
//TODO: aAni.Reset();
mpCurrentSdrDragMethod=NULL;
bDragSpecial=false;
@@ -278,7 +278,7 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
// If yes, allow shear even when !IsShearAllowed,
// because 3D objects are limited rotations
if (!b3DObjSelected && !IsShearAllowed())
- return sal_False;
+ return false;
mpCurrentSdrDragMethod = new SdrDragShear(*this,eDragMode==SDRDRAG_ROTATE);
} break;
case HDL_UPLFT: case HDL_UPRGT:
@@ -286,12 +286,12 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
{
if (eDragMode==SDRDRAG_SHEAR || eDragMode==SDRDRAG_DISTORT)
{
- if (!IsDistortAllowed(sal_True) && !IsDistortAllowed(sal_False)) return sal_False;
+ if (!IsDistortAllowed(true) && !IsDistortAllowed(false)) return false;
mpCurrentSdrDragMethod = new SdrDragDistort(*this);
}
else
{
- if (!IsRotateAllowed(sal_True)) return sal_False;
+ if (!IsRotateAllowed(true)) return false;
mpCurrentSdrDragMethod = new SdrDragRotate(*this);
}
} break;
@@ -299,12 +299,12 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
{
if (IsMarkedHitMovesAlways() && eDragHdl==HDL_MOVE)
{ // HDL_MOVE is true, even if Obj is hit directly
- if (!IsMoveAllowed()) return sal_False;
+ if (!IsMoveAllowed()) return false;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
- if (!IsRotateAllowed(sal_True)) return sal_False;
+ if (!IsRotateAllowed(true)) return false;
mpCurrentSdrDragMethod = new SdrDragRotate(*this);
}
}
@@ -314,12 +314,12 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
{
if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways())
{
- if (!IsMoveAllowed()) return sal_False;
+ if (!IsMoveAllowed()) return false;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
- if (!IsMirrorAllowed(sal_True,sal_True)) return sal_False;
+ if (!IsMirrorAllowed(true,true)) return false;
mpCurrentSdrDragMethod = new SdrDragMirror(*this);
}
} break;
@@ -329,13 +329,13 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways())
{
if (!IsMoveAllowed())
- return sal_False;
+ return false;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
- if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False))
- return sal_False;
+ if (!IsCrookAllowed(true) && !IsCrookAllowed(false))
+ return false;
mpCurrentSdrDragMethod = new SdrDragCrop(*this);
}
}
@@ -346,13 +346,13 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
if(eDragHdl == HDL_MOVE && IsMarkedHitMovesAlways())
{
if(!IsMoveAllowed())
- return sal_False;
+ return false;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
if(!IsTransparenceAllowed())
- return sal_False;
+ return false;
mpCurrentSdrDragMethod = new SdrDragGradient(*this, false);
}
@@ -363,13 +363,13 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
if(eDragHdl == HDL_MOVE && IsMarkedHitMovesAlways())
{
if(!IsMoveAllowed())
- return sal_False;
+ return false;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
if(!IsGradientAllowed())
- return sal_False;
+ return false;
mpCurrentSdrDragMethod = new SdrDragGradient(*this);
}
@@ -380,12 +380,12 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
{
if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways())
{
- if (!IsMoveAllowed()) return sal_False;
+ if (!IsMoveAllowed()) return false;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
- if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) return sal_False;
+ if (!IsCrookAllowed(true) && !IsCrookAllowed(false)) return false;
mpCurrentSdrDragMethod = new SdrDragCrook(*this);
}
} break;
@@ -395,7 +395,7 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
// SDRDRAG_MOVE
if((eDragHdl == HDL_MOVE) && !IsMoveAllowed())
{
- return sal_False;
+ return false;
}
else if(eDragHdl == HDL_GLUE)
{
@@ -411,9 +411,9 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
}
else
{
- if(!IsResizeAllowed(sal_True))
+ if(!IsResizeAllowed(true))
{
- return sal_False;
+ return false;
}
bool bSingleTextObjMark = false; // SJ: #i100490#
@@ -456,7 +456,7 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
{
// #i77187#
// do not allow move of polygon points if object is move or size protected
- return sal_False;
+ return false;
}
}
@@ -490,7 +490,7 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
bDragSpecial=false;
if (!IsMoveAllowed())
- return sal_False;
+ return false;
bFramDrag=true;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
@@ -520,7 +520,7 @@ void SdrDragView::MovDragObj(const Point& rPnt)
}
}
-sal_Bool SdrDragView::EndDragObj(sal_Bool bCopy)
+bool SdrDragView::EndDragObj(bool bCopy)
{
bool bRet(false);
@@ -587,7 +587,7 @@ sal_Bool SdrDragView::EndDragObj(sal_Bool bCopy)
}
bInsPolyPoint=false;
- SetInsertGluePoint(sal_False);
+ SetInsertGluePoint(false);
return bRet;
}
@@ -615,7 +615,7 @@ void SdrDragView::BrkDragObj()
pInsPointUndo->Undo(); // delete inserted glue point again
delete pInsPointUndo;
pInsPointUndo=NULL;
- SetInsertGluePoint(sal_False);
+ SetInsertGluePoint(false);
}
eDragHdl=HDL_MOVE;
@@ -628,9 +628,9 @@ bool SdrDragView::IsInsObjPointPossible() const
return pMarkedObj!=NULL && pMarkedObj->IsPolyObj();
}
-sal_Bool SdrDragView::ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, const Point& rPnt, sal_Bool bNewObj, OutputDevice* pOut)
+bool SdrDragView::ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point& rPnt, bool bNewObj, OutputDevice* pOut)
{
- sal_Bool bRet(sal_False);
+ bool bRet(false);
if(pMarkedObj && pMarkedObj->ISA(SdrPathObj))
{
@@ -652,11 +652,11 @@ sal_Bool SdrDragView::ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, con
if(bIdxZwang)
{
- mnInsPointNum = pMarkedPath->NbcInsPoint(nIdx, aPt, bNewObj, sal_True);
+ mnInsPointNum = pMarkedPath->NbcInsPoint(nIdx, aPt, bNewObj, true);
}
else
{
- mnInsPointNum = pMarkedPath->NbcInsPointOld(aPt, bNewObj, sal_True);
+ mnInsPointNum = pMarkedPath->NbcInsPointOld(aPt, bNewObj, true);
}
if(bClosed0 != pMarkedPath->IsClosedObj())
@@ -691,26 +691,26 @@ sal_Bool SdrDragView::ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, con
return bRet;
}
-sal_Bool SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd)
+bool SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd)
{
if(IsInsObjPoint())
{
sal_uInt32 nNextPnt(mnInsPointNum);
Point aPnt(aDragStat.GetNow());
- sal_Bool bOk=EndDragObj(sal_False);
- if (bOk==sal_True && eCmd!=SDRCREATE_FORCEEND)
+ bool bOk=EndDragObj(false);
+ if (bOk && eCmd!=SDRCREATE_FORCEEND)
{
// Ret=True means: Action is over.
- bOk=!(ImpBegInsObjPoint(sal_True, nNextPnt, aPnt, eCmd == SDRCREATE_NEXTOBJECT, pDragWin));
+ bOk=!(ImpBegInsObjPoint(true, nNextPnt, aPnt, eCmd == SDRCREATE_NEXTOBJECT, pDragWin));
}
return bOk;
- } else return sal_False;
+ } else return false;
}
-sal_Bool SdrDragView::IsInsGluePointPossible() const
+bool SdrDragView::IsInsGluePointPossible() const
{
- sal_Bool bRet=sal_False;
+ bool bRet=false;
if (IsInsGluePointMode() && AreObjectsMarked())
{
if (GetMarkedObjectCount()==1)
@@ -719,20 +719,20 @@ sal_Bool SdrDragView::IsInsGluePointPossible() const
const SdrObject* pObj=GetMarkedObjectByIndex(0);
if (!HAS_BASE(SdrEdgeObj,pObj))
{
- bRet=sal_True;
+ bRet=true;
}
}
else
{
- bRet=sal_True;
+ bRet=true;
}
}
return bRet;
}
-sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt)
+bool SdrDragView::BegInsGluePoint(const Point& rPnt)
{
- sal_Bool bRet=sal_False;
+ bool bRet=false;
SdrObject* pObj;
SdrPageView* pPV;
sal_uIntPtr nMarkNum;
@@ -761,7 +761,7 @@ sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt)
}
if (pHdl!=NULL && pHdl->GetKind()==HDL_GLUE && pHdl->GetObj()==pObj && pHdl->GetObjHdlNum()==nGlueId)
{
- SetInsertGluePoint(sal_True);
+ SetInsertGluePoint(true);
bRet=BegDragObj(rPnt,NULL,pHdl,0);
if (bRet)
{
@@ -770,7 +770,7 @@ sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt)
}
else
{
- SetInsertGluePoint(sal_False);
+ SetInsertGluePoint(false);
delete pInsPointUndo;
pInsPointUndo=NULL;
}
@@ -783,7 +783,7 @@ sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt)
else
{
// no glue points possible for this object (e. g. Edge)
- SetInsertGluePoint(sal_False);
+ SetInsertGluePoint(false);
delete pInsPointUndo;
pInsPointUndo=NULL;
}
@@ -825,7 +825,7 @@ void SdrDragView::HideDragObj()
-void SdrDragView::SetNoDragXorPolys(sal_Bool bOn)
+void SdrDragView::SetNoDragXorPolys(bool bOn)
{
if (IsNoDragXorPolys()!=bOn)
{
@@ -852,7 +852,7 @@ void SdrDragView::SetNoDragXorPolys(sal_Bool bOn)
}
}
-void SdrDragView::SetDragStripes(sal_Bool bOn)
+void SdrDragView::SetDragStripes(bool bOn)
{
if (mpCurrentSdrDragMethod && aDragStat.IsShown())
{
@@ -866,14 +866,14 @@ void SdrDragView::SetDragStripes(sal_Bool bOn)
}
}
-sal_Bool SdrDragView::IsOrthoDesired() const
+bool SdrDragView::IsOrthoDesired() const
{
if(mpCurrentSdrDragMethod && (IS_TYPE(SdrDragObjOwn, mpCurrentSdrDragMethod) || IS_TYPE(SdrDragResize, mpCurrentSdrDragMethod)))
{
return bOrthoDesiredOnMarked;
}
- return sal_False;
+ return false;
}
void SdrDragView::SetMarkHandles()
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index a2e509779fd4..29abc34bb9b5 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -120,9 +120,9 @@ SdrLayer* SdrEditView::InsertNewLayer(const OUString& rName, sal_uInt16 nPos)
#include <svx/svdogrp.hxx>
#include <svx/scene3d.hxx>
-sal_Bool SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const
+bool SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const
{
- sal_Bool bDelAll(sal_True);
+ bool bDelAll(true);
sal_uInt32 nObjAnz(pOL->GetObjCount());
for(sal_uInt32 nObjNum(nObjAnz); nObjNum > 0 && bDelAll;)
@@ -136,14 +136,14 @@ sal_Bool SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const
{
if(!ImpDelLayerCheck(pSubOL, nDelID))
{
- bDelAll = sal_False;
+ bDelAll = false;
}
}
else
{
if(pObj->GetLayer() != nDelID)
{
- bDelAll = sal_False;
+ bDelAll = false;
}
}
}
@@ -373,86 +373,86 @@ void SdrEditView::ModelHasChanged()
bPossibilitiesDirty=true;
}
-sal_Bool SdrEditView::IsResizeAllowed(sal_Bool bProp) const
+bool SdrEditView::IsResizeAllowed(bool bProp) const
{
ForcePossibilities();
- if (bResizeProtect) return sal_False;
+ if (bResizeProtect) return false;
if (bProp) return bResizePropAllowed;
return bResizeFreeAllowed;
}
-sal_Bool SdrEditView::IsRotateAllowed(sal_Bool b90Deg) const
+bool SdrEditView::IsRotateAllowed(bool b90Deg) const
{
ForcePossibilities();
- if (bMoveProtect) return sal_False;
+ if (bMoveProtect) return false;
if (b90Deg) return bRotate90Allowed;
return bRotateFreeAllowed;
}
-sal_Bool SdrEditView::IsMirrorAllowed(sal_Bool b45Deg, sal_Bool b90Deg) const
+bool SdrEditView::IsMirrorAllowed(bool b45Deg, bool b90Deg) const
{
ForcePossibilities();
- if (bMoveProtect) return sal_False;
+ if (bMoveProtect) return false;
if (b90Deg) return bMirror90Allowed;
if (b45Deg) return bMirror45Allowed;
return bMirrorFreeAllowed && !bMoveProtect;
}
-sal_Bool SdrEditView::IsTransparenceAllowed() const
+bool SdrEditView::IsTransparenceAllowed() const
{
ForcePossibilities();
return bTransparenceAllowed;
}
-sal_Bool SdrEditView::IsGradientAllowed() const
+bool SdrEditView::IsGradientAllowed() const
{
ForcePossibilities();
return bGradientAllowed;
}
-sal_Bool SdrEditView::IsShearAllowed() const
+bool SdrEditView::IsShearAllowed() const
{
ForcePossibilities();
- if (bResizeProtect) return sal_False;
+ if (bResizeProtect) return false;
return bShearAllowed;
}
-sal_Bool SdrEditView::IsEdgeRadiusAllowed() const
+bool SdrEditView::IsEdgeRadiusAllowed() const
{
ForcePossibilities();
return bEdgeRadiusAllowed;
}
-sal_Bool SdrEditView::IsCrookAllowed(sal_Bool bNoContortion) const
+bool SdrEditView::IsCrookAllowed(bool bNoContortion) const
{
// CrookMode missing here (no rotations allowed when shearing ...)
ForcePossibilities();
if (bNoContortion) {
- if (!bRotateFreeAllowed) return sal_False;
+ if (!bRotateFreeAllowed) return false;
return !bMoveProtect && bMoveAllowed;
} else {
return !bResizeProtect && bContortionPossible;
}
}
-sal_Bool SdrEditView::IsDistortAllowed(sal_Bool bNoContortion) const
+bool SdrEditView::IsDistortAllowed(bool bNoContortion) const
{
ForcePossibilities();
if (bNoContortion) {
- return sal_False;
+ return false;
} else {
return !bResizeProtect && bContortionPossible;
}
}
-sal_Bool SdrEditView::IsCombinePossible(sal_Bool bNoPolyPoly) const
+bool SdrEditView::IsCombinePossible(bool bNoPolyPoly) const
{
ForcePossibilities();
if (bNoPolyPoly) return bCombineNoPolyPolyPossible;
else return bCombinePossible;
}
-sal_Bool SdrEditView::IsDismantlePossible(sal_Bool bMakeLines) const
+bool SdrEditView::IsDismantlePossible(bool bMakeLines) const
{
ForcePossibilities();
if (bMakeLines) return bDismantleMakeLinesPossible;
@@ -597,8 +597,8 @@ void SdrEditView::CheckPossibilities()
bCombineNoPolyPolyPossible = bCombinePossible;
}
- if (!bDismantlePossible) bDismantlePossible = ImpCanDismantle(pObj, sal_False);
- if (!bDismantleMakeLinesPossible) bDismantleMakeLinesPossible = ImpCanDismantle(pObj, sal_True);
+ if (!bDismantlePossible) bDismantlePossible = ImpCanDismantle(pObj, false);
+ if (!bDismantleMakeLinesPossible) bDismantleMakeLinesPossible = ImpCanDismantle(pObj, true);
// check OrthoDesiredOnMarked
if (!bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) bOrthoDesiredOnMarked=true;
// check ImportMtf
@@ -953,19 +953,19 @@ void SdrEditView::CopyMarkedObj()
-sal_Bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions)
+bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions)
{
if ((nOptions & SDRINSERT_SETDEFLAYER)!=0) {
SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(aAktLayer,true);
if (nLayer==SDRLAYER_NOTFOUND) nLayer=0;
if (rPV.GetLockedLayers().IsSet(nLayer) || !rPV.GetVisibleLayers().IsSet(nLayer)) {
SdrObject::Free( pObj ); // Layer locked or invisible
- return sal_False;
+ return false;
}
pObj->NbcSetLayer(nLayer);
}
if ((nOptions & SDRINSERT_SETDEFATTR)!=0) {
- if (pDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(pDefaultStyleSheet, sal_False);
+ if (pDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(pDefaultStyleSheet, false);
pObj->SetMergedItemSet(aDefaultAttr);
}
if (!pObj->IsInserted()) {
@@ -983,10 +983,10 @@ sal_Bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_
if ((nOptions & SDRINSERT_ADDMARK)==0) UnmarkAllObj();
MarkObj(pObj,&rPV);
}
- return sal_True;
+ return true;
}
-void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark)
+void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, bool bMark)
{
if(IsTextEdit())
{
@@ -1016,7 +1016,7 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoReplaceObject(*pOldObj,*pNewObj));
if( IsObjMarked( pOldObj ) )
- MarkObj( pOldObj, &rPV, sal_True /*unmark!*/ );
+ MarkObj( pOldObj, &rPV, true /*unmark!*/ );
pOL->ReplaceObject(pNewObj,pOldObj->GetOrdNum());
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 4f3bd09846dc..9c1bcd1c03b9 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -67,7 +67,7 @@
-void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy)
+void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, bool bCopy)
{
DBG_ASSERT(!rRect.IsEmpty(),"SetMarkedObjRect() with an empty Rect does not make sense.");
if (rRect.IsEmpty()) return;
@@ -301,8 +301,8 @@ long SdrEditView::GetMarkedObjRotate() const
}
return nRetval;
- //sal_Bool b1st=sal_True;
- //sal_Bool bOk=sal_True;
+ //sal_Bool b1st=true;
+ //sal_Bool bOk=true;
//long nWink=0;
//sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
//for (sal_uIntPtr nm=0; nm<nMarkAnz && bOk; nm++) {
@@ -310,8 +310,8 @@ long SdrEditView::GetMarkedObjRotate() const
// SdrObject* pO=pM->GetMarkedSdrObj();
// long nWink2=pO->GetRotateAngle();
// if (b1st) nWink=nWink2;
- // else if (nWink2!=nWink) bOk=sal_False;
- // b1st=sal_False;
+ // else if (nWink2!=nWink) bOk=false;
+ // b1st=false;
//}
//if (!bOk) nWink=0;
//return nWink;
@@ -434,7 +434,7 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b
EndUndo();
}
-void SdrEditView::MirrorMarkedObjHorizontal(sal_Bool bCopy)
+void SdrEditView::MirrorMarkedObjHorizontal(bool bCopy)
{
Point aCenter(GetMarkedObjRect().Center());
Point aPt2(aCenter);
@@ -442,7 +442,7 @@ void SdrEditView::MirrorMarkedObjHorizontal(sal_Bool bCopy)
MirrorMarkedObj(aCenter,aPt2,bCopy);
}
-void SdrEditView::MirrorMarkedObjVertical(sal_Bool bCopy)
+void SdrEditView::MirrorMarkedObjVertical(bool bCopy)
{
Point aCenter(GetMarkedObjRect().Center());
Point aPt2(aCenter);
@@ -506,7 +506,7 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bo
}
void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad,
- SdrCrookMode eMode, sal_Bool bVertical, sal_Bool bNoContortion, sal_Bool bRotate, const Rectangle& rMarkRect)
+ SdrCrookMode eMode, bool bVertical, bool bNoContortion, bool bRotate, const Rectangle& rMarkRect)
{
SdrPathObj* pPath=PTR_CAST(SdrPathObj,pO);
bool bDone = false;
@@ -558,7 +558,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
// for all others or if bNoContortion
Point aCtr0(pO->GetSnapRect().Center());
Point aCtr1(aCtr0);
- sal_Bool bRotOk(sal_False);
+ bool bRotOk(false);
double nSin(0.0), nCos(1.0);
double nWink(0.0);
@@ -589,7 +589,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
Rectangle aMarkRect(GetMarkedObjRect());
const bool bUndo = IsUndoEnabled();
- bool bRotate=bNoContortion && eMode==SDRCROOK_ROTATE && IsRotateAllowed(sal_False);
+ bool bRotate=bNoContortion && eMode==SDRCROOK_ROTATE && IsRotateAllowed(false);
if( bUndo )
{
@@ -627,7 +627,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
EndUndo();
}
-void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion)
+void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion)
{
SdrPathObj* pPath = PTR_CAST(SdrPathObj, pO);
@@ -704,7 +704,7 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto
-void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /*bReplaceAll*/)
+void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool /*bReplaceAll*/)
{
// bReplaceAll has no effect here
Rectangle aAllSnapRect(GetMarkedObjRect());
@@ -725,10 +725,10 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /*
long n=((const SdrTransformRef2YItem*)pPoolItem)->GetValue();
SetRef2(Point(GetRef2().X(),n));
}
- long nAllPosX=0; sal_Bool bAllPosX=false;
- long nAllPosY=0; sal_Bool bAllPosY=false;
- long nAllWdt=0; sal_Bool bAllWdt=false;
- long nAllHgt=0; sal_Bool bAllHgt=false;
+ long nAllPosX=0; bool bAllPosX=false;
+ long nAllPosY=0; bool bAllPosY=false;
+ long nAllWdt=0; bool bAllWdt=false;
+ long nAllHgt=0; bool bAllHgt=false;
bool bDoIt=false;
if (rAttr.GetItemState(SDRATTR_ALLPOSITIONX,true,&pPoolItem)==SFX_ITEM_SET) {
nAllPosX=((const SdrAllPositionXItem*)pPoolItem)->GetValue();
@@ -790,7 +790,7 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /*
}
}
-void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool /*bOnlyHardAttr*/) const
+void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, bool /*bOnlyHardAttr*/) const
{
// bOnlyHardAttr has no effect here.
// TODO: Take into account the origin and PvPos.
@@ -806,7 +806,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool /*bO
bool bVisible = true, bVisibleDC = false;
SdrLayerID nLayerId=0; bool bLayerDC=false;
OUString aObjName;
- sal_Bool bObjNameDC=false,bObjNameSet=false;
+ bool bObjNameDC=false,bObjNameSet=false;
long nSnapPosX=0; bool bSnapPosXDC=false;
long nSnapPosY=0; bool bSnapPosYDC=false;
long nSnapWdt=0; bool bSnapWdtDC=false;
@@ -907,7 +907,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool /*bO
}
}
-SfxItemSet SdrEditView::GetAttrFromMarked(sal_Bool bOnlyHardAttr) const
+SfxItemSet SdrEditView::GetAttrFromMarked(bool bOnlyHardAttr) const
{
SfxItemSet aSet(pMod->GetItemPool());
MergeAttrFromMarked(aSet,bOnlyHardAttr);
@@ -922,7 +922,7 @@ SfxItemSet SdrEditView::GetAttrFromMarked(sal_Bool bOnlyHardAttr) const
return aSet;
}
-void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const
+void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, bool bOnlyHardAttr) const
{
sal_uInt32 nMarkAnz(GetMarkedObjectCount());
@@ -940,12 +940,12 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr)
if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, false))
rAttr.InvalidateItem(nWhich);
else
- rAttr.MergeValue(rSet.Get(nWhich), sal_True);
+ rAttr.MergeValue(rSet.Get(nWhich), true);
}
else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, false))
{
const SfxPoolItem& rItem = rSet.Get(nWhich);
- rAttr.MergeValue(rItem, sal_True);
+ rAttr.MergeValue(rItem, true);
}
nWhich = aIter.NextWhich();
@@ -953,7 +953,7 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr)
}
}
-void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
+void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, bool bReplaceAll)
{
if (AreObjectsMarked())
{
@@ -998,7 +998,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
}
// To make Undo reconstruct text attributes correctly after Format.Standard
- sal_Bool bHasEEItems=SearchOutlinerItems(rAttr,bReplaceAll);
+ bool bHasEEItems=SearchOutlinerItems(rAttr,bReplaceAll);
// save additional geometry information when paragraph or character attributes
// are changed and the geometrical shape of the text object might be changed
@@ -1198,7 +1198,7 @@ SfxStyleSheet* SdrEditView::GetStyleSheetFromMarked() const
return pRet;
}
-void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
+void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr)
{
if (AreObjectsMarked())
{
@@ -1233,12 +1233,12 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDo
-sal_Bool SdrEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
+bool SdrEditView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const
{
if(GetMarkedObjectCount())
{
rTargetSet.Put(GetAttrFromMarked(bOnlyHardAttr), false);
- return sal_True;
+ return true;
}
else
{
@@ -1246,11 +1246,11 @@ sal_Bool SdrEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAt
}
}
-sal_Bool SdrEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
+bool SdrEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll)
{
if (GetMarkedObjectCount()!=0) {
SetAttrToMarked(rSet,bReplaceAll);
- return sal_True;
+ return true;
} else {
return SdrMarkView::SetAttributes(rSet,bReplaceAll);
}
@@ -1265,11 +1265,11 @@ SfxStyleSheet* SdrEditView::GetStyleSheet() const
}
}
-sal_Bool SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
+bool SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr)
{
if (GetMarkedObjectCount()!=0) {
SetStyleSheetToMarked(pStyleSheet,bDontRemoveHardAttr);
- return sal_True;
+ return true;
} else {
return SdrMarkView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr);
}
@@ -1287,7 +1287,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
if (AreObjectsMarked())
{
- SfxItemSet aMarkAttr(GetAttrFromMarked(sal_False)); // because of AutoGrowHeight and corner radius
+ SfxItemSet aMarkAttr(GetAttrFromMarked(false)); // because of AutoGrowHeight and corner radius
Rectangle aRect(GetMarkedObjRect());
// restore position to that before calc hack
aRect -= GetGridOffset();
@@ -1370,7 +1370,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
}
SfxItemState eState=aMarkAttr.GetItemState(SDRATTR_TEXT_AUTOGROWWIDTH);
- sal_Bool bAutoGrow=((SdrTextAutoGrowWidthItem&)(aMarkAttr.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
+ bool bAutoGrow=((SdrTextAutoGrowWidthItem&)(aMarkAttr.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
if (eState==SFX_ITEM_DONTCARE) {
aRetSet.InvalidateItem(SID_ATTR_TRANSFORM_AUTOWIDTH);
} else if (eState==SFX_ITEM_SET) {
@@ -1497,7 +1497,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
long nShearAngle=0;
long nShearX=0;
long nShearY=0;
- sal_Bool bShearVert=sal_False;
+ bool bShearVert=false;
bool bChgPos=false;
bool bChgSiz=false;
@@ -1580,13 +1580,13 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
// AutoGrow
if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOWIDTH,true,&pPoolItem)) {
- sal_Bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
+ bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
aSetAttr.Put(SdrTextAutoGrowWidthItem(bAutoGrow));
bSetAttr=true;
}
if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOHEIGHT,true,&pPoolItem)) {
- sal_Bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
+ bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
aSetAttr.Put(SdrTextAutoGrowHeightItem(bAutoGrow));
bSetAttr=true;
}
@@ -1603,7 +1603,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
BegUndo(ImpGetResStr(STR_EditTransform),GetDescriptionOfMarkedObjects());
if (bSetAttr) {
- SetAttrToMarked(aSetAttr,sal_False);
+ SetAttrToMarked(aSetAttr,false);
}
// change size and height
@@ -1742,16 +1742,16 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
-sal_Bool SdrEditView::IsAlignPossible() const
+bool SdrEditView::IsAlignPossible() const
{ // at least two selected objects, at least one of them movable
ForcePossibilities();
sal_uIntPtr nAnz=GetMarkedObjectCount();
- if (nAnz==0) return sal_False; // nothing selected!
+ if (nAnz==0) return false; // nothing selected!
if (nAnz==1) return bMoveAllowed; // align single object to page
return bOneOrMoreMovable; // otherwise: MarkCount>=2
}
-void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_Bool bBoundRects)
+void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, bool bBoundRects)
{
if (eHor==SDRHALIGN_NONE && eVert==SDRVALIGN_NONE)
return;
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 0a3bb17adc4a..2c755b046c10 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -564,14 +564,14 @@ void SdrEditView::ImpCopyAttributes(const SdrObject* pSource, SdrObject* pDest)
pDest->SetMergedItemSet(aSet);
pDest->NbcSetLayer(pSource->GetLayer());
- pDest->NbcSetStyleSheet(pSource->GetStyleSheet(), sal_True);
+ pDest->NbcSetStyleSheet(pSource->GetStyleSheet(), true);
}
}
-sal_Bool SdrEditView::ImpCanConvertForCombine1(const SdrObject* pObj) const
+bool SdrEditView::ImpCanConvertForCombine1(const SdrObject* pObj) const
{
// new condition IsLine() to be able to combine simple Lines
- sal_Bool bIsLine(sal_False);
+ bool bIsLine(false);
const SdrPathObj* pPath = PTR_CAST(SdrPathObj,pObj);
@@ -586,7 +586,7 @@ sal_Bool SdrEditView::ImpCanConvertForCombine1(const SdrObject* pObj) const
return (aInfo.bCanConvToPath || aInfo.bCanConvToPoly || bIsLine);
}
-sal_Bool SdrEditView::ImpCanConvertForCombine(const SdrObject* pObj) const
+bool SdrEditView::ImpCanConvertForCombine(const SdrObject* pObj) const
{
SdrObjList* pOL = pObj->GetSubList();
@@ -601,7 +601,7 @@ sal_Bool SdrEditView::ImpCanConvertForCombine(const SdrObject* pObj) const
// all members of a group have to be convertible
if(!ImpCanConvertForCombine1(pObj1))
{
- return sal_False;
+ return false;
}
}
}
@@ -609,14 +609,14 @@ sal_Bool SdrEditView::ImpCanConvertForCombine(const SdrObject* pObj) const
{
if(!ImpCanConvertForCombine1(pObj))
{
- return sal_False;
+ return false;
}
}
- return sal_True;
+ return true;
}
-basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon1(const SdrObject* pObj, sal_Bool bCombine) const
+basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon1(const SdrObject* pObj, bool bCombine) const
{
basegfx::B2DPolyPolygon aRetval;
SdrPathObj* pPath = PTR_CAST(SdrPathObj, pObj);
@@ -665,7 +665,7 @@ basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon1(const SdrObject* pObj, s
return aRetval;
}
-basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon(const SdrObject* pObj, sal_Bool bCombine) const
+basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon(const SdrObject* pObj, bool bCombine) const
{
SdrObjList* pOL = pObj->GetSubList();
@@ -1020,8 +1020,8 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
// since now basegfx::tools::adaptiveSubdivide() is used, it is no longer
// necessary to use ConvertMarkedToPolyObj which will subdivide curves using the old
// mechanisms. In a next step the polygon clipper will even be able to clip curves...
- // ConvertMarkedToPolyObj(sal_True);
- ConvertMarkedToPathObj(sal_True);
+ // ConvertMarkedToPolyObj(true);
+ ConvertMarkedToPathObj(true);
OSL_ENSURE(AreObjectsMarked(), "no more objects selected after preparations (!)");
for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++)
@@ -1139,7 +1139,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
pInsOL->InsertObject(pPath, nInsPos, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath));
- MarkObj(pPath, pInsPV, sal_False, sal_True);
+ MarkObj(pPath, pInsPV, false, true);
}
aRemove.ForceSort();
@@ -1174,7 +1174,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
}
}
-void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly)
+void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly)
{
// #105899# Start of Combine-Undo put to front, else ConvertMarkedToPolyObj would
// create a 2nd Undo-action and Undo-Comment.
@@ -1195,8 +1195,8 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly)
// using ConvertMarkedToPathObj without changing the previous fix.
// #i21250#
- // Instead of simply passing sal_True as LineToArea, use bNoPolyPoly as info
- // if this command is a 'Combine' or a 'Connect' command. On Connect it's sal_True.
+ // Instead of simply passing true as LineToArea, use bNoPolyPoly as info
+ // if this command is a 'Combine' or a 'Connect' command. On Connect it's true.
// To not concert line segments with a set line width to polygons in that case,
// use this info. Do not convert LineToArea on Connect commands.
// ConvertMarkedToPathObj(!bNoPolyPoly);
@@ -1207,9 +1207,9 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly)
// used for merge.
// LineToArea is never necessary, both commands are able to take over the
// set line style and to display it correctly. Thus, i will use a
- // ConvertMarkedToPathObj with a sal_False in any case. Only drawback is that
+ // ConvertMarkedToPathObj with a false in any case. Only drawback is that
// simple polygons will be changed to curves, but with no information loss.
- ConvertMarkedToPathObj(sal_False /* bLineToArea */);
+ ConvertMarkedToPathObj(false /* bLineToArea */);
// continue as before
basegfx::B2DPolyPolygon aPolyPolygon;
@@ -1243,7 +1243,7 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly)
// unfortunately ConvertMarkedToPathObj has converted all
// involved polygon data to curve segments, even if not necessary.
// It is better to try to reduce to more simple polygons.
- basegfx::B2DPolyPolygon aTmpPoly(basegfx::tools::simplifyCurveSegments(ImpGetPolyPolygon(pObj, sal_True)));
+ basegfx::B2DPolyPolygon aTmpPoly(basegfx::tools::simplifyCurveSegments(ImpGetPolyPolygon(pObj, true)));
aPolyPolygon.insert(0L, aTmpPoly);
if(!pInsOL)
@@ -1332,7 +1332,7 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly)
// in the UNDO there is no problem, but as soon as they get deleted, the
// MarkList will contain deleted objects -> GPF.
UnmarkAllObj(pInsPV);
- MarkObj(pPath, pInsPV, sal_False, sal_True);
+ MarkObj(pPath, pInsPV, false, true);
}
// build an UndoComment from the objects actually used
@@ -1350,15 +1350,15 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly)
// Dismantle
-sal_Bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon, sal_Bool bMakeLines) const
+bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon, bool bMakeLines) const
{
- sal_Bool bCan(sal_False);
+ bool bCan(false);
const sal_uInt32 nPolygonCount(rPpolyPolygon.count());
if(nPolygonCount >= 2L)
{
// #i69172# dismantle makes sense with 2 or more polygons in a polyPolygon
- bCan = sal_True;
+ bCan = true;
}
else if(bMakeLines && 1L == nPolygonCount)
{
@@ -1368,17 +1368,17 @@ sal_Bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolyg
if(nPointCount > 2L)
{
- bCan = sal_True;
+ bCan = true;
}
}
return bCan;
}
-sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines) const
+bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, bool bMakeLines) const
{
bool bOtherObjs(false); // true=objects other than PathObj's existent
- bool bMin1PolyPoly(false); // sal_True=at least 1 PolyPolygon with more than one Polygon existent
+ bool bMin1PolyPoly(false); // true=at least 1 PolyPolygon with more than one Polygon existent
SdrObjList* pOL = pObj->GetSubList();
if(pOL)
@@ -1452,7 +1452,7 @@ sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines
return bMin1PolyPoly && !bOtherObjs;
}
-void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, sal_Bool bMakeLines)
+void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, bool bMakeLines)
{
const SdrPathObj* pSrcPath = PTR_CAST(SdrPathObj, pObj);
const SdrObjCustomShape* pCustomShape = PTR_CAST(SdrObjCustomShape, pObj);
@@ -1480,7 +1480,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
rOL.InsertObject(pPath, rPos, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, true));
- MarkObj(pPath, pPV, sal_False, sal_True);
+ MarkObj(pPath, pPV, false, true);
rPos++;
}
else
@@ -1515,7 +1515,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
rOL.InsertObject(pPath, rPos, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, true));
- MarkObj(pPath, pPV, sal_False, sal_True);
+ MarkObj(pPath, pPV, false, true);
rPos++;
}
}
@@ -1551,7 +1551,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
rOL.InsertObject(pCandidate, rPos, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pCandidate, true));
- MarkObj(pCandidate, pPV, sal_False, sal_True);
+ MarkObj(pCandidate, pPV, false, true);
if(pCustomShape->HasText() && !pCustomShape->IsTextPath())
{
@@ -1596,14 +1596,14 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
rOL.InsertObject(pTextObj, rPos + 1, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pTextObj, true));
- MarkObj(pTextObj, pPV, sal_False, sal_True);
+ MarkObj(pTextObj, pPV, false, true);
}
}
}
}
}
-void SdrEditView::DismantleMarkedObjects(sal_Bool bMakeLines)
+void SdrEditView::DismantleMarkedObjects(bool bMakeLines)
{
// temporary MarkList
SdrMarkList aRemoveMerker;
@@ -1844,7 +1844,7 @@ void SdrEditView::UnGroupMarked()
nDstCnt++;
// No SortCheck when inserting into MarkList, because that would
// provoke a RecalcOrdNums() each time because of pObj->GetOrdNum():
- aNewMark.InsertEntry(SdrMark(pObj,pM->GetPageView()),sal_False);
+ aNewMark.InsertEntry(SdrMark(pObj,pM->GetPageView()),false);
}
if( bUndo )
@@ -1875,7 +1875,7 @@ void SdrEditView::UnGroupMarked()
if (nCount!=0)
{
- GetMarkedObjectListWriteAccess().Merge(aNewMark,sal_True); // Because of the sorting above, aNewMark is reversed
+ GetMarkedObjectListWriteAccess().Merge(aNewMark,true); // Because of the sorting above, aNewMark is reversed
MarkListHasChanged();
}
}
@@ -1884,7 +1884,7 @@ void SdrEditView::UnGroupMarked()
// ConvertToPoly
-SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bool bLineToArea)
+SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, bool bPath, bool bLineToArea)
{
SdrObject* pNewObj = pObj->ConvertToPolyObj(bPath, bLineToArea);
if (pNewObj!=NULL)
@@ -1906,7 +1906,7 @@ SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bo
return pNewObj;
}
-void SdrEditView::ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea)
+void SdrEditView::ImpConvertTo(bool bPath, bool bLineToArea)
{
bool bMrkChg=false;
if (AreObjectsMarked()) {
@@ -1959,14 +1959,14 @@ void SdrEditView::ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea)
}
}
-void SdrEditView::ConvertMarkedToPathObj(sal_Bool bLineToArea)
+void SdrEditView::ConvertMarkedToPathObj(bool bLineToArea)
{
- ImpConvertTo(sal_True, bLineToArea);
+ ImpConvertTo(true, bLineToArea);
}
-void SdrEditView::ConvertMarkedToPolyObj(sal_Bool bLineToArea)
+void SdrEditView::ConvertMarkedToPolyObj(bool bLineToArea)
{
- ImpConvertTo(sal_False, bLineToArea);
+ ImpConvertTo(false, bLineToArea);
}
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 9e42ed049675..78f472215f07 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -100,7 +100,7 @@ SdrObjEditView::~SdrObjEditView()
-sal_Bool SdrObjEditView::IsAction() const
+bool SdrObjEditView::IsAction() const
{
return IsMacroObj() || SdrGlueEditView::IsAction();
}
@@ -214,7 +214,7 @@ void SdrObjEditView::ModelHasChanged()
pTextEditOutliner->SetControlWord(nStat);
Rectangle aAnchorRect;
pTextObj->TakeTextAnchorRect(aAnchorRect);
- pTextObj->ImpSetContourPolygon(*pTextEditOutliner,aAnchorRect, sal_True);
+ pTextObj->ImpSetContourPolygon(*pTextEditOutliner,aAnchorRect, true);
}
for (sal_uIntPtr nOV=0; nOV<nOutlViewAnz; nOV++) {
OutlinerView* pOLV=pTextEditOutliner->GetView(nOV);
@@ -518,17 +518,17 @@ SdrUndoManager* SdrObjEditView::getSdrUndoManagerForEnhancedTextEdit() const
return GetModel() ? dynamic_cast< SdrUndoManager* >(GetModel()->GetSdrUndoManager()) : 0;
}
-sal_Bool SdrObjEditView::SdrBeginTextEdit(
+bool SdrObjEditView::SdrBeginTextEdit(
SdrObject* pObj, SdrPageView* pPV, Window* pWin,
- sal_Bool bIsNewObj, SdrOutliner* pGivenOutliner,
+ bool bIsNewObj, SdrOutliner* pGivenOutliner,
OutlinerView* pGivenOutlinerView,
- sal_Bool bDontDeleteOutliner, sal_Bool bOnlyOneView,
- sal_Bool bGrabFocus)
+ bool bDontDeleteOutliner, bool bOnlyOneView,
+ bool bGrabFocus)
{
SdrEndTextEdit();
if( dynamic_cast< SdrTextObj* >( pObj ) == 0 )
- return sal_False; // currently only possible with text objects
+ return false; // currently only possible with text objects
if(bGrabFocus && pWin)
{
@@ -627,10 +627,10 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() );
DBG_ASSERT( pTextObj, "svx::SdrObjEditView::BegTextEdit(), no text object?" );
if( !pTextObj )
- return sal_False;
+ return false;
// switch off any running TextAnimations
- pTextObj->SetTextAnimationAllowed(sal_False);
+ pTextObj->SetTextAnimationAllowed(false);
// remember old cursor
if (pTextEditOutliner->GetViewCount()!=0)
@@ -648,7 +648,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
Rectangle aTextRect;
Rectangle aAnchorRect;
pTextObj->TakeTextRect(*pTextEditOutliner, aTextRect, true,
- &aAnchorRect /* Give sal_True here, not sal_False */);
+ &aAnchorRect /* Give true here, not false */);
if ( !pTextObj->IsContourTextFrame() )
{
@@ -670,7 +670,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
aMinTextEditArea.Move(aPvOfs.X(),aPvOfs.Y());
pTextEditCursorMerker=pWin->GetCursor();
- aHdl.SetMoveOutside(sal_True);
+ aHdl.SetMoveOutside(true);
// #i72757#
// Since IsMarkHdlWhenTextEdit() is ignored, it is necessary
@@ -690,8 +690,8 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
if( i2 == nCount )
pTextEditOutliner->InsertView(pTextEditOutlinerView,0);
- aHdl.SetMoveOutside(sal_False);
- aHdl.SetMoveOutside(sal_True);
+ aHdl.SetMoveOutside(false);
+ aHdl.SetMoveOutside(true);
// register all windows as OutlinerViews with the Outliner
if(!bOnlyOneView)
@@ -770,7 +770,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
}
}
- return sal_True; // ran fine, let TextEdit run now
+ return true; // ran fine, let TextEdit run now
}
else
{
@@ -810,12 +810,12 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
mxTextEditObj.reset(0);
pTextEditPV=NULL;
pTextEditWin=NULL;
- aHdl.SetMoveOutside(sal_False);
+ aHdl.SetMoveOutside(false);
- return sal_False;
+ return false;
}
-SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
+SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
{
SdrEndTextEditKind eRet=SDRENDTEXTEDIT_UNCHANGED;
SdrTextObj* pTEObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() );
@@ -886,7 +886,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
if (pTEOutliner!=NULL)
{
- sal_Bool bModified=pTEOutliner->IsModified();
+ bool bModified=pTEOutliner->IsModified();
if (pTEOutlinerView!=NULL)
{
pTEOutlinerView->HideCursor();
@@ -992,7 +992,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
// Switch on any TextAnimation again after TextEdit
if(pTEObj->ISA(SdrTextObj))
{
- ((SdrTextObj*)pTEObj)->SetTextAnimationAllowed(sal_True);
+ ((SdrTextObj*)pTEObj)->SetTextAnimationAllowed(true);
}
// #i72757#
@@ -1036,7 +1036,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
if (pTEWin!=NULL) {
pTEWin->SetCursor(pTECursorMerker);
}
- aHdl.SetMoveOutside(sal_False);
+ aHdl.SetMoveOutside(false);
if (eRet!=SDRENDTEXTEDIT_UNCHANGED)
{
GetMarkedObjectListWriteAccess().SetNameDirty();
@@ -1079,7 +1079,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
}
-// info about TextEdit. Default is sal_False.
+// info about TextEdit. Default is false.
bool SdrObjEditView::IsTextEdit() const
{
return mxTextEditObj.is();
@@ -1126,9 +1126,9 @@ void SdrObjEditView::SetTextEditWin(Window* pWin)
}
}
-sal_Bool SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const
+bool SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const
{
- sal_Bool bOk=sal_False;
+ bool bOk=false;
if(mxTextEditObj.is())
{
nTol=ImpGetHitTolLogic(nTol,NULL);
@@ -1163,9 +1163,9 @@ sal_Bool SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const
return bOk;
}
-sal_Bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const
+bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const
{
- sal_Bool bOk=sal_False;
+ bool bOk=false;
if(mxTextEditObj.is())
{
SdrTextObj* pText= dynamic_cast<SdrTextObj*>(mxTextEditObj.get());
@@ -1210,7 +1210,7 @@ sal_Bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
- return sal_True;
+ return true;
}
}
return SdrGlueEditView::KeyInput(rKEvt,pWin);
@@ -1219,7 +1219,7 @@ sal_Bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
sal_Bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
{
if (pTextEditOutlinerView!=NULL) {
- sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode();
+ bool bPostIt=pTextEditOutliner->IsInSelectionMode();
if (!bPostIt) {
Point aPt(rMEvt.GetPosPixel());
if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
@@ -1244,7 +1244,7 @@ sal_Bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
- return sal_True;
+ return true;
}
}
}
@@ -1254,7 +1254,7 @@ sal_Bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
sal_Bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
{
if (pTextEditOutlinerView!=NULL) {
- sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode();
+ bool bPostIt=pTextEditOutliner->IsInSelectionMode();
if (!bPostIt) {
Point aPt(rMEvt.GetPosPixel());
if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
@@ -1275,7 +1275,7 @@ sal_Bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
- return sal_True;
+ return true;
}
}
}
@@ -1285,8 +1285,8 @@ sal_Bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
sal_Bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
{
if (pTextEditOutlinerView!=NULL) {
- sal_Bool bSelMode=pTextEditOutliner->IsInSelectionMode();
- sal_Bool bPostIt=bSelMode;
+ bool bSelMode=pTextEditOutliner->IsInSelectionMode();
+ bool bPostIt=bSelMode;
if (!bPostIt) {
Point aPt(rMEvt.GetPosPixel());
if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
@@ -1307,7 +1307,7 @@ sal_Bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
- return sal_True;
+ return true;
}
}
}
@@ -1320,7 +1320,7 @@ sal_Bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin)
if (pTextEditOutlinerView!=NULL)
{
if (rCEvt.GetCommand()==COMMAND_STARTDRAG) {
- sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode() || !rCEvt.IsMouseEvent();
+ bool bPostIt=pTextEditOutliner->IsInSelectionMode() || !rCEvt.IsMouseEvent();
if (!bPostIt && rCEvt.IsMouseEvent()) {
Point aPt(rCEvt.GetMousePosPixel());
if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
@@ -1344,13 +1344,13 @@ sal_Bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin)
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
- return sal_True;
+ return true;
}
}
else
{
pTextEditOutlinerView->Command(rCEvt);
- return sal_True;
+ return true;
}
}
return SdrGlueEditView::Command(rCEvt,pWin);
@@ -1358,9 +1358,9 @@ sal_Bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin)
-sal_Bool SdrObjEditView::ImpIsTextEditAllSelected() const
+bool SdrObjEditView::ImpIsTextEditAllSelected() const
{
- sal_Bool bRet=sal_False;
+ bool bRet=false;
if (pTextEditOutliner!=NULL && pTextEditOutlinerView!=NULL)
{
if(SdrTextObj::HasTextImpl( pTextEditOutliner ) )
@@ -1372,18 +1372,18 @@ sal_Bool SdrObjEditView::ImpIsTextEditAllSelected() const
if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==(nParaAnz-1))
{
if( pTextEditOutliner->GetText(pLastPara).getLength() == aESel.nEndPos )
- bRet = sal_True;
+ bRet = true;
}
// in case the selection was done backwards
if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==(nParaAnz-1))
{
if(pTextEditOutliner->GetText(pLastPara).getLength() == aESel.nStartPos)
- bRet = sal_True;
+ bRet = true;
}
}
else
{
- bRet=sal_True;
+ bRet=true;
}
}
return bRet;
@@ -1435,11 +1435,11 @@ sal_uInt16 SdrObjEditView::GetScriptType() const
return nScriptType;
}
-sal_Bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
+bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const
{
if( mxSelectionController.is() )
if( mxSelectionController->GetAttributes( rTargetSet, bOnlyHardAttr ) )
- return sal_True;
+ return true;
if(IsTextEdit())
{
@@ -1468,7 +1468,7 @@ sal_Bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHar
MergeNotPersistAttrFromMarked(rTargetSet, bOnlyHardAttr);
}
- return sal_True;
+ return true;
}
else
{
@@ -1476,11 +1476,11 @@ sal_Bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHar
}
}
-sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
+bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll)
{
- sal_Bool bRet=sal_False;
+ bool bRet=false;
bool bTextEdit=pTextEditOutlinerView!=NULL && mxTextEditObj.is();
- sal_Bool bAllTextSelected=ImpIsTextEditAllSelected();
+ bool bAllTextSelected=ImpIsTextEditAllSelected();
const SfxItemSet* pSet=&rSet;
if (!bTextEdit)
@@ -1521,7 +1521,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace
}
#endif
- sal_Bool bOnlyEEItems;
+ bool bOnlyEEItems;
bool bNoEEItems=!SearchOutlinerItems(*pSet,bReplaceAll,&bOnlyEEItems);
// everything selected? -> attributes to the border, too
// if no EEItems, attributes to the border only
@@ -1556,7 +1556,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace
mxTextEditObj->SetMergedItemSetAndBroadcast(*pSet, bReplaceAll);
FlushComeBackTimer(); // to set ModeHasChanged immediately
- bRet=sal_True;
+ bRet=true;
}
}
else if (!bOnlyEEItems)
@@ -1601,7 +1601,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace
}
}
FlushComeBackTimer();
- bRet=sal_True;
+ bRet=true;
}
if(!bNoEEItems)
{
@@ -1618,7 +1618,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace
ImpMakeTextCursorAreaVisible();
}
- bRet=sal_True;
+ bRet=true;
}
return bRet;
}
@@ -1644,12 +1644,12 @@ SfxStyleSheet* SdrObjEditView::GetStyleSheet() const
return pSheet;
}
-sal_Bool SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
+bool SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr)
{
if( mxSelectionController.is() )
{
if( mxSelectionController->SetStyleSheet( pStyleSheet, bDontRemoveHardAttr ) )
- return sal_True;
+ return true;
}
// if we are currently in edit mode we must also set the stylesheet
@@ -1697,7 +1697,7 @@ void SdrObjEditView::DeleteWindowFromPaintView(OutputDevice* pOldWin)
}
}
-sal_Bool SdrObjEditView::IsTextEditInSelectionMode() const
+bool SdrObjEditView::IsTextEditInSelectionMode() const
{
return pTextEditOutliner!=NULL && pTextEditOutliner->IsInSelectionMode();
}
@@ -1706,9 +1706,9 @@ sal_Bool SdrObjEditView::IsTextEditInSelectionMode() const
// MacroMode
-sal_Bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin)
+bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin)
{
- sal_Bool bRet=sal_False;
+ bool bRet=false;
BrkMacroObj();
if (pObj!=NULL && pPV!=NULL && pWin!=NULL && pObj->HasMacro()) {
nTol=ImpGetHitTolLogic(nTol,NULL);
@@ -1767,7 +1767,7 @@ void SdrObjEditView::MovMacroObj(const Point& rPnt)
aHitRec.pPageView=pMacroPV;
aHitRec.bDown=bMacroDown;
aHitRec.pOut=pMacroWin;
- sal_Bool bDown=pMacroObj->IsMacroHit(aHitRec);
+ bool bDown=pMacroObj->IsMacroHit(aHitRec);
if (bDown) ImpMacroDown(rPnt);
else ImpMacroUp(rPnt);
}
@@ -1783,7 +1783,7 @@ void SdrObjEditView::BrkMacroObj()
}
}
-sal_Bool SdrObjEditView::EndMacroObj()
+bool SdrObjEditView::EndMacroObj()
{
if (pMacroObj!=NULL && bMacroDown) {
ImpMacroUp(aMacroDownPos);
@@ -1802,7 +1802,7 @@ sal_Bool SdrObjEditView::EndMacroObj()
return bRet;
} else {
BrkMacroObj();
- return sal_False;
+ return false;
}
}
@@ -2009,7 +2009,7 @@ bool SdrObjEditView::TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFor
}
else
{
- const sal_Bool bOnlyHardAttr = sal_False;
+ const bool bOnlyHardAttr = false;
rFormatSet->Put( GetAttrFromMarked(bOnlyHardAttr) );
}
return true;
@@ -2110,7 +2110,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar
if( !bTextOnly )
{
SfxItemSet aPaintSet( CreatePaintSet( GetFormatRangeImpl(false), *rShapeSet.GetPool(), rFormatSet, rShapeSet, bNoCharacterFormats, bNoParagraphFormats ) );
- const sal_Bool bReplaceAll = sal_False;
+ const bool bReplaceAll = false;
SetAttrToMarked(aPaintSet, bReplaceAll);
}
@@ -2138,7 +2138,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar
if( !aSel.HasRange() )
pOLV->SetSelection( rEditEngine.GetWord( aSel, com::sun::star::i18n::WordType::DICTIONARY_WORD ) );
- const sal_Bool bRemoveParaAttribs = !bNoParagraphFormats;
+ const bool bRemoveParaAttribs = !bNoParagraphFormats;
pOLV->RemoveAttribsKeepLanguages( bRemoveParaAttribs );
SfxItemSet aSet( pOLV->GetAttribs() );
SfxItemSet aPaintSet( CreatePaintSet(GetFormatRangeImpl(true), *aSet.GetPool(), rFormatSet, aSet, bNoCharacterFormats, bNoParagraphFormats ) );
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 6826c06a5d5b..27f68587d6f7 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -197,9 +197,9 @@ void OLEObjCache::RemoveObj(SdrOle2Obj* pObj)
erase( it );
}
-sal_Bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj)
+bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj)
{
- sal_Bool bUnloaded = sal_False;
+ bool bUnloaded = false;
if (pObj)
{
//#i80528# The old mechanism is completely useless, only taking into account if
@@ -460,10 +460,10 @@ namespace sdr
-sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal_Bool* pbOnlyEE)
+bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnlyEE)
{
- sal_Bool bHas=sal_False;
- sal_Bool bOnly=sal_True;
+ bool bHas=false;
+ bool bOnly=true;
bool bLookOnly=pbOnlyEE!=NULL;
SfxWhichIter aIter(rSet);
sal_uInt16 nWhich=aIter.FirstWhich();
@@ -473,12 +473,12 @@ sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal
// Disabled and DontCare are regarded as holes in the Which range.
SfxItemState eState=rSet.GetItemState(nWhich);
if ((eState==SFX_ITEM_DEFAULT && bInklDefaults) || eState==SFX_ITEM_SET) {
- if (nWhich<EE_ITEMS_START || nWhich>EE_ITEMS_END) bOnly=sal_False;
- else bHas=sal_True;
+ if (nWhich<EE_ITEMS_START || nWhich>EE_ITEMS_END) bOnly=false;
+ else bHas=true;
}
nWhich=aIter.NextWhich();
}
- if (!bHas) bOnly=sal_False;
+ if (!bHas) bOnly=false;
if (pbOnlyEE!=NULL) *pbOnlyEE=bOnly;
return bHas;
}
@@ -572,7 +572,7 @@ void SvdProgressInfo::Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount
nObjCount = _nObjCount;
}
-sal_Bool SvdProgressInfo::ReportActions( sal_uIntPtr nAnzActions )
+bool SvdProgressInfo::ReportActions( sal_uIntPtr nAnzActions )
{
nSumCurAction += nAnzActions;
nCurAction += nAnzActions;
@@ -582,7 +582,7 @@ sal_Bool SvdProgressInfo::ReportActions( sal_uIntPtr nAnzActions )
return pLink->Call(NULL) == 1L;
}
-sal_Bool SvdProgressInfo::ReportInserts( sal_uIntPtr nAnzInserts )
+bool SvdProgressInfo::ReportInserts( sal_uIntPtr nAnzInserts )
{
nSumCurAction += nAnzInserts;
nCurInsert += nAnzInserts;
@@ -590,7 +590,7 @@ sal_Bool SvdProgressInfo::ReportInserts( sal_uIntPtr nAnzInserts )
return pLink->Call(NULL) == 1L;
}
-sal_Bool SvdProgressInfo::ReportRescales( sal_uIntPtr nAnzRescales )
+bool SvdProgressInfo::ReportRescales( sal_uIntPtr nAnzRescales )
{
nSumCurAction += nAnzRescales;
return pLink->Call(NULL) == 1L;
@@ -606,7 +606,7 @@ void SvdProgressInfo::SetInsertCount( sal_uIntPtr _nInsertCount )
nInsertCount = _nInsertCount;
}
-sal_Bool SvdProgressInfo::SetNextObject()
+bool SvdProgressInfo::SetNextObject()
{
nActionCount = 0;
nCurAction = 0;
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 62aa11fca68a..d44d2be72d74 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -47,7 +47,7 @@ SdrGlueEditView::~SdrGlueEditView()
-void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
+void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
{
sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
@@ -94,37 +94,40 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst
static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*, const void*)
{
sal_uInt16& nRet=*(sal_uInt16*)pnRet;
- sal_Bool& bFirst=*(sal_Bool*)pbFirst;
+ bool& bFirst=*(bool*)pbFirst;
if (nRet!=FUZZY) {
- sal_uInt16 nEsc=rGP.GetEscDir();
- sal_Bool bOn=(nEsc & *(sal_uInt16*)pnThisEsc)!=0;
- if (bFirst) { nRet=bOn; bFirst=sal_False; }
- else if (nRet!=bOn) nRet=FUZZY;
+ sal_uInt16 nEsc = rGP.GetEscDir();
+ bool bOn = (nEsc & *(sal_uInt16*)pnThisEsc) != 0;
+ if (bFirst) {
+ nRet = bOn ? 1 : 0;
+ bFirst = false;
+ }
+ else if (nRet != (bOn ? 1 : 0)) nRet=FUZZY;
}
}
TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const
{
ForceUndirtyMrkPnt();
- sal_Bool bFirst=sal_True;
+ bool bFirst=true;
sal_uInt16 nRet=0;
- ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,sal_True,&bFirst,&nThisEsc,&nRet);
+ ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,true,&bFirst,&nThisEsc,&nRet);
return (TRISTATE)nRet;
}
static void ImpSetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pnThisEsc, const void* pbOn, const void*, const void*, const void*)
{
sal_uInt16 nEsc=rGP.GetEscDir();
- if (*(sal_Bool*)pbOn) nEsc|=*(sal_uInt16*)pnThisEsc;
+ if (*(bool*)pbOn) nEsc|=*(sal_uInt16*)pnThisEsc;
else nEsc&=~*(sal_uInt16*)pnThisEsc;
rGP.SetEscDir(nEsc);
}
-void SdrGlueEditView::SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bOn)
+void SdrGlueEditView::SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, bool bOn)
{
ForceUndirtyMrkPnt();
BegUndo(ImpGetResStr(STR_EditSetGlueEscDir),GetDescriptionOfMarkedGluePoints());
- ImpDoMarkedGluePoints(ImpSetEscDir,sal_False,&nThisEsc,&bOn);
+ ImpDoMarkedGluePoints(ImpSetEscDir,false,&nThisEsc,&bOn);
EndUndo();
}
@@ -133,10 +136,10 @@ void SdrGlueEditView::SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bO
static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*, const void*)
{
sal_uInt16& nRet=*(sal_uInt16*)pnRet;
- sal_Bool& bFirst=*(sal_Bool*)pbFirst;
+ bool& bFirst=*(bool*)pbFirst;
if (nRet!=FUZZY) {
bool bOn=rGP.IsPercent();
- if (bFirst) { nRet=sal_uInt16(bOn); bFirst=sal_False; }
+ if (bFirst) { nRet=sal_uInt16(bOn); bFirst=false; }
else if ((nRet!=0)!=bOn) nRet=FUZZY;
}
}
@@ -144,24 +147,24 @@ static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const vo
TRISTATE SdrGlueEditView::IsMarkedGluePointsPercent() const
{
ForceUndirtyMrkPnt();
- sal_Bool bFirst=sal_True;
+ bool bFirst=true;
sal_uInt16 nRet=sal_True;
- ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,sal_True,&bFirst,&nRet);
+ ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,true,&bFirst,&nRet);
return (TRISTATE)nRet;
}
static void ImpSetPercent(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbOn, const void*, const void*, const void*, const void*)
{
Point aPos(rGP.GetAbsolutePos(*pObj));
- rGP.SetPercent(*(sal_Bool*)pbOn);
+ rGP.SetPercent(*(bool*)pbOn);
rGP.SetAbsolutePos(aPos,*pObj);
}
-void SdrGlueEditView::SetMarkedGluePointsPercent(sal_Bool bOn)
+void SdrGlueEditView::SetMarkedGluePointsPercent(bool bOn)
{
ForceUndirtyMrkPnt();
BegUndo(ImpGetResStr(STR_EditSetGluePercent),GetDescriptionOfMarkedGluePoints());
- ImpDoMarkedGluePoints(ImpSetPercent,sal_False,&bOn);
+ ImpDoMarkedGluePoints(ImpSetPercent,false,&bOn);
EndUndo();
}
@@ -170,9 +173,9 @@ void SdrGlueEditView::SetMarkedGluePointsPercent(sal_Bool bOn)
static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet, const void*)
{
sal_uInt16& nRet=*(sal_uInt16*)pnRet;
- sal_Bool& bFirst=*(sal_Bool*)pbFirst;
- sal_Bool& bDontCare=*(sal_Bool*)pbDontCare;
- sal_Bool bVert=*(sal_Bool*)pbVert;
+ bool& bFirst=*(bool*)pbFirst;
+ bool& bDontCare=*(bool*)pbDontCare;
+ bool bVert=*(bool*)pbVert;
if (!bDontCare) {
sal_uInt16 nAlg=0;
if (bVert) {
@@ -180,32 +183,32 @@ static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void
} else {
nAlg=rGP.GetHorzAlign();
}
- if (bFirst) { nRet=nAlg; bFirst=sal_False; }
+ if (bFirst) { nRet=nAlg; bFirst=false; }
else if (nRet!=nAlg) {
if (bVert) {
nRet=SDRVERTALIGN_DONTCARE;
} else {
nRet=SDRHORZALIGN_DONTCARE;
}
- bDontCare=sal_True;
+ bDontCare=true;
}
}
}
-sal_uInt16 SdrGlueEditView::GetMarkedGluePointsAlign(sal_Bool bVert) const
+sal_uInt16 SdrGlueEditView::GetMarkedGluePointsAlign(bool bVert) const
{
ForceUndirtyMrkPnt();
- sal_Bool bFirst=sal_True;
- sal_Bool bDontCare=sal_False;
+ bool bFirst=true;
+ bool bDontCare=false;
sal_uInt16 nRet=0;
- ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetAlign,sal_True,&bFirst,&bDontCare,&bVert,&nRet);
+ ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetAlign,true,&bFirst,&bDontCare,&bVert,&nRet);
return nRet;
}
static void ImpSetAlign(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbVert, const void* pnAlign, const void*, const void*, const void*)
{
Point aPos(rGP.GetAbsolutePos(*pObj));
- if (*(sal_Bool*)pbVert) { // bVert?
+ if (*(bool*)pbVert) { // bVert?
rGP.SetVertAlign(*(sal_uInt16*)pnAlign);
} else {
rGP.SetHorzAlign(*(sal_uInt16*)pnAlign);
@@ -213,11 +216,11 @@ static void ImpSetAlign(SdrGluePoint& rGP, const SdrObject* pObj, const void* pb
rGP.SetAbsolutePos(aPos,*pObj);
}
-void SdrGlueEditView::SetMarkedGluePointsAlign(sal_Bool bVert, sal_uInt16 nAlign)
+void SdrGlueEditView::SetMarkedGluePointsAlign(bool bVert, sal_uInt16 nAlign)
{
ForceUndirtyMrkPnt();
BegUndo(ImpGetResStr(STR_EditSetGlueAlign),GetDescriptionOfMarkedGluePoints());
- ImpDoMarkedGluePoints(ImpSetAlign,sal_False,&bVert,&nAlign);
+ ImpDoMarkedGluePoints(ImpSetAlign,false,&bVert,&nAlign);
EndUndo();
}
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index a225219d9e51..7e53388e9909 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -277,9 +277,9 @@ SdrHdl::SdrHdl():
nPolyNum(0),
nPPntNum(0),
nSourceHdlNum(0),
- bSelect(sal_False),
- b1PixMore(sal_False),
- bPlusHdl(sal_False),
+ bSelect(false),
+ b1PixMore(false),
+ bPlusHdl(false),
mbMoveOutside(false),
mbMouseOver(false)
{
@@ -296,9 +296,9 @@ SdrHdl::SdrHdl(const Point& rPnt, SdrHdlKind eNewKind):
nPolyNum(0),
nPPntNum(0),
nSourceHdlNum(0),
- bSelect(sal_False),
- b1PixMore(sal_False),
- bPlusHdl(sal_False),
+ bSelect(false),
+ b1PixMore(false),
+ bPlusHdl(false),
mbMoveOutside(false),
mbMouseOver(false)
{
@@ -309,7 +309,7 @@ SdrHdl::~SdrHdl()
GetRidOfIAObject();
}
-void SdrHdl::Set1PixMore(sal_Bool bJa)
+void SdrHdl::Set1PixMore(bool bJa)
{
if(b1PixMore != bJa)
{
@@ -354,7 +354,7 @@ void SdrHdl::SetPos(const Point& rPnt)
}
}
-void SdrHdl::SetSelected(sal_Bool bJa)
+void SdrHdl::SetSelected(bool bJa)
{
if(bSelect != bJa)
{
@@ -413,7 +413,7 @@ void SdrHdl::CreateB2dIAObject()
BitmapColorIndex eColIndex = LightGreen;
BitmapMarkerKind eKindOfMarker = Rect_7x7;
- sal_Bool bRot = pHdlList->IsRotateShear();
+ bool bRot = pHdlList->IsRotateShear();
if(pObj)
eColIndex = (bSelect) ? Cyan : LightCyan;
if(bRot)
@@ -863,7 +863,7 @@ Pointer SdrHdl::GetPointer() const
return Pointer(ePtr);
}
-sal_Bool SdrHdl::IsFocusHdl() const
+bool SdrHdl::IsFocusHdl() const
{
switch(eKind)
{
@@ -878,9 +878,9 @@ sal_Bool SdrHdl::IsFocusHdl() const
{
// if it's an activated TextEdit, it's moved to extended points
if(pHdlList && pHdlList->IsMoveOutside())
- return sal_False;
+ return false;
else
- return sal_True;
+ return true;
}
case HDL_MOVE: // handle to move object
@@ -897,12 +897,12 @@ sal_Bool SdrHdl::IsFocusHdl() const
case HDL_USER:
{
- return sal_True;
+ return true;
}
default:
{
- return sal_False;
+ return false;
}
}
}
@@ -918,10 +918,10 @@ void SdrHdl::onMouseLeave()
// class SdrHdlColor
-SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, sal_Bool bLum)
+SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, bool bLum)
: SdrHdl(rRef, HDL_COLR),
aMarkerSize(rSize),
- bUseLuminance(bLum)
+ bUseLuminance(bLum ? 1 : 0)
{
if(IsUseLuminance())
aCol = GetLuminance(aCol);
@@ -1043,7 +1043,7 @@ void SdrHdlColor::CallColorChangeLink()
aColorChangeHdl.Call(this);
}
-void SdrHdlColor::SetColor(Color aNew, sal_Bool bCallLink)
+void SdrHdlColor::SetColor(Color aNew, bool bCallLink)
{
if(IsUseLuminance())
aNew = GetLuminance(aNew);
@@ -1075,7 +1075,7 @@ void SdrHdlColor::SetSize(const Size& rNew)
}
// class SdrHdlGradient
-SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, sal_Bool bGrad)
+SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, bool bGrad)
: SdrHdl(rRef1, bGrad ? HDL_GRAD : HDL_TRNS)
, pColHdl1(NULL)
, pColHdl2(NULL)
@@ -1182,11 +1182,11 @@ void SdrHdlGradient::CreateB2dIAObject()
IMPL_LINK(SdrHdlGradient, ColorChangeHdl, SdrHdl*, /*pHdl*/)
{
if(GetObj())
- FromIAOToItem(GetObj(), sal_True, sal_True);
+ FromIAOToItem(GetObj(), true, true);
return 0;
}
-void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, sal_Bool bSetItemOnObject, sal_Bool bUndo)
+void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, bool bSetItemOnObject, bool bUndo)
{
// from IAO positions and colors to gradient
const SfxItemSet& rSet = _pObj->GetMergedItemSet();
@@ -1528,13 +1528,13 @@ Pointer ImpEdgeHdl::GetPointer() const
return Pointer(POINTER_SSIZE);
}
-sal_Bool ImpEdgeHdl::IsHorzDrag() const
+bool ImpEdgeHdl::IsHorzDrag() const
{
SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pObj);
if (pEdge==NULL)
- return sal_False;
+ return false;
if (nObjHdlNum<=1)
- return sal_False;
+ return false;
SdrEdgeKind eEdgeKind = ((SdrEdgeKindItem&)(pEdge->GetObjectItem(SDRATTR_EDGEKIND))).GetValue();
@@ -1547,11 +1547,11 @@ sal_Bool ImpEdgeHdl::IsHorzDrag() const
{
long nWink=nObjHdlNum==2 ? rInfo.nAngle1 : rInfo.nAngle2;
if (nWink==0 || nWink==18000)
- return sal_True;
+ return true;
else
- return sal_False;
+ return false;
}
- return sal_False;
+ return false;
}
@@ -1844,7 +1844,7 @@ extern "C" int SAL_CALL ImplSortHdlFunc( const void* pVoid1, const void* pVoid2
-void SdrHdlList::TravelFocusHdl(sal_Bool bForward)
+void SdrHdlList::TravelFocusHdl(bool bForward)
{
// security correction
if(mnFocusIndex != CONTAINER_ENTRY_NOTFOUND && mnFocusIndex >= GetHdlCount())
@@ -2031,9 +2031,9 @@ SdrHdlList::SdrHdlList(SdrMarkView* pV)
aList()
{
nHdlSize = 3;
- bRotateShear = sal_False;
- bMoveOutside = sal_False;
- bDistortShear = sal_False;
+ bRotateShear = false;
+ bMoveOutside = false;
+ bDistortShear = false;
}
SdrHdlList::~SdrHdlList()
@@ -2057,12 +2057,12 @@ void SdrHdlList::SetHdlSize(sal_uInt16 nSiz)
}
}
-void SdrHdlList::SetMoveOutside(sal_Bool bOn)
+void SdrHdlList::SetMoveOutside(bool bOn)
{
if(bMoveOutside != bOn)
{
// remember new value
- bMoveOutside = bOn;
+ bMoveOutside = bOn ? 1 : 0;
// propagate change to IAOs
for(sal_uIntPtr i=0; i<GetHdlCount(); i++)
@@ -2073,14 +2073,14 @@ void SdrHdlList::SetMoveOutside(sal_Bool bOn)
}
}
-void SdrHdlList::SetRotateShear(sal_Bool bOn)
+void SdrHdlList::SetRotateShear(bool bOn)
{
bRotateShear = bOn;
}
-void SdrHdlList::SetDistortShear(sal_Bool bOn)
+void SdrHdlList::SetDistortShear(bool bOn)
{
- bDistortShear = bOn;
+ bDistortShear = bOn ? 1 : 0;
}
SdrHdl* SdrHdlList::RemoveHdl(sal_uIntPtr nNum)
@@ -2115,8 +2115,8 @@ void SdrHdlList::Clear()
}
aList.clear();
- bRotateShear=sal_False;
- bDistortShear=sal_False;
+ bRotateShear=false;
+ bDistortShear=false;
}
void SdrHdlList::Sort()
@@ -2154,7 +2154,7 @@ sal_uIntPtr SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const
return it - aList.begin();
}
-void SdrHdlList::AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin)
+void SdrHdlList::AddHdl(SdrHdl* pHdl, bool bAtBegin)
{
if (pHdl!=NULL)
{
@@ -2170,7 +2170,7 @@ void SdrHdlList::AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin)
}
}
-SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, sal_Bool bBack, sal_Bool bNext, SdrHdl* pHdl0) const
+SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, bool bBack, bool bNext, SdrHdl* pHdl0) const
{
SdrHdl* pRet=NULL;
sal_uIntPtr nAnz=GetHdlCount();
@@ -2183,7 +2183,7 @@ SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, sal_Bool bBack, sal_Bool bNe
if (bNext)
{
if (pHdl==pHdl0)
- bNext=sal_False;
+ bNext=false;
}
else
{
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 403ac8039c4b..593787219958 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -1120,7 +1120,7 @@ void SdrItemBrowser::Undirty()
if(pView->AreObjectsMarked())
{
SfxItemSet a2ndSet(pView->GetModel()->GetItemPool());
- pView->GetAttributes(a2ndSet, sal_True);
+ pView->GetAttributes(a2ndSet, true);
SetAttributes(&aSet,&a2ndSet);
}
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 2d80d61f4e3f..ae50895ecd1d 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -24,15 +24,15 @@
#include "svx/svdglob.hxx"
#include "svx/svdstr.hrc"
-sal_Bool SetOfByte::IsEmpty() const
+bool SetOfByte::IsEmpty() const
{
for(sal_uInt16 i(0); i < 32; i++)
{
if(aData[i] != 0)
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
void SetOfByte::operator&=(const SetOfByte& r2ndSet)
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index b329b7f1e267..7914f847dd6a 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -47,8 +47,8 @@ SdrMark::SdrMark(SdrObject* pNewObj, SdrPageView* pNewPageView)
mpPoints(0L),
mpLines(0L),
mpGluePoints(0L),
- mbCon1(sal_False),
- mbCon2(sal_False),
+ mbCon1(false),
+ mbCon2(false),
mnUser(0)
{
if(mpSelectedSdrObject)
@@ -64,8 +64,8 @@ SdrMark::SdrMark(const SdrMark& rMark)
mpPoints(0L),
mpLines(0L),
mpGluePoints(0L),
- mbCon1(sal_False),
- mbCon2(sal_False),
+ mbCon1(false),
+ mbCon2(false),
mnUser(0)
{
*this = rMark;
@@ -193,27 +193,27 @@ SdrMark& SdrMark::operator=(const SdrMark& rMark)
return *this;
}
-sal_Bool SdrMark::operator==(const SdrMark& rMark) const
+bool SdrMark::operator==(const SdrMark& rMark) const
{
- sal_Bool bRet(mpSelectedSdrObject == rMark.mpSelectedSdrObject && mpPageView == rMark.mpPageView && mbCon1 == rMark.mbCon1 && mbCon2 == rMark.mbCon2 && mnUser == rMark.mnUser);
+ bool bRet(mpSelectedSdrObject == rMark.mpSelectedSdrObject && mpPageView == rMark.mpPageView && mbCon1 == rMark.mbCon1 && mbCon2 == rMark.mbCon2 && mnUser == rMark.mnUser);
if((mpPoints != 0L) != (rMark.mpPoints != 0L))
- bRet = sal_False;
+ bRet = false;
if((mpLines != 0L) != (rMark.mpLines != 0L))
- bRet = sal_False;
+ bRet = false;
if((mpGluePoints != 0L) != (rMark.mpGluePoints != 0L))
- bRet = sal_False;
+ bRet = false;
if(bRet && mpPoints && *mpPoints != *rMark.mpPoints)
- bRet = sal_False;
+ bRet = false;
if(bRet && mpLines && *mpLines != *rMark.mpLines)
- bRet = sal_False;
+ bRet = false;
if(bRet && mpGluePoints && *mpGluePoints != *rMark.mpGluePoints)
- bRet = sal_False;
+ bRet = false;
return bRet;
}
@@ -257,7 +257,7 @@ void SdrMarkList::ImpForceSort()
{
if(!mbSorted)
{
- mbSorted = sal_True;
+ mbSorted = true;
sal_uLong nAnz = maList.size();
// remove invalid
@@ -293,10 +293,10 @@ void SdrMarkList::ImpForceSort()
{
// Con1/Con2 Merging
if(pCmp->IsCon1())
- pAkt->SetCon1(sal_True);
+ pAkt->SetCon1(true);
if(pCmp->IsCon2())
- pAkt->SetCon2(sal_True);
+ pAkt->SetCon2(true);
// delete pCmp
maList.erase(maList.begin() + i);
@@ -377,7 +377,7 @@ sal_uLong SdrMarkList::FindObject(const SdrObject* pObj) const
return CONTAINER_ENTRY_NOTFOUND;
}
-void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort)
+void SdrMarkList::InsertEntry(const SdrMark& rMark, bool bChkSort)
{
SetNameDirty();
sal_uLong nAnz(maList.size());
@@ -385,7 +385,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort)
if(!bChkSort || !mbSorted || nAnz == 0)
{
if(!bChkSort)
- mbSorted = sal_False;
+ mbSorted = false;
maList.push_back(new SdrMark(rMark));
}
@@ -400,10 +400,10 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort)
// This one already exists.
// Con1/Con2 Merging
if(rMark.IsCon1())
- pLast->SetCon1(sal_True);
+ pLast->SetCon1(true);
if(rMark.IsCon2())
- pLast->SetCon2(sal_True);
+ pLast->SetCon2(true);
}
else
{
@@ -422,13 +422,13 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort)
if(nNeuNum < nLastNum)
{
// at some point, we have to sort
- mbSorted = sal_False;
+ mbSorted = false;
}
}
else
{
// at some point, we have to sort
- mbSorted = sal_False;
+ mbSorted = false;
}
}
}
@@ -460,18 +460,18 @@ void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum)
SetNameDirty();
SdrMark* pKopie = new SdrMark(rNewMark);
maList[nNum] = pKopie;
- mbSorted = sal_False;
+ mbSorted = false;
}
}
-void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse)
+void SdrMarkList::Merge(const SdrMarkList& rSrcList, bool bReverse)
{
sal_uLong nAnz(rSrcList.maList.size());
if(rSrcList.mbSorted)
{
// merge without forcing a Sort in rSrcList
- bReverse = sal_False;
+ bReverse = false;
}
if(!bReverse)
@@ -493,9 +493,9 @@ void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse)
}
}
-sal_Bool SdrMarkList::DeletePageView(const SdrPageView& rPV)
+bool SdrMarkList::DeletePageView(const SdrPageView& rPV)
{
- sal_Bool bChgd(sal_False);
+ bool bChgd(false);
for(std::vector<SdrMark*>::iterator it = maList.begin(); it != maList.end(); )
{
@@ -506,7 +506,7 @@ sal_Bool SdrMarkList::DeletePageView(const SdrPageView& rPV)
it = maList.erase(it);
delete pMark;
SetNameDirty();
- bChgd = sal_True;
+ bChgd = true;
}
else
++it;
@@ -515,9 +515,9 @@ sal_Bool SdrMarkList::DeletePageView(const SdrPageView& rPV)
return bChgd;
}
-sal_Bool SdrMarkList::InsertPageView(const SdrPageView& rPV)
+bool SdrMarkList::InsertPageView(const SdrPageView& rPV)
{
- sal_Bool bChgd(sal_False);
+ bool bChgd(false);
DeletePageView(rPV); // delete all of them, then append the entire page
SdrObject* pObj;
const SdrObjList* pOL = rPV.GetObjList();
@@ -526,14 +526,14 @@ sal_Bool SdrMarkList::InsertPageView(const SdrPageView& rPV)
for(sal_uLong nO(0L); nO < nObjAnz; nO++)
{
pObj = pOL->GetObj(nO);
- sal_Bool bDoIt(rPV.IsObjMarkable(pObj));
+ bool bDoIt(rPV.IsObjMarkable(pObj));
if(bDoIt)
{
SdrMark* pM = new SdrMark(pObj, (SdrPageView*)&rPV);
maList.push_back(pM);
SetNameDirty();
- bChgd = sal_True;
+ bChgd = true;
}
}
@@ -552,7 +552,7 @@ const OUString& SdrMarkList::GetMarkDescription() const
if(!pTextObj || !pTextObj->IsTextFrame())
{
- ((SdrMarkList*)(this))->mbNameOk = sal_False;
+ ((SdrMarkList*)(this))->mbNameOk = false;
}
}
@@ -596,15 +596,15 @@ const OUString& SdrMarkList::GetMarkDescription() const
}
const_cast<SdrMarkList*>(this)->maMarkName = aNam;
- const_cast<SdrMarkList*>(this)->mbNameOk = sal_True;
+ const_cast<SdrMarkList*>(this)->mbNameOk = true;
}
return maMarkName;
}
-const OUString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
+const OUString& SdrMarkList::GetPointMarkDescription(bool bGlue) const
{
- sal_Bool& rNameOk = (sal_Bool&)(bGlue ? mbGluePointNameOk : mbPointNameOk);
+ bool& rNameOk = (bool&)(bGlue ? mbGluePointNameOk : mbPointNameOk);
OUString& rName = const_cast<OUString&>(bGlue ? maGluePointName : maPointName);
sal_uLong nMarkAnz(GetMarkCount());
sal_uLong nMarkPtAnz(0L);
@@ -643,14 +643,14 @@ const OUString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
if(!pTextObj || !pTextObj->IsTextFrame())
{
- rNameOk = sal_False;
+ rNameOk = false;
}
}
if(!nMarkPtObjAnz)
{
rName = OUString();
- rNameOk = sal_True;
+ rNameOk = true;
}
else if(!rNameOk)
{
@@ -707,15 +707,15 @@ const OUString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
aStr1 = aStr1.replaceFirst("%1", aNam);
rName = aStr1;
- rNameOk = sal_True;
+ rNameOk = true;
}
return rName;
}
-sal_Bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, Rectangle& rRect) const
+bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, Rectangle& rRect) const
{
- sal_Bool bFnd(sal_False);
+ bool bFnd(false);
Rectangle aR;
for(sal_uLong i(0L); i < GetMarkCount(); i++)
@@ -735,7 +735,7 @@ sal_Bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, Rectangle& rRect) const
else
{
rRect = aR;
- bFnd = sal_True;
+ bFnd = true;
}
}
}
@@ -744,9 +744,9 @@ sal_Bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, Rectangle& rRect) const
return bFnd;
}
-sal_Bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const
+bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const
{
- sal_Bool bFnd(sal_False);
+ bool bFnd(false);
for(sal_uLong i(0L); i < GetMarkCount(); i++)
{
@@ -765,7 +765,7 @@ sal_Bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const
else
{
rRect = aR;
- bFnd = sal_True;
+ bFnd = true;
}
}
}
@@ -779,7 +779,7 @@ sal_Bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const
namespace sdr
{
ViewSelection::ViewSelection()
- : mbEdgesOfMarkedNodesDirty(sal_False)
+ : mbEdgesOfMarkedNodesDirty(false)
{
}
@@ -787,7 +787,7 @@ namespace sdr
{
if(!mbEdgesOfMarkedNodesDirty)
{
- mbEdgesOfMarkedNodesDirty = sal_True;
+ mbEdgesOfMarkedNodesDirty = true;
maEdgesOfMarkedNodes.Clear();
maMarkedEdgesOfMarkedNodes.Clear();
maAllMarkedObjects.clear();
@@ -826,11 +826,11 @@ namespace sdr
{
if(pObj)
{
- sal_Bool bIsGroup(pObj->IsGroupObject());
+ bool bIsGroup(pObj->IsGroupObject());
if(bIsGroup && pObj->ISA(E3dObject) && !pObj->ISA(E3dScene))
{
- bIsGroup = sal_False;
+ bIsGroup = false;
}
if(bIsGroup)
@@ -852,7 +852,7 @@ namespace sdr
{
if(mbEdgesOfMarkedNodesDirty)
{
- mbEdgesOfMarkedNodesDirty = sal_False;
+ mbEdgesOfMarkedNodesDirty = false;
maMarkedObjectList.ForceSort();
maEdgesOfMarkedNodes.Clear();
maMarkedEdgesOfMarkedNodes.Clear();
@@ -890,12 +890,12 @@ namespace sdr
if(pEdge->GetConnectedNode(true) == pCandidate)
{
- aM.SetCon1(sal_True);
+ aM.SetCon1(true);
}
if(pEdge->GetConnectedNode(false) == pCandidate)
{
- aM.SetCon2(sal_True);
+ aM.SetCon2(true);
}
if(CONTAINER_ENTRY_NOTFOUND == maMarkedObjectList.FindObject(pEdge))
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index fbf5315cb138..29c13a34edaf 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -204,46 +204,37 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
// can't create DrawOutliner OnDemand, because I can't get the Pool,
// then (only from 302 onwards!)
pDrawOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this );
- ImpSetOutlinerDefaults(pDrawOutliner, sal_True);
+ ImpSetOutlinerDefaults(pDrawOutliner, true);
pHitTestOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this );
- ImpSetOutlinerDefaults(pHitTestOutliner, sal_True);
+ ImpSetOutlinerDefaults(pHitTestOutliner, true);
ImpCreateTables();
}
-SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal_Bool bLoadRefCounts):
+SdrModel::SdrModel():
aReadDate( DateTime::EMPTY ),
maMaPag(),
maPages()
{
- ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts);
+ ImpCtor(NULL, NULL, false, LOADREFCOUNTS);
}
-SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal_Bool bLoadRefCounts):
- aReadDate( DateTime::EMPTY ),
- maMaPag(),
- maPages(),
- aTablePath(rPath)
-{
- ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts);
-}
-
-SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts):
+SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts):
aReadDate( DateTime::EMPTY ),
maMaPag(),
maPages()
{
- ImpCtor(pPool,pPers,bUseExtColorTable, (bool)bLoadRefCounts);
+ ImpCtor(pPool,pPers,bUseExtColorTable, bLoadRefCounts);
}
-SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts):
+SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, bool bLoadRefCounts):
aReadDate( DateTime::EMPTY ),
maMaPag(),
maPages(),
aTablePath(rPath)
{
- ImpCtor(pPool,pPers,bUseExtColorTable, (bool)bLoadRefCounts);
+ ImpCtor(pPool,pPers,bUseExtColorTable, bLoadRefCounts);
}
SdrModel::SdrModel(const SdrModel& /*rSrcModel*/):
@@ -278,7 +269,7 @@ SdrModel::~SdrModel()
#endif
delete pAktUndoGroup;
- ClearModel(sal_True);
+ ClearModel(true);
delete pLayerAdmin;
@@ -691,7 +682,7 @@ void SdrModel::ImpCreateTables()
}
}
-void SdrModel::ClearModel(sal_Bool bCalledFromDestructor)
+void SdrModel::ClearModel(bool bCalledFromDestructor)
{
if(bCalledFromDestructor)
{
@@ -795,7 +786,7 @@ const SdrTextObj* SdrModel::GetFormattingTextObj() const
return NULL;
}
-void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit )
+void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool bInit )
{
/**************************************************************************
* Initialization of the Outliners for drawing text and HitTest
@@ -1775,7 +1766,7 @@ void SdrModel::Merge(SdrModel& rSourceModel,
if (bUndo) EndUndo();
}
-void SdrModel::SetStarDrawPreviewMode(sal_Bool bPreview)
+void SdrModel::SetStarDrawPreviewMode(bool bPreview)
{
if (!bPreview && bStarDrawPreviewMode && GetPageCount())
{
@@ -1913,9 +1904,9 @@ void SdrModel::SetCharCompressType( sal_uInt16 nType )
}
}
-void SdrModel::SetKernAsianPunctuation( sal_Bool bEnabled )
+void SdrModel::SetKernAsianPunctuation( bool bEnabled )
{
- if( mbKernAsianPunctuation != (bool) bEnabled )
+ if( mbKernAsianPunctuation != bEnabled )
{
mbKernAsianPunctuation = bEnabled;
ImpSetOutlinerDefaults( pDrawOutliner );
@@ -1923,9 +1914,9 @@ void SdrModel::SetKernAsianPunctuation( sal_Bool bEnabled )
}
}
-void SdrModel::SetAddExtLeading( sal_Bool bEnabled )
+void SdrModel::SetAddExtLeading( bool bEnabled )
{
- if( mbAddExtLeading != (bool) bEnabled )
+ if( mbAddExtLeading != bEnabled )
{
mbAddExtLeading = bEnabled;
ImpSetOutlinerDefaults( pDrawOutliner );
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 4ecd12bb8c7a..b8ae15db5339 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -65,17 +65,17 @@ class ImplMarkingOverlay
// bitfield
// A flag to remember if the action is for unmarking.
- unsigned mbUnmarking : 1;
+ bool mbUnmarking : 1;
public:
- ImplMarkingOverlay(const SdrPaintView& rView, const basegfx::B2DPoint& rStartPos, sal_Bool bUnmarking = sal_False);
+ ImplMarkingOverlay(const SdrPaintView& rView, const basegfx::B2DPoint& rStartPos, bool bUnmarking = false);
~ImplMarkingOverlay();
void SetSecondPosition(const basegfx::B2DPoint& rNewPosition);
- sal_Bool IsUnmarking() const { return mbUnmarking; }
+ bool IsUnmarking() const { return mbUnmarking; }
};
-ImplMarkingOverlay::ImplMarkingOverlay(const SdrPaintView& rView, const basegfx::B2DPoint& rStartPos, sal_Bool bUnmarking)
+ImplMarkingOverlay::ImplMarkingOverlay(const SdrPaintView& rView, const basegfx::B2DPoint& rStartPos, bool bUnmarking)
: maSecondPosition(rStartPos),
mbUnmarking(bUnmarking)
{
@@ -209,7 +209,7 @@ void SdrMarkView::ModelHasChanged()
-sal_Bool SdrMarkView::IsAction() const
+bool SdrMarkView::IsAction() const
{
return SdrSnapView::IsAction() || IsMarkObj() || IsMarkPoints() || IsMarkGluePoints();
}
@@ -311,7 +311,7 @@ void SdrMarkView::HideSdrPage()
-sal_Bool SdrMarkView::BegMarkObj(const Point& rPnt, sal_Bool bUnmark)
+bool SdrMarkView::BegMarkObj(const Point& rPnt, bool bUnmark)
{
BrkAction();
@@ -323,7 +323,7 @@ sal_Bool SdrMarkView::BegMarkObj(const Point& rPnt, sal_Bool bUnmark)
aDragStat.NextPoint();
aDragStat.SetMinMove(nMinMovLog);
- return sal_True;
+ return true;
}
void SdrMarkView::MovMarkObj(const Point& rPnt)
@@ -337,9 +337,9 @@ void SdrMarkView::MovMarkObj(const Point& rPnt)
}
}
-sal_Bool SdrMarkView::EndMarkObj()
+bool SdrMarkView::EndMarkObj()
{
- sal_Bool bRetval(sal_False);
+ bool bRetval(false);
if(IsMarkObj())
{
@@ -348,7 +348,7 @@ sal_Bool SdrMarkView::EndMarkObj()
Rectangle aRect(aDragStat.GetStart(), aDragStat.GetNow());
aRect.Justify();
MarkObj(aRect, mpMarkObjOverlay->IsUnmarking());
- bRetval = sal_True;
+ bRetval = true;
}
// cleanup
@@ -370,7 +370,7 @@ void SdrMarkView::BrkMarkObj()
-sal_Bool SdrMarkView::BegMarkPoints(const Point& rPnt, sal_Bool bUnmark)
+bool SdrMarkView::BegMarkPoints(const Point& rPnt, bool bUnmark)
{
if(HasMarkablePoints())
{
@@ -384,10 +384,10 @@ sal_Bool SdrMarkView::BegMarkPoints(const Point& rPnt, sal_Bool bUnmark)
aDragStat.NextPoint();
aDragStat.SetMinMove(nMinMovLog);
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
void SdrMarkView::MovMarkPoints(const Point& rPnt)
@@ -402,9 +402,9 @@ void SdrMarkView::MovMarkPoints(const Point& rPnt)
}
}
-sal_Bool SdrMarkView::EndMarkPoints()
+bool SdrMarkView::EndMarkPoints()
{
- sal_Bool bRetval(sal_False);
+ bool bRetval(false);
if(IsMarkPoints())
{
@@ -414,7 +414,7 @@ sal_Bool SdrMarkView::EndMarkPoints()
aRect.Justify();
MarkPoints(aRect, mpMarkPointsOverlay->IsUnmarking());
- bRetval = sal_True;
+ bRetval = true;
}
// cleanup
@@ -436,7 +436,7 @@ void SdrMarkView::BrkMarkPoints()
-sal_Bool SdrMarkView::BegMarkGluePoints(const Point& rPnt, sal_Bool bUnmark)
+bool SdrMarkView::BegMarkGluePoints(const Point& rPnt, bool bUnmark)
{
if(HasMarkableGluePoints())
{
@@ -450,10 +450,10 @@ sal_Bool SdrMarkView::BegMarkGluePoints(const Point& rPnt, sal_Bool bUnmark)
aDragStat.NextPoint();
aDragStat.SetMinMove(nMinMovLog);
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
void SdrMarkView::MovMarkGluePoints(const Point& rPnt)
@@ -468,9 +468,9 @@ void SdrMarkView::MovMarkGluePoints(const Point& rPnt)
}
}
-sal_Bool SdrMarkView::EndMarkGluePoints()
+bool SdrMarkView::EndMarkGluePoints()
{
- sal_Bool bRetval(sal_False);
+ bool bRetval(false);
if(IsMarkGluePoints())
{
@@ -480,7 +480,7 @@ sal_Bool SdrMarkView::EndMarkGluePoints()
aRect.Justify();
MarkGluePoints(&aRect, mpMarkGluePointsOverlay->IsUnmarking());
- bRetval = sal_True;
+ bRetval = true;
}
// cleanup
@@ -519,7 +519,7 @@ sal_uIntPtr SdrMarkView::GetMarkableObjCount() const
return nCount;
}
-sal_Bool SdrMarkView::HasMarkableObj() const
+bool SdrMarkView::HasMarkableObj() const
{
sal_uIntPtr nCount=0;
@@ -556,10 +556,10 @@ void SdrMarkView::showMarkHandles()
}
}
-sal_Bool SdrMarkView::ImpIsFrameHandles() const
+bool SdrMarkView::ImpIsFrameHandles() const
{
sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
- sal_Bool bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles;
+ bool bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles;
bool bStdDrag=eDragMode==SDRDRAG_MOVE;
if (nMarkAnz==1 && bStdDrag && bFrmHdl)
{
@@ -569,13 +569,13 @@ sal_Bool SdrMarkView::ImpIsFrameHandles() const
sal_uInt16 nIdent=pObj->GetObjIdentifier();
if (nIdent==OBJ_LINE || nIdent==OBJ_EDGE || nIdent==OBJ_CAPTION || nIdent==OBJ_MEASURE || nIdent==OBJ_CUSTOMSHAPE || nIdent==OBJ_TABLE )
{
- bFrmHdl=sal_False;
+ bFrmHdl=false;
}
}
}
if (!bStdDrag && !bFrmHdl) {
// all other drag modes only with FrameHandles
- bFrmHdl=sal_True;
+ bFrmHdl=true;
if (eDragMode==SDRDRAG_ROTATE) {
// when rotating, use ObjOwn drag, if there's at least 1 PolyObj
for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && bFrmHdl; nMarkNum++) {
@@ -597,7 +597,7 @@ sal_Bool SdrMarkView::ImpIsFrameHandles() const
// no FrameHdl for crop
if(bFrmHdl && SDRDRAG_CROP == eDragMode)
{
- bFrmHdl = sal_False;
+ bFrmHdl = false;
}
return bFrmHdl;
@@ -647,7 +647,7 @@ void SdrMarkView::SetMarkHandles()
static_cast<SdrTextObj*>(pMarkedObj)->IsTextFrame();
}
- sal_Bool bFrmHdl=ImpIsFrameHandles();
+ bool bFrmHdl=ImpIsFrameHandles();
if (nMarkAnz>0)
{
@@ -784,7 +784,7 @@ void SdrMarkView::SetMarkHandles()
if (bPoly)
{
- sal_Bool bSelected=pMrkPnts!=NULL
+ bool bSelected=pMrkPnts!=NULL
&& pMrkPnts->find( sal_uInt16(i-nSiz0) ) != pMrkPnts->end();
pHdl->SetSelected(bSelected);
if (bPlusHdlAlways || bSelected)
@@ -797,7 +797,7 @@ void SdrMarkView::SetMarkHandles()
{
pPlusHdl->SetObj(pObj);
pPlusHdl->SetPageView(pPV);
- pPlusHdl->SetPlusHdl(sal_True);
+ pPlusHdl->SetPlusHdl(true);
aHdl.AddHdl(pPlusHdl);
}
}
@@ -936,7 +936,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
(const XFillFloatTransparenceItem&)rSet.Get(XATTR_FILLFLOATTRANSPARENCE));
XGradient aGrad = aNewItem.GetGradientValue();
- aNewItem.SetEnabled(sal_True);
+ aNewItem.SetEnabled(true);
aGrad.SetStartIntens(100);
aGrad.SetEndIntens(100);
aNewItem.SetGradientValue(aGrad);
@@ -965,9 +965,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
// build handles
const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY()));
const Point aTmpPos2(basegfx::fround(aGradTransVector.maPositionB.getX()), basegfx::fround(aGradTransVector.maPositionB.getY()));
- SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, SDR_HANDLE_COLOR_SIZE_NORMAL, sal_True);
- SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, SDR_HANDLE_COLOR_SIZE_NORMAL, sal_True);
- SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, sal_False);
+ SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, SDR_HANDLE_COLOR_SIZE_NORMAL, true);
+ SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, SDR_HANDLE_COLOR_SIZE_NORMAL, true);
+ SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, false);
DBG_ASSERT(pColHdl1 && pColHdl2 && pGradHdl, "Could not get all necessary handles!");
// link them
@@ -1007,9 +1007,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
// build handles
const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY()));
const Point aTmpPos2(basegfx::fround(aGradTransVector.maPositionB.getX()), basegfx::fround(aGradTransVector.maPositionB.getY()));
- SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, aHdlSize, sal_False);
- SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, aHdlSize, sal_False);
- SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, sal_True);
+ SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, aHdlSize, false);
+ SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, aHdlSize, false);
+ SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, true);
DBG_ASSERT(pColHdl1 && pColHdl2 && pGradHdl, "Could not get all necessary handles!");
// link them
@@ -1249,9 +1249,9 @@ void SdrMarkView::SetMarkRects()
void SdrMarkView::SetFrameHandles(bool bOn)
{
if (bOn!=bForceFrameHandles) {
- sal_Bool bOld=ImpIsFrameHandles();
+ bool bOld=ImpIsFrameHandles();
bForceFrameHandles=bOn;
- sal_Bool bNew=ImpIsFrameHandles();
+ bool bNew=ImpIsFrameHandles();
if (bNew!=bOld) {
AdjustMarkHdl();
MarkListHasChanged();
@@ -1278,7 +1278,7 @@ void SdrMarkView::SetEditMode(SdrViewEditMode eMode)
-sal_Bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
+bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
{
if (pObj)
{
@@ -1287,15 +1287,15 @@ sal_Bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
{
// object not selectable or
// SdrUnoObj not in DesignMode
- return sal_False;
+ return false;
}
}
- return pPV!=NULL ? pPV->IsObjMarkable(pObj) : sal_True;
+ return pPV==NULL || pPV->IsObjMarkable(pObj);
}
-sal_Bool SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const
+bool SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const
{
- sal_Bool bRet=sal_False;
+ bool bRet=false;
nTol=ImpGetHitTolLogic(nTol,NULL);
Point aPt(rPnt);
for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount() && !bRet; nm++) {
@@ -1310,34 +1310,34 @@ SdrHdl* SdrMarkView::PickHandle(const Point& rPnt, sal_uIntPtr nOptions, SdrHdl*
if (bSomeObjChgdFlag) { // recalculate handles, if necessary
FlushComeBackTimer();
}
- sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
- sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0;
+ bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
+ bool bNext=(nOptions & SDRSEARCH_NEXT) !=0;
Point aPt(rPnt);
return aHdl.IsHdlListHit(aPt,bBack,bNext,pHdl0);
}
-sal_Bool SdrMarkView::MarkObj(const Point& rPnt, short nTol, sal_Bool bToggle, sal_Bool bDeep)
+bool SdrMarkView::MarkObj(const Point& rPnt, short nTol, bool bToggle, bool bDeep)
{
SdrObject* pObj;
SdrPageView* pPV;
nTol=ImpGetHitTolLogic(nTol,NULL);
sal_uIntPtr nOptions=SDRSEARCH_PICKMARKABLE;
if (bDeep) nOptions=nOptions|SDRSEARCH_DEEP;
- sal_Bool bRet=PickObj(rPnt,(sal_uInt16)nTol,pObj,pPV,nOptions);
+ bool bRet=PickObj(rPnt,(sal_uInt16)nTol,pObj,pPV,nOptions);
if (bRet) {
- sal_Bool bUnmark=bToggle && IsObjMarked(pObj);
+ bool bUnmark=bToggle && IsObjMarked(pObj);
MarkObj(pObj,pPV,bUnmark);
}
return bRet;
}
-sal_Bool SdrMarkView::MarkNextObj(sal_Bool bPrev)
+bool SdrMarkView::MarkNextObj(bool bPrev)
{
SdrPageView* pPageView = GetSdrPageView();
if(!pPageView)
{
- return sal_False;
+ return false;
}
SortMarkedObjects();
@@ -1375,7 +1375,7 @@ sal_Bool SdrMarkView::MarkNextObj(sal_Bool bPrev)
if(!pMarkObj)
{
- return sal_False;
+ return false;
}
if (nChgMarkNum!=ULONG_MAX)
@@ -1383,10 +1383,10 @@ sal_Bool SdrMarkView::MarkNextObj(sal_Bool bPrev)
GetMarkedObjectListWriteAccess().DeleteMark(nChgMarkNum);
}
MarkObj(pMarkObj,pPageView); // also calls MarkListHasChanged(), AdjustMarkHdl()
- return sal_True;
+ return true;
}
-sal_Bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, sal_Bool bPrev)
+bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev)
{
SortMarkedObjects();
nTol=ImpGetHitTolLogic(nTol,NULL);
@@ -1408,7 +1408,7 @@ sal_Bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, sal_Bool bPrev)
}
}
// nothing found, in this case, just select an object
- if (pTopMarkHit==NULL) return MarkObj(rPnt,sal_uInt16(nTol),sal_False);
+ if (pTopMarkHit==NULL) return MarkObj(rPnt,sal_uInt16(nTol),false);
SdrObject* pTopObjHit=pTopMarkHit->GetMarkedSdrObj();
SdrObjList* pObjList=pTopObjHit->GetObjList();
@@ -1493,9 +1493,9 @@ sal_Bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, sal_Bool bPrev)
return pFndObj!=NULL;
}
-sal_Bool SdrMarkView::MarkObj(const Rectangle& rRect, sal_Bool bUnmark)
+bool SdrMarkView::MarkObj(const Rectangle& rRect, bool bUnmark)
{
- sal_Bool bFnd=sal_False;
+ bool bFnd=false;
Rectangle aR(rRect);
SdrObjList* pObjList;
BrkAction();
@@ -1515,14 +1515,14 @@ sal_Bool SdrMarkView::MarkObj(const Rectangle& rRect, sal_Bool bUnmark)
if (IsObjMarkable(pObj,pPV))
{
GetMarkedObjectListWriteAccess().InsertEntry(SdrMark(pObj,pPV));
- bFnd=sal_True;
+ bFnd=true;
}
} else {
sal_uIntPtr nPos=TryToFindMarkedObject(pObj);
if (nPos!=CONTAINER_ENTRY_NOTFOUND)
{
GetMarkedObjectListWriteAccess().DeleteMark(nPos);
- bFnd=sal_True;
+ bFnd=true;
}
}
}
@@ -1536,7 +1536,7 @@ sal_Bool SdrMarkView::MarkObj(const Rectangle& rRect, sal_Bool bUnmark)
return bFnd;
}
-void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark, sal_Bool bImpNoSetMarkHdl)
+void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, bool bUnmark, bool bImpNoSetMarkHdl)
{
if (pObj!=NULL && pPV!=NULL && IsObjMarkable(pObj, pPV)) {
BrkAction();
@@ -1559,7 +1559,7 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark, s
}
}
-sal_Bool SdrMarkView::IsObjMarked(SdrObject* pObj) const
+bool SdrMarkView::IsObjMarked(SdrObject* pObj) const
{
// Hack: Because FindObject() is not const,
// I have to cast myself to non-const.
@@ -1696,12 +1696,12 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nT
return pRet;
}
-sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions) const
+bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions) const
{
return PickObj(rPnt,nTol,rpObj,rpPV,nOptions,NULL,NULL,NULL);
}
-sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum, sal_uInt16* pnPassNum) const
+bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum, sal_uInt16* pnPassNum) const
{ // TODO: lacks a Pass2,Pass3
SortMarkedObjects();
if (ppRootObj!=NULL) *ppRootObj=NULL;
@@ -1820,7 +1820,7 @@ sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj,
return rpObj!=NULL;
}
-sal_Bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum, sal_uIntPtr nOptions) const
+bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum, sal_uIntPtr nOptions) const
{
SortMarkedObjects();
bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0;
@@ -1830,7 +1830,7 @@ sal_Bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPag
if (pnMarkNum!=NULL) *pnMarkNum=CONTAINER_ENTRY_NOTFOUND;
Point aPt(rPnt);
sal_uInt16 nTol=(sal_uInt16)nHitTolLog;
- sal_Bool bFnd=sal_False;
+ bool bFnd=false;
sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
sal_uIntPtr nMarkNum;
for (nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) {
@@ -1861,7 +1861,7 @@ sal_Bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPag
aRect.Right ()+=nTol;
aRect.Bottom()+=nTol;
if (aRect.IsInside(aPt)) {
- bFnd=sal_True;
+ bFnd=true;
rpObj=pObj;
rpPV=pPV;
if (pnMarkNum!=NULL) *pnMarkNum=nMarkNum;
@@ -2022,9 +2022,9 @@ void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr,
-sal_Bool SdrMarkView::EnterMarkedGroup()
+bool SdrMarkView::EnterMarkedGroup()
{
- sal_Bool bRet=sal_False;
+ bool bRet=false;
// We enter only the first group found (in only one PageView), because
// PageView::EnterGroup calls an AdjustMarkHdl.
// TODO: I'll have to prevent that via a flag.
@@ -2041,7 +2041,7 @@ sal_Bool SdrMarkView::EnterMarkedGroup()
SdrObject* pObj=pM->GetMarkedSdrObj();
if (pObj->IsGroupObject()) {
if (pPV->EnterGroup(pObj)) {
- bRet=sal_True;
+ bRet=true;
bEnter=true;
}
}
@@ -2063,7 +2063,7 @@ void SdrMarkView::MarkListHasChanged()
#ifdef DBG_UTIL
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
#endif
- sal_Bool bOneEdgeMarked=sal_False;
+ bool bOneEdgeMarked=false;
if (GetMarkedObjectCount()==1) {
const SdrObject* pObj=GetMarkedObjectByIndex(0);
if (pObj->GetObjInventor()==SdrInventor) {
@@ -2076,7 +2076,7 @@ void SdrMarkView::MarkListHasChanged()
-void SdrMarkView::SetMoveOutside(sal_Bool bOn)
+void SdrMarkView::SetMoveOutside(bool bOn)
{
aHdl.SetMoveOutside(bOn);
}
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 63f9b5ee57d3..8ff28e3d1b07 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -30,7 +30,7 @@
// Point Selection
-sal_Bool SdrMarkView::HasMarkablePoints() const
+bool SdrMarkView::HasMarkablePoints() const
{
ForceUndirtyMrkPnt();
bool bRet=false;
@@ -66,10 +66,10 @@ sal_uIntPtr SdrMarkView::GetMarkablePointCount() const
return nAnz;
}
-sal_Bool SdrMarkView::HasMarkedPoints() const
+bool SdrMarkView::HasMarkedPoints() const
{
ForceUndirtyMrkPnt();
- sal_Bool bRet=sal_False;
+ bool bRet=false;
if (!ImpIsFrameHandles()) {
sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
if (nMarkAnz<=nFrameHandlesLimit) {
@@ -100,33 +100,33 @@ sal_uIntPtr SdrMarkView::GetMarkedPointCount() const
return nAnz;
}
-sal_Bool SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const
+bool SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const
{
return !ImpIsFrameHandles() && &rHdl!=NULL && !rHdl.IsPlusHdl() && rHdl.GetKind()!=HDL_GLUE && rHdl.GetKind()!=HDL_SMARTTAG && rHdl.GetObj()!=NULL && rHdl.GetObj()->IsPolyObj();
}
-sal_Bool SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark)
+bool SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark)
{
return ImpMarkPoint( pHdl, pMark, bUnmark );
}
-sal_Bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark)
+bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark)
{
if (pHdl==NULL || pHdl->IsPlusHdl() || pHdl->GetKind()==HDL_GLUE)
- return sal_False;
+ return false;
if (pHdl->IsSelected() != bUnmark)
- return sal_False;
+ return false;
SdrObject* pObj=pHdl->GetObj();
if (pObj==NULL || !pObj->IsPolyObj())
- return sal_False;
+ return false;
if (pMark==NULL)
{
sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj);
if (nMarkNum==CONTAINER_ENTRY_NOTFOUND)
- return sal_False;
+ return false;
pMark=GetSdrMarkByIndex(nMarkNum);
}
const sal_uInt32 nHdlNum(pHdl->GetObjHdlNum());
@@ -144,7 +144,7 @@ sal_Bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmar
}
else
{
- return sal_False; // error case!
+ return false; // error case!
}
}
@@ -161,7 +161,7 @@ sal_Bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmar
{
pPlusHdl->SetObj(pObj);
pPlusHdl->SetPageView(pMark->GetPageView());
- pPlusHdl->SetPlusHdl(sal_True);
+ pPlusHdl->SetPlusHdl(true);
aHdl.AddHdl(pPlusHdl);
}
}
@@ -183,15 +183,15 @@ sal_Bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmar
aHdl.Sort();
- return sal_True;
+ return true;
}
-sal_Bool SdrMarkView::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark)
+bool SdrMarkView::MarkPoint(SdrHdl& rHdl, bool bUnmark)
{
- if (&rHdl==NULL) return sal_False;
+ if (&rHdl==NULL) return false;
ForceUndirtyMrkPnt();
- sal_Bool bRet=sal_False;
+ bool bRet=false;
const SdrObject* pObj=rHdl.GetObj();
if (IsPointMarkable(rHdl) && rHdl.IsSelected()==bUnmark) {
sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj);
@@ -200,7 +200,7 @@ sal_Bool SdrMarkView::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark)
pM->ForceMarkedPoints();
if (ImpMarkPoint(&rHdl,pM,bUnmark)) {
MarkListHasChanged();
- bRet=sal_True;
+ bRet=true;
}
}
}
@@ -208,10 +208,10 @@ sal_Bool SdrMarkView::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark)
return bRet;
}
-sal_Bool SdrMarkView::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark)
+bool SdrMarkView::MarkPoints(const Rectangle* pRect, bool bUnmark)
{
ForceUndirtyMrkPnt();
- sal_Bool bChgd=sal_False;
+ bool bChgd=false;
SortMarkedObjects();
const SdrObject* pObj0=NULL;
const SdrPageView* pPV0=NULL;
@@ -242,7 +242,7 @@ sal_Bool SdrMarkView::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark)
}
Point aPos(pHdl->GetPos());
if (pM!=NULL && (pRect==NULL || pRect->IsInside(aPos))) {
- if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=sal_True;
+ if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=true;
}
}
}
@@ -253,10 +253,10 @@ sal_Bool SdrMarkView::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark)
return bChgd;
}
-sal_Bool SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/)
+bool SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, bool /*bPrev*/)
{
ForceUndirtyMrkPnt();
- sal_Bool bChgd=sal_False;
+ bool bChgd=false;
SortMarkedObjects();
if (bChgd) {
@@ -318,7 +318,7 @@ void SdrMarkView::ImpSetPointsRects() const
void SdrMarkView::UndirtyMrkPnt() const
{
- sal_Bool bChg=sal_False;
+ bool bChg=false;
sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
@@ -335,7 +335,7 @@ void SdrMarkView::UndirtyMrkPnt() const
if( it != pPts->end() )
{
pPts->erase(it, pPts->end() );
- bChg = sal_True;
+ bChg = true;
}
}
else
@@ -344,7 +344,7 @@ void SdrMarkView::UndirtyMrkPnt() const
if(pPts && !pPts->empty())
{
pPts->clear();
- bChg = sal_True;
+ bChg = true;
}
}
}
@@ -362,7 +362,7 @@ void SdrMarkView::UndirtyMrkPnt() const
sal_uInt16 nId=*it;
if (pGPL->FindGluePoint(nId)==SDRGLUEPOINT_NOTFOUND) {
pPts->erase(it++);
- bChg=sal_True;
+ bChg=true;
}
else
++it;
@@ -370,7 +370,7 @@ void SdrMarkView::UndirtyMrkPnt() const
} else {
if (pPts!=NULL && !pPts->empty()) {
pPts->clear(); // object doesn't have any glue points (any more)
- bChg=sal_True;
+ bChg=true;
}
}
}
@@ -381,9 +381,9 @@ void SdrMarkView::UndirtyMrkPnt() const
-sal_Bool SdrMarkView::HasMarkableGluePoints() const
+bool SdrMarkView::HasMarkableGluePoints() const
{
- sal_Bool bRet=sal_False;
+ bool bRet=false;
if (IsGluePointEditMode()) {
ForceUndirtyMrkPnt();
sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
@@ -399,7 +399,7 @@ sal_Bool SdrMarkView::HasMarkableGluePoints() const
{
if((*pGPL)[a].IsUserDefined())
{
- bRet = sal_True;
+ bRet = true;
}
}
}
@@ -408,10 +408,10 @@ sal_Bool SdrMarkView::HasMarkableGluePoints() const
return bRet;
}
-sal_Bool SdrMarkView::HasMarkedGluePoints() const
+bool SdrMarkView::HasMarkedGluePoints() const
{
ForceUndirtyMrkPnt();
- sal_Bool bRet=sal_False;
+ bool bRet=false;
sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
@@ -421,11 +421,11 @@ sal_Bool SdrMarkView::HasMarkedGluePoints() const
return bRet;
}
-sal_Bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark)
+bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, bool bUnmark)
{
- if (!IsGluePointEditMode() && !bUnmark) return sal_False;
+ if (!IsGluePointEditMode() && !bUnmark) return false;
ForceUndirtyMrkPnt();
- sal_Bool bChgd=sal_False;
+ bool bChgd=false;
SortMarkedObjects();
sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
@@ -436,7 +436,7 @@ sal_Bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark)
if (bUnmark && pRect==NULL) { // UnmarkAll
if (pPts!=NULL && !pPts->empty()) {
pPts->clear();
- bChgd=sal_True;
+ bChgd=true;
}
} else {
if (pGPL!=NULL && (pPts!=NULL || !bUnmark)) {
@@ -453,11 +453,11 @@ sal_Bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark)
pPts=pM->ForceMarkedGluePoints();
bool bContains = pPts->find( rGP.GetId() ) != pPts->end();
if (!bUnmark && !bContains) {
- bChgd=sal_True;
+ bChgd=true;
pPts->insert(rGP.GetId());
}
if (bUnmark && bContains) {
- bChgd=sal_True;
+ bChgd=true;
pPts->erase(rGP.GetId());
}
}
@@ -473,23 +473,23 @@ sal_Bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark)
return bChgd;
}
-sal_Bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions) const
+bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions) const
{
SdrObject* pObj0=rpObj;
sal_uInt16 nId0=rnId;
rpObj=NULL; rpPV=NULL; rnId=0;
- if (!IsGluePointEditMode()) return sal_False;
- sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
- sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0;
+ if (!IsGluePointEditMode()) return false;
+ bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
+ bool bNext=(nOptions & SDRSEARCH_NEXT) !=0;
OutputDevice* pOut=(OutputDevice*)pActualOutDev;
if (pOut==NULL) pOut=GetFirstOutputDevice();
- if (pOut==NULL) return sal_False;
+ if (pOut==NULL) return false;
SortMarkedObjects();
sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
sal_uIntPtr nMarkNum=bBack ? 0 : nMarkAnz;
if (bNext) {
nMarkNum=((SdrMarkView*)this)->TryToFindMarkedObject(pObj0);
- if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) return sal_False;
+ if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) return false;
if (!bBack) nMarkNum++;
}
while (bBack ? nMarkNum<nMarkAnz : nMarkNum>0) {
@@ -510,21 +510,21 @@ sal_Bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uI
rpObj=pObj;
rnId=(*pGPL)[nNum].GetId();
rpPV=pPV;
- return sal_True;
+ return true;
}
}
}
- bNext=sal_False; // HitNextGluePoint only for the first Obj
+ bNext=false; // HitNextGluePoint only for the first Obj
if (bBack) nMarkNum++;
}
- return sal_False;
+ return false;
}
-sal_Bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* /*pPV*/, sal_Bool bUnmark)
+bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* /*pPV*/, bool bUnmark)
{
- if (!IsGluePointEditMode()) return sal_False;
+ if (!IsGluePointEditMode()) return false;
ForceUndirtyMrkPnt();
- sal_Bool bChgd=sal_False;
+ bool bChgd=false;
if (pObj!=NULL) {
sal_uIntPtr nMarkPos=TryToFindMarkedObject(pObj);
if (nMarkPos!=CONTAINER_ENTRY_NOTFOUND) {
@@ -533,11 +533,11 @@ sal_Bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const
if (pPts!=NULL) {
bool bContains = pPts->find( nId ) != pPts->end();
if (!bUnmark && !bContains) {
- bChgd=sal_True;
+ bChgd=true;
pPts->insert(nId);
}
if (bUnmark && bContains) {
- bChgd=sal_True;
+ bChgd=true;
pPts->erase(nId);
}
}
@@ -552,10 +552,10 @@ sal_Bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const
return bChgd;
}
-sal_Bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const
+bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const
{
ForceUndirtyMrkPnt();
- sal_Bool bRet=sal_False;
+ bool bRet=false;
sal_uIntPtr nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); // casting to NonConst
if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
const SdrMark* pM=GetSdrMarkByIndex(nPos);
@@ -580,10 +580,10 @@ SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) cons
return NULL;
}
-sal_Bool SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/)
+bool SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, bool /*bPrev*/)
{
ForceUndirtyMrkPnt();
- sal_Bool bChgd=sal_False;
+ bool bChgd=false;
SortMarkedObjects();
if (bChgd) {
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index db996ba1ef13..dee596023efa 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -205,7 +205,7 @@ static bool ImpVerticalSwitch( const SdrObjCustomShape& rCustoShape )
SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemSet& rOriginalSet)
{
SdrObject* pRetval = 0L;
- const sal_Bool bShadow(((SdrShadowItem&)rOriginalSet.Get(SDRATTR_SHADOW)).GetValue());
+ const bool bShadow(((SdrShadowItem&)rOriginalSet.Get(SDRATTR_SHADOW)).GetValue());
if(bShadow)
{
@@ -458,7 +458,7 @@ const SdrObject* SdrObjCustomShape::GetSdrObjectShadowFromCustomShape() const
if(pSdrObject)
{
const SfxItemSet& rOriginalSet = GetObjectItemSet();
- const sal_Bool bShadow(((SdrShadowItem&)rOriginalSet.Get( SDRATTR_SHADOW )).GetValue());
+ const bool bShadow(((SdrShadowItem&)rOriginalSet.Get( SDRATTR_SHADOW )).GetValue());
if(bShadow)
{
@@ -472,10 +472,10 @@ const SdrObject* SdrObjCustomShape::GetSdrObjectShadowFromCustomShape() const
return mpLastShadowGeometry;
}
-sal_Bool SdrObjCustomShape::IsTextPath() const
+bool SdrObjCustomShape::IsTextPath() const
{
const OUString sTextPath( "TextPath" );
- sal_Bool bTextPathOn = sal_False;
+ bool bTextPathOn = false;
SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sTextPath );
if ( pAny )
@@ -483,9 +483,9 @@ sal_Bool SdrObjCustomShape::IsTextPath() const
return bTextPathOn;
}
-sal_Bool SdrObjCustomShape::UseNoFillStyle() const
+bool SdrObjCustomShape::UseNoFillStyle() const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
OUString sShapeType;
const OUString sType( "Type" );
SdrCustomShapeGeometryItem& rGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
@@ -497,9 +497,9 @@ sal_Bool SdrObjCustomShape::UseNoFillStyle() const
return bRet;
}
-sal_Bool SdrObjCustomShape::IsMirroredX() const
+bool SdrObjCustomShape::IsMirroredX() const
{
- sal_Bool bMirroredX = sal_False;
+ bool bMirroredX = false;
SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
const OUString sMirroredX( "MirroredX" );
com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredX );
@@ -507,9 +507,9 @@ sal_Bool SdrObjCustomShape::IsMirroredX() const
*pAny >>= bMirroredX;
return bMirroredX;
}
-sal_Bool SdrObjCustomShape::IsMirroredY() const
+bool SdrObjCustomShape::IsMirroredY() const
{
- sal_Bool bMirroredY = sal_False;
+ bool bMirroredY = false;
SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
const OUString sMirroredY( "MirroredY" );
com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredY );
@@ -517,7 +517,7 @@ sal_Bool SdrObjCustomShape::IsMirroredY() const
*pAny >>= bMirroredY;
return bMirroredY;
}
-void SdrObjCustomShape::SetMirroredX( const sal_Bool bMirrorX )
+void SdrObjCustomShape::SetMirroredX( const bool bMirrorX )
{
SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
const OUString sMirroredX( "MirroredX" );
@@ -527,7 +527,7 @@ void SdrObjCustomShape::SetMirroredX( const sal_Bool bMirrorX )
aGeometryItem.SetPropertyValue( aPropVal );
SetMergedItem( aGeometryItem );
}
-void SdrObjCustomShape::SetMirroredY( const sal_Bool bMirrorY )
+void SdrObjCustomShape::SetMirroredY( const bool bMirrorY )
{
SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
const OUString sMirroredY( "MirroredY" );
@@ -567,9 +567,9 @@ double SdrObjCustomShape::GetExtraTextRotation( const bool bPreRotation ) const
return fExtraTextRotateAngle;
}
-sal_Bool SdrObjCustomShape::GetTextBounds( Rectangle& rTextBound ) const
+bool SdrObjCustomShape::GetTextBounds( Rectangle& rTextBound ) const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
Reference< XCustomShapeEngine > xCustomShapeEngine( GetCustomShapeEngine() );
if ( xCustomShapeEngine.is() )
@@ -578,12 +578,12 @@ sal_Bool SdrObjCustomShape::GetTextBounds( Rectangle& rTextBound ) const
if ( aR.Width > 1 && aR.Height > 1 )
{
rTextBound = Rectangle( Point( aR.X, aR.Y ), Size( aR.Width, aR.Height ) );
- bRet = sal_True;
+ bRet = true;
}
}
return bRet;
}
-basegfx::B2DPolyPolygon SdrObjCustomShape::GetLineGeometry( const SdrObjCustomShape* pCustomShape, const sal_Bool bBezierAllowed )
+basegfx::B2DPolyPolygon SdrObjCustomShape::GetLineGeometry( const SdrObjCustomShape* pCustomShape, const bool bBezierAllowed )
{
basegfx::B2DPolyPolygon aRetval;
Reference< XCustomShapeEngine > xCustomShapeEngine( pCustomShape->GetCustomShapeEngine() );
@@ -751,21 +751,21 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s
if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_X )
{
const OUString sMirroredX( "MirroredX" );
- sal_Bool bMirroredX = sal_True;
+ bool bMirroredX = true;
rPropValues[ n ].Name = sMirroredX;
rPropValues[ n++ ].Value <<= bMirroredX;
}
if ( nFlags & MSDFF_HANDLE_FLAGS_MIRRORED_Y )
{
const OUString sMirroredY( "MirroredY" );
- sal_Bool bMirroredY = sal_True;
+ bool bMirroredY = true;
rPropValues[ n ].Name = sMirroredY;
rPropValues[ n++ ].Value <<= bMirroredY;
}
if ( nFlags & MSDFF_HANDLE_FLAGS_SWITCHED )
{
const OUString sSwitched( "Switched" );
- sal_Bool bSwitched = sal_True;
+ bool bSwitched = true;
rPropValues[ n ].Name = sSwitched;
rPropValues[ n++ ].Value <<= bSwitched;
}
@@ -855,7 +855,7 @@ SdrObjCustomShape::SdrObjCustomShape() :
mpLastShadowGeometry(0L)
{
bClosedObj = true; // custom shapes may be filled
- bTextFrame = sal_True;
+ bTextFrame = true;
}
SdrObjCustomShape::~SdrObjCustomShape()
@@ -1106,9 +1106,9 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
SetMergedItem( aGeometryItem );
}
-sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) const
+bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) const
{
- sal_Bool bIsDefaultGeometry = sal_False;
+ bool bIsDefaultGeometry = false;
PropertyValue aPropVal;
OUString sShapeType;
@@ -1134,7 +1134,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
{
if ( ( aViewBox.Width == pDefCustomShape->nCoordWidth )
&& ( aViewBox.Height == pDefCustomShape->nCoordHeight ) )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
}
break;
@@ -1156,11 +1156,11 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqCoordinates2[ i ].Second, pDefCustomShape->pVertices[ i ].nValB );
}
if ( seqCoordinates1 == seqCoordinates2 )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
}
else if ( pDefCustomShape && ( ( pDefCustomShape->nVertices == 0 ) || ( pDefCustomShape->pVertices == 0 ) ) )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
break;
@@ -1181,11 +1181,11 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqGluePoints2[ i ].Second, pDefCustomShape->pGluePoints[ i ].nValB );
}
if ( seqGluePoints1 == seqGluePoints2 )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
}
else if ( pDefCustomShape && ( pDefCustomShape->nGluePoints == 0 ) )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
break;
@@ -1212,7 +1212,7 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
lcl_ShapeSegmentFromBinary( rSegInfo, nSDat );
}
if ( seqSegments1 == seqSegments2 )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
}
else
@@ -1224,13 +1224,13 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
&& ( seqSegments1[ 1 ].Command == EnhancedCustomShapeSegmentCommand::LINETO )
&& ( seqSegments1[ 2 ].Command == EnhancedCustomShapeSegmentCommand::CLOSESUBPATH )
&& ( seqSegments1[ 3 ].Command == EnhancedCustomShapeSegmentCommand::ENDSUBPATH ) )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
}
}
}
else if ( pDefCustomShape && ( ( pDefCustomShape->nElements == 0 ) || ( pDefCustomShape->pElements == 0 ) ) )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
break;
@@ -1244,11 +1244,11 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
if ( *pAny >>= nStretchX )
{
if ( pDefCustomShape->nXRef == nStretchX )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
}
else if ( pDefCustomShape && ( pDefCustomShape->nXRef == DEFAULT_MINIMUM_SIGNED_COMPARE ) )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
break;
@@ -1262,11 +1262,11 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
if ( *pAny >>= nStretchY )
{
if ( pDefCustomShape->nYRef == nStretchY )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
}
else if ( pDefCustomShape && ( pDefCustomShape->nYRef == DEFAULT_MINIMUM_SIGNED_COMPARE ) )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
break;
@@ -1287,11 +1287,11 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
seqEquations2[ i ] = EnhancedCustomShape2d::GetEquation( pData->nFlags, pData->nVal[ 0 ], pData->nVal[ 1 ], pData->nVal[ 2 ] );
if ( seqEquations1 == seqEquations2 )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
}
else if ( pDefCustomShape && ( ( pDefCustomShape->nCalculation == 0 ) || ( pDefCustomShape->pCalculation == 0 ) ) )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
break;
@@ -1315,11 +1315,11 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqTextFrames2[ i ].BottomRight.Second, pRectangles->nPairB.nValB );
}
if ( seqTextFrames1 == seqTextFrames2 )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
}
else if ( pDefCustomShape && ( ( pDefCustomShape->nTextRect == 0 ) || ( pDefCustomShape->pTextRect == 0 ) ) )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
break;
@@ -1344,11 +1344,11 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
lcl_ShapePropertiesFromDFF( pData, rPropValues );
}
if ( seqHandles1 == seqHandles2 )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
}
else if ( pDefCustomShape && ( ( pDefCustomShape->nHandles == 0 ) || ( pDefCustomShape->pHandles == 0 ) ) )
- bIsDefaultGeometry = sal_True;
+ bIsDefaultGeometry = true;
}
break;
}
@@ -1564,12 +1564,12 @@ void SdrObjCustomShape::NbcResize( const Point& rRef, const Fraction& rxFact, co
if ( ( ( xFact.GetNumerator() < 0 ) && ( xFact.GetDenominator() > 0 ) ) ||
( ( xFact.GetNumerator() > 0 ) && ( xFact.GetDenominator() < 0 ) ) )
{
- SetMirroredX( IsMirroredX() == sal_False );
+ SetMirroredX( IsMirroredX() == false );
}
if ( ( ( yFact.GetNumerator() < 0 ) && ( yFact.GetDenominator() > 0 ) ) ||
( ( yFact.GetNumerator() > 0 ) && ( yFact.GetDenominator() < 0 ) ) )
{
- SetMirroredY( IsMirroredY() == sal_False );
+ SetMirroredY( IsMirroredY() == false );
}
}
@@ -1599,8 +1599,8 @@ void SdrObjCustomShape::NbcResize( const Point& rRef, const Fraction& rxFact, co
}
void SdrObjCustomShape::NbcRotate( const Point& rRef, long nWink, double sn, double cs )
{
- sal_Bool bMirroredX = IsMirroredX();
- sal_Bool bMirroredY = IsMirroredY();
+ bool bMirroredX = IsMirroredX();
+ bool bMirroredY = IsMirroredY();
fObjectRotation = fmod( fObjectRotation, 360.0 );
if ( fObjectRotation < 0 )
@@ -1777,8 +1777,8 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
aNewList.Insert(aCopy);
}
- sal_Bool bMirroredX = IsMirroredX();
- sal_Bool bMirroredY = IsMirroredY();
+ bool bMirroredX = IsMirroredX();
+ bool bMirroredY = IsMirroredY();
long nShearWink = aGeo.nShearWink;
double fTan = aGeo.nTan;
@@ -1957,8 +1957,8 @@ bool SdrObjCustomShape::beginSpecialDrag(SdrDragStat& rDrag) const
void SdrObjCustomShape::DragResizeCustomShape( const Rectangle& rNewRect, SdrObjCustomShape* pObj ) const
{
Rectangle aOld( pObj->aRect );
- sal_Bool bOldMirroredX( pObj->IsMirroredX() );
- sal_Bool bOldMirroredY( pObj->IsMirroredY() );
+ bool bOldMirroredX( pObj->IsMirroredX() );
+ bool bOldMirroredY( pObj->IsMirroredY() );
Rectangle aNewRect( rNewRect );
aNewRect.Justify();
@@ -2068,7 +2068,7 @@ void SdrObjCustomShape::DragMoveCustomShapeHdl( const Point aDestination, const
pObj->aRect.Move( nXDiff, nYDiff );
pObj->aOutRect.Move( nXDiff, nYDiff );
pObj->maSnapRect.Move( nXDiff, nYDiff );
- pObj->SetRectsDirty(sal_True);
+ pObj->SetRectsDirty(true);
pObj->InvalidateRenderGeometry();
for (std::vector< SdrCustomShapeInteraction >::const_iterator aIter( aInteractionHandles.begin() ), aEnd( aInteractionHandles.end() ) ;
@@ -2222,7 +2222,7 @@ bool SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd )
basegfx::B2DPolyPolygon SdrObjCustomShape::TakeCreatePoly(const SdrDragStat& /*rDrag*/) const
{
- return GetLineGeometry( this, sal_False );
+ return GetLineGeometry( this, false );
}
@@ -2250,7 +2250,7 @@ bool SdrObjCustomShape::IsAutoGrowWidth() const
is that the SdrAutoGrowWidthItem and SdrAutoGrowHeightItem are not exchanged if the vertical writing
mode has been changed */
-void SdrObjCustomShape::SetVerticalWriting( sal_Bool bVertical )
+void SdrObjCustomShape::SetVerticalWriting( bool bVertical )
{
ForceOutlinerParaObject();
@@ -2546,7 +2546,7 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
}
return bRet;
}
-sal_Bool SdrObjCustomShape::BegTextEdit( SdrOutliner& rOutl )
+bool SdrObjCustomShape::BegTextEdit( SdrOutliner& rOutl )
{
return SdrTextObj::BegTextEdit( rOutl );
}
@@ -2803,7 +2803,7 @@ void SdrObjCustomShape::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject
{
SdrTextObj::NbcSetOutlinerParaObject( pTextObject );
SetBoundRectDirty();
- SetRectsDirty(sal_True);
+ SetRectsDirty(true);
InvalidateRenderGeometry();
}
@@ -2845,7 +2845,7 @@ OUString SdrObjCustomShape::TakeObjNamePlural() const
basegfx::B2DPolyPolygon SdrObjCustomShape::TakeXorPoly() const
{
- return GetLineGeometry( (SdrObjCustomShape*)this, sal_False );
+ return GetLineGeometry( (SdrObjCustomShape*)this, false );
}
basegfx::B2DPolyPolygon SdrObjCustomShape::TakeContour() const
@@ -2856,7 +2856,7 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeContour() const
return basegfx::B2DPolyPolygon();
}
-SdrObject* SdrObjCustomShape::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const
+SdrObject* SdrObjCustomShape::DoConvertToPolyObj(bool bBezier, bool bAddText) const
{
// #i37011#
SdrObject* pRetval = 0L;
@@ -2883,7 +2883,7 @@ SdrObject* SdrObjCustomShape::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText
if(pRetval)
{
- const sal_Bool bShadow(((SdrShadowItem&)GetMergedItem(SDRATTR_SHADOW)).GetValue());
+ const bool bShadow(((SdrShadowItem&)GetMergedItem(SDRATTR_SHADOW)).GetValue());
if(bShadow)
{
pRetval->SetMergedItem(SdrShadowItem(true));
@@ -2899,7 +2899,7 @@ SdrObject* SdrObjCustomShape::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText
return pRetval;
}
-void SdrObjCustomShape::NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr )
+void SdrObjCustomShape::NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr )
{
// #i40944#
InvalidateRenderGeometry();
@@ -3058,7 +3058,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix,
}
// taking fObjectRotation instead of aGeo.nWink
-sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const
+bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const
{
// get turn and shear
double fRotate = fObjectRotation * F_PI180;
@@ -3067,8 +3067,8 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba
// get aRect, this is the unrotated snaprect
Rectangle aRectangle(aRect);
- sal_Bool bMirroredX = IsMirroredX();
- sal_Bool bMirroredY = IsMirroredY();
+ bool bMirroredX = IsMirroredX();
+ bool bMirroredY = IsMirroredY();
if ( bMirroredX || bMirroredY )
{ // we have to retrieve the unmirrored rect
@@ -3165,7 +3165,7 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba
basegfx::fTools::equalZero(fRotate) ? 0.0 : -fRotate,
aTranslate);
- return sal_False;
+ return false;
}
sdr::contact::ViewContact* SdrObjCustomShape::CreateObjectSpecificViewContact()
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 9ebd5409aa3e..ba7e8b1aad6e 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -131,7 +131,7 @@ void SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
{
Rectangle aBoundRect = GetLastBoundRect();
SetBoundRectDirty();
- SetRectsDirty(sal_True);
+ SetRectsDirty(true);
// This may have led to object change
SetChanged();
@@ -152,12 +152,12 @@ sal_Int32 SdrAttrObj::ImpGetLineWdt() const
return nRetval;
}
-sal_Bool SdrAttrObj::HasFill() const
+bool SdrAttrObj::HasFill() const
{
return bClosedObj && ((XFillStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_FILLSTYLE))).GetValue()!=XFILL_NONE;
}
-sal_Bool SdrAttrObj::HasLine() const
+bool SdrAttrObj::HasLine() const
{
return ((XLineStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_LINESTYLE))).GetValue()!=XLINE_NONE;
}
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 60b3ff96b62d..c368553177c3 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -535,7 +535,7 @@ SdrObjPlusData* SdrObject::NewPlusData() const
return new SdrObjPlusData;
}
-void SdrObject::SetRectsDirty(sal_Bool bNotMyself)
+void SdrObject::SetRectsDirty(bool bNotMyself)
{
if (!bNotMyself) {
SetBoundRectDirty();
@@ -1773,7 +1773,7 @@ Point SdrObject::GetSnapPoint(sal_uInt32 i) const
return GetPoint(i);
}
-sal_Bool SdrObject::IsPolyObj() const
+bool SdrObject::IsPolyObj() const
{
return false;
}
@@ -1843,7 +1843,7 @@ OString SdrObject::stringify() const
return aString.makeStringAndClear();
}
-sal_Bool SdrObject::BegTextEdit(SdrOutliner& /*rOutl*/)
+bool SdrObject::BegTextEdit(SdrOutliner& /*rOutl*/)
{
return false;
}
@@ -2367,7 +2367,7 @@ void SdrObject::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHar
SendUserCall(SDRUSERCALL_CHGATTR, aBoundRect0);
}
-void SdrObject::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr)
+void SdrObject::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
// only allow graphic and presentation styles for shapes
if( pNewStyleSheet && (pNewStyleSheet->GetFamily() == SFX_STYLE_FAMILY_PARA) && (pNewStyleSheet->GetFamily() == SFX_STYLE_FAMILY_PAGE) )
@@ -2842,7 +2842,7 @@ SdrObject* SdrObject::ConvertToPolyObj(bool bBezier, bool bLineToArea) const
-SdrObject* SdrObject::DoConvertToPolyObj(sal_Bool /*bBezier*/, bool /*bAddText*/) const
+SdrObject* SdrObject::DoConvertToPolyObj(bool /*bBezier*/, bool /*bAddText*/) const
{
return NULL;
}
@@ -3175,7 +3175,7 @@ void SdrObject::notifyShapePropertyChange( const ::svx::ShapeProperty _eProperty
// gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon
// with the base geometry and returns TRUE. Otherwise it returns FALSE.
-sal_Bool SdrObject::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const
+bool SdrObject::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const
{
// any kind of SdrObject, just use SnapRect
Rectangle aRectangle(GetSnapRect());
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 3a91a5630981..ecdb33d51b45 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -194,16 +194,16 @@ TYPEINIT1(SdrCaptionObj,SdrRectObj);
SdrCaptionObj::SdrCaptionObj():
SdrRectObj(OBJ_TEXT),
aTailPoly(3), // default size: 3 points = 2 lines
- mbSpecialTextBoxShadow(sal_False),
- mbFixedTail(sal_False)
+ mbSpecialTextBoxShadow(false),
+ mbFixedTail(false)
{
}
SdrCaptionObj::SdrCaptionObj(const Rectangle& rRect, const Point& rTail):
SdrRectObj(OBJ_TEXT,rRect),
aTailPoly(3), // default size: 3 points = 2 lines
- mbSpecialTextBoxShadow(sal_False),
- mbFixedTail(sal_False)
+ mbSpecialTextBoxShadow(false),
+ mbFixedTail(false)
{
aTailPoly[0]=maFixedTailPos=rTail;
}
@@ -738,10 +738,10 @@ void SdrCaptionObj::RestGeoData(const SdrObjGeoData& rGeo)
aTailPoly=rCGeo.aTailPoly;
}
-SdrObject* SdrCaptionObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const
+SdrObject* SdrCaptionObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
{
SdrObject* pRect=SdrRectObj::DoConvertToPolyObj(bBezier, bAddText);
- SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), sal_False, bBezier);
+ SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), false, bBezier);
SdrObject* pRet=(pTail!=NULL) ? pTail : pRect;
if (pTail!=NULL && pRect!=NULL) {
bool bInsRect = true;
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 21d47318ab62..cb39bb5dc865 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -808,7 +808,7 @@ void SdrCircObj::NbcMove(const Size& aSiz)
MoveRect(aOutRect,aSiz);
MoveRect(maSnapRect,aSiz);
SetXPolyDirty();
- SetRectsDirty(sal_True);
+ SetRectsDirty(true);
}
void SdrCircObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
@@ -1144,7 +1144,7 @@ void SdrCircObj::ImpSetCircInfoToAttr()
}
}
-SdrObject* SdrCircObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const
+SdrObject* SdrCircObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
{
const sal_Bool bFill(OBJ_CARC == meCircleKind ? sal_False : sal_True);
const basegfx::B2DPolygon aCircPolygon(ImpCalcXPolyCirc(meCircleKind, aRect, nStartWink, nEndWink));
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 70a6c2d890fd..ce6d78bd9c5f 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1018,7 +1018,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
if (aBewR1.Right()>aBewR2.Left()) {
/* Cases 2.8, 2.9:
Case 2.8: always going around on the outside
- (bDirect=sal_False).
+ (bDirect=false).
Case 2.9 could also be a direct connection (in the
case that the BewareRects overlap only slightly and
@@ -1079,7 +1079,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
// overlap on y axis; cases 2.1, 2.8, 2.9
if (aBewR1.Bottom()>aBewR2.Top()) {
/* Cases 2.8, 2.9
- Case 2.8 always going around on the outside (bDirect=sal_False).
+ Case 2.8 always going around on the outside (bDirect=false).
Case 2.9 could also be a direct connection (in the
case that the BewareRects overlap only slightly and
@@ -1753,10 +1753,10 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const
if (nPntAnz!=0) {
if (nHdlNum==0) {
pHdl=new ImpEdgeHdl((*pEdgeTrack)[0],HDL_POLY);
- if (aCon1.pObj!=NULL && aCon1.bBestVertex) pHdl->Set1PixMore(sal_True);
+ if (aCon1.pObj!=NULL && aCon1.bBestVertex) pHdl->Set1PixMore(true);
} else if (nHdlNum==1) {
pHdl=new ImpEdgeHdl((*pEdgeTrack)[sal_uInt16(nPntAnz-1)],HDL_POLY);
- if (aCon2.pObj!=NULL && aCon2.bBestVertex) pHdl->Set1PixMore(sal_True);
+ if (aCon2.pObj!=NULL && aCon2.bBestVertex) pHdl->Set1PixMore(true);
} else {
SdrEdgeKind eKind=((SdrEdgeKindItem&)(GetObjectItem(SDRATTR_EDGEKIND))).GetValue();
if (eKind==SDREDGE_ORTHOLINES || eKind==SDREDGE_BEZIER) {
@@ -2368,11 +2368,11 @@ void SdrEdgeObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear
}
}
-SdrObject* SdrEdgeObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const
+SdrObject* SdrEdgeObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
{
basegfx::B2DPolyPolygon aPolyPolygon;
aPolyPolygon.append(pEdgeTrack->getB2DPolygon());
- SdrObject* pRet = ImpConvertMakeObj(aPolyPolygon, sal_False, bBezier);
+ SdrObject* pRet = ImpConvertMakeObj(aPolyPolygon, false, bBezier);
if(bAddText)
{
@@ -2395,9 +2395,9 @@ Point SdrEdgeObj::GetSnapPoint(sal_uInt32 i) const
else return (*pEdgeTrack)[nAnz-1];
}
-sal_Bool SdrEdgeObj::IsPolyObj() const
+bool SdrEdgeObj::IsPolyObj() const
{
- return sal_False;
+ return false;
}
sal_uInt32 SdrEdgeObj::GetPointCount() const
@@ -2477,7 +2477,7 @@ void SdrEdgeObj::RestGeoData(const SdrObjGeoData& rGeo)
aEdgeInfo =rEGeo.aEdgeInfo;
}
-Point SdrEdgeObj::GetTailPoint( sal_Bool bTail ) const
+Point SdrEdgeObj::GetTailPoint( bool bTail ) const
{
if( pEdgeTrack && pEdgeTrack->GetPointCount()!=0)
{
@@ -2502,7 +2502,7 @@ Point SdrEdgeObj::GetTailPoint( sal_Bool bTail ) const
}
-void SdrEdgeObj::SetTailPoint( sal_Bool bTail, const Point& rPt )
+void SdrEdgeObj::SetTailPoint( bool bTail, const Point& rPt )
{
ImpSetTailPoint( bTail, rPt );
SetChanged();
@@ -2513,7 +2513,7 @@ void SdrEdgeObj::SetTailPoint( sal_Bool bTail, const Point& rPt )
0 <= nId <= 3 : One of the default points is chosen
nId >= 4 : A user defined glue point is chosen
*/
-void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */ )
+void SdrEdgeObj::setGluePointIndex( bool bTail, sal_Int32 nIndex /* = -1 */ )
{
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetCurrentBoundRect();
@@ -2547,7 +2547,7 @@ void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */
/** this method is used by the api to return a glue point id for a connection.
See setGluePointId for possible return values */
-sal_Int32 SdrEdgeObj::getGluePointIndex( sal_Bool bTail )
+sal_Int32 SdrEdgeObj::getGluePointIndex( bool bTail )
{
SdrObjConnection& rConn1 = GetConnection( bTail );
sal_Int32 nId = -1;
@@ -2570,7 +2570,7 @@ void SdrEdgeObj::NbcSetAnchorPos(const Point& rPnt)
ImpDirtyEdgeTrack();
}
-sal_Bool SdrEdgeObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const
+bool SdrEdgeObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const
{
// use base method from SdrObject, it's not rotatable and
// a call to GetSnapRect() is used. That's what we need for Connector.
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 403e57d8c1da..89f700244168 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -1062,7 +1062,7 @@ GDIMetaFile SdrGrafObj::getMetafileFromEmbeddedSvg() const
return aRetval;
}
-SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText ) const
+SdrObject* SdrGrafObj::DoConvertToPolyObj(bool bBezier, bool bAddText ) const
{
SdrObject* pRetval = NULL;
GraphicType aGraphicType(GetGraphicType());
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 59255e269d05..603860b10040 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -766,7 +766,7 @@ void SdrObjGroup::ReformatText()
pSub->ReformatAllTextObjects();
}
-SdrObject* SdrObjGroup::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const
+SdrObject* SdrObjGroup::DoConvertToPolyObj(bool bBezier, bool bAddText) const
{
SdrObject* pGroup = new SdrObjGroup;
pGroup->SetModel(GetModel());
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index c4f2b1a9f4b0..0eace2ffb8dd 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -636,7 +636,7 @@ void SdrMeasureObj::UndirtyText() const
rOutliner.Clear();
// cast to nonconst three times
((SdrMeasureObj*)this)->aTextSize=aSiz;
- ((SdrMeasureObj*)this)->bTextSizeDirty=sal_False;
+ ((SdrMeasureObj*)this)->bTextSizeDirty=false;
((SdrMeasureObj*)this)->bTextDirty=false;
}
}
@@ -1111,9 +1111,9 @@ Point SdrMeasureObj::GetSnapPoint(sal_uInt32 i) const
else return aPt2;
}
-sal_Bool SdrMeasureObj::IsPolyObj() const
+bool SdrMeasureObj::IsPolyObj() const
{
- return sal_True;
+ return true;
}
sal_uInt32 SdrMeasureObj::GetPointCount() const
@@ -1158,7 +1158,7 @@ void SdrMeasureObj::RestGeoData(const SdrObjGeoData& rGeo)
SetTextDirty();
}
-SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const
+SdrObject* SdrMeasureObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
{
// get XOR Poly as base
XPolyPolygon aTmpPolyPolygon(TakeXorPoly());
@@ -1277,7 +1277,7 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) co
}
}
-sal_Bool SdrMeasureObj::BegTextEdit(SdrOutliner& rOutl)
+bool SdrMeasureObj::BegTextEdit(SdrOutliner& rOutl)
{
UndirtyText();
return SdrTextObj::BegTextEdit(rOutl);
@@ -1383,7 +1383,7 @@ sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const
// implemented since currently it is derived from SdrTextObj which uses
// a functionality based on SnapRect which is not useful here
-sal_Bool SdrMeasureObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const
+bool SdrMeasureObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const
{
// handle the same as a simple line since the definition is based on two points
const basegfx::B2DRange aRange(aPt1.X(), aPt1.Y(), aPt2.X(), aPt2.Y());
@@ -1427,7 +1427,7 @@ sal_Bool SdrMeasureObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegf
// build return value matrix
rMatrix = basegfx::tools::createScaleTranslateB2DHomMatrix(aScale, aTranslate);
- return sal_True;
+ return true;
}
void SdrMeasureObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& /*rPolyPolygon*/)
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index ccfafc397f74..b237dfc6cc8a 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -314,7 +314,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::saveObject()
xPersist->storeOwn();
if ( xModifiable.is() )
- xModifiable->setModified( sal_True );
+ xModifiable->setModified( true );
}
@@ -547,7 +547,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl
{
// the calculation of the object area has not changed the object size
// it should be done here then
- //SfxBooleanFlagGuard aGuard( m_bResizeNoScale, sal_True );
+ //SfxBooleanFlagGuard aGuard( m_bResizeNoScale, true );
// new size of the object area without scaling
Size aNewObjSize( Fraction( aNewLogicRect.GetWidth() ) / m_aScaleWidth,
@@ -614,7 +614,7 @@ SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject):
::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ),
pObj(pObject)
{
- SetSynchron( sal_False );
+ SetSynchron( false );
}
@@ -899,9 +899,9 @@ void SdrOle2Obj::Connect()
-sal_Bool SdrOle2Obj::UpdateLinkURL_Impl()
+bool SdrOle2Obj::UpdateLinkURL_Impl()
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
if ( mpImpl->mpObjectLink )
{
@@ -930,7 +930,7 @@ sal_Bool SdrOle2Obj::UpdateLinkURL_Impl()
xPersObj->reload( aArgs, uno::Sequence< beans::PropertyValue >() );
mpImpl->maLinkURL = aNewLinkURL;
- bResult = sal_True;
+ bResult = true;
if ( nCurState != embed::EmbedStates::LOADED )
xObjRef->changeState( nCurState );
@@ -1132,7 +1132,7 @@ void SdrOle2Obj::Connect_Impl()
pModel->GetRefDevice()->GetOutDevType() == OUTDEV_PRINTER)
{
// Kein RefDevice oder RefDevice kein Printer
- sal_Bool bModified = (*ppObjRef)->IsModified();
+ bool bModified = (*ppObjRef)->IsModified();
Printer* pPrinter = (Printer*) pModel->GetRefDevice();
(*ppObjRef)->OnDocumentPrinterChanged( pPrinter );
(*ppObjRef)->SetModified( bModified );
@@ -1241,7 +1241,7 @@ void SdrOle2Obj::Disconnect_Impl()
{
try
{
- xClose->close( sal_True );
+ xClose->close( true );
}
catch ( util::CloseVetoException& )
{
@@ -1353,7 +1353,7 @@ SdrObject* SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText, bool /* bUseHC
}
}
-SdrObject* SdrOle2Obj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const
+SdrObject* SdrOle2Obj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
{
// #i118485# missing converter added
if(GetModel())
@@ -1915,21 +1915,21 @@ void SdrOle2Obj::NbcMove(const Size& rSize)
-sal_Bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect )
+bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect )
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
sal_Int32 nState = xObj->getCurrentState();
if ( nState == embed::EmbedStates::LOADED )
{
// the object is already unloaded
- bResult = sal_True;
+ bResult = true;
}
else
{
uno::Reference < util::XModifiable > xModifiable( xObj->getComponent(), uno::UNO_QUERY );
if ( !xModifiable.is() )
- bResult = sal_True;
+ bResult = true;
else
{
sal_Int64 nMiscStatus = xObj->getStatus( nAspect );
@@ -1939,7 +1939,7 @@ sal_Bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbedded
!( xModifiable.is() && xModifiable->isModified() ) &&
!( nState == embed::EmbedStates::INPLACE_ACTIVE || nState == embed::EmbedStates::UI_ACTIVE || nState == embed::EmbedStates::ACTIVE ) )
{
- bResult = sal_True;
+ bResult = true;
}
}
}
@@ -1949,16 +1949,16 @@ sal_Bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbedded
-sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect )
+bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect )
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
if ( CanUnloadRunningObj( xObj, nAspect ) )
{
try
{
xObj->changeState( embed::EmbedStates::LOADED );
- bResult = sal_True;
+ bResult = true;
}
catch( ::com::sun::star::uno::Exception& )
{
@@ -1976,9 +1976,9 @@ sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xOb
-sal_Bool SdrOle2Obj::Unload()
+bool SdrOle2Obj::Unload()
{
- sal_Bool bUnloaded = sal_False;
+ bool bUnloaded = false;
if( xObjRef.is() )
{
@@ -1988,11 +1988,11 @@ sal_Bool SdrOle2Obj::Unload()
//sal_uIntPtr nRefCount = (*ppObjRef)->GetRefCount();
// prevent Unload if there are external references
//if( nRefCount > 2 )
- // return sal_False;
+ // return false;
//DBG_ASSERT( nRefCount == 2, "Wrong RefCount for unload" );
}
else
- bUnloaded = sal_True;
+ bUnloaded = true;
if ( pModel && xObjRef.is() )
{
@@ -2031,7 +2031,7 @@ void SdrOle2Obj::GetObjRef_Impl()
if( !IsEmptyPresObj() )
{
// remember modified status of model
- const sal_Bool bWasChanged(pModel ? pModel->IsChanged() : sal_False);
+ const bool bWasChanged = pModel && pModel->IsChanged();
// perhaps preview not valid anymore
// This line changes the modified state of the model
@@ -2059,9 +2059,9 @@ void SdrOle2Obj::GetObjRef_Impl()
//TODO/LATER: printerchange notification
/*
// prevent SetModified (don't want no update here)
- sal_Bool bWasEnabled = (*ppObjRef)->IsEnableSetModified();
+ bool bWasEnabled = (*ppObjRef)->IsEnableSetModified();
if ( bWasEnabled )
- (*ppObjRef)->EnableSetModified( sal_False );
+ (*ppObjRef)->EnableSetModified( false );
// Kein RefDevice oder RefDevice kein Printer
Printer* pPrinter = (Printer*) pModel->GetRefDevice();
@@ -2107,7 +2107,7 @@ uno::Reference< frame::XModel > SdrOle2Obj::getXModel() const
-sal_Bool SdrOle2Obj::IsChart() const
+bool SdrOle2Obj::IsChart() const
{
if ( !m_bTypeAsked )
{
@@ -2130,7 +2130,7 @@ void SdrOle2Obj::SetGraphicToObj( const uno::Reference< io::XInputStream >& xGrS
}
-sal_Bool SdrOle2Obj::IsCalc() const
+bool SdrOle2Obj::IsCalc() const
{
if ( !xObjRef.is() )
return false;
@@ -2144,10 +2144,10 @@ sal_Bool SdrOle2Obj::IsCalc() const
|| SvGlobalName(SO3_SC_OLE_EMBED_CLASSID_8) == aObjClsId
|| SvGlobalName(SO3_SC_CLASSID) == aObjClsId )
{
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
@@ -2160,12 +2160,12 @@ uno::Reference< frame::XModel > SdrOle2Obj::GetParentXModel() const
}
-sal_Bool SdrOle2Obj::CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScaleHeight, Size& aObjAreaSize )
+bool SdrOle2Obj::CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScaleHeight, Size& aObjAreaSize )
{
// TODO/LEAN: to avoid rounding errors scaling always uses the VisArea.
// If we don't cache it for own objects also we must load the object here
if ( !xObjRef.is() || !pModel )
- return sal_False;
+ return false;
MapMode aMapMode( pModel->GetScaleUnit() );
aObjAreaSize = xObjRef.GetSize( &aMapMode );
@@ -2178,11 +2178,11 @@ sal_Bool SdrOle2Obj::CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScal
Kuerzen(aScaleHeight, 10);
Kuerzen(aScaleWidth, 10);
- return sal_True;
+ return true;
}
-sal_Bool SdrOle2Obj::AddOwnLightClient()
+bool SdrOle2Obj::AddOwnLightClient()
{
// The Own Light Client must be registered in object only using this method!
if ( !SfxInPlaceClient::GetClient( dynamic_cast<SfxObjectShell*>(pModel->GetPersist()), xObjRef.GetObject() )
@@ -2200,17 +2200,17 @@ sal_Bool SdrOle2Obj::AddOwnLightClient()
mpImpl->pLightClient->SetSizeScale( aScaleWidth, aScaleHeight );
try {
xObjRef->setClientSite( mpImpl->pLightClient );
- return sal_True;
+ return true;
} catch( uno::Exception& )
{}
}
}
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 43480971c0d0..537e6c472a23 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1824,7 +1824,7 @@ void SdrPathObj::ImpForceKind()
}
}
-void SdrPathObj::ImpSetClosed(sal_Bool bClose)
+void SdrPathObj::ImpSetClosed(bool bClose)
{
if(bClose)
{
@@ -2153,7 +2153,7 @@ SdrHdl* SdrPathObj::GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlusNum) const
}
pHdl->SetSourceHdlNum(rHdl.GetSourceHdlNum());
- pHdl->SetPlusHdl(sal_True);
+ pHdl->SetPlusHdl(true);
}
}
}
@@ -2488,9 +2488,9 @@ Point SdrPathObj::GetSnapPoint(sal_uInt32 nSnapPnt) const
return Point(FRound(aB2DPoint.getX()), FRound(aB2DPoint.getY()));
}
-sal_Bool SdrPathObj::IsPolyObj() const
+bool SdrPathObj::IsPolyObj() const
{
- return sal_True;
+ return true;
}
sal_uInt32 SdrPathObj::GetPointCount() const
@@ -2548,13 +2548,13 @@ void SdrPathObj::NbcSetPoint(const Point& rPnt, sal_uInt32 nHdlNum)
}
}
-sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, sal_Bool bNewObj, sal_Bool bHideHim)
+sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, bool bNewObj, bool bHideHim)
{
sal_uInt32 nNewHdl;
if(bNewObj)
{
- nNewHdl = NbcInsPoint(0L, rPos, sal_True, bHideHim);
+ nNewHdl = NbcInsPoint(0L, rPos, true, bHideHim);
}
else
{
@@ -2573,14 +2573,14 @@ sal_uInt32 SdrPathObj::NbcInsPointOld(const Point& rPos, sal_Bool bNewObj, sal_B
nPolyIndex += GetPathPoly().getB2DPolygon(a).count();
}
- nNewHdl = NbcInsPoint(nPolyIndex, rPos, sal_False, bHideHim);
+ nNewHdl = NbcInsPoint(nPolyIndex, rPos, false, bHideHim);
}
ImpForceKind();
return nNewHdl;
}
-sal_uInt32 SdrPathObj::NbcInsPoint(sal_uInt32 /*nHdlNum*/, const Point& rPos, sal_Bool bNewObj, sal_Bool /*bHideHim*/)
+sal_uInt32 SdrPathObj::NbcInsPoint(sal_uInt32 /*nHdlNum*/, const Point& rPos, bool bNewObj, bool /*bHideHim*/)
{
sal_uInt32 nNewHdl;
@@ -2741,7 +2741,7 @@ SdrObject* SdrPathObj::RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index)
return pNewObj;
}
-SdrObject* SdrPathObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const
+SdrObject* SdrPathObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
{
// #i89784# check for FontWork with activated HideContour
const drawinglayer::attribute::SdrTextAttribute aText(
@@ -2841,7 +2841,7 @@ void SdrPathObj::ToggleClosed()
}
// for friend class SdrPolyEditView in some compilers:
-void SdrPathObj::SetRectsDirty(sal_Bool bNotMyself)
+void SdrPathObj::SetRectsDirty(bool bNotMyself)
{
SdrTextObj::SetRectsDirty(bNotMyself);
}
@@ -2875,7 +2875,7 @@ void SdrPathObj::impDeleteDAC() const
// gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon
// with the base geometry and returns TRUE. Otherwise it returns FALSE.
-sal_Bool SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const
+bool SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const
{
double fRotate(0.0);
double fShearX(0.0);
@@ -3001,7 +3001,7 @@ sal_Bool SdrPathObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::
basegfx::fTools::equalZero(fRotate) ? 0.0 : -fRotate,
aTranslate);
- return sal_True;
+ return true;
}
// Sets the base geometry of the object using infos contained in the homogeneous 3x3 matrix.
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 09ff4b176cb5..54d4ea3643e5 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -579,7 +579,7 @@ SdrGluePoint SdrRectObj::GetCornerGluePoint(sal_uInt16 nPosNum) const
return aGP;
}
-SdrObject* SdrRectObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const
+SdrObject* SdrRectObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
{
XPolygon aXP(ImpCalcXPoly(aRect,GetEckenradius()));
{ // TODO: this is only for the moment, until we have the new TakeContour()
@@ -596,7 +596,7 @@ SdrObject* SdrRectObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const
// when used with bAddText==false from other converters
if((bAddText && !IsTextFrame()) || HasFill() || HasLine())
{
- pRet = ImpConvertMakeObj(aPolyPolygon, sal_True, bBezier);
+ pRet = ImpConvertMakeObj(aPolyPolygon, true, bBezier);
}
if(bAddText)
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 61779a33237a..07e4e9d9f3da 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -91,21 +91,21 @@ SdrTextObj::SdrTextObj()
pFormTextBoundRect(NULL),
eTextKind(OBJ_TEXT)
{
- bTextSizeDirty=sal_False;
- bTextFrame=sal_False;
- bNoShear=sal_False;
- bNoRotate=sal_False;
- bNoMirror=sal_False;
- bDisableAutoWidthOnDragging=sal_False;
-
- mbInEditMode = sal_False;
- mbTextHidden = sal_False;
- mbTextAnimationAllowed = sal_True;
+ bTextSizeDirty=false;
+ bTextFrame=false;
+ bNoShear=false;
+ bNoRotate=false;
+ bNoMirror=false;
+ bDisableAutoWidthOnDragging=false;
+
+ mbInEditMode = false;
+ mbTextHidden = false;
+ mbTextAnimationAllowed = true;
maTextEditOffset = Point(0, 0);
// #i25616#
mbSupportTextIndentingOnLineWidthChange = true;
- mbInDownScale = sal_False;
+ mbInDownScale = false;
}
SdrTextObj::SdrTextObj(const Rectangle& rNewRect)
@@ -116,18 +116,18 @@ SdrTextObj::SdrTextObj(const Rectangle& rNewRect)
pFormTextBoundRect(NULL),
eTextKind(OBJ_TEXT)
{
- bTextSizeDirty=sal_False;
- bTextFrame=sal_False;
- bNoShear=sal_False;
- bNoRotate=sal_False;
- bNoMirror=sal_False;
- bDisableAutoWidthOnDragging=sal_False;
+ bTextSizeDirty=false;
+ bTextFrame=false;
+ bNoShear=false;
+ bNoRotate=false;
+ bNoMirror=false;
+ bDisableAutoWidthOnDragging=false;
ImpJustifyRect(aRect);
- mbInEditMode = sal_False;
- mbTextHidden = sal_False;
- mbTextAnimationAllowed = sal_True;
- mbInDownScale = sal_False;
+ mbInEditMode = false;
+ mbTextHidden = false;
+ mbTextAnimationAllowed = true;
+ mbInDownScale = false;
maTextEditOffset = Point(0, 0);
// #i25616#
@@ -141,17 +141,17 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind)
pFormTextBoundRect(NULL),
eTextKind(eNewTextKind)
{
- bTextSizeDirty=sal_False;
- bTextFrame=sal_True;
- bNoShear=sal_True;
- bNoRotate=sal_False;
- bNoMirror=sal_True;
- bDisableAutoWidthOnDragging=sal_False;
-
- mbInEditMode = sal_False;
- mbTextHidden = sal_False;
- mbTextAnimationAllowed = sal_True;
- mbInDownScale = sal_False;
+ bTextSizeDirty=false;
+ bTextFrame=true;
+ bNoShear=true;
+ bNoRotate=false;
+ bNoMirror=true;
+ bDisableAutoWidthOnDragging=false;
+
+ mbInEditMode = false;
+ mbTextHidden = false;
+ mbTextAnimationAllowed = true;
+ mbInDownScale = false;
maTextEditOffset = Point(0, 0);
// #i25616#
@@ -166,18 +166,18 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect)
pFormTextBoundRect(NULL),
eTextKind(eNewTextKind)
{
- bTextSizeDirty=sal_False;
- bTextFrame=sal_True;
- bNoShear=sal_True;
- bNoRotate=sal_False;
- bNoMirror=sal_True;
- bDisableAutoWidthOnDragging=sal_False;
+ bTextSizeDirty=false;
+ bTextFrame=true;
+ bNoShear=true;
+ bNoRotate=false;
+ bNoMirror=true;
+ bDisableAutoWidthOnDragging=false;
ImpJustifyRect(aRect);
- mbInEditMode = sal_False;
- mbTextHidden = sal_False;
- mbTextAnimationAllowed = sal_True;
- mbInDownScale = sal_False;
+ mbInEditMode = false;
+ mbTextHidden = false;
+ mbTextAnimationAllowed = true;
+ mbInDownScale = false;
maTextEditOffset = Point(0, 0);
// #i25616#
@@ -237,7 +237,7 @@ void SdrTextObj::NbcSetText(const OUString& rStr)
rOutliner.Clear();
NbcSetOutlinerParaObject(pNewText);
aTextSize=aSiz;
- bTextSizeDirty=sal_False;
+ bTextSizeDirty=false;
}
void SdrTextObj::SetText(const OUString& rStr)
@@ -260,7 +260,7 @@ void SdrTextObj::NbcSetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt
rOutliner.Clear();
NbcSetOutlinerParaObject(pNewText);
aTextSize=aSiz;
- bTextSizeDirty=sal_False;
+ bTextSizeDirty=false;
}
void SdrTextObj::SetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat)
@@ -288,7 +288,7 @@ const Size& SdrTextObj::GetTextSize() const
}
// casting to nonconst twice
((SdrTextObj*)this)->aTextSize=aSiz;
- ((SdrTextObj*)this)->bTextSizeDirty=sal_False;
+ ((SdrTextObj*)this)->bTextSizeDirty=false;
}
return aTextSize;
}
@@ -299,7 +299,7 @@ bool SdrTextObj::IsAutoGrowHeight() const
return false; // AutoGrow only together with TextFrames
const SfxItemSet& rSet = GetObjectItemSet();
- sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
+ bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
if(bRet)
{
@@ -311,7 +311,7 @@ bool SdrTextObj::IsAutoGrowHeight() const
if(eDirection == SDRTEXTANI_UP || eDirection == SDRTEXTANI_DOWN)
{
- bRet = sal_False;
+ bRet = false;
}
}
}
@@ -324,9 +324,9 @@ bool SdrTextObj::IsAutoGrowWidth() const
return false; // AutoGrow only together with TextFrames
const SfxItemSet& rSet = GetObjectItemSet();
- sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
+ bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
- sal_Bool bInEditMOde = IsInEditMode();
+ bool bInEditMOde = IsInEditMode();
if(!bInEditMOde && bRet)
{
@@ -338,7 +338,7 @@ bool SdrTextObj::IsAutoGrowWidth() const
if(eDirection == SDRTEXTANI_LEFT || eDirection == SDRTEXTANI_RIGHT)
{
- bRet = sal_False;
+ bRet = false;
}
}
}
@@ -357,7 +357,7 @@ SdrTextHorzAdjust SdrTextObj::GetTextHorizontalAdjust(const SfxItemSet& rSet) co
SdrTextHorzAdjust eRet = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue();
- sal_Bool bInEditMode = IsInEditMode();
+ bool bInEditMode = IsInEditMode();
if(!bInEditMode && eRet == SDRTEXTHORZADJUST_BLOCK)
{
@@ -389,7 +389,7 @@ SdrTextVertAdjust SdrTextObj::GetTextVerticalAdjust(const SfxItemSet& rSet) cons
// Take care for vertical text animation here
SdrTextVertAdjust eRet = ((SdrTextVertAdjustItem&)(rSet.Get(SDRATTR_TEXT_VERTADJUST))).GetValue();
- sal_Bool bInEditMode = IsInEditMode();
+ bool bInEditMode = IsInEditMode();
// Take care for vertical text animation here
if(!bInEditMode && eRet == SDRTEXTVERTADJUST_BLOCK)
@@ -552,7 +552,7 @@ bool SdrTextObj::NbcSetMinTextFrameHeight(long nHgt)
// bDisableAutoHeightOnDragging if vertical.
if(IsVerticalWriting() && bDisableAutoWidthOnDragging)
{
- bDisableAutoWidthOnDragging = sal_False;
+ bDisableAutoWidthOnDragging = false;
SetObjectItem(SdrTextAutoGrowHeightItem(false));
}
@@ -571,7 +571,7 @@ bool SdrTextObj::NbcSetMinTextFrameWidth(long nWdt)
// when not vertical.
if(!IsVerticalWriting() && bDisableAutoWidthOnDragging)
{
- bDisableAutoWidthOnDragging = sal_False;
+ bDisableAutoWidthOnDragging = false;
SetObjectItem(SdrTextAutoGrowWidthItem(false));
}
@@ -580,7 +580,7 @@ bool SdrTextObj::NbcSetMinTextFrameWidth(long nWdt)
return false;
}
-void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const
+void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, bool bLineWidth ) const
{
basegfx::B2DPolyPolygon aXorPolyPolygon(TakeXorPoly());
basegfx::B2DPolyPolygon* pContourPolyPolygon = 0L;
@@ -603,7 +603,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho
// test if shadow needs to be avoided for TakeContour()
const SfxItemSet& rSet = GetObjectItemSet();
- sal_Bool bShadowOn = ((SdrShadowItem&)(rSet.Get(SDRATTR_SHADOW))).GetValue();
+ bool bShadowOn = ((SdrShadowItem&)(rSet.Get(SDRATTR_SHADOW))).GetValue();
// #i33696#
// Remember TextObject currently set at the DrawOutliner, it WILL be
@@ -710,7 +710,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
long nWdt=nAnkWdt;
long nHgt=nAnkHgt;
- sal_Bool bInEditMode = IsInEditMode();
+ bool bInEditMode = IsInEditMode();
if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE))
{
@@ -1387,7 +1387,7 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText( OutlinerParaObject* pTextObjec
if (!IsTextFrame())
{
// the SnapRect keeps its size
- SetRectsDirty(sal_True);
+ SetRectsDirty(true);
}
// always invalidate BoundRect on change
@@ -1412,7 +1412,7 @@ void SdrTextObj::NbcReformatText()
{
// the SnapRect keeps its size
SetBoundRectDirty();
- SetRectsDirty(sal_True);
+ SetRectsDirty(true);
}
SetTextSizeDirty();
ActionChanged();
@@ -1485,7 +1485,7 @@ void SdrTextObj::ForceOutlinerParaObject()
}
}
-sal_Bool SdrTextObj::IsVerticalWriting() const
+bool SdrTextObj::IsVerticalWriting() const
{
if(pEdtOutl)
{
@@ -1498,10 +1498,10 @@ sal_Bool SdrTextObj::IsVerticalWriting() const
return pOutlinerParaObject->IsVertical();
}
- return sal_False;
+ return false;
}
-void SdrTextObj::SetVerticalWriting(sal_Bool bVertical)
+void SdrTextObj::SetVerticalWriting(bool bVertical)
{
OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
if( !pOutlinerParaObject && bVertical )
@@ -1516,8 +1516,8 @@ void SdrTextObj::SetVerticalWriting(sal_Bool bVertical)
{
// get item settings
const SfxItemSet& rSet = GetObjectItemSet();
- sal_Bool bAutoGrowWidth = ((SdrTextAutoGrowWidthItem&)rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue();
- sal_Bool bAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT)).GetValue();
+ bool bAutoGrowWidth = ((SdrTextAutoGrowWidthItem&)rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH)).GetValue();
+ bool bAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT)).GetValue();
// Also exchange hor/ver adjust items
SdrTextHorzAdjust eHorz = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue();
@@ -1578,7 +1578,7 @@ void SdrTextObj::SetVerticalWriting(sal_Bool bVertical)
// gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon
// with the base geometry and returns TRUE. Otherwise it returns FALSE.
-sal_Bool SdrTextObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const
+bool SdrTextObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& /*rPolyPolygon*/) const
{
// get turn and shear
double fRotate = (aGeo.nDrehWink / 100.0) * F_PI180;
@@ -1632,7 +1632,7 @@ sal_Bool SdrTextObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::
basegfx::fTools::equalZero(fRotate) ? 0.0 : -fRotate,
aTranslate);
- return sal_False;
+ return false;
}
// sets the base geometry of the object using infos contained in the homogeneous 3x3 matrix.
@@ -1879,7 +1879,7 @@ bool SdrTextObj::IsFitToSize() const
return (eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
}
-void SdrTextObj::SetTextAnimationAllowed(sal_Bool bNew)
+void SdrTextObj::SetTextAnimationAllowed(bool bNew)
{
if(mbTextAnimationAllowed != bNew)
{
@@ -1903,13 +1903,13 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
else if (IsAutoFit() && !mbInDownScale)
{
OSL_ASSERT(pEdtOutl);
- mbInDownScale = sal_True;
+ mbInDownScale = true;
// sucks that we cannot disable paints via
// pEdtOutl->SetUpdateMode(FALSE) - but EditEngine skips
// formatting as well, then.
ImpAutoFitText(*pEdtOutl);
- mbInDownScale = sal_False;
+ mbInDownScale = false;
}
}
}
@@ -1965,20 +1965,20 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem)
// The concept of the text object:
// ~~~~~~~~~~~~~~~~~~~~~~~~
// Attributes/Variations:
-// - sal_Bool text frame / graphics object with caption
-// - sal_Bool FontWork (if it is not a text frame and not a ContourTextFrame)
-// - sal_Bool ContourTextFrame (if it is not a text frame and not Fontwork)
+// - bool text frame / graphics object with caption
+// - bool FontWork (if it is not a text frame and not a ContourTextFrame)
+// - bool ContourTextFrame (if it is not a text frame and not Fontwork)
// - long rotation angle (if it is not FontWork)
// - long text frame margins (if it is not FontWork)
-// - sal_Bool FitToSize (if it is not FontWork)
-// - sal_Bool AutoGrowingWidth/Height (if it is not FitToSize and not FontWork)
+// - bool FitToSize (if it is not FontWork)
+// - bool AutoGrowingWidth/Height (if it is not FitToSize and not FontWork)
// - long Min/MaxFrameWidth/Height (if AutoGrowingWidth/Height)
// - enum horizontal text anchoring left,center,right,justify/block,Stretch(ni)
// - enum vertical text anchoring top, middle, bottom, block, stretch(ni)
// - enum ticker text (if it is not FontWork)
-// Every derived object is either a text frame (bTextFrame=sal_True)
-// or a drawing object with a caption (bTextFrame=sal_False).
+// Every derived object is either a text frame (bTextFrame=true)
+// or a drawing object with a caption (bTextFrame=false).
// Default anchoring for text frames:
// SDRTEXTHORZADJUST_BLOCK, SDRTEXTVERTADJUST_TOP
@@ -2007,8 +2007,8 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem)
// ContourTextFrame:
// - long rotation angle
// - long text frame margins (maybe later)
-// - sal_Bool FitToSize (maybe later)
-// - sal_Bool AutoGrowingWidth/Height (maybe much later)
+// - bool FitToSize (maybe later)
+// - bool AutoGrowingWidth/Height (maybe much later)
// - long Min/MaxFrameWidth/Height (maybe much later)
// - enum horizontal text anchoring (maybe later, for now: left, centered)
// - enum vertical text anchoring (maybe later, for now: top)
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 56c43ea014aa..9ab93331df46 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -80,7 +80,7 @@ namespace
::com::sun::star::lang::Locale maLocale;
// bitfield
- unsigned mbRTL : 1;
+ bool mbRTL : 1;
public:
impPathTextPortion(DrawPortionInfo& rInfo)
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index eb5d9d8dd51c..0d9c70d87dff 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -35,12 +35,12 @@ bool SdrTextObj::HasTextEdit() const
return true;
}
-sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
+bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
{
- if (pEdtOutl!=NULL) return sal_False; // Textedit might already run in another View!
+ if (pEdtOutl!=NULL) return false; // Textedit might already run in another View!
pEdtOutl=&rOutl;
- mbInEditMode = sal_True;
+ mbInEditMode = true;
sal_uInt16 nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT;
if ( !IsOutlText() )
@@ -115,7 +115,7 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
rOutl.UpdateFields();
rOutl.ClearModifyFlag();
- return sal_True;
+ return true;
}
void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const
@@ -264,7 +264,7 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
// need to end edit mode early since SetOutlinerParaObject already
// uses GetCurrentBoundRect() which needs to take the text into account
// to work correct
- mbInEditMode = sal_False;
+ mbInEditMode = false;
SetOutlinerParaObject(pNewText);
}
@@ -274,7 +274,7 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
nStat &= ~EE_CNTRL_AUTOPAGESIZE;
rOutl.SetControlWord(nStat);
- mbInEditMode = sal_False;
+ mbInEditMode = false;
}
sal_uInt16 SdrTextObj::GetOutlinerViewAnchorMode() const
@@ -327,7 +327,7 @@ void SdrTextObj::ImpSetTextEditParams() const
if (bContourFrame) {
Rectangle aAnchorRect;
TakeTextAnchorRect(aAnchorRect);
- ImpSetContourPolygon(*pEdtOutl,aAnchorRect, sal_True);
+ ImpSetContourPolygon(*pEdtOutl,aAnchorRect, true);
}
if (bUpdMerk) pEdtOutl->SetUpdateMode(true);
}
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 5da632bcce9f..409af9f24c07 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -106,7 +106,7 @@ void SdrTextObj::NbcMove(const Size& rSiz)
MoveRect(aRect,rSiz);
MoveRect(aOutRect,rSiz);
MoveRect(maSnapRect,rSiz);
- SetRectsDirty(sal_True);
+ SetRectsDirty(true);
}
void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
@@ -420,7 +420,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const
-SdrObject* SdrTextObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const
+SdrObject* SdrTextObj::DoConvertToPolyObj(bool bBezier, bool bAddText) const
{
if(bAddText)
{
@@ -435,7 +435,7 @@ bool SdrTextObj::ImpCanConvTextToCurve() const
return !IsOutlText();
}
-SdrObject* SdrTextObj::ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, sal_Bool bClosed, sal_Bool bBezier, sal_Bool bNoSetAttr) const
+SdrObject* SdrTextObj::ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, bool bClosed, bool bBezier, bool bNoSetAttr) const
{
SdrObjKind ePathKind = bClosed ? OBJ_PATHFILL : OBJ_PATHLINE;
basegfx::B2DPolyPolygon aB2DPolyPolygon(rPolyPolygon);
@@ -471,7 +471,7 @@ SdrObject* SdrTextObj::ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPol
pPathObj->ClearMergedItem();
pPathObj->SetMergedItemSet(GetObjectItemSet());
pPathObj->GetProperties().BroadcastItemChange(aC);
- pPathObj->NbcSetStyleSheet(GetStyleSheet(), sal_True);
+ pPathObj->NbcSetStyleSheet(GetStyleSheet(), true);
}
}
}
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 66866e59dec8..dc1466d05419 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -154,7 +154,7 @@ namespace
TYPEINIT1(SdrUnoObj, SdrRectObj);
-SdrUnoObj::SdrUnoObj(const OUString& rModelName, sal_Bool _bOwnUnoControlModel)
+SdrUnoObj::SdrUnoObj(const OUString& rModelName, bool _bOwnUnoControlModel)
: m_pImpl( new SdrUnoObjDataHolder ),
bOwnUnoControlModel( _bOwnUnoControlModel )
{
@@ -169,7 +169,7 @@ SdrUnoObj::SdrUnoObj(const OUString& rModelName, sal_Bool _bOwnUnoControlModel)
SdrUnoObj::SdrUnoObj(const OUString& rModelName,
const uno::Reference< lang::XMultiServiceFactory >& rxSFac,
- sal_Bool _bOwnUnoControlModel)
+ bool _bOwnUnoControlModel)
: m_pImpl( new SdrUnoObjDataHolder ),
bOwnUnoControlModel( _bOwnUnoControlModel )
{
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index 3f383ae4c153..22c6b38535fc 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -532,7 +532,7 @@ Point SdrVirtObj::GetSnapPoint(sal_uInt32 i) const
return aP;
}
-sal_Bool SdrVirtObj::IsPolyObj() const
+bool SdrVirtObj::IsPolyObj() const
{
return rRefObj.IsPolyObj();
}
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 19511a45ed93..b6ab6401421e 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -152,11 +152,11 @@ SdrPageView::SdrPageView(SdrPage* pPage1, SdrView& rNewView)
aPgOrg.X()=mpPage->GetLftBorder();
aPgOrg.Y()=mpPage->GetUppBorder();
}
- mbHasMarked = sal_False;
+ mbHasMarked = false;
aLayerVisi.SetAll();
aLayerPrn.SetAll();
- mbVisible = sal_False;
+ mbVisible = false;
pAktList = NULL;
pAktGroup = NULL;
SetAktGroupAndList(NULL, mpPage);
@@ -221,7 +221,7 @@ void SdrPageView::ModelHasChanged()
if (GetAktGroup()!=NULL) CheckAktGroup();
}
-sal_Bool SdrPageView::IsReadOnly() const
+bool SdrPageView::IsReadOnly() const
{
return (0L == GetPage() || GetView().GetModel()->IsReadOnly() || GetPage()->IsReadOnly() || GetObjList()->IsReadOnly());
}
@@ -230,7 +230,7 @@ void SdrPageView::Show()
{
if(!IsVisible())
{
- mbVisible = sal_True;
+ mbVisible = true;
InvalidateAllWin();
for(sal_uInt32 a(0L); a < GetView().PaintWindowCount(); a++)
@@ -245,7 +245,7 @@ void SdrPageView::Hide()
if(IsVisible())
{
InvalidateAllWin();
- mbVisible = sal_False;
+ mbVisible = false;
ClearPageWindows();
}
}
@@ -649,20 +649,20 @@ bool SdrPageView::IsLayer(const OUString& rName, const SetOfByte& rBS) const
return bRet;
}
-sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const
+bool SdrPageView::IsObjMarkable(SdrObject* pObj) const
{
if(pObj)
{
// excluded from selection?
if(pObj->IsMarkProtect())
{
- return sal_False;
+ return false;
}
// only visible are selectable
if( !pObj->IsVisible() )
{
- return sal_False;
+ return false;
}
if(pObj->ISA(SdrObjGroup))
@@ -673,7 +673,7 @@ sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const
if(pObjList && pObjList->GetObjCount())
{
- sal_Bool bGroupIsMarkable(sal_False);
+ bool bGroupIsMarkable(false);
for(sal_uInt32 a(0L); !bGroupIsMarkable && a < pObjList->GetObjCount(); a++)
{
@@ -682,7 +682,7 @@ sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const
// call recursively
if(IsObjMarkable(pCandidate))
{
- bGroupIsMarkable = sal_True;
+ bGroupIsMarkable = true;
}
}
@@ -692,7 +692,7 @@ sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const
{
// #i43302#
// Allow empty groups to be selected to be able to delete them
- return sal_True;
+ return true;
}
}
else
@@ -703,7 +703,7 @@ sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const
}
}
- return sal_False;
+ return false;
}
void SdrPageView::SetPageOrigin(const Point& rOrg)
@@ -793,13 +793,13 @@ void SdrPageView::SetAktGroupAndList(SdrObject* pNewGroup, SdrObjList* pNewList)
}
}
-sal_Bool SdrPageView::EnterGroup(SdrObject* pObj)
+bool SdrPageView::EnterGroup(SdrObject* pObj)
{
- sal_Bool bRet(sal_False);
+ bool bRet(false);
if(pObj && pObj->IsGroupObject())
{
- sal_Bool bGlueInvalidate(GetView().ImpIsGlueVisible());
+ bool bGlueInvalidate(GetView().ImpIsGlueVisible());
if(bGlueInvalidate)
{
@@ -839,7 +839,7 @@ sal_Bool SdrPageView::EnterGroup(SdrObject* pObj)
GetView().GlueInvalidate();
}
- bRet = sal_True;
+ bRet = true;
}
return bRet;
@@ -849,7 +849,7 @@ void SdrPageView::LeaveOneGroup()
{
if(GetAktGroup())
{
- sal_Bool bGlueInvalidate = (GetView().ImpIsGlueVisible());
+ bool bGlueInvalidate = (GetView().ImpIsGlueVisible());
if(bGlueInvalidate)
GetView().GlueInvalidate();
@@ -887,7 +887,7 @@ void SdrPageView::LeaveAllGroup()
{
if(GetAktGroup())
{
- sal_Bool bGlueInvalidate = (GetView().ImpIsGlueVisible());
+ bool bGlueInvalidate = (GetView().ImpIsGlueVisible());
if(bGlueInvalidate)
GetView().GlueInvalidate();
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 8ed86f255c5f..892f49025ad2 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -201,7 +201,7 @@ void SdrPaintView::ImpClearVars()
aComeBackTimer.SetTimeoutHdl(LINK(this,SdrPaintView,ImpComeBackHdl));
if (pMod)
- SetDefaultStyleSheet(pMod->GetDefaultStyleSheet(), sal_True);
+ SetDefaultStyleSheet(pMod->GetDefaultStyleSheet(), true);
maGridColor = Color( COL_BLACK );
}
@@ -344,7 +344,7 @@ void SdrPaintView::ModelHasChanged()
-sal_Bool SdrPaintView::IsAction() const
+bool SdrPaintView::IsAction() const
{
return false;
}
@@ -370,7 +370,7 @@ void SdrPaintView::TakeActionRect(Rectangle&) const
}
-// info about TextEdit. Default is sal_False.
+// info about TextEdit. Default is false.
bool SdrPaintView::IsTextEdit() const
{
return false;
@@ -526,7 +526,7 @@ bool SdrPaintView::IsLayerVisible(const OUString& rName) const
return false;
}
-void SdrPaintView::SetLayerLocked(const OUString& rName, sal_Bool bLock)
+void SdrPaintView::SetLayerLocked(const OUString& rName, bool bLock)
{
if(mpPageView)
{
@@ -544,7 +544,7 @@ bool SdrPaintView::IsLayerLocked(const OUString& rName) const
return false;
}
-void SdrPaintView::SetLayerPrintable(const OUString& rName, sal_Bool bPrn)
+void SdrPaintView::SetLayerPrintable(const OUString& rName, bool bPrn)
{
if(mpPageView)
{
@@ -927,7 +927,7 @@ void SdrPaintView::InvalidateAllWin()
}
}
-void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix)
+void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, bool bPlus1Pix)
{
const sal_uInt32 nWindowCount(PaintWindowCount());
@@ -1000,7 +1000,7 @@ bool SdrPaintView::IsGroupEntered() const
return false;
}
-void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool /*bReplaceAll*/)
+void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, bool /*bReplaceAll*/)
{
// bReplaceAll has no effect here at all.
bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
@@ -1019,7 +1019,7 @@ void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool /*
}
}
-void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool /*bOnlyHardAttr*/) const
+void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, bool /*bOnlyHardAttr*/) const
{
// bOnlyHardAttr has no effect here at all.
bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
@@ -1031,7 +1031,7 @@ void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool /*bOnl
}
}
-void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
+void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll)
{
#ifdef DBG_UTIL
{
@@ -1061,7 +1061,7 @@ void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
#endif
}
-void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
+void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr)
{
if (pDefaultStyleSheet)
EndListening(*pDefaultStyleSheet);
@@ -1084,7 +1084,7 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDo
#endif
}
-sal_Bool SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
+bool SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const
{
if(bOnlyHardAttr || !pDefaultStyleSheet)
{
@@ -1097,13 +1097,13 @@ sal_Bool SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardA
rTargetSet.Put(aDefaultAttr, false);
}
MergeNotPersistDefaultAttr(rTargetSet, bOnlyHardAttr);
- return sal_True;
+ return true;
}
-sal_Bool SdrPaintView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
+bool SdrPaintView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll)
{
SetDefaultAttr(rSet,bReplaceAll);
- return sal_True;
+ return true;
}
SfxStyleSheet* SdrPaintView::GetStyleSheet() const
@@ -1111,16 +1111,16 @@ SfxStyleSheet* SdrPaintView::GetStyleSheet() const
return GetDefaultStyleSheet();
}
-sal_Bool SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
+bool SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr)
{
SetDefaultStyleSheet(pStyleSheet,bDontRemoveHardAttr);
- return sal_True;
+ return true;
}
#ifdef DBG_UTIL
-void SdrPaintView::ShowItemBrowser(sal_Bool bShow)
+void SdrPaintView::ShowItemBrowser(bool bShow)
{
if (bShow) {
if (pItemBrowser==NULL) {
@@ -1192,7 +1192,7 @@ void SdrPaintView::DoConnect(SdrOle2Obj* /*pOleObj*/)
{
}
-void SdrPaintView::SetAnimationEnabled( sal_Bool bEnable )
+void SdrPaintView::SetAnimationEnabled( bool bEnable )
{
SetAnimationMode( bEnable ? SDR_ANIMATION_ANIMATE : SDR_ANIMATION_DISABLE );
}
@@ -1318,7 +1318,7 @@ void SdrPaintView::SetBufferedOverlayAllowed(bool bNew)
}
}
-sal_Bool SdrPaintView::IsPagePaintingAllowed() const
+bool SdrPaintView::IsPagePaintingAllowed() const
{
return mbPagePaintingAllowed;
}
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index f9b0a5b41c69..50f9f50b5466 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -41,8 +41,8 @@ void SdrPolyEditView::ImpResetPolyPossibilityFlags()
{
eMarkedPointsSmooth=SDRPATHSMOOTH_DONTCARE;
eMarkedSegmentsKind=SDRPATHSEGMENT_DONTCARE;
- bSetMarkedPointsSmoothPossible=sal_False;
- bSetMarkedSegmentsKindPossible=sal_False;
+ bSetMarkedPointsSmoothPossible=false;
+ bSetMarkedSegmentsKindPossible=false;
}
void SdrPolyEditView::ImpClearVars()
@@ -385,7 +385,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
pM->GetPageView()->GetObjList()->InsertObject(pNeuObj, pObj->GetOrdNum() + 1, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNeuObj));
- MarkObj(pNeuObj, pM->GetPageView(), sal_False, sal_True);
+ MarkObj(pNeuObj, pM->GetPageView(), false, true);
}
if(nNewPt0Idx)
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 4f1238a027ce..823e2193d332 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -222,7 +222,7 @@ SdrSnapView::~SdrSnapView()
-sal_Bool SdrSnapView::IsAction() const
+bool SdrSnapView::IsAction() const
{
return IsSetPageOrg() || IsDragHelpLine() || SdrPaintView::IsAction();
}
@@ -424,7 +424,7 @@ sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
dy = 0;
}
}
- sal_Bool bRet=SDRSNAP_NOTSNAPPED;
+ sal_uInt16 bRet=SDRSNAP_NOTSNAPPED;
if (dx==NOT_SNAPPED) dx=0; else bRet|=SDRSNAP_XSNAPPED;
if (dy==NOT_SNAPPED) dy=0; else bRet|=SDRSNAP_YSNAPPED;
rPnt.X()=x+dx;
@@ -461,7 +461,7 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes
-sal_Bool SdrSnapView::BegSetPageOrg(const Point& rPnt)
+bool SdrSnapView::BegSetPageOrg(const Point& rPnt)
{
BrkAction();
@@ -470,7 +470,7 @@ sal_Bool SdrSnapView::BegSetPageOrg(const Point& rPnt)
mpPageOriginOverlay = new ImplPageOriginOverlay(*this, aStartPos);
aDragStat.Reset(GetSnapPos(rPnt,NULL));
- return sal_True;
+ return true;
}
void SdrSnapView::MovSetPageOrg(const Point& rPnt)
@@ -484,9 +484,9 @@ void SdrSnapView::MovSetPageOrg(const Point& rPnt)
}
}
-sal_Bool SdrSnapView::EndSetPageOrg()
+bool SdrSnapView::EndSetPageOrg()
{
- sal_Bool bRet(sal_False);
+ bool bRet(false);
if(IsSetPageOrg())
{
@@ -496,7 +496,7 @@ sal_Bool SdrSnapView::EndSetPageOrg()
{
Point aPnt(aDragStat.GetNow());
pPV->SetPageOrigin(aPnt);
- bRet = sal_True;
+ bRet = true;
}
// cleanup
@@ -518,7 +518,7 @@ void SdrSnapView::BrkSetPageOrg()
-sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const
+bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const
{
rpPV=NULL;
nTol=ImpGetHitTolLogic(nTol,&rOut);
@@ -531,16 +531,16 @@ sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDe
if (nIndex!=SDRHELPLINE_NOTFOUND) {
rpPV=pPV;
rnHelpLineNum=nIndex;
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
// start HelpLine drag for new HelpLine
-sal_Bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV)
+bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV)
{
- sal_Bool bRet(sal_False);
+ bool bRet(false);
if(!bHlplFixed)
{
@@ -559,7 +559,7 @@ sal_Bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV)
aDragStat.Reset(GetSnapPos(aHelpLinePos, pPV));
aDragStat.SetMinMove(ImpGetMinMovLogic(-3, 0L));
- bRet = sal_True;
+ bRet = true;
}
}
@@ -567,9 +567,9 @@ sal_Bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV)
}
// start HelpLine drag with existing HelpLine
-sal_Bool SdrSnapView::BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind)
+bool SdrSnapView::BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind)
{
- sal_Bool bRet(sal_False);
+ bool bRet(false);
BrkAction();
@@ -579,7 +579,7 @@ sal_Bool SdrSnapView::BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKin
basegfx::B2DPoint aStartPos(rPnt.X(), rPnt.Y());
mpHelpLineOverlay = new ImplHelpLineOverlay(*this, aStartPos, 0L, 0, eNewKind);
aDragStat.Reset(GetSnapPos(rPnt, 0L));
- bRet = sal_True;
+ bRet = true;
}
return bRet;
@@ -616,9 +616,9 @@ void SdrSnapView::MovDragHelpLine(const Point& rPnt)
}
}
-sal_Bool SdrSnapView::EndDragHelpLine()
+bool SdrSnapView::EndDragHelpLine()
{
- sal_Bool bRet(sal_False);
+ bool bRet(false);
if(IsDragHelpLine())
{
@@ -635,7 +635,7 @@ sal_Bool SdrSnapView::EndDragHelpLine()
aChangedHelpLine.SetPos(aPnt);
pPageView->SetHelpLine(mpHelpLineOverlay->GetHelpLineNumber(), aChangedHelpLine);
- bRet = sal_True;
+ bRet = true;
}
else
{
@@ -648,7 +648,7 @@ sal_Bool SdrSnapView::EndDragHelpLine()
SdrHelpLine aNewHelpLine(mpHelpLineOverlay->GetHelpLineKind(), aPnt);
pPageView->InsertHelpLine(aNewHelpLine);
- bRet = sal_True;
+ bRet = true;
}
}
}
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 940e83ec5aec..8e010d143e87 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -50,7 +50,7 @@ static void ImplUnmarkObject( SdrObject* pObj )
SdrViewIter aIter( pObj );
for ( SdrView* pView = aIter.FirstView(); pView; pView = aIter.NextView() )
{
- pView->MarkObj( pObj, pView->GetSdrPageView(), sal_True );
+ pView->MarkObj( pObj, pView->GetSdrPageView(), true );
}
}
@@ -150,12 +150,12 @@ bool SdrUndoGroup::CanSdrRepeat(SdrView& rView) const
{
case SDRREPFUNC_OBJ_NONE : return false;
case SDRREPFUNC_OBJ_DELETE : return rView.AreObjectsMarked();
- case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: return rView.IsCombinePossible(sal_False);
- case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : return rView.IsCombinePossible(sal_True);
- case SDRREPFUNC_OBJ_DISMANTLE_POLYS : return rView.IsDismantlePossible(sal_False);
- case SDRREPFUNC_OBJ_DISMANTLE_LINES : return rView.IsDismantlePossible(sal_True);
- case SDRREPFUNC_OBJ_CONVERTTOPOLY : return rView.IsConvertToPolyObjPossible(sal_False);
- case SDRREPFUNC_OBJ_CONVERTTOPATH : return rView.IsConvertToPathObjPossible(sal_False);
+ case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: return rView.IsCombinePossible(false);
+ case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : return rView.IsCombinePossible(true);
+ case SDRREPFUNC_OBJ_DISMANTLE_POLYS : return rView.IsDismantlePossible(false);
+ case SDRREPFUNC_OBJ_DISMANTLE_LINES : return rView.IsDismantlePossible(true);
+ case SDRREPFUNC_OBJ_CONVERTTOPOLY : return rView.IsConvertToPolyObjPossible(false);
+ case SDRREPFUNC_OBJ_CONVERTTOPATH : return rView.IsConvertToPathObjPossible(false);
case SDRREPFUNC_OBJ_GROUP : return rView.IsGroupPossible();
case SDRREPFUNC_OBJ_UNGROUP : return rView.IsUnGroupPossible();
case SDRREPFUNC_OBJ_PUTTOTOP : return rView.IsToTopPossible();
@@ -175,12 +175,12 @@ void SdrUndoGroup::SdrRepeat(SdrView& rView)
{
case SDRREPFUNC_OBJ_NONE : break;
case SDRREPFUNC_OBJ_DELETE : rView.DeleteMarked(); break;
- case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: rView.CombineMarkedObjects(sal_False); break;
- case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : rView.CombineMarkedObjects(sal_True); break;
- case SDRREPFUNC_OBJ_DISMANTLE_POLYS : rView.DismantleMarkedObjects(sal_False); break;
- case SDRREPFUNC_OBJ_DISMANTLE_LINES : rView.DismantleMarkedObjects(sal_True); break;
- case SDRREPFUNC_OBJ_CONVERTTOPOLY : rView.ConvertMarkedToPolyObj(sal_False); break;
- case SDRREPFUNC_OBJ_CONVERTTOPATH : rView.ConvertMarkedToPathObj(sal_False); break;
+ case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: rView.CombineMarkedObjects(false); break;
+ case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : rView.CombineMarkedObjects(true); break;
+ case SDRREPFUNC_OBJ_DISMANTLE_POLYS : rView.DismantleMarkedObjects(false); break;
+ case SDRREPFUNC_OBJ_DISMANTLE_LINES : rView.DismantleMarkedObjects(true); break;
+ case SDRREPFUNC_OBJ_CONVERTTOPOLY : rView.ConvertMarkedToPolyObj(false); break;
+ case SDRREPFUNC_OBJ_CONVERTTOPATH : rView.ConvertMarkedToPathObj(false); break;
case SDRREPFUNC_OBJ_GROUP : rView.GroupMarked(); break;
case SDRREPFUNC_OBJ_UNGROUP : rView.UnGroupMarked(); break;
case SDRREPFUNC_OBJ_PUTTOTOP : rView.PutMarkedToTop(); break;
@@ -527,7 +527,7 @@ void SdrUndoAttrObj::SdrRepeat(SdrView& rView)
{
if(pRepeatSet)
{
- rView.SetAttrToMarked(*pRepeatSet, sal_False);
+ rView.SetAttrToMarked(*pRepeatSet, false);
}
}
@@ -1164,7 +1164,7 @@ SdrUndoObjSetText::SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText)
, pOldText(NULL)
, pNewText(NULL)
, bNewTextAvailable(false)
- , bEmptyPresObj(sal_False)
+ , bEmptyPresObj(false)
, mnText(nText)
{
SdrText* pText = static_cast< SdrTextObj*>( &rNewObj )->getText(mnText);
@@ -1739,7 +1739,7 @@ OUString SdrUndoPageRemoveMasterPage::GetComment() const
SdrUndoPageChangeMasterPage::SdrUndoPageChangeMasterPage(SdrPage& rChangedPage)
: SdrUndoPageMasterPage(rChangedPage),
- mbNewHadMasterPage(sal_False)
+ mbNewHadMasterPage(false)
{
}
@@ -1748,7 +1748,7 @@ void SdrUndoPageChangeMasterPage::Undo()
// remember values from new page
if(mrPage.TRG_HasMasterPage())
{
- mbNewHadMasterPage = sal_True;
+ mbNewHadMasterPage = true;
maNewSet = mrPage.TRG_GetMasterPageVisibleLayers();
maNewMasterPageNumber = mrPage.TRG_GetMasterPage().GetPageNum();
}
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index a7e73b1ada11..9b5fa6f2c989 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -180,7 +180,7 @@ sal_Bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
SetActualWin(pWin);
sal_Bool bRet=SdrCreateView::KeyInput(rKEvt,pWin);
if (!bRet && !IsExtendedKeyInputDispatcherEnabled()) {
- bRet=sal_True;
+ bRet=true;
switch (rKEvt.GetKeyCode().GetFullFunction()) {
case KEYFUNC_CUT : Cut(); break;
case KEYFUNC_COPY : Yank(); break;
@@ -204,7 +204,7 @@ sal_Bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
case KEY_BACKSPACE+KEY_MOD2+KEY_SHIFT: pMod->Redo(); break;
case KEY_REPEAT: case KEY_BACKSPACE+KEY_MOD2+KEY_MOD1: pMod->Repeat(*this); break;
case KEY_MOD1+KEY_A: MarkAll(); break;
- default: bRet=sal_False;
+ default: bRet=false;
} // switch
}
} // switch
@@ -266,7 +266,7 @@ sal_Bool SdrView::Command(const CommandEvent& rCEvt, Window* pWin)
return bRet;
}
-sal_Bool SdrView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
+bool SdrView::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const
{
return SdrCreateView::GetAttributes(rTargetSet, bOnlyHardAttr);
}
@@ -328,17 +328,17 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
// #i73628# Use a non-changeable copy of he logic position
const Point aLocalLogicPosition(rLogicPos);
- sal_Bool bEditMode=IsEditMode();
+ bool bEditMode=IsEditMode();
bool bPointMode=bEditMode && HasMarkablePoints();
- sal_Bool bGluePointMode=IsGluePointEditMode();
+ bool bGluePointMode=IsGluePointEditMode();
bool bInsPolyPt=bPointMode && IsInsObjPointMode() && IsInsObjPointPossible();
bool bInsGluePt=bGluePointMode && IsInsGluePointMode() && IsInsGluePointPossible();
- sal_Bool bIsTextEdit=IsTextEdit();
- sal_Bool bTextEditHit=IsTextEditHit(aLocalLogicPosition,0/*nHitTolLog*/);
- sal_Bool bTextEditSel=IsTextEditInSelectionMode();
- sal_Bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
- sal_Bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
- sal_Bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
+ bool bIsTextEdit=IsTextEdit();
+ bool bTextEditHit=IsTextEditHit(aLocalLogicPosition,0/*nHitTolLog*/);
+ bool bTextEditSel=IsTextEditInSelectionMode();
+ bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
+ bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
+ bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
SdrHitKind eHit=SDRHIT_NONE;
SdrHdl* pHdl=pOut!=NULL && !bTextEditSel ? PickHandle(aLocalLogicPosition) : NULL;
SdrPageView* pPV=NULL;
@@ -350,7 +350,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
if (bTextEditHit || bTextEditSel)
{
eHit=SDRHIT_TEXTEDIT;
- bTextEditHit=sal_True;
+ bTextEditHit=true;
}
else if (pHdl!=NULL)
{
@@ -412,8 +412,8 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
if (IsMacroMode() && eHit==SDRHIT_UNMARKEDOBJECT)
{
bool bRoot=pObj->HasMacro();
- sal_Bool bDeep=pObj!=pHitObj && pHitObj->HasMacro();
- sal_Bool bMid=sal_False; // Have we hit upon a grouped group with a macro?
+ bool bDeep=pObj!=pHitObj && pHitObj->HasMacro();
+ bool bMid=false; // Have we hit upon a grouped group with a macro?
SdrObject* pMidObj=NULL;
if (pObj!=pHitObj)
{
@@ -424,7 +424,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
{
if (pObjTmp->HasMacro())
{
- bMid=sal_True;
+ bMid=true;
pMidObj=pObjTmp;
}
pObjTmp=pObjTmp->GetUpGroup();
@@ -518,7 +518,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
}
sal_Int32 nTolerance(nHitTolLog);
- sal_Bool bBoundRectHit(sal_False);
+ bool bBoundRectHit(false);
if(pOut)
{
@@ -530,7 +530,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
|| (aLocalLogicPosition.Y() >= aBoundRect.Top() - nTolerance && aLocalLogicPosition.Y() <= aBoundRect.Top() + nTolerance)
|| (aLocalLogicPosition.Y() >= aBoundRect.Bottom() - nTolerance && aLocalLogicPosition.Y() <= aBoundRect.Bottom() + nTolerance))
{
- bBoundRectHit = sal_True;
+ bBoundRectHit = true;
}
if(!bBoundRectHit)
@@ -557,12 +557,12 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
pObj=NULL;
pPV=NULL;
}
- sal_Bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
- sal_Bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0;
- sal_Bool bMouseDown=rVEvt.bMouseDown;
- sal_Bool bMouseUp=rVEvt.bMouseUp;
+ bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
+ bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0;
+ bool bMouseDown=rVEvt.bMouseDown;
+ bool bMouseUp=rVEvt.bMouseUp;
SdrEventKind eEvent=SDREVENT_NONE;
- sal_Bool bIsAction=IsAction();
+ bool bIsAction=IsAction();
if (bIsAction)
{
@@ -631,9 +631,9 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
else if (eHit==SDRHIT_HANDLE)
{
eEvent=SDREVENT_BEGDRAGOBJ; // Mark+Drag,AddMark+Drag,DeepMark+Drag,Unmark
- sal_Bool bGlue=pHdl->GetKind()==HDL_GLUE;
- sal_Bool bPoly=!bGlue && IsPointMarkable(*pHdl);
- sal_Bool bMarked=bGlue || (bPoly && pHdl->IsSelected());
+ bool bGlue=pHdl->GetKind()==HDL_GLUE;
+ bool bPoly=!bGlue && IsPointMarkable(*pHdl);
+ bool bMarked=bGlue || (bPoly && pHdl->IsSelected());
if (bGlue || bPoly)
{
eEvent=bGlue ? SDREVENT_MARKGLUEPOINT : SDREVENT_MARKPOINT;
@@ -751,18 +751,18 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
return eHit;
}
-sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
+bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
{
- sal_Bool bRet=sal_False;
+ bool bRet=false;
SdrHitKind eHit=rVEvt.eHit;
Point aLogicPos(rVEvt.aLogicPos);
- sal_Bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
- sal_Bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
- sal_Bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
- sal_Bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
- sal_Bool bMouseDown=rVEvt.bMouseDown;
- sal_Bool bMouseUp=rVEvt.bMouseUp;
+ bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
+ bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
+ bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
+ bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
+ bool bMouseDown=rVEvt.bMouseDown;
+ bool bMouseUp=rVEvt.bMouseUp;
if (bMouseDown) {
if (bMouseLeft) aDragStat.SetMouseDown(true);
} else if (bMouseUp) {
@@ -794,13 +794,13 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
// pHdl==NULL (because of eHit).
}
switch (rVEvt.eEvent) {
- case SDREVENT_NONE: bRet=sal_False; break;
- case SDREVENT_TEXTEDIT: bRet=sal_False; break; // Events handled by the OutlinerView are not taken into account here.
- case SDREVENT_MOVACTION: MovAction(aLogicPos); bRet=sal_True; break;
- case SDREVENT_ENDACTION: EndAction(); bRet=sal_True; break;
- case SDREVENT_BCKACTION: BckAction(); bRet=sal_True; break;
- case SDREVENT_BRKACTION: BrkAction(); bRet=sal_True; break;
- case SDREVENT_ENDMARK : EndAction(); bRet=sal_True; break;
+ case SDREVENT_NONE: bRet=false; break;
+ case SDREVENT_TEXTEDIT: bRet=false; break; // Events handled by the OutlinerView are not taken into account here.
+ case SDREVENT_MOVACTION: MovAction(aLogicPos); bRet=true; break;
+ case SDREVENT_ENDACTION: EndAction(); bRet=true; break;
+ case SDREVENT_BCKACTION: BckAction(); bRet=true; break;
+ case SDREVENT_BRKACTION: BrkAction(); bRet=true; break;
+ case SDREVENT_ENDMARK : EndAction(); bRet=true; break;
case SDREVENT_BRKMARK : {
BrkAction();
if (!MarkObj(aLogicPos,nHitTolLog,rVEvt.bAddMark)) {
@@ -810,7 +810,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
// 3. deselect any selected objects
if (!rVEvt.bAddMark) UnmarkAll();
}
- bRet=sal_True;
+ bRet=true;
} break;
case SDREVENT_ENDCREATE: { // if necessary, MarkObj
SdrCreateCmd eCmd=SDRCREATE_NEXTPOINT;
@@ -822,7 +822,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
if (eHit==SDRHIT_TEXTEDIT)
{
bool bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() &&
- SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, sal_False, (SdrOutliner*)0L));
+ SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, false, (SdrOutliner*)0L));
if(bRet2)
{
@@ -836,9 +836,9 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
}
}
}
- bRet=sal_True; // object is selected and (if necessary) TextEdit is started
- } else bRet=sal_False; // canceled Create, nothing else
- } else bRet=sal_True; // return sal_True for EndCreate
+ bRet=true; // object is selected and (if necessary) TextEdit is started
+ } else bRet=false; // canceled Create, nothing else
+ } else bRet=true; // return true for EndCreate
} break;
case SDREVENT_ENDDRAG: {
bRet=EndDragObj(IsDragWithCopy());
@@ -846,7 +846,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
} break;
case SDREVENT_MARKOBJ: { // + (if applicable) BegDrag
if (!rVEvt.bAddMark) UnmarkAllObj();
- sal_Bool bUnmark=rVEvt.bUnmark;
+ bool bUnmark=rVEvt.bUnmark;
if (rVEvt.bPrevNextMark) {
bRet=MarkNextObj(aLogicPos,nHitTolLog,rVEvt.bMarkPrev);
} else {
@@ -859,7 +859,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
}
if (!bUnmark) {
BegDragObj(aLogicPos,NULL,(SdrHdl*)NULL,nMinMovLog);
- bRet=sal_True;
+ bRet=true;
}
} break;
case SDREVENT_MARKPOINT: { // + (if applicable) BegDrag
@@ -871,7 +871,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
}
if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) {
BegDragObj(aLogicPos,NULL,rVEvt.pHdl,nMinMovLog);
- bRet=sal_True;
+ bRet=true;
}
} break;
case SDREVENT_MARKGLUEPOINT: { // + (if applicable) BegDrag
@@ -884,7 +884,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) {
SdrHdl* pHdl=GetGluePointHdl(rVEvt.pObj,rVEvt.nGlueId);
BegDragObj(aLogicPos,NULL,pHdl,nMinMovLog);
- bRet=sal_True;
+ bRet=true;
}
} break;
case SDREVENT_BEGMARK: bRet=BegMark(aLogicPos,rVEvt.bAddMark,rVEvt.bUnmark); break;
@@ -894,7 +894,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
if (MODKEY_PolyPoly) eCmd=SDRCREATE_NEXTOBJECT;
if (rVEvt.nMouseClicks>1) eCmd=SDRCREATE_FORCEEND;
EndInsObjPoint(eCmd);
- bRet=sal_True;
+ bRet=true;
} break;
case SDREVENT_BEGINSGLUEPOINT: bRet=BegInsGluePoint(aLogicPos); break;
case SDREVENT_BEGDRAGHELPLINE: bRet=BegDragHelpLine(rVEvt.nHlplIdx,rVEvt.pPV); break;
@@ -913,7 +913,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
}
bRet = pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType()&&
- SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, sal_False, (SdrOutliner*)0L);
+ SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, false, (SdrOutliner*)0L);
if(bRet)
{
@@ -932,10 +932,10 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
// left mouse button released?
bool bLeftUp=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseUp;
// left mouse button pressed or held?
- sal_Bool bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp;
+ bool bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp;
pWin->SetPointer(GetPreferredPointer(rVEvt.aLogicPos,pWin,
rVEvt.nMouseCode & (KEY_SHIFT|KEY_MOD1|KEY_MOD2),bLeftDown1));
- sal_Bool bAction=IsAction();
+ bool bAction=IsAction();
if (bLeftDown && bAction) pWin->CaptureMouse();
else if (bLeftUp || (rVEvt.bIsAction && !bAction)) pWin->ReleaseMouse();
}
@@ -943,7 +943,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
}
#include <editeng/outlobj.hxx>
-Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier, sal_Bool bLeftDown) const
+Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier, bool bLeftDown) const
{
// Actions
if (IsCreateObj())
@@ -1068,7 +1068,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
}
switch (eDragMode) {
case SDRDRAG_ROTATE: {
- if ((bCorner || bMov) && !IsRotateAllowed(sal_True))
+ if ((bCorner || bMov) && !IsRotateAllowed(true))
return Pointer(POINTER_NOTALLOWED);
// are 3D objects selected?
@@ -1087,7 +1087,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
} break;
case SDRDRAG_SHEAR: case SDRDRAG_DISTORT: {
if (bCorner) {
- if (!IsDistortAllowed(sal_True) && !IsDistortAllowed(sal_False)) return Pointer(POINTER_NOTALLOWED);
+ if (!IsDistortAllowed(true) && !IsDistortAllowed(false)) return Pointer(POINTER_NOTALLOWED);
else return Pointer(POINTER_REFHAND);
}
if (bVertex && !IsShearAllowed()) return Pointer(POINTER_NOTALLOWED);
@@ -1109,9 +1109,9 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
b45=b90 || (std::abs(aDif.X())==std::abs(aDif.Y()));
}
bool bNo=false;
- if (!IsMirrorAllowed(sal_True,sal_True)) bNo=true; // any mirroring is forbidden
- if (!IsMirrorAllowed(sal_False,sal_False) && !b45) bNo=true; // mirroring freely is forbidden
- if (!IsMirrorAllowed(sal_True,sal_False) && !b90) bNo=true; // mirroring horizontally/vertically is allowed
+ if (!IsMirrorAllowed(true,true)) bNo=true; // any mirroring is forbidden
+ if (!IsMirrorAllowed(false,false) && !b45) bNo=true; // mirroring freely is forbidden
+ if (!IsMirrorAllowed(true,false) && !b90) bNo=true; // mirroring horizontally/vertically is allowed
if (bNo) return Pointer(POINTER_NOTALLOWED);
if (b90) {
return Pointer(POINTER_MIRROR);
@@ -1138,7 +1138,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
case SDRDRAG_CROOK: {
if (bCorner || bVertex || bMov) {
- if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) return Pointer(POINTER_NOTALLOWED);
+ if (!IsCrookAllowed(true) && !IsCrookAllowed(false)) return Pointer(POINTER_NOTALLOWED);
return Pointer(POINTER_CROOK);
}
}
@@ -1149,7 +1149,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice*
}
default: {
- if ((bCorner || bVertex) && !IsResizeAllowed(sal_True)) return Pointer(POINTER_NOTALLOWED);
+ if ((bCorner || bVertex) && !IsResizeAllowed(true)) return Pointer(POINTER_NOTALLOWED);
}
}
if (pHdl!=NULL) return pHdl->GetPointer();
@@ -1244,7 +1244,7 @@ OUString SdrView::GetStatusText()
bool bBrk=false;
while (!bBrk) {
sal_uInt16 nLen=pTextEditOutliner->GetLineLen(aSel.nEndPara,nParaLine);
- sal_Bool bLastLine=(nParaLine==nParaLineAnz-1);
+ bool bLastLine=(nParaLine==nParaLineAnz-1);
if (nCol>nLen || (!bLastLine && nCol==nLen)) {
nCol-=nLen;
nLin++;
@@ -1409,9 +1409,9 @@ void SdrView::DeleteMarked()
}
}
-sal_Bool SdrView::BegMark(const Point& rPnt, sal_Bool bAddMark, sal_Bool bUnmark)
+bool SdrView::BegMark(const Point& rPnt, bool bAddMark, bool bUnmark)
{
- if (bUnmark) bAddMark=sal_True;
+ if (bUnmark) bAddMark=true;
if (IsGluePointEditMode()) {
if (!bAddMark) UnmarkAllGluePoints();
return BegMarkGluePoints(rPnt,bUnmark);
@@ -1440,9 +1440,9 @@ void SdrView::onAccessibilityOptionsChanged()
{
}
-void SdrView::SetMasterPagePaintCaching(sal_Bool bOn)
+void SdrView::SetMasterPagePaintCaching(bool bOn)
{
- if(mbMasterPagePaintCaching != (bool) bOn)
+ if(mbMasterPagePaintCaching != bOn)
{
mbMasterPagePaintCaching = bOn;
diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx
index f4021a7c2545..52c44a1b3383 100644
--- a/svx/source/svdraw/svdviter.cxx
+++ b/svx/source/svdraw/svdviter.cxx
@@ -40,7 +40,7 @@ void SdrViewIter::ImpInitVars()
-SdrViewIter::SdrViewIter(const SdrPage* pPage, sal_Bool bNoMasterPage)
+SdrViewIter::SdrViewIter(const SdrPage* pPage, bool bNoMasterPage)
{
mpPage = pPage;
mpModel = (pPage) ? pPage->GetModel() : 0L;
@@ -51,7 +51,7 @@ SdrViewIter::SdrViewIter(const SdrPage* pPage, sal_Bool bNoMasterPage)
-SdrViewIter::SdrViewIter(const SdrObject* pObject, sal_Bool bNoMasterPage)
+SdrViewIter::SdrViewIter(const SdrObject* pObject, bool bNoMasterPage)
{
mpObject = pObject;
mpModel = (pObject) ? pObject->GetModel() : 0L;
@@ -69,11 +69,11 @@ SdrViewIter::SdrViewIter(const SdrObject* pObject, sal_Bool bNoMasterPage)
-sal_Bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const
+bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const
{
if(mpPage)
{
- sal_Bool bMaster(mpPage->IsMasterPage());
+ bool bMaster(mpPage->IsMasterPage());
SdrPage* pPg = pPV->GetPage();
if(pPg == mpPage)
@@ -89,7 +89,7 @@ sal_Bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const
}
else
{
- return sal_True;
+ return true;
}
}
else
@@ -114,24 +114,24 @@ sal_Bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const
if(!aObjLay.IsEmpty())
{
- return sal_True;
+ return true;
} // else, look at the next master page of this page...
}
else
{
- return sal_True;
+ return true;
}
}
}
}
// master page forbidden or no fitting master page found
- return sal_False;
+ return false;
}
}
else
{
- return sal_True;
+ return true;
}
}
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 91f631f5b4fb..0ada28208166 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -62,34 +62,34 @@ SdrExchangeView::SdrExchangeView(SdrModel* pModel1, OutputDevice* pOut):
{
}
-sal_Bool SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const
+bool SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const
{
- sal_Bool bRet(sal_False);
+ bool bRet(false);
if(!aMaxWorkArea.IsEmpty())
{
if(rPt.X()<aMaxWorkArea.Left())
{
rPt.X() = aMaxWorkArea.Left();
- bRet = sal_True;
+ bRet = true;
}
if(rPt.X()>aMaxWorkArea.Right())
{
rPt.X() = aMaxWorkArea.Right();
- bRet = sal_True;
+ bRet = true;
}
if(rPt.Y()<aMaxWorkArea.Top())
{
rPt.Y() = aMaxWorkArea.Top();
- bRet = sal_True;
+ bRet = true;
}
if(rPt.Y()>aMaxWorkArea.Bottom())
{
rPt.Y() = aMaxWorkArea.Bottom();
- bRet = sal_True;
+ bRet = true;
}
}
return bRet;
@@ -107,9 +107,9 @@ void SdrExchangeView::ImpGetPasteObjList(Point& /*rPos*/, SdrObjList*& rpLst)
}
}
-sal_Bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const
+bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const
{
- sal_Bool bRet=sal_False;
+ bool bRet=false;
rLayer=0;
if (pObjList!=NULL) {
const SdrPage* pPg=pObjList->GetPage();
@@ -125,17 +125,17 @@ sal_Bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerI
return bRet;
}
-sal_Bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
+bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
{
if (rStr.isEmpty())
- return sal_False;
+ return false;
Point aPos(rPos);
ImpGetPasteObjList(aPos,pLst);
ImpLimitToWorkArea( aPos );
- if (pLst==NULL) return sal_False;
+ if (pLst==NULL) return false;
SdrLayerID nLayer;
- if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
+ if (!ImpGetPasteLayer(pLst,nLayer)) return false;
bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
if (bUnmark) UnmarkAllObj();
Rectangle aTextRect(0,0,500,500);
@@ -147,7 +147,7 @@ sal_Bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, SdrObjL
pObj->SetModel(pMod);
pObj->SetLayer(nLayer);
pObj->NbcSetText(rStr); // SetText before SetAttr, else SetAttr doesn't work!
- if (pDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(pDefaultStyleSheet, sal_False);
+ if (pDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(pDefaultStyleSheet, false);
pObj->SetMergedItemSet(aDefaultAttr);
@@ -162,17 +162,17 @@ sal_Bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, SdrObjL
MapUnit eMap=pMod->GetScaleUnit();
Fraction aMap=pMod->GetScaleFraction();
ImpPasteObject(pObj,*pLst,aPos,aSiz,MapMode(eMap,Point(0,0),aMap,aMap),nOptions);
- return sal_True;
+ return true;
}
-sal_Bool SdrExchangeView::Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
+bool SdrExchangeView::Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
{
Point aPos(rPos);
ImpGetPasteObjList(aPos,pLst);
ImpLimitToWorkArea( aPos );
- if (pLst==NULL) return sal_False;
+ if (pLst==NULL) return false;
SdrLayerID nLayer;
- if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
+ if (!ImpGetPasteLayer(pLst,nLayer)) return false;
bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
if (bUnmark) UnmarkAllObj();
Rectangle aTextRect(0,0,500,500);
@@ -183,7 +183,7 @@ sal_Bool SdrExchangeView::Paste(SvStream& rInput, const OUString& rBaseURL, sal_
SdrRectObj* pObj=new SdrRectObj(OBJ_TEXT,aTextRect);
pObj->SetModel(pMod);
pObj->SetLayer(nLayer);
- if (pDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(pDefaultStyleSheet, sal_False);
+ if (pDefaultStyleSheet!=NULL) pObj->NbcSetStyleSheet(pDefaultStyleSheet, false);
pObj->SetMergedItemSet(aDefaultAttr);
@@ -214,20 +214,20 @@ sal_Bool SdrExchangeView::Paste(SvStream& rInput, const OUString& rBaseURL, sal_
{
if(pObj->GetModel()->GetStyleSheetPool() == &pCandidate->GetPool())
{
- pObj->NbcSetStyleSheet(pCandidate, sal_True);
+ pObj->NbcSetStyleSheet(pCandidate, true);
}
}
}
}
- return sal_True;
+ return true;
}
-sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
+bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
{
const SdrModel* pSrcMod=&rMod;
if (pSrcMod==pMod)
- return sal_False; // this can't work, right?
+ return false; // this can't work, right?
const bool bUndo = IsUndoEnabled();
@@ -238,7 +238,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL
{
if( bUndo )
EndUndo();
- return sal_True;
+ return true;
}
Point aPos(rPos);
@@ -254,7 +254,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL
ImpLimitToWorkArea( aPos );
if (pLst==NULL)
- return sal_False;
+ return false;
bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
if (bUnmark)
@@ -350,7 +350,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL
if (bMark) {
// Don't already set Markhandles!
// That is instead being done by ModelHasChanged in MarkView.
- MarkObj(pNeuObj,pMarkPV,sal_False,sal_True);
+ MarkObj(pNeuObj,pMarkPV,false,true);
}
// #i13033#
@@ -391,7 +391,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL
if( bUndo )
EndUndo();
- return sal_True;
+ return true;
}
void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions)
@@ -780,26 +780,26 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
-sal_Bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */)
+bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */)
{
OSL_FAIL( "SdrExchangeView::Cut: Not supported any more." );
- return sal_False;
+ return false;
}
-sal_Bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/)
+bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/)
{
OSL_FAIL( "SdrExchangeView::Yank: Not supported any more." );
- return sal_False;
+ return false;
}
-sal_Bool SdrExchangeView::Paste(Window* /*pWin*/, sal_uIntPtr /*nFormat*/)
+bool SdrExchangeView::Paste(Window* /*pWin*/, sal_uIntPtr /*nFormat*/)
{
OSL_FAIL( "SdrExchangeView::Paste: Not supported any more." );
- return sal_False;
+ return false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index e2722f0555bc..6aa5e5d45265 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -301,7 +301,7 @@ namespace sdr
{
if(pNewItem && (SDRATTR_TEXTDIRECTION == nWhich))
{
- sal_Bool bVertical(com::sun::star::text::WritingMode_TB_RL == ((SvxWritingModeItem*)pNewItem)->GetValue());
+ bool bVertical(com::sun::star::text::WritingMode_TB_RL == ((SvxWritingModeItem*)pNewItem)->GetValue());
sdr::table::SdrTableObj& rObj = (sdr::table::SdrTableObj&)GetSdrObject();
if( rObj.IsVerticalWriting() != bVertical )
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 1d4dc8a2e7f0..ffb4ed7359b9 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -439,7 +439,7 @@ bool SdrTableObjImpl::ApplyCellStyles()
if( xCell.is() && ( xCell->GetStyleSheet() != pStyle ) )
{
bChanges = true;
- xCell->SetStyleSheet( pStyle, sal_True );
+ xCell->SetStyleSheet( pStyle, true );
}
}
}
@@ -690,7 +690,7 @@ void SdrTableObjImpl::UpdateCells( Rectangle& rArea )
{
TableModelNotifyGuard aGuard( mxTable.get() );
mpLayouter->updateCells( rArea );
- mxTable->setModified(sal_True);
+ mxTable->setModified(true);
}
}
@@ -1815,14 +1815,14 @@ Point SdrTableObj::GetSnapPoint(sal_uInt32 i) const
-sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
+bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
{
if( pEdtOutl != NULL )
- return sal_False;
+ return false;
pEdtOutl=&rOutl;
- mbInEditMode = sal_True;
+ mbInEditMode = true;
rOutl.Init( OUTLINERMODE_TEXTOBJECT );
rOutl.SetRefDevice( pModel->GetRefDevice() );
@@ -1852,7 +1852,7 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
rOutl.UpdateFields();
rOutl.ClearModifyFlag();
- return sal_True;
+ return true;
}
@@ -1899,7 +1899,7 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
nStat &= ~EE_CNTRL_AUTOPAGESIZE;
rOutl.SetControlWord(nStat);
- mbInEditMode = sal_False;
+ mbInEditMode = false;
}
@@ -2043,7 +2043,7 @@ void SdrTableObj::ReformatText()
-sal_Bool SdrTableObj::IsVerticalWriting() const
+bool SdrTableObj::IsVerticalWriting() const
{
const SvxWritingModeItem* pModeItem = dynamic_cast< const SvxWritingModeItem* >( &GetObjectItem( SDRATTR_TEXTDIRECTION ) );
return pModeItem && pModeItem->GetValue() == com::sun::star::text::WritingMode_TB_RL;
@@ -2051,7 +2051,7 @@ sal_Bool SdrTableObj::IsVerticalWriting() const
-void SdrTableObj::SetVerticalWriting(sal_Bool bVertical )
+void SdrTableObj::SetVerticalWriting(bool bVertical )
{
if( bVertical != IsVerticalWriting() )
{
@@ -2091,7 +2091,7 @@ WritingMode SdrTableObj::GetWritingMode() const
// gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon
// with the base geometry and returns TRUE. Otherwise it returns FALSE.
-sal_Bool SdrTableObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon ) const
+bool SdrTableObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon ) const
{
return SdrTextObj::TRGetBaseGeometry( rMatrix, rPolyPolygon );
}
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 659bf3c8e59d..e3671acd6da6 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -531,7 +531,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
}
if( pTableObj->IsTextEditActive() )
- mpView->SdrEndTextEdit(sal_True);
+ mpView->SdrEndTextEdit(true);
RemoveSelection();
@@ -636,7 +636,7 @@ void SvxTableController::onDelete( sal_uInt16 nSId )
getSelectedCells( aStart, aEnd );
if( pTableObj->IsTextEditActive() )
- mpView->SdrEndTextEdit(sal_True);
+ mpView->SdrEndTextEdit(true);
RemoveSelection();
@@ -1024,7 +1024,7 @@ void SvxTableController::MergeMarkedCells()
if( pTableObj )
{
if( pTableObj->IsTextEditActive() )
- mpView->SdrEndTextEdit(sal_True);
+ mpView->SdrEndTextEdit(true);
TableModelNotifyGuard aGuard( mxTable.get() );
MergeRange( aStart.mnCol, aStart.mnRow, aEnd.mnCol, aEnd.mnRow );
@@ -1058,7 +1058,7 @@ void SvxTableController::SplitMarkedCells()
if( pTableObj )
{
if( pTableObj->IsTextEditActive() )
- mpView->SdrEndTextEdit(sal_True);
+ mpView->SdrEndTextEdit(true);
TableModelNotifyGuard aGuard( mxTable.get() );
@@ -1537,7 +1537,7 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, Window
void SvxTableController::gotoCell( const CellPos& rPos, bool bSelect, Window* pWindow, sal_uInt16 nAction )
{
if( mxTableObj.is() && static_cast<SdrTableObj*>(mxTableObj.get())->IsTextEditActive() )
- mpView->SdrEndTextEdit(sal_True);
+ mpView->SdrEndTextEdit(true);
if( bSelect )
{
@@ -1683,7 +1683,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const
if( pTableObj != mpView->GetTextEditObject() || bEmptyOutliner || !pTableObj->IsTextEditActive( aPos ) )
{
if( pTableObj->IsTextEditActive() )
- mpView->SdrEndTextEdit(sal_True);
+ mpView->SdrEndTextEdit(true);
pTableObj->setActiveCell( aPos );
@@ -1692,7 +1692,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const
if( pTableObj->IsVerticalWriting() )
pOutl->SetVertical( true );
- if(mpView->SdrBeginTextEdit(pTableObj, pPV, pWindow, sal_True, pOutl))
+ if(mpView->SdrBeginTextEdit(pTableObj, pPV, pWindow, true, pOutl))
{
maCursorLastPos = maCursorFirstPos = rPos;
@@ -2451,7 +2451,7 @@ bool SvxTableController::PasteObject( SdrTableObj* pPasteTableObj )
getSelectedCells( aStart, aEnd );
if( mpView->IsTextEdit() )
- mpView->SdrEndTextEdit(sal_True);
+ mpView->SdrEndTextEdit(true);
sal_Int32 nColumns = mxTable->getColumnCount();
sal_Int32 nRows = mxTable->getRowCount();
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 14bf98a507a1..52e91ff8e995 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -273,7 +273,7 @@ void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xS
{
if(CONTAINER_ENTRY_NOTFOUND != pView->TryToFindMarkedObject(pSdrShape))
{
- pView->MarkObj(pSdrShape, pView->GetSdrPageView(), sal_True, sal_False);
+ pView->MarkObj(pSdrShape, pView->GetSdrPageView(), true, false);
}
}
@@ -1903,13 +1903,13 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c
bool bCustomShapeGeometry = pObject && aPropertyName == "CustomShapeGeometry";
- sal_Bool bMirroredX = sal_False;
- sal_Bool bMirroredY = sal_False;
+ bool bMirroredX = false;
+ bool bMirroredY = false;
if ( bCustomShapeGeometry )
{
- bMirroredX = ( ((SdrObjCustomShape*)pObject)->IsMirroredX() );
- bMirroredY = ( ((SdrObjCustomShape*)pObject)->IsMirroredY() );
+ bMirroredX = ((SdrObjCustomShape*)pObject)->IsMirroredX();
+ bMirroredY = ((SdrObjCustomShape*)pObject)->IsMirroredY();
}
SvxShape::setPropertyValue( aPropertyName, aValue );
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 99e95d3cc487..bb1db0d8c8b0 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -829,7 +829,7 @@ SvxEditViewForwarder* SvxTextEditSourceImpl::GetEditViewForwarder( sal_Bool bCre
// enter edit mode
mpView->SdrEndTextEdit();
- if(mpView->SdrBeginTextEdit(mpObject, 0L, 0L, sal_False, (SdrOutliner*)0L, 0L, sal_False, sal_False))
+ if(mpView->SdrBeginTextEdit(mpObject, 0L, 0L, false, (SdrOutliner*)0L, 0L, false, false))
{
SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, mpObject );
if( pTextObj->IsTextEditActive() )
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index d65884bf05c3..0bd6a01ec411 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -698,7 +698,7 @@ void SwDoc::PrtDataChanged()
}
if ( bDraw && mpDrawModel )
{
- const sal_Bool bTmpAddExtLeading = get(IDocumentSettingAccess::ADD_EXT_LEADING);
+ const bool bTmpAddExtLeading = get(IDocumentSettingAccess::ADD_EXT_LEADING);
if ( bTmpAddExtLeading != mpDrawModel->IsAddExtLeading() )
mpDrawModel->SetAddExtLeading( bTmpAddExtLeading );
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index d94eb3590d90..7173f8d0b5cb 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -413,7 +413,7 @@ bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
if( pFrmFmt &&
FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() )
{
- rDrawView.MarkObj( pObj, rDrawView.Imp().GetPageView(), sal_True );
+ rDrawView.MarkObj( pObj, rDrawView.Imp().GetPageView(), true );
--i;
DelLayoutFmt( pFrmFmt );
}
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index ebe533ca35e0..a1714b03b419 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1608,7 +1608,7 @@ void SwDrawContact::DisconnectFromLayout( bool _bMoveMasterToInvisibleLayer )
for( SdrView* pView = aIter.FirstView(); pView;
pView = aIter.NextView() )
{
- pView->MarkObj( GetMaster(), pView->GetSdrPageView(), sal_True );
+ pView->MarkObj( GetMaster(), pView->GetSdrPageView(), true );
}
// Instead of removing 'master' object from drawing page, move the
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
index 7cf986c17a17..4886a8e62241 100644
--- a/sw/source/core/draw/drawdoc.cxx
+++ b/sw/source/core/draw/drawdoc.cxx
@@ -121,7 +121,7 @@ SwDrawDocument::~SwDrawDocument()
{
Broadcast(SdrHint(HINT_MODELCLEARED));
- ClearModel(sal_True);
+ ClearModel(true);
}
/** Create a new page (SdPage) and return a pointer to it back.
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index b025b987029b..eeeb492ff799 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -62,13 +62,13 @@ class SwSdrHdl : public SdrHdl
public:
SwSdrHdl(const Point& rPnt, bool bTopRight ) :
SdrHdl( rPnt, bTopRight ? HDL_ANCHOR_TR : HDL_ANCHOR ) {}
- virtual sal_Bool IsFocusHdl() const;
+ virtual bool IsFocusHdl() const;
};
-sal_Bool SwSdrHdl::IsFocusHdl() const
+bool SwSdrHdl::IsFocusHdl() const
{
if( HDL_ANCHOR == eKind || HDL_ANCHOR_TR == eKind )
- return sal_True;
+ return true;
return SdrHdl::IsFocusHdl();
}
@@ -101,13 +101,13 @@ SwDrawView::SwDrawView( SwViewImp &rI, SdrModel *pMd, OutputDevice *pOutDev) :
SetGridVisible( false );
SetHlplVisible( false );
SetGlueVisible( false );
- SetFrameDragSingles( sal_True );
- SetVirtualObjectBundling( sal_True );
- SetSwapAsynchron( sal_True );
+ SetFrameDragSingles( true );
+ SetVirtualObjectBundling( true );
+ SetSwapAsynchron( true );
- EnableExtendedKeyInputDispatcher( sal_False );
- EnableExtendedMouseEventDispatcher( sal_False );
- EnableExtendedCommandEventDispatcher( sal_False );
+ EnableExtendedKeyInputDispatcher( false );
+ EnableExtendedMouseEventDispatcher( false );
+ EnableExtendedCommandEventDispatcher( false );
SetHitTolerancePixel( GetMarkHdlSizePixel()/2 );
@@ -650,11 +650,11 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
_MoveRepeatedObjs( *pMovedAnchoredObj, aMovedChildObjs );
}
-sal_Bool SwDrawView::TakeDragLimit( SdrDragMode eMode,
+bool SwDrawView::TakeDragLimit( SdrDragMode eMode,
Rectangle& rRect ) const
{
const SdrMarkList &rMrkList = GetMarkedObjectList();
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( 1 == rMrkList.GetMarkCount() )
{
const SdrObject *pObj = rMrkList.GetMark( 0 )->GetMarkedSdrObj();
@@ -662,7 +662,7 @@ sal_Bool SwDrawView::TakeDragLimit( SdrDragMode eMode,
if( ::CalcClipRect( pObj, aRect, eMode == SDRDRAG_MOVE ) )
{
rRect = aRect.SVRect();
- bRet = sal_True;
+ bRet = true;
}
}
return bRet;
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 9c3e5a616bdb..f1a90752a580 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -1491,7 +1491,7 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt )
aSet.Put(pClpObj->GetMergedItemSet());
}
- pView->SetAttributes( aSet, sal_False );
+ pView->SetAttributes( aSet, false );
}
break;
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index cbcdbcfadaf2..68930af1d73c 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -255,7 +255,7 @@ void SwFEShell::SelectFlyFrm( SwFlyFrm& rFrm, sal_Bool bNew )
pImpl->GetDrawView()->UnmarkAll();
pImpl->GetDrawView()->MarkObj( rFrm.GetVirtDrawObj(),
- pImpl->GetPageView(), sal_False, sal_False );
+ pImpl->GetPageView(), false, false );
KillPams();
ClearMark();
SelFlyGrabCrsr();
@@ -934,7 +934,7 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj,
{
// select drawing object
Imp()->GetDrawView()->MarkObj( &rDrawObj, Imp()->GetPageView(),
- sal_False, sal_False );
+ false, false );
}
else
{
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 4fb6bcaad2ac..4e188f1321cc 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1046,7 +1046,7 @@ void SwFEShell::EndTextEdit()
}
if ( !pObj->GetUpGroup() )
{
- if ( SDRENDTEXTEDIT_SHOULDBEDELETED == pView->SdrEndTextEdit(sal_True) )
+ if ( SDRENDTEXTEDIT_SHOULDBEDELETED == pView->SdrEndTextEdit(true) )
{
if ( pView->GetMarkedObjectList().GetMarkCount() > 1 )
{
@@ -1115,7 +1115,7 @@ bool SwFEShell::IsObjSelectable( const Point& rPt )
sal_uInt16 nOld = pDView->GetHitTolerancePixel();
pDView->SetHitTolerancePixel( pDView->GetMarkHdlSizePixel()/2 );
- bRet = 0 != pDView->PickObj( rPt, pDView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMARKABLE );
+ bRet = pDView->PickObj( rPt, pDView->getHitTolLog(), pObj, pPV, SDRSEARCH_PICKMARKABLE );
pDView->SetHitTolerancePixel( nOld );
}
return bRet;
@@ -1913,12 +1913,12 @@ sal_Bool SwFEShell::ImpEndCreate()
if ( pMarkObj )
{
Imp()->GetDrawView()->MarkObj( pMarkObj, Imp()->GetPageView(),
- sal_False, sal_False );
+ false, false );
}
else
{
Imp()->GetDrawView()->MarkObj( &rSdrObj, Imp()->GetPageView(),
- sal_False, sal_False );
+ false, false );
}
}
}
diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx
index 727c060ea67f..1d1617ad071f 100644
--- a/sw/source/core/inc/dview.hxx
+++ b/sw/source/core/inc/dview.hxx
@@ -92,7 +92,7 @@ public:
virtual void ObjOrderChanged( SdrObject* pObj, sal_uLong nOldPos,
sal_uLong nNewPos );
- virtual sal_Bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
+ virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
virtual void MakeVisible( const Rectangle&, Window &rWin );
virtual void CheckPossibilities();
diff --git a/sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx
index a9a7c503a3e3..49ae7baf2b0c 100644
--- a/sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -136,7 +136,7 @@ static void lcl_LeaveDrawText(SwWrtShell& rSh)
{
if(rSh.GetDrawView())
{
- rSh.GetDrawView()->SdrEndTextEdit( sal_True );
+ rSh.GetDrawView()->SdrEndTextEdit( true );
Point aPt(LONG_MIN, LONG_MIN);
// go out of the frame
rSh.SelectObj(aPt, SW_LEAVE_FRAME);
@@ -791,7 +791,7 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh)
{
// now the current one has to be deselected
if(pCurrentTextObj)
- pDrView->SdrEndTextEdit( sal_True );
+ pDrView->SdrEndTextEdit( true );
// and the found one should be activated
rSh.MakeVisible(pTextObj->GetLogicRect());
Point aTmp( 0,0 );
diff --git a/sw/source/core/uibase/docvw/edtwin.cxx b/sw/source/core/uibase/docvw/edtwin.cxx
index 10794255f42b..8f0b7ba08dbc 100644
--- a/sw/source/core/uibase/docvw/edtwin.cxx
+++ b/sw/source/core/uibase/docvw/edtwin.cxx
@@ -1279,7 +1279,7 @@ void SwEditWin::ChangeDrawing( sal_uInt8 nDir )
if(!bWasNoSnap)
((SdrDragStat&)rDragStat).SetNoSnap(true);
if(bWasSnapEnabled)
- pSdrView->SetSnapEnabled(sal_False);
+ pSdrView->SetSnapEnabled(false);
pSdrView->MovAction(aEndPoint);
pSdrView->EndDragObj();
diff --git a/sw/source/core/uibase/lingu/sdrhhcwrap.cxx b/sw/source/core/uibase/lingu/sdrhhcwrap.cxx
index 3a05a06b3328..5f74abc257d8 100644
--- a/sw/source/core/uibase/lingu/sdrhhcwrap.cxx
+++ b/sw/source/core/uibase/lingu/sdrhhcwrap.cxx
@@ -90,7 +90,7 @@ SdrHHCWrapper::~SdrHHCWrapper()
{
SdrView *pSdrView = pView->GetWrtShell().GetDrawView();
OSL_ENSURE( pSdrView, "SdrHHCWrapper without DrawView?" );
- pSdrView->SdrEndTextEdit( sal_True );
+ pSdrView->SdrEndTextEdit( true );
SetUpdateMode(false);
pOutlView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) );
}
@@ -111,7 +111,7 @@ bool SdrHHCWrapper::ConvertNextDocument()
{
SdrView *pSdrView = pView->GetWrtShell().GetDrawView();
OSL_ENSURE( pSdrView, "SdrHHCWrapper without DrawView?" );
- pSdrView->SdrEndTextEdit( sal_True );
+ pSdrView->SdrEndTextEdit( true );
SetUpdateMode(false);
pOutlView->SetOutputArea( Rectangle( Point(), Size(1, 1) ) );
SetPaperSize( Size(1, 1) );
@@ -154,7 +154,7 @@ bool SdrHHCWrapper::ConvertNextDocument()
SetUpdateMode(true);
pView->GetWrtShell().MakeVisible(pTextObj->GetLogicRect());
- pSdrView->SdrBeginTextEdit(pTextObj, pPV, &pView->GetEditWin(), sal_False, this, pOutlView, sal_True, sal_True);
+ pSdrView->SdrBeginTextEdit(pTextObj, pPV, &pView->GetEditWin(), false, this, pOutlView, true, true);
}
else
SetUpdateMode(false);
diff --git a/sw/source/core/uibase/ribbar/conform.cxx b/sw/source/core/uibase/ribbar/conform.cxx
index 2b15f5f8e9e4..a3b5c3d2e7d1 100644
--- a/sw/source/core/uibase/ribbar/conform.cxx
+++ b/sw/source/core/uibase/ribbar/conform.cxx
@@ -46,13 +46,13 @@ sal_Bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
if (rMEvt.IsMod2())
{
- pSdrView->SetCreate1stPointAsCenter(sal_True);
- pSdrView->SetResizeAtCenter(sal_True);
+ pSdrView->SetCreate1stPointAsCenter(true);
+ pSdrView->SetResizeAtCenter(true);
}
else
{
- pSdrView->SetCreate1stPointAsCenter(sal_False);
- pSdrView->SetResizeAtCenter(sal_False);
+ pSdrView->SetCreate1stPointAsCenter(false);
+ pSdrView->SetResizeAtCenter(false);
}
SdrViewEvent aVEvt;
diff --git a/sw/source/core/uibase/ribbar/conrect.cxx b/sw/source/core/uibase/ribbar/conrect.cxx
index b6646827c1b1..9b7aa478e549 100644
--- a/sw/source/core/uibase/ribbar/conrect.cxx
+++ b/sw/source/core/uibase/ribbar/conrect.cxx
@@ -100,7 +100,7 @@ sal_Bool ConstRectangle::MouseButtonUp(const MouseEvent& rMEvt)
SdrTextObj* pText = (SdrTextObj*)pObj;
SfxItemSet aSet(pSdrView->GetModel()->GetItemPool());
- pText->SetVerticalWriting(sal_True);
+ pText->SetVerticalWriting(true);
aSet.Put(SdrTextAutoGrowWidthItem(true));
aSet.Put(SdrTextAutoGrowHeightItem(false));
diff --git a/sw/source/core/uibase/ribbar/drawbase.cxx b/sw/source/core/uibase/ribbar/drawbase.cxx
index de3eddb8fe3d..927522a873a8 100644
--- a/sw/source/core/uibase/ribbar/drawbase.cxx
+++ b/sw/source/core/uibase/ribbar/drawbase.cxx
@@ -56,7 +56,7 @@ SwDrawBase::SwDrawBase(SwWrtShell* pSwWrtShell, SwEditWin* pWindow, SwView* pSwV
SwDrawBase::~SwDrawBase()
{
if (m_pView->GetWrtShellPtr()) // In the view-dtor could the wrtsh already been deleted...
- m_pSh->GetDrawView()->SetEditMode(sal_True);
+ m_pSh->GetDrawView()->SetEditMode(true);
}
sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
@@ -71,13 +71,13 @@ sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
if (rMEvt.IsMod2())
{
- pSdrView->SetCreate1stPointAsCenter(sal_True);
- pSdrView->SetResizeAtCenter(sal_True);
+ pSdrView->SetCreate1stPointAsCenter(true);
+ pSdrView->SetResizeAtCenter(true);
}
else
{
- pSdrView->SetCreate1stPointAsCenter(sal_False);
- pSdrView->SetResizeAtCenter(sal_False);
+ pSdrView->SetCreate1stPointAsCenter(false);
+ pSdrView->SetResizeAtCenter(false);
}
SdrViewEvent aVEvt;
@@ -426,7 +426,7 @@ void SwDrawBase::Activate(const sal_uInt16 nSlot)
SdrView *pSdrView = m_pSh->GetDrawView();
pSdrView->SetCurrentObj( static_cast< sal_uInt16 >(m_pWin->GetSdrDrawMode()) );
- pSdrView->SetEditMode(sal_False);
+ pSdrView->SetEditMode(false);
SetDrawPointer();
m_pSh->NoEdit();
@@ -436,7 +436,7 @@ void SwDrawBase::Deactivate()
{
SdrView *pSdrView = m_pSh->GetDrawView();
pSdrView->SetOrtho(false);
- pSdrView->SetAngleSnapEnabled(sal_False);
+ pSdrView->SetAngleSnapEnabled(false);
if (m_pWin->IsDrawAction() && m_pSh->IsDrawCreate())
m_pSh->BreakCreate();
diff --git a/sw/source/core/uibase/shells/drawdlg.cxx b/sw/source/core/uibase/shells/drawdlg.cxx
index 9ba12d925938..1abf9b0fac4f 100644
--- a/sw/source/core/uibase/shells/drawdlg.cxx
+++ b/sw/source/core/uibase/shells/drawdlg.cxx
@@ -88,7 +88,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
if (bHasMarked)
pView->SetAttributes(*pDlg->GetOutputItemSet());
else
- pView->SetDefaultAttr(*pDlg->GetOutputItemSet(), sal_False);
+ pView->SetDefaultAttr(*pDlg->GetOutputItemSet(), false);
pSh->EndAction();
static sal_uInt16 aInval[] =
@@ -131,9 +131,9 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
{
pSh->StartAction();
if(bHasMarked)
- pView->SetAttrToMarked(*pDlg->GetOutputItemSet(), sal_False);
+ pView->SetAttrToMarked(*pDlg->GetOutputItemSet(), false);
else
- pView->SetDefaultAttr(*pDlg->GetOutputItemSet(), sal_False);
+ pView->SetDefaultAttr(*pDlg->GetOutputItemSet(), false);
pSh->EndAction();
static sal_uInt16 aInval[] =
@@ -180,9 +180,9 @@ void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq)
if (pArgs)
{
if(pView->AreObjectsMarked())
- pView->SetAttrToMarked(*rReq.GetArgs(), sal_False);
+ pView->SetAttrToMarked(*rReq.GetArgs(), false);
else
- pView->SetDefaultAttr(*rReq.GetArgs(), sal_False);
+ pView->SetDefaultAttr(*rReq.GetArgs(), false);
}
else
{
diff --git a/sw/source/core/uibase/shells/drawsh.cxx b/sw/source/core/uibase/shells/drawsh.cxx
index 5932d12c999b..4763cb55931a 100644
--- a/sw/source/core/uibase/shells/drawsh.cxx
+++ b/sw/source/core/uibase/shells/drawsh.cxx
@@ -532,7 +532,7 @@ void SwDrawShell::ExecFormText(SfxRequest& rReq)
if ( pDrView->IsTextEdit() )
{
- pDrView->SdrEndTextEdit( sal_True );
+ pDrView->SdrEndTextEdit( true );
GetView().AttrChangedNotify(&rSh);
}
diff --git a/sw/source/core/uibase/shells/drwtxtex.cxx b/sw/source/core/uibase/shells/drwtxtex.cxx
index 24abc785cf6e..db2014b014e7 100644
--- a/sw/source/core/uibase/shells/drwtxtex.cxx
+++ b/sw/source/core/uibase/shells/drwtxtex.cxx
@@ -490,7 +490,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
SdrPageView* pTmpPV = pSdrView->GetSdrPageView();
SdrView* pTmpView = pSdrView;
- pSdrView->SdrEndTextEdit(sal_True);
+ pSdrView->SdrEndTextEdit(true);
SfxItemSet aAttr( *aNewAttr.GetPool(),
SDRATTR_TEXTDIRECTION,
@@ -514,7 +514,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
SdrPageView* pTmpPV = pSdrView->GetSdrPageView();
SdrView* pTmpView = pSdrView;
- pSdrView->SdrEndTextEdit(sal_True);
+ pSdrView->SdrEndTextEdit(true);
bool bLeftToRight = nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT;
const SfxPoolItem* pPoolItem;
diff --git a/sw/source/core/uibase/shells/drwtxtsh.cxx b/sw/source/core/uibase/shells/drwtxtsh.cxx
index 350c4f62c06a..a5b158795ed7 100644
--- a/sw/source/core/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/core/uibase/shells/drwtxtsh.cxx
@@ -216,7 +216,7 @@ void SwDrawTextShell::ExecFormText(SfxRequest& rReq)
//#111733# Sometimes SdrEndTextEdit() initiates the change in selection and
// 'this' is not valid anymore
SwView& rTempView = GetView();
- pDrView->SdrEndTextEdit(sal_True);
+ pDrView->SdrEndTextEdit(true);
//this removes the current shell from the dispatcher stack!!
rTempView.AttrChangedNotify(&rSh);
}
diff --git a/sw/source/core/uibase/shells/textdrw.cxx b/sw/source/core/uibase/shells/textdrw.cxx
index fcc12affcb9c..acc239b544b4 100644
--- a/sw/source/core/uibase/shells/textdrw.cxx
+++ b/sw/source/core/uibase/shells/textdrw.cxx
@@ -52,7 +52,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget,
// OBJ_FM_BUTTON
pSdrView->SetDesignMode(true);
pSdrView->SetCurrentObj(OBJ_FM_BUTTON);
- pSdrView->SetEditMode(sal_False);
+ pSdrView->SetEditMode(false);
Point aStartPos(rSh.GetCharRect().Pos() + Point(0, 1));
diff --git a/sw/source/core/uibase/uiview/pview.cxx b/sw/source/core/uibase/uiview/pview.cxx
index 50aa5e1bd92a..0c07be1eb895 100644
--- a/sw/source/core/uibase/uiview/pview.cxx
+++ b/sw/source/core/uibase/uiview/pview.cxx
@@ -1084,7 +1084,7 @@ void SwPagePreview::StateUndo(SfxItemSet& rSet)
void SwPagePreview::Init(const SwViewOption * pPrefs)
{
if ( GetViewShell()->HasDrawView() )
- GetViewShell()->GetDrawView()->SetAnimationEnabled( sal_False );
+ GetViewShell()->GetDrawView()->SetAnimationEnabled( false );
bNormalPrint = sal_True;
diff --git a/sw/source/core/uibase/uiview/view.cxx b/sw/source/core/uibase/uiview/view.cxx
index e2d60dd2eac8..a96f76dec036 100644
--- a/sw/source/core/uibase/uiview/view.cxx
+++ b/sw/source/core/uibase/uiview/view.cxx
@@ -213,7 +213,7 @@ IMPL_LINK_NOARG(SwView, FormControlActivated)
// if we're editing text currently, cancel this
SdrView *pSdrView = m_pWrtShell ? m_pWrtShell->GetDrawView() : NULL;
if ( pSdrView && pSdrView->IsTextEdit() )
- pSdrView->SdrEndTextEdit( sal_True );
+ pSdrView->SdrEndTextEdit( true );
const_cast< SwView* >( this )->AttrChangedNotify( m_pWrtShell );
}
@@ -1049,7 +1049,7 @@ SwView::~SwView()
// the last view must end the text edit
SdrView *pSdrView = m_pWrtShell ? m_pWrtShell->GetDrawView() : 0;
if( pSdrView && pSdrView->IsTextEdit() )
- pSdrView->SdrEndTextEdit( sal_True );
+ pSdrView->SdrEndTextEdit( true );
SetWindow( 0 );
diff --git a/sw/source/core/uibase/uiview/viewdraw.cxx b/sw/source/core/uibase/uiview/viewdraw.cxx
index 0e9849c797c4..bcd7704afcdb 100644
--- a/sw/source/core/uibase/uiview/viewdraw.cxx
+++ b/sw/source/core/uibase/uiview/viewdraw.cxx
@@ -387,7 +387,7 @@ void SwView::ExecDraw(SfxRequest& rReq)
}
if(bEndTextEdit && pSdrView && pSdrView->IsTextEdit())
- pSdrView->SdrEndTextEdit( sal_True );
+ pSdrView->SdrEndTextEdit( true );
AttrChangedNotify(m_pWrtShell);
}
@@ -558,7 +558,7 @@ sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin,
// set in each case, thus it will be correct for all objects
((SdrTextObj*)pToBeActivated)->SetTextEditOffset(aNewTextEditOffset);
- sal_Bool bRet(pSdrView->SdrBeginTextEdit( pToBeActivated, pPV, pWin, sal_True, pOutliner, 0, sal_False, sal_False, sal_False ));
+ bool bRet(pSdrView->SdrBeginTextEdit( pToBeActivated, pPV, pWin, true, pOutliner, 0, false, false, false ));
// #i7672#
// Since SdrBeginTextEdit actually creates the OutlinerView and thus also
@@ -594,7 +594,7 @@ bool SwView::IsTextTool() const
OSL_ENSURE( pSdrView, "IsTextTool without DrawView?" );
if (pSdrView->IsCreateMode())
- pSdrView->SetCreateMode(sal_False);
+ pSdrView->SetCreateMode(false);
pSdrView->TakeCurrentObj(nId,nInvent);
return (nInvent==SdrInventor);
diff --git a/sw/source/core/uibase/utlui/content.cxx b/sw/source/core/uibase/utlui/content.cxx
index 60ac680ffd66..9ffcf86c15f9 100644
--- a/sw/source/core/uibase/utlui/content.cxx
+++ b/sw/source/core/uibase/utlui/content.cxx
@@ -2732,7 +2732,7 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent)
SdrPageView* pPV = pDrawView->GetSdrPageView/*GetPageViewPvNum*/(/*0*/);
if (pPV)
{
- pDrawView->MarkObj(pTemp, pPV, sal_True);
+ pDrawView->MarkObj(pTemp, pPV, true);
}
}
}
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 5948312d7a34..0de8f0e8a51c 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -79,9 +79,9 @@ void SwViewImp::Init( const SwViewOption *pNewOpt )
pDrawView->SetWorkArea( pRoot->Frm().SVRect() );
if ( GetShell()->IsPreview() )
- pDrawView->SetAnimationEnabled( sal_False );
+ pDrawView->SetAnimationEnabled( false );
- pDrawView->SetUseIncompatiblePathCreateInterface( sal_False );
+ pDrawView->SetUseIncompatiblePathCreateInterface( false );
// set handle size to 9 pixels, always
pDrawView->SetMarkHdlSizePixel(9);
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 2e7e3152c8be..9bf78f7bac3f 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -2121,13 +2121,13 @@ void SwViewShell::ImplApplyViewOptions( const SwViewOption &rOpt )
MakeDrawView();
SwDrawView *pDView = Imp()->GetDrawView();
- if ( pDView->IsDragStripes() != rOpt.IsCrossHair() )
+ if ( (pDView->IsDragStripes() ? 1 : 0) != rOpt.IsCrossHair() )
pDView->SetDragStripes( rOpt.IsCrossHair() );
- if ( pDView->IsGridSnap() != rOpt.IsSnap() )
+ if ( (pDView->IsGridSnap() ? 1 : 0) != rOpt.IsSnap() )
pDView->SetGridSnap( rOpt.IsSnap() );
- if ( pDView->IsGridVisible() != rOpt.IsGridVisible() )
+ if ( (pDView->IsGridVisible() ? 1 : 0) != rOpt.IsGridVisible() )
pDView->SetGridVisible( rOpt.IsGridVisible() );
const Size &rSz = rOpt.GetSnapSize();