Skip to content
Commit c9da2ac4 authored by Oliver Kellogg's avatar Oliver Kellogg
Browse files

Followup to commit dba3b12e - further preparation for loading files from...

Followup to commit dba3b12e - further preparation for loading files from https://www.eclipse.org/papyrus

umbrello/umlmodel/attribute.cpp
- In function load1 case m_SecondaryId.isEmpty() while-loop, if href is
  non empty then require href to contain "PrimitiveTypes" in addition to
  "#".  Reason: Papyrus concidentally uses the datatype name as the
  xmi:id, but only in the predefined UMLPrimitiveTypes.library.uml and
  JavaPrimitiveTypes.library.uml.
  Proper resolution of href would require nested loading of model files,
  which is not yet implemented for Papyrus.

umbrello/dialogs/codetexthighlighter.cpp
- In function keywords() return empty QStringList immediately if `pl' is
  `Reserved' (else we crash due to null pointer dereference).

umbrello/codegenerators/codegenfactory.cpp
- In function createObject return null immediately if `pl' is Reserved
  (else we crash due to null pointer dereference).

CCBUG: 56184
parent c15cd1e1
Loading
Loading
Loading
Pipeline #122408 passed with stage
in 14 minutes
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment