summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/svdedtv1.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-06-26 14:47:52 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-06-27 11:11:27 +0200
commit6561fc32afaa0ca992ae988b6d08c62e3e516d43 (patch)
tree79c8385626c1707688f75ce04fe92af1c0ae6249 /svx/source/svdraw/svdedtv1.cxx
parentf65f34d630f02c0d9f8c6e5e28dff56e6208ab4f (diff)
loplugin:oncevar in svx
Change-Id: I22a3a13e059ac7d3479f12860564fe3eb1b55e44 Reviewed-on: https://gerrit.libreoffice.org/39282 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/svdraw/svdedtv1.cxx')
-rw-r--r--svx/source/svdraw/svdedtv1.cxx10
1 files changed, 1 insertions, 9 deletions
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 3ccc98c14546..243a9ee5869f 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -792,7 +792,6 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr) const
SdrLayerID nLayerId(0);
bool bLayerDC=false;
OUString aObjName;
- bool bObjNameDC=false,bObjNameSet=false;
long nSnapPosX=0; bool bSnapPosXDC=false;
long nSnapPosY=0; bool bSnapPosYDC=false;
long nSnapWdt=0; bool bSnapWdtDC=false;
@@ -848,14 +847,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr) const
if (!bLogicHgtDiff && aSnapRect.GetHeight()!=aLogicRect.GetHeight()) bLogicHgtDiff=true;
}
}
- if (!bObjNameDC ) {
- if (!bObjNameSet) {
- aObjName=pObj->GetName();
- } else {
- if (!aObjName.equals(pObj->GetName()))
- bObjNameDC = true;
- }
- }
+ aObjName=pObj->GetName();
}
if (bSnapPosXDC || nAllSnapPosX!=nSnapPosX) rAttr.Put(SdrAllPositionXItem(nAllSnapPosX));