summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2019-08-03 18:13:29 +0200
committerDavid Tardon <dtardon@redhat.com>2019-08-03 18:13:34 +0200
commit95ccb8facab44862b12f69eac9b52ede02a1a55d (patch)
tree0346f52d47cf8db5a6801f35865cda2eb56b1f4e
parentd6205a23ff36b1ab1f876cebfd41ad1acf19aac5 (diff)
astyle
Change-Id: I2d5fac3180897b3a35fa62edf8dddb545b3595be
-rw-r--r--src/lib/VSDFieldList.cpp4
-rw-r--r--src/test/importtest.cpp64
2 files changed, 34 insertions, 34 deletions
diff --git a/src/lib/VSDFieldList.cpp b/src/lib/VSDFieldList.cpp
index b936535..f16b5f2 100644
--- a/src/lib/VSDFieldList.cpp
+++ b/src/lib/VSDFieldList.cpp
@@ -71,7 +71,7 @@ librevenge::RVNGString libvisio::VSDNumericField::datetimeToString(const char *f
// This method is copied from:
// https://sourceforge.net/p/libwpd/librevenge/ci/master/tree/src/lib/RVNGProperty.cpp#l35
// to avoid ABI breakage. If upstream file was modified, please update method accordingly.
-static librevenge::RVNGString doubleToString(const double value, const char* format, const char* postfix)
+static librevenge::RVNGString doubleToString(const double value, const char *format, const char *postfix)
{
librevenge::RVNGString tempString;
if (value < 0.0001 && value > -0.0001)
@@ -154,7 +154,7 @@ double convertNumber(const unsigned short cellType, const double number)
}
}
-const char* getUnitString(const unsigned short cellType)
+const char *getUnitString(const unsigned short cellType)
{
switch (cellType)
{
diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
index 468f362..0e54d41 100644
--- a/src/test/importtest.cpp
+++ b/src/test/importtest.cpp
@@ -117,38 +117,38 @@ librevenge::RVNGString getXPathContent(xmlDocPtr doc, const librevenge::RVNGStri
xmlXPathObjectPtr xpathobject = getXPathNode(doc, xpath);
switch (xpathobject->type)
{
- case XPATH_UNDEFINED:
- CPPUNIT_FAIL("Undefined XPath type");
- case XPATH_NODESET:
- {
- xmlNodeSetPtr nodeset = xpathobject->nodesetval;
-
- librevenge::RVNGString message("XPath '");
- message.append(xpath);
- message.append("': not found.");
- CPPUNIT_ASSERT_MESSAGE(message.cstr(), xmlXPathNodeSetGetLength(nodeset) > 0);
-
- xmlNodePtr xmlnode = nodeset->nodeTab[0];
- xmlNodePtr xmlchild = xmlnode->children;
- librevenge::RVNGString s;
- while (xmlchild && xmlchild->type != XML_TEXT_NODE)
- xmlchild = xmlchild->next;
- if (xmlchild && xmlchild->type == XML_TEXT_NODE)
- s = (reinterpret_cast<char *>((xmlnode->children[0]).content));
- xmlXPathFreeObject(xpathobject);
- return s;
- }
- case XPATH_BOOLEAN:
- return xpathobject->boolval ? librevenge::RVNGString("true") : librevenge::RVNGString("false");
- case XPATH_STRING:
- return librevenge::RVNGString(reinterpret_cast<char *>(xpathobject->stringval));
- case XPATH_NUMBER:
- case XPATH_POINT:
- case XPATH_RANGE:
- case XPATH_LOCATIONSET:
- case XPATH_USERS:
- case XPATH_XSLT_TREE:
- CPPUNIT_FAIL("Unsupported XPath type");
+ case XPATH_UNDEFINED:
+ CPPUNIT_FAIL("Undefined XPath type");
+ case XPATH_NODESET:
+ {
+ xmlNodeSetPtr nodeset = xpathobject->nodesetval;
+
+ librevenge::RVNGString message("XPath '");
+ message.append(xpath);
+ message.append("': not found.");
+ CPPUNIT_ASSERT_MESSAGE(message.cstr(), xmlXPathNodeSetGetLength(nodeset) > 0);
+
+ xmlNodePtr xmlnode = nodeset->nodeTab[0];
+ xmlNodePtr xmlchild = xmlnode->children;
+ librevenge::RVNGString s;
+ while (xmlchild && xmlchild->type != XML_TEXT_NODE)
+ xmlchild = xmlchild->next;
+ if (xmlchild && xmlchild->type == XML_TEXT_NODE)
+ s = (reinterpret_cast<char *>((xmlnode->children[0]).content));
+ xmlXPathFreeObject(xpathobject);
+ return s;
+ }
+ case XPATH_BOOLEAN:
+ return xpathobject->boolval ? librevenge::RVNGString("true") : librevenge::RVNGString("false");
+ case XPATH_STRING:
+ return librevenge::RVNGString(reinterpret_cast<char *>(xpathobject->stringval));
+ case XPATH_NUMBER:
+ case XPATH_POINT:
+ case XPATH_RANGE:
+ case XPATH_LOCATIONSET:
+ case XPATH_USERS:
+ case XPATH_XSLT_TREE:
+ CPPUNIT_FAIL("Unsupported XPath type");
}
CPPUNIT_FAIL("Invalid XPath type");