Related: #i122121# moved automatic StartEnd adaption to svx

(cherry picked from commit 81e9ede3e748a40555e87efd1af19521dab5261d)

Conflicts:
sd/source/ui/view/drviews2.cxx

Change-Id: I5ce51fce89e8f29d2f469bf11c5ba6f075f690f2

1 files changed, 0 insertions, 128 deletions

diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 37619aa294c2..4e44fb76b528 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -277,135 +277,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
         {
             if( rReq.GetArgs() )
             {
-                sal_Bool bMergeUndo = sal_False;
-                ::svl::IUndoManager* pUndoManager = GetDocSh()->GetUndoManager();
-
-                // adjustment Start/EndWidth
-                if(nSId == SID_ATTR_LINE_WIDTH)
-                {
-                    SdrObject* pObj = NULL;
-                    const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
-                    sal_uLong nCount = rMarkList.GetMarkCount();
-                    const sal_Int32 nNewLineWidth(((const XLineWidthItem&)rReq.GetArgs()->Get(XATTR_LINEWIDTH)).GetValue());
-                    const bool bUndo(mpDrawView->IsUndoEnabled());
-
-                    for (sal_uLong i=0; i<nCount; i++)
-                    {
-                        SfxItemSet aAttr(GetDoc()->GetPool());
-                        pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
-                        aAttr.Put(pObj->GetMergedItemSet());
-
-                        sal_Int32 nActLineWidth = ((const XLineWidthItem&)aAttr.Get(XATTR_LINEWIDTH)).GetValue();
-
-                        if(nActLineWidth != nNewLineWidth)
-                        {
-                            sal_Bool bSetItemSet(sal_False);
-
-                            // do this for SFX_ITEM_DEFAULT and for SFX_ITEM_SET
-                            if(SFX_ITEM_DONTCARE != aAttr.GetItemState(XATTR_LINESTARTWIDTH))
-                            {
-                                sal_Int32 nValAct = ((const XLineStartWidthItem&)aAttr.Get(XATTR_LINESTARTWIDTH)).GetValue();
-                                sal_Int32 nValNew = nValAct + (((nNewLineWidth - nActLineWidth) * 15) / 10);
-                                if(nValNew < 0)
-                                    nValNew = 0;
-                                bSetItemSet = sal_True;
-                                aAttr.Put(XLineStartWidthItem(nValNew));
-                            }
-
-                            // do this for SFX_ITEM_DEFAULT and for SFX_ITEM_SET
-                            if(SFX_ITEM_DONTCARE != aAttr.GetItemState(XATTR_LINEENDWIDTH))
-                            {
-                                sal_Int32 nValAct = ((const XLineEndWidthItem&)aAttr.Get(XATTR_LINEENDWIDTH)).GetValue();
-                                sal_Int32 nValNew = nValAct + (((nNewLineWidth - nActLineWidth) * 15) / 10);
-                                if(nValNew < 0)
-                                    nValNew = 0;
-                                bSetItemSet = sal_True;
-                                aAttr.Put(XLineEndWidthItem(nValNew));
-                            }
-
-                            if(bSetItemSet)
-                            {
-                                if(bUndo)
-                                {
-                                    if(!bMergeUndo)
-                                    {
-                                        pUndoManager->EnterListAction( String(), String() );
-                                        mpDrawView->BegUndo();
-                                        bMergeUndo = sal_True;
-                                    }
-
-                                    mpDrawView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj));
-                                }
-
-                                pObj->SetMergedItemSet(aAttr);
-                            }
-                        }
-                    }
-
-                    if(bMergeUndo)
-                    {
-                        mpDrawView->EndUndo();
-                    }
-                }
-
-                if (nSId == SID_ATTR_FILL_SHADOW)
-                {
-                    // possibly transparent objects are filled white
-                    SdrObject* pObj = NULL;
-                    const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
-                    sal_uLong nCount = rMarkList.GetMarkCount();
-                    const bool bUndo = mpDrawView->IsUndoEnabled();
-
-                    for (sal_uLong i=0; i<nCount; i++)
-                    {
-                        SfxItemSet aAttr(GetDoc()->GetPool());
-                        pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
-
-                        // #i25616#
-                        if(!pObj->ISA(SdrGrafObj))
-                        {
-                            aAttr.Put(pObj->GetMergedItemSet());
-
-                            const XFillStyleItem& rFillStyle = (const XFillStyleItem&) aAttr.Get(XATTR_FILLSTYLE);
-                            const XLineStyleItem& rLineStyle = (const XLineStyleItem&) aAttr.Get(XATTR_LINESTYLE);
-
-                            if(XFILL_NONE == rFillStyle.GetValue() && XLINE_NONE == rLineStyle.GetValue())
-                            {
-                                if( bUndo )
-                                {
-                                    // template has no filling, so force
-                                    // filling (hard) attribute
-                                    if (!bMergeUndo)
-                                    {
-                                        bMergeUndo = sal_True;
-                                        pUndoManager->EnterListAction( String(), String() );
-                                        mpDrawView->BegUndo();
-                                    }
-
-                                    mpDrawView->AddUndo(GetDoc()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj));
-                                }
-
-                                aAttr.Put(XFillStyleItem(XFILL_SOLID));
-                                aAttr.Put(XFillColorItem(String(), COL_WHITE));
-
-                                pObj->SetMergedItemSet(aAttr);
-                            }
-                        }
-                    }
-
-                    if (bMergeUndo)
-                    {
-                        mpDrawView->EndUndo();
-                    }
-                }
-
                 mpDrawView->SetAttributes(*rReq.GetArgs());
-
-                if (bMergeUndo)
-                {
-                    pUndoManager->LeaveListAction();
-                }
-
                 rReq.Done();
             }
             else