summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2012-07-26 13:50:24 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2012-07-26 13:50:24 +0200
commit309883a4e8ab3b3d7f207902db5ff148c1177f38 (patch)
tree83436c6a13c519f2414acece3196efb7cf06d604
parent545f0adec7cbae3d04a2809d68850e10827fec84 (diff)
Another tiny incremental change
-rw-r--r--src/lib/VSDXStylesCollector.cpp5
-rw-r--r--src/lib/VSDXStylesCollector.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/VSDXStylesCollector.cpp b/src/lib/VSDXStylesCollector.cpp
index 41a8b37..6df5bb3 100644
--- a/src/lib/VSDXStylesCollector.cpp
+++ b/src/lib/VSDXStylesCollector.cpp
@@ -46,7 +46,7 @@ libvisio::VSDXStylesCollector::VSDXStylesCollector(
m_groupShapeOrder(), m_shapeList(), m_currentStyleSheet(0), m_styles(),
m_lineStyle(0), m_fillStyle(0), m_textBlockStyle(0), m_charStyle(0), m_paraStyle(0),
m_lineStyleMaster(0xffffffff), m_fillStyleMaster(0xffffffff), m_textStyleMaster(0xffffffff),
- m_isStyleStarted(false)
+ m_isStyleStarted(false), m_currentShapeLevel(0)
{
m_groupXFormsSequence.clear();
m_groupMembershipsSequence.clear();
@@ -215,6 +215,7 @@ void libvisio::VSDXStylesCollector::collectShape(unsigned id, unsigned level, un
unsigned /* lineStyle */, unsigned /* fillStyle */, unsigned /* textStyle */)
{
_handleLevelChange(level);
+ m_currentShapeLevel = level;
m_currentShapeId = id;
m_isShapeStarted = true;
}
@@ -400,8 +401,10 @@ void libvisio::VSDXStylesCollector::_handleLevelChange(unsigned level)
{
if (m_currentLevel == level)
return;
+ // if (level <= m_currentShapeLevel+1)
if (level < 3)
_flushShapeList();
+ // if (level <= m_currentShapeLevel)
if (level < 2)
{
m_isShapeStarted = false;
diff --git a/src/lib/VSDXStylesCollector.h b/src/lib/VSDXStylesCollector.h
index d32ad20..4ef23ac 100644
--- a/src/lib/VSDXStylesCollector.h
+++ b/src/lib/VSDXStylesCollector.h
@@ -176,6 +176,7 @@ private:
unsigned m_fillStyleMaster;
unsigned m_textStyleMaster;
bool m_isStyleStarted;
+ unsigned m_currentShapeLevel;
};
}