Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SDK
Umbrello
Commits
b76512a7
Commit
b76512a7
authored
Nov 20, 2013
by
Joris Steyn
Browse files
Include association objects in clip4 and load them
BUG: 327834
parent
6ec246ec
Changes
2
Hide whitespace changes
Inline
Side-by-side
umbrello/clipboard/umlclipboard.cpp
View file @
b76512a7
...
...
@@ -97,6 +97,12 @@ QMimeData* UMLClipboard::copy(bool fromView/*=false*/)
m_ObjectList
.
append
(
widget
->
umlObject
());
}
}
foreach
(
WidgetBase
*
widget
,
m_AssociationList
)
{
if
(
widget
->
umlObject
()
!=
0
)
{
m_ObjectList
.
append
(
widget
->
umlObject
());
}
}
}
else
{
//if the copy action is being performed from the ListView
UMLListViewItemList
itemsSelected
=
listView
->
selectedItems
();
if
(
itemsSelected
.
count
()
<=
0
)
{
...
...
umbrello/clipboard/umldragdata.cpp
View file @
b76512a7
...
...
@@ -680,9 +680,6 @@ bool UMLDragData::decodeClip4(const QMimeData* mimeData, UMLObjectList& objects,
while
(
!
element
.
isNull
())
{
UMLObject
*
pObject
=
0
;
QString
type
=
element
.
tagName
();
//FIXME associations don't load
if
(
type
==
"UML:Association"
)
continue
;
UMLDoc
*
doc
=
UMLApp
::
app
()
->
document
();
Uml
::
ID
::
Type
elmId
=
Uml
::
ID
::
fromString
(
element
.
attribute
(
"xmi.id"
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment