[umbrello-devel] [umbrello] [Bug 56184] Umbrello XMI file format doesn't conform with uml13.dtd

[Oliver Kellogg]

https://bugs.kde.org/show_bug.cgi?id=56184

--- Comment #61 from Oliver Kellogg <okellogg at users.sourceforge.net> ---
Git commit a9d4efc360903eb884b1624de18a0f188c0cfdcf by Oliver Kellogg.
Committed on 20/04/2014 at 17:32.
Pushed by okellogg into branch 'master'.

umbrello/umldoc.h
- Add ENC_WINDOWS for use by encoding(QIODevice&)

umbrello/umldoc.cpp
- short UMLDoc::encoding(QIODevice & file) :
  - Introduce variable 'enc' with initial value ENC_UNKNOWN
  - In loop advancing over comments and processing instructions, if
    node.isProcessingInstruction() then analyze the
    node.toProcessingInstruction().data(); if attribute "encoding" is
    found then extract its value. Assign ENC_UNICODE to enc if value is
    "UTF-8"; assign ENC_WINDOWS to enc if value is "windows-1252"; else
    assign ENC_OLD_ENC to enc (indicating a not yet implemented encoding.)
  - Change uWarning() messages added in commit 732b50a to uDebug()
  - For premature returns, return variable 'enc' instead of ENC_UNKNOWN.
    Reason: Returning ENC_UNKNOWN here is overly strict, it precludes any
    further attempts at loading foreign XMI files. Rather, use the encoding
    attribute from the processing instruction if found.
- bool UMLDoc::loadFromXMI(QIODevice & file, short encode) :
  Extend check which makes sure it is an XMI file to permit "xmi:XMI" as
  root.tagName()

M  +31   -12   umbrello/umldoc.cpp
M  +2    -1    umbrello/umldoc.h

http://commits.kde.org/umbrello/a9d4efc360903eb884b1624de18a0f188c0cfdcf

-- 
You are receiving this mail because:
You are the assignee for the bug.