[Libreoffice-commits] libvisio.git: src/lib
Fridrich Å trba
fridrich.strba at bluewin.ch
Thu Nov 21 07:32:16 PST 2013
src/lib/VSDContentCollector.cpp | 2 +-
src/lib/VSDOutputElementList.cpp | 15 +++++++--------
src/lib/VSDOutputElementList.h | 2 +-
3 files changed, 9 insertions(+), 10 deletions(-)
New commits:
commit f7aa5e4c068591516138780bbe308a014c95c9d1
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Nov 21 15:24:15 2013 +0100
Fold tabStops into the propList
Change-Id: Iee866e27e76327fc04385e19ebcad2b6b4f36ea1
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index 4207719..5c81986 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -528,7 +528,7 @@ void libvisio::VSDContentCollector::_flushText()
else
paraProps.insert("fo:line-height", -(*paraIt).spLine, librevenge::RVNG_PERCENT);
- m_shapeOutputText->addOpenParagraph(paraProps, librevenge::RVNGPropertyListVector());
+ m_shapeOutputText->addOpenParagraph(paraProps);
paraCharCount = (*paraIt).charCount;
diff --git a/src/lib/VSDOutputElementList.cpp b/src/lib/VSDOutputElementList.cpp
index 0af3aa2..42ef287 100644
--- a/src/lib/VSDOutputElementList.cpp
+++ b/src/lib/VSDOutputElementList.cpp
@@ -107,16 +107,15 @@ private:
class VSDOpenParagraphOutputElement : public VSDOutputElement
{
public:
- VSDOpenParagraphOutputElement(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec);
+ VSDOpenParagraphOutputElement(const librevenge::RVNGPropertyList &propList);
virtual ~VSDOpenParagraphOutputElement() {}
virtual void draw(librevenge::RVNGDrawingInterface *painter);
virtual VSDOutputElement *clone()
{
- return new VSDOpenParagraphOutputElement(m_propList, m_propListVec);
+ return new VSDOpenParagraphOutputElement(m_propList);
}
private:
librevenge::RVNGPropertyList m_propList;
- librevenge::RVNGPropertyListVector m_propListVec;
};
@@ -286,13 +285,13 @@ void libvisio::VSDEndLayerOutputElement::draw(librevenge::RVNGDrawingInterface *
}
-libvisio::VSDOpenParagraphOutputElement::VSDOpenParagraphOutputElement(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec) :
- m_propList(propList), m_propListVec(propListVec) {}
+libvisio::VSDOpenParagraphOutputElement::VSDOpenParagraphOutputElement(const librevenge::RVNGPropertyList &propList) :
+ m_propList(propList) {}
void libvisio::VSDOpenParagraphOutputElement::draw(librevenge::RVNGDrawingInterface *painter)
{
if (painter)
- painter->openParagraph(m_propList, m_propListVec);
+ painter->openParagraph(m_propList);
}
@@ -397,9 +396,9 @@ void libvisio::VSDOutputElementList::addStartTextObject(const librevenge::RVNGPr
m_elements.push_back(new VSDStartTextObjectOutputElement(propList));
}
-void libvisio::VSDOutputElementList::addOpenParagraph(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec)
+void libvisio::VSDOutputElementList::addOpenParagraph(const librevenge::RVNGPropertyList &propList)
{
- m_elements.push_back(new VSDOpenParagraphOutputElement(propList, propListVec));
+ m_elements.push_back(new VSDOpenParagraphOutputElement(propList));
}
void libvisio::VSDOutputElementList::addOpenSpan(const librevenge::RVNGPropertyList &propList)
diff --git a/src/lib/VSDOutputElementList.h b/src/lib/VSDOutputElementList.h
index 67051fb..37e3cdb 100644
--- a/src/lib/VSDOutputElementList.h
+++ b/src/lib/VSDOutputElementList.h
@@ -54,7 +54,7 @@ public:
void addPath(const librevenge::RVNGPropertyList &propList);
void addGraphicObject(const librevenge::RVNGPropertyList &propList);
void addStartTextObject(const librevenge::RVNGPropertyList &propList);
- void addOpenParagraph(const librevenge::RVNGPropertyList &propList, const librevenge::RVNGPropertyListVector &propListVec);
+ void addOpenParagraph(const librevenge::RVNGPropertyList &propList);
void addOpenSpan(const librevenge::RVNGPropertyList &propList);
void addInsertText(const librevenge::RVNGString &text);
void addCloseSpan();
More information about the Libreoffice-commits
mailing list