[Libreoffice-commits] core.git: 3 commits - basic/source idlc/source sd/source svx/inc svx/source vcl/generic
Takeshi Abe
tabe at fixedpoint.jp
Sun Mar 24 18:57:40 PDT 2013
basic/source/basmgr/basmgr.cxx | 6 +--
idlc/source/astunion.cxx | 6 +--
sd/source/ui/inc/SdUnoSlideView.hxx | 17 --------
sd/source/ui/view/drviews6.cxx | 2 -
sd/source/ui/view/drviewsc.cxx | 2 -
svx/inc/svx/sdr/event/eventhandler.hxx | 2 -
svx/inc/svx/view3d.hxx | 12 +++---
svx/source/engine3d/view3d.cxx | 28 +++++++-------
svx/source/items/algitem.cxx | 4 +-
svx/source/items/grfitem.cxx | 4 +-
svx/source/items/hlnkitem.cxx | 2 -
svx/source/items/numinf.cxx | 3 -
svx/source/sdr/event/eventhandler.cxx | 2 -
svx/source/sdr/properties/e3dsceneproperties.cxx | 8 ++--
svx/source/sdr/properties/textproperties.cxx | 10 ++---
svx/source/stbctrls/pszctrl.cxx | 46 +++++++++++------------
vcl/generic/fontmanager/fontmanager.cxx | 9 +---
17 files changed, 70 insertions(+), 93 deletions(-)
New commits:
commit 1e50f7892705c64db0ffec06b651cd280e9a7f8f
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Mon Mar 25 10:51:15 2013 +0900
sal_Bool to bool
Change-Id: Ibc63340b3ae431c7cdac78893dbdd1989ebe5ff9
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 70775ae..8f52b1f 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -256,7 +256,7 @@ void SAL_CALL BasMgrContainerListenerImpl::disposing( const lang::EventObject& S
void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const container::ContainerEvent& Event )
throw( uno::RuntimeException )
{
- sal_Bool bLibContainer = maLibName.isEmpty();
+ bool bLibContainer = maLibName.isEmpty();
OUString aName;
Event.Accessor >>= aName;
@@ -308,7 +308,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const container::Con
// Replace not possible for library container
#ifdef DBG_UTIL
- sal_Bool bLibContainer = maLibName.isEmpty();
+ bool bLibContainer = maLibName.isEmpty();
#endif
DBG_ASSERT( !bLibContainer, "library container fired elementReplaced()");
@@ -336,7 +336,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( const container::Cont
OUString aName;
Event.Accessor >>= aName;
- sal_Bool bLibContainer = maLibName.isEmpty();
+ bool bLibContainer = maLibName.isEmpty();
if( bLibContainer )
{
StarBASIC* pLib = mpMgr->GetLib( aName );
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 573190b..8a136d7 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -583,7 +583,7 @@ void DrawViewShell::FuTemp04(SfxRequest& rReq)
mpDrawView->SdrEndTextEdit();
if(GetActiveWindow())
GetActiveWindow()->EnterWait();
- mpDrawView->End3DCreation(sal_True);
+ mpDrawView->End3DCreation(true);
Cancel();
rReq.Ignore();
if(GetActiveWindow())
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index 6694393..bcdd2b9 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -406,7 +406,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
}
WaitObject aWait( (Window*)GetActiveWindow() );
- mpDrawView->ConvertMarkedObjTo3D(sal_True);
+ mpDrawView->ConvertMarkedObjTo3D(true);
}
}
diff --git a/svx/inc/svx/sdr/event/eventhandler.hxx b/svx/inc/svx/sdr/event/eventhandler.hxx
index b5ac78b..91ac549 100644
--- a/svx/inc/svx/sdr/event/eventhandler.hxx
+++ b/svx/inc/svx/sdr/event/eventhandler.hxx
@@ -96,7 +96,7 @@ namespace sdr
virtual void ExecuteEvents();
// for control
- sal_Bool IsEmpty() const;
+ bool IsEmpty() const;
};
} // end of namespace event
} // end of namespace sdr
diff --git a/svx/inc/svx/view3d.hxx b/svx/inc/svx/view3d.hxx
index 72420f2..7f4d523 100644
--- a/svx/inc/svx/view3d.hxx
+++ b/svx/inc/svx/view3d.hxx
@@ -69,13 +69,13 @@ protected:
void InitView();
- void ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat);
- void ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat);
+ void ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat);
+ void ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat);
void ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj);
void ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj);
void InitScene(E3dScene* pScene, double fW, double fH, double fCamZ);
- void ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D, sal_Bool& rGroupSelected) const;
+ void ImpIsConvertTo3DPossible(SdrObject* pObj, bool& rAny3D, bool& rGroupSelected) const;
void BreakSingle3DObj(E3dObject* pObj);
public:
@@ -108,7 +108,7 @@ public:
bool ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset);
bool IsConvertTo3DObjPossible() const;
- void ConvertMarkedObjTo3D(sal_Bool bExtrude=sal_True, basegfx::B2DPoint aPnt1 = basegfx::B2DPoint(0.0, 0.0), basegfx::B2DPoint aPnt2 = basegfx::B2DPoint(0.0, 1.0));
+ void ConvertMarkedObjTo3D(bool bExtrude=true, basegfx::B2DPoint aPnt1 = basegfx::B2DPoint(0.0, 0.0), basegfx::B2DPoint aPnt2 = basegfx::B2DPoint(0.0, 1.0));
// Nachtraeglichhe Korrekturmoeglichkeit um alle Extrudes in einer
// bestimmten Tiefensortierung anzulegen
@@ -118,10 +118,10 @@ public:
void Start3DCreation();
// migration of overlay
- sal_Bool Is3DRotationCreationActive() const { return (0L != mpMirrorOverlay); }
+ bool Is3DRotationCreationActive() const { return (0L != mpMirrorOverlay); }
virtual void MovAction(const Point& rPnt);
- void End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes=sal_False);
+ void End3DCreation(bool bUseDefaultValuesForMirrorAxes=false);
void ResetCreationActive();
double GetDefaultCamPosZ();
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 4dc904f..5f856ed 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -603,8 +603,8 @@ bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDs
bool E3dView::IsConvertTo3DObjPossible() const
{
- sal_Bool bAny3D(sal_False);
- sal_Bool bGroupSelected(sal_False);
+ bool bAny3D(false);
+ bool bGroupSelected(false);
bool bRetval(true);
for(sal_uInt32 a=0;!bAny3D && a<GetMarkedObjectCount();a++)
@@ -624,14 +624,14 @@ bool E3dView::IsConvertTo3DObjPossible() const
return bRetval;
}
-void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D,
- sal_Bool& rGroupSelected) const
+void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, bool& rAny3D,
+ bool& rGroupSelected) const
{
if(pObj)
{
if(pObj->ISA(E3dObject))
{
- rAny3D = sal_True;
+ rAny3D = true;
}
else
{
@@ -643,7 +643,7 @@ void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D,
SdrObject* pNewObj = aIter.Next();
ImpIsConvertTo3DPossible(pNewObj, rAny3D, rGroupSelected);
}
- rGroupSelected = sal_True;
+ rGroupSelected = true;
}
}
}
@@ -698,7 +698,7 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj)
}
}
-void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
+void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
{
// Single PathObject, transform this
SdrPathObj* pPath = PTR_CAST(SdrPathObj, pObj);
@@ -766,7 +766,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal
}
}
-void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
+void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
{
if(pObj)
{
@@ -831,7 +831,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExt
}
}
-void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, basegfx::B2DPoint aPnt2)
+void E3dView::ConvertMarkedObjTo3D(bool bExtrude, basegfx::B2DPoint aPnt1, basegfx::B2DPoint aPnt2)
{
if(AreObjectsMarked())
{
@@ -1097,12 +1097,12 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
if(aCompareColor == aLocalColor)
{
- bOverlap = sal_False;
+ bOverlap = false;
}
}
else if(eLocalFillStyle == XFILL_NONE)
{
- bOverlap = sal_False;
+ bOverlap = false;
}
}
}
@@ -1468,7 +1468,7 @@ void E3dView::MovAction(const Point& rPnt)
// axis. It is sufficient with this call, if an object is selected.
// (No initialization necessary)
-void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes)
+void E3dView::End3DCreation(bool bUseDefaultValuesForMirrorAxes)
{
ResetCreationActive();
@@ -1485,7 +1485,7 @@ void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes)
basegfx::B2DPoint aPnt1(aRect.Left(), -aRect.Top());
basegfx::B2DPoint aPnt2(aRect.Left(), -aRect.Bottom());
- ConvertMarkedObjTo3D(sal_False, aPnt1, aPnt2);
+ ConvertMarkedObjTo3D(false, aPnt1, aPnt2);
}
else
{
@@ -1499,7 +1499,7 @@ void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes)
basegfx::B2DPoint aPnt1(aMirrorRef1.X(), -aMirrorRef1.Y());
basegfx::B2DPoint aPnt2(aMirrorRef2.X(), -aMirrorRef2.Y());
- ConvertMarkedObjTo3D(sal_False, aPnt1, aPnt2);
+ ConvertMarkedObjTo3D(false, aPnt1, aPnt2);
}
}
}
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index a3ff5d9..e0b0aa0 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -336,7 +336,7 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/)
bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
- sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+ bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
{
@@ -364,7 +364,7 @@ bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
- sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 );
+ bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 );
long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX; // Members sind sal_Int16
sal_Int32 nVal = 0;
if(!(rVal >>= nVal) || (nVal > nMaxVal))
diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx
index 3bc7ab1..d63e32e 100644
--- a/svx/source/items/grfitem.cxx
+++ b/svx/source/items/grfitem.cxx
@@ -89,7 +89,7 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, sal_uInt16 nVersion ) const
bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
- sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+ bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
text::GraphicCrop aRet;
aRet.Left = nLeft;
@@ -112,7 +112,7 @@ bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
- sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
+ bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
text::GraphicCrop aVal;
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 3389f9c..a2181a2 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -235,7 +235,7 @@ int SvxHyperlinkItem::operator==( const SfxPoolItem& rAttr ) const
const SvxHyperlinkItem& rItem = (const SvxHyperlinkItem&) rAttr;
- sal_Bool bRet = ( sName == rItem.sName &&
+ bool bRet = ( sName == rItem.sName &&
sURL == rItem.sURL &&
sTarget == rItem.sTarget &&
eType == rItem.eType &&
diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx
index ae01f99..9dab9cb7 100644
--- a/svx/source/sdr/event/eventhandler.cxx
+++ b/svx/source/sdr/event/eventhandler.cxx
@@ -110,7 +110,7 @@ namespace sdr
}
// for control
- sal_Bool EventHandler::IsEmpty() const
+ bool EventHandler::IsEmpty() const
{
return (0L == maVector.size());
}
diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx
index f215e1a..5b9fbed 100644
--- a/svx/source/sdr/properties/e3dsceneproperties.cxx
+++ b/svx/source/sdr/properties/e3dsceneproperties.cxx
@@ -197,13 +197,13 @@ namespace sdr
// one common function for the camera attributes
// since SetCamera() sets all three back to the ItemSet
Camera3D aSceneCam(rObj.GetCamera());
- sal_Bool bChange(sal_False);
+ bool bChange(false);
// for SDRATTR_3DSCENE_PERSPECTIVE:
if(aSceneCam.GetProjection() != rObj.GetPerspective())
{
aSceneCam.SetProjection(rObj.GetPerspective());
- bChange = sal_True;
+ bChange = true;
}
// for SDRATTR_3DSCENE_DISTANCE:
@@ -213,7 +213,7 @@ namespace sdr
if(fNew != aActualPosition.getZ())
{
aSceneCam.SetPosition(basegfx::B3DPoint(aActualPosition.getX(), aActualPosition.getY(), fNew));
- bChange = sal_True;
+ bChange = true;
}
// for SDRATTR_3DSCENE_FOCAL_LENGTH:
@@ -222,7 +222,7 @@ namespace sdr
if(aSceneCam.GetFocalLength() != fNew)
{
aSceneCam.SetFocalLength(fNew);
- bChange = sal_True;
+ bChange = true;
}
// for all
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index 156268f..cf5e526 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -207,7 +207,7 @@ namespace sdr
if(nDifference)
{
- const sal_Bool bLineVisible(XLINE_NONE != ((const XLineStyleItem&)(GetItem(XATTR_LINESTYLE))).GetValue());
+ const bool bLineVisible(XLINE_NONE != ((const XLineStyleItem&)(GetItem(XATTR_LINESTYLE))).GetValue());
if(bLineVisible)
{
@@ -421,7 +421,7 @@ namespace sdr
if(nParaCount)
{
- sal_Bool bBurnIn(sal_False);
+ bool bBurnIn(false);
for(sal_uInt16 nPara = 0; nPara < nParaCount; nPara++)
{
@@ -451,7 +451,7 @@ namespace sdr
from the paragraphs item set
*/
- sal_Bool bHasURL(sal_False);
+ bool bHasURL(false);
if(aSet.GetItemState(EE_CHAR_COLOR) == SFX_ITEM_SET)
{
@@ -473,7 +473,7 @@ namespace sdr
if(pData && pData->ISA(SvxURLField))
{
- bHasURL = sal_True;
+ bHasURL = true;
break;
}
}
@@ -519,7 +519,7 @@ namespace sdr
}
pOutliner->SetParaAttribs(nPara, aSet);
- bBurnIn = sal_True; // #i51163# Flag was set wrong
+ bBurnIn = true; // #i51163# Flag was set wrong
}
}
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index de7fd80..b4485c5 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -142,10 +142,10 @@ struct SvxPosSizeStatusBarControl_Impl
Point aPos; // valid when a position is shown
Size aSize; // valid when a size is shown
String aStr; // valid when a text is shown
- sal_Bool bPos; // show position ?
- sal_Bool bSize; // set size ?
- sal_Bool bTable; // set table index ?
- sal_Bool bHasMenu; // set StarCalc popup menu ?
+ bool bPos; // show position ?
+ bool bSize; // set size ?
+ bool bTable; // set table index ?
+ bool bHasMenu; // set StarCalc popup menu ?
sal_uInt16 nFunction; // the selected StarCalc function
Image aPosImage; // Image to show the position
Image aSizeImage; // Image to show the size
@@ -170,10 +170,10 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId,
SfxStatusBarControl( _nSlotId, _nId, rStb ),
pImp( new SvxPosSizeStatusBarControl_Impl )
{
- pImp->bPos = sal_False;
- pImp->bSize = sal_False;
- pImp->bTable = sal_False;
- pImp->bHasMenu = sal_False;
+ pImp->bPos = false;
+ pImp->bSize = false;
+ pImp->bTable = false;
+ pImp->bHasMenu = false;
pImp->nFunction = 0;
pImp->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
pImp->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) );
@@ -233,12 +233,12 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
{
if ( eState == SFX_ITEM_AVAILABLE )
{
- pImp->bHasMenu = sal_True;
+ pImp->bHasMenu = true;
if ( pState && pState->ISA(SfxUInt16Item) )
pImp->nFunction = ((const SfxUInt16Item*)pState)->GetValue();
}
else
- pImp->bHasMenu = sal_False;
+ pImp->bHasMenu = false;
}
else if ( SFX_ITEM_AVAILABLE != eState )
{
@@ -246,11 +246,11 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
// notified for all display types
if ( nSID == SID_TABLE_CELL )
- pImp->bTable = sal_False;
+ pImp->bTable = false;
else if ( nSID == SID_ATTR_POSITION )
- pImp->bPos = sal_False;
+ pImp->bPos = false;
else if ( nSID == GetSlotId() ) // controller is registered for SID_ATTR_SIZE
- pImp->bSize = sal_False;
+ pImp->bSize = false;
else
{
SAL_WARN( "svx.stbcrtls","unknown slot id");
@@ -260,30 +260,30 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
{
// show position
pImp->aPos = ( (SfxPointItem*)pState )->GetValue();
- pImp->bPos = sal_True;
- pImp->bTable = sal_False;
+ pImp->bPos = true;
+ pImp->bTable = false;
}
else if ( pState->ISA( SvxSizeItem ) )
{
// show size
pImp->aSize = ( (SvxSizeItem*)pState )->GetSize();
- pImp->bSize = sal_True;
- pImp->bTable = sal_False;
+ pImp->bSize = true;
+ pImp->bTable = false;
}
else if ( pState->ISA( SfxStringItem ) )
{
// show string (table cel or different)
pImp->aStr = ( (SfxStringItem*)pState )->GetValue();
- pImp->bTable = sal_True;
- pImp->bPos = sal_False;
- pImp->bSize = sal_False;
+ pImp->bTable = true;
+ pImp->bPos = false;
+ pImp->bSize = false;
}
else
{
SAL_WARN( "svx.stbcrtls", "invalid item type" );
- pImp->bPos = sal_False;
- pImp->bSize = sal_False;
- pImp->bTable = sal_False;
+ pImp->bPos = false;
+ pImp->bSize = false;
+ pImp->bTable = false;
}
if ( GetStatusBar().AreItemsVisible() )
commit c7af37db60aab361e8ab01e69c816d249fb558b6
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sun Mar 24 20:50:41 2013 +0900
deleting NULL is safe
Change-Id: I3748d0034b2c8e9d9122ad2a9001763eb1265e1d
diff --git a/idlc/source/astunion.cxx b/idlc/source/astunion.cxx
index 827dbbd..8a03ae5 100644
--- a/idlc/source/astunion.cxx
+++ b/idlc/source/astunion.cxx
@@ -362,8 +362,7 @@ AstUnionBranch::AstUnionBranch(AstUnionLabel* pLabel, AstType const * pType, con
AstUnionBranch::~AstUnionBranch()
{
- if ( m_pLabel )
- delete m_pLabel;
+ delete m_pLabel;
}
AstUnionLabel::AstUnionLabel(UnionLabel labelKind, AstExpression* pExpr)
@@ -376,8 +375,7 @@ AstUnionLabel::AstUnionLabel(UnionLabel labelKind, AstExpression* pExpr)
AstUnionLabel::~AstUnionLabel()
{
- if ( m_pLabelValue )
- delete m_pLabelValue;
+ delete m_pLabelValue;
}
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index 8583b69..34ab3ea 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -112,8 +112,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) :
SvxNumberInfoItem::~SvxNumberInfoItem()
{
- if ( pDelFormatArr )
- delete []pDelFormatArr;
+ delete [] pDelFormatArr;
}
//------------------------------------------------------------------------
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index 59c21c3..c5a52f7 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -187,8 +187,7 @@ PrintFontManager::PrintFont::PrintFont( fonttype::type eType ) :
PrintFontManager::PrintFont::~PrintFont()
{
- if( m_pMetrics )
- delete m_pMetrics;
+ delete m_pMetrics;
}
// -------------------------------------------------------------------------
@@ -749,8 +748,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider,
m_nLeading = m_nAscend + m_nDescend - 1000;
- if( m_pMetrics )
- delete m_pMetrics;
+ delete m_pMetrics;
m_pMetrics = new PrintFontMetrics;
// mark all pages as queried (or clear if only global font info queiried)
memset( m_pMetrics->m_aPages, bOnlyGlobalAttributes ? 0 : 0xff, sizeof( m_pMetrics->m_aPages ) );
@@ -1014,8 +1012,7 @@ PrintFontManager::~PrintFontManager()
for( ::boost::unordered_map< fontID, PrintFont* >::const_iterator it = m_aFonts.begin(); it != m_aFonts.end(); ++it )
delete (*it).second;
delete m_pAtoms;
- if( m_pFontCache )
- delete m_pFontCache;
+ delete m_pFontCache;
}
// -------------------------------------------------------------------------
commit fad530fa03cda8a1cd1490bc579fe6bc71638920
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sun Mar 24 20:41:45 2013 +0900
Drop commented-out code
Change-Id: I2718ccf34f0a62c49c04646a982ca9914a25499f
diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx
index 2fb06b5..392925f 100644
--- a/sd/source/ui/inc/SdUnoSlideView.hxx
+++ b/sd/source/ui/inc/SdUnoSlideView.hxx
@@ -95,23 +95,6 @@ public:
private:
slidesorter::SlideSorter& mrSlideSorter;
- /*
- virtual void FillPropertyTable (
- ::std::vector< ::com::sun::star::beans::Property>& rProperties);
- virtual sal_Bool SAL_CALL convertFastPropertyValue(
- ::com::sun::star::uno::Any & rConvertedValue,
- ::com::sun::star::uno::Any & rOldValue,
- sal_Int32 nHandle,
- const ::com::sun::star::uno::Any& rValue )
- throw (::com::sun::star::lang::IllegalArgumentException);
- virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
- sal_Int32 nHandle,
- const ::com::sun::star::uno::Any& rValue )
- throw (::com::sun::star::uno::Exception);
- virtual void SAL_CALL getFastPropertyValue(
- ::com::sun::star::uno::Any& rValue,
- sal_Int32 nHandle ) const;
- */
};
} // end of namespace sd
More information about the Libreoffice-commits
mailing list