[Libreoffice-commits] core.git: svx/source
Tor Lillqvist
tml at collabora.com
Fri Apr 17 05:05:47 PDT 2015
svx/source/engine3d/dragmt3d.cxx | 5 -----
svx/source/engine3d/e3dundo.cxx | 4 ----
svx/source/engine3d/obj3d.cxx | 3 ---
svx/source/engine3d/scene3d.cxx | 2 --
svx/source/svdraw/svdundo.cxx | 4 ----
5 files changed, 18 deletions(-)
New commits:
commit 7bcf9131032cbcdb162f33d03230e43d4f1db2aa
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Apr 17 15:00:27 2015 +0300
WaE: unused variables
Change-Id: I3b0ed8a6c8e5d13b9236ee1a1337820c3cbce9ac
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index 39dd69f..e02a6a7 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -159,7 +159,6 @@ bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/)
for(nOb=0;nOb<nCnt;nOb++)
{
E3dDragMethodUnit& rCandidate = maGrp[nOb];
- E3DModifySceneSnapRectUpdater aUpdater(rCandidate.mp3DObj);
rCandidate.mp3DObj->SetTransform(rCandidate.maTransform);
if( bUndo )
{
@@ -187,7 +186,6 @@ void E3dDragMethod::CancelSdrDrag()
{
// Restore transformation
E3dDragMethodUnit& rCandidate = maGrp[nOb];
- E3DModifySceneSnapRectUpdater aUpdater(rCandidate.mp3DObj);
rCandidate.mp3DObj->SetTransform(rCandidate.maInitTransform);
}
}
@@ -408,7 +406,6 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt)
if(mbMoveFull)
{
- E3DModifySceneSnapRectUpdater aUpdater(rCandidate.mp3DObj);
rCandidate.mp3DObj->SetTransform(rCandidate.maTransform);
}
else
@@ -558,7 +555,6 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt)
if(mbMoveFull)
{
- E3DModifySceneSnapRectUpdater aUpdater(rCandidate.mp3DObj);
rCandidate.mp3DObj->SetTransform(rCandidate.maTransform);
}
else
@@ -677,7 +673,6 @@ void E3dDragMove::MoveSdrDrag(const Point& rPnt)
if(mbMoveFull)
{
- E3DModifySceneSnapRectUpdater aUpdater(rCandidate.mp3DObj);
rCandidate.mp3DObj->SetTransform(rCandidate.maTransform);
}
else
diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx
index 9d6dcfc..4f7a6dd 100644
--- a/svx/source/engine3d/e3dundo.cxx
+++ b/svx/source/engine3d/e3dundo.cxx
@@ -49,7 +49,6 @@ E3dRotateUndoAction::~E3dRotateUndoAction ()
void E3dRotateUndoAction::Undo ()
{
- E3DModifySceneSnapRectUpdater aUpdater(pMy3DObj);
pMy3DObj->SetTransform(aMyOldRotation);
}
@@ -57,7 +56,6 @@ void E3dRotateUndoAction::Undo ()
void E3dRotateUndoAction::Redo ()
{
- E3DModifySceneSnapRectUpdater aUpdater(pMy3DObj);
pMy3DObj->SetTransform(aMyNewRotation);
}
@@ -83,13 +81,11 @@ E3dAttributesUndoAction::~E3dAttributesUndoAction()
void E3dAttributesUndoAction::Undo()
{
- E3DModifySceneSnapRectUpdater aUpdater(pObject);
pObject->SetMergedItemSetAndBroadcast(aOldSet);
}
void E3dAttributesUndoAction::Redo()
{
- E3DModifySceneSnapRectUpdater aUpdater(pObject);
pObject->SetMergedItemSetAndBroadcast(aNewSet);
}
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index ef50b3d..a701ad9 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -374,7 +374,6 @@ void E3dObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti
basegfx::B3DHomMatrix mObjTrans(GetTransform());
mObjTrans *= mTrans;
- E3DModifySceneSnapRectUpdater aUpdater(this);
SetTransform(mObjTrans);
}
}
@@ -427,7 +426,6 @@ void E3dObject::NbcMove(const Size& rSize)
basegfx::B3DHomMatrix aTranslate;
aTranslate.translate(aMove.getX() - aPos.getX(), aMove.getY() - aPos.getY(), aMove.getZ() - aPos.getZ());
- E3DModifySceneSnapRectUpdater aUpdater(pScene);
SetTransform(aTranslate * GetTransform());
}
}
@@ -739,7 +737,6 @@ void E3dObject::SaveGeoData(SdrObjGeoData& rGeo) const
void E3dObject::RestGeoData(const SdrObjGeoData& rGeo)
{
maLocalBoundVol = static_cast<const E3DObjGeoData &>(rGeo).maLocalBoundVol;
- E3DModifySceneSnapRectUpdater aUpdater(this);
NbcSetTransform(static_cast<const E3DObjGeoData &>(rGeo).maTransformation);
SdrAttrObj::RestGeoData (rGeo);
}
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 2876b4d..6140815 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -397,8 +397,6 @@ E3dScene* E3dScene::GetScene() const
void E3dScene::removeAllNonSelectedObjects()
{
- E3DModifySceneSnapRectUpdater aUpdater(this);
-
for(size_t a = 0; a < maSubList.GetObjCount(); ++a)
{
SdrObject* pObj = maSubList.GetObj(a);
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 12bf420..2e11ebc 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -322,7 +322,6 @@ SdrUndoAttrObj::~SdrUndoAttrObj()
void SdrUndoAttrObj::Undo()
{
- E3DModifySceneSnapRectUpdater aUpdater(pObj);
bool bIs3DScene(pObj && pObj->ISA(E3dScene));
// Trigger PageChangeCall
@@ -429,7 +428,6 @@ void SdrUndoAttrObj::Undo()
void SdrUndoAttrObj::Redo()
{
- E3DModifySceneSnapRectUpdater aUpdater(pObj);
bool bIs3DScene(pObj && pObj->ISA(E3dScene));
if(!pUndoGroup || bIs3DScene)
@@ -743,7 +741,6 @@ void SdrUndoRemoveObj::Undo()
aOwnerAnchorPos = pObjList->GetOwnerObj()->GetAnchorPos();
}
- E3DModifySceneSnapRectUpdater aUpdater(pObjList->GetOwnerObj());
SdrInsertReason aReason(SDRREASON_UNDO);
pObjList->InsertObject(pObj,nOrdNum,&aReason);
@@ -761,7 +758,6 @@ void SdrUndoRemoveObj::Redo()
if (pObj->IsInserted())
{
ImplUnmarkObject( pObj );
- E3DModifySceneSnapRectUpdater aUpdater(pObj);
pObjList->RemoveObject(nOrdNum);
}
More information about the Libreoffice-commits
mailing list