0a063f3a36
Patch contributed by Christian Lippka impress212: #i113063# patch: dubios self assign in svx/source/dialog/framelink.cxx http://svn.apache.org/viewvc?view=revision&revision=1167619 Patches contributed by Mathias Bauer gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 cws mba34issues01: #i117712#: fix several resource errors introduced by IAccessible2 implementation http://svn.apache.org/viewvc?view=revision&revision=1172343 cws mba34issues01: #i117719#: use correct resource ID http://svn.apache.org/viewvc?view=revision&revision=1172351 Patch contributed by Andre Fischer Do not add targets for junit tests when junit is disabled. http://svn.apache.org/viewvc?view=revision&revision=1241508 Patches contributed by Armin Le-Grand #118804# corrected GraphicExporter behaviour on shortcut when pixel graphic is requested http://svn.apache.org/viewvc?view=revision&revision=1240195 fix for #118525#: Using primitives for chart sub-geometry visualisation http://svn.apache.org/viewvc?view=revision&revision=1226879 #118485# - Styles for OLEs are not saved. http://svn.apache.org/viewvc?view=revision&revision=1182166 #118524: apply patch, followup fixes to 118485 http://svn.apache.org/viewvc?view=revision&revision=1186077 13f79535-47bb-0310-9956-ffa450edef68 Patch contributed by Regina Henschel linecap: Reintegrating finished LineCap feature http://svn.apache.org/viewvc?view=revision&revision=1232507 Patch contributed by Wang Lei (leiw) #i118760# split the first table cell vertically, then undo&redo, the Presentation app will crash http://svn.apache.org/viewvc?view=revision&revision=1301361 cleanup globlmn hacks, undo dependent fixmes.
127 lines
4.4 KiB
C++
127 lines
4.4 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
|
|
// #i13033#
|
|
// New mechanism to hold a ist of all original and cloned objects for later
|
|
// re-creating the connections for contained connectors
|
|
#include <clonelist.hxx>
|
|
#include <svx/svdoedge.hxx>
|
|
#include <svx/scene3d.hxx>
|
|
|
|
void CloneList::AddPair(const SdrObject* pOriginal, SdrObject* pClone)
|
|
{
|
|
maOriginalList.push_back(pOriginal);
|
|
maCloneList.push_back(pClone);
|
|
|
|
// look for subobjects, too.
|
|
sal_Bool bOriginalIsGroup(pOriginal->IsGroupObject());
|
|
sal_Bool bCloneIsGroup(pClone->IsGroupObject());
|
|
|
|
if(bOriginalIsGroup && pOriginal->ISA(E3dObject) && !pOriginal->ISA(E3dScene))
|
|
bOriginalIsGroup = sal_False;
|
|
|
|
if(bCloneIsGroup && pClone->ISA(E3dObject) && !pClone->ISA(E3dScene))
|
|
bCloneIsGroup = sal_False;
|
|
|
|
if(bOriginalIsGroup && bCloneIsGroup)
|
|
{
|
|
const SdrObjList* pOriginalList = pOriginal->GetSubList();
|
|
SdrObjList* pCloneList = pClone->GetSubList();
|
|
|
|
if(pOriginalList && pCloneList
|
|
&& pOriginalList->GetObjCount() == pCloneList->GetObjCount())
|
|
{
|
|
for(sal_uInt32 a(0); a < pOriginalList->GetObjCount(); a++)
|
|
{
|
|
// recursive call
|
|
AddPair(pOriginalList->GetObj(a), pCloneList->GetObj(a));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
const SdrObject* CloneList::GetOriginal(sal_uInt32 nIndex) const
|
|
{
|
|
return maOriginalList[nIndex];
|
|
}
|
|
|
|
SdrObject* CloneList::GetClone(sal_uInt32 nIndex) const
|
|
{
|
|
return maCloneList[nIndex];
|
|
}
|
|
|
|
void CloneList::CopyConnections() const
|
|
{
|
|
sal_uInt32 cloneCount = maCloneList.size();
|
|
|
|
for(sal_uInt32 a = 0; a < maOriginalList.size(); a++)
|
|
{
|
|
const SdrEdgeObj* pOriginalEdge = PTR_CAST(SdrEdgeObj, GetOriginal(a));
|
|
SdrEdgeObj* pCloneEdge = PTR_CAST(SdrEdgeObj, GetClone(a));
|
|
|
|
if(pOriginalEdge && pCloneEdge)
|
|
{
|
|
SdrObject* pOriginalNode1 = pOriginalEdge->GetConnectedNode(sal_True);
|
|
SdrObject* pOriginalNode2 = pOriginalEdge->GetConnectedNode(sal_False);
|
|
|
|
if(pOriginalNode1)
|
|
{
|
|
std::vector<const SdrObject*>::const_iterator it = std::find(maOriginalList.begin(),
|
|
maOriginalList.end(),
|
|
pOriginalNode1);
|
|
|
|
sal_uInt32 nPos = it - maOriginalList.begin();
|
|
|
|
if(it != maOriginalList.end())
|
|
{
|
|
SdrObject *cObj = NULL;
|
|
|
|
if (nPos < cloneCount)
|
|
cObj = GetClone(nPos);
|
|
|
|
if(pOriginalEdge->GetConnectedNode(sal_True) != cObj)
|
|
pCloneEdge->ConnectToNode(sal_True, cObj);
|
|
}
|
|
}
|
|
|
|
if(pOriginalNode2)
|
|
{
|
|
std::vector<const SdrObject*>::const_iterator it = std::find(maOriginalList.begin(),
|
|
maOriginalList.end(),
|
|
pOriginalNode2);
|
|
|
|
sal_uInt32 nPos = it - maOriginalList.begin();
|
|
|
|
if(it != maOriginalList.end())
|
|
{
|
|
SdrObject *cObj = NULL;
|
|
|
|
if (nPos < cloneCount)
|
|
cObj = GetClone(nPos);
|
|
|
|
if(pOriginalEdge->GetConnectedNode(sal_False) != cObj)
|
|
pCloneEdge->ConnectToNode(sal_False, cObj);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|