src/lib/VSDContentCollector.cpp | 12 ++++++------
src/lib/VSDContentCollector.h | 2 +-
src/lib/VSDGeometryList.cpp | 12 ++++++------
src/lib/VSDGeometryList.h | 6 +++---
src/lib/VSDOutputElementList.cpp | 4 ++--
src/lib/VSDXParser.cpp | 2 +-
6 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 7d1543b4f7bb4578735767141356bf61565a9fd9
Author: David Tardon <dtar...@redhat.com>
Date: Thu Mar 30 20:16:42 2017 +0200
astyle
Change-Id: I6f5e0d95ec7a0e7d6c2db9e33d82568000747a3d
diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index b4db6fe..4a876c2 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -2211,7 +2211,7 @@ void
libvisio::VSDContentCollector::collectNURBSTo(unsigned id, unsigned level,
_handleLevelChange(level);
}
-void libvisio::VSDContentCollector::collectPolylineTo(unsigned /* id */ ,
unsigned level, double x, double y, unsigned char xType, unsigned char yType,
const std::vector<std::pair<double, double> > &points)
+void libvisio::VSDContentCollector::collectPolylineTo(unsigned /* id */,
unsigned level, double x, double y, unsigned char xType, unsigned char yType,
const std::vector<std::pair<double, double> > &points)
{
_handleLevelChange(level);
@@ -2327,7 +2327,7 @@ void
libvisio::VSDContentCollector::collectTxtXForm(unsigned level, const XForm
{
_handleLevelChange(level);
if (m_txtxform)
- delete(m_txtxform);
+ delete (m_txtxform);
m_txtxform = new XForm(txtxform);
m_txtxform->x = m_txtxform->pinX - m_txtxform->pinLocX;
m_txtxform->y = m_txtxform->pinY - m_txtxform->pinLocY;
@@ -2674,7 +2674,7 @@ void libvisio::VSDContentCollector::collectText(unsigned
level, const librevenge
m_currentText = libvisio::VSDName(textStream, format);
}
-void libvisio::VSDContentCollector::collectParaIX(unsigned /* id */ , unsigned
level, unsigned charCount, const boost::optional<double> &indFirst,
+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 char> &bullet, const boost::optional<VSDName>
&bulletStr,
@@ -2701,7 +2701,7 @@ void
libvisio::VSDContentCollector::collectDefaultParaStyle(unsigned charCount,
bullet, bulletStr,
bulletFont, bulletFontSize, textPosAfterBullet, flags), m_documentTheme);
}
-void libvisio::VSDContentCollector::collectCharIX(unsigned /* id */ , unsigned
level, unsigned charCount,
+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,
@@ -3475,7 +3475,7 @@ void
libvisio::VSDContentCollector::_handleLevelChange(unsigned level)
m_x = 0;
m_y = 0;
if (m_txtxform)
- delete(m_txtxform);
+ delete (m_txtxform);
m_txtxform = 0;
m_xform = XForm();
m_NURBSData.clear();
@@ -3497,7 +3497,7 @@ void libvisio::VSDContentCollector::startPage(unsigned
pageId)
m_originalX = 0.0;
m_originalY = 0.0;
if (m_txtxform)
- delete(m_txtxform);
+ delete (m_txtxform);
m_txtxform = 0;
m_xform = XForm();
m_x = 0;
diff --git a/src/lib/VSDContentCollector.h b/src/lib/VSDContentCollector.h
index d40b72f..edf7b2a 100644
--- a/src/lib/VSDContentCollector.h
+++ b/src/lib/VSDContentCollector.h
@@ -39,7 +39,7 @@ public:
);
virtual ~VSDContentCollector()
{
- if (m_txtxform) delete(m_txtxform);
+ if (m_txtxform) delete (m_txtxform);
};
void collectDocumentTheme(const VSDXTheme *theme);
diff --git a/src/lib/VSDGeometryList.cpp b/src/lib/VSDGeometryList.cpp
index 50cfb7e..1e83f49 100644
--- a/src/lib/VSDGeometryList.cpp
+++ b/src/lib/VSDGeometryList.cpp
@@ -156,7 +156,7 @@ public:
class VSDPolylineTo1 : public VSDGeometryListElement
{
public:
- VSDPolylineTo1(unsigned id , unsigned level, double x, double y, unsigned
char xType, unsigned char yType, std::vector<std::pair<double, double> >
points) :
+ VSDPolylineTo1(unsigned id, unsigned level, double x, double y, unsigned
char xType, unsigned char yType, std::vector<std::pair<double, double> >
points) :
VSDGeometryListElement(id, level), m_x(x), m_y(y), m_xType(xType),
m_yType(yType), m_points(points) {}
virtual ~VSDPolylineTo1() {}
void handle(VSDCollector *collector) const;
@@ -170,7 +170,7 @@ public:
class VSDPolylineTo2 : public VSDGeometryListElement
{
public:
- VSDPolylineTo2(unsigned id , unsigned level, double x, double y, unsigned
dataID) :
+ VSDPolylineTo2(unsigned id, unsigned level, double x, double y, unsigned
dataID) :
VSDGeometryListElement(id, level), m_dataID(dataID), m_x(x), m_y(y) {}
virtual ~VSDPolylineTo2() {}
void handle(VSDCollector *collector) const;
@@ -184,7 +184,7 @@ public:
class VSDPolylineTo3 : public VSDGeometryListElement
{
public:
- VSDPolylineTo3(unsigned id , unsigned level, const boost::optional<double>
&x, const boost::optional<double> &y,
+ VSDPolylineTo3(unsigned id, unsigned level, const boost::optional<double>
&x, const boost::optional<double> &y,
const boost::optional<PolylineData> &data) :
VSDGeometryListElement(id, level), m_data(FROM_OPTIONAL(data,
PolylineData())), m_x(FROM_OPTIONAL(x, 0.0)), m_y(FROM_OPTIONAL(y, 0.0)) {}
virtual ~VSDPolylineTo3() {}
@@ -699,20 +699,20 @@ 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,
+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)
{
clearElement(id);
m_elements[id] = new VSDPolylineTo1(id, level, x, y, xType, yType, points);
}
-void libvisio::VSDGeometryList::addPolylineTo(unsigned id , unsigned level,
double x, double y, unsigned dataID)
+void libvisio::VSDGeometryList::addPolylineTo(unsigned id, unsigned level,
double x, double y, unsigned dataID)
{
clearElement(id);
m_elements[id] = new VSDPolylineTo2(id, level, x, y, dataID);
}
-void libvisio::VSDGeometryList::addPolylineTo(unsigned id , unsigned level,
boost::optional<double> &x, boost::optional<double> &y,
boost::optional<PolylineData> &data)
+void libvisio::VSDGeometryList::addPolylineTo(unsigned id, unsigned level,
boost::optional<double> &x, boost::optional<double> &y,
boost::optional<PolylineData> &data)
{
VSDPolylineTo3 *tmpElement = dynamic_cast<VSDPolylineTo3 *>(m_elements[id]);
if (!tmpElement)
diff --git a/src/lib/VSDGeometryList.h b/src/lib/VSDGeometryList.h
index af1aa8a..b528715 100644
--- a/src/lib/VSDGeometryList.h
+++ b/src/lib/VSDGeometryList.h
@@ -66,10 +66,10 @@ public:
void 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);
- void addPolylineTo(unsigned id , unsigned level, double x, double y,
unsigned char xType, unsigned char yType,
+ void addPolylineTo(unsigned id, unsigned level, double x, double y, unsigned
char xType, unsigned char yType,
const std::vector<std::pair<double, double> > &points);
- void addPolylineTo(unsigned id , unsigned level, double x, double y,
unsigned dataID);
- void addPolylineTo(unsigned id , unsigned level, boost::optional<double> &x,
boost::optional<double> &y, boost::optional<PolylineData> &data);
+ void addPolylineTo(unsigned id, unsigned level, double x, double y, unsigned
dataID);
+ void addPolylineTo(unsigned id, unsigned level, boost::optional<double> &x,
boost::optional<double> &y, boost::optional<PolylineData> &data);
void 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);
diff --git a/src/lib/VSDOutputElementList.cpp b/src/lib/VSDOutputElementList.cpp
index 5b06fb8..59cf392 100644
--- a/src/lib/VSDOutputElementList.cpp
+++ b/src/lib/VSDOutputElementList.cpp
@@ -504,7 +504,7 @@ libvisio::VSDOutputElementList::VSDOutputElementList(const
libvisio::VSDOutputEl
libvisio::VSDOutputElementList
&libvisio::VSDOutputElementList::operator=(const libvisio::VSDOutputElementList
&elementList)
{
for (std::vector<VSDOutputElement *>::iterator iter = m_elements.begin();
iter != m_elements.end(); ++iter)
- delete(*iter);
+ delete (*iter);
m_elements.clear();
@@ -523,7 +523,7 @@ void libvisio::VSDOutputElementList::append(const
libvisio::VSDOutputElementList
libvisio::VSDOutputElementList::~VSDOutputElementList()
{
for (std::vector<VSDOutputElement *>::iterator iter = m_elements.begin();
iter != m_elements.end(); ++iter)
- delete(*iter);
+ delete (*iter);
m_elements.clear();
}
diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
index 26916b5..36bda6a 100644
--- a/src/lib/VSDXParser.cpp
+++ b/src/lib/VSDXParser.cpp
@@ -1194,7 +1194,7 @@ void
libvisio::VSDXParser::readShapeProperties(xmlTextReaderPtr reader)
break;
case XML_SHAPESHDWOFFSETY:
if (XML_READER_TYPE_ELEMENT == tokenType)
- ret = readDoubleData(m_shape.m_fillStyle.shadowOffsetY , reader);
+ ret = readDoubleData(m_shape.m_fillStyle.shadowOffsetY, reader);
break;
case XML_LEFTMARGIN:
if (XML_READER_TYPE_ELEMENT == tokenType)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
