[Libreoffice-commits] libvisio.git: src/lib
Fridrich Å trba
fridrich.strba at bluewin.ch
Wed Dec 11 13:08:10 PST 2013
src/lib/VDXParser.cpp | 4 -
src/lib/VSD5Parser.cpp | 8 +-
src/lib/VSD6Parser.cpp | 8 +-
src/lib/VSDCharacterList.cpp | 12 ++--
src/lib/VSDContentCollector.cpp | 90 +++++++++++++++----------------
src/lib/VSDGeometryList.cpp | 38 ++++++-------
src/lib/VSDParagraphList.cpp | 6 +-
src/lib/VSDParser.cpp | 10 +--
src/lib/VSDStylesCollector.cpp | 116 ++++++++++++++++++++--------------------
src/lib/VSDXMLParserBase.cpp | 6 +-
src/lib/VSDXParser.cpp | 4 -
11 files changed, 151 insertions(+), 151 deletions(-)
New commits:
commit 1afbb575ae6d80b51b75a9c8f6fafa8f0f07f8d5
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Dec 11 22:07:49 2013 +0100
Re-astyle
Change-Id: Iacfed5764164c80130685cac757f1b9ca0acfdaf
diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
index 8a3814a..cbf689f 100644
--- a/src/lib/VDXParser.cpp
+++ b/src/lib/VDXParser.cpp
@@ -457,7 +457,7 @@ void libvisio::VDXParser::readFillAndShadow(xmlTextReaderPtr reader)
VSD_DEBUG_MSG(("Found stencil fill\n"));
}
m_shape.m_fillStyle.override(VSDOptionalFillStyle(fillColourFG, fillColourBG, fillPattern, fillFGTransparency, fillBGTransparency,
- shadowColourFG, shadowPattern, shadowOffsetX, shadowOffsetY));
+ shadowColourFG, shadowPattern, shadowOffsetX, shadowOffsetY));
}
}
@@ -803,7 +803,7 @@ void libvisio::VDXParser::readTextBlock(xmlTextReaderPtr reader)
verticalAlign, !!bgClrId, bgColour, defaultTabStop, textDirection);
else
m_shape.m_textBlockStyle.override(VSDOptionalTextBlockStyle(leftMargin, rightMargin, topMargin, bottomMargin,
- verticalAlign, !!bgClrId, bgColour, defaultTabStop, textDirection));
+ verticalAlign, !!bgClrId, bgColour, defaultTabStop, textDirection));
}
xmlChar *libvisio::VDXParser::readStringData(xmlTextReaderPtr reader)
diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp
index 4d051ce..4cae084 100644
--- a/src/lib/VSD5Parser.cpp
+++ b/src/lib/VSD5Parser.cpp
@@ -278,8 +278,8 @@ void libvisio::VSD5Parser::readCharIX(librevenge::RVNGInputStream *input)
}
m_shape.m_charStyle.override(VSDOptionalCharStyle(charCount, font, fontColour, fontSize,
- bold, italic, underline, doubleunderline, strikeout, doublestrikeout,
- allcaps, initcaps, smallcaps, superscript, subscript));
+ bold, italic, underline, doubleunderline, strikeout, doublestrikeout,
+ allcaps, initcaps, smallcaps, superscript, subscript));
m_shape.m_charList.addCharIX(m_header.id, m_header.level, charCount, font, fontColour, fontSize,
bold, italic, underline, doubleunderline, strikeout, doublestrikeout,
allcaps, initcaps, smallcaps, superscript, subscript);
@@ -314,7 +314,7 @@ void libvisio::VSD5Parser::readFillAndShadow(librevenge::RVNGInputStream *input)
shadowOffsetY = m_shadowOffsetY;
}
m_shape.m_fillStyle.override(VSDOptionalFillStyle(colourFG, colourBG, fillPattern, 0.0,
- 0.0, shfgc, shadowPattern, shadowOffsetX, shadowOffsetY));
+ 0.0, shfgc, shadowPattern, shadowOffsetX, shadowOffsetY));
}
}
@@ -406,7 +406,7 @@ void libvisio::VSD5Parser::readTextBlock(librevenge::RVNGInputStream *input)
verticalAlign, isBgFilled, c, 0.0, (unsigned char)0);
else
m_shape.m_textBlockStyle.override(VSDOptionalTextBlockStyle(leftMargin, rightMargin, topMargin, bottomMargin,
- verticalAlign, isBgFilled, c, 0.0, (unsigned char)0));
+ verticalAlign, isBgFilled, c, 0.0, (unsigned char)0));
}
void libvisio::VSD5Parser::readTextField(librevenge::RVNGInputStream *input)
diff --git a/src/lib/VSD6Parser.cpp b/src/lib/VSD6Parser.cpp
index 683e0ae..d867e66 100644
--- a/src/lib/VSD6Parser.cpp
+++ b/src/lib/VSD6Parser.cpp
@@ -161,8 +161,8 @@ void libvisio::VSD6Parser::readCharIX(librevenge::RVNGInputStream *input)
}
m_shape.m_charStyle.override(VSDOptionalCharStyle(charCount, font, fontColour, fontSize,
- bold, italic, underline, doubleunderline, strikeout, doublestrikeout,
- allcaps, initcaps, smallcaps, superscript, subscript));
+ bold, italic, underline, doubleunderline, strikeout, doublestrikeout,
+ allcaps, initcaps, smallcaps, superscript, subscript));
m_shape.m_charList.addCharIX(m_header.id, m_header.level, charCount, font, fontColour, fontSize,
bold, italic, underline, doubleunderline, strikeout, doublestrikeout,
allcaps, initcaps, smallcaps, superscript, subscript);
@@ -197,7 +197,7 @@ void libvisio::VSD6Parser::readParaIX(librevenge::RVNGInputStream *input)
}
m_shape.m_paraStyle.override(VSDOptionalParaStyle(charCount, indFirst, indLeft, indRight,
- spLine, spBefore, spAfter, align, (unsigned)0));
+ spLine, spBefore, spAfter, align, (unsigned)0));
m_shape.m_paraList.addParaIX(m_header.id, m_header.level, charCount, indFirst, indLeft, indRight,
spLine, spBefore, spAfter, align, (unsigned)0);
}
@@ -267,7 +267,7 @@ void libvisio::VSD6Parser::readFillAndShadow(librevenge::RVNGInputStream *input)
shadowOffsetY = m_shadowOffsetY;
}
m_shape.m_fillStyle.override(VSDOptionalFillStyle(colourFG, colourBG, fillPattern, fillFGTransparency,
- fillBGTransparency, shadowFG, shadowPattern, shadowOffsetX, shadowOffsetY));
+ fillBGTransparency, shadowFG, shadowPattern, shadowOffsetX, shadowOffsetY));
}
}
diff --git a/src/lib/VSDCharacterList.cpp b/src/lib/VSDCharacterList.cpp
index bdec705..72bb0ce 100644
--- a/src/lib/VSDCharacterList.cpp
+++ b/src/lib/VSDCharacterList.cpp
@@ -124,11 +124,11 @@ libvisio::VSDCharacterList::~VSDCharacterList()
}
void libvisio::VSDCharacterList::addCharIX(unsigned id, unsigned level, unsigned charCount,
- const boost::optional<VSDName> &font, const boost::optional<Colour> &fontColour, const boost::optional<double> &fontSize,
- const boost::optional<bool> &bold, const boost::optional<bool> &italic, const boost::optional<bool> &underline,
- const boost::optional<bool> &doubleunderline, const boost::optional<bool> &strikeout, const boost::optional<bool> &doublestrikeout,
- const boost::optional<bool> &allcaps, const boost::optional<bool> &initcaps, const boost::optional<bool> &smallcaps,
- const boost::optional<bool> &superscript, const boost::optional<bool> &subscript)
+ const boost::optional<VSDName> &font, const boost::optional<Colour> &fontColour, const boost::optional<double> &fontSize,
+ const boost::optional<bool> &bold, const boost::optional<bool> &italic, const boost::optional<bool> &underline,
+ const boost::optional<bool> &doubleunderline, const boost::optional<bool> &strikeout, const boost::optional<bool> &doublestrikeout,
+ const boost::optional<bool> &allcaps, const boost::optional<bool> &initcaps, const boost::optional<bool> &smallcaps,
+ const boost::optional<bool> &superscript, const boost::optional<bool> &subscript)
{
VSDCharIX *tmpElement = dynamic_cast<VSDCharIX *>(m_elements[id]);
if (!tmpElement)
@@ -141,7 +141,7 @@ void libvisio::VSDCharacterList::addCharIX(unsigned id, unsigned level, unsigned
}
else
tmpElement->m_style.override(VSDOptionalCharStyle(charCount, font, fontColour, fontSize, bold, italic, underline,
- doubleunderline, strikeout, doublestrikeout, allcaps, initcaps, smallcaps, superscript, subscript));
+ doubleunderline, strikeout, doublestrikeout, allcaps, initcaps, smallcaps, superscript, subscript));
}
void libvisio::VSDCharacterList::addCharIX(unsigned id, unsigned level, const VSDOptionalCharStyle &style)
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index c3889aa..2843964 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -597,7 +597,7 @@ void libvisio::VSDContentCollector::_flushText()
if (tmpBuffer.size() >= 2)
{
if (tmpBuffer[tmpBuffer.size() - 1] == 0 && (tmpBuffer[tmpBuffer.size() - 2] == 0x0a ||
- tmpBuffer[tmpBuffer.size() - 2] == '\n' || tmpBuffer[tmpBuffer.size() - 2] == 0x0e))
+ tmpBuffer[tmpBuffer.size() - 2] == '\n' || tmpBuffer[tmpBuffer.size() - 2] == 0x0e))
{
tmpBuffer.pop_back();
tmpBuffer.pop_back();
@@ -1058,24 +1058,24 @@ void libvisio::VSDContentCollector::collectRelQuadBezTo(unsigned /* id */, unsig
}
void libvisio::VSDContentCollector::collectLine(unsigned level, const boost::optional<double> &strokeWidth, const boost::optional<Colour> &c, const boost::optional<unsigned char> &linePattern,
- const boost::optional<unsigned char> &startMarker, const boost::optional<unsigned char> &endMarker, const boost::optional<unsigned char> &lineCap)
+ const boost::optional<unsigned char> &startMarker, const boost::optional<unsigned char> &endMarker, const boost::optional<unsigned char> &lineCap)
{
_handleLevelChange(level);
m_lineStyle.override(VSDOptionalLineStyle(strokeWidth, c, linePattern, startMarker, endMarker, lineCap));
}
void libvisio::VSDContentCollector::collectFillAndShadow(unsigned level, const boost::optional<Colour> &colourFG, const boost::optional<Colour> &colourBG,
- const boost::optional<unsigned char> &fillPattern, const boost::optional<double> &fillFGTransparency, const boost::optional<double> &fillBGTransparency,
- const boost::optional<unsigned char> &shadowPattern, const boost::optional<Colour> &shfgc, const boost::optional<double> &shadowOffsetX,
- const boost::optional<double> &shadowOffsetY)
+ const boost::optional<unsigned char> &fillPattern, const boost::optional<double> &fillFGTransparency, const boost::optional<double> &fillBGTransparency,
+ const boost::optional<unsigned char> &shadowPattern, const boost::optional<Colour> &shfgc, const boost::optional<double> &shadowOffsetX,
+ const boost::optional<double> &shadowOffsetY)
{
_handleLevelChange(level);
m_fillStyle.override(VSDOptionalFillStyle(colourFG, colourBG, fillPattern, fillFGTransparency, fillBGTransparency, shfgc, shadowPattern, shadowOffsetX, shadowOffsetY));
}
void libvisio::VSDContentCollector::collectFillAndShadow(unsigned level, const boost::optional<Colour> &colourFG, const boost::optional<Colour> &colourBG,
- const boost::optional<unsigned char> &fillPattern, const boost::optional<double> &fillFGTransparency, const boost::optional<double> &fillBGTransparency,
- const boost::optional<unsigned char> &shadowPattern, const boost::optional<Colour> &shfgc)
+ const boost::optional<unsigned char> &fillPattern, const boost::optional<double> &fillFGTransparency, const boost::optional<double> &fillBGTransparency,
+ const boost::optional<unsigned char> &shadowPattern, const boost::optional<Colour> &shfgc)
{
collectFillAndShadow(level, colourFG, colourBG, fillPattern, fillFGTransparency, fillBGTransparency, shadowPattern, shfgc, m_shadowOffsetX, m_shadowOffsetY);
}
@@ -1388,7 +1388,7 @@ void libvisio::VSDContentCollector::_outputLinearBezierSegment(const std::vector
}
void libvisio::VSDContentCollector::_generateBezierSegmentsFromNURBS(unsigned degree,
- const std::vector<std::pair<double, double> > &controlPoints, const std::vector<double> &knotVector)
+ const std::vector<std::pair<double, double> > &controlPoints, const std::vector<double> &knotVector)
{
if (controlPoints.empty() || knotVector.empty() || !degree)
return;
@@ -1491,7 +1491,7 @@ double libvisio::VSDContentCollector::_NURBSBasis(unsigned knot, unsigned degree
#define VSD_NUM_POLYLINES_PER_KNOT 100
void libvisio::VSDContentCollector::_generatePolylineFromNURBS(unsigned degree, const std::vector<std::pair<double, double> > &controlPoints,
- const std::vector<double> &knotVector, const std::vector<double> &weights)
+ const std::vector<double> &knotVector, const std::vector<double> &weights)
{
if (m_noShow)
return;
@@ -1542,8 +1542,8 @@ bool libvisio::VSDContentCollector::_isUniform(const std::vector<double> &weight
}
void libvisio::VSDContentCollector::collectNURBSTo(unsigned /* id */, unsigned level, double x2, double y2,
- unsigned char xType, unsigned char yType, unsigned degree, const std::vector<std::pair<double, double> > &ctrlPnts,
- const std::vector<double> &kntVec, const std::vector<double> &weights)
+ unsigned char xType, unsigned char yType, unsigned degree, const std::vector<std::pair<double, double> > &ctrlPnts,
+ const std::vector<double> &kntVec, const std::vector<double> &weights)
{
_handleLevelChange(level);
@@ -2107,8 +2107,8 @@ void libvisio::VSDContentCollector::collectText(unsigned level, const librevenge
}
void libvisio::VSDContentCollector::collectParaIX(unsigned /* id */ , unsigned level, unsigned charCount, const boost::optional<double> &indFirst,
- const boost::optional<double> &indLeft, const boost::optional<double> &indRight, const boost::optional<double> &spLine, const boost::optional<double> &spBefore,
- const boost::optional<double> &spAfter, const boost::optional<unsigned char> &align, const boost::optional<unsigned> &flags)
+ const boost::optional<double> &indLeft, const boost::optional<double> &indRight, const boost::optional<double> &spLine, const boost::optional<double> &spBefore,
+ const boost::optional<double> &spAfter, const boost::optional<unsigned char> &align, const boost::optional<unsigned> &flags)
{
_handleLevelChange(level);
VSDParaStyle format(m_defaultParaStyle);
@@ -2118,17 +2118,17 @@ void libvisio::VSDContentCollector::collectParaIX(unsigned /* id */ , unsigned l
}
void libvisio::VSDContentCollector::collectDefaultParaStyle(unsigned charCount, const boost::optional<double> &indFirst,
- const boost::optional<double> &indLeft, const boost::optional<double> &indRight, const boost::optional<double> &spLine, const boost::optional<double> &spBefore,
- const boost::optional<double> &spAfter, const boost::optional<unsigned char> &align, const boost::optional<unsigned> &flags)
+ const boost::optional<double> &indLeft, const boost::optional<double> &indRight, const boost::optional<double> &spLine, const boost::optional<double> &spBefore,
+ const boost::optional<double> &spAfter, const boost::optional<unsigned char> &align, const boost::optional<unsigned> &flags)
{
m_defaultParaStyle.override(VSDOptionalParaStyle(charCount, indFirst, indLeft, indRight, spLine, spBefore, spAfter, align, flags));
}
void libvisio::VSDContentCollector::collectCharIX(unsigned /* id */ , unsigned level, unsigned charCount,
- const boost::optional<VSDName> &font, const boost::optional<Colour> &fontColour, const boost::optional<double> &fontSize, const boost::optional<bool> &bold,
- const boost::optional<bool> &italic, const boost::optional<bool> &underline, const boost::optional<bool> &doubleunderline, const boost::optional<bool> &strikeout,
- const boost::optional<bool> &doublestrikeout, const boost::optional<bool> &allcaps, const boost::optional<bool> &initcaps, const boost::optional<bool> &smallcaps,
- const boost::optional<bool> &superscript, const boost::optional<bool> &subscript)
+ const boost::optional<VSDName> &font, const boost::optional<Colour> &fontColour, const boost::optional<double> &fontSize, const boost::optional<bool> &bold,
+ const boost::optional<bool> &italic, const boost::optional<bool> &underline, const boost::optional<bool> &doubleunderline, const boost::optional<bool> &strikeout,
+ const boost::optional<bool> &doublestrikeout, const boost::optional<bool> &allcaps, const boost::optional<bool> &initcaps, const boost::optional<bool> &smallcaps,
+ const boost::optional<bool> &superscript, const boost::optional<bool> &subscript)
{
_handleLevelChange(level);
VSDCharStyle format(m_defaultCharStyle);
@@ -2139,19 +2139,19 @@ void libvisio::VSDContentCollector::collectCharIX(unsigned /* id */ , unsigned l
}
void libvisio::VSDContentCollector::collectDefaultCharStyle(unsigned charCount,
- const boost::optional<VSDName> &font, const boost::optional<Colour> &fontColour, const boost::optional<double> &fontSize, const boost::optional<bool> &bold,
- const boost::optional<bool> &italic, const boost::optional<bool> &underline, const boost::optional<bool> &doubleunderline, const boost::optional<bool> &strikeout,
- const boost::optional<bool> &doublestrikeout, const boost::optional<bool> &allcaps, const boost::optional<bool> &initcaps, const boost::optional<bool> &smallcaps,
- const boost::optional<bool> &superscript, const boost::optional<bool> &subscript)
+ const boost::optional<VSDName> &font, const boost::optional<Colour> &fontColour, const boost::optional<double> &fontSize, const boost::optional<bool> &bold,
+ const boost::optional<bool> &italic, const boost::optional<bool> &underline, const boost::optional<bool> &doubleunderline, const boost::optional<bool> &strikeout,
+ const boost::optional<bool> &doublestrikeout, const boost::optional<bool> &allcaps, const boost::optional<bool> &initcaps, const boost::optional<bool> &smallcaps,
+ const boost::optional<bool> &superscript, const boost::optional<bool> &subscript)
{
m_defaultCharStyle.override(VSDOptionalCharStyle(charCount, font, fontColour, fontSize, bold, italic, underline, doubleunderline, strikeout, doublestrikeout,
- allcaps, initcaps, smallcaps, superscript, subscript));
+ allcaps, initcaps, smallcaps, superscript, subscript));
}
void libvisio::VSDContentCollector::collectTextBlock(unsigned level, const boost::optional<double> &leftMargin, const boost::optional<double> &rightMargin,
- const boost::optional<double> &topMargin, const boost::optional<double> &bottomMargin, const boost::optional<unsigned char> &verticalAlign,
- const boost::optional<bool> &isBgFilled, const boost::optional<Colour> &bgColour, const boost::optional<double> &defaultTabStop,
- const boost::optional<unsigned char> &textDirection)
+ const boost::optional<double> &topMargin, const boost::optional<double> &bottomMargin, const boost::optional<unsigned char> &verticalAlign,
+ const boost::optional<bool> &isBgFilled, const boost::optional<Colour> &bgColour, const boost::optional<double> &defaultTabStop,
+ const boost::optional<unsigned char> &textDirection)
{
_handleLevelChange(level);
m_textBlockStyle.override(VSDOptionalTextBlockStyle(leftMargin, rightMargin, topMargin, bottomMargin, verticalAlign, isBgFilled, bgColour, defaultTabStop, textDirection));
@@ -2200,17 +2200,17 @@ void libvisio::VSDContentCollector::collectStyleSheet(unsigned id, unsigned leve
}
void libvisio::VSDContentCollector::collectLineStyle(unsigned /* level */, const boost::optional<double> &strokeWidth, const boost::optional<Colour> &c,
- const boost::optional<unsigned char> &linePattern, const boost::optional<unsigned char> &startMarker, const boost::optional<unsigned char> &endMarker,
- const boost::optional<unsigned char> &lineCap)
+ const boost::optional<unsigned char> &linePattern, const boost::optional<unsigned char> &startMarker, const boost::optional<unsigned char> &endMarker,
+ const boost::optional<unsigned char> &lineCap)
{
VSDOptionalLineStyle lineStyle(strokeWidth, c, linePattern, startMarker, endMarker, lineCap);
m_styles.addLineStyle(m_currentStyleSheet, lineStyle);
}
void libvisio::VSDContentCollector::collectFillStyle(unsigned /* level */, const boost::optional<Colour> &colourFG, const boost::optional<Colour> &colourBG,
- const boost::optional<unsigned char> &fillPattern, const boost::optional<double> &fillFGTransparency, const boost::optional<double> &fillBGTransparency,
- const boost::optional<unsigned char> &shadowPattern, const boost::optional<Colour> &shfgc, const boost::optional<double> &shadowOffsetX,
- const boost::optional<double> &shadowOffsetY)
+ const boost::optional<unsigned char> &fillPattern, const boost::optional<double> &fillFGTransparency, const boost::optional<double> &fillBGTransparency,
+ const boost::optional<unsigned char> &shadowPattern, const boost::optional<Colour> &shfgc, const boost::optional<double> &shadowOffsetX,
+ const boost::optional<double> &shadowOffsetY)
{
VSDOptionalFillStyle fillStyle(colourFG, colourBG, fillPattern, fillFGTransparency, fillBGTransparency, shfgc, shadowPattern, shadowOffsetX, shadowOffsetY);
m_styles.addFillStyle(m_currentStyleSheet, fillStyle);
@@ -2218,16 +2218,16 @@ void libvisio::VSDContentCollector::collectFillStyle(unsigned /* level */, const
}
void libvisio::VSDContentCollector::collectFillStyle(unsigned level, const boost::optional<Colour> &colourFG, const boost::optional<Colour> &colourBG,
- const boost::optional<unsigned char> &fillPattern, const boost::optional<double> &fillFGTransparency, const boost::optional<double> &fillBGTransparency,
- const boost::optional<unsigned char> &shadowPattern, const boost::optional<Colour> &shfgc)
+ const boost::optional<unsigned char> &fillPattern, const boost::optional<double> &fillFGTransparency, const boost::optional<double> &fillBGTransparency,
+ const boost::optional<unsigned char> &shadowPattern, const boost::optional<Colour> &shfgc)
{
collectFillStyle(level, colourFG, colourBG, fillPattern, fillFGTransparency, fillBGTransparency, shadowPattern, shfgc, m_shadowOffsetX, m_shadowOffsetY);
}
void libvisio::VSDContentCollector::collectParaIXStyle(unsigned /* id */, unsigned /* level */, unsigned charCount,
- const boost::optional<double> &indFirst, const boost::optional<double> &indLeft, const boost::optional<double> &indRight,
- const boost::optional<double> &spLine, const boost::optional<double> &spBefore, const boost::optional<double> &spAfter,
- const boost::optional<unsigned char> &align, const boost::optional<unsigned> &flags)
+ const boost::optional<double> &indFirst, const boost::optional<double> &indLeft, const boost::optional<double> &indRight,
+ const boost::optional<double> &spLine, const boost::optional<double> &spBefore, const boost::optional<double> &spAfter,
+ const boost::optional<unsigned char> &align, const boost::optional<unsigned> &flags)
{
VSDOptionalParaStyle paraStyle(charCount, indFirst, indLeft, indRight, spLine, spBefore, spAfter, align, flags);
m_styles.addParaStyle(m_currentStyleSheet, paraStyle);
@@ -2235,11 +2235,11 @@ void libvisio::VSDContentCollector::collectParaIXStyle(unsigned /* id */, unsign
void libvisio::VSDContentCollector::collectCharIXStyle(unsigned /* id */, unsigned /* level */, unsigned charCount,
- const boost::optional<VSDName> &font, const boost::optional<Colour> &fontColour, const boost::optional<double> &fontSize,
- const boost::optional<bool> &bold, const boost::optional<bool> &italic, const boost::optional<bool> &underline,
- const boost::optional<bool> &doubleunderline, const boost::optional<bool> &strikeout, const boost::optional<bool> &doublestrikeout,
- const boost::optional<bool> &allcaps, const boost::optional<bool> &initcaps, const boost::optional<bool> &smallcaps,
- const boost::optional<bool> &superscript, const boost::optional<bool> &subscript)
+ const boost::optional<VSDName> &font, const boost::optional<Colour> &fontColour, const boost::optional<double> &fontSize,
+ const boost::optional<bool> &bold, const boost::optional<bool> &italic, const boost::optional<bool> &underline,
+ const boost::optional<bool> &doubleunderline, const boost::optional<bool> &strikeout, const boost::optional<bool> &doublestrikeout,
+ const boost::optional<bool> &allcaps, const boost::optional<bool> &initcaps, const boost::optional<bool> &smallcaps,
+ const boost::optional<bool> &superscript, const boost::optional<bool> &subscript)
{
VSDOptionalCharStyle charStyle(charCount, font, fontColour, fontSize, bold, italic, underline, doubleunderline, strikeout, doublestrikeout,
allcaps, initcaps, smallcaps, superscript, subscript);
@@ -2247,9 +2247,9 @@ void libvisio::VSDContentCollector::collectCharIXStyle(unsigned /* id */, unsign
}
void libvisio::VSDContentCollector::collectTextBlockStyle(unsigned /* level */, const boost::optional<double> &leftMargin, const boost::optional<double> &rightMargin,
- const boost::optional<double> &topMargin, const boost::optional<double> &bottomMargin, const boost::optional<unsigned char> &verticalAlign,
- const boost::optional<bool> &isBgFilled, const boost::optional<Colour> &bgColour, const boost::optional<double> &defaultTabStop,
- const boost::optional<unsigned char> &textDirection)
+ const boost::optional<double> &topMargin, const boost::optional<double> &bottomMargin, const boost::optional<unsigned char> &verticalAlign,
+ const boost::optional<bool> &isBgFilled, const boost::optional<Colour> &bgColour, const boost::optional<double> &defaultTabStop,
+ const boost::optional<unsigned char> &textDirection)
{
VSDOptionalTextBlockStyle textBlockStyle(leftMargin, rightMargin, topMargin, bottomMargin, verticalAlign, isBgFilled, bgColour, defaultTabStop, textDirection);
m_styles.addTextBlockStyle(m_currentStyleSheet, textBlockStyle);
diff --git a/src/lib/VSDGeometryList.cpp b/src/lib/VSDGeometryList.cpp
index 89181b5..19b2836 100644
--- a/src/lib/VSDGeometryList.cpp
+++ b/src/lib/VSDGeometryList.cpp
@@ -615,7 +615,7 @@ libvisio::VSDGeometryList::~VSDGeometryList()
}
void libvisio::VSDGeometryList::addGeometry(unsigned id, unsigned level, const boost::optional<bool> &noFill,
- const boost::optional<bool> &noLine, const boost::optional<bool> &noShow)
+ const boost::optional<bool> &noLine, const boost::optional<bool> &noShow)
{
VSDGeometry *tmpElement = dynamic_cast<VSDGeometry *>(m_elements[id]);
if (!tmpElement)
@@ -638,7 +638,7 @@ void libvisio::VSDGeometryList::addEmpty(unsigned id, unsigned level)
}
void libvisio::VSDGeometryList::addMoveTo(unsigned id, unsigned level, const boost::optional<double> &x,
- const boost::optional<double> &y)
+ const boost::optional<double> &y)
{
VSDMoveTo *tmpElement = dynamic_cast<VSDMoveTo *>(m_elements[id]);
if (!tmpElement)
@@ -669,7 +669,7 @@ void libvisio::VSDGeometryList::addLineTo(unsigned id, unsigned level, const boo
}
void libvisio::VSDGeometryList::addArcTo(unsigned id, unsigned level, const boost::optional<double> &x2,
- const boost::optional<double> &y2, const boost::optional<double> &bow)
+ const boost::optional<double> &y2, const boost::optional<double> &bow)
{
VSDArcTo *tmpElement = dynamic_cast<VSDArcTo *>(m_elements[id]);
if (!tmpElement)
@@ -686,7 +686,7 @@ void libvisio::VSDGeometryList::addArcTo(unsigned id, unsigned level, const boos
}
void libvisio::VSDGeometryList::addNURBSTo(unsigned id, unsigned level, double x2, double y2, unsigned char xType, unsigned char yType, unsigned degree,
- const std::vector<std::pair<double, double> > &controlPoints, const std::vector<double> &knotVector, const std::vector<double> &weights)
+ const std::vector<std::pair<double, double> > &controlPoints, const std::vector<double> &knotVector, const std::vector<double> &weights)
{
clearElement(id);
m_elements[id] = new VSDNURBSTo1(id, level, x2, y2, xType, yType, degree, controlPoints, knotVector, weights);
@@ -699,8 +699,8 @@ void libvisio::VSDGeometryList::addNURBSTo(unsigned id, unsigned level, double x
}
void libvisio::VSDGeometryList::addNURBSTo(unsigned id, unsigned level, const boost::optional<double> &x2, const boost::optional<double> &y2,
- const boost::optional<double> &knot, const boost::optional<double> &knotPrev, const boost::optional<double> &weight,
- const boost::optional<double> &weightPrev, const boost::optional<NURBSData> &data)
+ const boost::optional<double> &knot, const boost::optional<double> &knotPrev, const boost::optional<double> &weight,
+ const boost::optional<double> &weightPrev, const boost::optional<NURBSData> &data)
{
VSDNURBSTo3 *tmpElement = dynamic_cast<VSDNURBSTo3 *>(m_elements[id]);
if (!tmpElement)
@@ -721,7 +721,7 @@ void libvisio::VSDGeometryList::addNURBSTo(unsigned id, unsigned level, const bo
}
void libvisio::VSDGeometryList::addPolylineTo(unsigned id , unsigned level, double x, double y, unsigned char xType, unsigned char yType,
- const std::vector<std::pair<double, double> > &points)
+ const std::vector<std::pair<double, double> > &points)
{
clearElement(id);
m_elements[id] = new VSDPolylineTo1(id, level, x, y, xType, yType, points);
@@ -750,8 +750,8 @@ void libvisio::VSDGeometryList::addPolylineTo(unsigned id , unsigned level, boos
}
void libvisio::VSDGeometryList::addEllipse(unsigned id, unsigned level, const boost::optional<double> &cx,
- const boost::optional<double> &cy,const boost::optional<double> &xleft, const boost::optional<double> &yleft,
- const boost::optional<double> &xtop, const boost::optional<double> &ytop)
+ const boost::optional<double> &cy,const boost::optional<double> &xleft, const boost::optional<double> &yleft,
+ const boost::optional<double> &xtop, const boost::optional<double> &ytop)
{
VSDEllipse *tmpElement = dynamic_cast<VSDEllipse *>(m_elements[id]);
if (!tmpElement)
@@ -771,8 +771,8 @@ void libvisio::VSDGeometryList::addEllipse(unsigned id, unsigned level, const bo
}
void libvisio::VSDGeometryList::addEllipticalArcTo(unsigned id, unsigned level, const boost::optional<double> &x3,
- const boost::optional<double> &y3, const boost::optional<double> &x2, const boost::optional<double> &y2,
- const boost::optional<double> &angle, const boost::optional<double> &ecc)
+ const boost::optional<double> &y3, const boost::optional<double> &x2, const boost::optional<double> &y2,
+ const boost::optional<double> &angle, const boost::optional<double> &ecc)
{
VSDEllipticalArcTo *tmpElement = dynamic_cast<VSDEllipticalArcTo *>(m_elements[id]);
if (!tmpElement)
@@ -792,8 +792,8 @@ void libvisio::VSDGeometryList::addEllipticalArcTo(unsigned id, unsigned level,
}
void libvisio::VSDGeometryList::addSplineStart(unsigned id, unsigned level, const boost::optional<double> &x,
- const boost::optional<double> &y, const boost::optional<double> &secondKnot, const boost::optional<double> &firstKnot,
- const boost::optional<double> &lastKnot, const boost::optional<unsigned> °ree)
+ const boost::optional<double> &y, const boost::optional<double> &secondKnot, const boost::optional<double> &firstKnot,
+ const boost::optional<double> &lastKnot, const boost::optional<unsigned> °ree)
{
VSDSplineStart *tmpElement = dynamic_cast<VSDSplineStart *>(m_elements[id]);
if (!tmpElement)
@@ -813,7 +813,7 @@ void libvisio::VSDGeometryList::addSplineStart(unsigned id, unsigned level, cons
}
void libvisio::VSDGeometryList::addSplineKnot(unsigned id, unsigned level, const boost::optional<double> &x,
- const boost::optional<double> &y, const boost::optional<double> &knot)
+ const boost::optional<double> &y, const boost::optional<double> &knot)
{
VSDSplineKnot *tmpElement = dynamic_cast<VSDSplineKnot *>(m_elements[id]);
if (!tmpElement)
@@ -830,7 +830,7 @@ void libvisio::VSDGeometryList::addSplineKnot(unsigned id, unsigned level, const
}
void libvisio::VSDGeometryList::addInfiniteLine(unsigned id, unsigned level, const boost::optional<double> &x1,
- const boost::optional<double> &y1, const boost::optional<double> &x2, const boost::optional<double> &y2)
+ const boost::optional<double> &y1, const boost::optional<double> &x2, const boost::optional<double> &y2)
{
VSDInfiniteLine *tmpElement = dynamic_cast<VSDInfiniteLine *>(m_elements[id]);
if (!tmpElement)
@@ -848,8 +848,8 @@ void libvisio::VSDGeometryList::addInfiniteLine(unsigned id, unsigned level, con
}
void libvisio::VSDGeometryList::addRelCubBezTo(unsigned id, unsigned level, const boost::optional<double> &x,
- const boost::optional<double> &y, const boost::optional<double> &a, const boost::optional<double> &b,
- const boost::optional<double> &c, const boost::optional<double> &d)
+ const boost::optional<double> &y, const boost::optional<double> &a, const boost::optional<double> &b,
+ const boost::optional<double> &c, const boost::optional<double> &d)
{
VSDRelCubBezTo *tmpElement = dynamic_cast<VSDRelCubBezTo *>(m_elements[id]);
if (!tmpElement)
@@ -869,8 +869,8 @@ void libvisio::VSDGeometryList::addRelCubBezTo(unsigned id, unsigned level, cons
}
void libvisio::VSDGeometryList::addRelEllipticalArcTo(unsigned id, unsigned level, const boost::optional<double> &x3,
- const boost::optional<double> &y3, const boost::optional<double> &x2, const boost::optional<double> &y2,
- const boost::optional<double> &angle, const boost::optional<double> &ecc)
+ const boost::optional<double> &y3, const boost::optional<double> &x2, const boost::optional<double> &y2,
+ const boost::optional<double> &angle, const boost::optional<double> &ecc)
{
VSDRelEllipticalArcTo *tmpElement = dynamic_cast<VSDRelEllipticalArcTo *>(m_elements[id]);
if (!tmpElement)
diff --git a/src/lib/VSDParagraphList.cpp b/src/lib/VSDParagraphList.cpp
index b1b1507..2acfda8 100644
--- a/src/lib/VSDParagraphList.cpp
+++ b/src/lib/VSDParagraphList.cpp
@@ -116,9 +116,9 @@ libvisio::VSDParagraphList::~VSDParagraphList()
}
void libvisio::VSDParagraphList::addParaIX(unsigned id, unsigned level, unsigned charCount, const boost::optional<double> &indFirst,
- const boost::optional<double> &indLeft, const boost::optional<double> &indRight, const boost::optional<double> &spLine,
- const boost::optional<double> &spBefore, const boost::optional<double> &spAfter, const boost::optional<unsigned char> &align,
- const boost::optional<unsigned> &flags)
+ const boost::optional<double> &indLeft, const boost::optional<double> &indRight, const boost::optional<double> &spLine,
+ const boost::optional<double> &spBefore, const boost::optional<double> &spAfter, const boost::optional<unsigned char> &align,
+ const boost::optional<unsigned> &flags)
{
VSDParaIX *tmpElement = dynamic_cast<VSDParaIX *>(m_elements[id]);
if (!tmpElement)
diff --git a/src/lib/VSDParser.cpp b/src/lib/VSDParser.cpp
index b8519a0..058d5db 100644
--- a/src/lib/VSDParser.cpp
+++ b/src/lib/VSDParser.cpp
@@ -837,7 +837,7 @@ void libvisio::VSDParser::readTextBlock(librevenge::RVNGInputStream *input)
verticalAlign, isBgFilled, c, defaultTabStop, textDirection);
else
m_shape.m_textBlockStyle.override(VSDOptionalTextBlockStyle(leftMargin, rightMargin, topMargin, bottomMargin,
- verticalAlign, isBgFilled, c, defaultTabStop, textDirection));
+ verticalAlign, isBgFilled, c, defaultTabStop, textDirection));
}
void libvisio::VSDParser::readGeomList(librevenge::RVNGInputStream *input)
@@ -1743,8 +1743,8 @@ void libvisio::VSDParser::readCharIX(librevenge::RVNGInputStream *input)
}
m_shape.m_charStyle.override(VSDOptionalCharStyle(charCount, font, fontColour, fontSize,
- bold, italic, underline, doubleunderline, strikeout, doublestrikeout,
- allcaps, initcaps, smallcaps, superscript, subscript));
+ bold, italic, underline, doubleunderline, strikeout, doublestrikeout,
+ allcaps, initcaps, smallcaps, superscript, subscript));
m_shape.m_charList.addCharIX(m_header.id, m_header.level, charCount, font, fontColour, fontSize,
bold, italic, underline, doubleunderline, strikeout, doublestrikeout,
allcaps, initcaps, smallcaps, superscript, subscript);
@@ -1781,7 +1781,7 @@ void libvisio::VSDParser::readParaIX(librevenge::RVNGInputStream *input)
}
m_shape.m_paraStyle.override(VSDOptionalParaStyle(charCount, indFirst, indLeft, indRight,
- spLine, spBefore, spAfter, align, flags));
+ spLine, spBefore, spAfter, align, flags));
m_shape.m_paraList.addParaIX(m_header.id, m_header.level, charCount, indFirst, indLeft, indRight,
spLine, spBefore, spAfter, align, flags);
}
@@ -1851,7 +1851,7 @@ void libvisio::VSDParser::readFillAndShadow(librevenge::RVNGInputStream *input)
VSD_DEBUG_MSG(("Found stencil fill\n"));
}
m_shape.m_fillStyle.override(VSDOptionalFillStyle(colourFG, colourBG, fillPattern, fillFGTransparency,
- fillBGTransparency, shadowFG, shadowPattern, shadowOffsetX, shadowOffsetY));
+ fillBGTransparency, shadowFG, shadowPattern, shadowOffsetX, shadowOffsetY));
}
}
diff --git a/src/lib/VSDStylesCollector.cpp b/src/lib/VSDStylesCollector.cpp
index a0ad812..b30d3cc 100644
--- a/src/lib/VSDStylesCollector.cpp
+++ b/src/lib/VSDStylesCollector.cpp
@@ -52,7 +52,7 @@ libvisio::VSDStylesCollector::VSDStylesCollector(
}
void libvisio::VSDStylesCollector::collectEllipticalArcTo(unsigned /* id */, unsigned level, double /* x3 */, double /* y3 */,
- double /* x2 */, double /* y2 */, double /* angle */, double /* ecc */)
+ double /* x2 */, double /* y2 */, double /* angle */, double /* ecc */)
{
_handleLevelChange(level);
}
@@ -68,30 +68,30 @@ void libvisio::VSDStylesCollector::collectOLEData(unsigned /* id */, unsigned le
}
void libvisio::VSDStylesCollector::collectEllipse(unsigned /* id */, unsigned level, double /* cx */, double /* cy */,
- double /* xleft */, double /* yleft */, double /* xtop */, double /* ytop */)
+ double /* xleft */, double /* yleft */, double /* xtop */, double /* ytop */)
{
_handleLevelChange(level);
}
void libvisio::VSDStylesCollector::collectLine(unsigned level, const boost::optional<double> & /* strokeWidth */,
- const boost::optional<Colour> & /* c */, const boost::optional<unsigned char> & /* linePattern */,
- const boost::optional<unsigned char> & /* startMarker */, const boost::optional<unsigned char> & /* endMarker */,
- const boost::optional<unsigned char> &/* lineCap */)
+ const boost::optional<Colour> & /* c */, const boost::optional<unsigned char> & /* linePattern */,
+ const boost::optional<unsigned char> & /* startMarker */, const boost::optional<unsigned char> & /* endMarker */,
+ const boost::optional<unsigned char> &/* lineCap */)
{
_handleLevelChange(level);
}
void libvisio::VSDStylesCollector::collectFillAndShadow(unsigned level, const boost::optional<Colour> & /* colourFG */, const boost::optional<Colour> & /* colourBG */,
- const boost::optional<unsigned char> & /* fillPattern */, const boost::optional<double> & /* fillFGTransparency */,
- const boost::optional<double> & /* fillBGTransparency */, const boost::optional<unsigned char> & /* shadowPattern */, const boost::optional<Colour> & /* shfgc */,
- const boost::optional<double> & /* shadowOffsetX */, const boost::optional<double> &/* shadowOffsetY */)
+ const boost::optional<unsigned char> & /* fillPattern */, const boost::optional<double> & /* fillFGTransparency */,
+ const boost::optional<double> & /* fillBGTransparency */, const boost::optional<unsigned char> & /* shadowPattern */, const boost::optional<Colour> & /* shfgc */,
+ const boost::optional<double> & /* shadowOffsetX */, const boost::optional<double> &/* shadowOffsetY */)
{
_handleLevelChange(level);
}
void libvisio::VSDStylesCollector::collectFillAndShadow(unsigned level, const boost::optional<Colour> & /* colourFG */, const boost::optional<Colour> & /* colourBG */,
- const boost::optional<unsigned char> & /* fillPattern */, const boost::optional<double> & /* fillFGTransparency */,
- const boost::optional<double> & /* fillBGTransparency */, const boost::optional<unsigned char> & /* shadowPattern */, const boost::optional<Colour> & /* shfgc */)
+ const boost::optional<unsigned char> & /* fillPattern */, const boost::optional<double> & /* fillFGTransparency */,
+ const boost::optional<double> & /* fillBGTransparency */, const boost::optional<unsigned char> & /* shadowPattern */, const boost::optional<Colour> & /* shfgc */)
{
_handleLevelChange(level);
}
@@ -117,27 +117,27 @@ void libvisio::VSDStylesCollector::collectArcTo(unsigned /* id */, unsigned leve
}
void libvisio::VSDStylesCollector::collectNURBSTo(unsigned /* id */, unsigned level, double /* x2 */, double /* y2 */,
- unsigned char /* xType */, unsigned char /* yType */, unsigned /* degree */, const std::vector<std::pair<double, double> > & /* ctrlPts */,
- const std::vector<double> & /* kntVec */, const std::vector<double> & /* weights */)
+ unsigned char /* xType */, unsigned char /* yType */, unsigned /* degree */, const std::vector<std::pair<double, double> > & /* ctrlPts */,
+ const std::vector<double> & /* kntVec */, const std::vector<double> & /* weights */)
{
_handleLevelChange(level);
}
void libvisio::VSDStylesCollector::collectNURBSTo(unsigned /* id */, unsigned level, double /* x2 */, double /* y2 */, double /* knot */,
- double /* knotPrev */, double /* weight */, double /* weightPrev */, unsigned /* dataID */)
+ double /* knotPrev */, double /* weight */, double /* weightPrev */, unsigned /* dataID */)
{
_handleLevelChange(level);
}
void libvisio::VSDStylesCollector::collectNURBSTo(unsigned /* id */, unsigned level, double /* x2 */, double /* y2 */, double /* knot */,
- double /* knotPrev */, double /* weight */, double /* weightPrev */, const NURBSData & /* data */)
+ double /* knotPrev */, double /* weight */, double /* weightPrev */, const NURBSData & /* data */)
{
_handleLevelChange(level);
}
void libvisio::VSDStylesCollector::collectPolylineTo(unsigned /* id */, unsigned level, double /* x */, double /* y */,
- unsigned char /* xType */, unsigned char /* yType */,
- const std::vector<std::pair<double, double> > & /* points */)
+ unsigned char /* xType */, unsigned char /* yType */,
+ const std::vector<std::pair<double, double> > & /* points */)
{
_handleLevelChange(level);
}
@@ -153,7 +153,7 @@ void libvisio::VSDStylesCollector::collectPolylineTo(unsigned /* id */, unsigned
}
void libvisio::VSDStylesCollector::collectSplineStart(unsigned /* id */, unsigned level, double /* x */, double /* y */,
- double /* secondKnot */, double /* firstKnot */, double /* lastKnot */, unsigned /* degree */)
+ double /* secondKnot */, double /* firstKnot */, double /* lastKnot */, unsigned /* degree */)
{
_handleLevelChange(level);
}
@@ -198,14 +198,14 @@ void libvisio::VSDStylesCollector::collectRelQuadBezTo(unsigned /* id */, unsign
}
void libvisio::VSDStylesCollector::collectShapeData(unsigned /* id */, unsigned level, unsigned char /* xType */, unsigned char /* yType */,
- unsigned /* degree */, double /*lastKnot*/, std::vector<std::pair<double, double> > /* controlPoints */,
- std::vector<double> /* knotVector */, std::vector<double> /* weights */)
+ unsigned /* degree */, double /*lastKnot*/, std::vector<std::pair<double, double> > /* controlPoints */,
+ std::vector<double> /* knotVector */, std::vector<double> /* weights */)
{
_handleLevelChange(level);
}
void libvisio::VSDStylesCollector::collectShapeData(unsigned /* id */, unsigned level, unsigned char /* xType */, unsigned char /* yType */,
- std::vector<std::pair<double, double> > /* points */)
+ std::vector<std::pair<double, double> > /* points */)
{
_handleLevelChange(level);
}
@@ -232,13 +232,13 @@ void libvisio::VSDStylesCollector::collectShapesOrder(unsigned /* id */, unsigne
}
void libvisio::VSDStylesCollector::collectForeignDataType(unsigned level, unsigned /* foreignType */, unsigned /* foreignFormat */,
- double /* offsetX */, double /* offsetY */, double /* width */, double /* height */)
+ double /* offsetX */, double /* offsetY */, double /* width */, double /* height */)
{
_handleLevelChange(level);
}
void libvisio::VSDStylesCollector::collectPageProps(unsigned /* id */, unsigned level, double /* pageWidth */, double /* pageHeight */,
- double /* shadowOffsetX */, double /* shadowOffsetY */, double /* scale */)
+ double /* shadowOffsetX */, double /* shadowOffsetY */, double /* scale */)
{
_handleLevelChange(level);
}
@@ -249,7 +249,7 @@ void libvisio::VSDStylesCollector::collectPage(unsigned /* id */, unsigned level
}
void libvisio::VSDStylesCollector::collectShape(unsigned id, unsigned level, unsigned parent, unsigned /*masterPage*/, unsigned /*masterShape*/,
- unsigned /* lineStyle */, unsigned /* fillStyle */, unsigned /* textStyle */)
+ unsigned /* lineStyle */, unsigned /* fillStyle */, unsigned /* textStyle */)
{
_handleLevelChange(level);
m_currentShapeLevel = level;
@@ -275,43 +275,43 @@ void libvisio::VSDStylesCollector::collectText(unsigned level, const librevenge:
}
void libvisio::VSDStylesCollector::collectParaIX(unsigned /* id */, unsigned level, unsigned /* charCount */,
- const boost::optional<double> & /* indFirst */, const boost::optional<double> & /* indLeft */, const boost::optional<double> & /* indRight */,
- const boost::optional<double> & /* spLine */, const boost::optional<double> & /* spBefore */, const boost::optional<double> & /* spAfter */,
- const boost::optional<unsigned char> & /* align */, const boost::optional<unsigned> & /* flags */)
+ const boost::optional<double> & /* indFirst */, const boost::optional<double> & /* indLeft */, const boost::optional<double> & /* indRight */,
+ const boost::optional<double> & /* spLine */, const boost::optional<double> & /* spBefore */, const boost::optional<double> & /* spAfter */,
+ const boost::optional<unsigned char> & /* align */, const boost::optional<unsigned> & /* flags */)
{
_handleLevelChange(level);
}
void libvisio::VSDStylesCollector::collectDefaultParaStyle(unsigned /* charCount */, const boost::optional<double> & /* indFirst */,
- const boost::optional<double> & /* indLeft */, const boost::optional<double> & /* indRight */, const boost::optional<double> & /* spLine */,
- const boost::optional<double> & /* spBefore */, const boost::optional<double> & /* spAfter */,
- const boost::optional<unsigned char> & /* align */, const boost::optional<unsigned> & /* flags */)
+ const boost::optional<double> & /* indLeft */, const boost::optional<double> & /* indRight */, const boost::optional<double> & /* spLine */,
+ const boost::optional<double> & /* spBefore */, const boost::optional<double> & /* spAfter */,
+ const boost::optional<unsigned char> & /* align */, const boost::optional<unsigned> & /* flags */)
{
}
void libvisio::VSDStylesCollector::collectCharIX(unsigned /* id */, unsigned level, unsigned /* charCount */,
- const boost::optional<VSDName> & /* font */, const boost::optional<Colour> & /* fontColour */, const boost::optional<double> & /* fontSize */,
- const boost::optional<bool> & /* bold */, const boost::optional<bool> & /* italic */, const boost::optional<bool> & /* underline */,
- const boost::optional<bool> & /* doubleunderline */, const boost::optional<bool> & /* strikeout */, const boost::optional<bool> & /* doublestrikeout */,
- const boost::optional<bool> & /* allcaps */, const boost::optional<bool> & /* initcaps */, const boost::optional<bool> & /* smallcaps */,
- const boost::optional<bool> & /* superscript */, const boost::optional<bool> & /* subscript */)
+ const boost::optional<VSDName> & /* font */, const boost::optional<Colour> & /* fontColour */, const boost::optional<double> & /* fontSize */,
+ const boost::optional<bool> & /* bold */, const boost::optional<bool> & /* italic */, const boost::optional<bool> & /* underline */,
+ const boost::optional<bool> & /* doubleunderline */, const boost::optional<bool> & /* strikeout */, const boost::optional<bool> & /* doublestrikeout */,
+ const boost::optional<bool> & /* allcaps */, const boost::optional<bool> & /* initcaps */, const boost::optional<bool> & /* smallcaps */,
+ const boost::optional<bool> & /* superscript */, const boost::optional<bool> & /* subscript */)
{
_handleLevelChange(level);
}
void libvisio::VSDStylesCollector::collectDefaultCharStyle(unsigned /* charCount */,
- const boost::optional<VSDName> & /* font */, const boost::optional<Colour> & /* fontColour */, const boost::optional<double> & /* fontSize */,
- const boost::optional<bool> & /* bold */, const boost::optional<bool> & /* italic */, const boost::optional<bool> & /* underline */,
- const boost::optional<bool> & /* doubleunderline */, const boost::optional<bool> & /* strikeout */, const boost::optional<bool> & /* doublestrikeout */,
- const boost::optional<bool> & /* allcaps */, const boost::optional<bool> & /* initcaps */, const boost::optional<bool> & /* smallcaps */,
- const boost::optional<bool> & /* superscript */, const boost::optional<bool> & /* subscript */)
+ const boost::optional<VSDName> & /* font */, const boost::optional<Colour> & /* fontColour */, const boost::optional<double> & /* fontSize */,
+ const boost::optional<bool> & /* bold */, const boost::optional<bool> & /* italic */, const boost::optional<bool> & /* underline */,
+ const boost::optional<bool> & /* doubleunderline */, const boost::optional<bool> & /* strikeout */, const boost::optional<bool> & /* doublestrikeout */,
+ const boost::optional<bool> & /* allcaps */, const boost::optional<bool> & /* initcaps */, const boost::optional<bool> & /* smallcaps */,
+ const boost::optional<bool> & /* superscript */, const boost::optional<bool> & /* subscript */)
{
}
void libvisio::VSDStylesCollector::collectTextBlock(unsigned level, const boost::optional<double> & /* leftMargin */,
- const boost::optional<double> & /* rightMargin */, const boost::optional<double> & /* topMargin */, const boost::optional<double> & /* bottomMargin */,
- const boost::optional<unsigned char> & /* verticalAlign */, const boost::optional<bool> & /* isBgFilled */, const boost::optional<Colour> & /* bgColour */,
- const boost::optional<double> & /* defaultTabStop */, const boost::optional<unsigned char> & /* textDirection */)
+ const boost::optional<double> & /* rightMargin */, const boost::optional<double> & /* topMargin */, const boost::optional<double> & /* bottomMargin */,
+ const boost::optional<unsigned char> & /* verticalAlign */, const boost::optional<bool> & /* isBgFilled */, const boost::optional<Colour> & /* bgColour */,
+ const boost::optional<double> & /* defaultTabStop */, const boost::optional<unsigned char> & /* textDirection */)
{
_handleLevelChange(level);
}
@@ -333,48 +333,48 @@ void libvisio::VSDStylesCollector::collectStyleSheet(unsigned /* id */, unsigned
}
void libvisio::VSDStylesCollector::collectLineStyle(unsigned level, const boost::optional<double> & /* strokeWidth */, const boost::optional<Colour> & /* c */,
- const boost::optional<unsigned char> & /* linePattern */, const boost::optional<unsigned char> & /* startMarker */, const boost::optional<unsigned char> & /* endMarker */,
- const boost::optional<unsigned char> & /* lineCap */)
+ const boost::optional<unsigned char> & /* linePattern */, const boost::optional<unsigned char> & /* startMarker */, const boost::optional<unsigned char> & /* endMarker */,
+ const boost::optional<unsigned char> & /* lineCap */)
{
_handleLevelChange(level);
}
void libvisio::VSDStylesCollector::collectFillStyle(unsigned level, const boost::optional<Colour> & /* colourFG */, const boost::optional<Colour> & /* colourBG */,
- const boost::optional<unsigned char> & /* fillPattern */, const boost::optional<double> & /* fillFGTransparency */, const boost::optional<double> & /* fillBGTransparency */,
- const boost::optional<unsigned char> & /* shadowPattern */, const boost::optional<Colour> & /* shfgc */, const boost::optional<double> & /* shadowOffsetX */,
- const boost::optional<double> & /* shadowOffsetY */)
+ const boost::optional<unsigned char> & /* fillPattern */, const boost::optional<double> & /* fillFGTransparency */, const boost::optional<double> & /* fillBGTransparency */,
+ const boost::optional<unsigned char> & /* shadowPattern */, const boost::optional<Colour> & /* shfgc */, const boost::optional<double> & /* shadowOffsetX */,
+ const boost::optional<double> & /* shadowOffsetY */)
{
_handleLevelChange(level);
}
void libvisio::VSDStylesCollector::collectFillStyle(unsigned level, const boost::optional<Colour> & /* colourFG */, const boost::optional<Colour> & /* colourBG */,
- const boost::optional<unsigned char> & /* fillPattern */, const boost::optional<double> & /* fillFGTransparency */, const boost::optional<double> & /* fillBGTransparency */,
- const boost::optional<unsigned char> & /* shadowPattern */, const boost::optional<Colour> & /* shfgc */)
+ const boost::optional<unsigned char> & /* fillPattern */, const boost::optional<double> & /* fillFGTransparency */, const boost::optional<double> & /* fillBGTransparency */,
+ const boost::optional<unsigned char> & /* shadowPattern */, const boost::optional<Colour> & /* shfgc */)
{
_handleLevelChange(level);
}
void libvisio::VSDStylesCollector::collectCharIXStyle(unsigned /* id */, unsigned level, unsigned /* charCount */, const boost::optional<VSDName> & /* font */,
- const boost::optional<Colour> & /* fontColour */, const boost::optional<double> & /* fontSize */, const boost::optional<bool> & /* bold */, const boost::optional<bool> & /* italic */,
- const boost::optional<bool> & /* underline */, const boost::optional<bool> & /* doubleunderline */, const boost::optional<bool> & /* strikeout */,
- const boost::optional<bool> & /* doublestrikeout */, const boost::optional<bool> & /* allcaps */, const boost::optional<bool> & /* initcaps */, const boost::optional<bool> & /* smallcaps */,
- const boost::optional<bool> & /* superscript */, const boost::optional<bool> & /* subscript */)
+ const boost::optional<Colour> & /* fontColour */, const boost::optional<double> & /* fontSize */, const boost::optional<bool> & /* bold */, const boost::optional<bool> & /* italic */,
+ const boost::optional<bool> & /* underline */, const boost::optional<bool> & /* doubleunderline */, const boost::optional<bool> & /* strikeout */,
+ const boost::optional<bool> & /* doublestrikeout */, const boost::optional<bool> & /* allcaps */, const boost::optional<bool> & /* initcaps */, const boost::optional<bool> & /* smallcaps */,
+ const boost::optional<bool> & /* superscript */, const boost::optional<bool> & /* subscript */)
{
_handleLevelChange(level);
}
void libvisio::VSDStylesCollector::collectParaIXStyle(unsigned /* id */, unsigned level, unsigned /* charCount */, const boost::optional<double> & /* indFirst */,
- const boost::optional<double> & /* indLeft */, const boost::optional<double> & /* indRight */, const boost::optional<double> & /* spLine */, const boost::optional<double> & /* spBefore */,
- const boost::optional<double> & /* spAfter */, const boost::optional<unsigned char> & /* align */, const boost::optional<unsigned> & /* flags */)
+ const boost::optional<double> & /* indLeft */, const boost::optional<double> & /* indRight */, const boost::optional<double> & /* spLine */, const boost::optional<double> & /* spBefore */,
+ const boost::optional<double> & /* spAfter */, const boost::optional<unsigned char> & /* align */, const boost::optional<unsigned> & /* flags */)
{
_handleLevelChange(level);
}
void libvisio::VSDStylesCollector::collectTextBlockStyle(unsigned level, const boost::optional<double> & /* leftMargin */, const boost::optional<double> & /* rightMargin */,
- const boost::optional<double> & /* topMargin */, const boost::optional<double> & /* bottomMargin */, const boost::optional<unsigned char> & /* verticalAlign */,
- const boost::optional<bool> & /* isBgFilled */, const boost::optional<Colour> & /* bgColour */, const boost::optional<double> & /* defaultTabStop */,
- const boost::optional<unsigned char> & /* textDirection */)
+ const boost::optional<double> & /* topMargin */, const boost::optional<double> & /* bottomMargin */, const boost::optional<unsigned char> & /* verticalAlign */,
+ const boost::optional<bool> & /* isBgFilled */, const boost::optional<Colour> & /* bgColour */, const boost::optional<double> & /* defaultTabStop */,
+ const boost::optional<unsigned char> & /* textDirection */)
{
_handleLevelChange(level);
}
diff --git a/src/lib/VSDXMLParserBase.cpp b/src/lib/VSDXMLParserBase.cpp
index d024f4d..866f247 100644
--- a/src/lib/VSDXMLParserBase.cpp
+++ b/src/lib/VSDXMLParserBase.cpp
@@ -1381,8 +1381,8 @@ void libvisio::VSDXMLParserBase::readCharIX(xmlTextReaderPtr reader)
{
if (!ix || m_shape.m_charList.empty()) // character style 0 is the default character style
m_shape.m_charStyle.override(VSDOptionalCharStyle(charCount, font, fontColour, fontSize, bold,
- italic, underline, doubleunderline, strikeout, doublestrikeout,
- allcaps, initcaps, smallcaps, superscript, subscript));
+ italic, underline, doubleunderline, strikeout, doublestrikeout,
+ allcaps, initcaps, smallcaps, superscript, subscript));
m_shape.m_charList.addCharIX(ix, level, charCount, font, fontColour, fontSize, bold, italic,
underline, doubleunderline, strikeout, doublestrikeout, allcaps,
@@ -1469,7 +1469,7 @@ void libvisio::VSDXMLParserBase::readParaIX(xmlTextReaderPtr reader)
{
if (!ix || m_shape.m_paraList.empty()) // paragraph style 0 is the default paragraph style
m_shape.m_paraStyle.override(VSDOptionalParaStyle(charCount, indFirst, indLeft, indRight,
- spLine, spBefore, spAfter, align, flags));
+ spLine, spBefore, spAfter, align, flags));
m_shape.m_paraList.addParaIX(ix, level, charCount, indFirst, indLeft, indRight,
spLine, spBefore, spAfter, align, flags);
diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
index 4bb7e05..cefbbe6 100644
--- a/src/lib/VSDXParser.cpp
+++ b/src/lib/VSDXParser.cpp
@@ -872,9 +872,9 @@ void libvisio::VSDXParser::readStyleProperties(xmlTextReaderPtr reader)
{
m_shape.m_lineStyle.override(VSDOptionalLineStyle(strokeWidth, strokeColour, linePattern, startMarker, endMarker, lineCap));
m_shape.m_fillStyle.override(VSDOptionalFillStyle(fillColourFG, fillColourBG, fillPattern, fillFGTransparency, fillBGTransparency, shadowColourFG,
- shadowPattern, shadowOffsetX, shadowOffsetY));
+ shadowPattern, shadowOffsetX, shadowOffsetY));
m_shape.m_textBlockStyle.override(VSDOptionalTextBlockStyle(leftMargin, rightMargin, topMargin, bottomMargin, verticalAlign, !!bgClrId, bgColour,
- defaultTabStop, textDirection));
+ defaultTabStop, textDirection));
}
}
More information about the Libreoffice-commits
mailing list