Merge remote-tracking branch 'origin/aleksei_kanash_dev' into Ilia_dev

45d7b6dd · Ilia Ryabokon · f283193f · 6df3ae06 · 45d7b6dd · 45d7b6dd
Commit 45d7b6dd authored Sep 27, 2012 by Ilia Ryabokon
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 180 additions and 55 deletions

UBCFFSubsetAdaptor.cpp src/adaptors/UBCFFSubsetAdaptor.cpp +179 -54

UBCFFSubsetAdaptor.h src/adaptors/UBCFFSubsetAdaptor.h +1 -1

No files found.
--- a/src/adaptors/UBCFFSubsetAdaptor.cpp
+++ b/src/adaptors/UBCFFSubsetAdaptor.cpp
--- a/src/adaptors/UBCFFSubsetAdaptor.h
+++ b/src/adaptors/UBCFFSubsetAdaptor.h
@@ -102,7 +102,7 @@ private:
        inline bool parseSvgFlash(const QDomElement &element);
        inline bool parseSvgAudio(const QDomElement &element);
        inline bool parseSvgVideo(const QDomElement &element);
-        inline bool parseIwbGroup(QDomElement &parent);
+        inline UBGraphicsGroupContainerItem *parseIwbGroup(QDomElement &parent);
        inline bool parseIwbElement(QDomElement &element);
        inline void parseTSpan(const QDomElement &parent, QPainter &painter
                               , qreal &curX, qreal &curY, qreal &width, qreal &height, qreal &linespacing, QRectF &lastDrawnTextBoundingRect