summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-28 19:57:37 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-28 20:26:17 +0100
commit0d957046f103605ba51b2a59a8f4c463ca33010a (patch)
tree66acd5576bd19167c14837d8b036673485f252bc /svx/source
parentbd9581d46d78c5742fbb50f1b4a9ff2fc1dae7e8 (diff)
bool improvements
Change-Id: Ic32faa81bfbb66a9d8632fb3db187e33c31188ed
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx2
-rw-r--r--svx/source/accessibility/svxrectctaccessiblecontext.cxx4
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.cxx2
-rw-r--r--svx/source/customshapes/EnhancedCustomShape3d.cxx4
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeEngine.cxx6
-rw-r--r--svx/source/dialog/_bmpmask.cxx4
-rw-r--r--svx/source/dialog/_contdlg.cxx4
-rw-r--r--svx/source/dialog/connctrl.cxx16
-rw-r--r--svx/source/dialog/ctredlin.cxx2
-rw-r--r--svx/source/dialog/dlgctl3d.cxx4
-rw-r--r--svx/source/dialog/docrecovery.cxx22
-rw-r--r--svx/source/dialog/fntctrl.cxx2
-rw-r--r--svx/source/dialog/graphctl.cxx2
-rw-r--r--svx/source/dialog/hdft.cxx2
-rw-r--r--svx/source/dialog/imapdlg.cxx4
-rw-r--r--svx/source/dialog/imapwnd.cxx4
-rw-r--r--svx/source/dialog/rulritem.cxx18
-rw-r--r--svx/source/dialog/srchdlg.cxx40
-rw-r--r--svx/source/engine3d/camera3d.cxx2
-rw-r--r--svx/source/engine3d/dragmt3d.cxx6
-rw-r--r--svx/source/engine3d/float3d.cxx70
-rw-r--r--svx/source/engine3d/obj3d.cxx32
-rw-r--r--svx/source/engine3d/scene3d.cxx4
-rw-r--r--svx/source/engine3d/view3d.cxx20
-rw-r--r--svx/source/fmcomp/fmgridif.cxx2
-rw-r--r--svx/source/fmcomp/gridcell.cxx2
-rw-r--r--svx/source/form/filtnav.cxx4
-rw-r--r--svx/source/form/fmPropBrw.cxx2
-rw-r--r--svx/source/form/fmshell.cxx22
-rw-r--r--svx/source/form/fmshimp.cxx2
-rw-r--r--svx/source/form/fmvwimp.cxx8
-rw-r--r--svx/source/form/navigatortree.cxx2
-rw-r--r--svx/source/gallery2/GalleryControl.cxx6
-rw-r--r--svx/source/gallery2/galbrws.cxx6
-rw-r--r--svx/source/gallery2/galbrws1.cxx4
-rw-r--r--svx/source/gallery2/galctrl.cxx4
-rw-r--r--svx/source/gallery2/galtheme.cxx6
-rw-r--r--svx/source/items/algitem.cxx4
-rw-r--r--svx/source/items/clipfmtitem.cxx2
-rw-r--r--svx/source/items/hlnkitem.cxx12
-rw-r--r--svx/source/items/pageitem.cxx4
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofgraphic.cxx2
-rw-r--r--svx/source/sdr/properties/attributeproperties.cxx2
-rw-r--r--svx/source/sdr/properties/emptyproperties.cxx26
-rw-r--r--svx/source/sdr/properties/groupproperties.cxx20
-rw-r--r--svx/source/sdr/properties/measureproperties.cxx2
-rw-r--r--svx/source/sdr/properties/textproperties.cxx4
-rw-r--r--svx/source/sidebar/nbdtmg.cxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx30
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx2
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.cxx28
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.cxx4
-rw-r--r--svx/source/svdraw/clonelist.cxx12
-rw-r--r--svx/source/svdraw/sdrpagewindow.cxx4
-rw-r--r--svx/source/svdraw/svdattr.cxx12
-rw-r--r--svx/source/svdraw/svdcrtv.cxx12
-rw-r--r--svx/source/svdraw/svddrag.cxx24
-rw-r--r--svx/source/svdraw/svddrgv.cxx64
-rw-r--r--svx/source/svdraw/svdedtv.cxx194
-rw-r--r--svx/source/svdraw/svdedtv1.cxx14
-rw-r--r--svx/source/svdraw/svdedtv2.cxx8
-rw-r--r--svx/source/svdraw/svdedxv.cxx28
-rw-r--r--svx/source/svdraw/svdglue.cxx2
-rw-r--r--svx/source/svdraw/svdhdl.cxx2
-rw-r--r--svx/source/svdraw/svdhlpln.cxx2
-rw-r--r--svx/source/svdraw/svdibrow.cxx96
-rw-r--r--svx/source/svdraw/svdlayer.cxx4
-rw-r--r--svx/source/svdraw/svdmark.cxx4
-rw-r--r--svx/source/svdraw/svdmodel.cxx80
-rw-r--r--svx/source/svdraw/svdmrkv.cxx38
-rw-r--r--svx/source/svdraw/svdmrkv1.cxx6
-rw-r--r--svx/source/svdraw/svdoashp.cxx42
-rw-r--r--svx/source/svdraw/svdocapt.cxx44
-rw-r--r--svx/source/svdraw/svdocirc.cxx10
-rw-r--r--svx/source/svdraw/svdoedge.cxx100
-rw-r--r--svx/source/svdraw/svdogrp.cxx92
-rw-r--r--svx/source/svdraw/svdomeas.cxx62
-rw-r--r--svx/source/svdraw/svdoole2.cxx10
-rw-r--r--svx/source/svdraw/svdopage.cxx28
-rw-r--r--svx/source/svdraw/svdopath.cxx92
-rw-r--r--svx/source/svdraw/svdorect.cxx22
-rw-r--r--svx/source/svdraw/svdotext.cxx32
-rw-r--r--svx/source/svdraw/svdotxat.cxx8
-rw-r--r--svx/source/svdraw/svdotxdr.cxx2
-rw-r--r--svx/source/svdraw/svdotxed.cxx2
-rw-r--r--svx/source/svdraw/svdotxtr.cxx12
-rw-r--r--svx/source/svdraw/svdouno.cxx34
-rw-r--r--svx/source/svdraw/svdoutl.cxx2
-rw-r--r--svx/source/svdraw/svdovirt.cxx2
-rw-r--r--svx/source/svdraw/svdpage.cxx62
-rw-r--r--svx/source/svdraw/svdpagv.cxx2
-rw-r--r--svx/source/svdraw/svdpntv.cxx54
-rw-r--r--svx/source/svdraw/svdpoev.cxx6
-rw-r--r--svx/source/svdraw/svdsnpv.cxx48
-rw-r--r--svx/source/svdraw/svdtext.cxx4
-rw-r--r--svx/source/svdraw/svdtrans.cxx2
-rw-r--r--svx/source/svdraw/svdundo.cxx92
-rw-r--r--svx/source/svdraw/svdview.cxx56
-rw-r--r--svx/source/svdraw/svdxcgv.cxx12
-rw-r--r--svx/source/table/svdotable.cxx40
-rw-r--r--svx/source/table/tablecontroller.cxx12
-rw-r--r--svx/source/table/tablertfexporter.cxx2
-rw-r--r--svx/source/table/tablertfimporter.cxx4
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx2
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx4
-rw-r--r--svx/source/tbxctrls/fillctrl.cxx6
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx2
-rw-r--r--svx/source/tbxctrls/layctrl.cxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx4
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx16
-rw-r--r--svx/source/unodraw/unomtabl.cxx2
-rw-r--r--svx/source/unodraw/unopage.cxx2
-rw-r--r--svx/source/unodraw/unopool.cxx2
-rw-r--r--svx/source/unodraw/unoshap2.cxx12
-rw-r--r--svx/source/unodraw/unoshap3.cxx4
-rw-r--r--svx/source/unodraw/unoshape.cxx12
-rw-r--r--svx/source/unodraw/unoshtxt.cxx4
-rw-r--r--svx/source/xml/xmleohlp.cxx2
-rw-r--r--svx/source/xml/xmlgrhlp.cxx2
-rw-r--r--svx/source/xml/xmlxtexp.cxx2
-rw-r--r--svx/source/xoutdev/xattr2.cxx4
-rw-r--r--svx/source/xoutdev/xtabbtmp.cxx2
122 files changed, 1087 insertions, 1087 deletions
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index d38dda614996..523b084b2fda 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -1469,7 +1469,7 @@ struct XShapePosCompareHelper
if(pObj1 && pObj2)
return pObj1->GetOrdNum() < pObj2->GetOrdNum();
else
- return 0;
+ return false;
}
};
//end of group position
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 15a2ed02cc11..63c464669e93 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -588,7 +588,7 @@ sal_Bool SAL_CALL SvxRectCtlAccessibleContext::isAccessibleChildSelected( sal_In
void SAL_CALL SvxRectCtlAccessibleContext::clearAccessibleSelection() throw( RuntimeException )
{
- DBG_ASSERT( sal_False, "SvxRectCtlAccessibleContext::clearAccessibleSelection() is not possible!" );
+ DBG_ASSERT( false, "SvxRectCtlAccessibleContext::clearAccessibleSelection() is not possible!" );
}
void SAL_CALL SvxRectCtlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException )
@@ -619,7 +619,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::deselectAccessibleChild( sal_Int32 /*
{
OUString aMessage( "deselectAccessibleChild is not possible in this context" );
- DBG_ASSERT( sal_False, "SvxRectCtlAccessibleContext::deselectAccessibleChild() is not possible!" );
+ DBG_ASSERT( false, "SvxRectCtlAccessibleContext::deselectAccessibleChild() is not possible!" );
throw lang::IndexOutOfBoundsException( aMessage, *this ); // never possible
}
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index b3a780b14109..66c0e5b25053 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -2376,7 +2376,7 @@ void EnhancedCustomShape2d::ApplyGluePoints( SdrObject* pObj )
SdrGluePoint aGluePoint;
aGluePoint.SetPos( GetPoint( seqGluePoints[ i ], true, true ) );
- aGluePoint.SetPercent( sal_False );
+ aGluePoint.SetPercent( false );
aGluePoint.SetAlign( SDRVERTALIGN_TOP | SDRHORZALIGN_LEFT );
aGluePoint.SetEscDir( SDRESC_SMART );
SdrGluePointList* pList = pObj->ForceGluePointList();
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 2aa86e14c6c1..de0e70627e46 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -469,7 +469,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
}
else
{
- SdrObject* pNewObj = pNext->ConvertToPolyObj( sal_False, sal_False );
+ SdrObject* pNewObj = pNext->ConvertToPolyObj( false, false );
SdrPathObj* pPath = PTR_CAST( SdrPathObj, pNewObj );
if ( pPath )
aPolyPoly = pPath->GetPathPoly();
@@ -590,7 +590,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
double fW = rVolume.getWidth();
double fH = rVolume.getHeight();
- rCamera.SetAutoAdjustProjection( sal_False );
+ rCamera.SetAutoAdjustProjection( false );
rCamera.SetViewWindow( -fW / 2, - fH / 2, fW, fH);
basegfx::B3DPoint aLookAt( 0.0, 0.0, 0.0 );
basegfx::B3DPoint aCamPos( 0.0, 0.0, 100.0 );
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index e1ceb9591b20..edfdab26ed8b 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -326,7 +326,7 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render()
nShearWink = -nShearWink;
nTan = -nTan;
}
- pRenderedShape->Shear( pSdrObjCustomShape->GetSnapRect().Center(), nShearWink, nTan, sal_False);
+ pRenderedShape->Shear( pSdrObjCustomShape->GetSnapRect().Center(), nShearWink, nTan, false);
}
if( !bPostRotateAngle && nRotateAngle )
{
@@ -415,7 +415,7 @@ drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeom
nShearWink = -nShearWink;
nTan = -nTan;
}
- pObj->Shear( aRect.Center(), nShearWink, nTan, sal_False);
+ pObj->Shear( aRect.Center(), nShearWink, nTan, false);
}
sal_Int32 nRotateAngle = aCustomShape2d.GetRotateAngle();
if( nRotateAngle )
@@ -451,7 +451,7 @@ drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEngine::getLineGeom
}
else
{
- pNewObj = pNext->ConvertToPolyObj( sal_False, sal_False );
+ pNewObj = pNext->ConvertToPolyObj( false, false );
SdrPathObj* pPath = PTR_CAST( SdrPathObj, pNewObj );
if ( pPath )
aPP = pPath->GetPathPoly();
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 8ee996d51ed6..17ecfc2b82d8 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -325,7 +325,7 @@ IMPL_LINK( MaskData, FocusLbHdl, ColorLB*, pLb )
IMPL_LINK_NOARG(MaskData, ExecHdl)
{
- SfxBoolItem aBItem( SID_BMPMASK_EXEC, sal_True );
+ SfxBoolItem aBItem( SID_BMPMASK_EXEC, true );
rBindings.GetDispatcher()->Execute( SID_BMPMASK_EXEC, OWN_CALLMODE, &aBItem, 0L );
return 0L;
@@ -568,7 +568,7 @@ void SvxBmpMask::onSelect( MaskSet* pSet )
sal_Bool SvxBmpMask::Close()
{
- SfxBoolItem aItem2( SID_BMPMASK_PIPETTE, sal_False );
+ SfxBoolItem aItem2( SID_BMPMASK_PIPETTE, false );
GetBindings().GetDispatcher()->Execute( SID_BMPMASK_PIPETTE, OWN_CALLMODE, &aItem2, 0L );
return SfxDockingWindow::Close();
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index a3051b403b89..39e21e279c8b 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -309,7 +309,7 @@ sal_Bool SvxSuperContourDlg::Close()
if ( nRet == RET_YES )
{
- SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, sal_True );
+ SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, true );
GetBindings().GetDispatcher()->Execute(
SID_CONTOUR_EXEC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
}
@@ -429,7 +429,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
{
case( TBI_APPLY ):
{
- SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, sal_True );
+ SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, true );
GetBindings().GetDispatcher()->Execute(
SID_CONTOUR_EXEC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
}
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 2d83858177cd..f524d6682e18 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -158,14 +158,14 @@ void SvxXConnectionPreview::Construct()
SdrEdgeObj* pTmpEdgeObj = (SdrEdgeObj*) pObj;
pEdgeObj = (SdrEdgeObj*) pTmpEdgeObj->Clone();
- SdrObjConnection& rConn1 = (SdrObjConnection&)pEdgeObj->GetConnection( sal_True );
- SdrObjConnection& rConn2 = (SdrObjConnection&)pEdgeObj->GetConnection( sal_False );
+ SdrObjConnection& rConn1 = (SdrObjConnection&)pEdgeObj->GetConnection( true );
+ SdrObjConnection& rConn2 = (SdrObjConnection&)pEdgeObj->GetConnection( false );
- rConn1 = pTmpEdgeObj->GetConnection( sal_True );
- rConn2 = pTmpEdgeObj->GetConnection( sal_False );
+ rConn1 = pTmpEdgeObj->GetConnection( true );
+ rConn2 = pTmpEdgeObj->GetConnection( false );
- SdrObject* pTmpObj1 = pTmpEdgeObj->GetConnectedNode( sal_True );
- SdrObject* pTmpObj2 = pTmpEdgeObj->GetConnectedNode( sal_False );
+ SdrObject* pTmpObj1 = pTmpEdgeObj->GetConnectedNode( true );
+ SdrObject* pTmpObj2 = pTmpEdgeObj->GetConnectedNode( false );
// potential memory leak here (!). Create SdrObjList only when there is
// not yet one.
@@ -178,13 +178,13 @@ void SvxXConnectionPreview::Construct()
{
SdrObject* pObj1 = pTmpObj1->Clone();
pObjList->InsertObject( pObj1 );
- pEdgeObj->ConnectToNode( sal_True, pObj1 );
+ pEdgeObj->ConnectToNode( true, pObj1 );
}
if( pTmpObj2 )
{
SdrObject* pObj2 = pTmpObj2->Clone();
pObjList->InsertObject( pObj2 );
- pEdgeObj->ConnectToNode( sal_False, pObj2 );
+ pEdgeObj->ConnectToNode( false, pObj2 );
}
pObjList->InsertObject( pEdgeObj );
}
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 5c3531380eda..0ce12531dd7e 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -1009,7 +1009,7 @@ void SvxTPFilter::DeactivatePage()
pRedlinTable->SetFilterComment(IsComment());
utl::SearchParam aSearchParam( m_pEdComment->GetText(),
- utl::SearchParam::SRCH_REGEXP,sal_False,sal_False,sal_False );
+ utl::SearchParam::SRCH_REGEXP,false,false,false );
pRedlinTable->SetCommentParams(&aSearchParam);
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index bf0c3886738b..8104faf58a29 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -111,7 +111,7 @@ void Svx3DPreviewControl::Construct()
double fH = rVolume.getHeight();
double fCamZ = rVolume.getMaxZ() + ((fW + fH) / 2.0);
- rCamera.SetAutoAdjustProjection(sal_False);
+ rCamera.SetAutoAdjustProjection(false);
rCamera.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
basegfx::B3DPoint aLookAt;
double fDefaultCamPosZ = mp3DView->GetDefaultCamPosZ();
@@ -354,7 +354,7 @@ void Svx3DLightControl::Construct2()
double fH = rVolume.getHeight();
double fCamZ = rVolume.getMaxZ() + ((fW + fH) / 2.0);
- rCamera.SetAutoAdjustProjection(sal_False);
+ rCamera.SetAutoAdjustProjection(false);
rCamera.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
basegfx::B3DPoint aLookAt;
double fDefaultCamPosZ = mp3DView->GetDefaultCamPosZ();
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index a6f059e5c948..5a19440f0640 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -989,7 +989,7 @@ RecoveryDialog::RecoveryDialog(Window* pParent,
m_aFileListLB.SetBackground( rStyleSettings.GetDialogColor() );
- m_aNextBtn.Enable(sal_True);
+ m_aNextBtn.Enable(true);
m_aNextBtn.SetClickHdl( LINK( this, RecoveryDialog, NextButtonHdl ) );
m_aCancelBtn.SetClickHdl( LINK( this, RecoveryDialog, CancelButtonHdl ) );
@@ -1032,8 +1032,8 @@ short RecoveryDialog::execute()
// Dialog was started first time ...
// wait for user decision ("start" or "cancel" recovery)
// This decision will be made inside the NextBtn handler.
- m_aNextBtn.Enable(sal_True);
- m_aCancelBtn.Enable(sal_True);
+ m_aNextBtn.Enable(true);
+ m_aCancelBtn.Enable(true);
m_bWaitForUser = true;
while(m_bWaitForUser)
Application::Yield();
@@ -1051,8 +1051,8 @@ short RecoveryDialog::execute()
// do it asynchronous (to allow repaints)
// and wait for this asynchronous operation.
m_aDescrFT.SetText( m_aTitleRecoveryInProgress );
- m_aNextBtn.Enable(sal_False);
- m_aCancelBtn.Enable(sal_False);
+ m_aNextBtn.Enable(false);
+ m_aCancelBtn.Enable(false);
m_pCore->setProgressHandler(m_xProgress);
m_pCore->setUpdateListener(this);
m_pCore->doRecovery();
@@ -1074,15 +1074,15 @@ short RecoveryDialog::execute()
{
m_aDescrFT.SetText(m_aRecoveryOnlyFinishDescr);
m_aNextBtn.SetText(m_aRecoveryOnlyFinish);
- m_aNextBtn.Enable(sal_True);
- m_aCancelBtn.Enable(sal_False);
+ m_aNextBtn.Enable(true);
+ m_aCancelBtn.Enable(false);
}
else
{
m_aDescrFT.SetText(m_aTitleRecoveryReport);
m_aNextBtn.SetText(m_aNextStr);
- m_aNextBtn.Enable(sal_True);
- m_aCancelBtn.Enable(sal_True);
+ m_aNextBtn.Enable(true);
+ m_aCancelBtn.Enable(true);
}
m_bWaitForUser = true;
@@ -1524,10 +1524,10 @@ void BrokenRecoveryDialog::impl_askForSavePath()
maPrevBtn.Enable( _bAllowBack );
maNextBtn.SetClickHdl( LINK( this, ErrorRepWelcomeDialog, NextBtnHdl ) );
- maNextBtn.Enable( sal_True );
+ maNextBtn.Enable( true );
maCancelBtn.SetClickHdl( LINK( this, ErrorRepWelcomeDialog, CancelBtnHdl ) );
- maCancelBtn.Enable( sal_True );
+ maCancelBtn.Enable( true );
}
ErrorRepWelcomeDialog::~ErrorRepWelcomeDialog()
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index cf0a96974fc3..1c2ae0f5b53d 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -584,7 +584,7 @@ void SvxFontPrevWindow::SetPreviewText( const OUString& rString )
void SvxFontPrevWindow::SetFontNameAsPreviewText()
{
- pImpl->bUseFontNameAsText = sal_True;
+ pImpl->bUseFontNameAsText = true;
}
// -----------------------------------------------------------------------
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 381418925a42..2a5aa5f3f0f0 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -525,7 +525,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
// switch snapping off
if(!bWasNoSnap)
- ((SdrDragStat&)rDragStat).SetNoSnap(sal_True);
+ ((SdrDragStat&)rDragStat).SetNoSnap(true);
if(bWasSnapEnabled)
pView->SetSnapEnabled(sal_False);
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 6e65cae8a8be..f911071f6728 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -498,7 +498,7 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox )
{
m_pDistFT->Disable();
m_pDistEdit->Disable();
- m_pDynSpacingCB->Enable(sal_False);
+ m_pDynSpacingCB->Enable(false);
m_pHeightFT->Disable();
m_pHeightEdit->Disable();
m_pHeightDynBtn->Disable();
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 8d7425554ae4..11d0cbae45ba 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -228,7 +228,7 @@ sal_Bool SvxIMapDlg::Close()
if( nRet == RET_YES )
{
- SfxBoolItem aBoolItem( SID_IMAP_EXEC, sal_True );
+ SfxBoolItem aBoolItem( SID_IMAP_EXEC, true );
GetBindings().GetDispatcher()->Execute(
SID_IMAP_EXEC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
}
@@ -330,7 +330,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
case( TBI_APPLY ):
{
URLLoseFocusHdl( NULL );
- SfxBoolItem aBoolItem( SID_IMAP_EXEC, sal_True );
+ SfxBoolItem aBoolItem( SID_IMAP_EXEC, true );
GetBindings().GetDispatcher()->Execute(
SID_IMAP_EXEC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
}
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index a5881ed2b2e0..61fc25842c1d 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -298,7 +298,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
case( OBJ_CIRC ):
{
SdrCircObj* pCircObj = (SdrCircObj*) &rObj;
- SdrPathObj* pPathObj = (SdrPathObj*) pCircObj->ConvertToPolyObj( sal_False, sal_False );
+ SdrPathObj* pPathObj = (SdrPathObj*) pCircObj->ConvertToPolyObj( false, false );
Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L));
delete pPathObj;
@@ -364,7 +364,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
case( OBJ_CIRC ):
{
const SdrCircObj& rCircObj = (const SdrCircObj&) rObj;
- SdrPathObj* pPathObj = (SdrPathObj*) rCircObj.ConvertToPolyObj( sal_False, sal_False );
+ SdrPathObj* pPathObj = (SdrPathObj*) rCircObj.ConvertToPolyObj( false, false );
Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L));
IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, "", bActive, sal_False );
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 8e0f4d1b50df..7817e8b454a0 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -60,7 +60,7 @@ bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8
aLeftRightMargin.Left = bConvert ? TWIP_TO_MM100( mlLeft ) : mlLeft;
aLeftRightMargin.Right = bConvert ? TWIP_TO_MM100( mlRight ) : mlRight;
rVal <<= aLeftRightMargin;
- return sal_True;
+ return true;
}
case MID_LEFT:
@@ -369,10 +369,10 @@ bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u
aPos.Y() = aPagePosSize.Y;
lWidth = aPagePosSize.Width;
lHeight = aPagePosSize.Height;
- return sal_True;
+ return true;
}
else
- return sal_False;
+ return false;
}
else if ( rVal >>= nVal )
{
@@ -383,7 +383,7 @@ bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u
case MID_WIDTH: lWidth = nVal; break;
case MID_HEIGHT: lHeight = nVal; break;
- default: OSL_FAIL("Wrong MemberId!"); return sal_False;
+ default: OSL_FAIL("Wrong MemberId!"); return false;
}
return true;
@@ -443,15 +443,15 @@ bool SvxColumnItem::operator==(const SfxPoolItem& rCmp) const
nRight != ((const SvxColumnItem&)rCmp).nRight ||
bTable != ((const SvxColumnItem&)rCmp).bTable ||
Count() != ((const SvxColumnItem&)rCmp).Count())
- return sal_False;
+ return false;
const sal_uInt16 nCount = ((const SvxColumnItem&)rCmp).Count();
for(sal_uInt16 i = 0; i < nCount;++i)
{
if( (*this)[i] != ((const SvxColumnItem&)rCmp)[i] )
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
SvxColumnItem::SvxColumnItem( sal_uInt16 nAct ) :
@@ -561,7 +561,7 @@ bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe
break;
default:
OSL_FAIL("Wrong MemberId!");
- return sal_False;
+ return false;
}
return true;
@@ -597,7 +597,7 @@ bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nM
break;
default:
OSL_FAIL("Wrong MemberId!");
- return sal_False;
+ return false;
}
return true;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index b1c73cf86722..51202d288975 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -835,7 +835,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
m_pFormatBtn->Hide();
m_pNoFormatBtn->Hide();
m_pAttributeBtn->Hide();
- bDraw = sal_True;
+ bDraw = true;
}
else
{
@@ -858,7 +858,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
}
}
- if ( 0 && !bDraw ) //!!!!!
+ if ( false && !bDraw ) //!!!!!
{
m_pRegExpBtn->Show();
m_pLayoutBtn->Show();
@@ -867,7 +867,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
// similarity search?
if ( ( nModifyFlag & MODIFY_SIMILARITY ) == 0 )
m_pSimilarityBox->Check( pSearchItem->IsLevenshtein() );
- bSet = sal_True;
+ bSet = true;
FlagHdl_Impl(m_pSimilarityBox);
FlagHdl_Impl(m_pJapOptionsCB);
@@ -987,7 +987,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
m_pSearchAllBtn->Disable();
m_pReplaceBtn->Disable();
m_pReplaceAllBtn->Disable();
- m_pComponentFrame->Enable(sal_False);
+ m_pComponentFrame->Enable(false);
}
else
{
@@ -1098,7 +1098,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
if ( pCtrl && !bSet )
SetModifyFlag_Impl( pCtrl );
else
- bSet = sal_False;
+ bSet = false;
if (pCtrl == m_pSimilarityBox)
{
@@ -1187,14 +1187,14 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
}
// Search-string in place? then enable Buttons
- bSet = sal_True;
+ bSet = true;
ModifyHdl_Impl(m_pSearchLB);
}
}
if (m_pAllSheetsCB == pCtrl)
{
- bSet = sal_True;
+ bSet = true;
ModifyHdl_Impl(m_pSearchLB);
}
@@ -1243,12 +1243,12 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
}
}
- pSearchItem->SetRegExp( sal_False );
- pSearchItem->SetLevenshtein( sal_False );
+ pSearchItem->SetRegExp( false );
+ pSearchItem->SetLevenshtein( false );
if (GetCheckBoxValue(m_pRegExpBtn))
- pSearchItem->SetRegExp( sal_True );
+ pSearchItem->SetRegExp( true );
else if (GetCheckBoxValue(m_pSimilarityBox))
- pSearchItem->SetLevenshtein( sal_True );
+ pSearchItem->SetLevenshtein( true );
pSearchItem->SetWordOnly(GetCheckBoxValue(m_pWordBtn));
pSearchItem->SetBackward(GetCheckBoxValue(m_pBackwardsBtn));
@@ -1383,7 +1383,7 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd )
if ( !bSet )
SetModifyFlag_Impl( pEd );
else
- bSet = sal_False;
+ bSet = false;
// Calc allows searching for empty cells.
bool bAllowEmptySearch = (pSearchItem->GetAppFlag() == SVX_SEARCHAPP_CALC);
@@ -1413,7 +1413,7 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd )
}
else
{
- m_pComponentFrame->Enable(sal_False);
+ m_pComponentFrame->Enable(false);
m_pSearchBtn->Disable();
m_pSearchAllBtn->Disable();
m_pReplaceBtn->Disable();
@@ -1520,7 +1520,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl)
FocusHdl_Impl( bSearch ? m_pSearchLB : m_pReplaceLB );
}
- bSet = sal_True;
+ bSet = true;
pImpl->bSaveToModule = sal_False;
FlagHdl_Impl(m_pLayoutBtn);
pImpl->bSaveToModule = sal_True;
@@ -1851,7 +1851,7 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
m_pNoFormatBtn->Disable();
m_pAttributeBtn->Disable();
}
- bSet = sal_True;
+ bSet = true;
( (ComboBox*)pCtrl )->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
@@ -2228,12 +2228,12 @@ void SvxSearchDialog::SaveToModule_Impl()
Remember_Impl( m_pSearchLB->GetText(), sal_True );
}
- pSearchItem->SetRegExp( sal_False );
- pSearchItem->SetLevenshtein( sal_False );
+ pSearchItem->SetRegExp( false );
+ pSearchItem->SetLevenshtein( false );
if (GetCheckBoxValue(m_pRegExpBtn))
- pSearchItem->SetRegExp( sal_True );
+ pSearchItem->SetRegExp( true );
else if (GetCheckBoxValue(m_pSimilarityBox))
- pSearchItem->SetLevenshtein( sal_True );
+ pSearchItem->SetLevenshtein( true );
pSearchItem->SetWordOnly(GetCheckBoxValue(m_pWordBtn));
pSearchItem->SetBackward(GetCheckBoxValue(m_pBackwardsBtn));
@@ -2303,7 +2303,7 @@ SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, sal_uInt16 nId
pBindings->Update( SID_SEARCH_SEARCHSET );
pBindings->Update( SID_SEARCH_REPLACESET );
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
- dialog->bConstruct = sal_False;
+ dialog->bConstruct = false;
}
SvxSearchDialogWrapper::~SvxSearchDialogWrapper ()
diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx
index 533b456de315..c8f2f22bf250 100644
--- a/svx/source/engine3d/camera3d.cxx
+++ b/svx/source/engine3d/camera3d.cxx
@@ -27,7 +27,7 @@ Camera3D::Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLook
fResetFocalLength(fFocalLen),
fResetBankAngle(fBankAng),
fBankAngle(fBankAng),
- bAutoAdjustProjection(sal_True)
+ bAutoAdjustProjection(true)
{
SetVPD(0);
SetPosition(rPos);
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index e12fcebed0b4..4abfbcd710cc 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -45,7 +45,7 @@ E3dDragMethod::E3dDragMethod (
: SdrDragMethod(_rView),
meConstraint(eConstr),
mbMoveFull(bFull),
- mbMovedAtAll(sal_False)
+ mbMovedAtAll(false)
{
// Create a unit for all the 3D objects present in the selection
const long nCnt(rMark.GetMarkCount());
@@ -150,7 +150,7 @@ bool E3dDragMethod::BeginSdrDrag()
Show();
}
- return sal_True;
+ return true;
}
bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/)
@@ -187,7 +187,7 @@ bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/)
getSdrDragView().EndUndo();
}
- return sal_True;
+ return true;
}
void E3dDragMethod::CancelSdrDrag()
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index ac60b73cdb8d..d24bff86e9d3 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -342,7 +342,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
if (pDispatcher != NULL)
{
- SfxBoolItem aItem( SID_3D_INIT, sal_True );
+ SfxBoolItem aItem( SID_3D_INIT, true );
pDispatcher->Execute(
SID_3D_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
}
@@ -566,37 +566,37 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
else
{
// Geometry
- aFtHorizontal.Enable( sal_False );
- aNumHorizontal.Enable( sal_False );
+ aFtHorizontal.Enable( false );
+ aNumHorizontal.Enable( false );
aNumHorizontal.SetEmptyFieldValue();
- aFtVertical.Enable( sal_False );
- aNumVertical.Enable( sal_False );
+ aFtVertical.Enable( false );
+ aNumVertical.Enable( false );
aNumVertical.SetEmptyFieldValue();
- aFLSegments.Enable( sal_False );
- aFtEndAngle.Enable( sal_False );
- aMtrEndAngle.Enable( sal_False );
+ aFLSegments.Enable( false );
+ aFtEndAngle.Enable( false );
+ aMtrEndAngle.Enable( false );
aMtrEndAngle.SetEmptyFieldValue();
- aFtDepth.Enable( sal_False );
- aMtrDepth.Enable( sal_False );
+ aFtDepth.Enable( false );
+ aMtrDepth.Enable( false );
aMtrDepth.SetEmptyFieldValue();
// Representation
- aBtnShadow3d.Enable( sal_False );
- aFtSlant.Enable( sal_False );
- aMtrSlant.Enable( sal_False );
- aFLShadow.Enable( sal_False );
+ aBtnShadow3d.Enable( false );
+ aFtSlant.Enable( false );
+ aMtrSlant.Enable( false );
+ aFLShadow.Enable( false );
- aFtDistance.Enable( sal_False );
- aMtrDistance.Enable( sal_False );
+ aFtDistance.Enable( false );
+ aMtrDistance.Enable( false );
aMtrDistance.SetEmptyFieldValue();
- aFtFocalLeng.Enable( sal_False );
- aMtrFocalLength.Enable( sal_False );
+ aFtFocalLeng.Enable( false );
+ aMtrFocalLength.Enable( false );
aMtrFocalLength.SetEmptyFieldValue();
- aFLCamera.Enable( sal_False );
+ aFLCamera.Enable( false );
//Lower Range
- aBtnConvertTo3D.Enable( sal_False );
- aBtnLatheObject.Enable( sal_False );
+ aBtnConvertTo3D.Enable( false );
+ aBtnLatheObject.Enable( false );
}
}
// Bitmap fill ? -> Status
@@ -2322,7 +2322,7 @@ IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl)
SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
if (pDispatcher != NULL)
{
- SfxBoolItem aItem( SID_3D_STATE, sal_True );
+ SfxBoolItem aItem( SID_3D_STATE, true );
pDispatcher->Execute(
SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
}
@@ -2341,7 +2341,7 @@ IMPL_LINK_NOARG(Svx3DWin, ClickAssignHdl)
SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
if (pDispatcher != NULL)
{
- SfxBoolItem aItem( SID_3D_ASSIGN, sal_True );
+ SfxBoolItem aItem( SID_3D_ASSIGN, true );
pDispatcher->Execute(
SID_3D_ASSIGN, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
}
@@ -2760,7 +2760,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
if (pDispatcher != NULL)
{
- SfxBoolItem aItem( nSId, sal_True );
+ SfxBoolItem aItem( nSId, true );
pDispatcher->Execute(
nSId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
}
@@ -2998,44 +2998,44 @@ IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl)
if( aBtnLight1.IsChecked() )
{
aBtnLight1.Check( sal_False );
- aLbLight1.Enable( sal_False );
+ aLbLight1.Enable( false );
}
else if( aBtnLight2.IsChecked() )
{
aBtnLight2.Check( sal_False );
- aLbLight2.Enable( sal_False );
+ aLbLight2.Enable( false );
}
else if( aBtnLight3.IsChecked() )
{
aBtnLight3.Check( sal_False );
- aLbLight3.Enable( sal_False );
+ aLbLight3.Enable( false );
}
else if( aBtnLight4.IsChecked() )
{
aBtnLight4.Check( sal_False );
- aLbLight4.Enable( sal_False );
+ aLbLight4.Enable( false );
}
else if( aBtnLight5.IsChecked() )
{
aBtnLight5.Check( sal_False );
- aLbLight5.Enable( sal_False );
+ aLbLight5.Enable( false );
}
else if( aBtnLight6.IsChecked() )
{
aBtnLight6.Check( sal_False );
- aLbLight6.Enable( sal_False );
+ aLbLight6.Enable( false );
}
else if( aBtnLight7.IsChecked() )
{
aBtnLight7.Check( sal_False );
- aLbLight7.Enable( sal_False );
+ aLbLight7.Enable( false );
}
else if( aBtnLight8.IsChecked() )
{
aBtnLight8.Check( sal_False );
- aLbLight8.Enable( sal_False );
+ aLbLight8.Enable( false );
}
- aBtnLightColor.Enable( sal_False );
+ aBtnLightColor.Enable( false );
}
return( 0L );
@@ -3082,7 +3082,7 @@ void Svx3DWin::UpdatePreview()
SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
if (pDispatcher != NULL)
{
- SfxBoolItem aItem( SID_3D_STATE, sal_True );
+ SfxBoolItem aItem( SID_3D_STATE, true );
pDispatcher->Execute(
SID_3D_STATE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
}
@@ -3277,7 +3277,7 @@ void SvxConvertTo3DItem::StateChanged(sal_uInt16 /*_nId*/, SfxItemState eState,
SfxDispatcher* pDispatcher = LocalGetDispatcher(&GetBindings());
if (pDispatcher != NULL)
{
- SfxBoolItem aItem( SID_3D_STATE, sal_True );
+ SfxBoolItem aItem( SID_3D_STATE, true );
pDispatcher->Execute(
SID_3D_STATE, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD, &aItem, 0L);
}
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index a9c5d65590af..d3e1902a5e55 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -255,19 +255,19 @@ sal_uInt16 E3dObject::GetObjIdentifier() const
void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bResizeFreeAllowed = sal_True;
- rInfo.bResizePropAllowed = sal_True;
- rInfo.bRotateFreeAllowed = sal_True;
- rInfo.bRotate90Allowed = sal_True;
- rInfo.bMirrorFreeAllowed = sal_False;
- rInfo.bMirror45Allowed = sal_False;
- rInfo.bMirror90Allowed = sal_False;
- rInfo.bShearAllowed = sal_False;
- rInfo.bEdgeRadiusAllowed = sal_False;
- rInfo.bCanConvToPath = sal_False;
+ rInfo.bResizeFreeAllowed = true;
+ rInfo.bResizePropAllowed = true;
+ rInfo.bRotateFreeAllowed = true;
+ rInfo.bRotate90Allowed = true;
+ rInfo.bMirrorFreeAllowed = false;
+ rInfo.bMirror45Allowed = false;
+ rInfo.bMirror90Allowed = false;
+ rInfo.bShearAllowed = false;
+ rInfo.bEdgeRadiusAllowed = false;
+ rInfo.bCanConvToPath = false;
// no transparence for 3d objects
- rInfo.bTransparenceAllowed = sal_False;
+ rInfo.bTransparenceAllowed = false;
// gradient depends on fillstyle
// BM *** check if SetItem is NULL ***
@@ -279,10 +279,10 @@ void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
// 2D polygons would be required which need to be sorted by depth,
// ie at intersections be cut relative to each other. Also the texture
// coorinates were an unsolved problem.
- rInfo.bCanConvToPoly = sal_False;
- rInfo.bCanConvToContour = sal_False;
- rInfo.bCanConvToPathLineToArea = sal_False;
- rInfo.bCanConvToPolyLineToArea = sal_False;
+ rInfo.bCanConvToPoly = false;
+ rInfo.bCanConvToContour = false;
+ rInfo.bCanConvToPathLineToArea = false;
+ rInfo.bCanConvToPolyLineToArea = false;
}
void E3dObject::NbcSetLayer(SdrLayerID nLayer)
@@ -759,7 +759,7 @@ void E3dObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
NbcRotateGluePoints(rRef,nWink,sn,cs); // Rotate the glue points (who still
// have coordinates relative to the
// original page)
- SetGlueReallyAbsolute(sal_False); // from now they are again relative to BoundRect (that is defined as aOutRect)
+ SetGlueReallyAbsolute(false); // from now they are again relative to BoundRect (that is defined as aOutRect)
}
/*************************************************************************/
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 868ddcbaf6a5..8c77c791208b 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -639,7 +639,7 @@ void E3dScene::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
NbcRotateGluePoints(rRef,nWink,sn,cs); // Rotate the glue points (who still
// have coordinates relative to the
// original page)
- SetGlueReallyAbsolute(sal_False); // from now they are again relative to BoundRect (that is defined as aOutRect)
+ SetGlueReallyAbsolute(false); // from now they are again relative to BoundRect (that is defined as aOutRect)
SetRectsDirty();
}
@@ -701,7 +701,7 @@ bool E3dScene::MovCreate(SdrDragStat& rStat)
rStat.SetActionRect(aRect1);
NbcSetSnapRect(aRect1);
SetBoundRectDirty();
- bSnapRectDirty=sal_True;
+ bSnapRectDirty=true;
return true;
}
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 3aee208d33ae..efc7dd58d743 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -254,7 +254,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
{
pScene = ((E3dObject*)pObj)->GetScene();
if(pScene)
- pScene->SetSelected(sal_False);
+ pScene->SetSelected(false);
}
}
@@ -271,7 +271,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
// relatated scene
pScene = ((E3dCompoundObject*)pObj)->GetScene();
if(pScene)
- pScene->SetSelected(sal_False);
+ pScene->SetSelected(false);
}
}
@@ -282,7 +282,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
{
// Select object
E3dObject* p3DObj = (E3dObject*)pObj;
- p3DObj->SetSelected(sal_True);
+ p3DObj->SetSelected(true);
pScene = p3DObj->GetScene();
}
}
@@ -306,7 +306,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
// releated scene
pScene = ((E3dCompoundObject*)pObj)->GetScene();
if(pScene)
- pScene->SetSelected(sal_False);
+ pScene->SetSelected(false);
}
}
}
@@ -785,7 +785,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, bool bExtrude
ImpChangeSomeAttributesFor3DConversion(pObj);
// convert completely to path objects
- SdrObject* pNewObj1 = pObj->ConvertToPolyObj(sal_False, sal_False);
+ SdrObject* pNewObj1 = pObj->ConvertToPolyObj(false, false);
if(pNewObj1)
{
@@ -803,7 +803,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, bool bExtrude
ImpChangeSomeAttributesFor3DConversion2(pNewObj1);
// convert completely to path objects
- SdrObject* pNewObj2 = pObj->ConvertToContourObj(pNewObj1, sal_True);
+ SdrObject* pNewObj2 = pObj->ConvertToContourObj(pNewObj1, true);
if(pNewObj2)
{
@@ -1322,7 +1322,7 @@ void E3dView::InitScene(E3dScene* pScene, double fW, double fH, double fCamZ)
{
Camera3D aCam(pScene->GetCamera());
- aCam.SetAutoAdjustProjection(sal_False);
+ aCam.SetAutoAdjustProjection(false);
aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
basegfx::B3DPoint aLookAt;
@@ -1637,13 +1637,13 @@ void E3dView::CheckPossibilities()
// So far: there are two or more of any objects selected. See if
// compound objects are involved. If yes, ban grouping.
if(bGroupPossible && bCoumpound)
- bGroupPossible = sal_False;
+ bGroupPossible = false;
if(bUnGroupPossible && b3DObject)
- bUnGroupPossible = sal_False;
+ bUnGroupPossible = false;
if(bGrpEnterPossible && bCoumpound)
- bGrpEnterPossible = sal_False;
+ bGrpEnterPossible = false;
}
}
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index cd399cecde62..009a83067afe 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -482,7 +482,7 @@ FmXGridPeer* FmXGridControl::imp_CreatePeer(Window* pParent)
}
catch(const Exception&)
{
- OSL_ASSERT(!"Can not get style");
+ OSL_FAIL("Can not get style");
}
}
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index bed8056280b5..015a873fcdaf 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1979,7 +1979,7 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySe
// und dann ein Format generieren, dass die gewuenschten Nachkommastellen usw. hat
LanguageType aAppLanguage = Application::GetSettings().GetUILanguageTag().getLanguageType();
- OUString sFormatString = pFormatterUsed->GenerateFormat(0, aAppLanguage, bThousand, sal_False, nScale);
+ OUString sFormatString = pFormatterUsed->GenerateFormat(0, aAppLanguage, bThousand, false, nScale);
static_cast< DoubleNumericField* >( m_pWindow )->SetFormat( sFormatString, aAppLanguage );
static_cast< DoubleNumericField* >( m_pPainter )->SetFormat( sFormatString, aAppLanguage );
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index fc92b76d1fdf..baf32e1c7f89 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1157,7 +1157,7 @@ FmFilterNavigator::FmFilterNavigator( Window* pParent )
m_pModel = new FmFilterModel();
StartListening( *m_pModel );
- EnableInplaceEditing( sal_True );
+ EnableInplaceEditing( true );
SetSelectionMode(MULTIPLE_SELECTION);
SetDragDropMode(0xFFFF);
@@ -1556,7 +1556,7 @@ void FmFilterNavigator::Remove(FmFilterData* pItem)
if (pEntry == m_pEditingCurrently)
// cancel editing
- EndEditing(sal_True);
+ EndEditing(true);
if (pEntry)
GetModel()->Remove( pEntry );
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 0d879727d3be..d380e7057167 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -578,7 +578,7 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell )
if ( !m_xBrowserController.is() )
{
OUString sServiceName( "com.sun.star.inspection.ObjectInspector" );
- ShowServiceNotAvailableError( GetParent(), sServiceName, sal_True );
+ ShowServiceNotAvailableError( GetParent(), sServiceName, true );
}
else
{
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 17ae864d3837..10695b540e9d 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -218,8 +218,8 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView )
,m_pFormModel( NULL )
,m_pParentShell(_pParent)
,m_nLastSlot( 0 )
- ,m_bDesignMode( sal_True )
- ,m_bHasForms(sal_False)
+ ,m_bDesignMode( true )
+ ,m_bHasForms(false)
{
m_pImpl->acquire();
SetPool( &SFX_APP()->GetPool() );
@@ -312,7 +312,7 @@ void FmFormShell::impl_setDesignMode(sal_Bool bDesign)
}
else
{
- m_bHasForms = sal_False;
+ m_bHasForms = false;
m_bDesignMode = bDesign;
UIFeatureChanged();
}
@@ -498,7 +498,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
case SID_FM_SCROLLBAR:
case SID_FM_SPINBUTTON:
{
- SFX_REQUEST_ARG( rReq, pGrabFocusItem, SfxBoolItem, SID_FM_TOGGLECONTROLFOCUS, sal_False );
+ SFX_REQUEST_ARG( rReq, pGrabFocusItem, SfxBoolItem, SID_FM_TOGGLECONTROLFOCUS, false );
if ( pGrabFocusItem && pGrabFocusItem->GetValue() )
{ // see below
SfxViewShell* pShell = GetViewShell();
@@ -528,7 +528,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
// do this asynchron, so that the creation can be finished first
// reusing the SID_FM_TOGGLECONTROLFOCUS is somewhat hacky ... which it wouldn't if it would have another
// name, so I do not really have a big problem with this ....
- SfxBoolItem aGrabFocusIndicatorItem( SID_FM_TOGGLECONTROLFOCUS, sal_True );
+ SfxBoolItem aGrabFocusIndicatorItem( SID_FM_TOGGLECONTROLFOCUS, true );
GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( nSlot, SFX_CALLMODE_ASYNCHRON,
&aGrabFocusIndicatorItem, NULL );
}
@@ -608,7 +608,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
break;
case SID_FM_SHOW_PROPERTY_BROWSER:
{
- SFX_REQUEST_ARG( rReq, pShowItem, SfxBoolItem, SID_FM_SHOW_PROPERTIES, sal_False );
+ SFX_REQUEST_ARG( rReq, pShowItem, SfxBoolItem, SID_FM_SHOW_PROPERTIES, false );
sal_Bool bShow = sal_True;
if ( pShowItem )
bShow = pShowItem->GetValue();
@@ -620,7 +620,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
case SID_FM_PROPERTIES:
{
// PropertyBrowser anzeigen
- SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSlot, sal_False);
+ SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSlot, false);
sal_Bool bShow = pShowItem ? pShowItem->GetValue() : sal_True;
InterfaceBag aOnlyTheForm;
@@ -634,7 +634,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
case SID_FM_CTL_PROPERTIES:
{
- SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSlot, sal_False);
+ SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSlot, false);
sal_Bool bShow = pShowItem ? pShowItem->GetValue() : sal_True;
OSL_ENSURE( GetImpl()->onlyControlsAreMarked(), "FmFormShell::Execute: ControlProperties should be disabled!" );
@@ -671,7 +671,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
case SID_FM_DESIGN_MODE:
{
- SFX_REQUEST_ARG(rReq, pDesignItem, SfxBoolItem, nSlot, sal_False);
+ SFX_REQUEST_ARG(rReq, pDesignItem, SfxBoolItem, nSlot, false);
bool bDesignMode = pDesignItem ? pDesignItem->GetValue() : !m_bDesignMode;
SetDesignMode( bDesignMode );
if ( m_bDesignMode == bDesignMode )
@@ -823,7 +823,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
rReq.Done();
// initially open the filter navigator, the whole form based filter is pretty useless without it
- SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, sal_True );
+ SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, true );
GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_FILTER_NAVIGATOR, SFX_CALLMODE_ASYNCHRON,
&aIdentifierItem, NULL );
} break;
@@ -1076,7 +1076,7 @@ void FmFormShell::GetState(SfxItemSet &rSet)
rSet.DisableItem( nWhich );
else
{
- rSet.Put( SfxBoolItem( nWhich, sal_False ) );
+ rSet.Put( SfxBoolItem( nWhich, false ) );
// just to have a defined state (available and not checked)
}
}
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 3c6639035c44..d1f59fcb5240 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1362,7 +1362,7 @@ bool FmXFormShell::canConvertCurrentSelectionToControl( sal_Int16 nConversionSlo
if (nConvertSlots[i] == nConversionSlot)
return nObjectTypes[i] != nObjectType;
- return sal_True; // all other slots: assume "yes"
+ return true; // all other slots: assume "yes"
}
//------------------------------------------------------------------------------
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 4d6ee1a54752..3f65b4638e45 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1077,7 +1077,7 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ )
if ( !xWizard.is() )
{
- ShowServiceNotAvailableError( NULL, OUString::createFromAscii(pWizardAsciiName), sal_True );
+ ShowServiceNotAvailableError( NULL, OUString::createFromAscii(pWizardAsciiName), true );
}
else
{
@@ -1881,7 +1881,7 @@ void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (Runtime
{
if ( m_xWindow.is() && m_pView )
{
- m_pView->SetMoveOutside( sal_True, FmFormView::ImplAccess() );
+ m_pView->SetMoveOutside( true, FmFormView::ImplAccess() );
}
}
// -----------------------------------------------------------------------------
@@ -1891,7 +1891,7 @@ void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeEx
// so we can not remove us as focus listener
if ( m_xWindow.is() && m_pView )
{
- m_pView->SetMoveOutside( sal_False, FmFormView::ImplAccess() );
+ m_pView->SetMoveOutside( false, FmFormView::ImplAccess() );
}
}
// -----------------------------------------------------------------------------
@@ -1902,7 +1902,7 @@ void FmXFormView::removeGridWindowListening()
m_xWindow->removeFocusListener(this);
if ( m_pView )
{
- m_pView->SetMoveOutside( sal_False, FmFormView::ImplAccess() );
+ m_pView->SetMoveOutside( false, FmFormView::ImplAccess() );
}
m_xWindow = NULL;
}
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 5d47a219118c..b1b4241095ef 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -150,7 +150,7 @@ namespace svxform
);
SetDragDropMode(0xFFFF);
- EnableInplaceEditing( sal_True );
+ EnableInplaceEditing( true );
SetSelectionMode(MULTIPLE_SELECTION);
m_pNavModel = new NavigatorTreeModel( m_aNavigatorImages );
diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx
index 18b1d3875e72..f184019b387b 100644
--- a/svx/source/gallery2/GalleryControl.cxx
+++ b/svx/source/gallery2/GalleryControl.cxx
@@ -55,13 +55,13 @@ GalleryControl::GalleryControl (
FreeResource();
mpBrowser1->SelectTheme(0);
- mpBrowser1->Show(sal_True);
+ mpBrowser1->Show(true);
- mpBrowser2->Show(sal_True);
+ mpBrowser2->Show(true);
mpSplitter->SetHorizontal(false);
mpSplitter->SetSplitHdl( LINK( this, GalleryControl, SplitHdl ) );
- mpSplitter->Show( sal_True );
+ mpSplitter->Show( true );
InitSettings();
}
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index 3b717d776a7e..0759219269a5 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -84,13 +84,13 @@ GalleryBrowser::GalleryBrowser(
SetMinOutputSizePixel(maLastSize);
mpBrowser1->SelectTheme( 0 );
- mpBrowser1->Show( sal_True );
- mpBrowser2->Show( sal_True );
+ mpBrowser1->Show( true );
+ mpBrowser2->Show( true );
const bool bLayoutHorizontal(maLastSize.Width() > maLastSize.Height());
mpSplitter->SetHorizontal(bLayoutHorizontal);
mpSplitter->SetSplitHdl( LINK( this, GalleryBrowser, SplitHdl ) );
- mpSplitter->Show( sal_True );
+ mpSplitter->Show( true );
InitSettings();
}
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index ed9402b951db..25c33d0058b7 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -148,8 +148,8 @@ GalleryBrowser1::GalleryBrowser1(
ImplInsertThemeEntry( mpGallery->GetThemeInfo( i ) );
ImplAdjustControls();
- maNewTheme.Show( sal_True );
- mpThemes->Show( sal_True );
+ maNewTheme.Show( true );
+ mpThemes->Show( true );
}
GalleryBrowser1::~GalleryBrowser1()
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 6fd35dc5907b..1d543f8b4ea1 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -289,7 +289,7 @@ GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme
{
DBG_CTOR(GalleryIconView,NULL);
- EnableFullItemMode( sal_False );
+ EnableFullItemMode( false );
SetHelpId( HID_GALLERY_WINDOW );
InitSettings();
@@ -517,7 +517,7 @@ sal_Int8 GalleryIconView::ExecuteDrop( const ExecuteDropEvent& rEvt )
void GalleryIconView::StartDrag( sal_Int8, const Point& )
{
- const CommandEvent aEvt( GetPointerPosPixel(), COMMAND_STARTDRAG, sal_True );
+ const CommandEvent aEvt( GetPointerPosPixel(), COMMAND_STARTDRAG, true );
Region aRegion;
// call this to initiate dragging for ValueSet
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 193026226b18..182c207c0a4a 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -92,10 +92,10 @@ GalleryTheme::~GalleryTheme()
void GalleryTheme::ImplCreateSvDrawStorage()
{
- aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE );
+ aSvDrawStorageRef = new SvStorage( false, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE );
// #i50423# ReadOnly may not been set though the file can't be written (because of security reasons)
if ( ( aSvDrawStorageRef->GetError() != ERRCODE_NONE ) && !pThm->IsReadOnly() )
- aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
+ aSvDrawStorageRef = new SvStorage( false, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
}
sal_Bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry )
@@ -665,7 +665,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
sal_uIntPtr nStorErr = 0;
{
- SvStorageRef aTempStorageRef( new SvStorage( sal_False, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) );
+ SvStorageRef aTempStorageRef( new SvStorage( false, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) );
aSvDrawStorageRef->CopyTo( aTempStorageRef );
nStorErr = aSvDrawStorageRef->GetError();
}
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 6dede3649173..85331e6b10c5 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -112,7 +112,7 @@ bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue))
- return sal_False;
+ return false;
eOrient = (table::CellOrientation)nValue;
}
SvxCellOrientation eSvx = SVX_ORIENTATION_STANDARD;
@@ -368,7 +368,7 @@ bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX; // Members sind sal_Int16
sal_Int32 nVal = 0;
if(!(rVal >>= nVal) || (nVal > nMaxVal))
- return sal_False;
+ return false;
switch ( nMemberId & ~CONVERT_TWIPS )
{
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index fe978749b5c2..39a856008fb3 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -96,7 +96,7 @@ bool SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const
{
const SvxClipboardFmtItem& rCmp = (SvxClipboardFmtItem&)rComp;
if(rCmp.pImpl->aFmtNms.size() != pImpl->aFmtNms.size())
- return 0;
+ return false;
int nRet = 1;
for( sal_uInt16 n = 0, nEnd = rCmp.pImpl->aFmtNms.size(); n < nEnd; ++n )
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 5af2eb821526..367b1141e102 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -242,7 +242,7 @@ bool SvxHyperlinkItem::operator==( const SfxPoolItem& rAttr ) const
sIntName == rItem.sIntName &&
nMacroEvents == rItem.nMacroEvents);
if (!bRet)
- return sal_False;
+ return false;
const SvxMacroTableDtor* pOther = ((SvxHyperlinkItem&)rAttr).pMacroTable;
if( !pMacroTable )
@@ -324,27 +324,27 @@ bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8
{
case MID_HLINK_NAME :
if(!(rVal >>= aStr))
- return sal_False;
+ return false;
sIntName = aStr;
break;
case MID_HLINK_TEXT :
if(!(rVal >>= aStr))
- return sal_False;
+ return false;
sName = aStr;
break;
case MID_HLINK_URL:
if(!(rVal >>= aStr))
- return sal_False;
+ return false;
sURL = aStr.getStr();
break;
case MID_HLINK_TARGET:
if(!(rVal >>= aStr))
- return sal_False;
+ return false;
sTarget = aStr;
break;
case MID_HLINK_TYPE:
if(!(rVal >>= nVal))
- return sal_False;
+ return false;
eType = (SvxLinkInsertMode) (sal_uInt16) nVal;
break;
default:
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index cdebc8ae20b4..2ace029f5a37 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -183,7 +183,7 @@ bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
case SVX_PAGE_MIRROR: eRet = style::PageStyleLayout_MIRRORED; break;
default:
OSL_FAIL("was fuer ein Layout ist das?");
- return sal_False;
+ return false;
}
rVal <<= eRet;
}
@@ -216,7 +216,7 @@ bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue))
- return sal_False;
+ return false;
eLayout = (style::PageStyleLayout)nValue;
}
eUse &= 0xfff0;
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index 5b8d34335599..b0c4d7cc4f31 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
@@ -167,7 +167,7 @@ namespace sdr
if(rGrafObj.IsLinkedGraphic())
{
// update graphic link
- rGrafObj.ImpUpdateGraphicLink( sal_False );
+ rGrafObj.ImpUpdateGraphicLink( false );
}
else
{
diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx
index 54386de0e0b8..3f80270cfa08 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -370,7 +370,7 @@ namespace sdr
for (iter = aStyleList.begin(); iter != aStyleList.end(); ++iter)
{
pNewSheet = &pNewPool->Make((*iter)->GetName(), (*iter)->GetFamily(), (*iter)->GetMask());
- pNewSheet->GetItemSet().Put((*iter)->GetItemSet(), sal_False);
+ pNewSheet->GetItemSet().Put((*iter)->GetItemSet(), false);
if(bScaleUnitChanged)
{
diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx
index a766b18c2c4c..957856c820b1 100644
--- a/svx/source/sdr/properties/emptyproperties.cxx
+++ b/svx/source/sdr/properties/emptyproperties.cxx
@@ -34,7 +34,7 @@ namespace sdr
SfxItemSet& EmptyProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
{
// Basic implementation; Basic object has NO attributes
- DBG_ASSERT(sal_False, "EmptyProperties::CreateObjectSpecificItemSet() should never be called");
+ DBG_ASSERT(false, "EmptyProperties::CreateObjectSpecificItemSet() should never be called");
return *(new SfxItemSet(rPool));
}
@@ -75,65 +75,65 @@ namespace sdr
}
DBG_ASSERT(mpEmptyItemSet, "Could not create an SfxItemSet(!)");
- DBG_ASSERT(sal_False, "EmptyProperties::GetObjectItemSet() should never be called (!)");
+ DBG_ASSERT(false, "EmptyProperties::GetObjectItemSet() should never be called (!)");
return *mpEmptyItemSet;
}
void EmptyProperties::SetObjectItem(const SfxPoolItem& /*rItem*/)
{
- DBG_ASSERT(sal_False, "EmptyProperties::SetObjectItem() should never be called (!)");
+ DBG_ASSERT(false, "EmptyProperties::SetObjectItem() should never be called (!)");
}
void EmptyProperties::SetObjectItemDirect(const SfxPoolItem& /*rItem*/)
{
- DBG_ASSERT(sal_False, "EmptyProperties::SetObjectItemDirect() should never be called (!)");
+ DBG_ASSERT(false, "EmptyProperties::SetObjectItemDirect() should never be called (!)");
}
void EmptyProperties::ClearObjectItem(const sal_uInt16 /*nWhich*/)
{
- DBG_ASSERT(sal_False, "EmptyProperties::ClearObjectItem() should never be called (!)");
+ DBG_ASSERT(false, "EmptyProperties::ClearObjectItem() should never be called (!)");
}
void EmptyProperties::ClearObjectItemDirect(const sal_uInt16 /*nWhich*/)
{
- DBG_ASSERT(sal_False, "EmptyProperties::ClearObjectItemDirect() should never be called (!)");
+ DBG_ASSERT(false, "EmptyProperties::ClearObjectItemDirect() should never be called (!)");
}
void EmptyProperties::SetObjectItemSet(const SfxItemSet& /*rSet*/)
{
- DBG_ASSERT(sal_False, "EmptyProperties::SetObjectItemSet() should never be called (!)");
+ DBG_ASSERT(false, "EmptyProperties::SetObjectItemSet() should never be called (!)");
}
void EmptyProperties::ItemSetChanged(const SfxItemSet& /*rSet*/)
{
- DBG_ASSERT(sal_False, "EmptyProperties::ItemSetChanged() should never be called (!)");
+ DBG_ASSERT(false, "EmptyProperties::ItemSetChanged() should never be called (!)");
}
sal_Bool EmptyProperties::AllowItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) const
{
- DBG_ASSERT(sal_False, "EmptyProperties::AllowItemChange() should never be called (!)");
+ DBG_ASSERT(false, "EmptyProperties::AllowItemChange() should never be called (!)");
return sal_True;
}
void EmptyProperties::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/)
{
- DBG_ASSERT(sal_False, "EmptyProperties::ItemChange() should never be called (!)");
+ DBG_ASSERT(false, "EmptyProperties::ItemChange() should never be called (!)");
}
void EmptyProperties::PostItemChange(const sal_uInt16 /*nWhich*/)
{
- DBG_ASSERT(sal_False, "EmptyProperties::PostItemChange() should never be called (!)");
+ DBG_ASSERT(false, "EmptyProperties::PostItemChange() should never be called (!)");
}
void EmptyProperties::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, sal_Bool /*bDontRemoveHardAttr*/)
{
- DBG_ASSERT(sal_False, "EmptyProperties::SetStyleSheet() should never be called (!)");
+ DBG_ASSERT(false, "EmptyProperties::SetStyleSheet() should never be called (!)");
}
SfxStyleSheet* EmptyProperties::GetStyleSheet() const
{
- DBG_ASSERT(sal_False, "EmptyProperties::GetStyleSheet() should never be called (!)");
+ DBG_ASSERT(false, "EmptyProperties::GetStyleSheet() should never be called (!)");
return 0L;
}
} // end of namespace properties
diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx
index 6b8abb0c93f3..50ad6eb11fc6 100644
--- a/svx/source/sdr/properties/groupproperties.cxx
+++ b/svx/source/sdr/properties/groupproperties.cxx
@@ -62,7 +62,7 @@ namespace sdr
const SfxItemSet& GroupProperties::GetObjectItemSet() const
{
- DBG_ASSERT(sal_False, "GroupProperties::GetObjectItemSet() should never be called (!)");
+ DBG_ASSERT(false, "GroupProperties::GetObjectItemSet() should never be called (!)");
return DefaultProperties::GetObjectItemSet();
}
@@ -134,22 +134,22 @@ namespace sdr
void GroupProperties::SetObjectItem(const SfxPoolItem& /*rItem*/)
{
- DBG_ASSERT(sal_False, "GroupProperties::SetObjectItem() should never be called (!)");
+ DBG_ASSERT(false, "GroupProperties::SetObjectItem() should never be called (!)");
}
void GroupProperties::SetObjectItemDirect(const SfxPoolItem& /*rItem*/)
{
- DBG_ASSERT(sal_False, "GroupProperties::SetObjectItemDirect() should never be called (!)");
+ DBG_ASSERT(false, "GroupProperties::SetObjectItemDirect() should never be called (!)");
}
void GroupProperties::ClearObjectItem(const sal_uInt16 /*nWhich*/)
{
- DBG_ASSERT(sal_False, "GroupProperties::ClearObjectItem() should never be called (!)");
+ DBG_ASSERT(false, "GroupProperties::ClearObjectItem() should never be called (!)");
}
void GroupProperties::ClearObjectItemDirect(const sal_uInt16 /*nWhich*/)
{
- DBG_ASSERT(sal_False, "GroupProperties::ClearObjectItemDirect() should never be called (!)");
+ DBG_ASSERT(false, "GroupProperties::ClearObjectItemDirect() should never be called (!)");
}
void GroupProperties::SetMergedItem(const SfxPoolItem& rItem)
@@ -176,28 +176,28 @@ namespace sdr
void GroupProperties::SetObjectItemSet(const SfxItemSet& /*rSet*/)
{
- DBG_ASSERT(sal_False, "GroupProperties::SetObjectItemSet() should never be called (!)");
+ DBG_ASSERT(false, "GroupProperties::SetObjectItemSet() should never be called (!)");
}
void GroupProperties::ItemSetChanged(const SfxItemSet& /*rSet*/)
{
- DBG_ASSERT(sal_False, "GroupProperties::ItemSetChanged() should never be called (!)");
+ DBG_ASSERT(false, "GroupProperties::ItemSetChanged() should never be called (!)");
}
sal_Bool GroupProperties::AllowItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) const
{
- DBG_ASSERT(sal_False, "GroupProperties::AllowItemChange() should never be called (!)");
+ DBG_ASSERT(false, "GroupProperties::AllowItemChange() should never be called (!)");
return sal_False;
}
void GroupProperties::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/)
{
- DBG_ASSERT(sal_False, "GroupProperties::ItemChange() should never be called (!)");
+ DBG_ASSERT(false, "GroupProperties::ItemChange() should never be called (!)");
}
void GroupProperties::PostItemChange(const sal_uInt16 /*nWhich*/)
{
- DBG_ASSERT(sal_False, "GroupProperties::PostItemChange() should never be called (!)");
+ DBG_ASSERT(false, "GroupProperties::PostItemChange() should never be called (!)");
}
SfxStyleSheet* GroupProperties::GetStyleSheet() const
diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx
index cabec474025e..eb1f14397046 100644
--- a/svx/source/sdr/properties/measureproperties.cxx
+++ b/svx/source/sdr/properties/measureproperties.cxx
@@ -109,7 +109,7 @@ namespace sdr
//#71958# by default, the show units Bool-Item is set as hard
// attribute to sal_True to aviod confusion when copying SdrMeasureObj's
// from one application to another
- mpItemSet->Put(SdrMeasureShowUnitItem(sal_True));
+ mpItemSet->Put(SdrMeasureShowUnitItem(true));
basegfx::B2DPolygon aNewPolygon;
aNewPolygon.append(basegfx::B2DPoint(100.0, 0.0));
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 73c65e1525dd..9c766548c073 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -484,7 +484,7 @@ namespace sdr
if(bHasURL)
{
SfxItemSet aColorSet(*aSet.GetPool(), EE_CHAR_COLOR, EE_CHAR_COLOR );
- aColorSet.Put(aSet, sal_False);
+ aColorSet.Put(aSet, false);
ESelection aSel(nPara, 0);
@@ -511,7 +511,7 @@ namespace sdr
}
- aSet.Put(aParaSet, sal_False);
+ aSet.Put(aParaSet, false);
if(bHasURL)
{
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 9a0ca1a3a2d0..abe4d03c050c 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -160,7 +160,7 @@ void NBOTypeMgrBase::StoreBulCharFmtName_impl() {
if ( pSet )
{
SfxAllItemSet aSet(*pSet);
- SFX_ITEMSET_ARG(&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,sal_False);
+ SFX_ITEMSET_ARG(&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,false);
if ( pBulletCharFmt )
{
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index 3ea05beea1f1..229a53011b63 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -42,16 +42,16 @@
#define LLINESPACE_DURCH 5
#define LLINESPACE_FIX 6
-#define DO_NOT_CUSTOM 0
-#define USE_CUSTOM 1
+#define DO_NOT_CUSTOM false
+#define USE_CUSTOM true
namespace svx { namespace sidebar {
ParaLineSpacingControl::ParaLineSpacingControl(Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel)
: PopupControl( pParent,SVX_RES(RID_POPUPPANEL_PARAPAGE_LINESPACING))
- , mbUseLineSPCustom (0)
- , mbLineSPDisable (0)
+ , mbUseLineSPCustom (false)
+ , mbLineSPDisable (false)
, mrParaPropertyPanel(rPanel)
, mpBindings(NULL)
, nMinFixDist(BEGIN_VALUE)
@@ -240,9 +240,9 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
break;
}
if( !aWinOpt.Exists() && !aWinOpt2.Exists() )
- mbLineSPDisable = sal_True;
+ mbLineSPDisable = true;
else
- mbLineSPDisable = sal_False;
+ mbLineSPDisable = false;
if( mbLineSPDisable )
maLineSpacing.ReplaceItemImages(5, maImgCusGrey,0);
@@ -451,7 +451,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
else if( eState == SFX_ITEM_DISABLED )
{
aLineDist.Disable();
- pActLineDistFld->Enable(sal_False);
+ pActLineDistFld->Enable(false);
pActLineDistFld->SetText( "" );
maLineSpacing.SetNoSelection();
maLineSpacing.SelectItem(0);
@@ -460,7 +460,7 @@ void ParaLineSpacingControl::Rearrange(SfxItemState currSPState,FieldUnit currMe
}
else
{
- pActLineDistFld->Enable(sal_False);
+ pActLineDistFld->Enable(false);
pActLineDistFld->SetText( "" );
aLineDist.SetNoSelection();
maLineSpacing.SetNoSelection();
@@ -522,7 +522,7 @@ IMPL_LINK( ParaLineSpacingControl, LineSPDistHdl_Impl, ListBox*, pBox )
case LLINESPACE_1:
case LLINESPACE_15:
case LLINESPACE_2:
- pActLineDistFld->Enable(sal_False);
+ pActLineDistFld->Enable(false);
pActLineDistFld->SetText( "" );
break;
@@ -694,16 +694,16 @@ IMPL_LINK(ParaLineSpacingControl, VSSelHdl, void *, pControl)
switch ( iPos )
{
case 1:
- ExecuteLineSpacing( 0, 0 );
+ ExecuteLineSpacing( false, 0 );
break;
case 2:
- ExecuteLineSpacing( 0, 3 );
+ ExecuteLineSpacing( false, 3 );
break;
case 3:
- ExecuteLineSpacing( 0, 1 );
+ ExecuteLineSpacing( false, 1 );
break;
case 4:
- ExecuteLineSpacing( 0, 2 );
+ ExecuteLineSpacing( false, 2 );
break;
case 5:
{
@@ -741,7 +741,7 @@ IMPL_LINK(ParaLineSpacingControl, VSSelHdl, void *, pControl)
ExecuteLineSpacing( USE_CUSTOM, 0 );
}
else
- bClosePop = sal_False;
+ bClosePop = false;
}
break;
}
@@ -751,7 +751,7 @@ IMPL_LINK(ParaLineSpacingControl, VSSelHdl, void *, pControl)
return 0;
}
-void ParaLineSpacingControl::ExecuteLineSpacing( sal_uInt16 aIsCustom, sal_uInt16 aEntry )
+void ParaLineSpacingControl::ExecuteLineSpacing( bool aIsCustom, sal_uInt16 aEntry )
{
if( !aIsCustom )
{
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
index bd788e1ed256..8954a41ae2e9 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
@@ -52,7 +52,7 @@ public:
void SetLineSpace( SvxLineSpacingItem& rLineSpace,
int eSpace, long lValue = 0 );
- void ExecuteLineSpacing( sal_uInt16 aIsCustom, sal_uInt16 aEntry );
+ void ExecuteLineSpacing( bool aIsCustom, sal_uInt16 aEntry );
void SetAllNoSel();
void PopupModeEndCallback();
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 361231eb7248..393c92a71073 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -479,7 +479,7 @@ IMPL_LINK(ParaPropertyPanel, NumBTbxSelectHandler, ToolBox*, pToolBox)
{
nSID = FN_NUM_NUMBERING_ON;
}
- SfxBoolItem aBoolItem(nSID, sal_True);
+ SfxBoolItem aBoolItem(nSID, true);
GetBindings()->GetDispatcher()->Execute(nSID, SFX_CALLMODE_RECORD, &aBoolItem, 0L);
return 0;
@@ -521,7 +521,7 @@ IMPL_LINK(ParaPropertyPanel, VertTbxSelectHandler, ToolBox*, pToolBox)
mpTBxVertAlign->SetItemState(nIdVertCenter, STATE_NOCHECK);
mpTBxVertAlign->SetItemState(nIdVertBottom, STATE_CHECK);
}
- SfxBoolItem aBoolItem(nSID, sal_True);
+ SfxBoolItem aBoolItem(nSID, true);
GetBindings()->GetDispatcher()->Execute(nSID, SFX_CALLMODE_RECORD, &aBoolItem, 0L);
return 0;
@@ -619,12 +619,12 @@ void ParaPropertyPanel::ParaBKGStateChanged(sal_uInt16 /*nSID*/, SfxItemState eS
{
const SvxColorItem* pItem = (const SvxColorItem*)pState;
maColor = pItem->GetValue();
- mbColorAvailable = sal_True;
+ mbColorAvailable = true;
mpColorUpdater->Update(maColor);
}
else
{
- mbColorAvailable = sal_False;
+ mbColorAvailable = false;
maColor.SetColor(COL_AUTO);
mpColorUpdater->Update(maColor);
}
@@ -655,7 +655,7 @@ IMPL_LINK( ParaPropertyPanel, AlignStyleModifyHdl_Impl, ToolBox*, pBox )
pBox->SetItemState(nIdCenter, STATE_NOCHECK);
pBox->SetItemState(nIdRight, STATE_NOCHECK);
pBox->SetItemState(nIdJustify, STATE_NOCHECK);
- SfxBoolItem aBoolItem( SID_ATTR_PARA_ADJUST_LEFT, sal_True );
+ SfxBoolItem aBoolItem( SID_ATTR_PARA_ADJUST_LEFT, true );
GetBindings()->GetDispatcher()->Execute(SID_ATTR_PARA_ADJUST_LEFT, SFX_CALLMODE_RECORD, &aBoolItem, 0L);
}
else if( aCommand == UNO_CENTERPARA )
@@ -664,7 +664,7 @@ IMPL_LINK( ParaPropertyPanel, AlignStyleModifyHdl_Impl, ToolBox*, pBox )
pBox->SetItemState(nIdLeft, STATE_NOCHECK);
pBox->SetItemState(nIdRight, STATE_NOCHECK);
pBox->SetItemState(nIdJustify, STATE_NOCHECK);
- SfxBoolItem aBoolItem( SID_ATTR_PARA_ADJUST_CENTER, sal_True );
+ SfxBoolItem aBoolItem( SID_ATTR_PARA_ADJUST_CENTER, true );
GetBindings()->GetDispatcher()->Execute(SID_ATTR_PARA_ADJUST_CENTER, SFX_CALLMODE_RECORD, &aBoolItem, 0L);
}
else if( aCommand == UNO_RIGHTPARA )
@@ -673,7 +673,7 @@ IMPL_LINK( ParaPropertyPanel, AlignStyleModifyHdl_Impl, ToolBox*, pBox )
pBox->SetItemState(nIdLeft, STATE_NOCHECK);
pBox->SetItemState(nIdCenter, STATE_NOCHECK);
pBox->SetItemState(nIdJustify, STATE_NOCHECK);
- SfxBoolItem aBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, sal_True );
+ SfxBoolItem aBoolItem( SID_ATTR_PARA_ADJUST_RIGHT, true );
GetBindings()->GetDispatcher()->Execute(SID_ATTR_PARA_ADJUST_RIGHT, SFX_CALLMODE_RECORD, &aBoolItem, 0L);
}
else if( aCommand == UNO_JUSTIFYPARA )
@@ -682,7 +682,7 @@ IMPL_LINK( ParaPropertyPanel, AlignStyleModifyHdl_Impl, ToolBox*, pBox )
pBox->SetItemState(nIdLeft, STATE_NOCHECK);
pBox->SetItemState(nIdRight, STATE_NOCHECK);
pBox->SetItemState(nIdCenter, STATE_NOCHECK);
- SfxBoolItem aBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, sal_True );
+ SfxBoolItem aBoolItem( SID_ATTR_PARA_ADJUST_BLOCK, true );
GetBindings()->GetDispatcher()->Execute(SID_ATTR_PARA_ADJUST_BLOCK, SFX_CALLMODE_RECORD, &aBoolItem, 0L);
}
return 0;
@@ -713,7 +713,7 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl)
case CombinedEnumContext(Application_WriterVariants, Context_Text):
case CombinedEnumContext(Application_WriterVariants, Context_Table):
{
- SfxBoolItem aMargin( SID_INC_INDENT, sal_True );
+ SfxBoolItem aMargin( SID_INC_INDENT, true );
GetBindings()->GetDispatcher()->Execute(
SID_INC_INDENT, SFX_CALLMODE_RECORD, &aMargin, 0L);
}
@@ -742,7 +742,7 @@ IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl)
case CombinedEnumContext(Application_WriterVariants, Context_Text):
case CombinedEnumContext(Application_WriterVariants, Context_Table):
{
- SfxBoolItem aMargin( SID_DEC_INDENT, sal_True );
+ SfxBoolItem aMargin( SID_DEC_INDENT, true );
GetBindings()->GetDispatcher()->Execute(
SID_DEC_INDENT, SFX_CALLMODE_RECORD, &aMargin, 0L);
}
@@ -1262,16 +1262,16 @@ void ParaPropertyPanel::StateChangeOutLineImpl( sal_uInt16 nSID, SfxItemState eS
if (nSID==SID_OUTLINE_LEFT)
{
if( pState && eState == SFX_ITEM_UNKNOWN )
- mbOutLineLeft = 1;
+ mbOutLineLeft = true;
else
- mbOutLineLeft = 0;
+ mbOutLineLeft = false;
}
if (nSID==SID_OUTLINE_RIGHT)
{
if( pState && eState == SFX_ITEM_UNKNOWN )
- mbOutLineRight = 1;
+ mbOutLineRight = true;
else
- mbOutLineRight = 0;
+ mbOutLineRight = false;
}
const sal_uInt16 nIdDemote = mpTbxProDemote->GetItemId(UNO_DEMOTE);
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index acaaff4f7a7a..97555c5184f6 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -495,12 +495,12 @@ IMPL_LINK( PosSizePropertyPanel, ClickAutoHdl, void *, EMPTYARG )
IMPL_LINK( PosSizePropertyPanel, AngleModifiedHdl, void *, EMPTYARG )
{
OUString sTmp = mpMtrAngle->GetText();
- bool bNegative = 0;
+ bool bNegative = false;
sal_Unicode nChar = sTmp[0];
if( nChar == '-' )
{
- bNegative = 1;
+ bNegative = true;
nChar = sTmp[1];
}
diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx
index fc4c94aaaded..9960137d0959 100644
--- a/svx/source/svdraw/clonelist.cxx
+++ b/svx/source/svdraw/clonelist.cxx
@@ -78,8 +78,8 @@ void CloneList::CopyConnections() const
if(pOriginalEdge && pCloneEdge)
{
- SdrObject* pOriginalNode1 = pOriginalEdge->GetConnectedNode(sal_True);
- SdrObject* pOriginalNode2 = pOriginalEdge->GetConnectedNode(sal_False);
+ SdrObject* pOriginalNode1 = pOriginalEdge->GetConnectedNode(true);
+ SdrObject* pOriginalNode2 = pOriginalEdge->GetConnectedNode(false);
if(pOriginalNode1)
{
@@ -96,8 +96,8 @@ void CloneList::CopyConnections() const
if (nPos < cloneCount)
cObj = GetClone(nPos);
- if(pOriginalEdge->GetConnectedNode(sal_True) != cObj)
- pCloneEdge->ConnectToNode(sal_True, cObj);
+ if(pOriginalEdge->GetConnectedNode(true) != cObj)
+ pCloneEdge->ConnectToNode(true, cObj);
}
}
@@ -116,8 +116,8 @@ void CloneList::CopyConnections() const
if (nPos < cloneCount)
cObj = GetClone(nPos);
- if(pOriginalEdge->GetConnectedNode(sal_False) != cObj)
- pCloneEdge->ConnectToNode(sal_False, cObj);
+ if(pOriginalEdge->GetConnectedNode(false) != cObj)
+ pCloneEdge->ConnectToNode(false, cObj);
}
}
}
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 6c479b8de77e..3f8010a205bf 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -288,7 +288,7 @@ void SdrPageWindow::RedrawAll(sdr::contact::ViewObjectContactRedirector* pRedire
// Draw all layers. do NOT draw form layer from CompleteRedraw, this is done separately
// as a single layer paint
const SdrLayerAdmin& rLayerAdmin = rModel.GetLayerAdmin();
- const SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID(rLayerAdmin.GetControlLayerName(), sal_False);
+ const SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID(rLayerAdmin.GetControlLayerName(), false);
aProcessLayers.Clear(nControlLayerId);
// still something to paint?
@@ -336,7 +336,7 @@ void SdrPageWindow::RedrawLayer(const SdrLayerID* pId, sdr::contact::ViewObjectC
{
// find out if we are painting the ControlLayer
const SdrLayerAdmin& rLayerAdmin = rModel.GetLayerAdmin();
- const SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID(rLayerAdmin.GetControlLayerName(), sal_False);
+ const SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID(rLayerAdmin.GetControlLayerName(), false);
const bool bControlLayerProcessingActive(nControlLayerId == *pId);
// create PaintInfoRec, use Rectangle only temporarily
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index a7a23db5388e..d532d0826827 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -959,7 +959,7 @@ SfxPoolItem* SdrMetricItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
bool SdrMetricItem::HasMetrics() const
{
- return sal_True;
+ return true;
}
bool SdrMetricItem::ScaleMetrics(long nMul, long nDiv)
@@ -971,7 +971,7 @@ bool SdrMetricItem::ScaleMetrics(long nMul, long nDiv)
aVal/=nDiv;
SetValue(long(aVal));
}
- return sal_True;
+ return true;
}
SfxItemPresentation SdrMetricItem::GetPresentation(SfxItemPresentation ePres,
@@ -1079,7 +1079,7 @@ SfxItemPresentation SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentatio
return ePres;
}
-bool SdrTextFitToSizeTypeItem::HasBoolValue() const { return sal_True; }
+bool SdrTextFitToSizeTypeItem::HasBoolValue() const { return true; }
sal_Bool SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; }
@@ -1347,8 +1347,8 @@ bool SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv)
aVal+=nDiv/2; // to round accurately
aVal/=nDiv;
SetValue(short(aVal));
- return sal_True;
- } else return sal_False;
+ return true;
+ } else return false;
}
SfxItemPresentation SdrTextAniAmountItem::GetPresentation(
@@ -1391,7 +1391,7 @@ SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( sal_Bool bUseFixedCellHe
{
}
SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion )
- : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, sal_False )
+ : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, false )
{
if ( nVersion )
{
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 1068cf55d5af..79985a59ee47 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -412,7 +412,7 @@ sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, c
aLay = aMeasureLayer;
}
- SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay,sal_True);
+ SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay,true);
if (nLayer==SDRLAYER_NOTFOUND) nLayer=0;
if (!pCreatePV->GetLockedLayers().IsSet(nLayer) && pCreatePV->GetVisibleLayers().IsSet(nLayer))
{
@@ -569,9 +569,9 @@ void SdrCreateView::MovCreateObj(const Point& rPnt)
if(bDidLimit && IsOrtho())
{
if(aDragStat.IsOrtho8Possible())
- OrthoDistance8(aDragStat.GetPrev(), aPnt, sal_False);
+ OrthoDistance8(aDragStat.GetPrev(), aPnt, false);
else if(aDragStat.IsOrtho4Possible())
- OrthoDistance4(aDragStat.GetPrev(), aPnt, sal_False);
+ OrthoDistance4(aDragStat.GetPrev(), aPnt, false);
}
if (aPnt==aDragStat.GetNow()) return;
@@ -634,7 +634,7 @@ sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
}
else
{
- nLayer = rAd.GetLayerID(aAktLayer, sal_True);
+ nLayer = rAd.GetLayerID(aAktLayer, true);
}
if(SDRLAYER_NOTFOUND == nLayer)
@@ -859,7 +859,7 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/)
}
}
- aDragStat.SetShown(sal_True);
+ aDragStat.SetShown(true);
}
}
@@ -872,7 +872,7 @@ void SdrCreateView::HideCreateObj()
mpCreateViewExtraData->HideOverlay();
//DrawCreateObj(pOut,bFull);
- aDragStat.SetShown(sal_False);
+ aDragStat.SetShown(false);
}
}
diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx
index 0a982d2a40cf..a45ef7b9c6ca 100644
--- a/svx/source/svdraw/svddrag.cxx
+++ b/svx/source/svdraw/svddrag.cxx
@@ -38,20 +38,20 @@ void SdrDragStat::Reset()
{
pView=NULL;
pPageView=NULL;
- bShown=sal_False;
+ bShown=false;
nMinMov=1;
- bMinMoved=sal_False;
- bHorFixed=sal_False;
- bVerFixed=sal_False;
- bWantNoSnap=sal_False;
+ bMinMoved=false;
+ bHorFixed=false;
+ bVerFixed=false;
+ bWantNoSnap=false;
pHdl=NULL;
- bOrtho4=sal_False;
- bOrtho8=sal_False;
+ bOrtho4=false;
+ bOrtho8=false;
pDragMethod=NULL;
- bEndDragChangesAttributes=sal_False;
- bEndDragChangesGeoAndAttributes=sal_False;
- bMouseIsUp=sal_False;
- Clear(sal_True);
+ bEndDragChangesAttributes=false;
+ bEndDragChangesGeoAndAttributes=false;
+ bMouseIsUp=false;
+ Clear(true);
aActionRect=Rectangle();
}
@@ -103,7 +103,7 @@ bool SdrDragStat::CheckMinMoved(const Point& rPnt)
long dx=rPnt.X()-GetPrev().X(); if (dx<0) dx=-dx;
long dy=rPnt.Y()-GetPrev().Y(); if (dy<0) dy=-dy;
if (dx>=long(nMinMov) || dy>=long(nMinMov))
- bMinMoved=sal_True;
+ bMinMoved=true;
}
return bMinMoved;
}
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 7c3bbc15738d..84967e31150e 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -50,33 +50,33 @@ using namespace sdr;
void SdrDragView::ImpClearVars()
{
- bFramDrag=sal_False;
+ bFramDrag=false;
eDragMode=SDRDRAG_MOVE;
- bDragLimit=sal_False;
- bMarkedHitMovesAlways=sal_False;
+ bDragLimit=false;
+ bMarkedHitMovesAlways=false;
eDragHdl=HDL_MOVE;
pDragHdl=NULL;
- bDragHdl=sal_False;
- bDragSpecial=sal_False;
+ bDragHdl=false;
+ bDragSpecial=false;
mpCurrentSdrDragMethod=NULL;
- bDragStripes=sal_False;
- bMirrRefDragObj=sal_True;
- bDragWithCopy=sal_False;
+ bDragStripes=false;
+ bMirrRefDragObj=true;
+ bDragWithCopy=false;
pInsPointUndo=NULL;
- bInsGluePoint=sal_False;
- bInsObjPointMode=sal_False;
- bInsGluePointMode=sal_False;
+ bInsGluePoint=false;
+ bInsObjPointMode=false;
+ bInsGluePointMode=false;
nDragXorPolyLimit=100;
nDragXorPointLimit=500;
- bNoDragXorPolys=sal_False;
- bAutoVertexCon=sal_True;
- bAutoCornerCon=sal_False;
- bRubberEdgeDragging=sal_True;
- bDetailedEdgeDragging=sal_True;
+ bNoDragXorPolys=false;
+ bAutoVertexCon=true;
+ bAutoCornerCon=false;
+ bRubberEdgeDragging=true;
+ bDetailedEdgeDragging=true;
nDetailedEdgeDraggingLimit=10;
- bResizeAtCenter=sal_False;
- bCrookAtCenter=sal_False;
- bMouseHideWhileDraggingPoints=sal_False;
+ bResizeAtCenter=false;
+ bCrookAtCenter=false;
+ bMouseHideWhileDraggingPoints=false;
// init using default
mbSolidDragging = getOptionsDrawinglayer().IsSolidDragCreate();
@@ -207,8 +207,8 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
SetDragWithCopy(sal_False);
//TODO: aAni.Reset();
mpCurrentSdrDragMethod=NULL;
- bDragSpecial=sal_False;
- bDragLimit=sal_False;
+ bDragSpecial=false;
+ bDragLimit=false;
SdrDragMode eTmpMode=eDragMode;
if (eTmpMode==SDRDRAG_MOVE && pHdl!=NULL && pHdl->GetKind()!=HDL_MOVE) {
eTmpMode=SDRDRAG_RESIZE;
@@ -218,7 +218,7 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
if (!bFramDrag &&
(pMarkedObj==NULL || !pMarkedObj->hasSpecialDrag()) &&
(pHdl==NULL || pHdl->GetObj()==NULL)) {
- bFramDrag=sal_True;
+ bFramDrag=true;
}
Point aPnt(rPnt);
@@ -354,7 +354,7 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
if(!IsTransparenceAllowed())
return sal_False;
- mpCurrentSdrDragMethod = new SdrDragGradient(*this, sal_False);
+ mpCurrentSdrDragMethod = new SdrDragGradient(*this, false);
}
break;
}
@@ -463,7 +463,7 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
if(!mpCurrentSdrDragMethod)
{
// fallback to DragSpecial if no interaction defined
- bDragSpecial = sal_True;
+ bDragSpecial = true;
mpCurrentSdrDragMethod = new SdrDragObjOwn(*this);
}
}
@@ -487,12 +487,12 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
// Obj may not Move SpecialDrag, so try with MoveFrameDrag
delete mpCurrentSdrDragMethod;
mpCurrentSdrDragMethod = 0;
- bDragSpecial=sal_False;
+ bDragSpecial=false;
if (!IsMoveAllowed())
return sal_False;
- bFramDrag=sal_True;
+ bFramDrag=true;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
aDragStat.SetDragMethod(mpCurrentSdrDragMethod);
bRet = mpCurrentSdrDragMethod->BeginSdrDrag();
@@ -560,7 +560,7 @@ sal_Bool SdrDragView::EndDragObj(sal_Bool bCopy)
if (bInsPolyPoint)
{
SetMarkHandles();
- bInsPolyPoint=sal_False;
+ bInsPolyPoint=false;
if( bUndo )
{
BegUndo(aInsPointUndoStr);
@@ -586,7 +586,7 @@ sal_Bool SdrDragView::EndDragObj(sal_Bool bCopy)
BrkDragObj();
}
- bInsPolyPoint=sal_False;
+ bInsPolyPoint=false;
SetInsertGluePoint(sal_False);
return bRet;
@@ -607,7 +607,7 @@ void SdrDragView::BrkDragObj()
delete pInsPointUndo;
pInsPointUndo=NULL;
SetMarkHandles();
- bInsPolyPoint=sal_False;
+ bInsPolyPoint=false;
}
if (IsInsertGluePoint())
@@ -669,7 +669,7 @@ sal_Bool SdrDragView::ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, con
if(0xffffffff != mnInsPointNum)
{
- bInsPolyPoint = sal_True;
+ bInsPolyPoint = true;
UnmarkAllPoints();
AdjustMarkHdl();
@@ -810,7 +810,7 @@ void SdrDragView::ShowDragObj()
}
}
- aDragStat.SetShown(sal_True);
+ aDragStat.SetShown(true);
}
}
@@ -819,7 +819,7 @@ void SdrDragView::HideDragObj()
if(mpCurrentSdrDragMethod && aDragStat.IsShown())
{
mpCurrentSdrDragMethod->destroyOverlayGeometry();
- aDragStat.SetShown(sal_False);
+ aDragStat.SetShown(false);
}
}
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index a872d426bd8c..0bf5d7636fb8 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -39,55 +39,55 @@
void SdrEditView::ImpResetPossibilityFlags()
{
- bReadOnly =sal_False;
-
- bGroupPossible =sal_False;
- bUnGroupPossible =sal_False;
- bGrpEnterPossible =sal_False;
- bDeletePossible =sal_False;
- bToTopPossible =sal_False;
- bToBtmPossible =sal_False;
- bReverseOrderPossible =sal_False;
-
- bImportMtfPossible =sal_False;
- bCombinePossible =sal_False;
- bDismantlePossible =sal_False;
- bCombineNoPolyPolyPossible =sal_False;
- bDismantleMakeLinesPossible=sal_False;
- bOrthoDesiredOnMarked =sal_False;
-
- bMoreThanOneNotMovable =sal_False;
- bOneOrMoreMovable =sal_False;
- bMoreThanOneNoMovRot =sal_False;
- bContortionPossible =sal_False;
- bAllPolys =sal_False;
- bOneOrMorePolys =sal_False;
- bMoveAllowed =sal_False;
- bResizeFreeAllowed =sal_False;
- bResizePropAllowed =sal_False;
- bRotateFreeAllowed =sal_False;
- bRotate90Allowed =sal_False;
- bMirrorFreeAllowed =sal_False;
- bMirror45Allowed =sal_False;
- bMirror90Allowed =sal_False;
- bTransparenceAllowed =sal_False;
- bGradientAllowed =sal_False;
- bShearAllowed =sal_False;
- bEdgeRadiusAllowed =sal_False;
- bCanConvToPath =sal_False;
- bCanConvToPoly =sal_False;
- bCanConvToContour =sal_False;
- bCanConvToPathLineToArea=sal_False;
- bCanConvToPolyLineToArea=sal_False;
- bMoveProtect =sal_False;
- bResizeProtect =sal_False;
+ bReadOnly =false;
+
+ bGroupPossible =false;
+ bUnGroupPossible =false;
+ bGrpEnterPossible =false;
+ bDeletePossible =false;
+ bToTopPossible =false;
+ bToBtmPossible =false;
+ bReverseOrderPossible =false;
+
+ bImportMtfPossible =false;
+ bCombinePossible =false;
+ bDismantlePossible =false;
+ bCombineNoPolyPolyPossible =false;
+ bDismantleMakeLinesPossible=false;
+ bOrthoDesiredOnMarked =false;
+
+ bMoreThanOneNotMovable =false;
+ bOneOrMoreMovable =false;
+ bMoreThanOneNoMovRot =false;
+ bContortionPossible =false;
+ bAllPolys =false;
+ bOneOrMorePolys =false;
+ bMoveAllowed =false;
+ bResizeFreeAllowed =false;
+ bResizePropAllowed =false;
+ bRotateFreeAllowed =false;
+ bRotate90Allowed =false;
+ bMirrorFreeAllowed =false;
+ bMirror45Allowed =false;
+ bMirror90Allowed =false;
+ bTransparenceAllowed =false;
+ bGradientAllowed =false;
+ bShearAllowed =false;
+ bEdgeRadiusAllowed =false;
+ bCanConvToPath =false;
+ bCanConvToPoly =false;
+ bCanConvToContour =false;
+ bCanConvToPathLineToArea=false;
+ bCanConvToPolyLineToArea=false;
+ bMoveProtect =false;
+ bResizeProtect =false;
}
void SdrEditView::ImpClearVars()
{
ImpResetPossibilityFlags();
- bPossibilitiesDirty=sal_True; // << Purify didn't like this
- bBundleVirtObj=sal_False;
+ bPossibilitiesDirty=true; // << Purify didn't like this
+ bBundleVirtObj=false;
}
SdrEditView::SdrEditView(SdrModel* pModel1, OutputDevice* pOut):
@@ -199,7 +199,7 @@ void SdrEditView::ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID)
void SdrEditView::DeleteLayer(const OUString& rName)
{
SdrLayerAdmin& rLA = pMod->GetLayerAdmin();
- SdrLayer* pLayer = rLA.GetLayer(rName, sal_True);
+ SdrLayer* pLayer = rLA.GetLayer(rName, true);
sal_uInt16 nLayerNum(rLA.GetLayerPos(pLayer));
if(SDRLAYER_NOTFOUND != nLayerNum)
@@ -314,10 +314,10 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes()
if(pEdge)
{
- SdrObject* pObj1 = pEdge->GetConnectedNode(sal_False);
- SdrObject* pObj2 = pEdge->GetConnectedNode(sal_True);
+ SdrObject* pObj1 = pEdge->GetConnectedNode(false);
+ SdrObject* pObj2 = pEdge->GetConnectedNode(true);
- if(pObj1 && !pEdge->CheckNodeConnection(sal_False))
+ if(pObj1 && !pEdge->CheckNodeConnection(false))
{
iterPos = std::find(rAllMarkedObjects.begin(),rAllMarkedObjects.end(),pObj1);
@@ -325,11 +325,11 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes()
{
if( IsUndoEnabled() )
AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pEdge));
- pEdge->DisconnectFromNode(sal_False);
+ pEdge->DisconnectFromNode(false);
}
}
- if(pObj2 && !pEdge->CheckNodeConnection(sal_True))
+ if(pObj2 && !pEdge->CheckNodeConnection(true))
{
iterPos = std::find(rAllMarkedObjects.begin(),rAllMarkedObjects.end(),pObj2);
@@ -337,7 +337,7 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes()
{
if( IsUndoEnabled() )
AddUndo( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pEdge));
- pEdge->DisconnectFromNode(sal_True);
+ pEdge->DisconnectFromNode(true);
}
}
}
@@ -363,13 +363,13 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes()
void SdrEditView::MarkListHasChanged()
{
SdrMarkView::MarkListHasChanged();
- bPossibilitiesDirty=sal_True;
+ bPossibilitiesDirty=true;
}
void SdrEditView::ModelHasChanged()
{
SdrMarkView::ModelHasChanged();
- bPossibilitiesDirty=sal_True;
+ bPossibilitiesDirty=true;
}
sal_Bool SdrEditView::IsResizeAllowed(sal_Bool bProp) const
@@ -460,7 +460,7 @@ sal_Bool SdrEditView::IsDismantlePossible(sal_Bool bMakeLines) const
void SdrEditView::CheckPossibilities()
{
- if (bSomeObjChgdFlag) bPossibilitiesDirty=sal_True;
+ if (bSomeObjChgdFlag) bPossibilitiesDirty=true;
if(bSomeObjChgdFlag)
{
@@ -488,24 +488,24 @@ void SdrEditView::CheckPossibilities()
bool bGroup=pObj->GetSubList()!=NULL;
bool bHasText=pObj->GetOutlinerParaObject()!=NULL;
if (bGroup || bHasText) {
- bCombinePossible=sal_True;
+ bCombinePossible=true;
}
}
bCombineNoPolyPolyPossible=bCombinePossible;
- bDeletePossible=sal_True;
+ bDeletePossible=true;
// accept transformations for now
- bMoveAllowed =sal_True;
- bResizeFreeAllowed=sal_True;
- bResizePropAllowed=sal_True;
- bRotateFreeAllowed=sal_True;
- bRotate90Allowed =sal_True;
- bMirrorFreeAllowed=sal_True;
- bMirror45Allowed =sal_True;
- bMirror90Allowed =sal_True;
- bShearAllowed =sal_True;
- bEdgeRadiusAllowed=sal_False;
- bContortionPossible=sal_True;
- bCanConvToContour = sal_True;
+ bMoveAllowed =true;
+ bResizeFreeAllowed=true;
+ bResizePropAllowed=true;
+ bRotateFreeAllowed=true;
+ bRotate90Allowed =true;
+ bMirrorFreeAllowed=true;
+ bMirror45Allowed =true;
+ bMirror90Allowed =true;
+ bShearAllowed =true;
+ bEdgeRadiusAllowed=false;
+ bContortionPossible=true;
+ bCanConvToContour = true;
// these ones are only allowed when single object is selected
bTransparenceAllowed = (nMarkAnz == 1);
@@ -527,7 +527,7 @@ void SdrEditView::CheckPossibilities()
if(eFillStyle != XFILL_GRADIENT)
{
- bGradientAllowed = sal_False;
+ bGradientAllowed = false;
}
}
}
@@ -540,7 +540,7 @@ void SdrEditView::CheckPossibilities()
const SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrPageView* pPV=pM->GetPageView();
if (pPV!=pPV0) {
- if (pPV->IsReadOnly()) bReadOnly=sal_True;
+ if (pPV->IsReadOnly()) bReadOnly=true;
pPV0=pPV;
}
@@ -549,25 +549,25 @@ void SdrEditView::CheckPossibilities()
sal_Bool bMovPrt=pObj->IsMoveProtect();
sal_Bool bSizPrt=pObj->IsResizeProtect();
if (!bMovPrt && aInfo.bMoveAllowed) nMovableCount++; // count MovableObjs
- if (bMovPrt) bMoveProtect=sal_True;
- if (bSizPrt) bResizeProtect=sal_True;
+ if (bMovPrt) bMoveProtect=true;
+ if (bSizPrt) bResizeProtect=true;
// not allowed when not allowed at one object
if(!aInfo.bTransparenceAllowed)
- bTransparenceAllowed = sal_False;
+ bTransparenceAllowed = false;
// If one of these can't do something, none can
- if (!aInfo.bMoveAllowed ) bMoveAllowed =sal_False;
- if (!aInfo.bResizeFreeAllowed) bResizeFreeAllowed=sal_False;
- if (!aInfo.bResizePropAllowed) bResizePropAllowed=sal_False;
- if (!aInfo.bRotateFreeAllowed) bRotateFreeAllowed=sal_False;
- if (!aInfo.bRotate90Allowed ) bRotate90Allowed =sal_False;
- if (!aInfo.bMirrorFreeAllowed) bMirrorFreeAllowed=sal_False;
- if (!aInfo.bMirror45Allowed ) bMirror45Allowed =sal_False;
- if (!aInfo.bMirror90Allowed ) bMirror90Allowed =sal_False;
- if (!aInfo.bShearAllowed ) bShearAllowed =sal_False;
- if (aInfo.bEdgeRadiusAllowed) bEdgeRadiusAllowed=sal_True;
- if (aInfo.bNoContortion ) bContortionPossible=sal_False;
+ if (!aInfo.bMoveAllowed ) bMoveAllowed =false;
+ if (!aInfo.bResizeFreeAllowed) bResizeFreeAllowed=false;
+ if (!aInfo.bResizePropAllowed) bResizePropAllowed=false;
+ if (!aInfo.bRotateFreeAllowed) bRotateFreeAllowed=false;
+ if (!aInfo.bRotate90Allowed ) bRotate90Allowed =false;
+ if (!aInfo.bMirrorFreeAllowed) bMirrorFreeAllowed=false;
+ if (!aInfo.bMirror45Allowed ) bMirror45Allowed =false;
+ if (!aInfo.bMirror90Allowed ) bMirror90Allowed =false;
+ if (!aInfo.bShearAllowed ) bShearAllowed =false;
+ if (aInfo.bEdgeRadiusAllowed) bEdgeRadiusAllowed=true;
+ if (aInfo.bNoContortion ) bContortionPossible=false;
// For Crook with Contortion: all objects have to be
// Movable and Rotatable, except for a maximum of 1 of them
if (!bMoreThanOneNoMovRot) {
@@ -579,15 +579,15 @@ void SdrEditView::CheckPossibilities()
// if one member cannot be converted, no conversion is possible
if(!aInfo.bCanConvToContour)
- bCanConvToContour = sal_False;
+ bCanConvToContour = false;
// Ungroup
if (!bUnGroupPossible) bUnGroupPossible=pObj->GetSubList()!=NULL;
// ConvertToCurve: If at least one can be converted, that is fine.
- if (aInfo.bCanConvToPath ) bCanConvToPath =sal_True;
- if (aInfo.bCanConvToPoly ) bCanConvToPoly =sal_True;
- if (aInfo.bCanConvToPathLineToArea) bCanConvToPathLineToArea=sal_True;
- if (aInfo.bCanConvToPolyLineToArea) bCanConvToPolyLineToArea=sal_True;
+ if (aInfo.bCanConvToPath ) bCanConvToPath =true;
+ if (aInfo.bCanConvToPoly ) bCanConvToPoly =true;
+ if (aInfo.bCanConvToPathLineToArea) bCanConvToPathLineToArea=true;
+ if (aInfo.bCanConvToPolyLineToArea) bCanConvToPolyLineToArea=true;
// Combine/Dismantle
if(bCombinePossible)
@@ -599,7 +599,7 @@ void SdrEditView::CheckPossibilities()
if (!bDismantlePossible) bDismantlePossible = ImpCanDismantle(pObj, sal_False);
if (!bDismantleMakeLinesPossible) bDismantleMakeLinesPossible = ImpCanDismantle(pObj, sal_True);
// check OrthoDesiredOnMarked
- if (!bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) bOrthoDesiredOnMarked=sal_True;
+ if (!bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) bOrthoDesiredOnMarked=true;
// check ImportMtf
if (!bImportMtfPossible)
@@ -609,7 +609,7 @@ void SdrEditView::CheckPossibilities()
if(pSdrGrafObj && ((pSdrGrafObj->HasGDIMetaFile() && !pSdrGrafObj->IsEPS()) || pSdrGrafObj->isEmbeddedSvg()))
{
- bImportMtfPossible = sal_True;
+ bImportMtfPossible = true;
}
if(pSdrOle2Obj)
@@ -625,12 +625,12 @@ void SdrEditView::CheckPossibilities()
}
ImpCheckToTopBtmPossible();
((SdrPolyEditView*)this)->ImpCheckPolyPossibilities();
- bPossibilitiesDirty=sal_False;
+ bPossibilitiesDirty=false;
if (bReadOnly) {
sal_Bool bMerker1=bGrpEnterPossible;
ImpResetPossibilityFlags();
- bReadOnly=sal_True;
+ bReadOnly=true;
bGrpEnterPossible=bMerker1;
}
if (bMoveAllowed) {
@@ -640,9 +640,9 @@ void SdrEditView::CheckPossibilities()
SdrObject* pObj=GetMarkedObjectByIndex(0);
SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pObj);
if (pEdge!=NULL) {
- SdrObject* pNode1=pEdge->GetConnectedNode(sal_True);
- SdrObject* pNode2=pEdge->GetConnectedNode(sal_False);
- if (pNode1!=NULL || pNode2!=NULL) bMoveAllowed=sal_False;
+ SdrObject* pNode1=pEdge->GetConnectedNode(true);
+ SdrObject* pNode2=pEdge->GetConnectedNode(false);
+ if (pNode1!=NULL || pNode2!=NULL) bMoveAllowed=false;
}
}
}
@@ -955,7 +955,7 @@ void SdrEditView::CopyMarkedObj()
sal_Bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions)
{
if ((nOptions & SDRINSERT_SETDEFLAYER)!=0) {
- SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(aAktLayer,sal_True);
+ 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
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 746ea47f13dd..d1d842d8136a 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -159,8 +159,8 @@ std::vector< SdrUndoAction* > SdrEditView::CreateConnectorUndo( SdrObject& rO )
SdrObject* pPartObj = aIter.Next();
if ( pPartObj->ISA( SdrEdgeObj ) )
{
- if ( ( pPartObj->GetConnectedNode( sal_False ) == &rO ) ||
- ( pPartObj->GetConnectedNode( sal_True ) == &rO ) )
+ if ( ( pPartObj->GetConnectedNode( false ) == &rO ) ||
+ ( pPartObj->GetConnectedNode( true ) == &rO ) )
{
vUndoActions.push_back( GetModel()->GetSdrUndoFactory().CreateUndoGeoObject( *pPartObj ) );
}
@@ -768,11 +768,11 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /*
}
if (rAttr.GetItemState(SDRATTR_HORZSHEARALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long nAngle=((const SdrHorzShearAllItem*)pPoolItem)->GetValue();
- ShearMarkedObj(aAllSnapRect.Center(),nAngle,sal_False);
+ ShearMarkedObj(aAllSnapRect.Center(),nAngle,false);
}
if (rAttr.GetItemState(SDRATTR_VERTSHEARALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long nAngle=((const SdrVertShearAllItem*)pPoolItem)->GetValue();
- ShearMarkedObj(aAllSnapRect.Center(),nAngle,sal_True);
+ ShearMarkedObj(aAllSnapRect.Center(),nAngle,true);
}
const bool bUndo = IsUndoEnabled();
@@ -1038,7 +1038,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
// uses its second parameter (bInvalidAsDefault) to
// remove all such items to set them to default.
SfxItemSet aAttr(*rAttr.GetPool(), rAttr.GetRanges());
- aAttr.Put(rAttr, sal_True);
+ aAttr.Put(rAttr, true);
// #i38135#
bool bResetAnimationTimer(false);
@@ -1088,7 +1088,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
const bool bRescueText = dynamic_cast< SdrTextObj* >(pObj) != 0;
// add attribute undo
- AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,sal_False,bHasEEItems || bPossibleGeomChange || bRescueText));
+ AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,false,bHasEEItems || bPossibleGeomChange || bRescueText));
}
// set up a scene updater if object is a 3d object
@@ -1237,7 +1237,7 @@ sal_Bool SdrEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAt
{
if(GetMarkedObjectCount())
{
- rTargetSet.Put(GetAttrFromMarked(bOnlyHardAttr), sal_False);
+ rTargetSet.Put(GetAttrFromMarked(bOnlyHardAttr), false);
return sal_True;
}
else
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 490a69847e9e..f05d650d7801 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -627,7 +627,7 @@ basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon1(const SdrObject* pObj, s
}
else
{
- SdrObject* pConvObj = pObj->ConvertToPolyObj(bCombine, sal_False);
+ SdrObject* pConvObj = pObj->ConvertToPolyObj(bCombine, false);
if(pConvObj)
{
@@ -1479,7 +1479,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
SdrInsertReason aReason(SDRREASON_VIEWCALL, pSrcPath);
rOL.InsertObject(pPath, rPos, &aReason);
if( bUndo )
- AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, sal_True));
+ AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, true));
MarkObj(pPath, pPV, sal_False, sal_True);
rPos++;
}
@@ -1514,7 +1514,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
SdrInsertReason aReason(SDRREASON_VIEWCALL, pSrcPath);
rOL.InsertObject(pPath, rPos, &aReason);
if( bUndo )
- AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, sal_True));
+ AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, true));
MarkObj(pPath, pPV, sal_False, sal_True);
rPos++;
}
@@ -1643,7 +1643,7 @@ void SdrEditView::DismantleMarkedObjects(sal_Bool bMakeLines)
ImpDismantleOneObject(pObj,*pOL,nPos,pPV,bMakeLines);
}
if( bUndo )
- AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pObj,sal_True));
+ AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pObj,true));
pOL->RemoveObject(nPos0);
if( !bUndo )
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index be05624cfd1d..215d97251774 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -64,22 +64,22 @@
void SdrObjEditView::ImpClearVars()
{
- bQuickTextEditMode=sal_True;
- bMacroMode=sal_True;
+ bQuickTextEditMode=true;
+ bMacroMode=true;
pTextEditOutliner=NULL;
pTextEditOutlinerView=NULL;
pTextEditPV=NULL;
pTextEditWin=NULL;
pTextEditCursorMerker=NULL;
pEditPara=NULL;
- bTextEditNewObj=sal_False;
- bMacroDown=sal_False;
+ bTextEditNewObj=false;
+ bMacroDown=false;
pMacroObj=NULL;
pMacroPV=NULL;
pMacroWin=NULL;
nMacroTol=0;
- bTextEditDontDelete=sal_False;
- bTextEditOnlyOneView=sal_False;
+ bTextEditDontDelete=false;
+ bTextEditOnlyOneView=false;
}
SdrObjEditView::SdrObjEditView(SdrModel* pModel1, OutputDevice* pOut):
@@ -480,7 +480,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
if (pTextObj!=NULL) {
Color* pTxtCol=NULL;
Color* pFldCol=NULL;
- bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),sal_True,pTxtCol,pFldCol,rStr);
+ bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),true,pTxtCol,pFldCol,rStr);
if (bOk) {
if (pTxtCol!=NULL) {
pFI->SetTxtColor(*pTxtCol);
@@ -647,7 +647,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
Rectangle aTextRect;
Rectangle aAnchorRect;
- pTextObj->TakeTextRect(*pTextEditOutliner, aTextRect, sal_True,
+ pTextObj->TakeTextRect(*pTextEditOutliner, aTextRect, true,
&aAnchorRect /* Give sal_True here, not sal_False */);
if ( !pTextObj->IsContourTextFrame() )
@@ -1459,7 +1459,7 @@ sal_Bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHar
if(pTextEditOutlinerView)
{
// FALSE= regard InvalidItems as "holes," not as Default
- rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), sal_False);
+ rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), false);
rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ) );
}
@@ -1715,7 +1715,7 @@ sal_Bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* p
pMacroObj=pObj;
pMacroPV=pPV;
pMacroWin=pWin;
- bMacroDown=sal_False;
+ bMacroDown=false;
nMacroTol=sal_uInt16(nTol);
aMacroDownPos=rPnt;
MovMacroObj(rPnt);
@@ -1735,7 +1735,7 @@ void SdrObjEditView::ImpMacroUp(const Point& rUpPos)
aHitRec.pPageView=pMacroPV;
aHitRec.pOut=pMacroWin;
pMacroObj->PaintMacro(*pMacroWin,Rectangle(),aHitRec);
- bMacroDown=sal_False;
+ bMacroDown=false;
}
}
@@ -1749,10 +1749,10 @@ void SdrObjEditView::ImpMacroDown(const Point& rDownPos)
aHitRec.nTol=nMacroTol;
aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers();
aHitRec.pPageView=pMacroPV;
- aHitRec.bDown=sal_True;
+ aHitRec.bDown=true;
aHitRec.pOut=pMacroWin;
pMacroObj->PaintMacro(*pMacroWin,Rectangle(),aHitRec);
- bMacroDown=sal_True;
+ bMacroDown=true;
}
}
@@ -1793,7 +1793,7 @@ sal_Bool SdrObjEditView::EndMacroObj()
aHitRec.nTol=nMacroTol;
aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers();
aHitRec.pPageView=pMacroPV;
- aHitRec.bDown=sal_True;
+ aHitRec.bDown=true;
aHitRec.pOut=pMacroWin;
bool bRet=pMacroObj->DoMacro(aHitRec);
pMacroObj=NULL;
diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index 5c484bc0887d..34c88c71fb63 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -345,7 +345,7 @@ sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut
if (!bBack) nNum--;
const SdrGluePoint* pGP=GetObject(nNum);
if (bNext) {
- if (pGP->GetId()==nId0) bNext=sal_False;
+ if (pGP->GetId()==nId0) bNext=false;
} else {
if (pGP->IsHit(rPnt,rOut,pObj)) nRet=nNum;
}
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index a461882394ed..039318f61ba2 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -1363,7 +1363,7 @@ void SdrHdlBezWgt::CreateB2dIAObject()
if(pNewOverlayObject)
{
// line part is not hittable
- pNewOverlayObject->setHittable(sal_False);
+ pNewOverlayObject->setHittable(false);
// color(?)
pNewOverlayObject->setBaseColor(Color(COL_LIGHTBLUE));
diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx
index 31d0f9e6bbec..5806a7da4d38 100644
--- a/svx/source/svdraw/svdhlpln.cxx
+++ b/svx/source/svdraw/svdhlpln.cxx
@@ -52,7 +52,7 @@ bool SdrHelpLine::IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevic
}
} break;
} // switch
- return sal_False;
+ return false;
}
Rectangle SdrHelpLine::GetBoundRect(const OutputDevice& rOut) const
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index ce24f747514f..8b3364ae340f 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -230,13 +230,13 @@ void _SdrItemBrowserControl::ImpCtor()
nLastWhich = 0;
nLastWhichOben = 0; // not implemented yet
nLastWhichUnten = 0; // not implemented yet
- bWhichesButNames = sal_False;
- bDontHideIneffectiveItems = sal_False;
- bDontSortItems = sal_False;
- bShowWhichIds = sal_False;
- bShowRealValues = sal_False;
- bShowWhichIds = sal_True; // not implemented yet
- bShowRealValues = sal_True; // not implemented yet
+ bWhichesButNames = false;
+ bDontHideIneffectiveItems = false;
+ bDontSortItems = false;
+ bShowWhichIds = false;
+ bShowRealValues = false;
+ bShowWhichIds = true; // not implemented yet
+ bShowRealValues = true; // not implemented yet
InsertDataColumn(
ITEMBROWSER_WHICHCOL_ID,
@@ -595,7 +595,7 @@ bool ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& r
bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIndent)
{
rIndent=0;
- if (pSet==NULL) return sal_False;
+ if (pSet==NULL) return false;
const SfxPoolItem* pItem=NULL;
bool bRet = false;
switch (nWhich) {
@@ -612,21 +612,21 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
rIndent=1;
if (ImpGetItem(*pSet,XATTR_LINESTYLE,pItem)) {
XLineStyle eLineStyle=((const XLineStyleItem*)pItem)->GetValue();
- if (eLineStyle==XLINE_NONE) return sal_True;
- if (eLineStyle!=XLINE_DASH && nWhich==XATTR_LINEDASH) return sal_True;
+ if (eLineStyle==XLINE_NONE) return true;
+ if (eLineStyle!=XLINE_DASH && nWhich==XATTR_LINEDASH) return true;
}
if (nWhich==XATTR_LINESTART || nWhich==XATTR_LINESTARTCENTER) {
rIndent=2;
if (ImpGetItem(*pSet,XATTR_LINESTARTWIDTH,pItem)) {
sal_Int32 nWdt=((const XLineStartWidthItem*)pItem)->GetValue();
- if (nWdt==0) return sal_True;
+ if (nWdt==0) return true;
}
}
if (nWhich==XATTR_LINEEND || nWhich==XATTR_LINEENDCENTER) {
rIndent=2;
if (ImpGetItem(*pSet,XATTR_LINEENDWIDTH,pItem)) {
sal_Int32 nWdt=((const XLineEndWidthItem*)pItem)->GetValue();
- if (nWdt==0) return sal_True;
+ if (nWdt==0) return true;
}
}
} break;
@@ -640,11 +640,11 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
rIndent=1;
if (ImpGetItem(*pSet,XATTR_FILLSTYLE,pItem)) {
XFillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue();
- if (eFillStyle==XFILL_NONE) return sal_True;
+ if (eFillStyle==XFILL_NONE) return true;
// transparency currently only for SolidFill
- if (eFillStyle!=XFILL_SOLID && (nWhich==XATTR_FILLCOLOR || nWhich==XATTR_FILLTRANSPARENCE)) return sal_True;
- if (eFillStyle!=XFILL_GRADIENT && (nWhich==XATTR_FILLGRADIENT || nWhich==XATTR_GRADIENTSTEPCOUNT)) return sal_True;
- if (eFillStyle!=XFILL_HATCH && (nWhich==XATTR_FILLHATCH || nWhich==XATTR_FILLBACKGROUND)) return sal_True;
+ if (eFillStyle!=XFILL_SOLID && (nWhich==XATTR_FILLCOLOR || nWhich==XATTR_FILLTRANSPARENCE)) return true;
+ if (eFillStyle!=XFILL_GRADIENT && (nWhich==XATTR_FILLGRADIENT || nWhich==XATTR_GRADIENTSTEPCOUNT)) return true;
+ if (eFillStyle!=XFILL_HATCH && (nWhich==XATTR_FILLHATCH || nWhich==XATTR_FILLBACKGROUND)) return true;
}
} break;
case XATTR_FILLBITMAP :
@@ -661,10 +661,10 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
rIndent=1;
if (ImpGetItem(*pSet,XATTR_FILLSTYLE,pItem)) {
XFillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue();
- if (eFillStyle!=XFILL_BITMAP) return sal_True;
+ if (eFillStyle!=XFILL_BITMAP) return true;
}
if (nWhich==XATTR_FILLBITMAP || nWhich==XATTR_FILLBMP_TILE) {
- return sal_False; // always selectable
+ return false; // always selectable
}
bool bTileTRUE = false;
bool bTileFALSE = false;
@@ -692,7 +692,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
}
// another 2 items specially for Tile -- however, these exclude each other
if (nWhich==XATTR_FILLBMP_TILEOFFSETX || nWhich==XATTR_FILLBMP_TILEOFFSETY) {
- if (bTileFALSE) return sal_True;
+ if (bTileFALSE) return true;
sal_uInt16 nX=0,nY=0;
bool bX = false,bY = false;
if (ImpGetItem(*pSet,XATTR_FILLBMP_TILEOFFSETX,pItem)) {
@@ -704,11 +704,11 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
bY = true;
}
if (nWhich==XATTR_FILLBMP_TILEOFFSETX) {
- if (nX!=0 || !bX) return sal_False;
- if (nY!=0) return sal_True;
+ if (nX!=0 || !bX) return false;
+ if (nY!=0) return true;
} else {
- if (nY!=0 || !bY) return sal_False;
- if (nX!=0) return sal_True;
+ if (nY!=0 || !bY) return false;
+ if (nX!=0) return true;
}
}
// SizeLog not selectable if Stretch=TRUE and/or
@@ -716,7 +716,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
// -> apparently still in use
// (sal_True is the static PoolDefault)
if (nWhich==XATTR_FILLBMP_SIZELOG) {
- if (bTileFALSE && bStretchTRUE) return sal_True;
+ if (bTileFALSE && bStretchTRUE) return true;
}
} break;
@@ -734,13 +734,13 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
rIndent=1;
if (ImpGetItem(*pSet,XATTR_FORMTXTSTYLE,pItem)) {
XFormTextStyle eStyle=((const XFormTextStyleItem*)pItem)->GetValue();
- if (eStyle==XFT_NONE) return sal_True;
+ if (eStyle==XFT_NONE) return true;
}
if ((nWhich>=XATTR_FORMTXTSHDWCOLOR && nWhich<=XATTR_FORMTXTSHDWYVAL) || nWhich>=XATTR_FORMTXTSHDWTRANSP) {
rIndent=2;
if (ImpGetItem(*pSet,XATTR_FORMTXTSHADOW,pItem)) {
XFormTextShadow eShadow=((const XFormTextShadowItem*)pItem)->GetValue();
- if (eShadow==XFTSHADOW_NONE) return sal_True;
+ if (eShadow==XFTSHADOW_NONE) return true;
}
}
} break;
@@ -754,7 +754,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_SHADOW,pItem)) {
bool bShadow=((const SdrShadowItem*)pItem)->GetValue();
- if (!bShadow) return sal_True;
+ if (!bShadow) return true;
}
} break;
@@ -762,7 +762,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_CAPTIONFIXEDANGLE,pItem)) {
bool bFixed=((const SdrCaptionFixedAngleItem*)pItem)->GetValue();
- if (!bFixed) return sal_True;
+ if (!bFixed) return true;
}
} break;
case SDRATTR_CAPTIONESCREL:
@@ -770,15 +770,15 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_CAPTIONESCISREL,pItem)) {
bool bRel=((const SdrCaptionEscIsRelItem*)pItem)->GetValue();
- if (bRel && nWhich==SDRATTR_CAPTIONESCABS) return sal_True;
- if (!bRel && nWhich==SDRATTR_CAPTIONESCREL) return sal_True;
+ if (bRel && nWhich==SDRATTR_CAPTIONESCABS) return true;
+ if (!bRel && nWhich==SDRATTR_CAPTIONESCREL) return true;
}
} break;
case SDRATTR_CAPTIONLINELEN: {
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_CAPTIONFITLINELEN,pItem)) {
bool bFit=((const SdrCaptionFitLineLenItem*)pItem)->GetValue();
- if (bFit) return sal_True;
+ if (bFit) return true;
}
} break;
@@ -787,7 +787,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_TEXT_AUTOGROWHEIGHT,pItem)) {
bool bAutoGrow=((const SdrTextAutoGrowHeightItem*)pItem)->GetValue();
- if (!bAutoGrow) return sal_True;
+ if (!bAutoGrow) return true;
}
} break;
case SDRATTR_TEXT_MINFRAMEWIDTH:
@@ -795,14 +795,14 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_TEXT_AUTOGROWWIDTH,pItem)) {
bool bAutoGrow=((const SdrTextAutoGrowWidthItem*)pItem)->GetValue();
- if (!bAutoGrow) return sal_True;
+ if (!bAutoGrow) return true;
}
} break;
case SDRATTR_TEXT_VERTADJUST:
case SDRATTR_TEXT_HORZADJUST: {
if (ImpGetItem(*pSet,SDRATTR_TEXT_FITTOSIZE,pItem)) {
SdrFitToSizeType eFit=((const SdrTextFitToSizeTypeItem*)pItem)->GetValue();
- if (eFit!=SDRTEXTFIT_NONE) return sal_True;
+ if (eFit!=SDRTEXTFIT_NONE) return true;
}
} break;
@@ -815,30 +815,30 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_TEXT_ANIKIND,pItem)) {
SdrTextAniKind eAniKind=((const SdrTextAniKindItem*)pItem)->GetValue();
- if (eAniKind==SDRTEXTANI_NONE) return sal_True;
- if (eAniKind==SDRTEXTANI_BLINK && (nWhich==SDRATTR_TEXT_ANIDIRECTION || nWhich==SDRATTR_TEXT_ANIAMOUNT)) return sal_True;
- if (eAniKind==SDRTEXTANI_SLIDE && (nWhich==SDRATTR_TEXT_ANISTARTINSIDE || nWhich==SDRATTR_TEXT_ANISTOPINSIDE)) return sal_True;
+ if (eAniKind==SDRTEXTANI_NONE) return true;
+ if (eAniKind==SDRTEXTANI_BLINK && (nWhich==SDRATTR_TEXT_ANIDIRECTION || nWhich==SDRATTR_TEXT_ANIAMOUNT)) return true;
+ if (eAniKind==SDRTEXTANI_SLIDE && (nWhich==SDRATTR_TEXT_ANISTARTINSIDE || nWhich==SDRATTR_TEXT_ANISTOPINSIDE)) return true;
}
} break;
- case SDRATTR_EDGELINEDELTAANZ: return sal_True;
+ case SDRATTR_EDGELINEDELTAANZ: return true;
case SDRATTR_EDGELINE1DELTA:
case SDRATTR_EDGELINE2DELTA:
case SDRATTR_EDGELINE3DELTA: {
if (ImpGetItem(*pSet,SDRATTR_EDGEKIND,pItem)) {
SdrEdgeKind eKind=((const SdrEdgeKindItem*)pItem)->GetValue();
if (eKind==SDREDGE_THREELINES) {
- if (nWhich>SDRATTR_EDGELINE2DELTA) return sal_True;
- else return sal_False;
+ if (nWhich>SDRATTR_EDGELINE2DELTA) return true;
+ else return false;
}
- if (eKind!=SDREDGE_ORTHOLINES && eKind!=SDREDGE_BEZIER) return sal_True;
+ if (eKind!=SDREDGE_ORTHOLINES && eKind!=SDREDGE_BEZIER) return true;
}
if (ImpGetItem(*pSet,SDRATTR_EDGELINEDELTAANZ,pItem)) {
sal_uInt16 nAnz=((const SdrEdgeLineDeltaAnzItem*)pItem)->GetValue();
- if (nAnz==0) return sal_True;
- if (nAnz==1 && nWhich>SDRATTR_EDGELINE1DELTA) return sal_True;
- if (nAnz==2 && nWhich>SDRATTR_EDGELINE2DELTA) return sal_True;
- if (nAnz==3 && nWhich>SDRATTR_EDGELINE3DELTA) return sal_True;
+ if (nAnz==0) return true;
+ if (nAnz==1 && nWhich>SDRATTR_EDGELINE1DELTA) return true;
+ if (nAnz==2 && nWhich>SDRATTR_EDGELINE2DELTA) return true;
+ if (nAnz==3 && nWhich>SDRATTR_EDGELINE3DELTA) return true;
}
} break;
@@ -847,7 +847,7 @@ bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rI
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_CIRCKIND,pItem)) {
SdrCircKind eKind=((const SdrCircKindItem*)pItem)->GetValue();
- if (eKind==SDRCIRC_FULL) return sal_True;
+ if (eKind==SDRCIRC_FULL) return true;
}
} break;
} // switch
@@ -1070,7 +1070,7 @@ void _SdrItemBrowserWindow::GetFocus()
SdrItemBrowser::SdrItemBrowser(SdrView& rView):
_SdrItemBrowserWindow(ImpGetViewWin(rView)),
pView(&rView),
- bDirty(sal_False)
+ bDirty(false)
{
aIdleTimer.SetTimeoutHdl(LINK(this,SdrItemBrowser,IdleHdl));
GetBrowserControl().SetEntryChangedHdl(LINK(this,SdrItemBrowser,ChangedHdl));
@@ -1113,7 +1113,7 @@ void SdrItemBrowser::SetDirty()
void SdrItemBrowser::Undirty()
{
aIdleTimer.Stop();
- bDirty = sal_False;
+ bDirty = false;
SfxItemSet aSet(pView->GetModel()->GetItemPool());
pView->GetAttributes(aSet);
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 350c15b60568..e8f3fdc45e28 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -190,7 +190,7 @@ bool SdrLayerAdmin::operator==(const SdrLayerAdmin& rCmpLayerAdmin) const
{
if (pParent!=rCmpLayerAdmin.pParent ||
aLayer.size()!=rCmpLayerAdmin.aLayer.size())
- return sal_False;
+ return false;
bool bOk = true;
sal_uInt16 nAnz=GetLayerCount();
sal_uInt16 i=0;
@@ -291,7 +291,7 @@ const SdrLayer* SdrLayerAdmin::GetLayer(const OUString& rName, bool /*bInherited
if(!pLay && pParent)
{
- pLay = pParent->GetLayer(rName, sal_True);
+ pLay = pParent->GetLayer(rName, true);
}
return pLay;
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 33f93082dfbd..5b23f25cbf29 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -888,12 +888,12 @@ namespace sdr
{
SdrMark aM(pEdge, maMarkedObjectList.GetMark(a)->GetPageView());
- if(pEdge->GetConnectedNode(sal_True) == pCandidate)
+ if(pEdge->GetConnectedNode(true) == pCandidate)
{
aM.SetCon1(sal_True);
}
- if(pEdge->GetConnectedNode(sal_False) == pCandidate)
+ if(pEdge->GetConnectedNode(false) == pCandidate)
{
aM.SetCon2(sal_True);
}
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index e9add1a42e34..a42559affae2 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -113,10 +113,10 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
eUIUnit=FUNIT_MM;
aUIScale=Fraction(1,1);
nUIUnitKomma=0;
- bUIOnlyKomma=sal_False;
+ bUIOnlyKomma=false;
pLayerAdmin=NULL;
pItemPool=pPool;
- bMyPool=sal_False;
+ bMyPool=false;
m_pEmbeddedHelper=_pEmbeddedHelper;
pDrawOutliner=NULL;
pHitTestOutliner=NULL;
@@ -135,33 +135,33 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
mbUndoEnabled=true;
nProgressPercent=0;
nLoadVersion=0;
- bExtColorTable=sal_False;
- mbChanged = sal_False;
- bInfoChanged=sal_False;
- bPagNumsDirty=sal_False;
- bMPgNumsDirty=sal_False;
- bPageNotValid=sal_False;
- bSavePortable=sal_False;
- bSaveCompressed=sal_False;
- bSaveNative=sal_False;
- bSwapGraphics=sal_False;
+ bExtColorTable=false;
+ mbChanged = false;
+ bInfoChanged=false;
+ bPagNumsDirty=false;
+ bMPgNumsDirty=false;
+ bPageNotValid=false;
+ bSavePortable=false;
+ bSaveCompressed=false;
+ bSaveNative=false;
+ bSwapGraphics=false;
nSwapGraphicsMode=SDR_SWAPGRAPHICSMODE_DEFAULT;
- bSaveOLEPreview=sal_False;
- bPasteResize=sal_False;
- bNoBitmapCaching=sal_False;
- bReadOnly=sal_False;
+ bSaveOLEPreview=false;
+ bPasteResize=false;
+ bNoBitmapCaching=false;
+ bReadOnly=false;
nStreamCompressMode=COMPRESSMODE_NONE;
nStreamNumberFormat=NUMBERFORMAT_INT_BIGENDIAN;
nDefaultTabulator=0;
mpNumberFormatter = NULL;
- bTransparentTextFrames=sal_False;
- bStarDrawPreviewMode = sal_False;
+ bTransparentTextFrames=false;
+ bStarDrawPreviewMode = false;
nStarDrawPreviewMasterPageNum = SDRPAGE_NOTFOUND;
mpForbiddenCharactersTable = NULL;
mbModelLocked = false;
mpOutlinerCache = NULL;
- mbKernAsianPunctuation = sal_False;
- mbAddExtLeading = sal_False;
+ mbKernAsianPunctuation = false;
+ mbAddExtLeading = false;
mnHandoutPageCount = 0;
mbDisableTextEditUsesCommonUndoManager = false;
@@ -183,7 +183,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
// OutlinerPool as SecondaryPool of SdrPool
pItemPool->SetSecondaryPool(pOutlPool);
// remember that I created both pools myself
- bMyPool=sal_True;
+ bMyPool=true;
}
pItemPool->SetDefaultMetric((SfxMapUnit)eObjUnit);
@@ -340,7 +340,7 @@ void SdrModel::operator=(const SdrModel&)
bool SdrModel::operator==(const SdrModel&) const
{
OSL_FAIL("SdrModel::operator==() is not yet implemented");
- return sal_False;
+ return false;
}
void SdrModel::SetSwapGraphics( bool bSwap )
@@ -1402,7 +1402,7 @@ void SdrModel::RecalcPageNums(bool bMaster)
SdrPage* pPg=maMaPag[i];
pPg->SetPageNum(i);
}
- bMPgNumsDirty=sal_False;
+ bMPgNumsDirty=false;
}
else
{
@@ -1412,7 +1412,7 @@ void SdrModel::RecalcPageNums(bool bMaster)
SdrPage* pPg=maPages[i];
pPg->SetPageNum(i);
}
- bPagNumsDirty=sal_False;
+ bPagNumsDirty=false;
}
}
@@ -1422,10 +1422,10 @@ void SdrModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
if (nPos>nAnz) nPos=nAnz;
maPages.insert(maPages.begin()+nPos,pPage);
PageListChanged();
- pPage->SetInserted(sal_True);
+ pPage->SetInserted(true);
pPage->SetPageNum(nPos);
pPage->SetModel(this);
- if (nPos<nAnz) bPagNumsDirty=sal_True;
+ if (nPos<nAnz) bPagNumsDirty=true;
SetChanged();
SdrHint aHint(HINT_PAGEORDERCHG);
aHint.SetPage(pPage);
@@ -1444,9 +1444,9 @@ SdrPage* SdrModel::RemovePage(sal_uInt16 nPgNum)
maPages.erase(maPages.begin()+nPgNum);
PageListChanged();
if (pPg!=NULL) {
- pPg->SetInserted(sal_False);
+ pPg->SetInserted(false);
}
- bPagNumsDirty=sal_True;
+ bPagNumsDirty=true;
SetChanged();
SdrHint aHint(HINT_PAGEORDERCHG);
aHint.SetPage(pPg);
@@ -1460,7 +1460,7 @@ void SdrModel::MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos)
if (pPg!=NULL) {
maPages.erase(maPages.begin()+nPgNum); // shortcut to avoid two broadcasts
PageListChanged();
- pPg->SetInserted(sal_False);
+ pPg->SetInserted(false);
InsertPage(pPg,nNewPos);
}
else
@@ -1473,11 +1473,11 @@ void SdrModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos)
if (nPos>nAnz) nPos=nAnz;
maMaPag.insert(maMaPag.begin()+nPos,pPage);
MasterPageListChanged();
- pPage->SetInserted(sal_True);
+ pPage->SetInserted(true);
pPage->SetPageNum(nPos);
pPage->SetModel(this);
if (nPos<nAnz) {
- bMPgNumsDirty=sal_True;
+ bMPgNumsDirty=true;
}
SetChanged();
SdrHint aHint(HINT_PAGEORDERCHG);
@@ -1507,10 +1507,10 @@ SdrPage* SdrModel::RemoveMasterPage(sal_uInt16 nPgNum)
GetPage(np)->TRG_ImpMasterPageRemoved(*pRetPg);
}
- pRetPg->SetInserted(sal_False);
+ pRetPg->SetInserted(false);
}
- bMPgNumsDirty=sal_True;
+ bMPgNumsDirty=true;
SetChanged();
SdrHint aHint(HINT_PAGEORDERCHG);
aHint.SetPage(pRetPg);
@@ -1524,11 +1524,11 @@ void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos)
maMaPag.erase(maMaPag.begin()+nPgNum);
MasterPageListChanged();
if (pPg!=NULL) {
- pPg->SetInserted(sal_False);
+ pPg->SetInserted(false);
maMaPag.insert(maMaPag.begin()+nNewPos,pPg);
MasterPageListChanged();
}
- bMPgNumsDirty=sal_True;
+ bMPgNumsDirty=true;
SetChanged();
SdrHint aHint(HINT_PAGEORDERCHG);
aHint.SetPage(pPg);
@@ -1698,9 +1698,9 @@ void SdrModel::Merge(SdrModel& rSourceModel,
// inconsistent until all are in.
maMaPag.insert(maMaPag.begin()+nDstMasterPageAnz, pPg);
MasterPageListChanged();
- pPg->SetInserted(sal_True);
+ pPg->SetInserted(true);
pPg->SetModel(this);
- bMPgNumsDirty=sal_True;
+ bMPgNumsDirty=true;
if (bUndo) AddUndo(GetSdrUndoFactory().CreateUndoNewPage(*pPg));
} else {
OSL_FAIL("SdrModel::Merge(): MasterPage not found in SourceModel.");
@@ -1771,8 +1771,8 @@ void SdrModel::Merge(SdrModel& rSourceModel,
delete [] pMasterMap;
delete [] pMasterNeed;
- bMPgNumsDirty=sal_True;
- bPagNumsDirty=sal_True;
+ bMPgNumsDirty=true;
+ bPagNumsDirty=true;
SetChanged();
// TODO: Missing: merging and mapping of layers
@@ -1785,7 +1785,7 @@ void SdrModel::SetStarDrawPreviewMode(sal_Bool bPreview)
if (!bPreview && bStarDrawPreviewMode && GetPageCount())
{
// Resetting is not allowed, because the Model might not be loaded completely
- DBG_ASSERT(sal_False,"SdrModel::SetStarDrawPreviewMode(): Resetting not allowed, because Model might not be complete.");
+ DBG_ASSERT(false,"SdrModel::SetStarDrawPreviewMode(): Resetting not allowed, because Model might not be complete.");
}
else
{
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 46433c12d9f6..5a239d97392b 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -126,23 +126,23 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition
void SdrMarkView::ImpClearVars()
{
eDragMode=SDRDRAG_MOVE;
- bRefHdlShownOnly=sal_False;
+ bRefHdlShownOnly=false;
eEditMode=SDREDITMODE_EDIT;
eEditMode0=SDREDITMODE_EDIT;
- bDesignMode=sal_False;
+ bDesignMode=false;
pMarkedObj=NULL;
pMarkedPV=NULL;
- bForceFrameHandles=sal_False;
- bPlusHdlAlways=sal_False;
+ bForceFrameHandles=false;
+ bPlusHdlAlways=false;
nFrameHandlesLimit=50;
- bInsPolyPoint=sal_False;
+ bInsPolyPoint=false;
mnInsPointNum = 0L;
- bMarkedObjRectDirty=sal_False;
- bMarkedPointsRectsDirty=sal_False;
+ bMarkedObjRectDirty=false;
+ bMarkedPointsRectsDirty=false;
mbMarkHandlesHidden = false;
- bMrkPntDirty=sal_False;
- bMarkHdlWhenTextEdit=sal_False;
- bMarkableObjCountDirty=sal_False; // not yet implemented
+ bMrkPntDirty=false;
+ bMarkHdlWhenTextEdit=false;
+ bMarkableObjCountDirty=false; // not yet implemented
nMarkableObjCount=0; // not yet implemented
// Migrate selections
@@ -181,8 +181,8 @@ void SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED)
{
- bMarkedObjRectDirty=sal_True;
- bMarkedPointsRectsDirty=sal_True;
+ bMarkedObjRectDirty=true;
+ bMarkedPointsRectsDirty=true;
}
}
SdrSnapView::Notify(rBC,rHint);
@@ -192,14 +192,14 @@ void SdrMarkView::ModelHasChanged()
{
SdrPaintView::ModelHasChanged();
GetMarkedObjectListWriteAccess().SetNameDirty();
- bMarkedObjRectDirty=sal_True;
- bMarkedPointsRectsDirty=sal_True;
+ bMarkedObjRectDirty=true;
+ bMarkedPointsRectsDirty=true;
// Example: Obj is selected and maMarkedObjectList is sorted.
// In another View 2, the ObjOrder is changed (e. g. MovToTop())
// Then we need to re-sort MarkList.
GetMarkedObjectListWriteAccess().SetUnsorted();
SortMarkedObjects();
- bMrkPntDirty=sal_True;
+ bMrkPntDirty=true;
UndirtyMrkPnt();
SdrView* pV=(SdrView*)this;
if (pV!=NULL && !pV->IsDragObj() && !pV->IsInsObjPoint()) {
@@ -1232,7 +1232,7 @@ void SdrMarkView::CheckMarked()
// at least reset the remembered BoundRect to prevent handle
// generation if bForceFrameHandles is TRUE.
- bMarkedObjRectDirty = sal_True;
+ bMarkedObjRectDirty = true;
}
void SdrMarkView::SetMarkRects()
@@ -1972,7 +1972,7 @@ Point SdrMarkView::GetGridOffset() const
const Rectangle& SdrMarkView::GetMarkedObjRect() const
{
if (bMarkedObjRectDirty) {
- ((SdrMarkView*)this)->bMarkedObjRectDirty=sal_False;
+ ((SdrMarkView*)this)->bMarkedObjRectDirty=false;
Rectangle aRect;
Rectangle aRect2;
for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) {
@@ -2058,8 +2058,8 @@ void SdrMarkView::MarkListHasChanged()
GetMarkedObjectListWriteAccess().SetNameDirty();
SetEdgesOfMarkedNodesDirty();
- bMarkedObjRectDirty=sal_True;
- bMarkedPointsRectsDirty=sal_True;
+ bMarkedObjRectDirty=true;
+ bMarkedPointsRectsDirty=true;
#ifdef DBG_UTIL
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
#endif
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index ba06592f5e05..cff986f89f18 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -309,7 +309,7 @@ void SdrMarkView::ImpSetPointsRects() const
}
((SdrMarkView*)this)->aMarkedPointsRect=aPnts;
((SdrMarkView*)this)->aMarkedGluePointsRect=aGlue;
- ((SdrMarkView*)this)->bMarkedPointsRectsDirty=sal_False;
+ ((SdrMarkView*)this)->bMarkedPointsRectsDirty=false;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -375,8 +375,8 @@ void SdrMarkView::UndirtyMrkPnt() const
}
}
}
- if (bChg) ((SdrMarkView*)this)->bMarkedPointsRectsDirty=sal_True;
- ((SdrMarkView*)this)->bMrkPntDirty=sal_False;
+ if (bChg) ((SdrMarkView*)this)->bMarkedPointsRectsDirty=true;
+ ((SdrMarkView*)this)->bMrkPntDirty=false;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 8d615876dbe8..2bc7f5d55a3b 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1358,17 +1358,17 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
rInfo.bResizeFreeAllowed=fObjectRotation == 0.0;
- rInfo.bResizePropAllowed=sal_True;
- rInfo.bRotateFreeAllowed=sal_True;
- rInfo.bRotate90Allowed =sal_True;
- rInfo.bMirrorFreeAllowed=sal_True;
- rInfo.bMirror45Allowed =sal_True;
- rInfo.bMirror90Allowed =sal_True;
- rInfo.bTransparenceAllowed = sal_False;
- rInfo.bGradientAllowed = sal_False;
- rInfo.bShearAllowed =sal_True;
- rInfo.bEdgeRadiusAllowed=sal_False;
- rInfo.bNoContortion =sal_True;
+ rInfo.bResizePropAllowed=true;
+ rInfo.bRotateFreeAllowed=true;
+ rInfo.bRotate90Allowed =true;
+ rInfo.bMirrorFreeAllowed=true;
+ rInfo.bMirror45Allowed =true;
+ rInfo.bMirror90Allowed =true;
+ rInfo.bTransparenceAllowed = false;
+ rInfo.bGradientAllowed = false;
+ rInfo.bShearAllowed =true;
+ rInfo.bEdgeRadiusAllowed=false;
+ rInfo.bNoContortion =true;
// #i37011#
if ( mXRenderedCustomShape.is() )
@@ -1741,7 +1741,7 @@ SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const
if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
aPt-=GetSnapRect().Center();
SdrGluePoint aGP(aPt);
- aGP.SetPercent(sal_False);
+ aGP.SetPercent(false);
return aGP;
}
@@ -1773,7 +1773,7 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
for(a = 0; a < pSource->GetCount(); a++)
{
SdrGluePoint aCopy((*pSource)[a]);
- aCopy.SetUserDefined(sal_False);
+ aCopy.SetUserDefined(false);
aNewList.Insert(aCopy);
}
@@ -1790,7 +1790,7 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
{
sal_uInt16 nPointCount=aPoly.GetSize();
for (sal_uInt16 i=0; i<nPointCount; i++)
- ShearPoint(aPoly[i],aRect.Center(), fTan, sal_False );
+ ShearPoint(aPoly[i],aRect.Center(), fTan, false );
}
if ( aGeo.nDrehWink )
aPoly.Rotate( aRect.Center(), aGeo.nDrehWink / 10 );
@@ -2173,7 +2173,7 @@ void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat )
}
SetBoundRectDirty();
- bSnapRectDirty=sal_True;
+ bSnapRectDirty=true;
}
bool SdrObjCustomShape::BegCreate( SdrDragStat& rDrag )
@@ -2190,7 +2190,7 @@ bool SdrObjCustomShape::MovCreate(SdrDragStat& rStat)
}
DragCreateObject( rStat );
SetRectsDirty();
- return sal_True;
+ return true;
}
bool SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd )
@@ -2402,9 +2402,9 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt,
long nWdtGrow = nWdt-(rR.Right()-rR.Left());
long nHgtGrow = nHgt-(rR.Bottom()-rR.Top());
if ( nWdtGrow == 0 )
- bWdtGrow = sal_False;
+ bWdtGrow = false;
if ( nHgtGrow == 0 )
- bHgtGrow=sal_False;
+ bHgtGrow=false;
if ( bWdtGrow || bHgtGrow )
{
if ( bWdtGrow )
@@ -2444,11 +2444,11 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt,
aD2-=aD1;
rR.Move(aD2.X(),aD2.Y());
}
- return sal_True;
+ return true;
}
}
}
- return sal_False;
+ return false;
}
Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const bool bHgt, const bool bWdt )
@@ -3034,7 +3034,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix,
// back the mirroring of the shear angle
aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0);
aGeoStat.RecalcTan();
- Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, sal_False);
+ Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, false);
}
// rotation?
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index 8e56d5b624af..d02856bbd9cd 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -78,15 +78,15 @@ public:
ImpCaptParams()
{
eType =SDRCAPT_TYPE3;
- bFixedAngle=sal_False;
+ bFixedAngle=false;
nAngle =4500;
nGap =0;
eEscDir =SDRCAPT_ESCHORIZONTAL;
- bEscRel =sal_True;
+ bEscRel =true;
nEscRel =5000;
nEscAbs =0;
nLineLen =0;
- bFitLineLen=sal_True;
+ bFitLineLen=true;
}
void CalcEscPos(const Point& rTail, const Rectangle& rRect, Point& rPt, EscDir& rDir) const;
};
@@ -214,19 +214,19 @@ SdrCaptionObj::~SdrCaptionObj()
void SdrCaptionObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bRotateFreeAllowed=sal_False;
- rInfo.bRotate90Allowed =sal_False;
- rInfo.bMirrorFreeAllowed=sal_False;
- rInfo.bMirror45Allowed =sal_False;
- rInfo.bMirror90Allowed =sal_False;
- rInfo.bTransparenceAllowed = sal_False;
- rInfo.bGradientAllowed = sal_False;
- rInfo.bShearAllowed =sal_False;
- rInfo.bEdgeRadiusAllowed=sal_False;
- rInfo.bCanConvToPath =sal_True;
- rInfo.bCanConvToPoly =sal_True;
- rInfo.bCanConvToPathLineToArea=sal_False;
- rInfo.bCanConvToPolyLineToArea=sal_False;
+ rInfo.bRotateFreeAllowed=false;
+ rInfo.bRotate90Allowed =false;
+ rInfo.bMirrorFreeAllowed=false;
+ rInfo.bMirror45Allowed =false;
+ rInfo.bMirror90Allowed =false;
+ rInfo.bTransparenceAllowed = false;
+ rInfo.bGradientAllowed = false;
+ rInfo.bShearAllowed =false;
+ rInfo.bEdgeRadiusAllowed=false;
+ rInfo.bCanConvToPath =true;
+ rInfo.bCanConvToPoly =true;
+ rInfo.bCanConvToPathLineToArea=false;
+ rInfo.bCanConvToPolyLineToArea=false;
rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
}
@@ -327,7 +327,7 @@ bool SdrCaptionObj::beginSpecialDrag(SdrDragStat& rDrag) const
if(!pHdl)
{
if (bMovProt)
- return 0;
+ return false;
rDrag.SetNoSnap(true);
rDrag.SetActionRect(aRect);
@@ -544,7 +544,7 @@ void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, Polygon& rPoly, Rect
bool SdrCaptionObj::BegCreate(SdrDragStat& rStat)
{
- if (aRect.IsEmpty()) return sal_False; // Create currently only works with the given Rect
+ if (aRect.IsEmpty()) return false; // Create currently only works with the given Rect
ImpCaptParams aPara;
ImpGetCaptParams(aPara);
@@ -552,7 +552,7 @@ bool SdrCaptionObj::BegCreate(SdrDragStat& rStat)
aTailPoly[0]=rStat.GetStart();
ImpCalcTail(aPara,aTailPoly,aRect);
rStat.SetActionRect(aRect);
- return sal_True;
+ return true;
}
bool SdrCaptionObj::MovCreate(SdrDragStat& rStat)
@@ -563,8 +563,8 @@ bool SdrCaptionObj::MovCreate(SdrDragStat& rStat)
ImpCalcTail(aPara,aTailPoly,aRect);
rStat.SetActionRect(aRect);
SetBoundRectDirty();
- bSnapRectDirty=sal_True;
- return sal_True;
+ bSnapRectDirty=true;
+ return true;
}
bool SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
@@ -579,7 +579,7 @@ bool SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
bool SdrCaptionObj::BckCreate(SdrDragStat& /*rStat*/)
{
- return sal_False;
+ return false;
}
void SdrCaptionObj::BrkCreate(SdrDragStat& /*rStat*/)
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index fa4108cb7844..d52714617bb1 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -143,7 +143,7 @@ SdrCircObj::~SdrCircObj()
void SdrCircObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
bool bCanConv=!HasText() || ImpCanConvTextToCurve();
- rInfo.bEdgeRadiusAllowed = sal_False;
+ rInfo.bEdgeRadiusAllowed = false;
rInfo.bCanConvToPath=bCanConv;
rInfo.bCanConvToPoly=bCanConv;
rInfo.bCanConvToContour = !IsFontwork() && (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
@@ -373,7 +373,7 @@ public:
nStart(0),
nEnd(0),
nWink(0),
- bRight(sal_False)
+ bRight(false)
{}
void SetCreateParams(SdrDragStat& rStat);
};
@@ -689,7 +689,7 @@ bool SdrCircObj::BegCreate(SdrDragStat& rStat)
rStat.SetActionRect(aRect1);
aRect = aRect1;
ImpSetCreateParams(rStat);
- return sal_True;
+ return true;
}
bool SdrCircObj::MovCreate(SdrDragStat& rStat)
@@ -702,7 +702,7 @@ bool SdrCircObj::MovCreate(SdrDragStat& rStat)
nStartWink=pU->nStart;
nEndWink=pU->nEnd;
SetBoundRectDirty();
- bSnapRectDirty=sal_True;
+ bSnapRectDirty=true;
SetXPolyDirty();
// #i103058# push current angle settings to ItemSet to
@@ -712,7 +712,7 @@ bool SdrCircObj::MovCreate(SdrDragStat& rStat)
ImpSetCircInfoToAttr();
}
- return sal_True;
+ return true;
}
bool SdrCircObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 9e0b0ccf71a7..d5c325bcce4b 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -60,12 +60,12 @@ void SdrObjConnection::ResetVars()
nConId=0;
nXDist=0;
nYDist=0;
- bBestConn=sal_True;
- bBestVertex=sal_True;
- bXDistOvr=sal_False;
- bYDistOvr=sal_False;
- bAutoVertex=sal_False;
- bAutoCorner=sal_False;
+ bBestConn=true;
+ bBestVertex=true;
+ bXDistOvr=false;
+ bYDistOvr=false;
+ bAutoVertex=false;
+ bAutoCorner=false;
}
bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsPos) const
@@ -170,23 +170,23 @@ TYPEINIT1(SdrEdgeObj,SdrTextObj);
SdrEdgeObj::SdrEdgeObj()
: SdrTextObj(),
nNotifyingCount(0),
- bEdgeTrackDirty(sal_False),
- bEdgeTrackUserDefined(sal_False),
+ bEdgeTrackDirty(false),
+ bEdgeTrackUserDefined(false),
// Default is to allow default connects
- mbSuppressDefaultConnect(sal_False),
- mbBoundRectCalculationRunning(sal_False),
+ mbSuppressDefaultConnect(false),
+ mbBoundRectCalculationRunning(false),
mbSuppressed(false)
{
- bClosedObj=sal_False;
- bIsEdge=sal_True;
+ bClosedObj=false;
+ bIsEdge=true;
pEdgeTrack=new XPolygon;
}
SdrEdgeObj::~SdrEdgeObj()
{
- DisconnectFromNode(sal_True);
- DisconnectFromNode(sal_False);
+ DisconnectFromNode(true);
+ DisconnectFromNode(false);
delete pEdgeTrack;
}
@@ -361,10 +361,10 @@ void SdrEdgeObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
rInfo.bMirrorFreeAllowed = true;
rInfo.bMirror45Allowed = true;
rInfo.bMirror90Allowed = true;
- rInfo.bTransparenceAllowed = sal_False;
- rInfo.bGradientAllowed = sal_False;
+ rInfo.bTransparenceAllowed = false;
+ rInfo.bGradientAllowed = false;
rInfo.bShearAllowed = true;
- rInfo.bEdgeRadiusAllowed = sal_False;
+ rInfo.bEdgeRadiusAllowed = false;
bool bCanConv=!HasText() || ImpCanConvTextToCurve();
rInfo.bCanConvToPath=bCanConv;
rInfo.bCanConvToPoly=bCanConv;
@@ -418,8 +418,8 @@ SdrGluePoint SdrEdgeObj::GetVertexGluePoint(sal_uInt16 nNum) const
if (nPntAnz>0)
{
Point aOfs = GetSnapRect().Center();
- if (nNum==2 && GetConnectedNode(sal_True)==NULL) aPt=(*pEdgeTrack)[0];
- else if (nNum==3 && GetConnectedNode(sal_False)==NULL) aPt=(*pEdgeTrack)[nPntAnz-1];
+ if (nNum==2 && GetConnectedNode(true)==NULL) aPt=(*pEdgeTrack)[0];
+ else if (nNum==3 && GetConnectedNode(false)==NULL) aPt=(*pEdgeTrack)[nPntAnz-1];
else {
if ((nPntAnz & 1) ==1) {
aPt=(*pEdgeTrack)[nPntAnz/2];
@@ -435,7 +435,7 @@ SdrGluePoint SdrEdgeObj::GetVertexGluePoint(sal_uInt16 nNum) const
aPt-=aOfs;
}
SdrGluePoint aGP(aPt);
- aGP.SetPercent(sal_False);
+ aGP.SetPercent(false);
return aGP;
}
@@ -535,7 +535,7 @@ void SdrEdgeObj::ImpSetTailPoint(bool bTail1, const Point& rPt)
void SdrEdgeObj::ImpDirtyEdgeTrack()
{
if ( !bEdgeTrackUserDefined || !(GetModel() && GetModel()->isLocked()) )
- bEdgeTrackDirty = sal_True;
+ bEdgeTrackDirty = true;
}
void SdrEdgeObj::ImpUndirtyEdgeTrack()
@@ -583,20 +583,20 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
// To not run in a depth loop, use a coloring algorythm on
// SdrEdgeObj BoundRect calculations
- mbBoundRectCalculationRunning = sal_True;
+ mbBoundRectCalculationRunning = true;
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetCurrentBoundRect();
SetRectsDirty();
*pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo);
ImpSetEdgeInfoToAttr(); // copy values from aEdgeInfo into the pool
- bEdgeTrackDirty=sal_False;
+ bEdgeTrackDirty=false;
// Only redraw here, no object change
ActionChanged();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
- mbBoundRectCalculationRunning = sal_False;
+ mbBoundRectCalculationRunning = false;
}
}
@@ -778,22 +778,22 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
SdrEdgeInfoRec aBestInfo;
bool bAuto1=bCon1 && rCon1.bBestVertex;
bool bAuto2=bCon2 && rCon2.bBestVertex;
- if (bAuto1) rCon1.bAutoVertex=sal_True;
- if (bAuto2) rCon2.bAutoVertex=sal_True;
+ if (bAuto1) rCon1.bAutoVertex=true;
+ if (bAuto2) rCon2.bAutoVertex=true;
sal_uInt16 nBestAuto1=0;
sal_uInt16 nBestAuto2=0;
sal_uInt16 nAnz1=bAuto1 ? 4 : 1;
sal_uInt16 nAnz2=bAuto2 ? 4 : 1;
for (sal_uInt16 nNum1=0; nNum1<nAnz1; nNum1++) {
if (bAuto1) rCon1.nConId=nNum1;
- if (bCon1 && rCon1.TakeGluePoint(aGP1,sal_True)) {
+ if (bCon1 && rCon1.TakeGluePoint(aGP1,true)) {
aPt1=aGP1.GetPos();
nEsc1=aGP1.GetEscDir();
if (nEsc1==SDRESC_SMART) nEsc1=ImpCalcEscAngle(rCon1.pObj,aPt1-rCon1.aObjOfs);
}
for (sal_uInt16 nNum2=0; nNum2<nAnz2; nNum2++) {
if (bAuto2) rCon2.nConId=nNum2;
- if (bCon2 && rCon2.TakeGluePoint(aGP2,sal_True)) {
+ if (bCon2 && rCon2.TakeGluePoint(aGP2,true)) {
aPt2=aGP2.GetPos();
nEsc2=aGP2.GetEscDir();
if (nEsc2==SDRESC_SMART) nEsc2=ImpCalcEscAngle(rCon2.pObj,aPt2-rCon2.aObjOfs);
@@ -1582,7 +1582,7 @@ void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
}
if ( bObj1 || bObj2 )
{
- bEdgeTrackUserDefined = sal_False;
+ bEdgeTrackUserDefined = false;
}
SdrTextObj::Notify(rBC,rHint);
if (nNotifyingCount==0) { // a locking flag
@@ -1688,14 +1688,14 @@ void SdrEdgeObj::SetEdgeTrackPath( const basegfx::B2DPolyPolygon& rPoly )
{
if ( !rPoly.count() )
{
- bEdgeTrackDirty = sal_True;
- bEdgeTrackUserDefined = sal_False;
+ bEdgeTrackDirty = true;
+ bEdgeTrackUserDefined = false;
}
else
{
*pEdgeTrack = XPolygon( rPoly.getB2DPolygon( 0 ) );
- bEdgeTrackDirty = sal_False;
- bEdgeTrackUserDefined = sal_True;
+ bEdgeTrackDirty = false;
+ bEdgeTrackUserDefined = true;
// #i110629# also set aRect and maSnapeRect depending on pEdgeTrack
const Rectangle aPolygonBounds(pEdgeTrack->GetBoundRect());
@@ -1735,10 +1735,10 @@ sal_uInt32 SdrEdgeObj::GetHdlCount() const
}
else if (eKind==SDREDGE_THREELINES && nPntAnz == 4L)
{
- if(GetConnectedNode(sal_True))
+ if(GetConnectedNode(true))
nHdlAnz++;
- if(GetConnectedNode(sal_False))
+ if(GetConnectedNode(false))
nHdlAnz++;
}
}
@@ -1796,7 +1796,7 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const
}
} else if (eKind==SDREDGE_THREELINES) {
sal_uInt32 nNum(nHdlNum);
- if (GetConnectedNode(sal_True)==NULL) nNum++;
+ if (GetConnectedNode(true)==NULL) nNum++;
Point aPos((*pEdgeTrack)[(sal_uInt16)nNum-1]);
pHdl=new ImpEdgeHdl(aPos,HDL_POLY);
if (nNum==2) ((ImpEdgeHdl*)pHdl)->SetLineCode(OBJ1LINE2);
@@ -1926,7 +1926,7 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat)
// force recalculation of EdgeTrack
*pEdgeTrack = ImpCalcEdgeTrack(*pEdgeTrack, aCon1, aCon2, &aEdgeInfo);
- bEdgeTrackDirty=sal_False;
+ bEdgeTrackDirty=false;
// save EdgeInfos and mark object as user modified
ImpSetEdgeInfoToAttr();
@@ -2028,16 +2028,16 @@ basegfx::B2DPolygon SdrEdgeObj::ImplAddConnectorOverlay(SdrDragMethod& rDragMeth
bool SdrEdgeObj::BegCreate(SdrDragStat& rDragStat)
{
- rDragStat.SetNoSnap(sal_True);
+ rDragStat.SetNoSnap(true);
pEdgeTrack->SetPointCount(2);
(*pEdgeTrack)[0]=rDragStat.GetStart();
(*pEdgeTrack)[1]=rDragStat.GetNow();
if (rDragStat.GetPageView()!=NULL) {
ImpFindConnector(rDragStat.GetStart(),*rDragStat.GetPageView(),aCon1,this);
- ConnectToNode(sal_True,aCon1.pObj);
+ ConnectToNode(true,aCon1.pObj);
}
*pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo);
- return sal_True;
+ return true;
}
bool SdrEdgeObj::MovCreate(SdrDragStat& rDragStat)
@@ -2049,19 +2049,19 @@ bool SdrEdgeObj::MovCreate(SdrDragStat& rDragStat)
rDragStat.GetView()->SetConnectMarker(aCon2,*rDragStat.GetPageView());
}
SetBoundRectDirty();
- bSnapRectDirty=sal_True;
- ConnectToNode(sal_False,aCon2.pObj);
+ bSnapRectDirty=true;
+ ConnectToNode(false,aCon2.pObj);
*pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo);
- bEdgeTrackDirty=sal_False;
- return sal_True;
+ bEdgeTrackDirty=false;
+ return true;
}
bool SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd)
{
bool bOk=(eCmd==SDRCREATE_FORCEEND || rDragStat.GetPointAnz()>=2);
if (bOk) {
- ConnectToNode(sal_True,aCon1.pObj);
- ConnectToNode(sal_False,aCon2.pObj);
+ ConnectToNode(true,aCon1.pObj);
+ ConnectToNode(false,aCon2.pObj);
if (rDragStat.GetView()!=NULL) {
rDragStat.GetView()->HideConnectMarker();
}
@@ -2076,7 +2076,7 @@ bool SdrEdgeObj::BckCreate(SdrDragStat& rDragStat)
if (rDragStat.GetView()!=NULL) {
rDragStat.GetView()->HideConnectMarker();
}
- return sal_False;
+ return false;
}
void SdrEdgeObj::BrkCreate(SdrDragStat& rDragStat)
@@ -2102,7 +2102,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
{
rCon.ResetVars();
if (pOut==NULL) pOut=rPV.GetView().GetFirstOutputDevice();
- if (pOut==NULL) return sal_False;
+ if (pOut==NULL) return false;
SdrObjList* pOL=rPV.GetObjList();
const SetOfByte& rVisLayer=rPV.GetVisibleLayers();
// sensitive area of connectors is twice as large as the one of the handles
@@ -2190,7 +2190,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
aTestCon.nConId=nConNum;
aTestCon.bAutoCorner=bCorner;
aTestCon.bAutoVertex=bVertex;
- aTestCon.bBestConn=sal_False; // bCenter;
+ aTestCon.bBestConn=false; // bCenter;
aTestCon.bBestVertex=bCenter;
}
}
@@ -2205,7 +2205,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO
{
bFnd = true;
aTestCon.pObj=pObj;
- aTestCon.bBestConn=sal_True;
+ aTestCon.bBestConn=true;
}
}
if (bFnd) {
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 610f4d14a0df..6453cb9a6ef8 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -74,8 +74,8 @@ SdrObjGroup::SdrObjGroup()
pSub=new SdrObjList(NULL,NULL);
pSub->SetOwnerObj(this);
pSub->SetListKind(SDROBJLIST_GROUPOBJ);
- bRefPoint=sal_False;
- bClosedObj=sal_False;
+ bRefPoint=false;
+ bClosedObj=false;
}
@@ -86,51 +86,51 @@ SdrObjGroup::~SdrObjGroup()
void SdrObjGroup::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bNoContortion=sal_False;
+ rInfo.bNoContortion=false;
SdrObjList* pOL=pSub;
sal_uIntPtr nObjAnz=pOL->GetObjCount();
for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
SdrObjTransformInfoRec aInfo;
pObj->TakeObjInfo(aInfo);
- if (!aInfo.bMoveAllowed ) rInfo.bMoveAllowed =sal_False;
- if (!aInfo.bResizeFreeAllowed ) rInfo.bResizeFreeAllowed =sal_False;
- if (!aInfo.bResizePropAllowed ) rInfo.bResizePropAllowed =sal_False;
- if (!aInfo.bRotateFreeAllowed ) rInfo.bRotateFreeAllowed =sal_False;
- if (!aInfo.bRotate90Allowed ) rInfo.bRotate90Allowed =sal_False;
- if (!aInfo.bMirrorFreeAllowed ) rInfo.bMirrorFreeAllowed =sal_False;
- if (!aInfo.bMirror45Allowed ) rInfo.bMirror45Allowed =sal_False;
- if (!aInfo.bMirror90Allowed ) rInfo.bMirror90Allowed =sal_False;
- if (!aInfo.bShearAllowed ) rInfo.bShearAllowed =sal_False;
- if (!aInfo.bEdgeRadiusAllowed ) rInfo.bEdgeRadiusAllowed =sal_False;
- if (!aInfo.bNoOrthoDesired ) rInfo.bNoOrthoDesired =sal_False;
- if (aInfo.bNoContortion ) rInfo.bNoContortion =sal_True;
- if (!aInfo.bCanConvToPath ) rInfo.bCanConvToPath =sal_False;
+ if (!aInfo.bMoveAllowed ) rInfo.bMoveAllowed =false;
+ if (!aInfo.bResizeFreeAllowed ) rInfo.bResizeFreeAllowed =false;
+ if (!aInfo.bResizePropAllowed ) rInfo.bResizePropAllowed =false;
+ if (!aInfo.bRotateFreeAllowed ) rInfo.bRotateFreeAllowed =false;
+ if (!aInfo.bRotate90Allowed ) rInfo.bRotate90Allowed =false;
+ if (!aInfo.bMirrorFreeAllowed ) rInfo.bMirrorFreeAllowed =false;
+ if (!aInfo.bMirror45Allowed ) rInfo.bMirror45Allowed =false;
+ if (!aInfo.bMirror90Allowed ) rInfo.bMirror90Allowed =false;
+ if (!aInfo.bShearAllowed ) rInfo.bShearAllowed =false;
+ if (!aInfo.bEdgeRadiusAllowed ) rInfo.bEdgeRadiusAllowed =false;
+ if (!aInfo.bNoOrthoDesired ) rInfo.bNoOrthoDesired =false;
+ if (aInfo.bNoContortion ) rInfo.bNoContortion =true;
+ if (!aInfo.bCanConvToPath ) rInfo.bCanConvToPath =false;
if(!aInfo.bCanConvToContour)
- rInfo.bCanConvToContour = sal_False;
+ rInfo.bCanConvToContour = false;
- if (!aInfo.bCanConvToPoly ) rInfo.bCanConvToPoly =sal_False;
- if (!aInfo.bCanConvToPathLineToArea) rInfo.bCanConvToPathLineToArea=sal_False;
- if (!aInfo.bCanConvToPolyLineToArea) rInfo.bCanConvToPolyLineToArea=sal_False;
+ if (!aInfo.bCanConvToPoly ) rInfo.bCanConvToPoly =false;
+ if (!aInfo.bCanConvToPathLineToArea) rInfo.bCanConvToPathLineToArea=false;
+ if (!aInfo.bCanConvToPolyLineToArea) rInfo.bCanConvToPolyLineToArea=false;
}
if (nObjAnz==0) {
- rInfo.bRotateFreeAllowed=sal_False;
- rInfo.bRotate90Allowed =sal_False;
- rInfo.bMirrorFreeAllowed=sal_False;
- rInfo.bMirror45Allowed =sal_False;
- rInfo.bMirror90Allowed =sal_False;
- rInfo.bTransparenceAllowed = sal_False;
- rInfo.bGradientAllowed = sal_False;
- rInfo.bShearAllowed =sal_False;
- rInfo.bEdgeRadiusAllowed=sal_False;
- rInfo.bNoContortion =sal_True;
+ rInfo.bRotateFreeAllowed=false;
+ rInfo.bRotate90Allowed =false;
+ rInfo.bMirrorFreeAllowed=false;
+ rInfo.bMirror45Allowed =false;
+ rInfo.bMirror90Allowed =false;
+ rInfo.bTransparenceAllowed = false;
+ rInfo.bGradientAllowed = false;
+ rInfo.bShearAllowed =false;
+ rInfo.bEdgeRadiusAllowed=false;
+ rInfo.bNoContortion =true;
}
if(nObjAnz != 1)
{
// only allowed if single object selected
- rInfo.bTransparenceAllowed = sal_False;
- rInfo.bGradientAllowed = sal_False;
+ rInfo.bTransparenceAllowed = false;
+ rInfo.bGradientAllowed = false;
}
}
@@ -231,7 +231,7 @@ Point SdrObjGroup::GetRefPoint() const
void SdrObjGroup::SetRefPoint(const Point& rPnt)
{
- bRefPoint=sal_True;
+ bRefPoint=true;
aRefPoint=rPnt;
}
@@ -359,7 +359,7 @@ bool SdrObjGroup::beginSpecialDrag(SdrDragStat& /*rDrag*/) const
bool SdrObjGroup::BegCreate(SdrDragStat& /*rStat*/)
{
- return sal_False;
+ return false;
}
@@ -472,7 +472,7 @@ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
void SdrObjGroup::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
{
- SetGlueReallyAbsolute(sal_True);
+ SetGlueReallyAbsolute(true);
RotatePoint(aRefPoint,rRef,sn,cs);
SdrObjList* pOL=pSub;
sal_uIntPtr nObjAnz=pOL->GetObjCount();
@@ -481,13 +481,13 @@ void SdrObjGroup::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
pObj->NbcRotate(rRef,nWink,sn,cs);
}
NbcRotateGluePoints(rRef,nWink,sn,cs);
- SetGlueReallyAbsolute(sal_False);
+ SetGlueReallyAbsolute(false);
}
void SdrObjGroup::NbcMirror(const Point& rRef1, const Point& rRef2)
{
- SetGlueReallyAbsolute(sal_True);
+ SetGlueReallyAbsolute(true);
MirrorPoint(aRefPoint,rRef1,rRef2); // implementation missing in SvdEtc!
SdrObjList* pOL=pSub;
sal_uIntPtr nObjAnz=pOL->GetObjCount();
@@ -496,13 +496,13 @@ void SdrObjGroup::NbcMirror(const Point& rRef1, const Point& rRef2)
pObj->NbcMirror(rRef1,rRef2);
}
NbcMirrorGluePoints(rRef1,rRef2);
- SetGlueReallyAbsolute(sal_False);
+ SetGlueReallyAbsolute(false);
}
void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
{
- SetGlueReallyAbsolute(sal_True);
+ SetGlueReallyAbsolute(true);
ShearPoint(aRefPoint,rRef,tn);
SdrObjList* pOL=pSub;
sal_uIntPtr nObjAnz=pOL->GetObjCount();
@@ -511,7 +511,7 @@ void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, bool bVShea
pObj->NbcShear(rRef,nWink,tn,bVShear);
}
NbcShearGluePoints(rRef,nWink,tn,bVShear);
- SetGlueReallyAbsolute(sal_False);
+ SetGlueReallyAbsolute(false);
}
@@ -638,7 +638,7 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
{
if (nWink!=0) {
- SetGlueReallyAbsolute(sal_True);
+ SetGlueReallyAbsolute(true);
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
RotatePoint(aRefPoint,rRef,sn,cs);
// move the connectors first, everything else afterwards
@@ -654,7 +654,7 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
if (!pObj->IsEdgeObj()) pObj->Rotate(rRef,nWink,sn,cs);
}
NbcRotateGluePoints(rRef,nWink,sn,cs);
- SetGlueReallyAbsolute(sal_False);
+ SetGlueReallyAbsolute(false);
SetChanged();
BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
@@ -664,7 +664,7 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
{
- SetGlueReallyAbsolute(sal_True);
+ SetGlueReallyAbsolute(true);
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
MirrorPoint(aRefPoint,rRef1,rRef2); // implementation missing in SvdEtc!
// move the connectors first, everything else afterwards
@@ -680,7 +680,7 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
if (!pObj->IsEdgeObj()) pObj->Mirror(rRef1,rRef2);
}
NbcMirrorGluePoints(rRef1,rRef2);
- SetGlueReallyAbsolute(sal_False);
+ SetGlueReallyAbsolute(false);
SetChanged();
BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
@@ -690,7 +690,7 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
{
if (nWink!=0) {
- SetGlueReallyAbsolute(sal_True);
+ SetGlueReallyAbsolute(true);
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
ShearPoint(aRefPoint,rRef,tn);
// move the connectors first, everything else afterwards
@@ -706,7 +706,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, bool bVShear)
if (!pObj->IsEdgeObj()) pObj->Shear(rRef,nWink,tn,bVShear);
}
NbcShearGluePoints(rRef,nWink,tn,bVShear);
- SetGlueReallyAbsolute(sal_False);
+ SetGlueReallyAbsolute(false);
SetChanged();
BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 58e5dd679c6e..d58f5936b517 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -216,19 +216,19 @@ sdr::contact::ViewContact* SdrMeasureObj::CreateObjectSpecificViewContact()
TYPEINIT1(SdrMeasureObj,SdrTextObj);
SdrMeasureObj::SdrMeasureObj():
- bTextDirty(sal_False)
+ bTextDirty(false)
{
// #i25616#
- mbSupportTextIndentingOnLineWidthChange = sal_False;
+ mbSupportTextIndentingOnLineWidthChange = false;
}
SdrMeasureObj::SdrMeasureObj(const Point& rPt1, const Point& rPt2):
aPt1(rPt1),
aPt2(rPt2),
- bTextDirty(sal_False)
+ bTextDirty(false)
{
// #i25616#
- mbSupportTextIndentingOnLineWidthChange = sal_False;
+ mbSupportTextIndentingOnLineWidthChange = false;
}
SdrMeasureObj::~SdrMeasureObj()
@@ -237,25 +237,25 @@ SdrMeasureObj::~SdrMeasureObj()
void SdrMeasureObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bSelectAllowed =sal_True;
- rInfo.bMoveAllowed =sal_True;
- rInfo.bResizeFreeAllowed=sal_True;
- rInfo.bResizePropAllowed=sal_True;
- rInfo.bRotateFreeAllowed=sal_True;
- rInfo.bRotate90Allowed =sal_True;
- rInfo.bMirrorFreeAllowed=sal_True;
- rInfo.bMirror45Allowed =sal_True;
- rInfo.bMirror90Allowed =sal_True;
- rInfo.bTransparenceAllowed = sal_False;
- rInfo.bGradientAllowed = sal_False;
- rInfo.bShearAllowed =sal_True;
- rInfo.bEdgeRadiusAllowed=sal_False;
- rInfo.bNoOrthoDesired =sal_True;
- rInfo.bNoContortion =sal_False;
- rInfo.bCanConvToPath =sal_False;
- rInfo.bCanConvToPoly =sal_True;
- rInfo.bCanConvToPathLineToArea=sal_False;
- rInfo.bCanConvToPolyLineToArea=sal_False;
+ rInfo.bSelectAllowed =true;
+ rInfo.bMoveAllowed =true;
+ rInfo.bResizeFreeAllowed=true;
+ rInfo.bResizePropAllowed=true;
+ rInfo.bRotateFreeAllowed=true;
+ rInfo.bRotate90Allowed =true;
+ rInfo.bMirrorFreeAllowed=true;
+ rInfo.bMirror45Allowed =true;
+ rInfo.bMirror90Allowed =true;
+ rInfo.bTransparenceAllowed = false;
+ rInfo.bGradientAllowed = false;
+ rInfo.bShearAllowed =true;
+ rInfo.bEdgeRadiusAllowed=false;
+ rInfo.bNoOrthoDesired =true;
+ rInfo.bNoContortion =false;
+ rInfo.bCanConvToPath =false;
+ rInfo.bCanConvToPoly =true;
+ rInfo.bCanConvToPathLineToArea=false;
+ rInfo.bCanConvToPolyLineToArea=false;
rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
}
@@ -426,7 +426,7 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
OutlinerParaObject* pOutlinerParaObject = SdrTextObj::GetOutlinerParaObject();
if (pOutlinerParaObject!=NULL && pOutlinerParaObject->GetTextObject().GetParagraphCount()==1)
{
- bBrkLine=sal_True; // dashed line if there's only on paragraph.
+ bBrkLine=true; // dashed line if there's only on paragraph.
}
}
rPol.bBreakedLine=bBrkLine;
@@ -462,12 +462,12 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
rPol.nTextWink=rPol.nLineWink;
if (rRec.bTextRota90) rPol.nTextWink+=9000;
- rPol.bAutoUpsideDown=sal_False;
+ rPol.bAutoUpsideDown=false;
if (rRec.bTextAutoAngle) {
long nTmpWink=NormAngle360(rPol.nTextWink-rRec.nTextAutoAngleView);
if (nTmpWink>=18000) {
rPol.nTextWink+=18000;
- rPol.bAutoUpsideDown=sal_True;
+ rPol.bAutoUpsideDown=true;
}
}
@@ -597,7 +597,7 @@ bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara,
rpFldColor=NULL;
}
}
- return sal_True;
+ return true;
} else {
return SdrTextObj::CalcFieldValue(rField,nPara,nPos,bEdit,rpTxtColor,rpFldColor,rRet);
}
@@ -637,7 +637,7 @@ void SdrMeasureObj::UndirtyText() const
// cast to nonconst three times
((SdrMeasureObj*)this)->aTextSize=aSiz;
((SdrMeasureObj*)this)->bTextSizeDirty=sal_False;
- ((SdrMeasureObj*)this)->bTextDirty=sal_False;
+ ((SdrMeasureObj*)this)->bTextDirty=false;
}
}
@@ -978,7 +978,7 @@ bool SdrMeasureObj::BegCreate(SdrDragStat& rStat)
aPt1=rStat.GetStart();
aPt2=rStat.GetNow();
SetTextDirty();
- return sal_True;
+ return true;
}
bool SdrMeasureObj::MovCreate(SdrDragStat& rStat)
@@ -992,8 +992,8 @@ bool SdrMeasureObj::MovCreate(SdrDragStat& rStat)
}
SetTextDirty();
SetBoundRectDirty();
- bSnapRectDirty=sal_True;
- return sal_True;
+ bSnapRectDirty=true;
+ return true;
}
bool SdrMeasureObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 89a2ff983ba6..a9a9a55aefe4 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -767,7 +767,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const OUStrin
bFrame=bFrame_;
if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
- SetResizeProtect(sal_True);
+ SetResizeProtect(true);
// For math objects, set closed state to transparent
SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() ));
@@ -783,7 +783,7 @@ void SdrOle2Obj::Init()
mpImpl->pGraphicObject=NULL;
mpImpl->pLightClient = 0;
- xObjRef.Lock( sal_True );
+ xObjRef.Lock( true );
}
// -----------------------------------------------------------------------------
@@ -1086,7 +1086,7 @@ void SdrOle2Obj::Connect_Impl()
{
xObjRef.AssignToContainer( &rContainer, mpImpl->aPersistName );
mpImpl->mbConnected = true;
- xObjRef.Lock( sal_True );
+ xObjRef.Lock( true );
}
}
@@ -1499,7 +1499,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
// the caller of the method is responsible to control the old object, it will not be closed here
// Otherwise WW8 import crashes because it transfers control to OLENode by this method
if ( xObjRef.GetObject().is() )
- xObjRef.Lock( sal_False );
+ xObjRef.Lock( false );
// avoid removal of object in Disconnect! It is definitely a HACK to call SetObjRef(0)!
// This call will try to close the objects; so if anybody else wants to keep it, it must be locked by a CloseListener
@@ -1516,7 +1516,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
DELETEZ( pGraphic );
if ( (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
- SetResizeProtect(sal_True);
+ SetResizeProtect(true);
// For math objects, set closed state to transparent
SetClosedObj(!ImplIsMathObj( rNewObjRef ));
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index 8157b2d2a21c..fb141c6551e6 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -136,20 +136,20 @@ sal_uInt16 SdrPageObj::GetObjIdentifier() const
void SdrPageObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bRotateFreeAllowed=sal_False;
- rInfo.bRotate90Allowed =sal_False;
- rInfo.bMirrorFreeAllowed=sal_False;
- rInfo.bMirror45Allowed =sal_False;
- rInfo.bMirror90Allowed =sal_False;
- rInfo.bTransparenceAllowed = sal_False;
- rInfo.bGradientAllowed = sal_False;
- rInfo.bShearAllowed =sal_False;
- rInfo.bEdgeRadiusAllowed=sal_False;
- rInfo.bNoOrthoDesired =sal_False;
- rInfo.bCanConvToPath =sal_False;
- rInfo.bCanConvToPoly =sal_False;
- rInfo.bCanConvToPathLineToArea=sal_False;
- rInfo.bCanConvToPolyLineToArea=sal_False;
+ rInfo.bRotateFreeAllowed=false;
+ rInfo.bRotate90Allowed =false;
+ rInfo.bMirrorFreeAllowed=false;
+ rInfo.bMirror45Allowed =false;
+ rInfo.bMirror90Allowed =false;
+ rInfo.bTransparenceAllowed = false;
+ rInfo.bGradientAllowed = false;
+ rInfo.bShearAllowed =false;
+ rInfo.bEdgeRadiusAllowed=false;
+ rInfo.bNoOrthoDesired =false;
+ rInfo.bCanConvToPath =false;
+ rInfo.bCanConvToPoly =false;
+ rInfo.bCanConvToPathLineToArea=false;
+ rInfo.bCanConvToPolyLineToArea=false;
}
SdrPageObj* SdrPageObj::Clone() const
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 11e551b8a5cd..c49df1483c96 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -137,11 +137,11 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl
}
maMove = maOrig;
- bValid = sal_True;
+ bValid = true;
}
else
{
- bValid=sal_False;
+ bValid=false;
bClosed=rPO.IsClosed(); // closed object?
nPoly=(sal_uInt16)rHdl.GetPolyNum(); // number of the polygon in the PolyPolygon
nPnt=(sal_uInt16)rHdl.GetPointNum(); // number of points in the above polygon
@@ -166,10 +166,10 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl
if (!bPrevIsBegPnt) nPrevPrevPnt=GetPrevPnt(nPrevPnt,nPntMax,bClosed);
if (!bNextIsEndPnt) nNextNextPnt=GetNextPnt(nNextPnt,nPntMax,bClosed);
bControl=rHdl.IsPlusHdl(); // point is a control point
- bIsPrevControl=sal_False; // point is a control point before a support point
- bIsNextControl=sal_False; // point is a control point after a support point
- bPrevIsControl=sal_False; // if nPnt is a support point: a control point comes before
- bNextIsControl=sal_False; // if nPnt is a support point: a control point comes after
+ bIsPrevControl=false; // point is a control point before a support point
+ bIsNextControl=false; // point is a control point after a support point
+ bPrevIsControl=false; // if nPnt is a support point: a control point comes before
+ bNextIsControl=false; // if nPnt is a support point: a control point comes after
if (bControl) {
bIsPrevControl=aTmpXP.IsControl(nPrevPnt);
bIsNextControl=!bIsPrevControl;
@@ -187,9 +187,9 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl
nPnt=2;
nNextPnt=3;
nNextNextPnt=4;
- bEliminate=sal_False;
+ bEliminate=false;
ResetPoly(rPO);
- bValid=sal_True;
+ bValid=true;
}
}
@@ -238,10 +238,10 @@ struct ImpPathCreateUser : public SdrDragStatUserData
public:
ImpPathCreateUser(): nCircRadius(0),nCircStWink(0),nCircRelWink(0),
- bBezier(sal_False),bBezHasCtrl0(sal_False),bCurve(sal_False),bCircle(sal_False),bAngleSnap(sal_False),bLine(sal_False),bLine90(sal_False),bRect(sal_False),
- bMixedCreate(sal_False),nBezierStartPoint(0),eStartKind(OBJ_NONE),eAktKind(OBJ_NONE) { }
+ bBezier(false),bBezHasCtrl0(false),bCurve(false),bCircle(false),bAngleSnap(false),bLine(false),bLine90(false),bRect(false),
+ bMixedCreate(false),nBezierStartPoint(0),eStartKind(OBJ_NONE),eAktKind(OBJ_NONE) { }
- void ResetFormFlags() { bBezier=sal_False; bCurve=sal_False; bCircle=sal_False; bLine=sal_False; bRect=sal_False; }
+ void ResetFormFlags() { bBezier=false; bCurve=false; bCircle=false; bLine=false; bRect=false; }
bool IsFormFlag() const { return bBezier || bCurve || bCircle || bLine || bRect; }
XPolygon GetFormPoly() const;
bool CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, bool bMouseDown);
@@ -334,7 +334,7 @@ bool ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Poi
}
}
nCircRadius=nRad;
- if (nRad==0 || std::abs(nCircRelWink)<5) bRet=sal_False;
+ if (nRad==0 || std::abs(nCircRelWink)<5) bRet=false;
bCircle=bRet;
return bRet;
}
@@ -390,8 +390,8 @@ bool ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point
{
aLineStart=rP1;
aLineEnd=rP2;
- bLine90=sal_False;
- if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bLine=sal_False; return sal_False; }
+ bLine90=false;
+ if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bLine=false; return false; }
Point aTmpPt(rP2-rP1);
long nDirX=rDir.X();
long nDirY=rDir.Y();
@@ -404,8 +404,8 @@ bool ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point
} else { // rectangular transition
aLineEnd+=aP2;
}
- bLine=sal_True;
- return sal_True;
+ bLine=true;
+ return true;
}
XPolygon ImpPathCreateUser::GetLinePoly() const
@@ -421,7 +421,7 @@ bool ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point
aRectP1=rP1;
aRectP2=rP1;
aRectP3=rP2;
- if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bRect=sal_False; return sal_False; }
+ if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bRect=false; return false; }
Point aTmpPt(rP2-rP1);
long nDirX=rDir.X();
long nDirY=rDir.Y();
@@ -465,8 +465,8 @@ bool ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point
aRectP3.Y()+=ytemp;
}
}
- bRect=sal_True;
- return sal_True;
+ bRect=true;
+ return true;
}
XPolygon ImpPathCreateUser::GetRectPoly() const
@@ -540,7 +540,7 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const
{
const SdrHdl* pHdl=rDrag.GetHdl();
if(!pHdl)
- return sal_False;
+ return false;
bool bMultiPointDrag(true);
@@ -681,7 +681,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
if (!bHLin || !bVLin) {
long ndx=aPos.X()-aPnt1.X();
long ndy=aPos.Y()-aPnt1.Y();
- bPnt1=sal_True;
+ bPnt1=true;
double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0;
double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0;
bool bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho);
@@ -702,7 +702,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
if (!bHLin || !bVLin) {
long ndx=aPos.X()-aPnt2.X();
long ndy=aPos.Y()-aPnt2.Y();
- bPnt2=sal_True;
+ bPnt2=true;
double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0;
double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0;
bool bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho);
@@ -722,7 +722,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
nX1+=nY1; // correction distance to square
nX2+=nY2; // correction distance to square
// let the alternative that allows fewer correction win
- if (nX1<nX2) bPnt2=sal_False; else bPnt1=sal_False;
+ if (nX1<nX2) bPnt2=false; else bPnt1=false;
}
if (bPnt1) rDrag.Now()=aNeuPos1;
if (bPnt2) rDrag.Now()=aNeuPos2;
@@ -939,23 +939,23 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag
mrSdrPathObject.GetModel()->TakeWinkStr(std::abs(pU->nCircRelWink), aMetr);
aStr += aMetr;
aStr += " r=";
- mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, sal_True);
+ mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, true);
aStr += aMetr;
}
aStr += "dx=";
- mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X(), aMetr, sal_True);
+ mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X(), aMetr, true);
aStr += aMetr;
aStr += " dy=";
- mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y(), aMetr, sal_True);
+ mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y(), aMetr, true);
aStr += aMetr;
if(!IsFreeHand(meObjectKind))
{
sal_Int32 nLen(GetLen(aNow));
aStr += " l=";
- mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
+ mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, true);
aStr += aMetr;
sal_Int32 nWink(GetAngle(aNow));
@@ -1017,11 +1017,11 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag
aStr = "";
aStr += "dx=";
- mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X() - aBeg.X(), aMetr, sal_True);
+ mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X() - aBeg.X(), aMetr, true);
aStr += aMetr;
aStr += " dy=";
- mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y() - aBeg.Y(), aMetr, sal_True);
+ mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y() - aBeg.Y(), aMetr, true);
aStr += aMetr;
if(!pDragData->IsMultiPointDrag())
@@ -1048,7 +1048,7 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag
sal_Int32 nLen(GetLen(aNow));
aStr += " l=";
- mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
+ mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, true);
aStr += aMetr;
sal_Int32 nWink(GetAngle(aNow));
@@ -1094,7 +1094,7 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag
sal_Int32 nLen(GetLen(aPt));
aStr += " l=";
- mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
+ mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, true);
aStr += aMetr;
sal_Int32 nWink(GetAngle(aPt));
@@ -1115,7 +1115,7 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag
sal_Int32 nLen(GetLen(aPt));
aStr += "l=";
- mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
+ mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, true);
aStr += aMetr;
sal_Int32 nWink(GetAngle(aPt));
@@ -1252,7 +1252,7 @@ bool ImpPathForDragAndCreate::BegCreate(SdrDragStat& rStat)
rStat.SetNoSnap(bFreeHand);
rStat.SetOrtho8Possible();
aPathPolygon.Clear();
- mbCreating=sal_True;
+ mbCreating=true;
bool bMakeStartPoint = true;
SdrView* pView=rStat.GetView();
if (pView!=NULL && pView->IsUseIncompatiblePathCreateInterface() &&
@@ -1291,7 +1291,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
case OBJ_FREELINE: case OBJ_FREEFILL:
case OBJ_SPLNLINE: case OBJ_SPLNFILL: {
pU->eAktKind=eNewKind;
- pU->bMixedCreate=sal_True;
+ pU->bMixedCreate=true;
pU->nBezierStartPoint=rXPoly.GetPointCount();
if (pU->nBezierStartPoint>0) pU->nBezierStartPoint--;
} break;
@@ -1334,7 +1334,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
Point aPt1(rStat.Now());
long dx=aPt0.X()-aPt1.X(); if (dx<0) dx=-dx;
long dy=aPt0.Y()-aPt1.Y(); if (dy<0) dy=-dy;
- if (dx<nMinDist && dy<nMinDist) return sal_False;
+ if (dx<nMinDist && dy<nMinDist) return false;
// TODO: the following is copied from EndCreate (with a few smaller modifications)
// and should be combined into a method with the code there.
@@ -1390,7 +1390,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
if (rStat.GetPointAnz()>=2) eCmd=SDRCREATE_FORCEEND;
bRet = eCmd==SDRCREATE_FORCEEND;
if (bRet) {
- mbCreating = sal_False;
+ mbCreating = false;
delete pU;
rStat.SetUser(NULL);
}
@@ -1401,7 +1401,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
if (rStat.GetPointAnz()>=2) eCmd=SDRCREATE_FORCEEND;
bRet=eCmd==SDRCREATE_FORCEEND;
if (bRet) {
- mbCreating=sal_False;
+ mbCreating=false;
delete pU;
rStat.SetUser(NULL);
}
@@ -1425,7 +1425,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
} else {
if (nActPoint==1 && IsBezier(pU->eAktKind) && !pU->bBezHasCtrl0) {
pU->aBezControl0=rStat.GetNow();
- pU->bBezHasCtrl0=sal_True;
+ pU->bBezHasCtrl0=true;
nActPoint--;
}
if (pU->IsFormFlag()) {
@@ -1444,7 +1444,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
}
if (eCmd==SDRCREATE_NEXTOBJECT) {
if (rXPoly.GetPointCount()>=2) {
- pU->bBezHasCtrl0=sal_False;
+ pU->bBezHasCtrl0=false;
// only a singular polygon may be opened, so close this
rXPoly[nActPoint]=rXPoly[0];
XPolygon aXP;
@@ -1485,7 +1485,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
pU->ResetFormFlags();
bRet=eCmd==SDRCREATE_FORCEEND;
if (bRet) {
- mbCreating=sal_False;
+ mbCreating=false;
delete pU;
rStat.SetUser(NULL);
}
@@ -1536,7 +1536,7 @@ void ImpPathForDragAndCreate::BrkCreate(SdrDragStat& rStat)
{
ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser();
aPathPolygon.Clear();
- mbCreating=sal_False;
+ mbCreating=false;
delete pU;
rStat.SetUser(NULL);
}
@@ -1812,7 +1812,7 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose)
default: break;
}
- bClosedObj = sal_True;
+ bClosedObj = true;
}
else
{
@@ -1825,7 +1825,7 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose)
default: break;
}
- bClosedObj = sal_False;
+ bClosedObj = false;
}
ImpForceKind();
@@ -1833,12 +1833,12 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose)
void SdrPathObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bNoContortion=sal_False;
+ rInfo.bNoContortion=false;
bool bCanConv = !HasText() || ImpCanConvTextToCurve();
bool bIsPath = IsBezier() || IsSpline();
- rInfo.bEdgeRadiusAllowed = sal_False;
+ rInfo.bEdgeRadiusAllowed = false;
rInfo.bCanConvToPath = bCanConv && !bIsPath;
rInfo.bCanConvToPoly = bCanConv && bIsPath;
rInfo.bCanConvToContour = !IsFontwork() && (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
@@ -2455,7 +2455,7 @@ Point SdrPathObj::GetSnapPoint(sal_uInt32 nSnapPnt) const
sal_uInt32 nPoly,nPnt;
if(!PolyPolygonEditor::GetRelativePolyPoint(GetPathPoly(), nSnapPnt, nPoly, nPnt))
{
- DBG_ASSERT(sal_False,"SdrPathObj::GetSnapPoint: Point nSnapPnt does not exist.");
+ DBG_ASSERT(false,"SdrPathObj::GetSnapPoint: Point nSnapPnt does not exist.");
}
const basegfx::B2DPoint aB2DPoint(GetPathPoly().getB2DPolygon(nPoly).getB2DPoint(nPnt));
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 3b579f980ce3..937c35d51c07 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -67,14 +67,14 @@ TYPEINIT1(SdrRectObj,SdrTextObj);
SdrRectObj::SdrRectObj()
: mpXPoly(0L)
{
- bClosedObj=sal_True;
+ bClosedObj=true;
}
SdrRectObj::SdrRectObj(const Rectangle& rRect)
: SdrTextObj(rRect),
mpXPoly(NULL)
{
- bClosedObj=sal_True;
+ bClosedObj=true;
}
SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind)
@@ -84,7 +84,7 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind)
DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT ||
eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT,
"SdrRectObj::SdrRectObj(SdrObjKind) can only be applied to text frames.");
- bClosedObj=sal_True;
+ bClosedObj=true;
}
SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect)
@@ -94,7 +94,7 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect)
DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT ||
eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT,
"SdrRectObj::SdrRectObj(SdrObjKind,...) can only be applied to text frames.");
- bClosedObj=sal_True;
+ bClosedObj=true;
}
SdrRectObj::~SdrRectObj()
@@ -169,22 +169,22 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
bool bNoTextFrame=!IsTextFrame();
rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0;
- rInfo.bResizePropAllowed=sal_True;
- rInfo.bRotateFreeAllowed=sal_True;
- rInfo.bRotate90Allowed =sal_True;
+ rInfo.bResizePropAllowed=true;
+ rInfo.bRotateFreeAllowed=true;
+ rInfo.bRotate90Allowed =true;
rInfo.bMirrorFreeAllowed=bNoTextFrame;
rInfo.bMirror45Allowed =bNoTextFrame;
rInfo.bMirror90Allowed =bNoTextFrame;
// allow transparency
- rInfo.bTransparenceAllowed = sal_True;
+ rInfo.bTransparenceAllowed = true;
// gradient depends on fillstyle
XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
rInfo.bShearAllowed =bNoTextFrame;
- rInfo.bEdgeRadiusAllowed=sal_True;
+ rInfo.bEdgeRadiusAllowed=true;
bool bCanConv=!HasText() || ImpCanConvTextToCurve();
if (bCanConv && !bNoTextFrame && !HasText()) {
@@ -549,7 +549,7 @@ SdrGluePoint SdrRectObj::GetVertexGluePoint(sal_uInt16 nPosNum) const
if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
aPt-=GetSnapRect().Center();
SdrGluePoint aGP(aPt);
- aGP.SetPercent(sal_False);
+ aGP.SetPercent(false);
return aGP;
}
@@ -575,7 +575,7 @@ SdrGluePoint SdrRectObj::GetCornerGluePoint(sal_uInt16 nPosNum) const
if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
aPt-=GetSnapRect().Center();
SdrGluePoint aGP(aPt);
- aGP.SetPercent(sal_False);
+ aGP.SetPercent(false);
return aGP;
}
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 35dd1cb2571e..21b8911f6d1c 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -104,7 +104,7 @@ SdrTextObj::SdrTextObj()
maTextEditOffset = Point(0, 0);
// #i25616#
- mbSupportTextIndentingOnLineWidthChange = sal_True;
+ mbSupportTextIndentingOnLineWidthChange = true;
mbInDownScale = sal_False;
}
@@ -131,7 +131,7 @@ SdrTextObj::SdrTextObj(const Rectangle& rNewRect)
maTextEditOffset = Point(0, 0);
// #i25616#
- mbSupportTextIndentingOnLineWidthChange = sal_True;
+ mbSupportTextIndentingOnLineWidthChange = true;
}
SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind)
@@ -155,7 +155,7 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind)
maTextEditOffset = Point(0, 0);
// #i25616#
- mbSupportTextIndentingOnLineWidthChange = sal_True;
+ mbSupportTextIndentingOnLineWidthChange = true;
}
SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect)
@@ -181,7 +181,7 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect)
maTextEditOffset = Point(0, 0);
// #i25616#
- mbSupportTextIndentingOnLineWidthChange = sal_True;
+ mbSupportTextIndentingOnLineWidthChange = true;
}
SdrTextObj::~SdrTextObj()
@@ -296,7 +296,7 @@ const Size& SdrTextObj::GetTextSize() const
bool SdrTextObj::IsAutoGrowHeight() const
{
if(!bTextFrame)
- return sal_False; // AutoGrow only together with TextFrames
+ return false; // AutoGrow only together with TextFrames
const SfxItemSet& rSet = GetObjectItemSet();
sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
@@ -321,7 +321,7 @@ bool SdrTextObj::IsAutoGrowHeight() const
bool SdrTextObj::IsAutoGrowWidth() const
{
if(!bTextFrame)
- return sal_False; // AutoGrow only together with TextFrames
+ return false; // AutoGrow only together with TextFrames
const SfxItemSet& rSet = GetObjectItemSet();
sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
@@ -431,21 +431,21 @@ void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
bool bNoTextFrame=!IsTextFrame();
rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0;
- rInfo.bResizePropAllowed=sal_True;
- rInfo.bRotateFreeAllowed=sal_True;
- rInfo.bRotate90Allowed =sal_True;
+ rInfo.bResizePropAllowed=true;
+ rInfo.bRotateFreeAllowed=true;
+ rInfo.bRotate90Allowed =true;
rInfo.bMirrorFreeAllowed=bNoTextFrame;
rInfo.bMirror45Allowed =bNoTextFrame;
rInfo.bMirror90Allowed =bNoTextFrame;
// allow transparency
- rInfo.bTransparenceAllowed = sal_True;
+ rInfo.bTransparenceAllowed = true;
// gradient depends on fillstyle
XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
rInfo.bShearAllowed =bNoTextFrame;
- rInfo.bEdgeRadiusAllowed=sal_True;
+ rInfo.bEdgeRadiusAllowed=true;
bool bCanConv=ImpCanConvTextToCurve();
rInfo.bCanConvToPath =bCanConv;
rInfo.bCanConvToPoly =bCanConv;
@@ -917,7 +917,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
long nY=(nWantHgt*100) /nIsHgt; // calculate Y stretching
bool bChkX = true;
if (bNoStretching) { // might only be be possible proportionally
- if (nX>nY) { nX=nY; bChkX=sal_False; }
+ if (nX>nY) { nX=nY; bChkX=false; }
else { nY=nX; }
}
@@ -1123,7 +1123,7 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeContour() const
Rectangle aAnchor2;
Rectangle aR;
- TakeTextRect(rOutliner,aR,sal_False,&aAnchor2);
+ TakeTextRect(rOutliner,aR,false,&aAnchor2);
rOutliner.Clear();
bool bFitToSize(IsFitToSize());
if (bFitToSize) aR=aAnchor2;
@@ -1170,7 +1170,7 @@ Point SdrTextObj::GetSnapPoint(sal_uInt32 i) const
void SdrTextObj::ImpCheckMasterCachable()
{
- bNotMasterCachable=sal_False;
+ bNotMasterCachable=false;
OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
@@ -1243,7 +1243,7 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( bool bContourFrame,
}
}
rOutliner.SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
- TakeTextRect(rOutliner, rTextRect, sal_False, &rAnchorRect);
+ TakeTextRect(rOutliner, rTextRect, false, &rAnchorRect);
rPaintRect = rTextRect;
if (!bContourFrame)
@@ -1708,7 +1708,7 @@ void SdrTextObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
GeoStat aGeoStat;
aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0);
aGeoStat.RecalcTan();
- Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, sal_False);
+ Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, false);
}
// rotation?
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index e4dc26966cd5..c1562f3d6742 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -145,8 +145,8 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW
if (nHgt<1) nHgt=1; // nVDist may be negative
long nWdtGrow=nWdt-(rR.Right()-rR.Left());
long nHgtGrow=nHgt-(rR.Bottom()-rR.Top());
- if (nWdtGrow==0) bWdtGrow=sal_False;
- if (nHgtGrow==0) bHgtGrow=sal_False;
+ if (nWdtGrow==0) bWdtGrow=false;
+ if (nHgtGrow==0) bHgtGrow=false;
if (bWdtGrow || bHgtGrow) {
if (bWdtGrow) {
SdrTextHorzAdjust eHAdj=GetTextHorizontalAdjust();
@@ -176,11 +176,11 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW
aD2-=aD1;
rR.Move(aD2.X(),aD2.Y());
}
- return sal_True;
+ return true;
}
}
}
- return sal_False;
+ return false;
}
bool SdrTextObj::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 1feda4eb3ee7..40bd221f1332 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -199,7 +199,7 @@ bool SdrTextObj::MovCreate(SdrDragStat& rStat)
rStat.SetActionRect(aRect1);
aRect=aRect1; // for ObjName
SetBoundRectDirty();
- bSnapRectDirty=sal_True;
+ bSnapRectDirty=true;
if (HAS_BASE(SdrRectObj,this)) {
((SdrRectObj*)this)->SetXPolyDirty();
}
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 5d742461d0e0..c40dfaa7a35a 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -93,7 +93,7 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
{
Rectangle aAnchorRect;
Rectangle aTextRect;
- TakeTextRect(rOutl, aTextRect, sal_False,
+ TakeTextRect(rOutl, aTextRect, false,
&aAnchorRect);
Fraction aFitXKorreg(1,1);
ImpSetCharStretching(rOutl,aTextRect.GetSize(),aAnchorRect.GetSize(),aFitXKorreg);
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 1fc5466ba64d..34170cf86cee 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -198,7 +198,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
{
- SetGlueReallyAbsolute(sal_True);
+ SetGlueReallyAbsolute(true);
long dx=aRect.Right()-aRect.Left();
long dy=aRect.Bottom()-aRect.Top();
Point aP(aRect.TopLeft());
@@ -217,12 +217,12 @@ void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
}
SetRectsDirty();
NbcRotateGluePoints(rRef,nWink,sn,cs);
- SetGlueReallyAbsolute(sal_False);
+ SetGlueReallyAbsolute(false);
}
void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear)
{
- SetGlueReallyAbsolute(sal_True);
+ SetGlueReallyAbsolute(true);
// when this is a SdrPathObj, aRect may be uninitialized
Polygon aPol(Rect2Poly(aRect.IsEmpty() ? GetSnapRect() : aRect, aGeo));
@@ -239,12 +239,12 @@ void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear
ImpCheckShear();
SetRectsDirty();
NbcShearGluePoints(rRef,nWink,tn,bVShear);
- SetGlueReallyAbsolute(sal_False);
+ SetGlueReallyAbsolute(false);
}
void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
{
- SetGlueReallyAbsolute(sal_True);
+ SetGlueReallyAbsolute(true);
bool bNoShearMerk=aGeo.nShearWink==0;
bool bRota90Merk = false;
if (bNoShearMerk &&
@@ -292,7 +292,7 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
ImpCheckShear();
SetRectsDirty();
NbcMirrorGluePoints(rRef1,rRef2);
- SetGlueReallyAbsolute(sal_False);
+ SetGlueReallyAbsolute(false);
}
//////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 8e435a96e9fa..3385e3abb6f9 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -158,7 +158,7 @@ SdrUnoObj::SdrUnoObj(const OUString& rModelName, sal_Bool _bOwnUnoControlModel)
: m_pImpl( new SdrUnoObjDataHolder ),
bOwnUnoControlModel( _bOwnUnoControlModel )
{
- bIsUnoObj = sal_True;
+ bIsUnoObj = true;
m_pImpl->pEventListener = new SdrControlEventListenerImpl(this);
@@ -173,7 +173,7 @@ SdrUnoObj::SdrUnoObj(const OUString& rModelName,
: m_pImpl( new SdrUnoObjDataHolder ),
bOwnUnoControlModel( _bOwnUnoControlModel )
{
- bIsUnoObj = sal_True;
+ bIsUnoObj = true;
m_pImpl->pEventListener = new SdrControlEventListenerImpl(this);
@@ -217,21 +217,21 @@ void SdrUnoObj::SetPage(SdrPage* pNewPage)
void SdrUnoObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bRotateFreeAllowed = sal_False;
- rInfo.bRotate90Allowed = sal_False;
- rInfo.bMirrorFreeAllowed = sal_False;
- rInfo.bMirror45Allowed = sal_False;
- rInfo.bMirror90Allowed = sal_False;
- rInfo.bTransparenceAllowed = sal_False;
- rInfo.bGradientAllowed = sal_False;
- rInfo.bShearAllowed = sal_False;
- rInfo.bEdgeRadiusAllowed = sal_False;
- rInfo.bNoOrthoDesired = sal_False;
- rInfo.bCanConvToPath = sal_False;
- rInfo.bCanConvToPoly = sal_False;
- rInfo.bCanConvToPathLineToArea = sal_False;
- rInfo.bCanConvToPolyLineToArea = sal_False;
- rInfo.bCanConvToContour = sal_False;
+ rInfo.bRotateFreeAllowed = false;
+ rInfo.bRotate90Allowed = false;
+ rInfo.bMirrorFreeAllowed = false;
+ rInfo.bMirror45Allowed = false;
+ rInfo.bMirror90Allowed = false;
+ rInfo.bTransparenceAllowed = false;
+ rInfo.bGradientAllowed = false;
+ rInfo.bShearAllowed = false;
+ rInfo.bEdgeRadiusAllowed = false;
+ rInfo.bNoOrthoDesired = false;
+ rInfo.bCanConvToPath = false;
+ rInfo.bCanConvToPoly = false;
+ rInfo.bCanConvToPathLineToArea = false;
+ rInfo.bCanConvToPolyLineToArea = false;
+ rInfo.bCanConvToContour = false;
}
sal_uInt16 SdrUnoObj::GetObjIdentifier() const
diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx
index 0e7ce6b133be..01dfc2b5fe34 100644
--- a/svx/source/svdraw/svdoutl.cxx
+++ b/svx/source/svdraw/svdoutl.cxx
@@ -81,7 +81,7 @@ OUString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara
OUString aRet;
if(mpTextObj.is())
- bOk = static_cast< SdrTextObj* >( mpTextObj.get())->CalcFieldValue(rField, nPara, nPos, sal_False, rpTxtColor, rpFldColor, aRet);
+ bOk = static_cast< SdrTextObj* >( mpTextObj.get())->CalcFieldValue(rField, nPara, nPos, false, rpTxtColor, rpFldColor, aRet);
if (!bOk)
aRet = Outliner::CalcFieldValue(rField, nPara, nPos, rpTxtColor, rpFldColor);
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index 947755eb1921..658c223bb48f 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -50,7 +50,7 @@ TYPEINIT1(SdrVirtObj,SdrObject);
SdrVirtObj::SdrVirtObj(SdrObject& rNewObj):
rRefObj(rNewObj)
{
- bVirtObj=sal_True; // this is only a virtual object
+ bVirtObj=true; // this is only a virtual object
rRefObj.AddReference(*this);
bClosedObj=rRefObj.IsClosedObj();
}
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index d1deac329cbc..2bb7ca0a0653 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -83,8 +83,8 @@ SdrObjList::SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage, SdrObjList* pNewU
pModel=pNewModel;
pPage=pNewPage;
pUpList=pNewUpList;
- bObjOrdNumsDirty=sal_False;
- bRectsDirty=sal_False;
+ bObjOrdNumsDirty=false;
+ bRectsDirty=false;
pOwnerObj=NULL;
eListKind=SDROBJLIST_UNKNOWN;
}
@@ -99,8 +99,8 @@ SdrObjList::SdrObjList(const SdrObjList& rSrcList):
pModel=NULL;
pPage=NULL;
pUpList=NULL;
- bObjOrdNumsDirty=sal_False;
- bRectsDirty=sal_False;
+ bObjOrdNumsDirty=false;
+ bRectsDirty=false;
pOwnerObj=NULL;
eListKind=SDROBJLIST_UNKNOWN;
*this=rSrcList;
@@ -128,8 +128,8 @@ void SdrObjList::operator=(const SdrObjList& rSrcList)
void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
{
Clear();
- bObjOrdNumsDirty=sal_False;
- bRectsDirty =sal_False;
+ bObjOrdNumsDirty=false;
+ bRectsDirty =false;
sal_uIntPtr nCloneErrCnt=0;
sal_uIntPtr nAnz=rSrcList.GetObjCount();
SdrInsertReason aReason(SDRREASON_COPY);
@@ -161,8 +161,8 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
const SdrObject* pSrcOb=rSrcList.GetObj(no);
SdrEdgeObj* pSrcEdge=PTR_CAST(SdrEdgeObj,pSrcOb);
if (pSrcEdge!=NULL) {
- SdrObject* pSrcNode1=pSrcEdge->GetConnectedNode(sal_True);
- SdrObject* pSrcNode2=pSrcEdge->GetConnectedNode(sal_False);
+ SdrObject* pSrcNode1=pSrcEdge->GetConnectedNode(true);
+ SdrObject* pSrcNode2=pSrcEdge->GetConnectedNode(false);
if (pSrcNode1!=NULL && pSrcNode1->GetObjList()!=pSrcEdge->GetObjList()) pSrcNode1=NULL; // can't do this
if (pSrcNode2!=NULL && pSrcNode2->GetObjList()!=pSrcEdge->GetObjList()) pSrcNode2=NULL; // across all lists (yet)
if (pSrcNode1!=NULL || pSrcNode2!=NULL) {
@@ -173,7 +173,7 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
sal_uIntPtr nDstNode1=pSrcNode1->GetOrdNum();
SdrObject* pDstNode1=GetObj(nDstNode1);
if (pDstNode1!=NULL) { // else we get an error!
- pDstEdge->ConnectToNode(sal_True,pDstNode1);
+ pDstEdge->ConnectToNode(true,pDstNode1);
} else {
OSL_FAIL("SdrObjList::operator=(): pDstNode1==NULL!");
}
@@ -182,7 +182,7 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
sal_uIntPtr nDstNode2=pSrcNode2->GetOrdNum();
SdrObject* pDstNode2=GetObj(nDstNode2);
if (pDstNode2!=NULL) { // else the node was probably not selected
- pDstEdge->ConnectToNode(sal_False,pDstNode2);
+ pDstEdge->ConnectToNode(false,pDstNode2);
} else {
OSL_FAIL("SdrObjList::operator=(): pDstNode2==NULL!");
}
@@ -290,7 +290,7 @@ void SdrObjList::RecalcObjOrdNums()
SdrObject* pObj=GetObj(no);
pObj->SetOrdNum(no);
}
- bObjOrdNumsDirty=sal_False;
+ bObjOrdNumsDirty=false;
}
void SdrObjList::RecalcRects()
@@ -313,7 +313,7 @@ void SdrObjList::RecalcRects()
void SdrObjList::SetRectsDirty()
{
- bRectsDirty=sal_True;
+ bRectsDirty=true;
if (pUpList!=NULL) pUpList->SetRectsDirty();
}
@@ -336,7 +336,7 @@ void SdrObjList::NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrIns
if (nPos>nAnz) nPos=nAnz;
InsertObjectIntoContainer(*pObj,nPos);
- if (nPos<nAnz) bObjOrdNumsDirty=sal_True;
+ if (nPos<nAnz) bObjOrdNumsDirty=true;
pObj->SetOrdNum(nPos);
pObj->SetObjList(this);
pObj->SetPage(pPage);
@@ -349,7 +349,7 @@ void SdrObjList::NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrIns
aOutRect.Union(pObj->GetCurrentBoundRect());
aSnapRect.Union(pObj->GetSnapRect());
}
- pObj->SetInserted(sal_True); // calls the UserCall (among others)
+ pObj->SetInserted(true); // calls the UserCall (among others)
}
}
@@ -413,12 +413,12 @@ SdrObject* SdrObjList::NbcRemoveObject(sal_uIntPtr nObjNum)
pObj->GetViewContact().flushViewObjectContacts(true);
DBG_ASSERT(pObj->IsInserted(),"ZObjekt does not have the status Inserted.");
- pObj->SetInserted(sal_False); // Ruft u.a. den UserCall
+ pObj->SetInserted(false); // Ruft u.a. den UserCall
pObj->SetObjList(NULL);
pObj->SetPage(NULL);
if (!bObjOrdNumsDirty) { // optimizing for the case that the last object has to be removed
if (nObjNum!=sal_uIntPtr(nAnz-1)) {
- bObjOrdNumsDirty=sal_True;
+ bObjOrdNumsDirty=true;
}
}
SetRectsDirty();
@@ -454,12 +454,12 @@ SdrObject* SdrObjList::RemoveObject(sal_uIntPtr nObjNum)
}
pModel->SetChanged();
}
- pObj->SetInserted(sal_False); // calls, among other things, the UserCall
+ pObj->SetInserted(false); // calls, among other things, the UserCall
pObj->SetObjList(NULL);
pObj->SetPage(NULL);
if (!bObjOrdNumsDirty) { // optimization for the case that the last object is removed
if (nObjNum!=sal_uIntPtr(nAnz-1)) {
- bObjOrdNumsDirty=sal_True;
+ bObjOrdNumsDirty=true;
}
}
SetRectsDirty();
@@ -487,7 +487,7 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum)
DBG_ASSERT(pObj!=NULL,"SdrObjList::ReplaceObject: Could not find object to remove.");
if (pObj!=NULL) {
DBG_ASSERT(pObj->IsInserted(),"SdrObjList::ReplaceObject: ZObjekt does not have status Inserted.");
- pObj->SetInserted(sal_False);
+ pObj->SetInserted(false);
pObj->SetObjList(NULL);
pObj->SetPage(NULL);
ReplaceObjectInContainer(*pNewObj,nObjNum);
@@ -503,7 +503,7 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum)
// evtl. existing parent visualisations
impChildInserted(*pNewObj);
- pNewObj->SetInserted(sal_True);
+ pNewObj->SetInserted(true);
SetRectsDirty();
}
return pObj;
@@ -534,7 +534,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum)
pModel->Broadcast(aHint);
}
}
- pObj->SetInserted(sal_False);
+ pObj->SetInserted(false);
pObj->SetObjList(NULL);
pObj->SetPage(NULL);
ReplaceObjectInContainer(*pNewObj,nObjNum);
@@ -550,7 +550,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum)
// evtl. existing parent visualisations
impChildInserted(*pNewObj);
- pNewObj->SetInserted(sal_True);
+ pNewObj->SetInserted(true);
if (pModel!=NULL) {
// TODO: We need a different broadcast here.
if (pNewObj->GetPage()!=NULL) {
@@ -588,7 +588,7 @@ SdrObject* SdrObjList::NbcSetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nN
pObj->ActionChanged();
pObj->SetOrdNum(nNewObjNum);
- bObjOrdNumsDirty=sal_True;
+ bObjOrdNumsDirty=true;
}
return pObj;
}
@@ -615,7 +615,7 @@ SdrObject* SdrObjList::SetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewO
pObj->ActionChanged();
pObj->SetOrdNum(nNewObjNum);
- bObjOrdNumsDirty=sal_True;
+ bObjOrdNumsDirty=true;
if (pModel!=NULL)
{
// TODO: We need a different broadcast here.
@@ -630,7 +630,7 @@ const Rectangle& SdrObjList::GetAllObjSnapRect() const
{
if (bRectsDirty) {
((SdrObjList*)this)->RecalcRects();
- ((SdrObjList*)this)->bRectsDirty=sal_False;
+ ((SdrObjList*)this)->bRectsDirty=false;
}
return aSnapRect;
}
@@ -645,7 +645,7 @@ const Rectangle& SdrObjList::GetAllObjBoundRect() const
if (bRectsDirty || aOutRect.IsEmpty())
{
((SdrObjList*)this)->RecalcRects();
- ((SdrObjList*)this)->bRectsDirty=sal_False;
+ ((SdrObjList*)this)->bRectsDirty=false;
}
return aOutRect;
}
@@ -998,7 +998,7 @@ void SdrObjList::InsertObjectIntoContainer (
maList.push_back(&rObject);
else
maList.insert(maList.begin()+nInsertPosition, &rObject);
- bObjOrdNumsDirty=sal_True;
+ bObjOrdNumsDirty=true;
}
@@ -1035,7 +1035,7 @@ void SdrObjList::ReplaceObjectInContainer (
}
maList[nObjectPosition] = &rNewObject;
- bObjOrdNumsDirty=sal_True;
+ bObjOrdNumsDirty=true;
}
@@ -1064,7 +1064,7 @@ void SdrObjList::RemoveObjectFromContainer (
}
maList.erase(maList.begin()+nObjectPosition);
- bObjOrdNumsDirty=sal_True;
+ bObjOrdNumsDirty=true;
}
@@ -1665,10 +1665,10 @@ sal_uInt16 SdrPage::GetPageNum() const
if (mbMaster) {
if (pModel && pModel->IsMPgNumsDirty())
- ((SdrModel*)pModel)->RecalcPageNums(sal_True);
+ ((SdrModel*)pModel)->RecalcPageNums(true);
} else {
if (pModel && pModel->IsPagNumsDirty())
- ((SdrModel*)pModel)->RecalcPageNums(sal_False);
+ ((SdrModel*)pModel)->RecalcPageNums(false);
}
return nPageNum;
}
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 310897de24ca..4a58027d1583 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -617,7 +617,7 @@ void SdrPageView::SetLayer(const OUString& rName, SetOfByte& rBS, bool bJa)
if(!GetPage())
return;
- SdrLayerID nID = GetPage()->GetLayerAdmin().GetLayerID(rName, sal_True);
+ SdrLayerID nID = GetPage()->GetLayerAdmin().GetLayerID(rName, true);
if(SDRLAYER_NOTFOUND != nID)
rBS.Set(nID, bJa);
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 14470e4a8b18..8966df126bf4 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -170,23 +170,23 @@ void SdrPaintView::ImpClearVars()
#ifdef DBG_UTIL
pItemBrowser=NULL;
#endif
- bPageVisible=sal_True;
- bPageBorderVisible=sal_True;
- bBordVisible=sal_True;
- bGridVisible=sal_True;
- bGridFront =sal_False;
- bHlplVisible=sal_True;
- bHlplFront =sal_True;
- bGlueVisible=sal_False;
- bGlueVisible2=sal_False;
- bGlueVisible3=sal_False;
- bGlueVisible4=sal_False;
- bSwapAsynchron=sal_False;
- bPrintPreview=sal_False;
- mbPreviewRenderer=sal_False;
+ bPageVisible=true;
+ bPageBorderVisible=true;
+ bBordVisible=true;
+ bGridVisible=true;
+ bGridFront =false;
+ bHlplVisible=true;
+ bHlplFront =true;
+ bGlueVisible=false;
+ bGlueVisible2=false;
+ bGlueVisible3=false;
+ bGlueVisible4=false;
+ bSwapAsynchron=false;
+ bPrintPreview=false;
+ mbPreviewRenderer=false;
eAnimationMode = SDR_ANIMATION_ANIMATE;
- bAnimationPause = sal_False;
+ bAnimationPause = false;
nHitTolPix=2;
nMinMovPix=3;
@@ -194,9 +194,9 @@ void SdrPaintView::ImpClearVars()
nMinMovLog=0;
pActualOutDev=NULL;
pDragWin=NULL;
- bRestoreColors=sal_True;
+ bRestoreColors=true;
pDefaultStyleSheet=NULL;
- bSomeObjChgdFlag=sal_False;
+ bSomeObjChgdFlag=false;
nGraphicManagerDrawMode = GRFMGR_DRAW_STANDARD;
aComeBackTimer.SetTimeout(1);
aComeBackTimer.SetTimeoutHdl(LINK(this,SdrPaintView,ImpComeBackHdl));
@@ -228,7 +228,7 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
}
// flag to visualize groups
- bVisualizeEnteredGroup = sal_True;
+ bVisualizeEnteredGroup = true;
maColorConfig.AddListener(this);
onChangeColorConfig();
@@ -277,7 +277,7 @@ void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
SdrHintKind eKind=pSdrHint->GetKind();
if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED) {
if (bObjChg) {
- bSomeObjChgdFlag=sal_True;
+ bSomeObjChgdFlag=true;
aComeBackTimer.Start();
}
}
@@ -307,7 +307,7 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_
IMPL_LINK_NOARG_INLINE_START(SdrPaintView, ImpComeBackHdl)
{
if (bSomeObjChgdFlag) {
- bSomeObjChgdFlag=sal_False;
+ bSomeObjChgdFlag=false;
ModelHasChanged();
}
return 0;
@@ -869,7 +869,7 @@ void SdrPaintView::ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const
{
const SdrModel& rModel = *(GetModel());
const SdrLayerAdmin& rLayerAdmin = rModel.GetLayerAdmin();
- const SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID(rLayerAdmin.GetControlLayerName(), sal_False);
+ const SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID(rLayerAdmin.GetControlLayerName(), false);
// BUFFERED use GetTargetOutputDevice() now, it may be targeted to VDevs, too
// need to set PreparedPageWindow to make DrawLayer use the correct ObjectContact
@@ -1028,7 +1028,7 @@ void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool /*bOnl
bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
const OUString& aNam = bMeasure ? aMeasureLayer : aAktLayer;
rAttr.Put(SdrLayerNameItem(aNam));
- SdrLayerID nLayer=pMod->GetLayerAdmin().GetLayerID(aNam,sal_True);
+ SdrLayerID nLayer=pMod->GetLayerAdmin().GetLayerID(aNam,true);
if (nLayer!=SDRLAYER_NOTFOUND) {
rAttr.Put(SdrLayerIdItem(nLayer));
}
@@ -1057,7 +1057,7 @@ void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
}
#endif
if (bReplaceAll) aDefaultAttr.Set(rAttr);
- else aDefaultAttr.Put(rAttr,sal_False); // if FALSE, regard InvalidItems as "holes," not as Default
+ else aDefaultAttr.Put(rAttr,false); // if FALSE, regard InvalidItems as "holes," not as Default
SetNotPersistDefaultAttr(rAttr,bReplaceAll);
#ifdef DBG_UTIL
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
@@ -1091,13 +1091,13 @@ sal_Bool SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardA
{
if(bOnlyHardAttr || !pDefaultStyleSheet)
{
- rTargetSet.Put(aDefaultAttr, sal_False);
+ rTargetSet.Put(aDefaultAttr, false);
}
else
{
// else merge with DefStyleSheet
- rTargetSet.Put(pDefaultStyleSheet->GetItemSet(), sal_False);
- rTargetSet.Put(aDefaultAttr, sal_False);
+ rTargetSet.Put(pDefaultStyleSheet->GetItemSet(), false);
+ rTargetSet.Put(aDefaultAttr, false);
}
MergeNotPersistDefaultAttr(rTargetSet, bOnlyHardAttr);
return sal_True;
@@ -1128,7 +1128,7 @@ void SdrPaintView::ShowItemBrowser(sal_Bool bShow)
if (bShow) {
if (pItemBrowser==NULL) {
pItemBrowser=new SdrItemBrowser(*(SdrView*)this);
- pItemBrowser->SetFloatingMode(sal_True);
+ pItemBrowser->SetFloatingMode(true);
}
pItemBrowser->Show();
pItemBrowser->GrabFocus();
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 8dc10a78695e..af394839baa2 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -662,7 +662,7 @@ static void ImpMove(Point& rPt, Point* pC1, Point* pC2, const void* p1, const vo
void SdrPolyEditView::MoveMarkedPoints(const Size& rSiz, bool bCopy)
{
- bCopy=sal_False; // TODO: not yet implemented
+ bCopy=false; // TODO: not yet implemented
ForceUndirtyMrkPnt();
OUString aStr(ImpGetResStr(STR_EditMove));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
@@ -683,7 +683,7 @@ static void ImpResize(Point& rPt, Point* pC1, Point* pC2, const void* p1, const
void SdrPolyEditView::ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy)
{
- bCopy=sal_False; // TODO: not yet implemented
+ bCopy=false; // TODO: not yet implemented
ForceUndirtyMrkPnt();
OUString aStr(ImpGetResStr(STR_EditResize));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
@@ -704,7 +704,7 @@ static void ImpRotate(Point& rPt, Point* pC1, Point* pC2, const void* p1, const
void SdrPolyEditView::RotateMarkedPoints(const Point& rRef, long nWink, bool bCopy)
{
- bCopy=sal_False; // TODO: not yet implemented
+ bCopy=false; // TODO: not yet implemented
ForceUndirtyMrkPnt();
OUString aStr(ImpGetResStr(STR_EditResize));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 65337d25a116..4bdc12c38ff8 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -177,29 +177,29 @@ void ImplHelpLineOverlay::SetPosition(const basegfx::B2DPoint& rNewPosition)
void SdrSnapView::ClearVars()
{
nMagnSizPix=4;
- bSnapEnab=sal_True;
- bGridSnap=sal_True;
- bSnapTo1Pix=sal_True;
- bBordSnap=sal_True;
- bHlplSnap=sal_True;
- bOFrmSnap=sal_True;
- bOPntSnap=sal_False;
- bOConSnap=sal_True;
- bMoveMFrmSnap=sal_True;
- bMoveOFrmSnap=sal_True;
- bMoveOPntSnap=sal_True;
- bMoveOConSnap=sal_True;
- bMoveSnapOnlyTopLeft=sal_False;
- bOrtho=sal_False;
- bBigOrtho=sal_True;
+ bSnapEnab=true;
+ bGridSnap=true;
+ bSnapTo1Pix=true;
+ bBordSnap=true;
+ bHlplSnap=true;
+ bOFrmSnap=true;
+ bOPntSnap=false;
+ bOConSnap=true;
+ bMoveMFrmSnap=true;
+ bMoveOFrmSnap=true;
+ bMoveOPntSnap=true;
+ bMoveOConSnap=true;
+ bMoveSnapOnlyTopLeft=false;
+ bOrtho=false;
+ bBigOrtho=true;
nSnapAngle=1500;
- bAngleSnapEnab=sal_False;
- bMoveOnlyDragging=sal_False;
- bSlantButShear=sal_False;
- bCrookNoContortion=sal_False;
+ bAngleSnapEnab=false;
+ bMoveOnlyDragging=false;
+ bSlantButShear=false;
+ bCrookNoContortion=false;
eCrookMode=SDRCROOK_ROTATE;
- bHlplFixed=sal_False;
- bEliminatePolyPoints=sal_False;
+ bHlplFixed=false;
+ bEliminatePolyPoints=false;
nEliminatePolyPointLimitAngle=0;
BrkSetPageOrg();
@@ -348,7 +348,7 @@ sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
sal_uIntPtr nMaxFrameSnapCount=200;
// go back to IM_DEEPNOGROUPS runthrough for snap to object comparisons
- SdrObjListIter aIter(*pPV->GetPage(),IM_DEEPNOGROUPS,sal_True);
+ SdrObjListIter aIter(*pPV->GetPage(),IM_DEEPNOGROUPS,true);
while (aIter.IsMore() && (nMaxPointSnapCount>0 || nMaxFrameSnapCount>0)) {
SdrObject* pO=aIter.Next();
@@ -444,7 +444,7 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes
}
} else {
nBestXSnap=aPt.X();
- bXSnapped=sal_True;
+ bXSnapped=true;
}
}
if ((nRet & SDRSNAP_YSNAPPED) !=0) {
@@ -454,7 +454,7 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes
}
} else {
nBestYSnap=aPt.Y();
- bYSnapped=sal_True;
+ bYSnapped=true;
}
}
}
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index cd541754ea24..781782eab705 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -63,7 +63,7 @@ void SdrText::CheckPortionInfo( SdrOutliner& rOutliner )
void SdrText::ReformatText()
{
- mbPortionInfoChecked=sal_False;
+ mbPortionInfoChecked=false;
mpOutlinerParaObject->ClearPortionInfo();
}
@@ -163,7 +163,7 @@ void SdrText::SetModel( SdrModel* pNewModel )
}
SetOutlinerParaObject(rOutliner.CreateParaObject());
mpOutlinerParaObject->ClearPortionInfo();
- mbPortionInfoChecked=sal_False;
+ mbPortionInfoChecked=false;
rOutliner.Clear();
}
}
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index 89a8ddc4499b..45c89018347f 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -825,7 +825,7 @@ void SdrFormatter::Undirty()
nMul_=nMul1;
nDiv_=nDiv1;
nKomma_=nKomma1;
- bDirty=sal_False;
+ bDirty=false;
}
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index bc78d6b6727b..3ec558a41888 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -83,7 +83,7 @@ OUString SdrUndoAction::GetRepeatComment(SfxRepeatTarget& rView) const
bool SdrUndoAction::CanSdrRepeat(SdrView& /*rView*/) const
{
- return sal_False;
+ return false;
}
void SdrUndoAction::SdrRepeat(SdrView& /*rView*/)
@@ -269,7 +269,7 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1, bool bSave
, pRepeatSet(NULL)
, mxUndoStyleSheet()
, mxRedoStyleSheet()
- , bHaveToTakeRedoSet(sal_True)
+ , bHaveToTakeRedoSet(true)
, pTextUndo(NULL)
, pTextRedo(NULL)
, pUndoGroup(NULL)
@@ -331,7 +331,7 @@ void SdrUndoAttrObj::Undo()
{
if(bHaveToTakeRedoSet)
{
- bHaveToTakeRedoSet = sal_False;
+ bHaveToTakeRedoSet = false;
delete pRedoSet;
@@ -358,7 +358,7 @@ void SdrUndoAttrObj::Undo()
if(pSheet && pObj->GetModel() && pObj->GetModel()->GetStyleSheetPool())
{
ensureStyleSheetInStyleSheetPool(*pObj->GetModel()->GetStyleSheetPool(), *pSheet);
- pObj->SetStyleSheet(pSheet, sal_True);
+ pObj->SetStyleSheet(pSheet, true);
}
else
{
@@ -441,7 +441,7 @@ void SdrUndoAttrObj::Redo()
if(pSheet && pObj->GetModel() && pObj->GetModel()->GetStyleSheetPool())
{
ensureStyleSheetInStyleSheetPool(*pObj->GetModel()->GetStyleSheetPool(), *pSheet);
- pObj->SetStyleSheet(pSheet, sal_True);
+ pObj->SetStyleSheet(pSheet, true);
}
else
{
@@ -542,11 +542,11 @@ OUString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& /*rView*/) const
if(bStyleSheet)
{
- ImpTakeDescriptionStr(STR_EditSetStylesheet, aStr, sal_True);
+ ImpTakeDescriptionStr(STR_EditSetStylesheet, aStr, true);
}
else
{
- ImpTakeDescriptionStr(STR_EditSetAttributes, aStr, sal_True);
+ ImpTakeDescriptionStr(STR_EditSetAttributes, aStr, true);
}
return aStr;
@@ -592,7 +592,7 @@ bool SdrUndoMoveObj::CanSdrRepeat(SdrView& rView) const
OUString SdrUndoMoveObj::GetSdrRepeatComment(SdrView& /*rView*/) const
{
OUString aStr;
- ImpTakeDescriptionStr(STR_EditMove,aStr,sal_True);
+ ImpTakeDescriptionStr(STR_EditMove,aStr,true);
return aStr;
}
@@ -741,7 +741,7 @@ void SdrUndoObjList::ObjListListener::Notify(SfxBroadcaster&, const SfxHint& rHi
SdrUndoObjList::SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect)
: SdrUndoObj(rNewObj)
- , bOwner(sal_False)
+ , bOwner(false)
, pView(NULL)
, pPageView(NULL)
, m_pListener(NULL)
@@ -766,7 +766,7 @@ SdrUndoObjList::~SdrUndoObjList()
if (pObj!=NULL && IsOwner())
{
// Attribute have to go back to the regular Pool
- SetOwner(sal_False);
+ SetOwner(false);
// now delete
SdrObject::Free( pObj );
@@ -924,14 +924,14 @@ void SdrUndoDelObj::Undo()
{
SdrUndoRemoveObj::Undo();
DBG_ASSERT(IsOwner(),"UndoDeleteObj: pObj does not belong to UndoAction");
- SetOwner(sal_False);
+ SetOwner(false);
}
void SdrUndoDelObj::Redo()
{
SdrUndoRemoveObj::Redo();
DBG_ASSERT(!IsOwner(),"RedoDeleteObj: pObj already belongs to UndoAction");
- SetOwner(sal_True);
+ SetOwner(true);
// #i122985# if graphic object is deleted (but goes to undo) flush it's graphic content
// since it is potentially no longer needed
@@ -958,7 +958,7 @@ bool SdrUndoDelObj::CanSdrRepeat(SdrView& rView) const
OUString SdrUndoDelObj::GetSdrRepeatComment(SdrView& /*rView*/) const
{
OUString aStr;
- ImpTakeDescriptionStr(STR_EditDelete,aStr,sal_True);
+ ImpTakeDescriptionStr(STR_EditDelete,aStr,true);
return aStr;
}
@@ -968,14 +968,14 @@ void SdrUndoNewObj::Undo()
{
SdrUndoInsertObj::Undo();
DBG_ASSERT(!IsOwner(),"RedoNewObj: pObj already belongs to UndoAction");
- SetOwner(sal_True);
+ SetOwner(true);
}
void SdrUndoNewObj::Redo()
{
SdrUndoInsertObj::Redo();
DBG_ASSERT(IsOwner(),"RedoNewObj: pObj does not belong to UndoAction");
- SetOwner(sal_False);
+ SetOwner(false);
}
OUString SdrUndoNewObj::GetComment( const SdrObject& _rForObject )
@@ -992,11 +992,11 @@ OUString SdrUndoNewObj::GetComment() const
SdrUndoReplaceObj::SdrUndoReplaceObj(SdrObject& rOldObj1, SdrObject& rNewObj1, bool bOrdNumDirect)
: SdrUndoObj(rOldObj1)
- , bOldOwner(sal_False)
- , bNewOwner(sal_False)
+ , bOldOwner(false)
+ , bNewOwner(false)
, pNewObj(&rNewObj1)
{
- SetOldOwner(sal_True);
+ SetOldOwner(true);
pObjList=pObj->GetObjList();
if (bOrdNumDirect)
@@ -1014,7 +1014,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj()
if (pObj!=NULL && IsOldOwner())
{
// Attribute have to go back into the Pool
- SetOldOwner(sal_False);
+ SetOldOwner(false);
// now delete
SdrObject::Free( pObj );
@@ -1022,7 +1022,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj()
if (pNewObj!=NULL && IsNewOwner())
{
// Attribute have to go back into the Pool
- SetNewOwner(sal_False);
+ SetNewOwner(false);
// now delete
SdrObject::Free( pNewObj );
@@ -1038,8 +1038,8 @@ void SdrUndoReplaceObj::Undo()
{
DBG_ASSERT(!pObj->IsInserted(),"SdrUndoReplaceObj::Undo(): Old object is already inserted!");
DBG_ASSERT(pNewObj->IsInserted(),"SdrUndoReplaceObj::Undo(): New object is not inserted!");
- SetOldOwner(sal_False);
- SetNewOwner(sal_True);
+ SetOldOwner(false);
+ SetNewOwner(true);
ImplUnmarkObject( pNewObj );
pObjList->ReplaceObject(pObj,nOrdNum);
@@ -1056,8 +1056,8 @@ void SdrUndoReplaceObj::Redo()
{
DBG_ASSERT(!pNewObj->IsInserted(),"SdrUndoReplaceObj::Redo(): New object is already inserted!!");
DBG_ASSERT(pObj->IsInserted(),"SdrUndoReplaceObj::Redo(): Old object is not inserted!!");
- SetOldOwner(sal_True);
- SetNewOwner(sal_False);
+ SetOldOwner(true);
+ SetNewOwner(false);
ImplUnmarkObject( pObj );
pObjList->ReplaceObject(pNewObj,nOrdNum);
@@ -1163,7 +1163,7 @@ SdrUndoObjSetText::SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText)
: SdrUndoObj(rNewObj)
, pOldText(NULL)
, pNewText(NULL)
- , bNewTextAvailable(sal_False)
+ , bNewTextAvailable(false)
, bEmptyPresObj(sal_False)
, mnText(nText)
{
@@ -1187,7 +1187,7 @@ void SdrUndoObjSetText::AfterSetText()
SdrText* pText = static_cast< SdrTextObj*>( pObj )->getText(mnText);
if( pText && pText->GetOutlinerParaObject() )
pNewText = new OutlinerParaObject(*pText->GetOutlinerParaObject());
- bNewTextAvailable=sal_True;
+ bNewTextAvailable=true;
}
}
@@ -1292,7 +1292,7 @@ bool SdrUndoObjSetText::CanSdrRepeat(SdrView& rView) const
{
bool bOk = false;
if (bNewTextAvailable && rView.AreObjectsMarked()) {
- bOk=sal_True;
+ bOk=true;
}
return bOk;
}
@@ -1371,7 +1371,7 @@ SdrUndoLayer::SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin,
, pLayer(rNewLayerAdmin.GetLayer(nLayerNum))
, pLayerAdmin(&rNewLayerAdmin)
, nNum(nLayerNum)
- , bItsMine(sal_False)
+ , bItsMine(false)
{
}
@@ -1388,7 +1388,7 @@ SdrUndoLayer::~SdrUndoLayer()
void SdrUndoNewLayer::Undo()
{
DBG_ASSERT(!bItsMine,"SdrUndoNewLayer::Undo(): Layer already belongs to UndoAction.");
- bItsMine=sal_True;
+ bItsMine=true;
#ifdef DBG_UTIL
SdrLayer* pCmpLayer=
#endif
@@ -1399,7 +1399,7 @@ void SdrUndoNewLayer::Undo()
void SdrUndoNewLayer::Redo()
{
DBG_ASSERT(bItsMine,"SdrUndoNewLayer::Undo(): Layer does not belong to UndoAction.");
- bItsMine=sal_False;
+ bItsMine=false;
pLayerAdmin->InsertLayer(pLayer,nNum);
}
@@ -1413,14 +1413,14 @@ OUString SdrUndoNewLayer::GetComment() const
void SdrUndoDelLayer::Undo()
{
DBG_ASSERT(bItsMine,"SdrUndoDelLayer::Undo(): Layer does not belong to UndoAction.");
- bItsMine=sal_False;
+ bItsMine=false;
pLayerAdmin->InsertLayer(pLayer,nNum);
}
void SdrUndoDelLayer::Redo()
{
DBG_ASSERT(!bItsMine,"SdrUndoDelLayer::Undo(): Layer already belongs to UndoAction.");
- bItsMine=sal_True;
+ bItsMine=true;
#ifdef DBG_UTIL
SdrLayer* pCmpLayer=
#endif
@@ -1527,7 +1527,7 @@ void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr,
SdrUndoPageList::SdrUndoPageList(SdrPage& rNewPg)
: SdrUndoPage(rNewPg)
- , bItsMine(sal_False)
+ , bItsMine(false)
{
nPageNum=rNewPg.GetPageNum();
}
@@ -1546,7 +1546,7 @@ SdrUndoDelPage::SdrUndoDelPage(SdrPage& rNewPg)
: SdrUndoPageList(rNewPg)
, pUndoGroup(NULL)
{
- bItsMine = sal_True;
+ bItsMine = true;
// now remember the master page relationships
if(mrPage.IsMasterPage())
@@ -1589,7 +1589,7 @@ void SdrUndoDelPage::Undo()
pUndoGroup->Undo();
}
DBG_ASSERT(bItsMine,"UndoDeletePage: mrPage does not belong to UndoAction.");
- bItsMine=sal_False;
+ bItsMine=false;
}
void SdrUndoDelPage::Redo()
@@ -1597,20 +1597,20 @@ void SdrUndoDelPage::Redo()
ImpRemovePage(nPageNum);
// master page relations are dissolved automatically
DBG_ASSERT(!bItsMine,"RedoDeletePage: mrPage already belongs to UndoAction.");
- bItsMine=sal_True;
+ bItsMine=true;
}
OUString SdrUndoDelPage::GetComment() const
{
OUString aStr;
- ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,sal_False);
+ ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,false);
return aStr;
}
OUString SdrUndoDelPage::GetSdrRepeatComment(SdrView& /*rView*/) const
{
OUString aStr;
- ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,sal_False);
+ ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,false);
return aStr;
}
@@ -1629,20 +1629,20 @@ void SdrUndoNewPage::Undo()
{
ImpRemovePage(nPageNum);
DBG_ASSERT(!bItsMine,"UndoNewPage: mrPage already belongs to UndoAction.");
- bItsMine=sal_True;
+ bItsMine=true;
}
void SdrUndoNewPage::Redo()
{
ImpInsertPage(nPageNum);
DBG_ASSERT(bItsMine,"RedoNewPage: mrPage does not belong to UndoAction.");
- bItsMine=sal_False;
+ bItsMine=false;
}
OUString SdrUndoNewPage::GetComment() const
{
OUString aStr;
- ImpTakeDescriptionStr(STR_UndoNewPage,aStr,0,sal_False);
+ ImpTakeDescriptionStr(STR_UndoNewPage,aStr,0,false);
return aStr;
}
@@ -1651,14 +1651,14 @@ OUString SdrUndoNewPage::GetComment() const
OUString SdrUndoCopyPage::GetComment() const
{
OUString aStr;
- ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,sal_False);
+ ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,false);
return aStr;
}
OUString SdrUndoCopyPage::GetSdrRepeatComment(SdrView& /*rView*/) const
{
OUString aStr;
- ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,sal_False);
+ ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,false);
return aStr;
}
@@ -1687,7 +1687,7 @@ void SdrUndoSetPageNum::Redo()
OUString SdrUndoSetPageNum::GetComment() const
{
OUString aStr;
- ImpTakeDescriptionStr(STR_UndoMovPage,aStr,0,sal_False);
+ ImpTakeDescriptionStr(STR_UndoMovPage,aStr,0,false);
return aStr;
}
@@ -1731,7 +1731,7 @@ void SdrUndoPageRemoveMasterPage::Redo()
OUString SdrUndoPageRemoveMasterPage::GetComment() const
{
OUString aStr;
- ImpTakeDescriptionStr(STR_UndoDelPageMasterDscr,aStr,0,sal_False);
+ ImpTakeDescriptionStr(STR_UndoDelPageMasterDscr,aStr,0,false);
return aStr;
}
@@ -1776,7 +1776,7 @@ void SdrUndoPageChangeMasterPage::Redo()
OUString SdrUndoPageChangeMasterPage::GetComment() const
{
OUString aStr;
- ImpTakeDescriptionStr(STR_UndoChgPageMasterDscr,aStr,0,sal_False);
+ ImpTakeDescriptionStr(STR_UndoChgPageMasterDscr,aStr,0,false);
return aStr;
}
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 8b5f70a3e7e0..45aaca34f978 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -67,20 +67,20 @@ SdrViewEvent::SdrViewEvent()
nMouseCode(0),
nHlplIdx(0),
nGlueId(0),
- bMouseDown(sal_False),
- bMouseUp(sal_False),
- bDoubleHdlSize(sal_False),
- bIsAction(sal_False),
- bIsTextEdit(sal_False),
- bTextEditHit(sal_False),
- bAddMark(sal_False),
- bUnmark(sal_False),
- bPrevNextMark(sal_False),
- bMarkPrev(sal_False),
- bInsPointNewObj(sal_False),
- bDragWithCopy(sal_False),
- bCaptureMouse(sal_False),
- bReleaseMouse(sal_False)
+ bMouseDown(false),
+ bMouseUp(false),
+ bDoubleHdlSize(false),
+ bIsAction(false),
+ bIsTextEdit(false),
+ bTextEditHit(false),
+ bAddMark(false),
+ bUnmark(false),
+ bPrevNextMark(false),
+ bMarkPrev(false),
+ bInsPointNewObj(false),
+ bDragWithCopy(false),
+ bCaptureMouse(false),
+ bReleaseMouse(false)
{
}
@@ -158,12 +158,12 @@ TYPEINIT1(SdrView,SdrCreateView);
SdrView::SdrView(SdrModel* pModel1, OutputDevice* pOut)
: SdrCreateView(pModel1,pOut),
- bNoExtendedMouseDispatcher(sal_False),
- bNoExtendedKeyDispatcher(sal_False),
- bNoExtendedCommandDispatcher(sal_False),
- mbMasterPagePaintCaching(sal_False)
+ bNoExtendedMouseDispatcher(false),
+ bNoExtendedKeyDispatcher(false),
+ bNoExtendedCommandDispatcher(false),
+ mbMasterPagePaintCaching(false)
{
- bTextEditOnObjectsWithoutTextIfTextTool=sal_False;
+ bTextEditOnObjectsWithoutTextIfTextTool=false;
maAccessibilityOptions.AddListener(this);
@@ -221,7 +221,7 @@ sal_Bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
sal_Bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
{
SetActualWin(pWin);
- if (rMEvt.IsLeft()) aDragStat.SetMouseDown(sal_True);
+ if (rMEvt.IsLeft()) aDragStat.SetMouseDown(true);
sal_Bool bRet=SdrCreateView::MouseButtonDown(rMEvt,pWin);
if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) {
SdrViewEvent aVEvt;
@@ -234,7 +234,7 @@ sal_Bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
sal_Bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
{
SetActualWin(pWin);
- if (rMEvt.IsLeft()) aDragStat.SetMouseDown(sal_False);
+ if (rMEvt.IsLeft()) aDragStat.SetMouseDown(false);
sal_Bool bAction=IsAction();
sal_Bool bRet=!bAction && SdrCreateView::MouseButtonUp(rMEvt,pWin);
if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) {
@@ -470,7 +470,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
if( pTextObj->GetModel() )
pOutliner = &pTextObj->GetModel()->GetHitTestOutliner();
- pTextObj->TakeTextRect( *pOutliner, aTextRect, sal_False, &aAnchor, sal_False );
+ pTextObj->TakeTextRect( *pOutliner, aTextRect, false, &aAnchor, false );
// #i73628# Use a text-relative position for hit test in hit test outliner
Point aTemporaryTextRelativePosition(aLocalLogicPosition - aTextRect.TopLeft());
@@ -541,7 +541,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
// TextEdit attached to an object in a locked layer
if (pPV->GetLockedLayers().IsSet(pHitObj->GetLayer()))
{
- bTEHit=sal_False;
+ bTEHit=false;
}
if (bTEHit)
@@ -639,13 +639,13 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
eEvent=bGlue ? SDREVENT_MARKGLUEPOINT : SDREVENT_MARKPOINT;
if (MODKEY_DeepMark)
{
- rVEvt.bAddMark=sal_True;
- rVEvt.bPrevNextMark=sal_True;
+ rVEvt.bAddMark=true;
+ rVEvt.bPrevNextMark=true;
rVEvt.bMarkPrev=MODKEY_DeepBackw;
}
else if (MODKEY_MultiMark)
{
- rVEvt.bAddMark=sal_True;
+ rVEvt.bAddMark=true;
rVEvt.bUnmark=bMarked; // Toggle
if (bGlue)
{
@@ -764,9 +764,9 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
sal_Bool bMouseDown=rVEvt.bMouseDown;
sal_Bool bMouseUp=rVEvt.bMouseUp;
if (bMouseDown) {
- if (bMouseLeft) aDragStat.SetMouseDown(sal_True);
+ if (bMouseLeft) aDragStat.SetMouseDown(true);
} else if (bMouseUp) {
- if (bMouseLeft) aDragStat.SetMouseDown(sal_False);
+ if (bMouseLeft) aDragStat.SetMouseDown(false);
} else { // else, MouseMove
aDragStat.SetMouseDown(bMouseLeft);
}
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 0bdfb4a186e5..b437f5835064 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -114,7 +114,7 @@ sal_Bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerI
if (pObjList!=NULL) {
const SdrPage* pPg=pObjList->GetPage();
if (pPg!=NULL) {
- rLayer=pPg->GetLayerAdmin().GetLayerID(aAktLayer,sal_True);
+ rLayer=pPg->GetLayerAdmin().GetLayerID(aAktLayer,true);
if (rLayer==SDRLAYER_NOTFOUND) rLayer=0;
SdrPageView* pPV = GetSdrPageView();
if (pPV!=NULL) {
@@ -304,9 +304,9 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL
{
if(bResize)
{
- pNeuObj->GetModel()->SetPasteResize(sal_True);
+ pNeuObj->GetModel()->SetPasteResize(true);
pNeuObj->NbcResize(aPt0,xResize,yResize);
- pNeuObj->GetModel()->SetPasteResize(sal_False);
+ pNeuObj->GetModel()->SetPasteResize(false);
}
// #i39861#
@@ -330,7 +330,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL
}
else
{
- nLayer = rAd.GetLayerID(aAktLayer, sal_True);
+ nLayer = rAd.GetLayerID(aAktLayer, true);
}
if(SDRLAYER_NOTFOUND == nLayer)
@@ -681,7 +681,7 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject*
::std::vector< SdrMark* >& rObjVector1 = aObjVectors[ 0 ];
::std::vector< SdrMark* >& rObjVector2 = aObjVectors[ 1 ];
const SdrLayerAdmin& rLayerAdmin = pMod->GetLayerAdmin();
- const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), sal_False );
+ const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), false );
sal_uInt32 n, nCount;
for( n = 0, nCount = GetMarkedObjectCount(); n < nCount; n++ )
@@ -733,7 +733,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
// use a copy.
SortMarkedObjects();
SdrModel* pNeuMod=pMod->AllocModel();
- SdrPage* pNeuPag=pNeuMod->AllocPage(sal_False);
+ SdrPage* pNeuPag=pNeuMod->AllocPage(false);
pNeuMod->InsertPage(pNeuPag);
if( !mxSelectionController.is() || !mxSelectionController->GetMarkedObjModel( pNeuPag ) )
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 068a6557fe2c..f667c0bd4ae2 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -745,7 +745,7 @@ SdrTableObj::SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int
void SdrTableObj::init( sal_Int32 nColumns, sal_Int32 nRows )
{
- bClosedObj = sal_True;
+ bClosedObj = true;
mpImpl = new SdrTableObjImpl;
mpImpl->acquire();
@@ -1332,27 +1332,27 @@ void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
void SdrTableObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bResizeFreeAllowed=sal_True;
- rInfo.bResizePropAllowed=sal_True;
- rInfo.bRotateFreeAllowed=sal_False;
- rInfo.bRotate90Allowed =sal_False;
- rInfo.bMirrorFreeAllowed=sal_False;
- rInfo.bMirror45Allowed =sal_False;
- rInfo.bMirror90Allowed =sal_False;
+ rInfo.bResizeFreeAllowed=true;
+ rInfo.bResizePropAllowed=true;
+ rInfo.bRotateFreeAllowed=false;
+ rInfo.bRotate90Allowed =false;
+ rInfo.bMirrorFreeAllowed=false;
+ rInfo.bMirror45Allowed =false;
+ rInfo.bMirror90Allowed =false;
// allow transparence
- rInfo.bTransparenceAllowed = sal_True;
+ rInfo.bTransparenceAllowed = true;
// gradient depends on fillstyle
XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
- rInfo.bShearAllowed =sal_False;
- rInfo.bEdgeRadiusAllowed=sal_False;
- rInfo.bCanConvToPath =sal_False;
- rInfo.bCanConvToPoly =sal_False;
- rInfo.bCanConvToPathLineToArea=sal_False;
- rInfo.bCanConvToPolyLineToArea=sal_False;
- rInfo.bCanConvToContour = sal_False;
+ rInfo.bShearAllowed =false;
+ rInfo.bEdgeRadiusAllowed=false;
+ rInfo.bCanConvToPath =false;
+ rInfo.bCanConvToPoly =false;
+ rInfo.bCanConvToPathLineToArea=false;
+ rInfo.bCanConvToPolyLineToArea=false;
+ rInfo.bCanConvToContour = false;
}
// --------------------------------------------------------------------
@@ -2012,7 +2012,7 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, bool bWidth) const
{
if((pModel == NULL) || rR.IsEmpty() || !mpImpl || !mpImpl->mxTable.is() )
- return sal_False;
+ return false;
Rectangle aRectangle( rR );
mpImpl->LayoutTable( aRectangle, !bWidth, !bHeight );
@@ -2020,11 +2020,11 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, boo
if( aRectangle != rR )
{
rR = aRectangle;
- return sal_True;
+ return true;
}
else
{
- return sal_False;
+ return false;
}
}
@@ -2413,7 +2413,7 @@ bool SdrTableObj::MovCreate(SdrDragStat& rStat)
rStat.SetActionRect(aRect1);
aRect=aRect1; // fuer ObjName
SetBoundRectDirty();
- bSnapRectDirty=sal_True;
+ bSnapRectDirty=true;
return true;
}
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index a1bf2a921bd3..c4e3aa49ec8c 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -418,7 +418,7 @@ void SvxTableController::GetState( SfxItemSet& rSet )
if( !pSet )
{
pSet = new SfxItemSet( mxTableObj->GetModel()->GetItemPool() );
- MergeAttrFromSelectedCells(*pSet, sal_False);
+ MergeAttrFromSelectedCells(*pSet, false);
}
SdrTextVertAdjust eAdj = SDRTEXTVERTADJUST_BLOCK;
@@ -735,7 +735,7 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
SvxBoxInfoItem aBoxInfoItem( static_cast< const SvxBoxInfoItem& >( aNewAttr.Get( SDRATTR_TABLE_BORDER_INNER ) ) );
- MergeAttrFromSelectedCells(aNewAttr, sal_False);
+ MergeAttrFromSelectedCells(aNewAttr, false);
FillCommonBorderAttrFromSelectedCells( aBoxItem, aBoxInfoItem );
aNewAttr.Put( aBoxItem );
aNewAttr.Put( aBoxInfoItem );
@@ -762,7 +762,7 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
if( aNewBoxItem.GetDistance( BOX_LINE_BOTTOM ) != aBoxItem.GetDistance( BOX_LINE_BOTTOM ) )
aNewSet.Put(SdrTextLowerDistItem( aNewBoxItem.GetDistance( BOX_LINE_BOTTOM ) ) );
- SetAttrToSelectedCells(aNewSet, sal_False);
+ SetAttrToSelectedCells(aNewSet, false);
}
}
}
@@ -2300,7 +2300,7 @@ void SvxTableController::SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bR
getSelectedCells( aStart, aEnd );
SfxItemSet aAttr(*rAttr.GetPool(), rAttr.GetRanges());
- aAttr.Put(rAttr, sal_True);
+ aAttr.Put(rAttr, true);
const bool bFrame = (rAttr.GetItemState( SDRATTR_TABLE_BORDER ) == SFX_ITEM_SET) || (rAttr.GetItemState( SDRATTR_TABLE_BORDER_INNER ) == SFX_ITEM_SET);
@@ -2354,7 +2354,7 @@ bool SvxTableController::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAtt
if(pTextEditOutlinerView)
{
// FALSE= InvalidItems nicht al Default, sondern als "Loecher" betrachten
- rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), sal_False);
+ rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), false);
rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ) );
}
}
@@ -2507,7 +2507,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo
getSelectedCells( aStart, aEnd );
SfxItemSet aAttr(*rFormatSet.GetPool(), rFormatSet.GetRanges());
- aAttr.Put(rFormatSet, sal_True);
+ aAttr.Put(rFormatSet, true);
const bool bFrame = (rFormatSet.GetItemState( SDRATTR_TABLE_BORDER ) == SFX_ITEM_SET) || (rFormatSet.GetItemState( SDRATTR_TABLE_BORDER_INNER ) == SFX_ITEM_SET);
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index 5c643ad9dd84..167c6654b5ba 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -198,7 +198,7 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow )
}
bool bResetPar, bResetAttr;
- bResetPar = bResetAttr = sal_False;
+ bResetPar = bResetAttr = false;
SdrTextHorzAdjust eHAdj = xCell->GetTextHorizontalAdjust();
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 8c7fd001eddf..82edd54d4afc 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -301,7 +301,7 @@ void SdrTableRTFParser::NewCellRow()
{
if( mbNewDef )
{
- mbNewDef = sal_False;
+ mbNewDef = false;
maRows.push_back( RTFColumnVectorPtr( new RTFColumnVector() ) );
}
@@ -358,7 +358,7 @@ void SdrTableRTFParser::ProcToken( ImportInfo* pInfo )
break;
case RTF_CELLX: // closes cell default
{
- mbNewDef = sal_True;
+ mbNewDef = true;
mpInsDefault->mnCol = mnColCnt;
maDefaultList.push_back( boost::shared_ptr< RTFCellDefault >( mpInsDefault ) );
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index fb0c17b7e919..ec7d54ecc31e 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -398,7 +398,7 @@ void SvxColorDockingWindow::SetSize()
sal_Bool SvxColorDockingWindow::Close()
{
- SfxBoolItem aItem( SID_COLOR_CONTROL, sal_False );
+ SfxBoolItem aItem( SID_COLOR_CONTROL, false );
GetBindings().GetDispatcher()->Execute(
SID_COLOR_CONTROL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
SfxDockingWindow::Close();
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 0ff5b9212c67..024d913b3548 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -92,7 +92,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow(
mpDirectionSet->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) );
mpDirectionSet->SetColCount( 3 );
- mpDirectionSet->EnableFullItemMode( sal_False );
+ mpDirectionSet->EnableFullItemMode( false );
for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
{
@@ -583,7 +583,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr
mpLightingSet->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) );
mpLightingSet->SetColCount( 3 );
- mpLightingSet->EnableFullItemMode( sal_False );
+ mpLightingSet->EnableFullItemMode( false );
for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ )
{
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index fd370d9423a7..00157c01bf7c 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -304,7 +304,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
XGradientEntry* pEntry = new XGradientEntry( pGradientItem->GetGradientValue(), aTmpStr );
XGradientList aGradientList( "", ""/*TODO?*/ );
aGradientList.Insert( pEntry );
- aGradientList.SetDirty( sal_False );
+ aGradientList.SetDirty( false );
const Bitmap aBmp = aGradientList.GetUiBitmap( 0 );
if( !aBmp.IsEmpty() )
@@ -349,7 +349,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
XHatchEntry* pEntry = new XHatchEntry( pHatchItem->GetHatchValue(), aTmpStr );
XHatchList aHatchList( "", ""/*TODO?*/ );
aHatchList.Insert( pEntry );
- aHatchList.SetDirty( sal_False );
+ aHatchList.SetDirty( false );
const Bitmap aBmp = aHatchList.GetUiBitmap( 0 );
if( !aBmp.IsEmpty() )
@@ -403,7 +403,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
XPropertyList::CreatePropertyList(XBITMAP_LIST,
OUString("TmpList"), ""/*TODO?*/)->AsBitmapList();
xBitmapList->Insert( pEntry );
- xBitmapList->SetDirty( sal_False );
+ xBitmapList->SetDirty( false );
pFillAttrLB->Fill( xBitmapList );
pFillAttrLB->SelectEntryPos( pFillAttrLB->GetEntryCount() - 1 );
xBitmapList->Remove( 0 );
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 2ec5104c06b7..1fb08a15f673 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -551,7 +551,7 @@ void FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharact
sal_Int32 i;
for ( i = 0; i < 6; i++ )
{
- checkEntry( i, sal_False );
+ checkEntry( i, false );
enableEntry( i, bEnabled );
}
if ( nCharacterSpacing != -1 )
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 6a913978e338..75ff6e158554 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -717,7 +717,7 @@ void ColumnsWindow::PopupModeEnd()
SvxTableToolBoxControl::SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ),
- bEnabled( sal_True )
+ bEnabled( true )
{
rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
rTbx.Invalidate();
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 68998469994b..5284816bb226 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -416,7 +416,7 @@ void SvxStyleBox_Impl::Select()
SfxStyleSheetBasePool* pPool = pShell->GetStyleSheetPool();
SfxStyleSheetBase* pStyle = NULL;
- bool bCreateNew = 0;
+ bool bCreateNew = false;
if ( pPool )
{
@@ -431,7 +431,7 @@ void SvxStyleBox_Impl::Select()
{
// cannot find the style for whatever reason
// therefore create a new style
- bCreateNew = 1;
+ bCreateNew = true;
}
/* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call.
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index e698b97881a7..ce7090340ca8 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -437,11 +437,11 @@ VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWid
if(bSuccess)
{
SdrView* pView = new SdrView(mpDoc, pVDev);
- pView->SetPageVisible( sal_False );
- pView->SetBordVisible( sal_False );
- pView->SetGridVisible( sal_False );
- pView->SetHlplVisible( sal_False );
- pView->SetGlueVisible( sal_False );
+ pView->SetPageVisible( false );
+ pView->SetBordVisible( false );
+ pView->SetGridVisible( false );
+ pView->SetHlplVisible( false );
+ pView->SetGlueVisible( false );
pView->ShowSdrPage(pPage);
Region aRegion (Rectangle( aPoint, aPageSize ) );
@@ -743,8 +743,8 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
pView.reset(new SdrView( mpDoc, &aVDev ));
}
- pView->SetBordVisible( sal_False );
- pView->SetPageVisible( sal_False );
+ pView->SetBordVisible( false );
+ pView->SetPageVisible( false );
pView->ShowSdrPage( pPage );
const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() );
@@ -1185,7 +1185,7 @@ void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XCompon
// no errors so far
return;
}
- while( 0 );
+ while( false );
}
catch( Exception& )
{
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 7c162591af79..13541f214b38 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -326,7 +326,7 @@ uno::Any SAL_CALL SvxUnoMarkerTable::getByName( const OUString& aApiName )
throw container::NoSuchElementException();
}
- while(0);
+ while(false);
}
return aAny;
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index c8926b06d2e5..a0c66808fa2f 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -483,7 +483,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x
double fH = (double)aSize.Height;
Camera3D aCam(pScene->GetCamera());
- aCam.SetAutoAdjustProjection(sal_False);
+ aCam.SetAutoAdjustProjection(false);
aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
basegfx::B3DPoint aLookAt;
basegfx::B3DPoint aCamPos(0.0, 0.0, 10000.0);
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 08a610cfe165..be3b0dd01437 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -182,7 +182,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
pPool->SetPoolDefaultItem( XFillBmpTileItem( eMode == drawing::BitmapMode_REPEAT ) );
return;
}
- while(0);
+ while(false);
default:
{
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index bf3f86cd4de5..fc2285106307 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -287,7 +287,7 @@ void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xS
}
else
{
- DBG_ASSERT( 0, "Fatality! SdrObject is not belonging to its SdrObjList! [CL]" );
+ DBG_ASSERT( false, "Fatality! SdrObject is not belonging to its SdrObjList! [CL]" );
}
if( mpModel )
@@ -484,7 +484,7 @@ void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XC
SvxShape* pShape = SvxShape::getImplementation( xRef );
if( pShape )
- mpObj->ConnectToNode( sal_True, pShape->mpObj.get() );
+ mpObj->ConnectToNode( true, pShape->mpObj.get() );
if( mpModel )
mpModel->SetChanged();
@@ -500,7 +500,7 @@ void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XCon
SvxShape* pShape = SvxShape::getImplementation( xRef );
if( mpObj.is() && pShape )
- mpObj->ConnectToNode( sal_False, pShape->mpObj.get() );
+ mpObj->ConnectToNode( false, pShape->mpObj.get() );
if( mpModel )
mpModel->SetChanged();
@@ -513,7 +513,7 @@ void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing:
::SolarMutexGuard aGuard;
if(mpObj.is())
- mpObj->DisconnectFromNode( sal_True );
+ mpObj->DisconnectFromNode( true );
if( mpModel )
mpModel->SetChanged();
@@ -526,7 +526,7 @@ void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::X
::SolarMutexGuard aGuard;
if(mpObj.is())
- mpObj->DisconnectFromNode( sal_False );
+ mpObj->DisconnectFromNode( false );
if( mpModel )
mpModel->SetChanged();
@@ -1493,7 +1493,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte
SvMemoryStream aMemStm;
Graphic aGraphic;
- aMemStm.SetBuffer( (char*)pSeq->getConstArray(), pSeq->getLength(), sal_False, pSeq->getLength() );
+ aMemStm.SetBuffer( (char*)pSeq->getConstArray(), pSeq->getLength(), false, pSeq->getLength() );
if( GraphicConverter::Import( aMemStm, aGraphic ) == ERRCODE_NONE )
{
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index d94b7bc1e97c..2f343d6208ba 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -193,7 +193,7 @@ void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xSha
}
else
{
- DBG_ASSERT( 0, "Fatality! SdrObject is not belonging to its SdrObjList! [CL]" );
+ DBG_ASSERT( false, "Fatality! SdrObject is not belonging to its SdrObjList! [CL]" );
}
}
}
@@ -376,7 +376,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxIte
double fCamFocal =
(double)((const SfxUInt32Item&)rSceneSet.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue();
- aCam.SetAutoAdjustProjection(sal_False);
+ aCam.SetAutoAdjustProjection(false);
aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
basegfx::B3DPoint aLookAt;
basegfx::B3DPoint aCamPos(0.0, 0.0, fCamPosZ);
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 8c64c3a4c780..526bfec7d86e 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1738,7 +1738,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
if(bIsNotPersist)
{
// Not-Persistent Attribute, hole diese extra
- mpObj->TakeNotPersistAttr(*pSet, sal_False);
+ mpObj->TakeNotPersistAttr(*pSet, false);
}
}
@@ -1834,7 +1834,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
if(pMap->nWID >= SDRATTR_NOTPERSIST_FIRST && pMap->nWID <= SDRATTR_NOTPERSIST_LAST)
{
// Not-Persistent Attribute, hole diese extra
- mpObj->TakeNotPersistAttr(aSet, sal_False);
+ mpObj->TakeNotPersistAttr(aSet, false);
}
}
@@ -1878,7 +1878,7 @@ void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence
// reseted even when an execption is thrown
const ::comphelper::ScopeGuard aGuard( boost::bind( &SvxShape::endSetPropertyValues, this ) );
- mbIsMultiPropertyCall = sal_True;
+ mbIsMultiPropertyCall = true;
if( mpImpl->mpMaster )
{
@@ -1928,7 +1928,7 @@ void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence
void SvxShape::endSetPropertyValues()
{
- mbIsMultiPropertyCall = sal_False;
+ mbIsMultiPropertyCall = false;
if( mpImpl->mpItemSet )
{
delete mpImpl->mpItemSet;
@@ -2421,7 +2421,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
OUString aLayerName;
if( rValue >>= aLayerName )
{
- const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayer(aLayerName, sal_True);
+ const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayer(aLayerName, true);
if( pLayer != NULL )
{
mpObj->SetLayer( pLayer->GetID() );
@@ -2459,7 +2459,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
{
Point aRef1(mpObj->GetSnapRect().Center());
double nTan=tan(nShear*nPi180);
- mpObj->Shear(aRef1,nShear,nTan,sal_False);
+ mpObj->Shear(aRef1,nShear,nTan,false);
return true;
}
}
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 30d364fdd93e..991b6bf9abac 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -653,7 +653,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
// #91254# put text to object and set EmptyPresObj to FALSE
if( mpText && bOwnParaObj && pOutlinerParaObject && mpObject->IsEmptyPresObj() && pTextObj->IsRealyEdited() )
{
- mpObject->SetEmptyPresObj( sal_False );
+ mpObject->SetEmptyPresObj( false );
static_cast< SdrTextObj* >( mpObject)->NbcSetOutlinerParaObjectForText( pOutlinerParaObject, mpText );
// #i103982# Here, due to mpObject->NbcSetOutlinerParaObjectForText, we LOSE ownership of the
@@ -893,7 +893,7 @@ void SvxTextEditSourceImpl::UpdateData()
}
if( mpObject->IsEmptyPresObj() )
- mpObject->SetEmptyPresObj(sal_False);
+ mpObject->SetEmptyPresObj(false);
}
}
}
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 3740d786ba07..4cac9057870f 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -272,7 +272,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames(
}
else
{
- DBG_ASSERT( sal_False, "invalid arguments was found in URL!" );
+ DBG_ASSERT( false, "invalid arguments was found in URL!" );
}
}
}
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 41e94a93359e..60d913e42692 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -303,7 +303,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
{
SvLockBytes* pLockBytes = mpOStm->GetLockBytes();
if ( pLockBytes )
- pLockBytes->SetSynchronMode( sal_True );
+ pLockBytes->SetSynchronMode( true );
mpOStm->Seek( STREAM_SEEK_TO_END );
nStreamLen = mpOStm->Tell();
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 10ab02ed52e9..111192300a00 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -411,7 +411,7 @@ bool SvxXMLXTableExportComponent::exportTable() throw()
bRet = true;
}
- while(0);
+ while(false);
GetDocHandler()->endDocument();
}
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 1a3bb726cc0e..7a000300d2da 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -243,14 +243,14 @@ bool AffineMatrixItem::operator==(const SfxPoolItem& rRef) const
{
if(!SfxPoolItem::operator==(rRef))
{
- return 0;
+ return false;
}
const AffineMatrixItem* pRef = dynamic_cast< const AffineMatrixItem* >(&rRef);
if(!pRef)
{
- return 0;
+ return false;
}
return (maMatrix.m00 == pRef->maMatrix.m00
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index a677774a93a7..5a9d13e7095d 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -81,7 +81,7 @@ bool XBitmapList::Create()
aBitmap = createHistorical8x8FromArray(aArray, RGB_Color(COL_LIGHTBLUE), RGB_Color(COL_WHITE));
Insert(new XBitmapEntry(Graphic(aBitmap), aStr.toString()));
- return sal_True;
+ return true;
}
Bitmap XBitmapList::CreateBitmapForUI( long /*nIndex*/ )