diff --git a/.clang-format b/.clang-format
new file mode 100644
index 00000000..8343aa31
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,93 @@
+# .clang-format for Cutelyst projects 2023-04-18
+# Tries to be close to Qt coding style
+# but meh for ASql lambdas which LambdaBodyIndentation ins't enough
+---
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveMacros: 'false'
+AlignConsecutiveAssignments: 'true'
+AlignConsecutiveDeclarations: 'false'
+AllowShortEnumsOnASingleLine: 'true'
+AlignEscapedNewlines: DontAlign
+AlignOperands: 'true'
+AlignTrailingComments: 'true'
+AllowAllArgumentsOnNextLine: 'true'
+AllowAllParametersOfDeclarationOnNextLine: 'false'
+AllowShortBlocksOnASingleLine: 'false'
+AllowShortCaseLabelsOnASingleLine: 'false'
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: Inline
+AllowShortLoopsOnASingleLine: 'false'
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: 'false'
+AlwaysBreakTemplateDeclarations: 'Yes'
+BinPackArguments: 'false'
+BinPackParameters: 'false'
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BraceWrapping:
+    AfterCaseLabel: 'true'
+    AfterClass: 'true'
+    AfterEnum: 'false'
+    AfterFunction:   true
+    SplitEmptyFunction: 'true'
+    SplitEmptyRecord: 'true'
+    SplitEmptyNamespace: 'true'
+BreakBeforeTernaryOperators: 'true'
+BreakConstructorInitializers: BeforeComma
+BreakInheritanceList: BeforeComma
+BreakStringLiterals: 'true'
+CompactNamespaces: 'false'
+ConstructorInitializerAllOnOneLineOrOnePerLine: 'false'
+ConstructorInitializerIndentWidth: '4'
+ContinuationIndentWidth: '4'
+ColumnLimit: 100
+Cpp11BracedListStyle: 'true'
+FixNamespaceComments: 'true'
+ForEachMacros:
+  - forever # avoids { wrapped to next line
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeCategories:
+  - Regex:           '^<Q.*'
+    Priority:        200
+IncludeBlocks: Regroup
+IndentAccessModifiers: 'false'
+IndentCaseLabels: 'false'
+IndentPPDirectives: AfterHash
+IndentWidth: '4'
+IndentWrappedFunctionNames: 'true'
+KeepEmptyLinesAtTheStartOfBlocks: 'true'
+Language: Cpp
+LambdaBodyIndentation: OuterScope
+NamespaceIndentation: None
+PointerAlignment: Right
+ReflowComments: 'true'
+SortIncludes: 'true'
+SortUsingDeclarations: 'false'
+SpaceAfterCStyleCast: 'true'
+SpaceAfterLogicalNot: 'false'
+SpaceAfterTemplateKeyword: 'true'
+SpaceBeforeAssignmentOperators: 'true'
+SpaceBeforeCpp11BracedList: 'false'
+SpaceBeforeCtorInitializerColon: 'true'
+SpaceBeforeInheritanceColon: 'true'
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: 'true'
+SpaceInEmptyParentheses: 'false'
+SpacesInAngles: 'false'
+SpacesInCStyleCastParentheses: 'false'
+SpacesInContainerLiterals: 'false'
+SpacesInParentheses: 'false'
+SpacesInSquareBrackets: 'false'
+Standard: Cpp11
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+WhitespaceSensitiveMacros:
+  - C_ATTR
+UseTab: Never
+
+...
diff --git a/DateTime/main.cpp b/DateTime/main.cpp
index a302d500..fe1e1876 100644
--- a/DateTime/main.cpp
+++ b/DateTime/main.cpp
@@ -1,19 +1,19 @@
 // main.cpp
 
-#include <QtGlobal>
+#include <iostream>
+
 #include <QCoreApplication>
-#include <QtCore>
-#include <QVector>
+#include <QDebug>
 #include <QVariant>
-#include <QDebug> 
-
-#include <iostream>
+#include <QVector>
+#include <QtCore>
+#include <QtGlobal>
 using namespace std;
 
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
 #include "xlsxrichstring.h"
 #include "xlsxworkbook.h"
 using namespace QXlsx;
@@ -22,12 +22,11 @@ extern int test(QVector<QVariant> params);
 
 int main(int argc, char *argv[])
 {
-	QCoreApplication app(argc, argv);
+    QCoreApplication app(argc, argv);
 
-	QVector<QVariant> testParams;
-	int ret = test(testParams);
+    QVector<QVariant> testParams;
+    int ret = test(testParams);
     // qDebug() << "test return value : " << ret;
 
-	return 0; 
+    return 0;
 }
-
diff --git a/DateTime/test.cpp b/DateTime/test.cpp
index 950b249d..950aede7 100644
--- a/DateTime/test.cpp
+++ b/DateTime/test.cpp
@@ -1,34 +1,34 @@
 // test.cpp
 
-#include <QtGlobal>
+#include <iostream>
+
 #include <QCoreApplication>
-#include <QtCore>
-#include <QVector>
-#include <QVariant>
-#include <QDebug> 
+#include <QDebug>
 #include <QDir>
-
-#include <iostream>
+#include <QVariant>
+#include <QVector>
+#include <QtCore>
+#include <QtGlobal>
 using namespace std;
 
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
 #include "xlsxrichstring.h"
 #include "xlsxworkbook.h"
 
-int test( QVector<QVariant> params );
-int test1( QVector<QVariant> params );
-int test2( QVector<QVariant> params );
+int test(QVector<QVariant> params);
+int test1(QVector<QVariant> params);
+int test2(QVector<QVariant> params);
 
-int test( QVector<QVariant> params )
+int test(QVector<QVariant> params)
 {
     // return test1( params );
-    return test2( params );
+    return test2(params);
 }
 
-int test1( QVector<QVariant> params )
+int test1(QVector<QVariant> params)
 {
     qDebug() << "[debug] current path : " << QDir::currentPath();
 
@@ -36,33 +36,33 @@ int test1( QVector<QVariant> params )
 
     Document doc;
 
-    doc.write( "A1", QVariant(QDateTime::currentDateTimeUtc()) );
-    doc.write( "A2", QVariant(double(10.5)) );
-    doc.write( "A3", QVariant(QDate(2019, 10, 9)) );
-    doc.write( "A4", QVariant(QTime(10, 9, 5)) );
-    doc.write( "A5", QVariant((int) 40000) );
+    doc.write("A1", QVariant(QDateTime::currentDateTimeUtc()));
+    doc.write("A2", QVariant(double(10.5)));
+    doc.write("A3", QVariant(QDate(2019, 10, 9)));
+    doc.write("A4", QVariant(QTime(10, 9, 5)));
+    doc.write("A5", QVariant((int) 40000));
 
     qDebug() << "doc.read()";
-    qDebug() << doc.read( 1, 1 ).type() << doc.read( 1, 1 );
-    qDebug() << doc.read( 2, 1 ).type() << doc.read( 2, 1 );
-    qDebug() << doc.read( 3, 1 ).type() << doc.read( 3, 1 );
-    qDebug() << doc.read( 4, 1 ).type() << doc.read( 4, 1 );
-    qDebug() << doc.read( 5, 1 ).type() << doc.read( 5, 1 );
+    qDebug() << doc.read(1, 1).type() << doc.read(1, 1);
+    qDebug() << doc.read(2, 1).type() << doc.read(2, 1);
+    qDebug() << doc.read(3, 1).type() << doc.read(3, 1);
+    qDebug() << doc.read(4, 1).type() << doc.read(4, 1);
+    qDebug() << doc.read(5, 1).type() << doc.read(5, 1);
     qDebug() << "\n";
 
     qDebug() << "doc.cellAt()->value()";
-    qDebug() << doc.cellAt( 1, 1 )->value().type() << doc.cellAt( 1, 1 )->value();
-    qDebug() << doc.cellAt( 2, 1 )->value().type() << doc.cellAt( 2, 1 )->value();
-    qDebug() << doc.cellAt( 3, 1 )->value().type() << doc.cellAt( 3, 1 )->value();
-    qDebug() << doc.cellAt( 4, 1 )->value().type() << doc.cellAt( 4, 1 )->value();
-    qDebug() << doc.cellAt( 5, 1 )->value().type() << doc.cellAt( 5, 1 )->value();
+    qDebug() << doc.cellAt(1, 1)->value().type() << doc.cellAt(1, 1)->value();
+    qDebug() << doc.cellAt(2, 1)->value().type() << doc.cellAt(2, 1)->value();
+    qDebug() << doc.cellAt(3, 1)->value().type() << doc.cellAt(3, 1)->value();
+    qDebug() << doc.cellAt(4, 1)->value().type() << doc.cellAt(4, 1)->value();
+    qDebug() << doc.cellAt(5, 1)->value().type() << doc.cellAt(5, 1)->value();
 
     doc.saveAs("datetime.xlsx");
 
     return 0;
 }
 
-int test2( QVector<QVariant> params )
+int test2(QVector<QVariant> params)
 {
     qDebug() << "[debug] current path : " << QDir::currentPath();
 
@@ -72,26 +72,26 @@ int test2( QVector<QVariant> params )
 
     Document doc;
 
-    doc.write( "A1", QVariant(QDateTime::currentDateTimeUtc()) );
-    doc.write( "A2", QVariant(double(10.5)) );
-    doc.write( "A3", QVariant(QDate(2019, 10, 9)) );
-    doc.write( "A4", QVariant(QTime(10, 9, 5)) );
-    doc.write( "A5", QVariant((int) 40000) );
+    doc.write("A1", QVariant(QDateTime::currentDateTimeUtc()));
+    doc.write("A2", QVariant(double(10.5)));
+    doc.write("A3", QVariant(QDate(2019, 10, 9)));
+    doc.write("A4", QVariant(QTime(10, 9, 5)));
+    doc.write("A5", QVariant((int) 40000));
 
     qDebug() << "doc.read()";
-    qDebug() << doc.read( 1, 1 ).type() << doc.read( 1, 1 );
-    qDebug() << doc.read( 2, 1 ).type() << doc.read( 2, 1 );
-    qDebug() << doc.read( 3, 1 ).type() << doc.read( 3, 1 );
-    qDebug() << doc.read( 4, 1 ).type() << doc.read( 4, 1 );
-    qDebug() << doc.read( 5, 1 ).type() << doc.read( 5, 1 );
+    qDebug() << doc.read(1, 1).type() << doc.read(1, 1);
+    qDebug() << doc.read(2, 1).type() << doc.read(2, 1);
+    qDebug() << doc.read(3, 1).type() << doc.read(3, 1);
+    qDebug() << doc.read(4, 1).type() << doc.read(4, 1);
+    qDebug() << doc.read(5, 1).type() << doc.read(5, 1);
     qDebug() << "\n";
 
     qDebug() << "doc.cellAt()->value()";
-    qDebug() << doc.cellAt( 1, 1 )->value().type() << doc.cellAt( 1, 1 )->value();
-    qDebug() << doc.cellAt( 2, 1 )->value().type() << doc.cellAt( 2, 1 )->value();
-    qDebug() << doc.cellAt( 3, 1 )->value().type() << doc.cellAt( 3, 1 )->value();
-    qDebug() << doc.cellAt( 4, 1 )->value().type() << doc.cellAt( 4, 1 )->value();
-    qDebug() << doc.cellAt( 5, 1 )->value().type() << doc.cellAt( 5, 1 )->value();
+    qDebug() << doc.cellAt(1, 1)->value().type() << doc.cellAt(1, 1)->value();
+    qDebug() << doc.cellAt(2, 1)->value().type() << doc.cellAt(2, 1)->value();
+    qDebug() << doc.cellAt(3, 1)->value().type() << doc.cellAt(3, 1)->value();
+    qDebug() << doc.cellAt(4, 1)->value().type() << doc.cellAt(4, 1)->value();
+    qDebug() << doc.cellAt(5, 1)->value().type() << doc.cellAt(5, 1)->value();
     qDebug() << "\n";
 
     doc.saveAs("datetime.xlsx");
@@ -99,81 +99,78 @@ int test2( QVector<QVariant> params )
     qDebug() << "\n\ndoc2\n";
 
     Document doc2("datetime.xlsx");
-    if ( !doc2.load() )
-    {
-        qWarning() << "failed to load datetime.xlsx" ;
+    if (!doc2.load()) {
+        qWarning() << "failed to load datetime.xlsx";
         return (-1);
     }
     qDebug() << "\n\n";
 
-    doc2.write( "A6", QVariant(QDateTime::currentDateTimeUtc()) );
-    doc2.write( "A7", QVariant(double(10.5)) );
-    doc2.write( "A8", QVariant(QDate(2019, 10, 9)) );
-    doc2.write( "A9", QVariant(QTime(10, 9, 5)) );
-    doc2.write( "A10", QVariant((int) 40000) );
+    doc2.write("A6", QVariant(QDateTime::currentDateTimeUtc()));
+    doc2.write("A7", QVariant(double(10.5)));
+    doc2.write("A8", QVariant(QDate(2019, 10, 9)));
+    doc2.write("A9", QVariant(QTime(10, 9, 5)));
+    doc2.write("A10", QVariant((int) 40000));
 
     qDebug() << "doc2.read()";
-    qDebug() << doc2.read( 1, 1 ).type() << doc2.read( 1, 1 );
-    qDebug() << doc2.read( 2, 1 ).type() << doc2.read( 2, 1 );
-    qDebug() << doc2.read( 3, 1 ).type() << doc2.read( 3, 1 );
-    qDebug() << doc2.read( 4, 1 ).type() << doc2.read( 4, 1 );
-    qDebug() << doc2.read( 5, 1 ).type() << doc2.read( 5, 1 );
-    qDebug() << doc2.read( 6, 1 ).type() << doc2.read( 6, 1 );
-    qDebug() << doc2.read( 7, 1 ).type() << doc2.read( 7, 1 );
-    qDebug() << doc2.read( 8, 1 ).type() << doc2.read( 8, 1 );
-    qDebug() << doc2.read( 9, 1 ).type() << doc2.read( 9, 1 );
-    qDebug() << doc2.read(10, 1 ).type() << doc2.read(10, 1 );
+    qDebug() << doc2.read(1, 1).type() << doc2.read(1, 1);
+    qDebug() << doc2.read(2, 1).type() << doc2.read(2, 1);
+    qDebug() << doc2.read(3, 1).type() << doc2.read(3, 1);
+    qDebug() << doc2.read(4, 1).type() << doc2.read(4, 1);
+    qDebug() << doc2.read(5, 1).type() << doc2.read(5, 1);
+    qDebug() << doc2.read(6, 1).type() << doc2.read(6, 1);
+    qDebug() << doc2.read(7, 1).type() << doc2.read(7, 1);
+    qDebug() << doc2.read(8, 1).type() << doc2.read(8, 1);
+    qDebug() << doc2.read(9, 1).type() << doc2.read(9, 1);
+    qDebug() << doc2.read(10, 1).type() << doc2.read(10, 1);
     qDebug() << "\n";
 
     qDebug() << "doc2.cellAt()->value()";
-    qDebug() << doc2.cellAt( 1, 1 )->value().type() << doc2.cellAt( 1, 1 )->value();
-    qDebug() << doc2.cellAt( 2, 1 )->value().type() << doc2.cellAt( 2, 1 )->value();
-    qDebug() << doc2.cellAt( 3, 1 )->value().type() << doc2.cellAt( 3, 1 )->value();
-    qDebug() << doc2.cellAt( 4, 1 )->value().type() << doc2.cellAt( 4, 1 )->value();
-    qDebug() << doc2.cellAt( 5, 1 )->value().type() << doc2.cellAt( 5, 1 )->value();
-    qDebug() << doc2.cellAt( 6, 1 )->value().type() << doc2.cellAt( 6, 1 )->value();
-    qDebug() << doc2.cellAt( 7, 1 )->value().type() << doc2.cellAt( 7, 1 )->value();
-    qDebug() << doc2.cellAt( 8, 1 )->value().type() << doc2.cellAt( 8, 1 )->value();
-    qDebug() << doc2.cellAt( 9, 1 )->value().type() << doc2.cellAt( 9, 1 )->value();
-    qDebug() << doc2.cellAt(10, 1 )->value().type() << doc2.cellAt(10, 1 )->value();
+    qDebug() << doc2.cellAt(1, 1)->value().type() << doc2.cellAt(1, 1)->value();
+    qDebug() << doc2.cellAt(2, 1)->value().type() << doc2.cellAt(2, 1)->value();
+    qDebug() << doc2.cellAt(3, 1)->value().type() << doc2.cellAt(3, 1)->value();
+    qDebug() << doc2.cellAt(4, 1)->value().type() << doc2.cellAt(4, 1)->value();
+    qDebug() << doc2.cellAt(5, 1)->value().type() << doc2.cellAt(5, 1)->value();
+    qDebug() << doc2.cellAt(6, 1)->value().type() << doc2.cellAt(6, 1)->value();
+    qDebug() << doc2.cellAt(7, 1)->value().type() << doc2.cellAt(7, 1)->value();
+    qDebug() << doc2.cellAt(8, 1)->value().type() << doc2.cellAt(8, 1)->value();
+    qDebug() << doc2.cellAt(9, 1)->value().type() << doc2.cellAt(9, 1)->value();
+    qDebug() << doc2.cellAt(10, 1)->value().type() << doc2.cellAt(10, 1)->value();
     doc2.saveAs("datetime2.xlsx");
 
     qDebug() << "\n\ndoc3\n";
 
     Document doc3("datetime2.xlsx");
-    if ( !doc3.load() )
-    {
-        qWarning() << "failed to load datetime2.xlsx" ;
+    if (!doc3.load()) {
+        qWarning() << "failed to load datetime2.xlsx";
         return (-1);
     }
     qDebug() << "\n\n";
 
     qDebug() << "doc3.read()";
-    qDebug() << doc3.read( 1, 1 ).type() << doc3.read( 1, 1 );
-    qDebug() << doc3.read( 2, 1 ).type() << doc3.read( 2, 1 );
-    qDebug() << doc3.read( 3, 1 ).type() << doc3.read( 3, 1 );
-    qDebug() << doc3.read( 4, 1 ).type() << doc3.read( 4, 1 );
-    qDebug() << doc3.read( 5, 1 ).type() << doc3.read( 5, 1 );
-    qDebug() << doc3.read( 6, 1 ).type() << doc3.read( 6, 1 );
-    qDebug() << doc3.read( 7, 1 ).type() << doc3.read( 7, 1 );
-    qDebug() << doc3.read( 8, 1 ).type() << doc3.read( 8, 1 );
-    qDebug() << doc3.read( 9, 1 ).type() << doc3.read( 9, 1 );
-    qDebug() << doc3.read(10, 1 ).type() << doc3.read(10, 1 );
+    qDebug() << doc3.read(1, 1).type() << doc3.read(1, 1);
+    qDebug() << doc3.read(2, 1).type() << doc3.read(2, 1);
+    qDebug() << doc3.read(3, 1).type() << doc3.read(3, 1);
+    qDebug() << doc3.read(4, 1).type() << doc3.read(4, 1);
+    qDebug() << doc3.read(5, 1).type() << doc3.read(5, 1);
+    qDebug() << doc3.read(6, 1).type() << doc3.read(6, 1);
+    qDebug() << doc3.read(7, 1).type() << doc3.read(7, 1);
+    qDebug() << doc3.read(8, 1).type() << doc3.read(8, 1);
+    qDebug() << doc3.read(9, 1).type() << doc3.read(9, 1);
+    qDebug() << doc3.read(10, 1).type() << doc3.read(10, 1);
     qDebug() << "\n";
 
     qDebug() << "doc3.cellAt()->value()";
-    qDebug() << doc3.cellAt( 1, 1 )->value().type() << doc3.cellAt( 1, 1 )->value();
-    qDebug() << doc3.cellAt( 2, 1 )->value().type() << doc3.cellAt( 2, 1 )->value();
-    qDebug() << doc3.cellAt( 3, 1 )->value().type() << doc3.cellAt( 3, 1 )->value();
-    qDebug() << doc3.cellAt( 4, 1 )->value().type() << doc3.cellAt( 4, 1 )->value();
-    qDebug() << doc3.cellAt( 5, 1 )->value().type() << doc3.cellAt( 5, 1 )->value();
-    qDebug() << doc3.cellAt( 6, 1 )->value().type() << doc3.cellAt( 6, 1 )->value();
-    qDebug() << doc3.cellAt( 7, 1 )->value().type() << doc3.cellAt( 7, 1 )->value();
-    qDebug() << doc3.cellAt( 8, 1 )->value().type() << doc3.cellAt( 8, 1 )->value();
-    qDebug() << doc3.cellAt( 9, 1 )->value().type() << doc3.cellAt( 9, 1 )->value();
-    qDebug() << doc3.cellAt(10, 1 )->value().type() << doc3.cellAt(10, 1 )->value();
+    qDebug() << doc3.cellAt(1, 1)->value().type() << doc3.cellAt(1, 1)->value();
+    qDebug() << doc3.cellAt(2, 1)->value().type() << doc3.cellAt(2, 1)->value();
+    qDebug() << doc3.cellAt(3, 1)->value().type() << doc3.cellAt(3, 1)->value();
+    qDebug() << doc3.cellAt(4, 1)->value().type() << doc3.cellAt(4, 1)->value();
+    qDebug() << doc3.cellAt(5, 1)->value().type() << doc3.cellAt(5, 1)->value();
+    qDebug() << doc3.cellAt(6, 1)->value().type() << doc3.cellAt(6, 1)->value();
+    qDebug() << doc3.cellAt(7, 1)->value().type() << doc3.cellAt(7, 1)->value();
+    qDebug() << doc3.cellAt(8, 1)->value().type() << doc3.cellAt(8, 1)->value();
+    qDebug() << doc3.cellAt(9, 1)->value().type() << doc3.cellAt(9, 1)->value();
+    qDebug() << doc3.cellAt(10, 1)->value().type() << doc3.cellAt(10, 1)->value();
     doc2.saveAs("datetime2.xlsx");
 
     return 0;
 }
-
diff --git a/HelloAndroid/DynArray2D.h b/HelloAndroid/DynArray2D.h
index c0d2a3d7..f05f623f 100644
--- a/HelloAndroid/DynArray2D.h
+++ b/HelloAndroid/DynArray2D.h
@@ -2,39 +2,33 @@
 #ifndef DYNARRAY2D_H
 #define DYNARRAY2D_H
 
-// Code from https://www.qtcentre.org/threads/31440-two-dimensional-array-size-determined-dynamically
-// Some code is fixed by j2doll
+// Code from
+// https://www.qtcentre.org/threads/31440-two-dimensional-array-size-determined-dynamically Some
+// code is fixed by j2doll
 
-template <typename T> class DynArray2D
+template <typename T>
+class DynArray2D
 {
 public:
     DynArray2D(int n, int m)
     {
-        _n = n;
-        _array = new T*[n];
-        for(int i = 0; i < n; i++)
-        {
+        _n     = n;
+        _array = new T *[n];
+        for (int i = 0; i < n; i++) {
             _array[i] = new T[m];
         }
     }
 
-    void setValue(int n, int m, T v)
-    {
-        _array[n][m] = v;
-    }
+    void setValue(int n, int m, T v) { _array[n][m] = v; }
 
-    T getValue(int n, int m)
-    {
-        return _array[n][m];
-    }
+    T getValue(int n, int m) { return _array[n][m]; }
 
     ~DynArray2D()
     {
-        for (int i = 0 ; i < _n ; i++)
-        {
-            delete [] _array[i];
+        for (int i = 0; i < _n; i++) {
+            delete[] _array[i];
         }
-        delete [] _array;
+        delete[] _array;
     }
 
 protected:
@@ -42,5 +36,4 @@ template <typename T> class DynArray2D
     int _n;
 };
 
-
 #endif // DYNARRAY2D_H
diff --git a/HelloAndroid/XlsxTableModel.cpp b/HelloAndroid/XlsxTableModel.cpp
index 696acbbc..bfb7a909 100644
--- a/HelloAndroid/XlsxTableModel.cpp
+++ b/HelloAndroid/XlsxTableModel.cpp
@@ -6,27 +6,25 @@
 
 #include "XlsxTableModel.h"
 
-#include <QDebug>
-#include <QVariant>
-
 #include <sstream>
 
+#include <QDebug>
+#include <QVariant>
 
 XlsxTableModel::XlsxTableModel(const QList<QString> &colTitle, QList<VLIST> data, QObject *parent)
     : QAbstractTableModel(parent)
 {
-        // [1] set name of column
+    // [1] set name of column
 
-        m_colNames = colTitle;
-        m_roleCount = m_colNames.size();
+    m_colNames  = colTitle;
+    m_roleCount = m_colNames.size();
 
-        // [2]  set data
+    // [2]  set data
 
-        for (int dc = 0; dc < data.size() ; dc++ )
-        {
-            VLIST vList = data.at(dc);
-            m_the_data.append( vList );
-        }
+    for (int dc = 0; dc < data.size(); dc++) {
+        VLIST vList = data.at(dc);
+        m_the_data.append(vList);
+    }
 }
 
 void XlsxTableModel::testData()
@@ -42,9 +40,9 @@ void XlsxTableModel::testData()
 
     // set name of column
 
-    m_colNames.append( QString( "COL1" ) );
-    m_colNames.append( QString( "COL2" ) );
-    m_colNames.append( QString( "COL3" ) );
+    m_colNames.append(QString("COL1"));
+    m_colNames.append(QString("COL2"));
+    m_colNames.append(QString("COL3"));
 
     m_roleCount = m_colNames.size();
 
@@ -54,51 +52,49 @@ void XlsxTableModel::testData()
     list1.append(QVariant("Alpha"));
     list1.append(QVariant(10));
     list1.append(QVariant(100.0));
-    m_the_data.append( list1 );
+    m_the_data.append(list1);
 
     VLIST list2;
     list2.append(QVariant("Beta"));
     list2.append(QVariant(20));
     list2.append(QVariant(200.0));
-    m_the_data.append( list2 );
+    m_the_data.append(list2);
 
     VLIST list3;
     list3.append(QVariant("Gamma"));
     list3.append(QVariant(30));
     list3.append(QVariant(300.0));
-    m_the_data.append( list3 );
+    m_the_data.append(list3);
 
     VLIST list4;
     list4.append(QVariant("Delta"));
     list4.append(QVariant(40));
     list4.append(QVariant(400.0));
-    m_the_data.append( list4 );
-
+    m_the_data.append(list4);
 }
 
-int XlsxTableModel::rowCount(const QModelIndex& parent) const
+int XlsxTableModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent)
     return m_the_data.size();
 }
 
-int XlsxTableModel::columnCount(const QModelIndex& parent) const
+int XlsxTableModel::columnCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent)
     return m_roleCount;
 }
 
-QVariant XlsxTableModel::data(const QModelIndex& index, int role) const
+QVariant XlsxTableModel::data(const QModelIndex &index, int role) const
 {
     // current column & row
     int col = index.column();
     int row = index.row();
 
     // check boudaries
-    if ( col < 0 || columnCount() <= col ||
-         row < 0 || rowCount()    <= row )
-    {
-        qDebug() << "[Warning]" << " col=" << col << ", row="  << row;
+    if (col < 0 || columnCount() <= col || row < 0 || rowCount() <= row) {
+        qDebug() << "[Warning]"
+                 << " col=" << col << ", row=" << row;
         return QVariant();
     }
 
@@ -107,32 +103,28 @@ QVariant XlsxTableModel::data(const QModelIndex& index, int role) const
     QVariant ret;
     int cmpRole;
 
-    for (int ic = 0; ic < m_the_data.size() ; ic++)
-    {
-        if ( row == ic )
-        {
+    for (int ic = 0; ic < m_the_data.size(); ic++) {
+        if (row == ic) {
             QList<QVariant> vList = m_the_data.at(ic);
-            for (int jc = 0; jc < vList.size() ; jc++ )
-            {
-                int plusOneRole = (int)(Qt::UserRole);
-                plusOneRole = plusOneRole + 1;
-                cmpRole = plusOneRole + jc;
-                if ( role == cmpRole )
-                {
+            for (int jc = 0; jc < vList.size(); jc++) {
+                int plusOneRole = (int) (Qt::UserRole);
+                plusOneRole     = plusOneRole + 1;
+                cmpRole         = plusOneRole + jc;
+                if (role == cmpRole) {
                     QVariant var = vList.at(jc);
-                    if ( ! var.isValid() ) var.setValue( QString("") ) ;
-                    if ( var.isNull() ) var.setValue( QString("") ) ;
+                    if (!var.isValid())
+                        var.setValue(QString(""));
+                    if (var.isNull())
+                        var.setValue(QString(""));
                     ret = var;
                 }
             }
         }
     }
 
-    qDebug()
-        << "data: "
-        << " col="    << col << ", row="   << row
-        << ", role=" << role << ", cmpRole=" << cmpRole
-        << ", value=" << ret.toString();
+    qDebug() << "data: "
+             << " col=" << col << ", row=" << row << ", role=" << role << ", cmpRole=" << cmpRole
+             << ", value=" << ret.toString();
 
     return ret;
 }
@@ -141,11 +133,10 @@ QHash<int, QByteArray> XlsxTableModel::roleNames() const
 {
     QHash<int, QByteArray> roles;
 
-    for ( int ic = 0 ; ic < m_roleCount ; ic++)
-    {
+    for (int ic = 0; ic < m_roleCount; ic++) {
         QString strRole = m_colNames.at(ic);
-        int roleNo = (Qt::UserRole+1) + ic;
-        roles.insert( roleNo, strRole.toLatin1() );
+        int roleNo      = (Qt::UserRole + 1) + ic;
+        roles.insert(roleNo, strRole.toLatin1());
     }
 
     return roles;
@@ -157,16 +148,12 @@ QStringList XlsxTableModel::customRoleNames()
     QMap<int, QString> res;
     QHashIterator<int, QByteArray> i(roleNames());
 
-    while ( i.hasNext() )
-    {
+    while (i.hasNext()) {
         i.next();
-        if ( i.key() > Qt::UserRole )
-        {
-            res[ i.key() ] = i.value();
+        if (i.key() > Qt::UserRole) {
+            res[i.key()] = i.value();
         }
     }
 
     return res.values();
 }
-
-
diff --git a/HelloAndroid/XlsxTableModel.h b/HelloAndroid/XlsxTableModel.h
index d6fe9063..3257dd7f 100644
--- a/HelloAndroid/XlsxTableModel.h
+++ b/HelloAndroid/XlsxTableModel.h
@@ -7,19 +7,19 @@
 #ifndef XLSX_MODEL_H
 #define XLSX_MODEL_H
 
-#include <QtGlobal>
+#include <cstdlib>
+#include <string>
+#include <vector>
+
+#include <QAbstractTableModel>
+#include <QList>
+#include <QMap>
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QList>
-#include <QVector>
-#include <QMap>
 #include <QVariant>
-#include <QAbstractTableModel>
-
-#include <string>
-#include <vector>
-#include <cstdlib>
+#include <QVector>
+#include <QtGlobal>
 
 typedef QList<QVariant> VLIST;
 
@@ -29,13 +29,14 @@ class XlsxTableModel : public QAbstractTableModel
 
     // method that is called by QML script
     Q_PROPERTY(QStringList customRoleNames READ customRoleNames CONSTANT)
-public: QStringList customRoleNames();
+public:
+    QStringList customRoleNames();
 
 public: // constrcutor
     XlsxTableModel(const QList<QString> &colTitle, QList<VLIST> data, QObject *parent = NULL);
 
 public: // virtual function of parent object
-    int rowCount(const QModelIndex & parent = QModelIndex()) const Q_DECL_OVERRIDE;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
     int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
     QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
@@ -44,10 +45,9 @@ public: QStringList customRoleNames();
     void testData(); // test function.
 
 protected:
-    QList<VLIST> m_the_data; // table cell data
+    QList<VLIST> m_the_data;   // table cell data
     QList<QString> m_colNames; // column name
-    quint32 m_roleCount; // role count (same as column count)
-
+    quint32 m_roleCount;       // role count (same as column count)
 };
 
 #endif
diff --git a/HelloAndroid/main.cpp b/HelloAndroid/main.cpp
index 76ee426f..1a3c516b 100644
--- a/HelloAndroid/main.cpp
+++ b/HelloAndroid/main.cpp
@@ -4,116 +4,107 @@
 
 // main.cpp
 
-#include <QtGlobal>
-#include <QObject>
-#include <QString>
-#include <QUrl>
-#include <QList>
-#include <QVariant>
+#include "xlsxcellrange.h"
+#include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
+#include "xlsxrichstring.h"
+#include "xlsxworkbook.h"
 
-#include <QDebug>
+#include <cstdio>
+#include <iostream>
 
+#include <QDebug>
 #include <QGuiApplication>
+#include <QList>
+#include <QObject>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
-
-#include <cstdio>
-#include <iostream>
-
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
-#include "xlsxcellrange.h"
-#include "xlsxchart.h"
-#include "xlsxrichstring.h"
-#include "xlsxworkbook.h"
+#include <QString>
+#include <QUrl>
+#include <QVariant>
+#include <QtGlobal>
 using namespace QXlsx;
 
-#include "XlsxTableModel.h"
 #include "DynArray2D.h"
+#include "XlsxTableModel.h"
 
 std::string convertFromNumberToExcelColumn(int n);
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication::setAttribute( Qt::AA_EnableHighDpiScaling );
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 
     QGuiApplication app(argc, argv);
 
     QQmlApplicationEngine engine;
-    QQmlContext* ctxt = engine.rootContext();
+    QQmlContext *ctxt = engine.rootContext();
 
-    QXlsx::Document xlsx( ":/test.xlsx" ); // load xlsx
-    if (!xlsx.load())
-    {
+    QXlsx::Document xlsx(":/test.xlsx"); // load xlsx
+    if (!xlsx.load()) {
         qDebug() << "[ERROR] Failed to load xlsx";
         return (-1);
     }
 
-    QList<QString> colTitle; // list of column title
+    QList<QString> colTitle;   // list of column title
     QVector<CellLocation> vcl; // vector of cell(s) location
-    Worksheet* wsheet = (Worksheet*) xlsx.workbook()->activeSheet();
-    if ( NULL == wsheet )
-    {
+    Worksheet *wsheet = (Worksheet *) xlsx.workbook()->activeSheet();
+    if (NULL == wsheet) {
         qDebug() << "[ERROR] Failed to get active sheet";
         return (-2);
     }
 
     int rowMax = -1;
     int colMax = -1;
-    vcl = wsheet->getFullCells( &rowMax, &colMax );
+    vcl        = wsheet->getFullCells(&rowMax, &colMax);
 
-    Q_ASSERT( (-1) != rowMax ); // To CHECK
-    Q_ASSERT( (-1) != colMax );
+    Q_ASSERT((-1) != rowMax); // To CHECK
+    Q_ASSERT((-1) != colMax);
 
-    for (int ic = 0 ; ic < colMax ; ic++)
-    {
+    for (int ic = 0; ic < colMax; ic++) {
         std::string strCol = convertFromNumberToExcelColumn(ic + 1);
-        QString colName = QString::fromStdString( strCol );
-        colTitle.append( colName );
+        QString colName    = QString::fromStdString(strCol);
+        colTitle.append(colName);
     }
 
     // make cell matrix that has (colMax x rowMax) size.
 
-    DynArray2D< std::string > dynIntArray(colMax, rowMax);
+    DynArray2D<std::string> dynIntArray(colMax, rowMax);
 
-    for ( int icl = 0; icl < vcl.size(); ++icl )
-    {
-          CellLocation cl = vcl.at(icl); // cell location
+    for (int icl = 0; icl < vcl.size(); ++icl) {
+        CellLocation cl = vcl.at(icl); // cell location
 
-          // NOTICE: First cell of tableWidget is 0.
-          // But first cell of Qxlsx document is 1.
-          int row = cl.row - 1;
-          int col = cl.col - 1;
+        // NOTICE: First cell of tableWidget is 0.
+        // But first cell of Qxlsx document is 1.
+        int row = cl.row - 1;
+        int col = cl.col - 1;
 
-          auto ptrCell = cl.cell; // cell pointer
+        auto ptrCell = cl.cell; // cell pointer
 
-          // value of cell
-          QVariant var = ptrCell->value();
-          QString str = var.toString();
+        // value of cell
+        QVariant var = ptrCell->value();
+        QString str  = var.toString();
 
-          // set string value to (col, row)
-          dynIntArray.setValue( col, row, str.toStdString() );
+        // set string value to (col, row)
+        dynIntArray.setValue(col, row, str.toStdString());
     }
 
     QList<VLIST> xlsxData;
-    for (int ir = 0; ir < rowMax; ir++ )
-    {
+    for (int ir = 0; ir < rowMax; ir++) {
         VLIST vl;
-        for (int ic = 0; ic < colMax; ic++)
-        {
-            std::string value = dynIntArray.getValue( ic, ir );
-            vl.append( QString::fromStdString(value) );
+        for (int ic = 0; ic < colMax; ic++) {
+            std::string value = dynIntArray.getValue(ic, ir);
+            vl.append(QString::fromStdString(value));
         }
         xlsxData.append(vl);
     }
 
     // set model for tableview
     XlsxTableModel xlsxTableModel(colTitle, xlsxData);
-    ctxt->setContextProperty( "xlsxModel", &xlsxTableModel );
+    ctxt->setContextProperty("xlsxModel", &xlsxTableModel);
 
-    engine.load( QUrl(QStringLiteral("qrc:/main.qml")) ); // load QML
-    if ( engine.rootObjects().isEmpty() )
-    {
+    engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); // load QML
+    if (engine.rootObjects().isEmpty()) {
         qDebug() << "Failed to load qml";
         return (-1);
     }
@@ -130,29 +121,26 @@ std::string convertFromNumberToExcelColumn(int n)
     std::string stdString;
 
     char str[1000]; // To store result (Excel column name)
-    int i = 0; // To store current index in str which is result
+    int i = 0;      // To store current index in str which is result
 
-    while ( n > 0 )
-    {
+    while (n > 0) {
         // Find remainder
         int rem = n % 26;
 
         // If remainder is 0, then a 'Z' must be there in output
-        if ( rem == 0 )
-        {
+        if (rem == 0) {
             str[i++] = 'Z';
-            n = (n/26) - 1;
-        }
-        else // If remainder is non-zero
+            n        = (n / 26) - 1;
+        } else // If remainder is non-zero
         {
-            str[i++] = (rem-1) + 'A';
-            n = n / 26;
+            str[i++] = (rem - 1) + 'A';
+            n        = n / 26;
         }
     }
     str[i] = '\0';
 
     // Reverse the string and print result
-    std::reverse( str, str + strlen(str) );
+    std::reverse(str, str + strlen(str));
 
     stdString = str;
     return stdString;
diff --git a/HelloWorld/main.cpp b/HelloWorld/main.cpp
index c719e19c..3438b69e 100644
--- a/HelloWorld/main.cpp
+++ b/HelloWorld/main.cpp
@@ -2,21 +2,21 @@
 // QXlsx // MIT License // https://github.com/j2doll/QXlsx
 //
 
-#include <QtGlobal>
+#include <iostream>
+
 #include <QCoreApplication>
-#include <QtCore>
-#include <QVariant>
-#include <QDir>
 #include <QDebug>
-
-#include <iostream>
+#include <QDir>
+#include <QVariant>
+#include <QtCore>
+#include <QtGlobal>
 using namespace std;
 
 // [0] include QXlsx headers
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
 #include "xlsxrichstring.h"
 #include "xlsxworkbook.h"
 using namespace QXlsx;
@@ -30,18 +30,17 @@ int main(int argc, char *argv[])
 
     QXlsx::Document xlsxW;
 
-    int row = 1; int col = 1; //
+    int row = 1;
+    int col = 1; //
 
     // xlsxW.write("A1", "Hello Qt!"); // write "Hello Qt!" to cell(A,1). it's shared string.
     QVariant writeValue = QString("Hello Qt!");
     xlsxW.write(row, col, writeValue);
 
-    if ( xlsxW.saveAs("Test.xlsx") ) // save the document as 'Test.xlsx'
+    if (xlsxW.saveAs("Test.xlsx")) // save the document as 'Test.xlsx'
     {
         qDebug() << "[debug] success to write xlsx file";
-    }
-    else
-    {
+    } else {
         qDebug() << "[debug][error] failed to write xlsx file";
         exit(-1);
     }
@@ -51,25 +50,21 @@ int main(int argc, char *argv[])
     //--------------------------------------
     // [2] Reading excel file(*.xlsx)
 
-    Document xlsxR("Test.xlsx"); 
-    if ( xlsxR.load() ) // load excel file
+    Document xlsxR("Test.xlsx");
+    if (xlsxR.load()) // load excel file
     {
         qDebug() << "[debug] success to load xlsx file.";
 
-        Cell* cell = xlsxR.cellAt(row, col); // get cell pointer.
-        if ( cell != NULL )
-        {
-            QVariant var = cell->readValue(); // read cell value (number(double), QDateTime, QString ...)
+        Cell *cell = xlsxR.cellAt(row, col); // get cell pointer.
+        if (cell != NULL) {
+            QVariant var =
+                cell->readValue(); // read cell value (number(double), QDateTime, QString ...)
             qDebug() << "[debug] cell(1,1) is " << var; // Display value. It is 'Hello Qt!'.
-        }
-        else
-        {
+        } else {
             qDebug() << "[debug][error] cell(1,1) is not set.";
             exit(-2);
         }
-    }
-    else
-    {
+    } else {
         qDebug() << "[debug][error] failed to load xlsx file.";
     }
 
diff --git a/IssueTest/main.cpp b/IssueTest/main.cpp
index a302d500..fe1e1876 100644
--- a/IssueTest/main.cpp
+++ b/IssueTest/main.cpp
@@ -1,19 +1,19 @@
 // main.cpp
 
-#include <QtGlobal>
+#include <iostream>
+
 #include <QCoreApplication>
-#include <QtCore>
-#include <QVector>
+#include <QDebug>
 #include <QVariant>
-#include <QDebug> 
-
-#include <iostream>
+#include <QVector>
+#include <QtCore>
+#include <QtGlobal>
 using namespace std;
 
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
 #include "xlsxrichstring.h"
 #include "xlsxworkbook.h"
 using namespace QXlsx;
@@ -22,12 +22,11 @@ extern int test(QVector<QVariant> params);
 
 int main(int argc, char *argv[])
 {
-	QCoreApplication app(argc, argv);
+    QCoreApplication app(argc, argv);
 
-	QVector<QVariant> testParams;
-	int ret = test(testParams);
+    QVector<QVariant> testParams;
+    int ret = test(testParams);
     // qDebug() << "test return value : " << ret;
 
-	return 0; 
+    return 0;
 }
-
diff --git a/IssueTest/test.cpp b/IssueTest/test.cpp
index dbaa7626..c92f7b3d 100644
--- a/IssueTest/test.cpp
+++ b/IssueTest/test.cpp
@@ -1,28 +1,28 @@
 // test.cpp
 
-#include <QtGlobal>
+#include <iostream>
+
+#include <QColor>
 #include <QCoreApplication>
-#include <QtCore>
-#include <QVector>
-#include <QVariant>
-#include <QDebug> 
+#include <QDebug>
 #include <QDir>
-#include <QColor>
 #include <QImage>
-#include <QRgb>
 #include <QRandomGenerator>
-
-#include <iostream>
+#include <QRgb>
+#include <QVariant>
+#include <QVector>
+#include <QtCore>
+#include <QtGlobal>
 using namespace std;
 
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
 #include "xlsxrichstring.h"
 #include "xlsxworkbook.h"
 
-int test162( QVector<QVariant> params )
+int test162(QVector<QVariant> params)
 {
     using namespace QXlsx;
 
@@ -31,22 +31,17 @@ int test162( QVector<QVariant> params )
     xlsx.saveAs("image1.xlsx");
 
     Document xlsx2("image1.xlsx");
-    qDebug() << "xlsx2" ;
+    qDebug() << "xlsx2";
     qDebug() << " image count : " << xlsx.getImageCount();
     xlsx2.saveAs("image2.xlsx");
 
     return 0;
 }
 
-int test( QVector<QVariant> params )
+int test(QVector<QVariant> params)
 {
     qDebug() << "[debug] current path : " << QDir::currentPath();
     // return test162( params );
 
-
-
     return 0;
 }
-
-
-
diff --git a/Pump/colorprintf.h b/Pump/colorprintf.h
index c02ef2e9..e0040915 100644
--- a/Pump/colorprintf.h
+++ b/Pump/colorprintf.h
@@ -30,11 +30,11 @@
 extern "C" {
 #endif
 
-#include <stdio.h>
 #include <stdarg.h>
+#include <stdio.h>
 
 #ifdef _WIN32
-#include <windows.h>
+#    include <windows.h>
 #endif
 
 /*
@@ -49,75 +49,76 @@ extern "C" {
  *          4 -> magenta
  *          5 -> cyan
  */
-int colorprintf(int color, const char *format, ...) {
-	int fcolor = -1, retval = -99;
-	va_list args;
+int colorprintf(int color, const char *format, ...)
+{
+    int fcolor = -1, retval = -99;
+    va_list args;
 #ifdef _WIN32
-	if (color == 0) {
-		fcolor = FOREGROUND_RED;
-	} else if (color == 1) {
-		fcolor = FOREGROUND_GREEN;
-	} else if (color == 2) {
-		fcolor = FOREGROUND_RED | FOREGROUND_GREEN;
-	} else if (color == 3) {
-		fcolor = FOREGROUND_BLUE;
-	} else if (color == 4) {
-		fcolor = FOREGROUND_RED | FOREGROUND_BLUE;
-	} else if (color == 5) {
-		fcolor = FOREGROUND_GREEN | FOREGROUND_BLUE;
-	}
-	CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
-	WORD wOldColorAttrs;
-	HANDLE hStdout;
-	if (fcolor != -1) {
-		hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
-		if ((hStdout == NULL) || (hStdout == INVALID_HANDLE_VALUE)) {
-			return -99;
-		}
-		if (GetConsoleScreenBufferInfo(hStdout, &csbiInfo) == 0) {
-			return -99;
-		}
-		wOldColorAttrs = csbiInfo.wAttributes;
-		if (SetConsoleTextAttribute(hStdout, fcolor | FOREGROUND_INTENSITY) == 0) {
-			return -99;
-		}
-	}
+    if (color == 0) {
+        fcolor = FOREGROUND_RED;
+    } else if (color == 1) {
+        fcolor = FOREGROUND_GREEN;
+    } else if (color == 2) {
+        fcolor = FOREGROUND_RED | FOREGROUND_GREEN;
+    } else if (color == 3) {
+        fcolor = FOREGROUND_BLUE;
+    } else if (color == 4) {
+        fcolor = FOREGROUND_RED | FOREGROUND_BLUE;
+    } else if (color == 5) {
+        fcolor = FOREGROUND_GREEN | FOREGROUND_BLUE;
+    }
+    CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+    WORD wOldColorAttrs;
+    HANDLE hStdout;
+    if (fcolor != -1) {
+        hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
+        if ((hStdout == NULL) || (hStdout == INVALID_HANDLE_VALUE)) {
+            return -99;
+        }
+        if (GetConsoleScreenBufferInfo(hStdout, &csbiInfo) == 0) {
+            return -99;
+        }
+        wOldColorAttrs = csbiInfo.wAttributes;
+        if (SetConsoleTextAttribute(hStdout, fcolor | FOREGROUND_INTENSITY) == 0) {
+            return -99;
+        }
+    }
 #else
-	if (color == 0) {
-		fcolor = 1;
-	} else if (color == 1) {
-		fcolor = 2;
-	} else if (color == 2) {
-		fcolor = 3;
-	} else if (color == 3) {
-		fcolor = 4;
-	} else if (color == 4) {
-		fcolor = 5;
-	} else if (color == 5) {
-		fcolor = 6;
-	}
-	if (fcolor != -1 && printf("\033[1;3%dm", fcolor) < 0) {
-		return -99;
-	}
+    if (color == 0) {
+        fcolor = 1;
+    } else if (color == 1) {
+        fcolor = 2;
+    } else if (color == 2) {
+        fcolor = 3;
+    } else if (color == 3) {
+        fcolor = 4;
+    } else if (color == 4) {
+        fcolor = 5;
+    } else if (color == 5) {
+        fcolor = 6;
+    }
+    if (fcolor != -1 && printf("\033[1;3%dm", fcolor) < 0) {
+        return -99;
+    }
 #endif
-	va_start(args, format);
-	if (!args) {
-		return -99;
-	}
-	retval = vprintf(format, args);
-	va_end(args);
-	if (fcolor != -1) {
+    va_start(args, format);
+    if (!args) {
+        return -99;
+    }
+    retval = vprintf(format, args);
+    va_end(args);
+    if (fcolor != -1) {
 #ifdef _WIN32
-		if (SetConsoleTextAttribute(hStdout, wOldColorAttrs) == 0) {
-			return -99;
-		}
+        if (SetConsoleTextAttribute(hStdout, wOldColorAttrs) == 0) {
+            return -99;
+        }
 #else
-		if (printf("\033[0m") < 0) {
-			return -99;
-		}
+        if (printf("\033[0m") < 0) {
+            return -99;
+        }
 #endif
-	}
-	return retval;
+    }
+    return retval;
 }
 
 #ifdef __cplusplus
diff --git a/Pump/main.cpp b/Pump/main.cpp
index 88e1e7b3..dc243bad 100644
--- a/Pump/main.cpp
+++ b/Pump/main.cpp
@@ -1,19 +1,19 @@
 // main.cpp
 
-#include <QtGlobal>
+#include <iostream>
+
 #include <QCoreApplication>
-#include <QtCore>
-#include <QVector>
+#include <QDebug>
 #include <QVariant>
-#include <QDebug> 
-
-#include <iostream>
+#include <QVector>
+#include <QtCore>
+#include <QtGlobal>
 using namespace std;
 
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
 #include "xlsxrichstring.h"
 #include "xlsxworkbook.h"
 using namespace QXlsx;
@@ -22,11 +22,10 @@ extern int test(QVector<QVariant> params);
 
 int main(int argc, char *argv[])
 {
-	QCoreApplication app(argc, argv);
+    QCoreApplication app(argc, argv);
 
-	QVector<QVariant> testParams;
-	int ret = test(testParams);
+    QVector<QVariant> testParams;
+    int ret = test(testParams);
 
-	return 0; 
+    return 0;
 }
-
diff --git a/Pump/test.cpp b/Pump/test.cpp
index 12364b9d..52206cd5 100644
--- a/Pump/test.cpp
+++ b/Pump/test.cpp
@@ -1,28 +1,28 @@
 // test.cpp
 
-#include <QtGlobal>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <iostream>
+
+#include <QByteArray>
 #include <QCoreApplication>
-#include <QtCore>
-#include <QVector>
-#include <QVariant>
-#include <QDebug> 
+#include <QDataStream>
+#include <QDebug>
 #include <QDir>
 #include <QFile>
-#include <QTextStream>
-#include <QDataStream>
-#include <QByteArray>
 #include <QString>
-
-#include <iostream>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
+#include <QTextStream>
+#include <QVariant>
+#include <QVector>
+#include <QtCore>
+#include <QtGlobal>
 using namespace std;
 
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
 #include "xlsxrichstring.h"
 #include "xlsxworkbook.h"
 
@@ -30,21 +30,19 @@ using namespace std;
 // #include "colorprintf.h" // https://github.com/VittGam/colorprintf
 #endif
 
-int test( QVector<QVariant> params );
+int test(QVector<QVariant> params);
 
-int test( QVector<QVariant> params )
+int test(QVector<QVariant> params)
 {
     qDebug() << "[debug] current path : " << QDir::currentPath();
 
     QFile fileNames(":/xlsx_files/dir2.txt");
-    if ( !fileNames.open(QIODevice::ReadOnly | QIODevice::Text) )
-    {
+    if (!fileNames.open(QIODevice::ReadOnly | QIODevice::Text)) {
         qDebug() << "[debug] failed to load dir2.txt";
         return (-1);
     }
 
-    while (!fileNames.atEnd())
-    {
+    while (!fileNames.atEnd()) {
         QByteArray line = fileNames.readLine();
 
         QString strArg(line);
@@ -56,19 +54,13 @@ int test( QVector<QVariant> params )
         {
             using namespace QXlsx;
             Document output2(currentFilename);
-            if ( output2.load() )
-            {
-                if ( output2.saveAs( strArg3 ) )
-                {
+            if (output2.load()) {
+                if (output2.saveAs(strArg3)) {
                     qDebug() << "[debug] xlsx is saved. " << strArg3;
-                }
-                else
-                {
+                } else {
                     qCritical() << "[debug] failed to save. " << strArg3;
                 }
-            }
-            else
-            {
+            } else {
                 qCritical() << "[debug] failed to load. " << strArg3;
             }
         }
@@ -76,4 +68,3 @@ int test( QVector<QVariant> params )
 
     return 0;
 }
-
diff --git a/QXlsx/header/xlsxabstractooxmlfile.h b/QXlsx/header/xlsxabstractooxmlfile.h
index 8355b0b9..5de9db11 100644
--- a/QXlsx/header/xlsxabstractooxmlfile.h
+++ b/QXlsx/header/xlsxabstractooxmlfile.h
@@ -15,17 +15,13 @@ class QXLSX_EXPORT AbstractOOXmlFile
     Q_DECLARE_PRIVATE(AbstractOOXmlFile)
 
 public:
-    enum CreateFlag
-    {
-        F_NewFromScratch,
-        F_LoadFromExists
-    };
+    enum CreateFlag { F_NewFromScratch, F_LoadFromExists };
 
 public:
     virtual ~AbstractOOXmlFile();
 
     virtual void saveToXmlFile(QIODevice *device) const = 0;
-    virtual bool loadFromXmlFile(QIODevice *device) = 0;
+    virtual bool loadFromXmlFile(QIODevice *device)     = 0;
 
     virtual QByteArray saveToXmlData() const;
     virtual bool loadFromXmlData(const QByteArray &data);
diff --git a/QXlsx/header/xlsxabstractooxmlfile_p.h b/QXlsx/header/xlsxabstractooxmlfile_p.h
index 30fea98b..027e8a5d 100644
--- a/QXlsx/header/xlsxabstractooxmlfile_p.h
+++ b/QXlsx/header/xlsxabstractooxmlfile_p.h
@@ -3,9 +3,8 @@
 #ifndef XLSXOOXMLFILE_P_H
 #define XLSXOOXMLFILE_P_H
 
-#include "xlsxglobal.h"
-
 #include "xlsxabstractooxmlfile.h"
+#include "xlsxglobal.h"
 #include "xlsxrelationships_p.h"
 
 QT_BEGIN_NAMESPACE_XLSX
@@ -15,11 +14,11 @@ class AbstractOOXmlFilePrivate
     Q_DECLARE_PUBLIC(AbstractOOXmlFile)
 
 public:
-    AbstractOOXmlFilePrivate(AbstractOOXmlFile* q, AbstractOOXmlFile::CreateFlag flag);
+    AbstractOOXmlFilePrivate(AbstractOOXmlFile *q, AbstractOOXmlFile::CreateFlag flag);
     virtual ~AbstractOOXmlFilePrivate();
 
 public:
-    QString filePathInPackage; //such as "xl/worksheets/sheet1.xml"
+    QString filePathInPackage; // such as "xl/worksheets/sheet1.xml"
 
     Relationships *relationships;
     AbstractOOXmlFile::CreateFlag flag;
diff --git a/QXlsx/header/xlsxabstractsheet.h b/QXlsx/header/xlsxabstractsheet.h
index 8104740c..674a267a 100644
--- a/QXlsx/header/xlsxabstractsheet.h
+++ b/QXlsx/header/xlsxabstractsheet.h
@@ -3,8 +3,8 @@
 #ifndef XLSXABSTRACTSHEET_H
 #define XLSXABSTRACTSHEET_H
 
-#include "xlsxglobal.h"
 #include "xlsxabstractooxmlfile.h"
+#include "xlsxglobal.h"
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -22,7 +22,7 @@ class QXLSX_EXPORT AbstractSheet : public AbstractOOXmlFile
 public:
     // NOTE: If all Qt  compiler supports C++1x, recommend to use a 'class enum'.
     enum SheetType { ST_WorkSheet, ST_ChartSheet, ST_DialogSheet, ST_MacroSheet };
-    enum SheetState { SS_Visible,SS_Hidden, SS_VeryHidden };
+    enum SheetState { SS_Visible, SS_Hidden, SS_VeryHidden };
 
 public:
     QString sheetName() const;
diff --git a/QXlsx/header/xlsxabstractsheet_p.h b/QXlsx/header/xlsxabstractsheet_p.h
index b95a0581..6b5568fa 100644
--- a/QXlsx/header/xlsxabstractsheet_p.h
+++ b/QXlsx/header/xlsxabstractsheet_p.h
@@ -3,15 +3,14 @@
 #ifndef XLSXABSTRACTSHEET_P_H
 #define XLSXABSTRACTSHEET_P_H
 
-#include <QString>
+#include "xlsxabstractooxmlfile_p.h"
+#include "xlsxabstractsheet.h"
+#include "xlsxdrawing_p.h"
+#include "xlsxglobal.h"
 
 #include <memory>
 
-#include "xlsxglobal.h"
-
-#include "xlsxabstractsheet.h"
-#include "xlsxabstractooxmlfile_p.h"
-#include "xlsxdrawing_p.h"
+#include <QString>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxcell.h b/QXlsx/header/xlsxcell.h
index 619d41ff..aa47ce1e 100644
--- a/QXlsx/header/xlsxcell.h
+++ b/QXlsx/header/xlsxcell.h
@@ -3,18 +3,18 @@
 #ifndef QXLSX_XLSXCELL_H
 #define QXLSX_XLSXCELL_H
 
+#include "xlsxformat.h"
+#include "xlsxglobal.h"
+
 #include <cstdio>
 
-#include <QtGlobal>
-#include <QObject>
-#include <QString>
-#include <QVariant>
 #include <QDate>
 #include <QDateTime>
+#include <QObject>
+#include <QString>
 #include <QTime>
-
-#include "xlsxglobal.h"
-#include "xlsxformat.h"
+#include <QVariant>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -26,7 +26,7 @@ class WorksheetPrivate;
 
 class QXLSX_EXPORT Cell
 {
-	Q_DECLARE_PRIVATE(Cell)
+    Q_DECLARE_PRIVATE(Cell)
 
 private:
     friend class Worksheet;
@@ -43,38 +43,37 @@ class QXLSX_EXPORT Cell
         SharedStringType,
         StringType,
         CustomType, // custom or un-defined cell type
-	};
+    };
 
 public:
     Cell(const QVariant &data = QVariant(),
-            CellType type = NumberType,
-            const Format &format = Format(),
-            Worksheet *parent = nullptr,
-            qint32 styleIndex = (-1) );
-    Cell(const Cell * const cell);
+         CellType type        = NumberType,
+         const Format &format = Format(),
+         Worksheet *parent    = nullptr,
+         qint32 styleIndex    = (-1));
+    Cell(const Cell *const cell);
     ~Cell();
 
 public:
-    CellPrivate * const d_ptr; // See D-pointer and Q-pointer of Qt, for more information.
+    CellPrivate *const d_ptr; // See D-pointer and Q-pointer of Qt, for more information.
 
 public:
-	CellType cellType() const;
-	QVariant value() const;
-	QVariant readValue() const;
-	Format format() const;
-	
-	bool hasFormula() const;
-	CellFormula formula() const;
-
-	bool isDateTime() const;
-    QVariant dateTime() const; // QDateTime, QDate, QTime
+    CellType cellType() const;
+    QVariant value() const;
+    QVariant readValue() const;
+    Format format() const;
 
-	bool isRichString() const;
+    bool hasFormula() const;
+    CellFormula formula() const;
+
+    bool isDateTime() const;
+    QVariant dateTime() const; // QDateTime, QDate, QTime
 
-	qint32 styleNumber() const;
+    bool isRichString() const;
 
-	static bool isDateType(CellType cellType, const Format &format);
+    qint32 styleNumber() const;
 
+    static bool isDateType(CellType cellType, const Format &format);
 };
 
 QT_END_NAMESPACE_XLSX
diff --git a/QXlsx/header/xlsxcell_p.h b/QXlsx/header/xlsxcell_p.h
index 0abcc428..d7d71c20 100644
--- a/QXlsx/header/xlsxcell_p.h
+++ b/QXlsx/header/xlsxcell_p.h
@@ -3,15 +3,15 @@
 #ifndef XLSXCELL_P_H
 #define XLSXCELL_P_H
 
-#include <QtGlobal>
-#include <QObject>
-#include <QList>
-
-#include "xlsxglobal.h"
 #include "xlsxcell.h"
+#include "xlsxcellformula.h"
 #include "xlsxcellrange.h"
+#include "xlsxglobal.h"
 #include "xlsxrichstring.h"
-#include "xlsxcellformula.h"
+
+#include <QList>
+#include <QObject>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -20,10 +20,12 @@ class CellPrivate
     Q_DECLARE_PUBLIC(Cell)
 public:
     CellPrivate(Cell *p);
-    CellPrivate(const CellPrivate * const cp);
+    CellPrivate(const CellPrivate *const cp);
+
 public:
     Worksheet *parent;
     Cell *q_ptr;
+
 public:
     Cell::CellType cellType;
     QVariant value;
diff --git a/QXlsx/header/xlsxcellformula.h b/QXlsx/header/xlsxcellformula.h
index f0f4de41..4b96c9ae 100644
--- a/QXlsx/header/xlsxcellformula.h
+++ b/QXlsx/header/xlsxcellformula.h
@@ -24,14 +24,14 @@ class QXLSX_EXPORT CellFormula
 
 public:
     CellFormula();
-    CellFormula(const char *formula, FormulaType type=NormalType);
-    CellFormula(const QString &formula, FormulaType type=NormalType);
+    CellFormula(const char *formula, FormulaType type = NormalType);
+    CellFormula(const QString &formula, FormulaType type = NormalType);
     CellFormula(const QString &formula, const CellRange &ref, FormulaType type);
     CellFormula(const CellFormula &other);
     ~CellFormula();
 
 public:
-    CellFormula &operator =(const CellFormula &other);
+    CellFormula &operator=(const CellFormula &other);
     bool isValid() const;
 
     FormulaType formulaType() const;
@@ -39,11 +39,12 @@ class QXLSX_EXPORT CellFormula
     CellRange reference() const;
     int sharedIndex() const;
 
-    bool operator == (const CellFormula &formula) const;
-    bool operator != (const CellFormula &formula) const;
+    bool operator==(const CellFormula &formula) const;
+    bool operator!=(const CellFormula &formula) const;
 
     bool saveToXml(QXmlStreamWriter &writer) const;
     bool loadFromXml(QXmlStreamReader &reader);
+
 private:
     friend class Worksheet;
     friend class WorksheetPrivate;
diff --git a/QXlsx/header/xlsxcellformula_p.h b/QXlsx/header/xlsxcellformula_p.h
index 4390089c..6e8c8fca 100644
--- a/QXlsx/header/xlsxcellformula_p.h
+++ b/QXlsx/header/xlsxcellformula_p.h
@@ -3,9 +3,9 @@
 #ifndef XLSXCELLFORMULA_P_H
 #define XLSXCELLFORMULA_P_H
 
-#include "xlsxglobal.h"
 #include "xlsxcellformula.h"
 #include "xlsxcellrange.h"
+#include "xlsxglobal.h"
 
 #include <QSharedData>
 #include <QString>
@@ -15,15 +15,17 @@ QT_BEGIN_NAMESPACE_XLSX
 class CellFormulaPrivate : public QSharedData
 {
 public:
-    CellFormulaPrivate(const QString &formula, const CellRange &reference, CellFormula::FormulaType type);
+    CellFormulaPrivate(const QString &formula,
+                       const CellRange &reference,
+                       CellFormula::FormulaType type);
     CellFormulaPrivate(const CellFormulaPrivate &other);
     ~CellFormulaPrivate();
 
-    QString formula; //formula contents
+    QString formula; // formula contents
     CellFormula::FormulaType type;
     CellRange reference;
-    bool ca; //Calculate Cell
-    int si;  //Shared group index
+    bool ca; // Calculate Cell
+    int si;  // Shared group index
 };
 
 QT_END_NAMESPACE_XLSX
diff --git a/QXlsx/header/xlsxcelllocation.h b/QXlsx/header/xlsxcelllocation.h
index ccb5cdba..8a5d54ff 100644
--- a/QXlsx/header/xlsxcelllocation.h
+++ b/QXlsx/header/xlsxcelllocation.h
@@ -3,16 +3,16 @@
 #ifndef CELL_LOCATION_H
 #define CELL_LOCATION_H
 
-#include <QtGlobal>
-#include <QObject>
-#include <QString>
-#include <QVector>
-#include <QList>
-#include <QMetaType>
+#include "xlsxglobal.h"
 
 #include <memory>
 
-#include "xlsxglobal.h"
+#include <QList>
+#include <QMetaType>
+#include <QObject>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxcellrange.h b/QXlsx/header/xlsxcellrange.h
index 719317ca..1e37d40a 100644
--- a/QXlsx/header/xlsxcellrange.h
+++ b/QXlsx/header/xlsxcellrange.h
@@ -3,11 +3,11 @@
 #ifndef QXLSX_XLSXCELLRANGE_H
 #define QXLSX_XLSXCELLRANGE_H
 
-#include <QtGlobal>
-#include <QObject>
-
-#include "xlsxglobal.h"
 #include "xlsxcellreference.h"
+#include "xlsxglobal.h"
+
+#include <QObject>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -23,7 +23,7 @@ class QXLSX_EXPORT CellRange
     CellRange(const CellRange &other);
     ~CellRange();
 
-    QString toString(bool row_abs=false, bool col_abs=false) const;
+    QString toString(bool row_abs = false, bool col_abs = false) const;
     bool isValid() const;
     inline void setFirstRow(int row) { top = row; }
     inline void setLastRow(int row) { bottom = row; }
@@ -40,23 +40,24 @@ class QXLSX_EXPORT CellRange
     inline CellReference bottomLeft() const { return CellReference(bottom, left); }
     inline CellReference bottomRight() const { return CellReference(bottom, right); }
 
-    inline void operator =(const CellRange &other)
+    inline void operator=(const CellRange &other)
     {
-        top = other.top;
+        top    = other.top;
         bottom = other.bottom;
-        left = other.left;
-        right = other.right;
+        left   = other.left;
+        right  = other.right;
     }
-    inline bool operator ==(const CellRange &other) const
+    inline bool operator==(const CellRange &other) const
     {
-        return top==other.top && bottom==other.bottom
-                && left == other.left && right == other.right;
+        return top == other.top && bottom == other.bottom && left == other.left &&
+               right == other.right;
     }
-    inline bool operator !=(const CellRange &other) const
+    inline bool operator!=(const CellRange &other) const
     {
-        return top!=other.top || bottom!=other.bottom
-                || left != other.left || right != other.right;
+        return top != other.top || bottom != other.bottom || left != other.left ||
+               right != other.right;
     }
+
 private:
     void init(const QString &range);
 
diff --git a/QXlsx/header/xlsxcellreference.h b/QXlsx/header/xlsxcellreference.h
index c20abdc2..e2402708 100644
--- a/QXlsx/header/xlsxcellreference.h
+++ b/QXlsx/header/xlsxcellreference.h
@@ -3,10 +3,10 @@
 #ifndef QXLSX_XLSXCELLREFERENCE_H
 #define QXLSX_XLSXCELLREFERENCE_H
 
-#include <QtGlobal>
-
 #include "xlsxglobal.h"
 
+#include <QtGlobal>
+
 QT_BEGIN_NAMESPACE_XLSX
 
 class QXLSX_EXPORT CellReference
@@ -19,7 +19,7 @@ class QXLSX_EXPORT CellReference
     CellReference(const CellReference &other);
     ~CellReference();
 
-    QString toString(bool row_abs=false, bool col_abs=false) const;
+    QString toString(bool row_abs = false, bool col_abs = false) const;
     static CellReference fromString(const QString &cell);
     bool isValid() const;
     inline void setRow(int row) { _row = row; }
@@ -27,14 +27,15 @@ class QXLSX_EXPORT CellReference
     inline int row() const { return _row; }
     inline int column() const { return _column; }
 
-    inline bool operator ==(const CellReference &other) const
+    inline bool operator==(const CellReference &other) const
     {
-        return _row==other._row && _column==other._column;
+        return _row == other._row && _column == other._column;
     }
-    inline bool operator !=(const CellReference &other) const
+    inline bool operator!=(const CellReference &other) const
     {
-        return _row!=other._row || _column!=other._column;
+        return _row != other._row || _column != other._column;
     }
+
 private:
     void init(const QString &cell);
     int _row, _column;
diff --git a/QXlsx/header/xlsxchart.h b/QXlsx/header/xlsxchart.h
index b724e791..4b178d79 100644
--- a/QXlsx/header/xlsxchart.h
+++ b/QXlsx/header/xlsxchart.h
@@ -3,11 +3,11 @@
 #ifndef QXLSX_CHART_H
 #define QXLSX_CHART_H
 
-#include <QtGlobal>
+#include "xlsxabstractooxmlfile.h"
+
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-
-#include "xlsxabstractooxmlfile.h"
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -21,33 +21,52 @@ class QXLSX_EXPORT Chart : public AbstractOOXmlFile
 {
     Q_DECLARE_PRIVATE(Chart)
 public:
-    enum ChartType { // 16 type of chart (ECMA 376)
+    enum ChartType {             // 16 type of chart (ECMA 376)
         CT_NoStatementChart = 0, // Zero is internally used for unknown types
-        CT_AreaChart, CT_Area3DChart, CT_LineChart,
-        CT_Line3DChart, CT_StockChart, CT_RadarChart,
-        CT_ScatterChart, CT_PieChart, CT_Pie3DChart,
-        CT_DoughnutChart, CT_BarChart, CT_Bar3DChart,
-        CT_OfPieChart, CT_SurfaceChart, CT_Surface3DChart,
+        CT_AreaChart,
+        CT_Area3DChart,
+        CT_LineChart,
+        CT_Line3DChart,
+        CT_StockChart,
+        CT_RadarChart,
+        CT_ScatterChart,
+        CT_PieChart,
+        CT_Pie3DChart,
+        CT_DoughnutChart,
+        CT_BarChart,
+        CT_Bar3DChart,
+        CT_OfPieChart,
+        CT_SurfaceChart,
+        CT_Surface3DChart,
         CT_BubbleChart,
     };
-    enum ChartAxisPos { None = (-1), Left = 0, Right, Top, Bottom  };
+    enum ChartAxisPos { None = (-1), Left = 0, Right, Top, Bottom };
+
 private:
     friend class AbstractSheet;
     friend class Worksheet;
     friend class Chartsheet;
     friend class DrawingAnchor;
+
 private:
     Chart(AbstractSheet *parent, CreateFlag flag);
+
 public:
     ~Chart();
+
 public:
-    void addSeries(const CellRange &range, AbstractSheet *sheet = NULL, bool headerH = false, bool headerV = false, bool swapHeaders = false);
+    void addSeries(const CellRange &range,
+                   AbstractSheet *sheet = NULL,
+                   bool headerH         = false,
+                   bool headerV         = false,
+                   bool swapHeaders     = false);
     void setChartType(ChartType type);
     void setChartStyle(int id);
     void setAxisTitle(Chart::ChartAxisPos pos, QString axisTitle);
     void setChartTitle(QString strchartTitle);
     void setChartLegend(Chart::ChartAxisPos legendPos, bool overlap = false);
     void setGridlinesEnable(bool majorGridlinesEnable = false, bool minorGridlinesEnable = false);
+
 public:
     bool loadFromXmlFile(QIODevice *device) override;
     void saveToXmlFile(QIODevice *device) const override;
diff --git a/QXlsx/header/xlsxchart_p.h b/QXlsx/header/xlsxchart_p.h
index 1d5de8cb..0cb7eea7 100644
--- a/QXlsx/header/xlsxchart_p.h
+++ b/QXlsx/header/xlsxchart_p.h
@@ -3,30 +3,30 @@
 #ifndef QXLSX_CHART_P_H
 #define QXLSX_CHART_P_H
 
+#include "xlsxabstractooxmlfile_p.h"
+#include "xlsxchart.h"
+
+#include <memory>
+
+#include <QList>
+#include <QMap>
 #include <QObject>
 #include <QString>
 #include <QVector>
-#include <QMap>
-#include <QList>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
 
-#include <memory>
-
-#include "xlsxabstractooxmlfile_p.h"
-#include "xlsxchart.h"
-
 QT_BEGIN_NAMESPACE_XLSX
 
 class XlsxSeries
 {
 public:
-    //At present, we care about number cell ranges only!
+    // At present, we care about number cell ranges only!
     QString numberDataSource_numRef; // yval, val
-    QString axDataSource_numRef; // xval, cat
+    QString axDataSource_numRef;     // xval, cat
     QString headerH_numRef;
     QString headerV_numRef;
-    bool    swapHeader = false;
+    bool swapHeader = false;
 };
 
 class XlsxAxis
@@ -34,23 +34,19 @@ class XlsxAxis
 public:
     enum Type { T_None = (-1), T_Cat, T_Val, T_Date, T_Ser };
     enum AxisPos { None = (-1), Left, Right, Top, Bottom };
+
 public:
-    XlsxAxis(){}
+    XlsxAxis() {}
 
-    XlsxAxis( Type t,
-              XlsxAxis::AxisPos p,
-              int id,
-              int crossId,
-              QString axisTitle = QString())
+    XlsxAxis(Type t, XlsxAxis::AxisPos p, int id, int crossId, QString axisTitle = QString())
     {
-        type = t;
+        type    = t;
         axisPos = p;
-        axisId = id;
+        axisId  = id;
         crossAx = crossId;
 
-        if ( !axisTitle.isEmpty() )
-        {
-            axisNames[ p ] = axisTitle;
+        if (!axisTitle.isEmpty()) {
+            axisNames[p] = axisTitle;
         }
     }
 
@@ -59,7 +55,7 @@ class XlsxAxis
     XlsxAxis::AxisPos axisPos;
     int axisId;
     int crossAx;
-    QMap< XlsxAxis::AxisPos, QString > axisNames;
+    QMap<XlsxAxis::AxisPos, QString> axisNames;
 };
 
 class ChartPrivate : public AbstractOOXmlFilePrivate
@@ -73,8 +69,10 @@ class ChartPrivate : public AbstractOOXmlFilePrivate
 public:
     bool loadXmlChart(QXmlStreamReader &reader);
     bool loadXmlPlotArea(QXmlStreamReader &reader);
+
 protected:
     bool loadXmlPlotAreaElement(QXmlStreamReader &reader);
+
 public:
     bool loadXmlXxxChart(QXmlStreamReader &reader);
     bool loadXmlSer(QXmlStreamReader &reader);
@@ -82,25 +80,27 @@ class ChartPrivate : public AbstractOOXmlFilePrivate
     QString loadXmlStrRef(QXmlStreamReader &reader);
     bool loadXmlChartTitle(QXmlStreamReader &reader);
     bool loadXmlChartLegend(QXmlStreamReader &reader);
+
 protected:
     bool loadXmlChartTitleTx(QXmlStreamReader &reader);
     bool loadXmlChartTitleTxRich(QXmlStreamReader &reader);
     bool loadXmlChartTitleTxRichP(QXmlStreamReader &reader);
     bool loadXmlChartTitleTxRichP_R(QXmlStreamReader &reader);
+
 protected:
     bool loadXmlAxisCatAx(QXmlStreamReader &reader);
     bool loadXmlAxisDateAx(QXmlStreamReader &reader);
     bool loadXmlAxisSerAx(QXmlStreamReader &reader);
     bool loadXmlAxisValAx(QXmlStreamReader &reader);
-    bool loadXmlAxisEG_AxShared(QXmlStreamReader &reader, XlsxAxis* axis);
-    bool loadXmlAxisEG_AxShared_Scaling(QXmlStreamReader &reader, XlsxAxis* axis);
-    bool loadXmlAxisEG_AxShared_Title(QXmlStreamReader &reader, XlsxAxis* axis);
-    bool loadXmlAxisEG_AxShared_Title_Overlay(QXmlStreamReader &reader, XlsxAxis* axis);
-    bool loadXmlAxisEG_AxShared_Title_Tx(QXmlStreamReader &reader, XlsxAxis* axis);
-    bool loadXmlAxisEG_AxShared_Title_Tx_Rich(QXmlStreamReader &reader, XlsxAxis* axis);
-    bool loadXmlAxisEG_AxShared_Title_Tx_Rich_P(QXmlStreamReader &reader, XlsxAxis* axis);
-    bool loadXmlAxisEG_AxShared_Title_Tx_Rich_P_pPr(QXmlStreamReader &reader, XlsxAxis* axis);
-    bool loadXmlAxisEG_AxShared_Title_Tx_Rich_P_R(QXmlStreamReader &reader, XlsxAxis* axis);
+    bool loadXmlAxisEG_AxShared(QXmlStreamReader &reader, XlsxAxis *axis);
+    bool loadXmlAxisEG_AxShared_Scaling(QXmlStreamReader &reader, XlsxAxis *axis);
+    bool loadXmlAxisEG_AxShared_Title(QXmlStreamReader &reader, XlsxAxis *axis);
+    bool loadXmlAxisEG_AxShared_Title_Overlay(QXmlStreamReader &reader, XlsxAxis *axis);
+    bool loadXmlAxisEG_AxShared_Title_Tx(QXmlStreamReader &reader, XlsxAxis *axis);
+    bool loadXmlAxisEG_AxShared_Title_Tx_Rich(QXmlStreamReader &reader, XlsxAxis *axis);
+    bool loadXmlAxisEG_AxShared_Title_Tx_Rich_P(QXmlStreamReader &reader, XlsxAxis *axis);
+    bool loadXmlAxisEG_AxShared_Title_Tx_Rich_P_pPr(QXmlStreamReader &reader, XlsxAxis *axis);
+    bool loadXmlAxisEG_AxShared_Title_Tx_Rich_P_R(QXmlStreamReader &reader, XlsxAxis *axis);
 
     QString readSubTree(QXmlStreamReader &reader);
 
@@ -118,29 +118,29 @@ class ChartPrivate : public AbstractOOXmlFilePrivate
     void saveXmlChartLegend(QXmlStreamWriter &writer) const;
 
 protected:
-    void saveXmlAxisCatAx(QXmlStreamWriter &writer, XlsxAxis* axis) const;
-    void saveXmlAxisDateAx(QXmlStreamWriter &writer, XlsxAxis* axis) const;
-    void saveXmlAxisSerAx(QXmlStreamWriter &writer, XlsxAxis* axis) const;
-    void saveXmlAxisValAx(QXmlStreamWriter &writer, XlsxAxis* axis) const;
+    void saveXmlAxisCatAx(QXmlStreamWriter &writer, XlsxAxis *axis) const;
+    void saveXmlAxisDateAx(QXmlStreamWriter &writer, XlsxAxis *axis) const;
+    void saveXmlAxisSerAx(QXmlStreamWriter &writer, XlsxAxis *axis) const;
+    void saveXmlAxisValAx(QXmlStreamWriter &writer, XlsxAxis *axis) const;
 
-    void saveXmlAxisEG_AxShared(QXmlStreamWriter &writer, XlsxAxis* axis) const;
-    void saveXmlAxisEG_AxShared_Title(QXmlStreamWriter &writer, XlsxAxis* axis) const;
-    QString GetAxisPosString( XlsxAxis::AxisPos axisPos ) const;
-    QString GetAxisName(XlsxAxis* ptrXlsxAxis) const;
+    void saveXmlAxisEG_AxShared(QXmlStreamWriter &writer, XlsxAxis *axis) const;
+    void saveXmlAxisEG_AxShared_Title(QXmlStreamWriter &writer, XlsxAxis *axis) const;
+    QString GetAxisPosString(XlsxAxis::AxisPos axisPos) const;
+    QString GetAxisName(XlsxAxis *ptrXlsxAxis) const;
 
 public:
     Chart::ChartType chartType;
-    QList< std::shared_ptr<XlsxSeries> > seriesList;
-    QList< std::shared_ptr<XlsxAxis> > axisList;
-    QMap< XlsxAxis::AxisPos, QString > axisNames;
+    QList<std::shared_ptr<XlsxSeries>> seriesList;
+    QList<std::shared_ptr<XlsxAxis>> axisList;
+    QMap<XlsxAxis::AxisPos, QString> axisNames;
     QString chartTitle;
-    AbstractSheet* sheet;
+    AbstractSheet *sheet;
     Chart::ChartAxisPos legendPos;
     bool legendOverlay;
     bool majorGridlinesEnabled;
     bool minorGridlinesEnabled;
 
-    QString layout;             // only for storing a readed file
+    QString layout; // only for storing a readed file
 };
 
 QT_END_NAMESPACE_XLSX
diff --git a/QXlsx/header/xlsxchartsheet.h b/QXlsx/header/xlsxchartsheet.h
index e654af1a..889cac68 100644
--- a/QXlsx/header/xlsxchartsheet.h
+++ b/QXlsx/header/xlsxchartsheet.h
@@ -3,11 +3,11 @@
 #ifndef XLSXCHARTSHEET_H
 #define XLSXCHARTSHEET_H
 
-#include <QtGlobal>
-#include <QStringList>
-
 #include "xlsxabstractsheet.h"
 
+#include <QStringList>
+#include <QtGlobal>
+
 QT_BEGIN_NAMESPACE_XLSX
 
 class Workbook;
diff --git a/QXlsx/header/xlsxchartsheet_p.h b/QXlsx/header/xlsxchartsheet_p.h
index 21ade912..406807e3 100644
--- a/QXlsx/header/xlsxchartsheet_p.h
+++ b/QXlsx/header/xlsxchartsheet_p.h
@@ -3,11 +3,11 @@
 #ifndef XLSXCHARTSHEET_P_H
 #define XLSXCHARTSHEET_P_H
 
-#include <QtGlobal>
-
-#include "xlsxglobal.h"
-#include "xlsxchartsheet.h"
 #include "xlsxabstractsheet_p.h"
+#include "xlsxchartsheet.h"
+#include "xlsxglobal.h"
+
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxcolor_p.h b/QXlsx/header/xlsxcolor_p.h
index 4fafacf2..9528fa94 100644
--- a/QXlsx/header/xlsxcolor_p.h
+++ b/QXlsx/header/xlsxcolor_p.h
@@ -3,13 +3,13 @@
 #ifndef QXLSX_XLSXCOLOR_P_H
 #define QXLSX_XLSXCOLOR_P_H
 
-#include <QtGlobal>
-#include <QVariant>
+#include "xlsxglobal.h"
+
 #include <QColor>
-#include <QXmlStreamWriter>
+#include <QVariant>
 #include <QXmlStreamReader>
-
-#include "xlsxglobal.h"
+#include <QXmlStreamWriter>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -19,8 +19,8 @@ class XlsxColor
 {
 public:
     explicit XlsxColor(const QColor &color = QColor());
-    explicit XlsxColor(const QString &theme, const QString &tint=QString());
-    explicit XlsxColor (int index);
+    explicit XlsxColor(const QString &theme, const QString &tint = QString());
+    explicit XlsxColor(int index);
 
     bool isThemeColor() const;
     bool isIndexedColor() const;
@@ -36,7 +36,7 @@ class XlsxColor
     static QColor fromARGBString(const QString &c);
     static QString toARGBString(const QColor &c);
 
-    bool saveToXml(QXmlStreamWriter &writer, const QString &node=QString()) const;
+    bool saveToXml(QXmlStreamWriter &writer, const QString &node = QString()) const;
     bool loadFromXml(QXmlStreamReader &reader);
 
 private:
@@ -44,12 +44,12 @@ class XlsxColor
 };
 
 #if !defined(QT_NO_DATASTREAM)
-  QDataStream &operator<<(QDataStream &, const XlsxColor &);
-  QDataStream &operator>>(QDataStream &, XlsxColor &);
+QDataStream &operator<<(QDataStream &, const XlsxColor &);
+QDataStream &operator>>(QDataStream &, XlsxColor &);
 #endif
 
 #ifndef QT_NO_DEBUG_STREAM
-  QDebug operator<<(QDebug dbg, const XlsxColor &c);
+QDebug operator<<(QDebug dbg, const XlsxColor &c);
 #endif
 
 QT_END_NAMESPACE_XLSX
diff --git a/QXlsx/header/xlsxconditionalformatting.h b/QXlsx/header/xlsxconditionalformatting.h
index 117f74ae..4ddfdf0b 100644
--- a/QXlsx/header/xlsxconditionalformatting.h
+++ b/QXlsx/header/xlsxconditionalformatting.h
@@ -3,17 +3,17 @@
 #ifndef QXLSX_XLSXCONDITIONALFORMATTING_H
 #define QXLSX_XLSXCONDITIONALFORMATTING_H
 
-#include <QtGlobal>
-#include <QString>
-#include <QList>
+#include "xlsxcellrange.h"
+#include "xlsxcellreference.h"
+#include "xlsxglobal.h"
+
 #include <QColor>
+#include <QList>
+#include <QSharedDataPointer>
+#include <QString>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QSharedDataPointer>
-
-#include "xlsxglobal.h"
-#include "xlsxcellrange.h"
-#include "xlsxcellreference.h"
+#include <QtGlobal>
 
 class ConditionalFormattingTest;
 
@@ -70,15 +70,7 @@ class QXLSX_EXPORT ConditionalFormatting
         Highlight_Expression
     };
 
-    enum ValueObjectType
-    {
-        VOT_Formula,
-        VOT_Max,
-        VOT_Min,
-        VOT_Num,
-        VOT_Percent,
-        VOT_Percentile
-    };
+    enum ValueObjectType { VOT_Formula, VOT_Max, VOT_Min, VOT_Num, VOT_Percent, VOT_Percentile };
 
 public:
     ConditionalFormatting();
@@ -86,13 +78,32 @@ class QXLSX_EXPORT ConditionalFormatting
     ~ConditionalFormatting();
 
 public:
-    bool addHighlightCellsRule(HighlightRuleType type, const Format &format, bool stopIfTrue=false);
-    bool addHighlightCellsRule(HighlightRuleType type, const QString &formula1, const Format &format, bool stopIfTrue=false);
-    bool addHighlightCellsRule(HighlightRuleType type, const QString &formula1, const QString &formula2, const Format &format, bool stopIfTrue=false);
-    bool addDataBarRule(const QColor &color, bool showData=true, bool stopIfTrue=false);
-    bool addDataBarRule(const QColor &color, ValueObjectType type1, const QString &val1, ValueObjectType type2, const QString &val2, bool showData=true, bool stopIfTrue=false);
-    bool add2ColorScaleRule(const QColor &minColor, const QColor &maxColor, bool stopIfTrue=false);
-    bool add3ColorScaleRule(const QColor &minColor, const QColor &midColor, const QColor &maxColor,  bool stopIfTrue=false);
+    bool addHighlightCellsRule(HighlightRuleType type,
+                               const Format &format,
+                               bool stopIfTrue = false);
+    bool addHighlightCellsRule(HighlightRuleType type,
+                               const QString &formula1,
+                               const Format &format,
+                               bool stopIfTrue = false);
+    bool addHighlightCellsRule(HighlightRuleType type,
+                               const QString &formula1,
+                               const QString &formula2,
+                               const Format &format,
+                               bool stopIfTrue = false);
+    bool addDataBarRule(const QColor &color, bool showData = true, bool stopIfTrue = false);
+    bool addDataBarRule(const QColor &color,
+                        ValueObjectType type1,
+                        const QString &val1,
+                        ValueObjectType type2,
+                        const QString &val2,
+                        bool showData   = true,
+                        bool stopIfTrue = false);
+    bool
+        add2ColorScaleRule(const QColor &minColor, const QColor &maxColor, bool stopIfTrue = false);
+    bool add3ColorScaleRule(const QColor &minColor,
+                            const QColor &midColor,
+                            const QColor &maxColor,
+                            bool stopIfTrue = false);
 
     QList<CellRange> ranges() const;
 
@@ -101,7 +112,7 @@ class QXLSX_EXPORT ConditionalFormatting
     void addRange(int firstRow, int firstCol, int lastRow, int lastCol);
     void addRange(const CellRange &range);
 
-    //needed by QSharedDataPointer!!
+    // needed by QSharedDataPointer!!
     ConditionalFormatting &operator=(const ConditionalFormatting &other);
 
 private:
@@ -110,7 +121,7 @@ class QXLSX_EXPORT ConditionalFormatting
 
 private:
     bool saveToXml(QXmlStreamWriter &writer) const;
-    bool loadFromXml(QXmlStreamReader &reader, Styles* styles = NULL);
+    bool loadFromXml(QXmlStreamReader &reader, Styles *styles = NULL);
 
     QSharedDataPointer<ConditionalFormattingPrivate> d;
 };
diff --git a/QXlsx/header/xlsxconditionalformatting_p.h b/QXlsx/header/xlsxconditionalformatting_p.h
index 455af598..262e5f32 100644
--- a/QXlsx/header/xlsxconditionalformatting_p.h
+++ b/QXlsx/header/xlsxconditionalformatting_p.h
@@ -3,14 +3,14 @@
 #ifndef XLSXCONDITIONALFORMATTING_P_H
 #define XLSXCONDITIONALFORMATTING_P_H
 
-#include <QSharedData>
-#include <QMap>
+#include "xlsxcolor_p.h"
+#include "xlsxconditionalformatting.h"
+#include "xlsxformat.h"
 
 #include <memory>
 
-#include "xlsxconditionalformatting.h"
-#include "xlsxformat.h"
-#include "xlsxcolor_p.h"
+#include <QMap>
+#include <QSharedData>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -18,12 +18,14 @@ class XlsxCfVoData
 {
 public:
     XlsxCfVoData()
-        :gte(true)
+        : gte(true)
     {
     }
 
-    XlsxCfVoData(ConditionalFormatting::ValueObjectType type, const QString &value, bool gte=true)
-        :type(type), value(value), gte(gte)
+    XlsxCfVoData(ConditionalFormatting::ValueObjectType type, const QString &value, bool gte = true)
+        : type(type)
+        , value(value)
+        , gte(gte)
     {
     }
 
@@ -38,7 +40,7 @@ class XlsxCfRuleData
     enum Attribute {
         A_type,
         A_dxfId,
-        //A_priority,
+        // A_priority,
         A_stopIfTrue,
         A_aboveAverage,
         A_percent,
@@ -68,8 +70,9 @@ class XlsxCfRuleData
     };
 
     XlsxCfRuleData()
-        :priority(1)
-    {}
+        : priority(1)
+    {
+    }
 
     int priority;
     Format dxfFormat;
@@ -83,13 +86,13 @@ class ConditionalFormattingPrivate : public QSharedData
     ConditionalFormattingPrivate(const ConditionalFormattingPrivate &other);
     ~ConditionalFormattingPrivate();
 
-    void writeCfVo(QXmlStreamWriter &writer, const XlsxCfVoData& cfvo) const;
-    bool readCfVo(QXmlStreamReader &reader, XlsxCfVoData& cfvo);
+    void writeCfVo(QXmlStreamWriter &writer, const XlsxCfVoData &cfvo) const;
+    bool readCfVo(QXmlStreamReader &reader, XlsxCfVoData &cfvo);
     bool readCfRule(QXmlStreamReader &reader, XlsxCfRuleData *cfRule, Styles *styles);
     bool readCfDataBar(QXmlStreamReader &reader, XlsxCfRuleData *cfRule);
     bool readCfColorScale(QXmlStreamReader &reader, XlsxCfRuleData *cfRule);
 
-    QList<std::shared_ptr<XlsxCfRuleData> >cfRules;
+    QList<std::shared_ptr<XlsxCfRuleData>> cfRules;
     QList<CellRange> ranges;
 };
 
diff --git a/QXlsx/header/xlsxcontenttypes_p.h b/QXlsx/header/xlsxcontenttypes_p.h
index 43c73f0d..35cead6a 100644
--- a/QXlsx/header/xlsxcontenttypes_p.h
+++ b/QXlsx/header/xlsxcontenttypes_p.h
@@ -3,13 +3,13 @@
 #ifndef XLSXCONTENTTYPES_H
 #define XLSXCONTENTTYPES_H
 
-#include <QtGlobal>
+#include "xlsxabstractooxmlfile.h"
+
+#include <QIODevice>
+#include <QMap>
 #include <QString>
 #include <QStringList>
-#include <QMap>
-#include <QIODevice>
-
-#include "xlsxabstractooxmlfile.h"
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -21,7 +21,7 @@ class ContentTypes : public AbstractOOXmlFile
     void addDefault(const QString &key, const QString &value);
     void addOverride(const QString &key, const QString &value);
 
-    //Convenient funcation for addOverride()
+    // Convenient funcation for addOverride()
     void addDocPropCore();
     void addDocPropApp();
     void addStyles();
@@ -43,6 +43,7 @@ class ContentTypes : public AbstractOOXmlFile
 
     void saveToXmlFile(QIODevice *device) const override;
     bool loadFromXmlFile(QIODevice *device) override;
+
 private:
     QMap<QString, QString> m_defaults;
     QMap<QString, QString> m_overrides;
diff --git a/QXlsx/header/xlsxdatavalidation.h b/QXlsx/header/xlsxdatavalidation.h
index ad8a1d61..aea3bea8 100644
--- a/QXlsx/header/xlsxdatavalidation.h
+++ b/QXlsx/header/xlsxdatavalidation.h
@@ -3,14 +3,14 @@
 #ifndef QXLSX_XLSXDATAVALIDATION_H
 #define QXLSX_XLSXDATAVALIDATION_H
 
-#include <QtGlobal>
+#include "xlsxglobal.h"
+
+#include <QList>
 #include <QSharedDataPointer>
 #include <QString>
-#include <QList>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-
-#include "xlsxglobal.h"
+#include <QtGlobal>
 
 class QXmlStreamReader;
 class QXmlStreamWriter;
@@ -25,20 +25,9 @@ class DataValidationPrivate;
 class QXLSX_EXPORT DataValidation
 {
 public:
-    enum ValidationType
-    {
-        None,
-        Whole,
-        Decimal,
-        List,
-        Date,
-        Time,
-        TextLength,
-        Custom
-    };
+    enum ValidationType { None, Whole, Decimal, List, Date, Time, TextLength, Custom };
 
-    enum ValidationOperator
-    {
+    enum ValidationOperator {
         Between,
         NotBetween,
         Equal,
@@ -49,16 +38,14 @@ class QXLSX_EXPORT DataValidation
         GreaterThanOrEqual
     };
 
-    enum ErrorStyle
-    {
-        Stop,
-        Warning,
-        Information
-    };
+    enum ErrorStyle { Stop, Warning, Information };
 
     DataValidation();
-    DataValidation(ValidationType type, ValidationOperator op=Between, const QString &formula1=QString()
-            , const QString &formula2=QString(), bool allowBlank=false);
+    DataValidation(ValidationType type,
+                   ValidationOperator op   = Between,
+                   const QString &formula1 = QString(),
+                   const QString &formula2 = QString(),
+                   bool allowBlank         = false);
     DataValidation(const DataValidation &other);
     ~DataValidation();
 
@@ -81,8 +68,8 @@ class QXLSX_EXPORT DataValidation
     void setErrorStyle(ErrorStyle es);
     void setFormula1(const QString &formula);
     void setFormula2(const QString &formula);
-    void setErrorMessage(const QString &error, const QString &title=QString());
-    void setPromptMessage(const QString &prompt, const QString &title=QString());
+    void setErrorMessage(const QString &error, const QString &title = QString());
+    void setPromptMessage(const QString &prompt, const QString &title = QString());
     void setAllowBlank(bool enable);
     void setPromptMessageVisible(bool visible);
     void setErrorMessageVisible(bool visible);
@@ -96,6 +83,7 @@ class QXLSX_EXPORT DataValidation
 
     bool saveToXml(QXmlStreamWriter &writer) const;
     static DataValidation loadFromXml(QXmlStreamReader &reader);
+
 private:
     QSharedDataPointer<DataValidationPrivate> d;
 };
diff --git a/QXlsx/header/xlsxdatavalidation_p.h b/QXlsx/header/xlsxdatavalidation_p.h
index 727a182b..ebb407c4 100644
--- a/QXlsx/header/xlsxdatavalidation_p.h
+++ b/QXlsx/header/xlsxdatavalidation_p.h
@@ -3,18 +3,22 @@
 #ifndef XLSXDATAVALIDATION_P_H
 #define XLSXDATAVALIDATION_P_H
 
-#include <QtGlobal>
-#include <QSharedData>
-
 #include "xlsxdatavalidation.h"
 
+#include <QSharedData>
+#include <QtGlobal>
+
 QT_BEGIN_NAMESPACE_XLSX
 
-class    DataValidationPrivate : public QSharedData
+class DataValidationPrivate : public QSharedData
 {
 public:
     DataValidationPrivate();
-    DataValidationPrivate(DataValidation::ValidationType type, DataValidation::ValidationOperator op, const QString &formula1, const QString &formula2, bool allowBlank);
+    DataValidationPrivate(DataValidation::ValidationType type,
+                          DataValidation::ValidationOperator op,
+                          const QString &formula1,
+                          const QString &formula2,
+                          bool allowBlank);
     DataValidationPrivate(const DataValidationPrivate &other);
     ~DataValidationPrivate();
 
diff --git a/QXlsx/header/xlsxdatetype.h b/QXlsx/header/xlsxdatetype.h
index 366d99a6..cf09f4c6 100644
--- a/QXlsx/header/xlsxdatetype.h
+++ b/QXlsx/header/xlsxdatetype.h
@@ -3,15 +3,15 @@
 #ifndef QXLSX_XLSXDATETYPE_H
 #define QXLSX_XLSXDATETYPE_H
 
-#include <QtGlobal>
+#include "xlsxglobal.h"
+
+#include <QDate>
+#include <QDateTime>
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QDateTime>
-#include <QDate>
 #include <QTime>
-
-#include "xlsxglobal.h"
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -19,30 +19,30 @@ class QXLSX_EXPORT DateType
 {
 public:
     DateType();
-/*
-    DateType(bool is1904 = false);
-    DateType(double d, bool is1904 = false);
-    DateType(QDateTime qdt, bool is1904 = false);
-    DateType(QDate qd, bool is1904 = false);
-    DateType(QTime qt, bool is1904 = false);
-public:
-    enum currentDateType { DateAndTimeType, OnlyDateType, OnlyTimeType };
-public:
-    currentDateType getType();
-    bool getValue(QDateTime* pQdt);
-    bool getValue(QDate* pQd);
-    bool getValue(QTime* pQt);
-    bool getValue(double* pD);
-
-protected:
-
-protected:
-    bool isSet;
-    double dValue;
-    bool is1904Type;
-    currentDateType dType;
-*/
+    /*
+        DateType(bool is1904 = false);
+        DateType(double d, bool is1904 = false);
+        DateType(QDateTime qdt, bool is1904 = false);
+        DateType(QDate qd, bool is1904 = false);
+        DateType(QTime qt, bool is1904 = false);
+    public:
+        enum currentDateType { DateAndTimeType, OnlyDateType, OnlyTimeType };
+    public:
+        currentDateType getType();
+        bool getValue(QDateTime* pQdt);
+        bool getValue(QDate* pQd);
+        bool getValue(QTime* pQt);
+        bool getValue(double* pD);
+
+    protected:
+
+    protected:
+        bool isSet;
+        double dValue;
+        bool is1904Type;
+        currentDateType dType;
+    */
 };
 
 QT_END_NAMESPACE_XLSX
-#endif 
+#endif
diff --git a/QXlsx/header/xlsxdocpropsapp_p.h b/QXlsx/header/xlsxdocpropsapp_p.h
index 32b95fa7..e326a02c 100644
--- a/QXlsx/header/xlsxdocpropsapp_p.h
+++ b/QXlsx/header/xlsxdocpropsapp_p.h
@@ -3,22 +3,22 @@
 #ifndef XLSXDOCPROPSAPP_H
 #define XLSXDOCPROPSAPP_H
 
+#include "xlsxabstractooxmlfile.h"
+#include "xlsxglobal.h"
+
 #include <QList>
-#include <QStringList>
 #include <QMap>
-
-#include "xlsxglobal.h"
-#include "xlsxabstractooxmlfile.h"
+#include <QStringList>
 
 class QIODevice;
 
 QT_BEGIN_NAMESPACE_XLSX
 
-class  DocPropsApp : public AbstractOOXmlFile
+class DocPropsApp : public AbstractOOXmlFile
 {
 public:
     DocPropsApp(CreateFlag flag);
-    
+
     void addPartTitle(const QString &title);
     void addHeadingPair(const QString &name, int value);
 
@@ -31,7 +31,7 @@ class  DocPropsApp : public AbstractOOXmlFile
 
 private:
     QStringList m_titlesOfPartsList;
-    QList<std::pair<QString, int> > m_headingPairsList;
+    QList<std::pair<QString, int>> m_headingPairsList;
     QMap<QString, QString> m_properties;
 };
 
diff --git a/QXlsx/header/xlsxdocpropscore_p.h b/QXlsx/header/xlsxdocpropscore_p.h
index 3aaace6e..9dd827b7 100644
--- a/QXlsx/header/xlsxdocpropscore_p.h
+++ b/QXlsx/header/xlsxdocpropscore_p.h
@@ -3,8 +3,8 @@
 #ifndef XLSXDOCPROPSCORE_H
 #define XLSXDOCPROPSCORE_H
 
-#include "xlsxglobal.h"
 #include "xlsxabstractooxmlfile.h"
+#include "xlsxglobal.h"
 
 #include <QMap>
 #include <QStringList>
@@ -21,7 +21,7 @@ class DocPropsCore : public AbstractOOXmlFile
     bool setProperty(const QString &name, const QString &value);
     QString property(const QString &name) const;
     QStringList propertyNames() const;
-        
+
     void saveToXmlFile(QIODevice *device) const override;
     bool loadFromXmlFile(QIODevice *device) override;
 
diff --git a/QXlsx/header/xlsxdocument.h b/QXlsx/header/xlsxdocument.h
index 5d3455f2..85ad3477 100644
--- a/QXlsx/header/xlsxdocument.h
+++ b/QXlsx/header/xlsxdocument.h
@@ -3,16 +3,16 @@
 #ifndef QXLSX_XLSXDOCUMENT_H
 #define QXLSX_XLSXDOCUMENT_H
 
-#include <QtGlobal>
-#include <QObject>
-#include <QVariant>
-#include <QIODevice>
-#include <QImage>
-
-#include "xlsxglobal.h"
 #include "xlsxformat.h"
+#include "xlsxglobal.h"
 #include "xlsxworksheet.h"
 
+#include <QIODevice>
+#include <QImage>
+#include <QObject>
+#include <QVariant>
+#include <QtGlobal>
+
 QT_BEGIN_NAMESPACE_XLSX
 
 class Workbook;
@@ -26,102 +26,105 @@ class DocumentPrivate;
 
 class QXLSX_EXPORT Document : public QObject
 {
-	Q_OBJECT
+    Q_OBJECT
     Q_DECLARE_PRIVATE(Document) // D-Pointer. Qt classes have a Q_DECLARE_PRIVATE
                                 // macro in the public class. The macro reads: qglobal.h
 public:
-	explicit Document(QObject *parent = nullptr);
-	Document(const QString& xlsxName, QObject* parent = nullptr);
-	Document(QIODevice* device, QObject* parent = nullptr);
-	~Document();
-
-	bool write(const CellReference &cell, const QVariant &value, const Format &format=Format());
-	bool write(int row, int col, const QVariant &value, const Format &format=Format());
-	
-	QVariant read(const CellReference &cell) const;
-	QVariant read(int row, int col) const;
-	
+    explicit Document(QObject *parent = nullptr);
+    Document(const QString &xlsxName, QObject *parent = nullptr);
+    Document(QIODevice *device, QObject *parent = nullptr);
+    ~Document();
+
+    bool write(const CellReference &cell, const QVariant &value, const Format &format = Format());
+    bool write(int row, int col, const QVariant &value, const Format &format = Format());
+
+    QVariant read(const CellReference &cell) const;
+    QVariant read(int row, int col) const;
+
     int insertImage(int row, int col, const QImage &image);
-    bool getImage(int imageIndex, QImage& img);
-    bool getImage(int row, int col, QImage& img);
+    bool getImage(int imageIndex, QImage &img);
+    bool getImage(int row, int col, QImage &img);
     uint getImageCount();
-	
-	Chart *insertChart(int row, int col, const QSize &size);
-	
-	bool mergeCells(const CellRange &range, const Format &format=Format());
-	bool unmergeCells(const CellRange &range);
-
-	bool setColumnWidth(const CellRange &range, double width);
-	bool setColumnFormat(const CellRange &range, const Format &format);
-	bool setColumnHidden(const CellRange &range, bool hidden);
-	bool setColumnWidth(int column, double width);
-	bool setColumnFormat(int column, const Format &format);
-	bool setColumnHidden(int column, bool hidden);
-	bool setColumnWidth(int colFirst, int colLast, double width);
-	bool setColumnFormat(int colFirst, int colLast, const Format &format);
-	bool setColumnHidden(int colFirst, int colLast, bool hidden);
-	
-	double columnWidth(int column);
-	Format columnFormat(int column);
-	bool isColumnHidden(int column);
-
-	bool setRowHeight(int row, double height);
-	bool setRowFormat(int row, const Format &format);
-	bool setRowHidden(int row, bool hidden);
-	bool setRowHeight(int rowFirst, int rowLast, double height);
-	bool setRowFormat(int rowFirst, int rowLast, const Format &format);
-	bool setRowHidden(int rowFirst, int rowLast, bool hidden);
-
-	double rowHeight(int row);
-	Format rowFormat(int row);
-	bool isRowHidden(int row);
-
-	bool groupRows(int rowFirst, int rowLast, bool collapsed = true);
-	bool groupColumns(int colFirst, int colLast, bool collapsed = true);
-	
-	bool addDataValidation(const DataValidation &validation);
-	bool addConditionalFormatting(const ConditionalFormatting &cf);
-
-	Cell *cellAt(const CellReference &cell) const;
-	Cell *cellAt(int row, int col) const;
-
-    bool defineName(const QString &name, const QString &formula,
-                    const QString &comment=QString(), const QString &scope=QString());
-
-	CellRange dimension() const;
-
-	QString documentProperty(const QString &name) const;
-	void setDocumentProperty(const QString &name, const QString &property);
-	QStringList documentPropertyNames() const;
-
-	QStringList sheetNames() const;
-    bool addSheet(const QString &name = QString(),
+
+    Chart *insertChart(int row, int col, const QSize &size);
+
+    bool mergeCells(const CellRange &range, const Format &format = Format());
+    bool unmergeCells(const CellRange &range);
+
+    bool setColumnWidth(const CellRange &range, double width);
+    bool setColumnFormat(const CellRange &range, const Format &format);
+    bool setColumnHidden(const CellRange &range, bool hidden);
+    bool setColumnWidth(int column, double width);
+    bool setColumnFormat(int column, const Format &format);
+    bool setColumnHidden(int column, bool hidden);
+    bool setColumnWidth(int colFirst, int colLast, double width);
+    bool setColumnFormat(int colFirst, int colLast, const Format &format);
+    bool setColumnHidden(int colFirst, int colLast, bool hidden);
+
+    double columnWidth(int column);
+    Format columnFormat(int column);
+    bool isColumnHidden(int column);
+
+    bool setRowHeight(int row, double height);
+    bool setRowFormat(int row, const Format &format);
+    bool setRowHidden(int row, bool hidden);
+    bool setRowHeight(int rowFirst, int rowLast, double height);
+    bool setRowFormat(int rowFirst, int rowLast, const Format &format);
+    bool setRowHidden(int rowFirst, int rowLast, bool hidden);
+
+    double rowHeight(int row);
+    Format rowFormat(int row);
+    bool isRowHidden(int row);
+
+    bool groupRows(int rowFirst, int rowLast, bool collapsed = true);
+    bool groupColumns(int colFirst, int colLast, bool collapsed = true);
+
+    bool addDataValidation(const DataValidation &validation);
+    bool addConditionalFormatting(const ConditionalFormatting &cf);
+
+    Cell *cellAt(const CellReference &cell) const;
+    Cell *cellAt(int row, int col) const;
+
+    bool defineName(const QString &name,
+                    const QString &formula,
+                    const QString &comment = QString(),
+                    const QString &scope   = QString());
+
+    CellRange dimension() const;
+
+    QString documentProperty(const QString &name) const;
+    void setDocumentProperty(const QString &name, const QString &property);
+    QStringList documentPropertyNames() const;
+
+    QStringList sheetNames() const;
+    bool addSheet(const QString &name           = QString(),
                   AbstractSheet::SheetType type = AbstractSheet::ST_WorkSheet);
-    bool insertSheet(int index, const QString &name = QString(),
+    bool insertSheet(int index,
+                     const QString &name           = QString(),
                      AbstractSheet::SheetType type = AbstractSheet::ST_WorkSheet);
-	bool selectSheet(const QString &name);
-	bool selectSheet(int index);
-	bool renameSheet(const QString &oldName, const QString &newName);
-	bool copySheet(const QString &srcName, const QString &distName = QString());
-	bool moveSheet(const QString &srcName, int distIndex);
-	bool deleteSheet(const QString &name);
+    bool selectSheet(const QString &name);
+    bool selectSheet(int index);
+    bool renameSheet(const QString &oldName, const QString &newName);
+    bool copySheet(const QString &srcName, const QString &distName = QString());
+    bool moveSheet(const QString &srcName, int distIndex);
+    bool deleteSheet(const QString &name);
 
-	Workbook *workbook() const;
-	AbstractSheet *sheet(const QString &sheetName) const;
-	AbstractSheet *currentSheet() const;
-	Worksheet *currentWorksheet() const;
+    Workbook *workbook() const;
+    AbstractSheet *sheet(const QString &sheetName) const;
+    AbstractSheet *currentSheet() const;
+    Worksheet *currentWorksheet() const;
 
-	bool save() const;
-	bool saveAs(const QString &xlsXname) const;
-	bool saveAs(QIODevice *device) const;
+    bool save() const;
+    bool saveAs(const QString &xlsXname) const;
+    bool saveAs(QIODevice *device) const;
 
-	// copy style from one xlsx file to other
-	static bool copyStyle(const QString &from, const QString &to);
+    // copy style from one xlsx file to other
+    static bool copyStyle(const QString &from, const QString &to);
 
-	bool isLoadPackage() const; 
-	bool load() const; // equals to isLoadPackage()
+    bool isLoadPackage() const;
+    bool load() const; // equals to isLoadPackage()
 
-	bool changeimage(int filenoinmidea,QString newfile); // add by liufeijin20181025
+    bool changeimage(int filenoinmidea, QString newfile); // add by liufeijin20181025
 
     bool autosizeColumnWidth(const CellRange &range);
     bool autosizeColumnWidth(int column);
@@ -129,13 +132,12 @@ class QXLSX_EXPORT Document : public QObject
     bool autosizeColumnWidth(void);
 
 private:
-    QMap<int, int> getMaximalColumnWidth(int firstRow=1, int lastRow=INT_MAX);
-
+    QMap<int, int> getMaximalColumnWidth(int firstRow = 1, int lastRow = INT_MAX);
 
 private:
     Q_DISABLE_COPY(Document) // Disables the use of copy constructors and
                              // assignment operators for the given Class.
-    DocumentPrivate* const d_ptr;
+    DocumentPrivate *const d_ptr;
 };
 
 QT_END_NAMESPACE_XLSX
diff --git a/QXlsx/header/xlsxdocument_p.h b/QXlsx/header/xlsxdocument_p.h
index b15bdfa6..978df5eb 100644
--- a/QXlsx/header/xlsxdocument_p.h
+++ b/QXlsx/header/xlsxdocument_p.h
@@ -3,13 +3,13 @@
 #ifndef XLSXDOCUMENT_P_H
 #define XLSXDOCUMENT_P_H
 
-#include <QtGlobal>
-#include <QMap>
-
-#include "xlsxglobal.h"
+#include "xlsxcontenttypes_p.h"
 #include "xlsxdocument.h"
+#include "xlsxglobal.h"
 #include "xlsxworkbook.h"
-#include "xlsxcontenttypes_p.h"
+
+#include <QMap>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -23,17 +23,17 @@ class DocumentPrivate
     bool loadPackage(QIODevice *device);
     bool savePackage(QIODevice *device) const;
 
-	// copy style from one xlsx file to other
-	static bool copyStyle(const QString &from, const QString &to);
+    // copy style from one xlsx file to other
+    static bool copyStyle(const QString &from, const QString &to);
 
     Document *q_ptr;
-    const QString defaultPackageName; //default name when package name not specified
-    QString packageName; //name of the .xlsx file
+    const QString defaultPackageName; // default name when package name not specified
+    QString packageName;              // name of the .xlsx file
 
-    QMap<QString, QString> documentProperties; //core, app and custom properties
+    QMap<QString, QString> documentProperties; // core, app and custom properties
     QSharedPointer<Workbook> workbook;
     std::shared_ptr<ContentTypes> contentTypes;
-	bool isLoad; 
+    bool isLoad;
 };
 
 QT_END_NAMESPACE_XLSX
diff --git a/QXlsx/header/xlsxdrawing_p.h b/QXlsx/header/xlsxdrawing_p.h
index 80793cc2..75b6b1d7 100644
--- a/QXlsx/header/xlsxdrawing_p.h
+++ b/QXlsx/header/xlsxdrawing_p.h
@@ -3,12 +3,12 @@
 #ifndef QXLSX_DRAWING_H
 #define QXLSX_DRAWING_H
 
-#include <QtGlobal>
+#include "xlsxabstractooxmlfile.h"
+#include "xlsxrelationships_p.h"
+
 #include <QList>
 #include <QString>
-
-#include "xlsxrelationships_p.h"
-#include "xlsxabstractooxmlfile.h"
+#include <QtGlobal>
 
 class QIODevice;
 class QXmlStreamWriter;
diff --git a/QXlsx/header/xlsxdrawinganchor_p.h b/QXlsx/header/xlsxdrawinganchor_p.h
index 0c8c641e..c6e7743d 100644
--- a/QXlsx/header/xlsxdrawinganchor_p.h
+++ b/QXlsx/header/xlsxdrawinganchor_p.h
@@ -3,37 +3,36 @@
 #ifndef QXLSX_XLSXDRAWINGANCHOR_P_H
 #define QXLSX_XLSXDRAWINGANCHOR_P_H
 
+#include "xlsxglobal.h"
+
+#include <memory>
+
 #include <QPoint>
+#include <QSharedPointer>
 #include <QSize>
 #include <QString>
-#include <QSharedPointer>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
 
-#include <memory>
-
-#include "xlsxglobal.h"
-
 QT_BEGIN_NAMESPACE_XLSX
 
 class Drawing;
 class MediaFile;
 class Chart;
 
-//Helper class
-struct XlsxMarker
-{
-    XlsxMarker(){}
+// Helper class
+struct XlsxMarker {
+    XlsxMarker() {}
     XlsxMarker(int row, int column, int rowOffset, int colOffset)
-        :cell(QPoint(row, column)), offset(rowOffset, colOffset)
+        : cell(QPoint(row, column))
+        , offset(rowOffset, colOffset)
     {
-
     }
 
-    int row() const {return cell.x();}
-    int col() const {return cell.y();}
-    int rowOff() const {return offset.width();}
-    int colOff() const {return offset.height();}
+    int row() const { return cell.x(); }
+    int col() const { return cell.y(); }
+    int rowOff() const { return offset.width(); }
+    int colOff() const { return offset.height(); }
 
     QPoint cell;
     QSize offset;
@@ -42,24 +41,17 @@ struct XlsxMarker
 class DrawingAnchor
 {
 public:
-    enum ObjectType {
-        GraphicFrame,
-        Shape,
-        GroupShape,
-        ConnectionShape,
-        Picture,
-        Unknown
-    };
+    enum ObjectType { GraphicFrame, Shape, GroupShape, ConnectionShape, Picture, Unknown };
 
     DrawingAnchor(Drawing *drawing, ObjectType objectType);
     virtual ~DrawingAnchor();
 
     void setObjectPicture(const QImage &img);
     bool getObjectPicture(QImage &img);
-	
+
     void setObjectGraphicFrame(QSharedPointer<Chart> chart);
 
-    virtual bool loadFromXml(QXmlStreamReader &reader) = 0;
+    virtual bool loadFromXml(QXmlStreamReader &reader)     = 0;
     virtual void saveToXml(QXmlStreamWriter &writer) const = 0;
 
     virtual int row() const;
@@ -78,7 +70,9 @@ class DrawingAnchor
 
     void saveXmlPos(QXmlStreamWriter &writer, const QPoint &pos) const;
     void saveXmlExt(QXmlStreamWriter &writer, const QSize &ext) const;
-    void saveXmlMarker(QXmlStreamWriter &writer, const XlsxMarker &marker, const QString &node) const;
+    void saveXmlMarker(QXmlStreamWriter &writer,
+                       const XlsxMarker &marker,
+                       const QString &node) const;
     void saveXmlObject(QXmlStreamWriter &writer) const;
     void saveXmlObjectShape(QXmlStreamWriter &writer) const;
     void saveXmlObjectGroupShape(QXmlStreamWriter &writer) const;
@@ -92,40 +86,40 @@ class DrawingAnchor
     QSharedPointer<Chart> m_chartFile;
 
     int m_id;
+
 public:
     int getm_id();
 
 protected:
+    // liufeij {{
+    void setObjectShape(const QImage &img); // liufeij
 
-	// liufeij {{
-	void setObjectShape(const QImage &img); // liufeij
-
-	QString  editASName; 
+    QString editASName;
     // below only for twocellanchor shape
-    QPoint posTA;   // for shape liufeij 20181024
-    QSize extTA;    // for shape liufeij 20181024
-    int rotWithShapeTA;  //// for shape liufeij 20181024
-    int dpiTA;           //// for shape liufeij 20181024
-    QString sp_textlink,sp_macro,sp_blip_cstate,sp_blip_rembed;
-
-	// BELOW only for cxnSp shape
-	QString cxnSp_filpV,cxnSp_macro;
-	// belwo for cxnsp and sp
-	QString xsp_cNvPR_name,xsp_cNvPR_id; //x measns shape and cxnSp together using
-	QString xbwMode;         // same as above
-	QString xIn_algn,xIn_cmpd,xIn_cap,xIn_w; //cxnSp only need xIn_w
-	QString xprstGeom_prst;
-	QString x_headEnd_w,x_headEnd_len,x_headEnd_tyep;
-	QString x_tailEnd_w,x_tailEnd_len,x_tailEnd_tyep;
-	QString Style_inref_idx,style_fillref_idx,style_effectref_idx,style_forntref_idx;
-	QString Style_inref_val,style_fillref_val,style_effectref_val,style_forntref_val;
-	// liufeij }}
+    QPoint posTA;       // for shape liufeij 20181024
+    QSize extTA;        // for shape liufeij 20181024
+    int rotWithShapeTA; //// for shape liufeij 20181024
+    int dpiTA;          //// for shape liufeij 20181024
+    QString sp_textlink, sp_macro, sp_blip_cstate, sp_blip_rembed;
+
+    // BELOW only for cxnSp shape
+    QString cxnSp_filpV, cxnSp_macro;
+    // belwo for cxnsp and sp
+    QString xsp_cNvPR_name, xsp_cNvPR_id;       // x measns shape and cxnSp together using
+    QString xbwMode;                            // same as above
+    QString xIn_algn, xIn_cmpd, xIn_cap, xIn_w; // cxnSp only need xIn_w
+    QString xprstGeom_prst;
+    QString x_headEnd_w, x_headEnd_len, x_headEnd_tyep;
+    QString x_tailEnd_w, x_tailEnd_len, x_tailEnd_tyep;
+    QString Style_inref_idx, style_fillref_idx, style_effectref_idx, style_forntref_idx;
+    QString Style_inref_val, style_fillref_val, style_effectref_val, style_forntref_val;
+    // liufeij }}
 };
 
 class DrawingAbsoluteAnchor : public DrawingAnchor
 {
 public:
-    DrawingAbsoluteAnchor(Drawing *drawing, ObjectType objectType=Unknown);
+    DrawingAbsoluteAnchor(Drawing *drawing, ObjectType objectType = Unknown);
 
     QPoint pos;
     QSize ext;
@@ -137,7 +131,7 @@ class DrawingAbsoluteAnchor : public DrawingAnchor
 class DrawingOneCellAnchor : public DrawingAnchor
 {
 public:
-    DrawingOneCellAnchor(Drawing *drawing, ObjectType objectType=Unknown);
+    DrawingOneCellAnchor(Drawing *drawing, ObjectType objectType = Unknown);
 
     XlsxMarker from;
     QSize ext;
@@ -152,7 +146,7 @@ class DrawingOneCellAnchor : public DrawingAnchor
 class DrawingTwoCellAnchor : public DrawingAnchor
 {
 public:
-    DrawingTwoCellAnchor(Drawing *drawing, ObjectType objectType=Unknown);
+    DrawingTwoCellAnchor(Drawing *drawing, ObjectType objectType = Unknown);
 
     XlsxMarker from;
     XlsxMarker to;
diff --git a/QXlsx/header/xlsxformat.h b/QXlsx/header/xlsxformat.h
index 8a69e155..5644e5fc 100644
--- a/QXlsx/header/xlsxformat.h
+++ b/QXlsx/header/xlsxformat.h
@@ -3,15 +3,15 @@
 #ifndef QXLSX_FORMAT_H
 #define QXLSX_FORMAT_H
 
-#include <QFont>
-#include <QColor>
+#include "xlsxglobal.h"
+
 #include <QByteArray>
-#include <QList>
+#include <QColor>
 #include <QExplicitlySharedDataPointer>
+#include <QFont>
+#include <QList>
 #include <QVariant>
 
-#include "xlsxglobal.h"
-
 class FormatTest;
 
 QT_BEGIN_NAMESPACE_XLSX
@@ -27,15 +27,9 @@ class FormatPrivate;
 class QXLSX_EXPORT Format
 {
 public:
-    enum FontScript
-    {
-        FontScriptNormal,
-        FontScriptSuper,
-        FontScriptSub
-    };
+    enum FontScript { FontScriptNormal, FontScriptSuper, FontScriptSub };
 
-    enum FontUnderline
-    {
+    enum FontUnderline {
         FontUnderlineNone,
         FontUnderlineSingle,
         FontUnderlineDouble,
@@ -43,8 +37,7 @@ class QXLSX_EXPORT Format
         FontUnderlineDoubleAccounting
     };
 
-    enum HorizontalAlignment
-    {
+    enum HorizontalAlignment {
         AlignHGeneral,
         AlignLeft,
         AlignHCenter,
@@ -55,8 +48,7 @@ class QXLSX_EXPORT Format
         AlignHDistributed
     };
 
-    enum VerticalAlignment
-    {
+    enum VerticalAlignment {
         AlignTop,
         AlignVCenter,
         AlignBottom,
@@ -64,8 +56,7 @@ class QXLSX_EXPORT Format
         AlignVDistributed
     };
 
-    enum BorderStyle
-    {
+    enum BorderStyle {
         BorderNone,
         BorderThin,
         BorderMedium,
@@ -82,16 +73,14 @@ class QXLSX_EXPORT Format
         BorderSlantDashDot
     };
 
-    enum DiagonalBorderType
-    {
+    enum DiagonalBorderType {
         DiagonalBorderNone,
         DiagonalBorderDown,
         DiagonalBorderUp,
         DiagnoalBorderBoth
     };
 
-    enum FillPattern
-    {
+    enum FillPattern {
         PatternNone,
         PatternSolid,
         PatternMediumGray,
@@ -200,16 +189,19 @@ class QXLSX_EXPORT Format
     bool isValid() const;
     bool isEmpty() const;
 
-    bool operator == (const Format &format) const;
-    bool operator != (const Format &format) const;
+    bool operator==(const Format &format) const;
+    bool operator!=(const Format &format) const;
 
-    QVariant property(int propertyId, const QVariant &defaultValue=QVariant()) const;
-    void setProperty(int propertyId, const QVariant &value, const QVariant &clearValue=QVariant(), bool detach=true);
+    QVariant property(int propertyId, const QVariant &defaultValue = QVariant()) const;
+    void setProperty(int propertyId,
+                     const QVariant &value,
+                     const QVariant &clearValue = QVariant(),
+                     bool detach                = true);
     void clearProperty(int propertyId);
     bool hasProperty(int propertyId) const;
 
-    bool boolProperty(int propertyId, bool defaultValue=false) const;
-    int intProperty(int propertyId, int defaultValue=0) const;
+    bool boolProperty(int propertyId, bool defaultValue = false) const;
+    int intProperty(int propertyId, int defaultValue = 0) const;
     double doubleProperty(int propertyId, double defaultValue = 0.0) const;
     QString stringProperty(int propertyId, const QString &defaultValue = QString()) const;
     QColor colorProperty(int propertyId, const QColor &defaultValue = QColor()) const;
@@ -243,10 +235,11 @@ class QXLSX_EXPORT Format
     void setFillIndex(int index);
     void setXfIndex(int index);
     void setDxfIndex(int index);
+
 private:
     friend class Styles;
     friend class ::FormatTest;
-    friend   QDebug operator<<(QDebug, const Format &f);
+    friend QDebug operator<<(QDebug, const Format &f);
 
     int theme() const;
 
@@ -254,7 +247,7 @@ class QXLSX_EXPORT Format
 };
 
 #ifndef QT_NO_DEBUG_STREAM
-  QDebug operator<<(QDebug dbg, const Format &f);
+QDebug operator<<(QDebug dbg, const Format &f);
 #endif
 
 QT_END_NAMESPACE_XLSX
diff --git a/QXlsx/header/xlsxformat_p.h b/QXlsx/header/xlsxformat_p.h
index 0f3240d9..87d2aa6b 100644
--- a/QXlsx/header/xlsxformat_p.h
+++ b/QXlsx/header/xlsxformat_p.h
@@ -2,37 +2,36 @@
 #ifndef XLSXFORMAT_P_H
 #define XLSXFORMAT_P_H
 
-#include <QtGlobal>
-#include <QSharedData>
+#include "xlsxformat.h"
+
 #include <QMap>
 #include <QSet>
-
-#include "xlsxformat.h"
+#include <QSharedData>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
 class FormatPrivate : public QSharedData
 {
 public:
-    enum FormatType
-    {
-        FT_Invalid = 0,
-        FT_NumFmt = 0x01,
-        FT_Font = 0x02,
-        FT_Alignment = 0x04,
-        FT_Border = 0x08,
-        FT_Fill = 0x10,
+    enum FormatType {
+        FT_Invalid    = 0,
+        FT_NumFmt     = 0x01,
+        FT_Font       = 0x02,
+        FT_Alignment  = 0x04,
+        FT_Border     = 0x08,
+        FT_Fill       = 0x10,
         FT_Protection = 0x20
     };
 
     enum Property {
         P_STARTID,
 
-        //numFmt
+        // numFmt
         P_NumFmt_Id,
         P_NumFmt_FormatCode,
 
-        //font
+        // font
         P_Font_STARTID,
         P_Font_Size = P_Font_STARTID,
         P_Font_Italic,
@@ -51,7 +50,7 @@ class FormatPrivate : public QSharedData
         P_Font_Extend,
         P_Font_ENDID,
 
-        //border
+        // border
         P_Border_STARTID,
         P_Border_LeftStyle = P_Border_STARTID,
         P_Border_RightStyle,
@@ -66,14 +65,14 @@ class FormatPrivate : public QSharedData
         P_Border_DiagonalType,
         P_Border_ENDID,
 
-        //fill
+        // fill
         P_Fill_STARTID,
         P_Fill_Pattern = P_Fill_STARTID,
         P_Fill_BgColor,
         P_Fill_FgColor,
         P_Fill_ENDID,
 
-        //alignment
+        // alignment
         P_Alignment_STARTID,
         P_Alignment_AlignH = P_Alignment_STARTID,
         P_Alignment_AlignV,
@@ -83,7 +82,7 @@ class FormatPrivate : public QSharedData
         P_Alignment_ShinkToFit,
         P_Alignment_ENDID,
 
-        //protection
+        // protection
         P_Protection_Locked,
         P_Protection_Hidden,
 
@@ -94,7 +93,7 @@ class FormatPrivate : public QSharedData
     FormatPrivate(const FormatPrivate &other);
     ~FormatPrivate();
 
-    bool dirty; //The key re-generation is need.
+    bool dirty; // The key re-generation is need.
     QByteArray formatKey;
 
     bool font_dirty;
@@ -124,7 +123,6 @@ class FormatPrivate : public QSharedData
     QMap<int, QVariant> properties;
 };
 
-
 QT_END_NAMESPACE_XLSX
 
 #endif
diff --git a/QXlsx/header/xlsxglobal.h b/QXlsx/header/xlsxglobal.h
index a176309f..ef92e022 100644
--- a/QXlsx/header/xlsxglobal.h
+++ b/QXlsx/header/xlsxglobal.h
@@ -4,25 +4,25 @@
 #define XLSXGLOBAL_H
 
 #include <cstdio>
-#include <string>
 #include <iostream>
+#include <string>
 
-#include <QtGlobal>
+#include <QByteArray>
+#include <QIODevice>
 #include <QObject>
 #include <QString>
-#include <QVariant>
-#include <QIODevice>
-#include <QByteArray>
 #include <QStringList>
+#include <QVariant>
+#include <QtGlobal>
 
 #if defined(QXlsx_SHAREDLIB)
-#if defined(QXlsx_EXPORTS)
-#  define QXLSX_EXPORT Q_DECL_EXPORT
-#else
-#  define QXLSX_EXPORT Q_DECL_IMPORT
-#endif
+#    if defined(QXlsx_EXPORTS)
+#        define QXLSX_EXPORT Q_DECL_EXPORT
+#    else
+#        define QXLSX_EXPORT Q_DECL_IMPORT
+#    endif
 #else
-#  define QXLSX_EXPORT
+#    define QXLSX_EXPORT
 #endif
 
 #define QT_BEGIN_NAMESPACE_XLSX namespace QXlsx {
diff --git a/QXlsx/header/xlsxmediafile_p.h b/QXlsx/header/xlsxmediafile_p.h
index 1c18578c..30b9adbc 100644
--- a/QXlsx/header/xlsxmediafile_p.h
+++ b/QXlsx/header/xlsxmediafile_p.h
@@ -5,8 +5,8 @@
 
 #include "xlsxglobal.h"
 
-#include <QString>
 #include <QByteArray>
+#include <QString>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -14,10 +14,10 @@ class MediaFile
 {
 public:
     MediaFile(const QString &fileName);
-    MediaFile(const QByteArray &bytes, const QString &suffix, const QString &mimeType=QString());
+    MediaFile(const QByteArray &bytes, const QString &suffix, const QString &mimeType = QString());
 
 public:
-    void set(const QByteArray &bytes, const QString &suffix, const QString &mimeType=QString());
+    void set(const QByteArray &bytes, const QString &suffix, const QString &mimeType = QString());
     QString suffix() const;
     QString mimeType() const;
     QByteArray contents() const;
diff --git a/QXlsx/header/xlsxrelationships_p.h b/QXlsx/header/xlsxrelationships_p.h
index f7259cfa..5595687d 100644
--- a/QXlsx/header/xlsxrelationships_p.h
+++ b/QXlsx/header/xlsxrelationships_p.h
@@ -38,21 +38,20 @@
 
 #include "xlsxglobal.h"
 
+#include <QIODevice>
 #include <QList>
 #include <QString>
-#include <QIODevice>
 
 QT_BEGIN_NAMESPACE_XLSX
 
-struct XlsxRelationship
-{
+struct XlsxRelationship {
     QString id;
     QString type;
     QString target;
     QString targetMode;
 };
 
-class  Relationships
+class Relationships
 {
 public:
     Relationships();
@@ -65,7 +64,9 @@ class  Relationships
     void addDocumentRelationship(const QString &relativeType, const QString &target);
     void addPackageRelationship(const QString &relativeType, const QString &target);
     void addMsPackageRelationship(const QString &relativeType, const QString &target);
-    void addWorksheetRelationship(const QString &relativeType, const QString &target, const QString &targetMode=QString());
+    void addWorksheetRelationship(const QString &relativeType,
+                                  const QString &target,
+                                  const QString &targetMode = QString());
 
     void saveToXmlFile(QIODevice *device) const;
     QByteArray saveToXmlData() const;
@@ -79,7 +80,9 @@ class  Relationships
 
 private:
     QList<XlsxRelationship> relationships(const QString &type) const;
-    void addRelationship(const QString &type, const QString &target, const QString &targetMode=QString());
+    void addRelationship(const QString &type,
+                         const QString &target,
+                         const QString &targetMode = QString());
 
     QList<XlsxRelationship> m_relationships;
 };
diff --git a/QXlsx/header/xlsxrichstring.h b/QXlsx/header/xlsxrichstring.h
index 41a28db0..0eda23c0 100644
--- a/QXlsx/header/xlsxrichstring.h
+++ b/QXlsx/header/xlsxrichstring.h
@@ -25,23 +25,24 @@
 #ifndef XLSXRICHSTRING_H
 #define XLSXRICHSTRING_H
 
-#include "xlsxglobal.h"
 #include "xlsxformat.h"
-#include <QVariant>
-#include <QStringList>
+#include "xlsxglobal.h"
+
 #include <QSharedDataPointer>
+#include <QStringList>
+#include <QVariant>
 
 QT_BEGIN_NAMESPACE_XLSX
 class RichStringPrivate;
 class RichString;
 // qHash is a friend, but we can't use default arguments for friends (§8.3.6.4)
-  uint qHash(const RichString &rs, uint seed = 0) Q_DECL_NOTHROW;
+uint qHash(const RichString &rs, uint seed = 0) Q_DECL_NOTHROW;
 
 class QXLSX_EXPORT RichString
 {
 public:
     RichString();
-    explicit RichString(const QString& text);
+    explicit RichString(const QString &text);
     RichString(const RichString &other);
     ~RichString();
 
@@ -60,26 +61,27 @@ class QXLSX_EXPORT RichString
     operator QVariant() const;
 
     RichString &operator=(const RichString &other);
+
 private:
-    friend   uint qHash(const RichString &rs, uint seed) Q_DECL_NOTHROW;
-    friend   bool operator==(const RichString &rs1, const RichString &rs2);
-    friend   bool operator!=(const RichString &rs1, const RichString &rs2);
-    friend   bool operator<(const RichString &rs1, const RichString &rs2);
-    friend   QDebug operator<<(QDebug dbg, const RichString &rs);
+    friend uint qHash(const RichString &rs, uint seed) Q_DECL_NOTHROW;
+    friend bool operator==(const RichString &rs1, const RichString &rs2);
+    friend bool operator!=(const RichString &rs1, const RichString &rs2);
+    friend bool operator<(const RichString &rs1, const RichString &rs2);
+    friend QDebug operator<<(QDebug dbg, const RichString &rs);
 
     QSharedDataPointer<RichStringPrivate> d;
 };
 
-  bool operator==(const RichString &rs1, const RichString &rs2);
-  bool operator!=(const RichString &rs1, const RichString &rs2);
-  bool operator<(const RichString &rs1, const RichString &rs2);
-  bool operator==(const RichString &rs1, const QString &rs2);
-  bool operator==(const QString &rs1, const RichString &rs2);
-  bool operator!=(const RichString &rs1, const QString &rs2);
-  bool operator!=(const QString &rs1, const RichString &rs2);
+bool operator==(const RichString &rs1, const RichString &rs2);
+bool operator!=(const RichString &rs1, const RichString &rs2);
+bool operator<(const RichString &rs1, const RichString &rs2);
+bool operator==(const RichString &rs1, const QString &rs2);
+bool operator==(const QString &rs1, const RichString &rs2);
+bool operator!=(const RichString &rs1, const QString &rs2);
+bool operator!=(const QString &rs1, const RichString &rs2);
 
 #ifndef QT_NO_DEBUG_STREAM
-  QDebug operator<<(QDebug dbg, const RichString &rs);
+QDebug operator<<(QDebug dbg, const RichString &rs);
 #endif
 
 QT_END_NAMESPACE_XLSX
diff --git a/QXlsx/header/xlsxsharedstrings_p.h b/QXlsx/header/xlsxsharedstrings_p.h
index c0b32503..75d563df 100644
--- a/QXlsx/header/xlsxsharedstrings_p.h
+++ b/QXlsx/header/xlsxsharedstrings_p.h
@@ -36,23 +36,24 @@
 // We mean it.
 //
 
+#include "xlsxabstractooxmlfile.h"
+#include "xlsxglobal.h"
+#include "xlsxrichstring.h"
+
 #include <QHash>
-#include <QStringList>
 #include <QIODevice>
+#include <QStringList>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
 
-#include "xlsxglobal.h"
-#include "xlsxrichstring.h"
-#include "xlsxabstractooxmlfile.h"
-
 QT_BEGIN_NAMESPACE_XLSX
 
 class XlsxSharedStringInfo
 {
 public:
-    XlsxSharedStringInfo(int index=0, int count = 1) :
-        index(index), count(count)
+    XlsxSharedStringInfo(int index = 0, int count = 1)
+        : index(index)
+        , count(count)
     {
     }
 
@@ -60,13 +61,13 @@ class XlsxSharedStringInfo
     int count;
 };
 
-class  SharedStrings : public AbstractOOXmlFile
+class SharedStrings : public AbstractOOXmlFile
 {
 public:
     SharedStrings(CreateFlag flag);
     int count() const;
     bool isEmpty() const;
-    
+
     int addSharedString(const QString &string);
     int addSharedString(const RichString &string);
     void removeSharedString(const QString &string);
@@ -82,13 +83,13 @@ class  SharedStrings : public AbstractOOXmlFile
     bool loadFromXmlFile(QIODevice *device) override;
 
 private:
-    void readString(QXmlStreamReader &reader); // <si>
-    void readRichStringPart(QXmlStreamReader &reader, RichString &rich); // <r>
+    void readString(QXmlStreamReader &reader);                            // <si>
+    void readRichStringPart(QXmlStreamReader &reader, RichString &rich);  // <r>
     void readPlainStringPart(QXmlStreamReader &reader, RichString &rich); // <v>
     Format readRichStringPart_rPr(QXmlStreamReader &reader);
     void writeRichStringPart_rPr(QXmlStreamWriter &writer, const Format &format) const;
 
-    QHash<RichString, XlsxSharedStringInfo> m_stringTable; //for fast lookup
+    QHash<RichString, XlsxSharedStringInfo> m_stringTable; // for fast lookup
     QList<RichString> m_stringList;
     int m_stringCount;
 };
diff --git a/QXlsx/header/xlsxsimpleooxmlfile_p.h b/QXlsx/header/xlsxsimpleooxmlfile_p.h
index ba026c99..cb8c26e7 100644
--- a/QXlsx/header/xlsxsimpleooxmlfile_p.h
+++ b/QXlsx/header/xlsxsimpleooxmlfile_p.h
@@ -37,8 +37,8 @@
 //
 #include "xlsxabstractooxmlfile.h"
 
-#include <QString>
 #include <QIODevice>
+#include <QString>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/header/xlsxstyles_p.h b/QXlsx/header/xlsxstyles_p.h
index 380afd20..77c68abb 100644
--- a/QXlsx/header/xlsxstyles_p.h
+++ b/QXlsx/header/xlsxstyles_p.h
@@ -36,30 +36,32 @@
 // We mean it.
 //
 
-#include <QSharedPointer>
 #include <QHash>
+#include <QIODevice>
 #include <QList>
 #include <QMap>
+#include <QSharedPointer>
 #include <QStringList>
 #include <QVector>
-#include <QXmlStreamWriter>
 #include <QXmlStreamReader>
-#include <QIODevice>
+#include <QXmlStreamWriter>
 
 // class StylesTest;
 
-#include "xlsxglobal.h"
-#include "xlsxformat.h"
 #include "xlsxabstractooxmlfile.h"
+#include "xlsxformat.h"
+#include "xlsxglobal.h"
 
 QT_BEGIN_NAMESPACE_XLSX
 
 class Format;
 class XlsxColor;
 
-struct XlsxFormatNumberData
-{
-    XlsxFormatNumberData() : formatIndex(0) {}
+struct XlsxFormatNumberData {
+    XlsxFormatNumberData()
+        : formatIndex(0)
+    {
+    }
 
     int formatIndex;
     QString formatString;
@@ -70,9 +72,9 @@ class Styles : public AbstractOOXmlFile
 public:
     Styles(CreateFlag flag);
     ~Styles();
-    void addXfFormat(const Format &format, bool force=false);
+    void addXfFormat(const Format &format, bool force = false);
     Format xfFormat(int idx) const;
-    void addDxfFormat(const Format &format, bool force=false);
+    void addDxfFormat(const Format &format, bool force = false);
     Format dxfFormat(int idx) const;
 
     void saveToXmlFile(QIODevice *device) const override;
@@ -93,7 +95,10 @@ class Styles : public AbstractOOXmlFile
     void writeFill(QXmlStreamWriter &writer, const Format &fill, bool isDxf = false) const;
     void writeBorders(QXmlStreamWriter &writer) const;
     void writeBorder(QXmlStreamWriter &writer, const Format &border, bool isDxf = false) const;
-    void writeSubBorder(QXmlStreamWriter &writer, const QString &type, int style, const XlsxColor &color) const;
+    void writeSubBorder(QXmlStreamWriter &writer,
+                        const QString &type,
+                        int style,
+                        const XlsxColor &color) const;
     void writeCellXfs(QXmlStreamWriter &writer) const;
     void writeDxfs(QXmlStreamWriter &writer) const;
     void writeDxf(QXmlStreamWriter &writer, const Format &format) const;
@@ -106,7 +111,10 @@ class Styles : public AbstractOOXmlFile
     bool readFill(QXmlStreamReader &reader, Format &format);
     bool readBorders(QXmlStreamReader &reader);
     bool readBorder(QXmlStreamReader &reader, Format &format);
-    bool readSubBorder(QXmlStreamReader &reader, const QString &name, Format::BorderStyle &style, XlsxColor &color);
+    bool readSubBorder(QXmlStreamReader &reader,
+                       const QString &name,
+                       Format::BorderStyle &style,
+                       XlsxColor &color);
     bool readCellXfs(QXmlStreamReader &reader);
     bool readDxfs(QXmlStreamReader &reader);
     bool readDxf(QXmlStreamReader &reader);
@@ -116,8 +124,8 @@ class Styles : public AbstractOOXmlFile
     bool readCellStyleXfs(QXmlStreamReader &reader);
 
     QHash<QString, int> m_builtinNumFmtsHash;
-    QMap<int, QSharedPointer<XlsxFormatNumberData> > m_customNumFmtIdMap;
-    QHash<QString, QSharedPointer<XlsxFormatNumberData> > m_customNumFmtsHash;
+    QMap<int, QSharedPointer<XlsxFormatNumberData>> m_customNumFmtIdMap;
+    QHash<QString, QSharedPointer<XlsxFormatNumberData>> m_customNumFmtsHash;
     int m_nextCustomNumFmtId;
     QList<Format> m_fontsList;
     QList<Format> m_fillsList;
diff --git a/QXlsx/header/xlsxtheme_p.h b/QXlsx/header/xlsxtheme_p.h
index a9a783be..94d16e8f 100644
--- a/QXlsx/header/xlsxtheme_p.h
+++ b/QXlsx/header/xlsxtheme_p.h
@@ -3,12 +3,12 @@
 #ifndef XLSXTHEME_H
 #define XLSXTHEME_H
 
-#include <QtGlobal>
-#include <QString>
-#include <QIODevice>
-
 #include "xlsxabstractooxmlfile.h"
 
+#include <QIODevice>
+#include <QString>
+#include <QtGlobal>
+
 QT_BEGIN_NAMESPACE_XLSX
 
 class Theme : public AbstractOOXmlFile
diff --git a/QXlsx/header/xlsxutility_p.h b/QXlsx/header/xlsxutility_p.h
index 0c8e68f6..e7423e79 100644
--- a/QXlsx/header/xlsxutility_p.h
+++ b/QXlsx/header/xlsxutility_p.h
@@ -3,31 +3,30 @@
 #ifndef XLSXUTILITY_H
 #define XLSXUTILITY_H
 
-#include <QtGlobal>
+#include "xlsxglobal.h"
+
+#include <QColor>
+#include <QDate>
+#include <QDateTime>
 #include <QObject>
-#include <QString>
 #include <QPoint>
 #include <QString>
 #include <QStringList>
-#include <QColor>
-#include <QDateTime>
-#include <QDate>
 #include <QTime>
 #include <QVariant>
-
-#include "xlsxglobal.h"
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
 class CellReference;
 
-bool parseXsdBoolean(const QString &value, bool defaultValue=false);
+bool parseXsdBoolean(const QString &value, bool defaultValue = false);
 
 QStringList splitPath(const QString &path);
 QString getRelFilePath(const QString &filePath);
 
-double datetimeToNumber(const QDateTime &dt, bool is1904=false);
-QVariant datetimeFromNumber(double num, bool is1904=false);
+double datetimeToNumber(const QDateTime &dt, bool is1904 = false);
+QVariant datetimeFromNumber(double num, bool is1904 = false);
 double timeToNumber(const QTime &t);
 
 QString createSafeSheetName(const QString &nameProposal);
@@ -36,7 +35,9 @@ QString unescapeSheetName(const QString &sheetName);
 
 bool isSpaceReserveNeeded(const QString &string);
 
-QString convertSharedFormula(const QString &rootFormula, const CellReference &rootCell, const CellReference &cell);
+QString convertSharedFormula(const QString &rootFormula,
+                             const CellReference &rootCell,
+                             const CellReference &cell);
 
 QT_END_NAMESPACE_XLSX
 #endif // XLSXUTILITY_H
diff --git a/QXlsx/header/xlsxworkbook.h b/QXlsx/header/xlsxworkbook.h
index 536ad5f5..2e3e796a 100644
--- a/QXlsx/header/xlsxworkbook.h
+++ b/QXlsx/header/xlsxworkbook.h
@@ -3,17 +3,17 @@
 #ifndef XLSXWORKBOOK_H
 #define XLSXWORKBOOK_H
 
-#include <QtGlobal>
-#include <QList>
-#include <QImage>
-#include <QSharedPointer>
-#include <QIODevice>
+#include "xlsxabstractooxmlfile.h"
+#include "xlsxabstractsheet.h"
+#include "xlsxglobal.h"
 
 #include <memory>
 
-#include "xlsxglobal.h"
-#include "xlsxabstractooxmlfile.h"
-#include "xlsxabstractsheet.h"
+#include <QIODevice>
+#include <QImage>
+#include <QList>
+#include <QSharedPointer>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -39,34 +39,40 @@ class QXLSX_EXPORT Workbook : public AbstractOOXmlFile
     int sheetCount() const;
     AbstractSheet *sheet(int index) const;
 
-    AbstractSheet *addSheet(const QString &name = QString(), AbstractSheet::SheetType type = AbstractSheet::ST_WorkSheet);
-    AbstractSheet *insertSheet(int index, const QString &name = QString(), AbstractSheet::SheetType type = AbstractSheet::ST_WorkSheet);
+    AbstractSheet *addSheet(const QString &name           = QString(),
+                            AbstractSheet::SheetType type = AbstractSheet::ST_WorkSheet);
+    AbstractSheet *insertSheet(int index,
+                               const QString &name           = QString(),
+                               AbstractSheet::SheetType type = AbstractSheet::ST_WorkSheet);
     bool renameSheet(int index, const QString &name);
     bool deleteSheet(int index);
-    bool copySheet(int index, const QString &newName=QString());
+    bool copySheet(int index, const QString &newName = QString());
     bool moveSheet(int srcIndex, int distIndex);
 
     AbstractSheet *activeSheet() const;
     bool setActiveSheet(int index);
 
-//    void addChart();
-    bool defineName(const QString &name, const QString &formula, const QString &comment=QString(), const QString &scope=QString());
+    //    void addChart();
+    bool defineName(const QString &name,
+                    const QString &formula,
+                    const QString &comment = QString(),
+                    const QString &scope   = QString());
     bool isDate1904() const;
     void setDate1904(bool date1904);
     bool isStringsToNumbersEnabled() const;
-    void setStringsToNumbersEnabled(bool enable=true);
+    void setStringsToNumbersEnabled(bool enable = true);
     bool isStringsToHyperlinksEnabled() const;
-    void setStringsToHyperlinksEnabled(bool enable=true);
+    void setStringsToHyperlinksEnabled(bool enable = true);
     bool isHtmlToRichStringEnabled() const;
-    void setHtmlToRichStringEnabled(bool enable=true);
+    void setHtmlToRichStringEnabled(bool enable = true);
     QString defaultDateFormat() const;
     void setDefaultDateFormat(const QString &format);
 
-    //internal used member
-    void addMediaFile(std::shared_ptr<MediaFile> media, bool force=false);
-    QList<std::shared_ptr<MediaFile> > mediaFiles() const;
+    // internal used member
+    void addMediaFile(std::shared_ptr<MediaFile> media, bool force = false);
+    QList<std::shared_ptr<MediaFile>> mediaFiles() const;
     void addChartFile(QSharedPointer<Chart> chartFile);
-    QList<QSharedPointer<Chart> > chartFiles() const;
+    QList<QSharedPointer<Chart>> chartFiles() const;
 
 private:
     friend class Worksheet;
@@ -85,9 +91,11 @@ class QXLSX_EXPORT Workbook : public AbstractOOXmlFile
     Theme *theme();
     QList<QImage> images();
     QList<Drawing *> drawings();
-    QList<QSharedPointer<AbstractSheet> > getSheetsByTypes(AbstractSheet::SheetType type) const;
+    QList<QSharedPointer<AbstractSheet>> getSheetsByTypes(AbstractSheet::SheetType type) const;
     QStringList worksheetNames() const;
-    AbstractSheet *addSheet(const QString &name, int sheetId, AbstractSheet::SheetType type = AbstractSheet::ST_WorkSheet);
+    AbstractSheet *addSheet(const QString &name,
+                            int sheetId,
+                            AbstractSheet::SheetType type = AbstractSheet::ST_WorkSheet);
 };
 
 QT_END_NAMESPACE_XLSX
diff --git a/QXlsx/header/xlsxworkbook_p.h b/QXlsx/header/xlsxworkbook_p.h
index 7124f30a..86847018 100644
--- a/QXlsx/header/xlsxworkbook_p.h
+++ b/QXlsx/header/xlsxworkbook_p.h
@@ -3,32 +3,37 @@
 #ifndef XLSXWORKBOOK_P_H
 #define XLSXWORKBOOK_P_H
 
-#include <QtGlobal>
-#include <QSharedPointer>
-#include <QStringList>
-
-#include "xlsxworkbook.h"
 #include "xlsxabstractooxmlfile_p.h"
-#include "xlsxtheme_p.h"
-#include "xlsxsimpleooxmlfile_p.h"
 #include "xlsxrelationships_p.h"
+#include "xlsxsimpleooxmlfile_p.h"
+#include "xlsxtheme_p.h"
+#include "xlsxworkbook.h"
+
+#include <QSharedPointer>
+#include <QStringList>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
-struct XlsxDefineNameData
-{
+struct XlsxDefineNameData {
     XlsxDefineNameData()
-        :sheetId(-1)
-    {}
-    XlsxDefineNameData(const QString &name, const QString &formula, const QString &comment, int sheetId=-1)
-        :name(name), formula(formula), comment(comment), sheetId(sheetId)
+        : sheetId(-1)
+    {
+    }
+    XlsxDefineNameData(const QString &name,
+                       const QString &formula,
+                       const QString &comment,
+                       int sheetId = -1)
+        : name(name)
+        , formula(formula)
+        , comment(comment)
+        , sheetId(sheetId)
     {
-
     }
     QString name;
     QString formula;
     QString comment;
-    //using internal sheetId, instead of the localSheetId(order in the workbook)
+    // using internal sheetId, instead of the localSheetId(order in the workbook)
     int sheetId;
 };
 
@@ -39,13 +44,13 @@ class WorkbookPrivate : public AbstractOOXmlFilePrivate
     WorkbookPrivate(Workbook *q, Workbook::CreateFlag flag);
 
     QSharedPointer<SharedStrings> sharedStrings;
-    QList<QSharedPointer<AbstractSheet> > sheets;
-    QList<QSharedPointer<SimpleOOXmlFile> > externalLinks;
+    QList<QSharedPointer<AbstractSheet>> sheets;
+    QList<QSharedPointer<SimpleOOXmlFile>> externalLinks;
     QStringList sheetNames;
     QSharedPointer<Styles> styles;
     QSharedPointer<Theme> theme;
-    QList<std::shared_ptr<MediaFile> > mediaFiles;
-    QList<QSharedPointer<Chart> > chartFiles;
+    QList<std::shared_ptr<MediaFile>> mediaFiles;
+    QList<QSharedPointer<Chart>> chartFiles;
     QList<XlsxDefineNameData> definedNamesList;
 
     bool strings_to_numbers_enabled;
@@ -63,7 +68,7 @@ class WorkbookPrivate : public AbstractOOXmlFilePrivate
     int firstsheet;
     int table_count;
 
-    //Used to generate new sheet name and id
+    // Used to generate new sheet name and id
     int last_worksheet_index;
     int last_chartsheet_index;
     int last_sheet_id;
diff --git a/QXlsx/header/xlsxworksheet.h b/QXlsx/header/xlsxworksheet.h
index 75a08fcb..7c9232a8 100644
--- a/QXlsx/header/xlsxworksheet.h
+++ b/QXlsx/header/xlsxworksheet.h
@@ -3,22 +3,22 @@
 #ifndef XLSXWORKSHEET_H
 #define XLSXWORKSHEET_H
 
-#include <QtGlobal>
-#include <QObject>
-#include <QStringList>
-#include <QMap>
-#include <QVariant>
-#include <QPointF>
-#include <QIODevice>
-#include <QDateTime>
-#include <QUrl>
-#include <QImage>
-
 #include "xlsxabstractsheet.h"
 #include "xlsxcell.h"
+#include "xlsxcelllocation.h"
 #include "xlsxcellrange.h"
 #include "xlsxcellreference.h"
-#include "xlsxcelllocation.h"
+
+#include <QDateTime>
+#include <QIODevice>
+#include <QImage>
+#include <QMap>
+#include <QObject>
+#include <QPointF>
+#include <QStringList>
+#include <QUrl>
+#include <QVariant>
+#include <QtGlobal>
 
 class WorksheetTest;
 
@@ -51,44 +51,78 @@ class QXLSX_EXPORT Worksheet : public AbstractSheet
     ~Worksheet();
 
 public:
-    bool write(const CellReference &row_column, const QVariant &value, const Format &format=Format());
-    bool write(int row, int column, const QVariant &value, const Format &format=Format());
+    bool write(const CellReference &row_column,
+               const QVariant &value,
+               const Format &format = Format());
+    bool write(int row, int column, const QVariant &value, const Format &format = Format());
 
     QVariant read(const CellReference &row_column) const;
     QVariant read(int row, int column) const;
 
-    bool writeString(const CellReference &row_column, const QString &value, const Format &format=Format());
-    bool writeString(int row, int column, const QString &value, const Format &format=Format());
-    bool writeString(const CellReference &row_column, const RichString &value, const Format &format=Format());
-    bool writeString(int row, int column, const RichString &value, const Format &format=Format());
-
-    bool writeInlineString(const CellReference &row_column, const QString &value, const Format &format=Format());
-    bool writeInlineString(int row, int column, const QString &value, const Format &format=Format());
-
-    bool writeNumeric(const CellReference &row_column, double value, const Format &format=Format());
-    bool writeNumeric(int row, int column, double value, const Format &format=Format());
-
-    bool writeFormula(const CellReference &row_column, const CellFormula &formula, const Format &format=Format(), double result=0);
-    bool writeFormula(int row, int column, const CellFormula &formula, const Format &format=Format(), double result=0);
-
-    bool writeBlank(const CellReference &row_column, const Format &format=Format());
-    bool writeBlank(int row, int column, const Format &format=Format());
-
-    bool writeBool(const CellReference &row_column, bool value, const Format &format=Format());
-    bool writeBool(int row, int column, bool value, const Format &format=Format());
-
-    bool writeDateTime(const CellReference &row_column, const QDateTime& dt, const Format &format=Format());
-    bool writeDateTime(int row, int column, const QDateTime& dt, const Format &format=Format());
+    bool writeString(const CellReference &row_column,
+                     const QString &value,
+                     const Format &format = Format());
+    bool writeString(int row, int column, const QString &value, const Format &format = Format());
+    bool writeString(const CellReference &row_column,
+                     const RichString &value,
+                     const Format &format = Format());
+    bool writeString(int row, int column, const RichString &value, const Format &format = Format());
+
+    bool writeInlineString(const CellReference &row_column,
+                           const QString &value,
+                           const Format &format = Format());
+    bool writeInlineString(int row,
+                           int column,
+                           const QString &value,
+                           const Format &format = Format());
+
+    bool writeNumeric(const CellReference &row_column,
+                      double value,
+                      const Format &format = Format());
+    bool writeNumeric(int row, int column, double value, const Format &format = Format());
+
+    bool writeFormula(const CellReference &row_column,
+                      const CellFormula &formula,
+                      const Format &format = Format(),
+                      double result        = 0);
+    bool writeFormula(int row,
+                      int column,
+                      const CellFormula &formula,
+                      const Format &format = Format(),
+                      double result        = 0);
+
+    bool writeBlank(const CellReference &row_column, const Format &format = Format());
+    bool writeBlank(int row, int column, const Format &format = Format());
+
+    bool writeBool(const CellReference &row_column, bool value, const Format &format = Format());
+    bool writeBool(int row, int column, bool value, const Format &format = Format());
+
+    bool writeDateTime(const CellReference &row_column,
+                       const QDateTime &dt,
+                       const Format &format = Format());
+    bool writeDateTime(int row, int column, const QDateTime &dt, const Format &format = Format());
 
     // dev67
-    bool writeDate(const CellReference &row_column, const QDate& dt, const Format &format=Format());
-    bool writeDate(int row, int column, const QDate& dt, const Format &format=Format());
-
-    bool writeTime(const CellReference &row_column, const QTime& t, const Format &format=Format());
-    bool writeTime(int row, int column, const QTime& t, const Format &format=Format());
-
-    bool writeHyperlink(const CellReference &row_column, const QUrl &url, const Format &format=Format(), const QString &display=QString(), const QString &tip=QString());
-    bool writeHyperlink(int row, int column, const QUrl &url, const Format &format=Format(), const QString &display=QString(), const QString &tip=QString());
+    bool writeDate(const CellReference &row_column,
+                   const QDate &dt,
+                   const Format &format = Format());
+    bool writeDate(int row, int column, const QDate &dt, const Format &format = Format());
+
+    bool
+        writeTime(const CellReference &row_column, const QTime &t, const Format &format = Format());
+    bool writeTime(int row, int column, const QTime &t, const Format &format = Format());
+
+    bool writeHyperlink(const CellReference &row_column,
+                        const QUrl &url,
+                        const Format &format   = Format(),
+                        const QString &display = QString(),
+                        const QString &tip     = QString());
+    bool writeHyperlink(int row,
+                        int column,
+                        const QUrl &url,
+                        const Format &format   = Format(),
+                        const QString &display = QString(),
+                        const QString &tip     = QString());
 
     bool addDataValidation(const DataValidation &validation);
     bool addConditionalFormatting(const ConditionalFormatting &cf);
@@ -97,19 +131,19 @@ class QXLSX_EXPORT Worksheet : public AbstractSheet
     Cell *cellAt(int row, int column) const;
 
     int insertImage(int row, int column, const QImage &image);
-    bool getImage(int imageIndex, QImage& img);
-    bool getImage(int row, int column, QImage& img);
+    bool getImage(int imageIndex, QImage &img);
+    bool getImage(int row, int column, QImage &img);
     uint getImageCount();
 
     Chart *insertChart(int row, int column, const QSize &size);
 
-    bool mergeCells(const CellRange &range, const Format &format=Format());
+    bool mergeCells(const CellRange &range, const Format &format = Format());
     bool unmergeCells(const CellRange &range);
     QList<CellRange> mergedCells() const;
 
-    bool setColumnWidth(const CellRange& range, double width);
-    bool setColumnFormat(const CellRange& range, const Format &format);
-    bool setColumnHidden(const CellRange& range, bool hidden);
+    bool setColumnWidth(const CellRange &range, double width);
+    bool setColumnFormat(const CellRange &range, const Format &format);
+    bool setColumnHidden(const CellRange &range, bool hidden);
     bool setColumnWidth(int colFirst, int colLast, double width);
     bool setColumnFormat(int colFirst, int colLast, const Format &format);
     bool setColumnHidden(int colFirst, int colLast, bool hidden);
@@ -118,9 +152,9 @@ class QXLSX_EXPORT Worksheet : public AbstractSheet
     Format columnFormat(int column);
     bool isColumnHidden(int column);
 
-    bool setRowHeight(int rowFirst,int rowLast, double height);
-    bool setRowFormat(int rowFirst,int rowLast, const Format &format);
-    bool setRowHidden(int rowFirst,int rowLast, bool hidden);
+    bool setRowHeight(int rowFirst, int rowLast, double height);
+    bool setRowFormat(int rowFirst, int rowLast, const Format &format);
+    bool setRowHidden(int rowFirst, int rowLast, bool hidden);
 
     double rowHeight(int row);
     Format rowFormat(int row);
@@ -151,9 +185,9 @@ class QXLSX_EXPORT Worksheet : public AbstractSheet
     void setOutlineSymbolsVisible(bool visible);
     bool isWhiteSpaceVisible() const;
     void setWhiteSpaceVisible(bool visible);
- 	bool setStartPage(int spagen); //add by liufeijin20181028
+    bool setStartPage(int spagen); // add by liufeijin20181028
 
-    QVector<CellLocation> getFullCells(int* maxRow, int* maxCol);
+    QVector<CellLocation> getFullCells(int *maxRow, int *maxCol);
 
 private:
     void saveToXmlFile(QIODevice *device) const override;
diff --git a/QXlsx/header/xlsxworksheet_p.h b/QXlsx/header/xlsxworksheet_p.h
index 1fdd5520..b7210b71 100644
--- a/QXlsx/header/xlsxworksheet_p.h
+++ b/QXlsx/header/xlsxworksheet_p.h
@@ -3,76 +3,78 @@
 #ifndef XLSXWORKSHEET_P_H
 #define XLSXWORKSHEET_P_H
 
-#include <QtGlobal>
-#include <QObject>
-#include <QString>
-#include <QVector>
-#include <QImage>
-#include <QSharedPointer>
-
-#include <QRegularExpression>
-
-#include "xlsxworksheet.h"
 #include "xlsxabstractsheet_p.h"
 #include "xlsxcell.h"
-#include "xlsxdatavalidation.h"
-#include "xlsxconditionalformatting.h"
 #include "xlsxcellformula.h"
+#include "xlsxconditionalformatting.h"
+#include "xlsxdatavalidation.h"
+#include "xlsxworksheet.h"
+
+#include <QImage>
+#include <QObject>
+#include <QRegularExpression>
+#include <QSharedPointer>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
 
 class QXmlStreamWriter;
 class QXmlStreamReader;
 
 QT_BEGIN_NAMESPACE_XLSX
 
-const int XLSX_ROW_MAX = 1048576;
+const int XLSX_ROW_MAX    = 1048576;
 const int XLSX_COLUMN_MAX = 16384;
 const int XLSX_STRING_MAX = 32767;
 
 class SharedStrings;
 
-struct XlsxHyperlinkData
-{
-    enum LinkType
-    {
-        External,
-        Internal
-    };
-
-    XlsxHyperlinkData(LinkType linkType=External, const QString &target=QString(), const QString &location=QString()
-            , const QString &display=QString(), const QString &tip=QString())
-        :linkType(linkType), target(target), location(location), display(display), tooltip(tip)
+struct XlsxHyperlinkData {
+    enum LinkType { External, Internal };
+
+    XlsxHyperlinkData(LinkType linkType       = External,
+                      const QString &target   = QString(),
+                      const QString &location = QString(),
+                      const QString &display  = QString(),
+                      const QString &tip      = QString())
+        : linkType(linkType)
+        , target(target)
+        , location(location)
+        , display(display)
+        , tooltip(tip)
     {
-
     }
 
     LinkType linkType;
-    QString target; //For External link
+    QString target; // For External link
     QString location;
     QString display;
     QString tooltip;
 };
 
 // ECMA-376 Part1 18.3.1.81
-struct XlsxSheetFormatProps
-{
-    XlsxSheetFormatProps(int baseColWidth = 8,
-                         bool customHeight = false,
-                         double defaultColWidth = 8.430f, // https://learn.microsoft.com/en-us/office/troubleshoot/excel/determine-column-widths
-                         double defaultRowHeight = 15,
-                         quint8 outlineLevelCol = 0,
-                         quint8 outlineLevelRow = 0,
-                         bool thickBottom = false,
-                         bool thickTop = false,
-                         bool zeroHeight = false) :
-        baseColWidth(baseColWidth),
-        customHeight(customHeight),
-        defaultColWidth(defaultColWidth),
-        defaultRowHeight(defaultRowHeight),
-        outlineLevelCol(outlineLevelCol),
-        outlineLevelRow(outlineLevelRow),
-        thickBottom(thickBottom),
-        thickTop(thickTop),
-        zeroHeight(zeroHeight) {
+struct XlsxSheetFormatProps {
+    XlsxSheetFormatProps(
+        int baseColWidth  = 8,
+        bool customHeight = false,
+        double defaultColWidth =
+            8.430f, // https://learn.microsoft.com/en-us/office/troubleshoot/excel/determine-column-widths
+        double defaultRowHeight = 15,
+        quint8 outlineLevelCol  = 0,
+        quint8 outlineLevelRow  = 0,
+        bool thickBottom        = false,
+        bool thickTop           = false,
+        bool zeroHeight         = false)
+        : baseColWidth(baseColWidth)
+        , customHeight(customHeight)
+        , defaultColWidth(defaultColWidth)
+        , defaultRowHeight(defaultRowHeight)
+        , outlineLevelCol(outlineLevelCol)
+        , outlineLevelRow(outlineLevelRow)
+        , thickBottom(thickBottom)
+        , thickTop(thickTop)
+        , zeroHeight(zeroHeight)
+    {
     }
 
     int baseColWidth;
@@ -86,13 +88,15 @@ struct XlsxSheetFormatProps
     bool zeroHeight;
 };
 
-struct XlsxRowInfo
-{
-    XlsxRowInfo(double height=0, const Format &format=Format(), bool hidden=false) :
-        customHeight(false), height(height), format(format), hidden(hidden), outlineLevel(0)
-      , collapsed(false)
+struct XlsxRowInfo {
+    XlsxRowInfo(double height = 0, const Format &format = Format(), bool hidden = false)
+        : customHeight(false)
+        , height(height)
+        , format(format)
+        , hidden(hidden)
+        , outlineLevel(0)
+        , collapsed(false)
     {
-
     }
 
     bool customHeight;
@@ -103,25 +107,23 @@ struct XlsxRowInfo
     bool collapsed;
 };
 
-struct XlsxColumnInfo
-{
-    XlsxColumnInfo( int firstColumn, // = 0,
-                    int lastColumn, // = 1,
-                    bool isSetWidth,
-                    double width = 0,
-                    const Format &format = Format(),
-                    bool hidden = false)
-        : width(width),
-          format(format),
-          firstColumn(firstColumn),
-          lastColumn(lastColumn),
-          outlineLevel(0),
-          isSetWidth(isSetWidth),
-          customWidth(false),
-          hidden(hidden),
-          collapsed(false)
+struct XlsxColumnInfo {
+    XlsxColumnInfo(int firstColumn, // = 0,
+                   int lastColumn,  // = 1,
+                   bool isSetWidth,
+                   double width         = 0,
+                   const Format &format = Format(),
+                   bool hidden          = false)
+        : width(width)
+        , format(format)
+        , firstColumn(firstColumn)
+        , lastColumn(lastColumn)
+        , outlineLevel(0)
+        , isSetWidth(isSetWidth)
+        , customWidth(false)
+        , hidden(hidden)
+        , collapsed(false)
     {
-
     }
 
     double width;
@@ -144,7 +146,7 @@ class WorksheetPrivate : public AbstractSheetPrivate
     ~WorksheetPrivate();
 
 public:
-    int checkDimensions(int row, int col, bool ignore_row=false, bool ignore_col=false);
+    int checkDimensions(int row, int col, bool ignore_row = false, bool ignore_col = false);
     Format cellFormat(int row, int col) const;
     QString generateDimensionString() const;
     void calculateSpans() const;
@@ -152,7 +154,10 @@ class WorksheetPrivate : public AbstractSheetPrivate
     void validateDimension();
 
     void saveXmlSheetData(QXmlStreamWriter &writer) const;
-    void saveXmlCellData(QXmlStreamWriter &writer, int row, int col, std::shared_ptr<Cell> cell) const;
+    void saveXmlCellData(QXmlStreamWriter &writer,
+                         int row,
+                         int col,
+                         std::shared_ptr<Cell> cell) const;
     void saveXmlMergeCells(QXmlStreamWriter &writer) const;
     void saveXmlHyperlinks(QXmlStreamWriter &writer) const;
     void saveXmlDrawings(QXmlStreamWriter &writer) const;
@@ -169,22 +174,22 @@ class WorksheetPrivate : public AbstractSheetPrivate
     void loadXmlSheetViews(QXmlStreamReader &reader);
     void loadXmlHyperlinks(QXmlStreamReader &reader);
 
-    QList<QSharedPointer<XlsxRowInfo> > getRowInfoList(int rowFirst, int rowLast);
-    QList<QSharedPointer<XlsxColumnInfo> > getColumnInfoList(int colFirst, int colLast);
+    QList<QSharedPointer<XlsxRowInfo>> getRowInfoList(int rowFirst, int rowLast);
+    QList<QSharedPointer<XlsxColumnInfo>> getColumnInfoList(int colFirst, int colLast);
     QList<int> getColumnIndexes(int colFirst, int colLast);
     bool isColumnRangeValid(int colFirst, int colLast);
 
     SharedStrings *sharedStrings() const;
 
 public:
-    QMap<int, QMap<int, std::shared_ptr<Cell> > > cellTable;
+    QMap<int, QMap<int, std::shared_ptr<Cell>>> cellTable;
 
-    QMap<int, QMap<int, QString> > comments;
-    QMap<int, QMap<int, QSharedPointer<XlsxHyperlinkData> > > urlTable;
+    QMap<int, QMap<int, QString>> comments;
+    QMap<int, QMap<int, QSharedPointer<XlsxHyperlinkData>>> urlTable;
     QList<CellRange> merges;
-    QMap<int, QSharedPointer<XlsxRowInfo> > rowsInfo;
-    QMap<int, QSharedPointer<XlsxColumnInfo> > colsInfo;
-    QMap<int, QSharedPointer<XlsxColumnInfo> > colsInfoHelper;
+    QMap<int, QSharedPointer<XlsxRowInfo>> rowsInfo;
+    QMap<int, QSharedPointer<XlsxColumnInfo>> colsInfo;
+    QMap<int, QSharedPointer<XlsxColumnInfo>> colsInfoHelper;
 
     QList<DataValidation> dataValidationsList;
     QList<ConditionalFormatting> conditionalFormattingList;
@@ -226,7 +231,7 @@ class WorksheetPrivate : public AbstractSheetPrivate
     // header footer, liufeijin
     QString MoodFooter;
     QString ModdHeader;
-    QString MoodalignWithMargins;  // add align 20190619
+    QString MoodalignWithMargins; // add align 20190619
 
     XlsxSheetFormatProps sheetFormatProps;
 
@@ -244,7 +249,6 @@ class WorksheetPrivate : public AbstractSheetPrivate
     QRegularExpression urlPattern;
 
 private:
-
     static double calculateColWidth(int characters);
 };
 
diff --git a/QXlsx/header/xlsxzipreader_p.h b/QXlsx/header/xlsxzipreader_p.h
index 0a18cbc9..e2c965f6 100644
--- a/QXlsx/header/xlsxzipreader_p.h
+++ b/QXlsx/header/xlsxzipreader_p.h
@@ -3,19 +3,18 @@
 #ifndef QXLSX_XLSXZIPREADER_P_H
 #define QXLSX_XLSXZIPREADER_P_H
 
-#include <QScopedPointer>
-#include <QStringList>
-#include <QIODevice>
-
 #include "xlsxglobal.h"
 
+#include <QIODevice>
+#include <QScopedPointer>
+#include <QStringList>
 #include <QVector>
 
 class QZipReader;
 
 QT_BEGIN_NAMESPACE_XLSX
 
-class  ZipReader
+class ZipReader
 {
 public:
     explicit ZipReader(const QString &fileName);
diff --git a/QXlsx/header/xlsxzipwriter_p.h b/QXlsx/header/xlsxzipwriter_p.h
index 52ae63cb..799e77c6 100644
--- a/QXlsx/header/xlsxzipwriter_p.h
+++ b/QXlsx/header/xlsxzipwriter_p.h
@@ -3,12 +3,12 @@
 #ifndef QXLSX_ZIPWRITER_H
 #define QXLSX_ZIPWRITER_H
 
-#include <QtGlobal>
-#include <QString>
-#include <QIODevice>
-
 #include "xlsxglobal.h"
 
+#include <QIODevice>
+#include <QString>
+#include <QtGlobal>
+
 class QZipWriter;
 
 QT_BEGIN_NAMESPACE_XLSX
diff --git a/QXlsx/source/xlsxabstractooxmlfile.cpp b/QXlsx/source/xlsxabstractooxmlfile.cpp
index e94a721a..47025926 100644
--- a/QXlsx/source/xlsxabstractooxmlfile.cpp
+++ b/QXlsx/source/xlsxabstractooxmlfile.cpp
@@ -1,24 +1,28 @@
 // xlsxabstractooxmlfile.cpp
 
-#include <QtGlobal>
-#include <QBuffer>
-#include <QByteArray>
-
 #include "xlsxabstractooxmlfile.h"
+
 #include "xlsxabstractooxmlfile_p.h"
 
+#include <QBuffer>
+#include <QByteArray>
+#include <QtGlobal>
+
 QT_BEGIN_NAMESPACE_XLSX
 
-AbstractOOXmlFilePrivate::AbstractOOXmlFilePrivate(AbstractOOXmlFile *q, AbstractOOXmlFile::CreateFlag flag=AbstractOOXmlFile::F_NewFromScratch)
-    : relationships(new Relationships), flag(flag), q_ptr(q)
+AbstractOOXmlFilePrivate::AbstractOOXmlFilePrivate(
+    AbstractOOXmlFile *q,
+    AbstractOOXmlFile::CreateFlag flag = AbstractOOXmlFile::F_NewFromScratch)
+    : relationships(new Relationships)
+    , flag(flag)
+    , q_ptr(q)
 {
-
 }
 
 AbstractOOXmlFilePrivate::~AbstractOOXmlFilePrivate()
 {
     if (relationships) {
-          delete relationships;
+        delete relationships;
     }
 }
 
@@ -31,14 +35,13 @@ AbstractOOXmlFilePrivate::~AbstractOOXmlFilePrivate()
  */
 
 AbstractOOXmlFile::AbstractOOXmlFile(CreateFlag flag)
-    :d_ptr(new AbstractOOXmlFilePrivate(this, flag))
+    : d_ptr(new AbstractOOXmlFilePrivate(this, flag))
 {
 }
 
 AbstractOOXmlFile::AbstractOOXmlFile(AbstractOOXmlFilePrivate *d)
-    :d_ptr(d)
+    : d_ptr(d)
 {
-
 }
 
 AbstractOOXmlFile::~AbstractOOXmlFile()
@@ -83,7 +86,6 @@ QString AbstractOOXmlFile::filePath() const
     return d->filePathInPackage;
 }
 
-
 /*!
  * \internal
  */
@@ -93,5 +95,4 @@ Relationships *AbstractOOXmlFile::relationships() const
     return d->relationships;
 }
 
-
 QT_END_NAMESPACE_XLSX
diff --git a/QXlsx/source/xlsxabstractsheet.cpp b/QXlsx/source/xlsxabstractsheet.cpp
index 88f4db4c..69a4f5e8 100644
--- a/QXlsx/source/xlsxabstractsheet.cpp
+++ b/QXlsx/source/xlsxabstractsheet.cpp
@@ -1,23 +1,22 @@
 // xlsxabstractsheet.cpp
 
-#include <QtGlobal>
-
 #include "xlsxabstractsheet.h"
+
 #include "xlsxabstractsheet_p.h"
 #include "xlsxworkbook.h"
 
+#include <QtGlobal>
+
 QT_BEGIN_NAMESPACE_XLSX
 
 AbstractSheetPrivate::AbstractSheetPrivate(AbstractSheet *p, AbstractSheet::CreateFlag flag)
     : AbstractOOXmlFilePrivate(p, flag)
 {
-    type = AbstractSheet::ST_WorkSheet;
+    type       = AbstractSheet::ST_WorkSheet;
     sheetState = AbstractSheet::SS_Visible;
 }
 
-AbstractSheetPrivate::~AbstractSheetPrivate()
-{
-}
+AbstractSheetPrivate::~AbstractSheetPrivate() {}
 
 /*!
   \class AbstractSheet
@@ -52,15 +51,17 @@ AbstractSheetPrivate::~AbstractSheetPrivate()
 /*!
  * \internal
  */
-AbstractSheet::AbstractSheet(const QString &name, int id, Workbook *workbook, AbstractSheetPrivate *d) :
-    AbstractOOXmlFile(d)
-{
-    d_func()->name = name;
-    d_func()->id = id;
+AbstractSheet::AbstractSheet(const QString &name,
+                             int id,
+                             Workbook *workbook,
+                             AbstractSheetPrivate *d)
+    : AbstractOOXmlFile(d)
+{
+    d_func()->name     = name;
+    d_func()->id       = id;
     d_func()->workbook = workbook;
 }
 
-
 /*!
  * Returns the name of the sheet.
  */
diff --git a/QXlsx/source/xlsxcell.cpp b/QXlsx/source/xlsxcell.cpp
index f3fe4b61..7a0e49bc 100644
--- a/QXlsx/source/xlsxcell.cpp
+++ b/QXlsx/source/xlsxcell.cpp
@@ -1,30 +1,30 @@
 // xlsxcell.cpp
 
-#include <cmath>
-
-#include <QtGlobal>
-#include <QDebug>
-#include <QDateTime>
-#include <QDate>
-#include <QTime>
-
 #include "xlsxcell.h"
+
 #include "xlsxcell_p.h"
 #include "xlsxformat.h"
 #include "xlsxformat_p.h"
 #include "xlsxutility_p.h"
-#include "xlsxworksheet.h"
 #include "xlsxworkbook.h"
+#include "xlsxworksheet.h"
+
+#include <cmath>
+
+#include <QDate>
+#include <QDateTime>
+#include <QDebug>
+#include <QTime>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
-CellPrivate::CellPrivate(Cell *p) :
-	q_ptr(p)
+CellPrivate::CellPrivate(Cell *p)
+    : q_ptr(p)
 {
-
 }
 
-CellPrivate::CellPrivate(const CellPrivate * const cp)
+CellPrivate::CellPrivate(const CellPrivate *const cp)
     : parent(cp->parent)
     , cellType(cp->cellType)
     , value(cp->value)
@@ -33,7 +33,6 @@ CellPrivate::CellPrivate(const CellPrivate * const cp)
     , richString(cp->richString)
     , styleNumber(cp->styleNumber)
 {
-
 }
 
 /*!
@@ -58,27 +57,27 @@ CellPrivate::CellPrivate(const CellPrivate * const cp)
  * Created by Worksheet only.
  */
 // qint32 styleIndex = (-1)
-Cell::Cell(const QVariant &data, 
-	CellType type, 
-	const Format &format, 
-	Worksheet *parent,
-	qint32 styleIndex ) :
-	d_ptr(new CellPrivate(this))
+Cell::Cell(const QVariant &data,
+           CellType type,
+           const Format &format,
+           Worksheet *parent,
+           qint32 styleIndex)
+    : d_ptr(new CellPrivate(this))
 {
-	d_ptr->value = data;
-	d_ptr->cellType = type;
-	d_ptr->format = format;
-	d_ptr->parent = parent;
-	d_ptr->styleNumber = styleIndex; 
+    d_ptr->value       = data;
+    d_ptr->cellType    = type;
+    d_ptr->format      = format;
+    d_ptr->parent      = parent;
+    d_ptr->styleNumber = styleIndex;
 }
 
 /*!
  * \internal
  */
-Cell::Cell(const Cell * const cell):
-	d_ptr(new CellPrivate(cell->d_ptr))
+Cell::Cell(const Cell *const cell)
+    : d_ptr(new CellPrivate(cell->d_ptr))
 {
-	d_ptr->q_ptr = this;
+    d_ptr->q_ptr = this;
 }
 
 /*!
@@ -86,8 +85,8 @@ Cell::Cell(const Cell * const cell):
  */
 Cell::~Cell()
 {
-	if ( NULL != d_ptr )
-		delete d_ptr;
+    if (NULL != d_ptr)
+        delete d_ptr;
 }
 
 /*!
@@ -95,9 +94,9 @@ Cell::~Cell()
  */
 Cell::CellType Cell::cellType() const
 {
-	Q_D(const Cell);
+    Q_D(const Cell);
 
-	return d->cellType;
+    return d->cellType;
 }
 
 /*!
@@ -105,72 +104,56 @@ Cell::CellType Cell::cellType() const
  */
 QVariant Cell::value() const
 {
-	Q_D(const Cell); 
+    Q_D(const Cell);
 
-	return d->value; 
+    return d->value;
 }
 
 /*!
-* Return the data content of this Cell for reading 
-*/
+ * Return the data content of this Cell for reading
+ */
 QVariant Cell::readValue() const
 {
-	Q_D(const Cell);
+    Q_D(const Cell);
 
-	QVariant ret; // return value 
-	ret = d->value;
+    QVariant ret; // return value
+    ret = d->value;
 
-	Format fmt = this->format();
+    Format fmt = this->format();
 
-	if (isDateTime())
-	{
+    if (isDateTime()) {
         QVariant vDT = dateTime();
-        if ( vDT.isNull() )
-        {
+        if (vDT.isNull()) {
             return QVariant();
         }
 
-        // https://github.com/QtExcel/QXlsx/issues/171
-        // https://www.qt.io/blog/whats-new-in-qmetatype-qvariant
-        #if QT_VERSION >= 0x060000 // Qt 6.0 or over
-                if ( vDT.metaType().id() == QMetaType::QDateTime )
-                {
-                    ret = vDT;
-                }
-                else if ( vDT.metaType().id() == QMetaType::QDate )
-                {
-                    ret = vDT;
-                }
-                else if ( vDT.metaType().id() == QMetaType::QTime )
-                {
-                    ret = vDT;
-                }
-                else
-                {
-                    return QVariant();
-                }
-        #else
-                if ( vDT.type() == QVariant::DateTime )
-                {
-                    ret = vDT;
-                }
-                else if ( vDT.type() == QVariant::Date )
-                {
-                    ret = vDT;
-                }
-                else if ( vDT.type() == QVariant::Time )
-                {
-                    ret = vDT;
-                }
-                else
-                {
-                    return QVariant();
-                }
-        #endif
+// https://github.com/QtExcel/QXlsx/issues/171
+// https://www.qt.io/blog/whats-new-in-qmetatype-qvariant
+#if QT_VERSION >= 0x060000 // Qt 6.0 or over
+        if (vDT.metaType().id() == QMetaType::QDateTime) {
+            ret = vDT;
+        } else if (vDT.metaType().id() == QMetaType::QDate) {
+            ret = vDT;
+        } else if (vDT.metaType().id() == QMetaType::QTime) {
+            ret = vDT;
+        } else {
+            return QVariant();
+        }
+#else
+        if (vDT.type() == QVariant::DateTime) {
+            ret = vDT;
+        } else if (vDT.type() == QVariant::Date) {
+            ret = vDT;
+        } else if (vDT.type() == QVariant::Time) {
+            ret = vDT;
+        } else {
+            return QVariant();
+        }
+#endif
 
         // QDateTime dt = dateTime();
         // ret = dt;
-		
+
         // QString strFormat = fmt.numberFormat();
         // if (!strFormat.isEmpty())
         // {
@@ -185,9 +168,9 @@ QVariant Cell::readValue() const
 
         // if (styleNo == 11)
         // {
-			// QTime timeValue = dt.time(); // only time. (HH:mm:ss) 
-			// ret = timeValue;
-			// return ret;
+        // QTime timeValue = dt.time(); // only time. (HH:mm:ss)
+        // ret = timeValue;
+        // return ret;
         // }
 
         // if (styleNo == 12)
@@ -196,42 +179,41 @@ QVariant Cell::readValue() const
 
         // if (styleNo == 13) // (HH:mm:ss)
         // {
-            // double dValue = d->value.toDouble();
-            // int day = int(dValue); // unit is day.
-            // double deciamlPointValue1 = dValue - double(day);
+        // double dValue = d->value.toDouble();
+        // int day = int(dValue); // unit is day.
+        // double deciamlPointValue1 = dValue - double(day);
+
+        // double dHour = deciamlPointValue1 * (double(1.0) / double(24.0));
+        // int hour = int(dHour);
 
-            // double dHour = deciamlPointValue1 * (double(1.0) / double(24.0));
-            // int hour = int(dHour);
+        // double deciamlPointValue2 = deciamlPointValue1 - (double(hour) * (double(1.0) /
+        // double(24.0))); double dMin = deciamlPointValue2 * (double(1.0) / double(60.0)); int min
+        // = int(dMin);
 
-            // double deciamlPointValue2 = deciamlPointValue1 - (double(hour) * (double(1.0) / double(24.0)));
-            // double dMin = deciamlPointValue2 * (double(1.0) / double(60.0));
-            // int min = int(dMin);
+        // double deciamlPointValue3 = deciamlPointValue2 - (double(min) * (double(1.0) /
+        // double(60.0))); double dSec = deciamlPointValue3 * (double(1.0) / double(60.0)); int sec
+        // = int(dSec);
 
-            // double deciamlPointValue3 = deciamlPointValue2 - (double(min) * (double(1.0) / double(60.0)));
-            // double dSec = deciamlPointValue3 * (double(1.0) / double(60.0));
-            // int sec = int(dSec);
-	
-            // int totalHour = hour + (day * 24);
+        // int totalHour = hour + (day * 24);
 
-            // QString strTime;
-            // strTime = QString("%1:%2:%3").arg(totalHour).arg(min).arg(sec);
-            // ret = strTime;
+        // QString strTime;
+        // strTime = QString("%1:%2:%3").arg(totalHour).arg(min).arg(sec);
+        // ret = strTime;
 
-            // return ret;
+        // return ret;
         // }
 
         // return ret;
         // */
-	}
+    }
 
-	if (hasFormula())
-	{
-		QString formulaString = this->formula().formulaText();
-		ret = formulaString;
-		return ret; // return formula string 
-	}
+    if (hasFormula()) {
+        QString formulaString = this->formula().formulaText();
+        ret                   = formulaString;
+        return ret; // return formula string
+    }
 
-	return ret;
+    return ret;
 }
 
 /*!
@@ -239,9 +221,9 @@ QVariant Cell::readValue() const
  */
 Format Cell::format() const
 {
-	Q_D(const Cell);
+    Q_D(const Cell);
 
-	return d->format;
+    return d->format;
 }
 
 /*!
@@ -249,9 +231,9 @@ Format Cell::format() const
  */
 bool Cell::hasFormula() const
 {
-	Q_D(const Cell);
+    Q_D(const Cell);
 
-	return d->formula.isValid();
+    return d->formula.isValid();
 }
 
 /*!
@@ -259,9 +241,9 @@ bool Cell::hasFormula() const
  */
 CellFormula Cell::formula() const
 {
-	Q_D(const Cell);
+    Q_D(const Cell);
 
-	return d->formula;
+    return d->formula;
 }
 
 /*!
@@ -269,28 +251,22 @@ CellFormula Cell::formula() const
  */
 bool Cell::isDateTime() const
 {
-	Q_D(const Cell);
+    Q_D(const Cell);
 
-	Cell::CellType cellType = d->cellType;
-    double dValue = d->value.toDouble(); // number
-//	QString strValue = d->value.toString().toUtf8();
-	bool isValidFormat = d->format.isValid();
+    Cell::CellType cellType = d->cellType;
+    double dValue           = d->value.toDouble(); // number
+    //	QString strValue = d->value.toString().toUtf8();
+    bool isValidFormat    = d->format.isValid();
     bool isDateTimeFormat = d->format.isDateTimeFormat(); // datetime format
 
     // dev67
-    if ( cellType == NumberType ||
-         cellType == DateType ||
-         cellType == CustomType )
-    {
-        if ( dValue >= 0 &&
-             isValidFormat &&
-             isDateTimeFormat )
-        {
+    if (cellType == NumberType || cellType == DateType || cellType == CustomType) {
+        if (dValue >= 0 && isValidFormat && isDateTimeFormat) {
             return true;
         }
     }
 
-	return false;
+    return false;
 }
 
 /*!
@@ -299,29 +275,28 @@ bool Cell::isDateTime() const
 /*
 QDateTime Cell::dateTime() const
 {
-	Q_D(const Cell);
+        Q_D(const Cell);
 
-	if (!isDateTime())
-		return QDateTime();
+        if (!isDateTime())
+                return QDateTime();
 
-	return datetimeFromNumber(d->value.toDouble(), d->parent->workbook()->isDate1904());
+        return datetimeFromNumber(d->value.toDouble(), d->parent->workbook()->isDate1904());
 }
 */
 QVariant Cell::dateTime() const
 {
     Q_D(const Cell);
 
-    if (!isDateTime())
-    {
+    if (!isDateTime()) {
         return QVariant();
     }
 
     // dev57
 
     QVariant ret;
-    double dValue = d->value.toDouble();
+    double dValue   = d->value.toDouble();
     bool isDate1904 = d->parent->workbook()->isDate1904();
-    ret = datetimeFromNumber(dValue, isDate1904);
+    ret             = datetimeFromNumber(dValue, isDate1904);
     return ret;
 }
 
@@ -330,35 +305,30 @@ QVariant Cell::dateTime() const
  */
 bool Cell::isRichString() const
 {
-	Q_D(const Cell);
+    Q_D(const Cell);
 
-    if ( d->cellType != SharedStringType &&
-            d->cellType != InlineStringType &&
-            d->cellType != StringType )
-    {
-		return false;
+    if (d->cellType != SharedStringType && d->cellType != InlineStringType &&
+        d->cellType != StringType) {
+        return false;
     }
 
-	return d->richString.isRichString();
+    return d->richString.isRichString();
 }
 
-qint32 Cell::styleNumber() const 
+qint32 Cell::styleNumber() const
 {
-	Q_D(const Cell);
+    Q_D(const Cell);
 
-	qint32 ret = d->styleNumber;
-	return ret; 
+    qint32 ret = d->styleNumber;
+    return ret;
 }
 
 bool Cell::isDateType(CellType cellType, const Format &format)
 {
-    if ( cellType == NumberType ||
-         cellType == DateType ||
-         cellType == CustomType )
-    {
+    if (cellType == NumberType || cellType == DateType || cellType == CustomType) {
         return format.isValid() && format.isDateTimeFormat();
     }
-	return false;
+    return false;
 }
 
 QT_END_NAMESPACE_XLSX
diff --git a/QXlsx/source/xlsxcellformula.cpp b/QXlsx/source/xlsxcellformula.cpp
index 4b1e2b59..5ac5c9bb 100644
--- a/QXlsx/source/xlsxcellformula.cpp
+++ b/QXlsx/source/xlsxcellformula.cpp
@@ -1,40 +1,46 @@
 // xlsxcellformula.cpp
 
-#include <QtGlobal>
+#include "xlsxcellformula.h"
+
+#include "xlsxcellformula_p.h"
+#include "xlsxutility_p.h"
+
+#include <QDebug>
 #include <QObject>
 #include <QString>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QDebug>
-
-#include "xlsxcellformula.h"
-#include "xlsxcellformula_p.h"
-#include "xlsxutility_p.h"
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
-CellFormulaPrivate::CellFormulaPrivate(const QString &formula_, const CellRange &ref_, CellFormula::FormulaType type_)
-    :formula(formula_), type(type_), reference(ref_), ca(false), si(0)
+CellFormulaPrivate::CellFormulaPrivate(const QString &formula_,
+                                       const CellRange &ref_,
+                                       CellFormula::FormulaType type_)
+    : formula(formula_)
+    , type(type_)
+    , reference(ref_)
+    , ca(false)
+    , si(0)
 {
-    //Remove the formula '=' sign if exists
+    // Remove the formula '=' sign if exists
     if (formula.startsWith(QLatin1String("=")))
-        formula.remove(0,1);
+        formula.remove(0, 1);
     else if (formula.startsWith(QLatin1String("{=")) && formula.endsWith(QLatin1String("}")))
-        formula = formula.mid(2, formula.length()-3);
+        formula = formula.mid(2, formula.length() - 3);
 }
 
 CellFormulaPrivate::CellFormulaPrivate(const CellFormulaPrivate &other)
     : QSharedData(other)
-    , formula(other.formula), type(other.type), reference(other.reference)
-    , ca(other.ca), si(other.si)
+    , formula(other.formula)
+    , type(other.type)
+    , reference(other.reference)
+    , ca(other.ca)
+    , si(other.si)
 {
-
 }
 
-CellFormulaPrivate::~CellFormulaPrivate()
-{
-
-}
+CellFormulaPrivate::~CellFormulaPrivate() {}
 
 /*!
   \class CellFormula
@@ -56,41 +62,38 @@ CellFormulaPrivate::~CellFormulaPrivate()
  */
 CellFormula::CellFormula()
 {
-    //The d pointer is initialized with a null pointer
+    // The d pointer is initialized with a null pointer
 }
 
 /*!
  *  Creates a new formula with the given \a formula and \a type.
  */
 CellFormula::CellFormula(const char *formula, FormulaType type)
-    :d(new CellFormulaPrivate(QString::fromLatin1(formula), CellRange(), type))
+    : d(new CellFormulaPrivate(QString::fromLatin1(formula), CellRange(), type))
 {
-
 }
 
 /*!
  *  Creates a new formula with the given \a formula and \a type.
  */
 CellFormula::CellFormula(const QString &formula, FormulaType type)
-    :d(new CellFormulaPrivate(formula, CellRange(), type))
+    : d(new CellFormulaPrivate(formula, CellRange(), type))
 {
-
 }
 
 /*!
  *  Creates a new formula with the given \a formula, \a ref and \a type.
  */
 CellFormula::CellFormula(const QString &formula, const CellRange &ref, FormulaType type)
-    :d(new CellFormulaPrivate(formula, ref, type))
+    : d(new CellFormulaPrivate(formula, ref, type))
 {
-
 }
 
 /*!
    Creates a new formula with the same attributes as the \a other formula.
  */
 CellFormula::CellFormula(const CellFormula &other)
-    :d(other.d)
+    : d(other.d)
 {
 }
 
@@ -98,7 +101,7 @@ CellFormula::CellFormula(const CellFormula &other)
    Assigns the \a other formula to this formula, and returns a
    reference to this formula.
  */
-CellFormula &CellFormula::operator =(const CellFormula &other)
+CellFormula &CellFormula::operator=(const CellFormula &other)
 {
     d = other.d;
     return *this;
@@ -107,10 +110,7 @@ CellFormula &CellFormula::operator =(const CellFormula &other)
 /*!
  * Destroys this formula.
  */
-CellFormula::~CellFormula()
-{
-
-}
+CellFormula::~CellFormula() {}
 
 /*!
  * Returns the type of the formula.
@@ -187,7 +187,7 @@ int CellFormula::sharedIndex() const
  *
  * The possible values for this attribute are defined by the W3C XML Schema
  * boolean datatype.
-*/
+ */
 
 /* del2 (Input 2 Deleted) // not-impplmented attribute
  *
@@ -257,8 +257,7 @@ bool CellFormula::saveToXml(QXmlStreamWriter &writer) const
     // shared (Shared Formula)
 
     QString t;
-    switch (d->type)
-    {
+    switch (d->type) {
     case CellFormula::ArrayType:
         t = QStringLiteral("array");
         break;
@@ -282,8 +281,7 @@ bool CellFormula::saveToXml(QXmlStreamWriter &writer) const
     // character node of this element.
     writer.writeStartElement(QStringLiteral("f"));
 
-    if (!t.isEmpty())
-    {
+    if (!t.isEmpty()) {
         writer.writeAttribute(QStringLiteral("t"), t); // write type(t)
     }
 
@@ -297,12 +295,9 @@ bool CellFormula::saveToXml(QXmlStreamWriter &writer) const
     // The possible values for this attribute are defined by the ST_Ref
     // simple type (§18.18.62).
 
-    if ( d->type == CellFormula::SharedType ||
-         d->type == CellFormula::ArrayType ||
-         d->type == CellFormula::DataTableType )
-    {
-        if (d->reference.isValid())
-        {
+    if (d->type == CellFormula::SharedType || d->type == CellFormula::ArrayType ||
+        d->type == CellFormula::DataTableType) {
+        if (d->reference.isValid()) {
             writer.writeAttribute(QStringLiteral("ref"), d->reference.toString());
         }
     }
@@ -320,8 +315,7 @@ bool CellFormula::saveToXml(QXmlStreamWriter &writer) const
     // An instance of a datatype that is defined as ·boolean· can have the
     // following legal literals {true, false, 1, 0}.
 
-    if (d->ca)
-    {
+    if (d->ca) {
         writer.writeAttribute(QStringLiteral("ca"), QStringLiteral("1"));
     }
 
@@ -337,14 +331,12 @@ bool CellFormula::saveToXml(QXmlStreamWriter &writer) const
     // what the formula expression should be based on the cell's relative
     // location to the master formula cell.
 
-    if (d->type == CellFormula::SharedType)
-    {
+    if (d->type == CellFormula::SharedType) {
         int si = d->si;
         writer.writeAttribute(QStringLiteral("si"), QString::number(si));
     }
 
-    if (!d->formula.isEmpty())
-    {
+    if (!d->formula.isEmpty()) {
         QString strFormula = d->formula;
         writer.writeCharacters(strFormula); // write formula
     }
@@ -365,23 +357,19 @@ bool CellFormula::loadFromXml(QXmlStreamReader &reader)
         d = new CellFormulaPrivate(QString(), CellRange(), NormalType);
 
     QXmlStreamAttributes attributes = reader.attributes();
-    QString typeString = attributes.value(QLatin1String("t")).toString();
+    QString typeString              = attributes.value(QLatin1String("t")).toString();
 
     // branch: shared-formula
     //
     if (typeString == QLatin1String("array")) {
         d->type = ArrayType;
-    }
-    else if (typeString == QLatin1String("shared")) {
+    } else if (typeString == QLatin1String("shared")) {
         d->type = SharedType;
-    }
-    else if (typeString == QLatin1String("normal")) {
+    } else if (typeString == QLatin1String("normal")) {
         d->type = NormalType;
-    }
-    else if (typeString == QLatin1String("dataTable")) {
+    } else if (typeString == QLatin1String("dataTable")) {
         d->type = DataTableType;
-    }
-    else {
+    } else {
         /*
         // undefined type
         // qDebug() << "Undefined type" << typeString;
@@ -399,14 +387,11 @@ bool CellFormula::loadFromXml(QXmlStreamReader &reader)
     // ref (Range of Cells)
     // Range of cells which the formula applies to.
     // Only required for shared formula, array formula or data table.
-    if ( d->type == CellFormula::SharedType ||
-         d->type == CellFormula::ArrayType ||
-         d->type == CellFormula::DataTableType )
-    {
-        if (attributes.hasAttribute(QLatin1String("ref")))
-        {
+    if (d->type == CellFormula::SharedType || d->type == CellFormula::ArrayType ||
+        d->type == CellFormula::DataTableType) {
+        if (attributes.hasAttribute(QLatin1String("ref"))) {
             QString refString = attributes.value(QLatin1String("ref")).toString();
-            d->reference = CellRange(refString);
+            d->reference      = CellRange(refString);
         }
     }
 
@@ -416,13 +401,11 @@ bool CellFormula::loadFromXml(QXmlStreamReader &reader)
     // Optional attribute to optimize load performance by sharing formulas.
     // When a formula is a shared formula (t value is shared) then this value
     // indicates the group to which this particular cell's formula belongs.
-    if ( d->type == CellFormula::SharedType )
-    {
+    if (d->type == CellFormula::SharedType) {
         QString ca = attributes.value(QLatin1String("si")).toString();
-        d->ca = parseXsdBoolean(ca, false);
+        d->ca      = parseXsdBoolean(ca, false);
 
-        if (attributes.hasAttribute(QLatin1String("si")))
-        {
+        if (attributes.hasAttribute(QLatin1String("si"))) {
             d->si = attributes.value(QLatin1String("si")).toInt();
         }
     }
@@ -435,19 +418,17 @@ bool CellFormula::loadFromXml(QXmlStreamReader &reader)
 /*!
  * \internal
  */
-bool CellFormula::operator ==(const CellFormula &formula) const
+bool CellFormula::operator==(const CellFormula &formula) const
 {
-    return d->formula == formula.d->formula && d->type == formula.d->type
-            && d->si ==formula.d->si;
+    return d->formula == formula.d->formula && d->type == formula.d->type && d->si == formula.d->si;
 }
 
 /*!
  * \internal
  */
-bool CellFormula::operator !=(const CellFormula &formula) const
+bool CellFormula::operator!=(const CellFormula &formula) const
 {
-    return d->formula != formula.d->formula || d->type != formula.d->type
-            || d->si !=formula.d->si;
+    return d->formula != formula.d->formula || d->type != formula.d->type || d->si != formula.d->si;
 }
 
 QT_END_NAMESPACE_XLSX
diff --git a/QXlsx/source/xlsxcelllocation.cpp b/QXlsx/source/xlsxcelllocation.cpp
index c6342fdc..543c7347 100644
--- a/QXlsx/source/xlsxcelllocation.cpp
+++ b/QXlsx/source/xlsxcelllocation.cpp
@@ -1,14 +1,15 @@
 // xlsxcelllocation.cpp
 
-#include <QtGlobal>
+#include "xlsxcelllocation.h"
+
+#include "xlsxcell.h"
+#include "xlsxglobal.h"
+
+#include <QList>
 #include <QObject>
 #include <QString>
 #include <QVector>
-#include <QList>
-
-#include "xlsxglobal.h"
-#include "xlsxcell.h"
-#include "xlsxcelllocation.h"
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
diff --git a/QXlsx/source/xlsxcellrange.cpp b/QXlsx/source/xlsxcellrange.cpp
index 5f544838..63e7b581 100644
--- a/QXlsx/source/xlsxcellrange.cpp
+++ b/QXlsx/source/xlsxcellrange.cpp
@@ -1,13 +1,14 @@
 // xlsxcellrange.cpp
 
-#include <QtGlobal>
-#include <QString>
-#include <QPoint>
-#include <QStringList>
-
 #include "xlsxcellrange.h"
+
 #include "xlsxcellreference.h"
 
+#include <QPoint>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+
 QT_BEGIN_NAMESPACE_XLSX
 
 /*!
@@ -24,7 +25,10 @@ QT_BEGIN_NAMESPACE_XLSX
     whose rowCount() and columnCount() are 0.
 */
 CellRange::CellRange()
-    : top(-1), left(-1), bottom(-2), right(-2)
+    : top(-1)
+    , left(-1)
+    , bottom(-2)
+    , right(-2)
 {
 }
 
@@ -35,13 +39,18 @@ CellRange::CellRange()
     \sa topRow(), leftColumn(), bottomRow(), rightColumn()
 */
 CellRange::CellRange(int top, int left, int bottom, int right)
-    : top(top), left(left), bottom(bottom), right(right)
+    : top(top)
+    , left(left)
+    , bottom(bottom)
+    , right(right)
 {
 }
 
 CellRange::CellRange(const CellReference &topLeft, const CellReference &bottomRight)
-    : top(topLeft.row()), left(topLeft.column())
-    , bottom(bottomRight.row()), right(bottomRight.column())
+    : top(topLeft.row())
+    , left(topLeft.column())
+    , bottom(bottomRight.row())
+    , right(bottomRight.column())
 {
 }
 
@@ -69,16 +78,16 @@ void CellRange::init(const QString &range)
     if (rs.size() == 2) {
         CellReference start(rs[0]);
         CellReference end(rs[1]);
-        top = start.row();
-        left = start.column();
+        top    = start.row();
+        left   = start.column();
         bottom = end.row();
-        right = end.column();
+        right  = end.column();
     } else {
         CellReference p(rs[0]);
-        top = p.row();
-        left = p.column();
+        top    = p.row();
+        left   = p.column();
         bottom = p.row();
-        right = p.column();
+        right  = p.column();
     }
 }
 
@@ -87,16 +96,17 @@ void CellRange::init(const QString &range)
     other range.
 */
 CellRange::CellRange(const CellRange &other)
-    : top(other.top), left(other.left), bottom(other.bottom), right(other.right)
+    : top(other.top)
+    , left(other.left)
+    , bottom(other.bottom)
+    , right(other.right)
 {
 }
 
 /*!
     Destroys the range.
 */
-CellRange::~CellRange()
-{
-}
+CellRange::~CellRange() {}
 
 /*!
      Convert the range to string notation, such as "A1:B5".
@@ -107,7 +117,7 @@ QString CellRange::toString(bool row_abs, bool col_abs) const
         return QString();
 
     if (left == right && top == bottom) {
-        //Single cell
+        // Single cell
         return CellReference(top, left).toString(row_abs, col_abs);
     }
 
diff --git a/QXlsx/source/xlsxcellreference.cpp b/QXlsx/source/xlsxcellreference.cpp
index dc28b724..173b2f53 100644
--- a/QXlsx/source/xlsxcellreference.cpp
+++ b/QXlsx/source/xlsxcellreference.cpp
@@ -1,10 +1,10 @@
 // xlsxcellreference.cpp
 
 #include "xlsxcellreference.h"
-#include <QStringList>
-#include <QMap>
 
+#include <QMap>
 #include <QRegularExpression>
+#include <QStringList>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -12,12 +12,16 @@ namespace {
 
 int intPow(int x, int p)
 {
-  if (p == 0) return 1;
-  if (p == 1) return x;
-
-  int tmp = intPow(x, p/2);
-  if (p%2 == 0) return tmp * tmp;
-  else return x * tmp * tmp;
+    if (p == 0)
+        return 1;
+    if (p == 1)
+        return x;
+
+    int tmp = intPow(x, p / 2);
+    if (p % 2 == 0)
+        return tmp * tmp;
+    else
+        return x * tmp * tmp;
 }
 
 QString col_to_name(int col_num)
@@ -32,7 +36,7 @@ QString col_to_name(int col_num)
             remainder = col_num % 26;
             if (remainder == 0)
                 remainder = 26;
-            col_str.prepend(QChar('A'+remainder-1));
+            col_str.prepend(QChar('A' + remainder - 1));
             col_num = (col_num - 1) / 26;
         }
         it = col_cache.insert(col_num, col_str);
@@ -43,16 +47,16 @@ QString col_to_name(int col_num)
 
 int col_from_name(const QString &col_str)
 {
-    int col = 0;
+    int col  = 0;
     int expn = 0;
-    for (int i=col_str.size()-1; i>-1; --i) {
+    for (int i = col_str.size() - 1; i > -1; --i) {
         col += (col_str[i].unicode() - 'A' + 1) * intPow(26, expn);
         expn++;
     }
 
     return col;
 }
-} //namespace
+} // namespace
 
 /*!
     \class CellReference
@@ -66,7 +70,8 @@ int col_from_name(const QString &col_str)
     Constructs an invalid Cell Reference
 */
 CellReference::CellReference()
-    : _row(-1), _column(-1)
+    : _row(-1)
+    , _column(-1)
 {
 }
 
@@ -74,7 +79,8 @@ CellReference::CellReference()
     Constructs the Reference from the given \a row, and \a column.
 */
 CellReference::CellReference(int row, int column)
-    : _row(row), _column(column)
+    : _row(row)
+    , _column(column)
 {
 }
 
@@ -103,8 +109,8 @@ void CellReference::init(const QString &cell_str)
     if (match.hasMatch()) {
         const QString col_str = match.captured(1);
         const QString row_str = match.captured(2);
-        _row = row_str.toInt();
-        _column = col_from_name(col_str);
+        _row                  = row_str.toInt();
+        _column               = col_from_name(col_str);
     }
 }
 
@@ -113,16 +119,15 @@ void CellReference::init(const QString &cell_str)
     other Reference.
 */
 CellReference::CellReference(const CellReference &other)
-    : _row(other._row), _column(other._column)
+    : _row(other._row)
+    , _column(other._column)
 {
 }
 
 /*!
     Destroys the Reference.
 */
-CellReference::~CellReference()
-{
-}
+CellReference::~CellReference() {}
 
 /*!
      Convert the Reference to string notation, such as "A1" or "$A$1".
diff --git a/QXlsx/source/xlsxchart.cpp b/QXlsx/source/xlsxchart.cpp
index c0a0015b..914dfc78 100644
--- a/QXlsx/source/xlsxchart.cpp
+++ b/QXlsx/source/xlsxchart.cpp
@@ -1,30 +1,26 @@
 // xlsxchart.cpp
 
-#include <QtGlobal>
-#include <QString>
+#include "xlsxcellrange.h"
+#include "xlsxchart_p.h"
+#include "xlsxutility_p.h"
+#include "xlsxworksheet.h"
+
+#include <QDebug>
 #include <QIODevice>
+#include <QString>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
-#include <QDebug>
-
-#include "xlsxchart_p.h"
-#include "xlsxworksheet.h"
-#include "xlsxcellrange.h"
-#include "xlsxutility_p.h"
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
 ChartPrivate::ChartPrivate(Chart *q, Chart::CreateFlag flag)
-    : AbstractOOXmlFilePrivate(q, flag), chartType(static_cast<Chart::ChartType>(0))
+    : AbstractOOXmlFilePrivate(q, flag)
+    , chartType(static_cast<Chart::ChartType>(0))
 {
-
 }
 
-ChartPrivate::~ChartPrivate()
-{
-}
-
-
+ChartPrivate::~ChartPrivate() {}
 
 /*!
  * \internal
@@ -37,8 +33,8 @@ Chart::Chart(AbstractSheet *parent, CreateFlag flag)
     d_func()->sheet = parent;
 
     // d->legendPos = Chart::ChartAxisPos::None;
-    d->legendPos = Chart::None;
-    d->legendOverlay = false;
+    d->legendPos             = Chart::None;
+    d->legendOverlay         = false;
     d->majorGridlinesEnabled = false;
     d->minorGridlinesEnabled = false;
 }
@@ -46,14 +42,16 @@ Chart::Chart(AbstractSheet *parent, CreateFlag flag)
 /*!
  * Destroys the chart.
  */
-Chart::~Chart()
-{
-}
+Chart::~Chart() {}
 
 /*!
  * Add the data series which is in the range \a range of the \a sheet.
  */
-void Chart::addSeries(const CellRange &range, AbstractSheet *sheet, bool headerH, bool headerV, bool swapHeaders)
+void Chart::addSeries(const CellRange &range,
+                      AbstractSheet *sheet,
+                      bool headerH,
+                      bool headerV,
+                      bool swapHeaders)
 {
     Q_D(Chart);
 
@@ -65,61 +63,54 @@ void Chart::addSeries(const CellRange &range, AbstractSheet *sheet, bool headerH
         return;
 
     QString sheetName = sheet ? sheet->sheetName() : d->sheet->sheetName();
-    //In case sheetName contains space or '
+    // In case sheetName contains space or '
     sheetName = escapeSheetName(sheetName);
 
-    if (range.columnCount() == 1 || range.rowCount() == 1)
-    {
+    if (range.columnCount() == 1 || range.rowCount() == 1) {
         auto series = std::make_shared<XlsxSeries>();
-        series->numberDataSource_numRef = sheetName + QLatin1String("!") + range.toString(true, true);
+        series->numberDataSource_numRef =
+            sheetName + QLatin1String("!") + range.toString(true, true);
         d->seriesList.append(series);
-    }
-    else if ((range.columnCount() < range.rowCount()) || swapHeaders )
-    {
-        //Column based series
-        int firstDataRow = range.firstRow();
+    } else if ((range.columnCount() < range.rowCount()) || swapHeaders) {
+        // Column based series
+        int firstDataRow    = range.firstRow();
         int firstDataColumn = range.firstColumn();
 
         QString axDataSouruce_numRef;
-        if (d->chartType == CT_ScatterChart || d->chartType == CT_BubbleChart)
-        {
+        if (d->chartType == CT_ScatterChart || d->chartType == CT_BubbleChart) {
             firstDataColumn += 1;
-            CellRange subRange(range.firstRow(), range.firstColumn(), range.lastRow(), range.firstColumn());
+            CellRange subRange(
+                range.firstRow(), range.firstColumn(), range.lastRow(), range.firstColumn());
             axDataSouruce_numRef = sheetName + QLatin1String("!") + subRange.toString(true, true);
         }
 
-        if( headerH )
-        {
+        if (headerH) {
             firstDataRow += 1;
         }
-        if( headerV )
-        {
+        if (headerV) {
             firstDataColumn += 1;
         }
 
-        for (int col=firstDataColumn; col<=range.lastColumn(); ++col)
-        {
+        for (int col = firstDataColumn; col <= range.lastColumn(); ++col) {
             CellRange subRange(firstDataRow, col, range.lastRow(), col);
-            auto series = std::make_shared<XlsxSeries>();
+            auto series                 = std::make_shared<XlsxSeries>();
             series->axDataSource_numRef = axDataSouruce_numRef;
-            series->numberDataSource_numRef = sheetName + QLatin1String("!") + subRange.toString(true, true);
+            series->numberDataSource_numRef =
+                sheetName + QLatin1String("!") + subRange.toString(true, true);
 
-            if( headerH )
-            {
+            if (headerH) {
                 CellRange subRange(range.firstRow(), col, range.firstRow(), col);
-                series->headerH_numRef = sheetName + QLatin1String("!") + subRange.toString(true, true);
-            }
-            else
-            {
+                series->headerH_numRef =
+                    sheetName + QLatin1String("!") + subRange.toString(true, true);
+            } else {
                 series->headerH_numRef = QString();
             }
-            if( headerV )
-            {
-                CellRange subRange(firstDataRow, range.firstColumn(), range.lastRow(), range.firstColumn());
-                series->headerV_numRef = sheetName + QLatin1String("!") + subRange.toString(true, true);
-            }
-            else
-            {
+            if (headerV) {
+                CellRange subRange(
+                    firstDataRow, range.firstColumn(), range.lastRow(), range.firstColumn());
+                series->headerV_numRef =
+                    sheetName + QLatin1String("!") + subRange.toString(true, true);
+            } else {
                 series->headerV_numRef = QString();
             }
             series->swapHeader = swapHeaders;
@@ -127,54 +118,47 @@ void Chart::addSeries(const CellRange &range, AbstractSheet *sheet, bool headerH
             d->seriesList.append(series);
         }
 
-    }
-    else
-    {
-        //Row based series
-        int firstDataRow = range.firstRow();
+    } else {
+        // Row based series
+        int firstDataRow    = range.firstRow();
         int firstDataColumn = range.firstColumn();
 
         QString axDataSouruce_numRef;
-        if (d->chartType == CT_ScatterChart || d->chartType == CT_BubbleChart)
-        {
+        if (d->chartType == CT_ScatterChart || d->chartType == CT_BubbleChart) {
             firstDataRow += 1;
-            CellRange subRange(range.firstRow(), range.firstColumn(), range.firstRow(), range.lastColumn());
+            CellRange subRange(
+                range.firstRow(), range.firstColumn(), range.firstRow(), range.lastColumn());
             axDataSouruce_numRef = sheetName + QLatin1String("!") + subRange.toString(true, true);
         }
 
-        if( headerH )
-        {
+        if (headerH) {
             firstDataRow += 1;
         }
-        if( headerV )
-        {
+        if (headerV) {
             firstDataColumn += 1;
         }
 
-        for (int row=firstDataRow; row<=range.lastRow(); ++row)
-        {
+        for (int row = firstDataRow; row <= range.lastRow(); ++row) {
             CellRange subRange(row, firstDataColumn, row, range.lastColumn());
-            auto series = std::make_shared<XlsxSeries>();
+            auto series                 = std::make_shared<XlsxSeries>();
             series->axDataSource_numRef = axDataSouruce_numRef;
-            series->numberDataSource_numRef = sheetName + QLatin1String("!") + subRange.toString(true, true);
-
-            if( headerH )
-            {
-                CellRange subRange(range.firstRow(), firstDataColumn, range.firstRow(), range.lastColumn());
-                series->headerH_numRef = sheetName + QLatin1String("!") + subRange.toString(true, true);
-            }
-            else
-            {
+            series->numberDataSource_numRef =
+                sheetName + QLatin1String("!") + subRange.toString(true, true);
+
+            if (headerH) {
+                CellRange subRange(
+                    range.firstRow(), firstDataColumn, range.firstRow(), range.lastColumn());
+                series->headerH_numRef =
+                    sheetName + QLatin1String("!") + subRange.toString(true, true);
+            } else {
                 series->headerH_numRef = QString();
             }
 
-            if( headerV )
-            {
+            if (headerV) {
                 CellRange subRange(row, range.firstColumn(), row, range.firstColumn());
-                series->headerV_numRef = sheetName + QLatin1String("!") + subRange.toString(true, true);
-            }
-            else
-            {
+                series->headerV_numRef =
+                    sheetName + QLatin1String("!") + subRange.toString(true, true);
+            } else {
                 series->headerV_numRef = QString();
             }
             series->swapHeader = swapHeaders;
@@ -201,34 +185,26 @@ void Chart::setChartType(ChartType type)
 void Chart::setChartStyle(int id)
 {
     Q_UNUSED(id)
-    //!Todo
+    //! Todo
 }
 
 void Chart::setAxisTitle(Chart::ChartAxisPos pos, QString axisTitle)
 {
     Q_D(Chart);
 
-    if ( axisTitle.isEmpty() )
+    if (axisTitle.isEmpty())
         return;
 
     // dev24 : fixed for old compiler
-    if ( pos == Chart::Left )
-    {
-        d->axisNames[ XlsxAxis::Left ] = axisTitle;
-    }
-    else if ( pos == Chart::Top )
-    {
-        d->axisNames[ XlsxAxis::Top ] = axisTitle;
-    }
-    else if ( pos == Chart::Right )
-    {
-        d->axisNames[ XlsxAxis::Right ] = axisTitle;
+    if (pos == Chart::Left) {
+        d->axisNames[XlsxAxis::Left] = axisTitle;
+    } else if (pos == Chart::Top) {
+        d->axisNames[XlsxAxis::Top] = axisTitle;
+    } else if (pos == Chart::Right) {
+        d->axisNames[XlsxAxis::Right] = axisTitle;
+    } else if (pos == Chart::Bottom) {
+        d->axisNames[XlsxAxis::Bottom] = axisTitle;
     }
-    else if ( pos == Chart::Bottom )
-    {
-        d->axisNames[ XlsxAxis::Bottom ] = axisTitle;
-    }
-
 }
 
 // dev25
@@ -239,16 +215,14 @@ void Chart::setChartTitle(QString strchartTitle)
     d->chartTitle = strchartTitle;
 }
 
-
 void Chart::setChartLegend(Chart::ChartAxisPos legendPos, bool overlay)
 {
     Q_D(Chart);
 
-    d->legendPos = legendPos;
+    d->legendPos     = legendPos;
     d->legendOverlay = overlay;
 }
 
-
 void Chart::setGridlinesEnable(bool majorGridlinesEnable, bool minorGridlinesEnable)
 {
     Q_D(Chart);
@@ -257,7 +231,6 @@ void Chart::setGridlinesEnable(bool majorGridlinesEnable, bool minorGridlinesEna
     d->minorGridlinesEnabled = minorGridlinesEnable;
 }
 
-
 /*!
  * \internal
  */
@@ -303,19 +276,20 @@ void Chart::saveToXmlFile(QIODevice *device) const
                           QStringLiteral("http://schemas.openxmlformats.org/drawingml/2006/chart"));
     writer.writeAttribute(QStringLiteral("xmlns:a"),
                           QStringLiteral("http://schemas.openxmlformats.org/drawingml/2006/main"));
-    writer.writeAttribute(QStringLiteral("xmlns:r"),
-                          QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships"));
+    writer.writeAttribute(
+        QStringLiteral("xmlns:r"),
+        QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships"));
 
     /*
-    * chart is the root element for the chart. If the chart is a 3D chart,
-    * then a view3D element is contained, which specifies the 3D view.
-    * It then has a plot area, which defines a layout and contains an element
-    * that corresponds to, and defines, the type of chart.
-    */
+     * chart is the root element for the chart. If the chart is a 3D chart,
+     * then a view3D element is contained, which specifies the 3D view.
+     * It then has a plot area, which defines a layout and contains an element
+     * that corresponds to, and defines, the type of chart.
+     */
 
     d->saveXmlChart(writer);
 
-    writer.writeEndElement();// c:chartSpace
+    writer.writeEndElement(); // c:chartSpace
     writer.writeEndDocument();
 }
 
@@ -327,15 +301,11 @@ bool Chart::loadFromXmlFile(QIODevice *device)
     Q_D(Chart);
 
     QXmlStreamReader reader(device);
-    while (!reader.atEnd())
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
-        if (reader.tokenType() == QXmlStreamReader::StartElement)
-        {
-            if (reader.name() == QLatin1String("chart"))
-            {
-                if (!d->loadXmlChart(reader))
-                {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("chart")) {
+                if (!d->loadXmlChart(reader)) {
                     return false;
                 }
             }
@@ -345,47 +315,36 @@ bool Chart::loadFromXmlFile(QIODevice *device)
     return true;
 }
 
-
 bool ChartPrivate::loadXmlChart(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("chart"));
 
-//    qDebug() << "-------------- loadXmlChart";
+    //    qDebug() << "-------------- loadXmlChart";
 
-    while (!reader.atEnd())
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
 
-//        qDebug() << "-------------1- " << reader.name();
+        //        qDebug() << "-------------1- " << reader.name();
 
-        if (reader.tokenType() == QXmlStreamReader::StartElement)
-        {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
 
-            if (reader.name() == QLatin1String("plotArea"))
-            {
-                if (!loadXmlPlotArea(reader))
-                {
+            if (reader.name() == QLatin1String("plotArea")) {
+                if (!loadXmlPlotArea(reader)) {
                     return false;
                 }
-            }
-            else if (reader.name() == QLatin1String("title"))
-            {
-                //!Todo
+            } else if (reader.name() == QLatin1String("title")) {
+                //! Todo
 
-                if ( loadXmlChartTitle(reader) )
-                {
+                if (loadXmlChartTitle(reader)) {
                 }
-
             }
-//            else if (reader.name() == QLatin1String("legend"))
-//            {
-//                loadXmlChartLegend(reader);
-//                qDebug() << "-------------- loadXmlChartLegend";
-//            }
-        }
-        else if (reader.tokenType() == QXmlStreamReader::EndElement &&
-                 reader.name() == QLatin1String("chart") )
-        {
+            //            else if (reader.name() == QLatin1String("legend"))
+            //            {
+            //                loadXmlChartLegend(reader);
+            //                qDebug() << "-------------- loadXmlChartLegend";
+            //            }
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name() == QLatin1String("chart")) {
             break;
         }
     }
@@ -428,27 +387,21 @@ bool ChartPrivate::loadXmlPlotArea(QXmlStreamReader &reader)
 
     reader.readNext();
 
-    while (!reader.atEnd())
-    {
-//        qDebug() << "-------------2- " << reader.name();
+    while (!reader.atEnd()) {
+        //        qDebug() << "-------------2- " << reader.name();
 
-        if (reader.isStartElement())
-        {
-            if (!loadXmlPlotAreaElement(reader))
-            {
+        if (reader.isStartElement()) {
+            if (!loadXmlPlotAreaElement(reader)) {
                 qDebug() << "[debug] failed to load plotarea element.";
                 return false;
-            }
-            else if (reader.name() == QLatin1String("legend"))  // Why here?
+            } else if (reader.name() == QLatin1String("legend")) // Why here?
             {
                 loadXmlChartLegend(reader);
-//                qDebug() << "-------------- loadXmlChartLegend";
+                //                qDebug() << "-------------- loadXmlChartLegend";
             }
 
             reader.readNext();
-        }
-        else
-        {
+        } else {
             reader.readNext();
         }
     }
@@ -458,55 +411,41 @@ bool ChartPrivate::loadXmlPlotArea(QXmlStreamReader &reader)
 
 bool ChartPrivate::loadXmlPlotAreaElement(QXmlStreamReader &reader)
 {
-    if (reader.name() == QLatin1String("layout"))
-    {
-        //!ToDo extract attributes
+    if (reader.name() == QLatin1String("layout")) {
+        //! ToDo extract attributes
         layout = readSubTree(reader);
-    }
-    else if (reader.name().endsWith(QLatin1String("Chart")))
-    {
+    } else if (reader.name().endsWith(QLatin1String("Chart"))) {
         // for pieChart, barChart, ... (choose one)
-        if ( !loadXmlXxxChart(reader) )
-        {
+        if (!loadXmlXxxChart(reader)) {
             qDebug() << "[debug] failed to load chart";
             return false;
         }
-    }
-    else if (reader.name() == QLatin1String("catAx")) // choose one : catAx, dateAx, serAx, valAx
+    } else if (reader.name() == QLatin1String("catAx")) // choose one : catAx, dateAx, serAx, valAx
     {
         // qDebug() << "loadXmlAxisCatAx()";
         loadXmlAxisCatAx(reader);
-    }
-    else if (reader.name() == QLatin1String("dateAx")) // choose one : catAx, dateAx, serAx, valAx
+    } else if (reader.name() == QLatin1String("dateAx")) // choose one : catAx, dateAx, serAx, valAx
     {
         // qDebug() << "loadXmlAxisDateAx()";
         loadXmlAxisDateAx(reader);
-    }
-    else if (reader.name() == QLatin1String("serAx")) // choose one : catAx, dateAx, serAx, valAx
+    } else if (reader.name() == QLatin1String("serAx")) // choose one : catAx, dateAx, serAx, valAx
     {
         // qDebug() << "loadXmlAxisSerAx()";
         loadXmlAxisSerAx(reader);
-    }
-    else if (reader.name() == QLatin1String("valAx")) // choose one : catAx, dateAx, serAx, valAx
+    } else if (reader.name() == QLatin1String("valAx")) // choose one : catAx, dateAx, serAx, valAx
     {
         // qDebug() << "loadXmlAxisValAx()";
         loadXmlAxisValAx(reader);
-    }
-    else if (reader.name() == QLatin1String("dTable"))
-    {
-        //!ToDo
+    } else if (reader.name() == QLatin1String("dTable")) {
+        //! ToDo
         // dTable "CT_DTable"
         // reader.skipCurrentElement();
-    }
-    else if (reader.name() == QLatin1String("spPr"))
-    {
-        //!ToDo
+    } else if (reader.name() == QLatin1String("spPr")) {
+        //! ToDo
         // spPr "a:CT_ShapeProperties"
         // reader.skipCurrentElement();
-    }
-    else if (reader.name() == QLatin1String("extLst"))
-    {
-        //!ToDo
+    } else if (reader.name() == QLatin1String("extLst")) {
+        //! ToDo
         // extLst "CT_ExtensionList"
         // reader.skipCurrentElement();
     }
@@ -516,115 +455,64 @@ bool ChartPrivate::loadXmlPlotAreaElement(QXmlStreamReader &reader)
 
 bool ChartPrivate::loadXmlXxxChart(QXmlStreamReader &reader)
 {
-    const auto& name = reader.name();
+    const auto &name = reader.name();
 
-    if (name == QLatin1String("areaChart"))
-    {
+    if (name == QLatin1String("areaChart")) {
         chartType = Chart::CT_AreaChart;
-    }
-    else if (name == QLatin1String("area3DChart"))
-    {
+    } else if (name == QLatin1String("area3DChart")) {
         chartType = Chart::CT_Area3DChart;
-    }
-    else if (name == QLatin1String("lineChart"))
-    {
+    } else if (name == QLatin1String("lineChart")) {
         chartType = Chart::CT_LineChart;
-    }
-    else if (name == QLatin1String("line3DChart"))
-    {
+    } else if (name == QLatin1String("line3DChart")) {
         chartType = Chart::CT_Line3DChart;
-    }
-    else if (name == QLatin1String("stockChart"))
-    {
+    } else if (name == QLatin1String("stockChart")) {
         chartType = Chart::CT_StockChart;
-    }
-    else if (name == QLatin1String("radarChart"))
-    {
+    } else if (name == QLatin1String("radarChart")) {
         chartType = Chart::CT_RadarChart;
-    }
-    else if (name == QLatin1String("scatterChart"))
-    {
+    } else if (name == QLatin1String("scatterChart")) {
         chartType = Chart::CT_ScatterChart;
-    }
-    else if (name == QLatin1String("pieChart"))
-    {
+    } else if (name == QLatin1String("pieChart")) {
         chartType = Chart::CT_PieChart;
-    }
-    else if (name == QLatin1String("pie3DChart"))
-    {
+    } else if (name == QLatin1String("pie3DChart")) {
         chartType = Chart::CT_Pie3DChart;
-    }
-    else if (name == QLatin1String("doughnutChart"))
-    {
+    } else if (name == QLatin1String("doughnutChart")) {
         chartType = Chart::CT_DoughnutChart;
-    }
-    else if (name == QLatin1String("barChart"))
-    {
+    } else if (name == QLatin1String("barChart")) {
         chartType = Chart::CT_BarChart;
-    }
-    else if (name == QLatin1String("bar3DChart"))
-    {
+    } else if (name == QLatin1String("bar3DChart")) {
         chartType = Chart::CT_Bar3DChart;
-    }
-    else if (name == QLatin1String("ofPieChart"))
-    {
+    } else if (name == QLatin1String("ofPieChart")) {
         chartType = Chart::CT_OfPieChart;
-    }
-    else if (name == QLatin1String("surfaceChart"))
-    {
+    } else if (name == QLatin1String("surfaceChart")) {
         chartType = Chart::CT_SurfaceChart;
-    }
-    else if (name == QLatin1String("surface3DChart"))
-    {
+    } else if (name == QLatin1String("surface3DChart")) {
         chartType = Chart::CT_Surface3DChart;
-    }
-    else if (name == QLatin1String("bubbleChart"))
-    {
+    } else if (name == QLatin1String("bubbleChart")) {
         chartType = Chart::CT_BubbleChart;
-    }
-    else
-    {
+    } else {
         qDebug() << "[undefined chart type] " << name;
         chartType = Chart::CT_NoStatementChart;
         return false;
     }
 
-    while( !reader.atEnd() )
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
-        if (reader.tokenType() == QXmlStreamReader::StartElement)
-        {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
             // dev57
 
-            if ( reader.name() == QLatin1String("ser") )
-            {
+            if (reader.name() == QLatin1String("ser")) {
                 loadXmlSer(reader);
-            }
-            else if (reader.name() == QLatin1String("varyColors"))
-            {
-            }
-            else if (reader.name() == QLatin1String("barDir"))
-            {
-            }
-            else if (reader.name() == QLatin1String("axId"))
-            {
+            } else if (reader.name() == QLatin1String("varyColors")) {
+            } else if (reader.name() == QLatin1String("barDir")) {
+            } else if (reader.name() == QLatin1String("axId")) {
                 //
 
-            }
-            else if (reader.name() == QLatin1String("scatterStyle"))
-            {
-            }
-            else if (reader.name() == QLatin1String("holeSize"))
-            {
-            }
-            else
-            {
+            } else if (reader.name() == QLatin1String("scatterStyle")) {
+            } else if (reader.name() == QLatin1String("holeSize")) {
+            } else {
             }
 
-        }
-        else if ( reader.tokenType() == QXmlStreamReader::EndElement &&
-                  reader.name() == name )
-        {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement && reader.name() == name) {
             break;
         }
     }
@@ -639,63 +527,40 @@ bool ChartPrivate::loadXmlSer(QXmlStreamReader &reader)
     auto series = std::make_shared<XlsxSeries>();
     seriesList.append(series);
 
-    while ( !reader.atEnd() &&
-            !(reader.tokenType() == QXmlStreamReader::EndElement &&
-             reader.name() == QLatin1String("ser")) )
-    {
-        if (reader.readNextStartElement())
-        {
-            //TODO beide Header noch auswerten RTR 2019.11
-            const auto& name = reader.name();
-            if ( name == QLatin1String("tx") )
-            {
-                while ( !reader.atEnd() &&
-                        !(reader.tokenType() == QXmlStreamReader::EndElement &&
-                         reader.name() == name))
-                {
-                    if (reader.readNextStartElement())
-                    {
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("ser"))) {
+        if (reader.readNextStartElement()) {
+            // TODO beide Header noch auswerten RTR 2019.11
+            const auto &name = reader.name();
+            if (name == QLatin1String("tx")) {
+                while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                            reader.name() == name)) {
+                    if (reader.readNextStartElement()) {
                         if (reader.name() == QLatin1String("strRef"))
                             series->headerV_numRef = loadXmlStrRef(reader);
                     }
                 }
-            }
-            else if ( name == QLatin1String("cat") ||
-                 name == QLatin1String("xVal") )
-            {
-                while ( !reader.atEnd() &&
-                        !(reader.tokenType() == QXmlStreamReader::EndElement &&
-                         reader.name() == name))
-                {
-                    if (reader.readNextStartElement())
-                    {
+            } else if (name == QLatin1String("cat") || name == QLatin1String("xVal")) {
+                while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                            reader.name() == name)) {
+                    if (reader.readNextStartElement()) {
                         if (reader.name() == QLatin1String("numRef"))
                             series->axDataSource_numRef = loadXmlNumRef(reader);
-                        else
-                        if (reader.name() == QLatin1String("strRef"))
+                        else if (reader.name() == QLatin1String("strRef"))
                             series->headerH_numRef = loadXmlStrRef(reader);
                     }
                 }
-            }
-            else if (name == QLatin1String("val") || name == QLatin1String("yVal"))
-            {
-                while ( !reader.atEnd() &&
-                        !(reader.tokenType() == QXmlStreamReader::EndElement &&
-                        reader.name() == name))
-                {
-                    if (reader.readNextStartElement())
-                    {
+            } else if (name == QLatin1String("val") || name == QLatin1String("yVal")) {
+                while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                            reader.name() == name)) {
+                    if (reader.readNextStartElement()) {
                         if (reader.name() == QLatin1String("numRef"))
                             series->numberDataSource_numRef = loadXmlNumRef(reader);
                     }
                 }
-            }
-            else if (name == QLatin1String("extLst"))
-            {
-                while ( !reader.atEnd() &&
-                        !(reader.tokenType() == QXmlStreamReader::EndElement &&
-                         reader.name() == name))
-                {
+            } else if (name == QLatin1String("extLst")) {
+                while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                            reader.name() == name)) {
                     reader.readNextStartElement();
                 }
             }
@@ -705,16 +570,13 @@ bool ChartPrivate::loadXmlSer(QXmlStreamReader &reader)
     return true;
 }
 
-
 QString ChartPrivate::loadXmlNumRef(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("numRef"));
 
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement
-                                && reader.name() == QLatin1String("numRef")))
-    {
-        if (reader.readNextStartElement())
-        {
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("numRef"))) {
+        if (reader.readNextStartElement()) {
             if (reader.name() == QLatin1String("f"))
                 return reader.readElementText();
         }
@@ -723,16 +585,13 @@ QString ChartPrivate::loadXmlNumRef(QXmlStreamReader &reader)
     return QString();
 }
 
-
 QString ChartPrivate::loadXmlStrRef(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("strRef"));
 
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement
-                                && reader.name() == QLatin1String("strRef")))
-    {
-        if (reader.readNextStartElement())
-        {
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("strRef"))) {
+        if (reader.readNextStartElement()) {
             if (reader.name() == QLatin1String("f"))
                 return reader.readElementText();
         }
@@ -741,7 +600,6 @@ QString ChartPrivate::loadXmlStrRef(QXmlStreamReader &reader)
     return QString();
 }
 
-
 void ChartPrivate::saveXmlChart(QXmlStreamWriter &writer) const
 {
     //----------------------------------------------------
@@ -759,35 +617,61 @@ void ChartPrivate::saveXmlChart(QXmlStreamWriter &writer) const
     writer.writeStartElement(QStringLiteral("c:plotArea"));
 
     // a little workaround for Start- and EndElement with starting ">" and ending without ">"
-    writer.device()->write("><c:layout>"); //layout
+    writer.device()->write("><c:layout>"); // layout
     writer.device()->write(layout.toUtf8());
-    writer.device()->write("</c:layout"); //layout
+    writer.device()->write("</c:layout"); // layout
 
     // dev35
-    switch (chartType)
-    {
-        case Chart::CT_AreaChart:       saveXmlAreaChart(writer); break;
-        case Chart::CT_Area3DChart:     saveXmlAreaChart(writer); break;
-        case Chart::CT_LineChart:       saveXmlLineChart(writer); break;
-        case Chart::CT_Line3DChart:     saveXmlLineChart(writer); break;
-        case Chart::CT_StockChart: break;
-        case Chart::CT_RadarChart: break;
-        case Chart::CT_ScatterChart:    saveXmlScatterChart(writer); break;
-        case Chart::CT_PieChart:        saveXmlPieChart(writer); break;
-        case Chart::CT_Pie3DChart:      saveXmlPieChart(writer); break;
-        case Chart::CT_DoughnutChart:   saveXmlDoughnutChart(writer); break;
-        case Chart::CT_BarChart:        saveXmlBarChart(writer); break;
-        case Chart::CT_Bar3DChart:      saveXmlBarChart(writer); break;
-        case Chart::CT_OfPieChart: break;
-        case Chart::CT_SurfaceChart:  break;
-        case Chart::CT_Surface3DChart: break;
-        case Chart::CT_BubbleChart:  break;
-        default:  break;
+    switch (chartType) {
+    case Chart::CT_AreaChart:
+        saveXmlAreaChart(writer);
+        break;
+    case Chart::CT_Area3DChart:
+        saveXmlAreaChart(writer);
+        break;
+    case Chart::CT_LineChart:
+        saveXmlLineChart(writer);
+        break;
+    case Chart::CT_Line3DChart:
+        saveXmlLineChart(writer);
+        break;
+    case Chart::CT_StockChart:
+        break;
+    case Chart::CT_RadarChart:
+        break;
+    case Chart::CT_ScatterChart:
+        saveXmlScatterChart(writer);
+        break;
+    case Chart::CT_PieChart:
+        saveXmlPieChart(writer);
+        break;
+    case Chart::CT_Pie3DChart:
+        saveXmlPieChart(writer);
+        break;
+    case Chart::CT_DoughnutChart:
+        saveXmlDoughnutChart(writer);
+        break;
+    case Chart::CT_BarChart:
+        saveXmlBarChart(writer);
+        break;
+    case Chart::CT_Bar3DChart:
+        saveXmlBarChart(writer);
+        break;
+    case Chart::CT_OfPieChart:
+        break;
+    case Chart::CT_SurfaceChart:
+        break;
+    case Chart::CT_Surface3DChart:
+        break;
+    case Chart::CT_BubbleChart:
+        break;
+    default:
+        break;
     }
 
     saveXmlAxis(writer); // c:catAx, c:valAx, c:serAx, c:dateAx (choose one)
 
-    //!TODO: write element
+    //! TODO: write element
     // c:dTable CT_DTable
     // c:spPr   CT_ShapeProperties
     // c:extLst CT_ExtensionList
@@ -802,15 +686,13 @@ void ChartPrivate::saveXmlChart(QXmlStreamWriter &writer) const
 
 bool ChartPrivate::loadXmlChartTitle(QXmlStreamReader &reader)
 {
-    //!TODO : load chart title
+    //! TODO : load chart title
 
     Q_ASSERT(reader.name() == QLatin1String("title"));
 
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement
-                                && reader.name() == QLatin1String("title")))
-    {
-        if (reader.readNextStartElement())
-        {
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("title"))) {
+        if (reader.readNextStartElement()) {
             if (reader.name() == QLatin1String("tx")) // c:tx
                 return loadXmlChartTitleTx(reader);
         }
@@ -823,11 +705,9 @@ bool ChartPrivate::loadXmlChartTitleTx(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("tx"));
 
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement
-                                && reader.name() == QLatin1String("tx")))
-    {
-        if (reader.readNextStartElement())
-        {
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("tx"))) {
+        if (reader.readNextStartElement()) {
             if (reader.name() == QLatin1String("rich")) // c:rich
                 return loadXmlChartTitleTxRich(reader);
         }
@@ -840,11 +720,9 @@ bool ChartPrivate::loadXmlChartTitleTxRich(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("rich"));
 
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement
-                                && reader.name() == QLatin1String("rich")))
-    {
-        if (reader.readNextStartElement())
-        {
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("rich"))) {
+        if (reader.readNextStartElement()) {
             if (reader.name() == QLatin1String("p")) // a:p
                 return loadXmlChartTitleTxRichP(reader);
         }
@@ -857,11 +735,9 @@ bool ChartPrivate::loadXmlChartTitleTxRichP(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("p"));
 
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement
-                                && reader.name() == QLatin1String("p")))
-    {
-        if (reader.readNextStartElement())
-        {
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("p"))) {
+        if (reader.readNextStartElement()) {
             if (reader.name() == QLatin1String("r")) // a:r
                 return loadXmlChartTitleTxRichP_R(reader);
         }
@@ -874,15 +750,13 @@ bool ChartPrivate::loadXmlChartTitleTxRichP_R(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("r"));
 
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement
-                                && reader.name() == QLatin1String("r")))
-    {
-        if (reader.readNextStartElement())
-        {
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("r"))) {
+        if (reader.readNextStartElement()) {
             if (reader.name() == QLatin1String("t")) // a:t
             {
                 QString textValue = reader.readElementText();
-                this->chartTitle = textValue;
+                this->chartTitle  = textValue;
                 return true;
             }
         }
@@ -891,11 +765,10 @@ bool ChartPrivate::loadXmlChartTitleTxRichP_R(QXmlStreamReader &reader)
     return false;
 }
 
-
 // write 'chart title'
 void ChartPrivate::saveXmlChartTitle(QXmlStreamWriter &writer) const
 {
-    if ( chartTitle.isEmpty() )
+    if (chartTitle.isEmpty())
         return;
 
     writer.writeStartElement(QStringLiteral("c:title"));
@@ -912,277 +785,274 @@ void ChartPrivate::saveXmlChartTitle(QXmlStreamWriter &writer) const
     </xsd:complexType>
     */
 
-        writer.writeStartElement(QStringLiteral("c:tx"));
-        /*
-        <xsd:complexType name="CT_Tx">
-            <xsd:sequence>
-                <xsd:choice     minOccurs="1"   maxOccurs="1">
-                <xsd:element    name="strRef"   type="CT_StrRef"        minOccurs="1" maxOccurs="1"/>
-                <xsd:element    name="rich"     type="a:CT_TextBody"    minOccurs="1" maxOccurs="1"/>
-                </xsd:choice>
-            </xsd:sequence>
-        </xsd:complexType>
-        */
-
-            writer.writeStartElement(QStringLiteral("c:rich"));
-            /*
-            <xsd:complexType name="CT_TextBody">
-                <xsd:sequence>
-                    <xsd:element name="bodyPr"      type="CT_TextBodyProperties"    minOccurs=" 1"  maxOccurs="1"/>
-                    <xsd:element name="lstStyle"    type="CT_TextListStyle"         minOccurs="0"   maxOccurs="1"/>
-                    <xsd:element name="p"           type="CT_TextParagraph"         minOccurs="1"   maxOccurs="unbounded"/>
-                </xsd:sequence>
-            </xsd:complexType>
-            */
-
-                writer.writeEmptyElement(QStringLiteral("a:bodyPr")); // <a:bodyPr/>
-                /*
-                <xsd:complexType name="CT_TextBodyProperties">
-                    <xsd:sequence>
-                        <xsd:element name="prstTxWarp" type="CT_PresetTextShape" minOccurs="0" maxOccurs="1"/>
-                        <xsd:group ref="EG_TextAutofit" minOccurs="0" maxOccurs="1"/>
-                        <xsd:element name="scene3d" type="CT_Scene3D" minOccurs="0" maxOccurs="1"/>
-                        <xsd:group ref="EG_Text3D" minOccurs="0" maxOccurs="1"/>
-                        <xsd:element name="extLst" type="CT_OfficeArtExtensionList" minOccurs="0" maxOccurs="1"/>
-                    </xsd:sequence>
-                    <xsd:attribute name="rot" type="ST_Angle" use="optional"/>
-                    <xsd:attribute name="spcFirstLastPara" type="xsd:boolean" use="optional"/>
-                    <xsd:attribute name="vertOverflow" type="ST_TextVertOverflowType" use="optional"/>
-                    <xsd:attribute name="horzOverflow" type="ST_TextHorzOverflowType" use="optional"/>
-                    <xsd:attribute name="vert" type="ST_TextVerticalType" use="optional"/>
-                    <xsd:attribute name="wrap" type="ST_TextWrappingType" use="optional"/>
-                    <xsd:attribute name="lIns" type="ST_Coordinate32" use="optional"/>
-                    <xsd:attribute name="tIns" type="ST_Coordinate32" use="optional"/>
-                    <xsd:attribute name="rIns" type="ST_Coordinate32" use="optional"/>
-                    <xsd:attribute name="bIns" type="ST_Coordinate32" use="optional"/>
-                    <xsd:attribute name="numCol" type="ST_TextColumnCount" use="optional"/>
-                    <xsd:attribute name="spcCol" type="ST_PositiveCoordinate32" use="optional"/>
-                    <xsd:attribute name="rtlCol" type="xsd:boolean" use="optional"/>
-                    <xsd:attribute name="fromWordArt" type="xsd:boolean" use="optional"/>
-                    <xsd:attribute name="anchor" type="ST_TextAnchoringType" use="optional"/>
-                    <xsd:attribute name="anchorCtr" type="xsd:boolean" use="optional"/>
-                    <xsd:attribute name="forceAA" type="xsd:boolean" use="optional"/>
-                    <xsd:attribute name="upright" type="xsd:boolean" use="optional" default="false"/>
-                    <xsd:attribute name="compatLnSpc" type="xsd:boolean" use="optional"/>
-                </xsd:complexType>
-                 */
-
-                writer.writeEmptyElement(QStringLiteral("a:lstStyle")); // <a:lstStyle/>
-
-                writer.writeStartElement(QStringLiteral("a:p"));
-                /*
-                <xsd:complexType name="CT_TextParagraph">
-                    <xsd:sequence>
-                        <xsd:element    name="pPr"          type="CT_TextParagraphProperties" minOccurs="0" maxOccurs="1"/>
-                        <xsd:group      ref="EG_TextRun"    minOccurs="0" maxOccurs="unbounded"/>
-                        <xsd:element    name="endParaRPr"   type="CT_TextCharacterProperties" minOccurs="0"
-                        maxOccurs="1"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-                 */
-
-                    // <a:pPr lvl="0">
-                    writer.writeStartElement(QStringLiteral("a:pPr"));
-
-                        writer.writeAttribute(QStringLiteral("lvl"), QStringLiteral("0"));
-
-                        // <a:defRPr b="0"/>
-                        writer.writeStartElement(QStringLiteral("a:defRPr"));
-
-                            writer.writeAttribute(QStringLiteral("b"), QStringLiteral("0"));
-
-                        writer.writeEndElement();  // a:defRPr
-
-                    writer.writeEndElement();  // a:pPr
-
-                /*
-                <xsd:group name="EG_TextRun">
-                    <xsd:choice>
-                        <xsd:element name="r"   type="CT_RegularTextRun"/>
-                        <xsd:element name="br"  type="CT_TextLineBreak"/>
-                        <xsd:element name="fld" type="CT_TextField"/>
-                    </xsd:choice>
-                </xsd:group>
-                */
-
-                writer.writeStartElement(QStringLiteral("a:r"));
-                /*
-                <xsd:complexType name="CT_RegularTextRun">
-                    <xsd:sequence>
-                        <xsd:element name="rPr" type="CT_TextCharacterProperties" minOccurs="0" maxOccurs="1"/>
-                        <xsd:element name="t"   type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-                 */
-
-                    // <a:t>chart name</a:t>
-                    writer.writeTextElement(QStringLiteral("a:t"), chartTitle);
-
-                writer.writeEndElement();  // a:r
-
-                writer.writeEndElement();  // a:p
-
-            writer.writeEndElement();  // c:rich
-
-        writer.writeEndElement();  // c:tx
-
-        // <c:overlay val="0"/>
-        writer.writeStartElement(QStringLiteral("c:overlay"));
-            writer.writeAttribute(QStringLiteral("val"), QStringLiteral("0"));
-        writer.writeEndElement();  // c:overlay
-
-    writer.writeEndElement();  // c:title
+    writer.writeStartElement(QStringLiteral("c:tx"));
+    /*
+    <xsd:complexType name="CT_Tx">
+        <xsd:sequence>
+            <xsd:choice     minOccurs="1"   maxOccurs="1">
+            <xsd:element    name="strRef"   type="CT_StrRef"        minOccurs="1" maxOccurs="1"/>
+            <xsd:element    name="rich"     type="a:CT_TextBody"    minOccurs="1" maxOccurs="1"/>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+    */
+
+    writer.writeStartElement(QStringLiteral("c:rich"));
+    /*
+    <xsd:complexType name="CT_TextBody">
+        <xsd:sequence>
+            <xsd:element name="bodyPr"      type="CT_TextBodyProperties"    minOccurs=" 1"
+    maxOccurs="1"/> <xsd:element name="lstStyle"    type="CT_TextListStyle"         minOccurs="0"
+    maxOccurs="1"/> <xsd:element name="p"           type="CT_TextParagraph"         minOccurs="1"
+    maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    */
+
+    writer.writeEmptyElement(QStringLiteral("a:bodyPr")); // <a:bodyPr/>
+    /*
+    <xsd:complexType name="CT_TextBodyProperties">
+        <xsd:sequence>
+            <xsd:element name="prstTxWarp" type="CT_PresetTextShape" minOccurs="0" maxOccurs="1"/>
+            <xsd:group ref="EG_TextAutofit" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="scene3d" type="CT_Scene3D" minOccurs="0" maxOccurs="1"/>
+            <xsd:group ref="EG_Text3D" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="extLst" type="CT_OfficeArtExtensionList" minOccurs="0"
+    maxOccurs="1"/>
+        </xsd:sequence>
+        <xsd:attribute name="rot" type="ST_Angle" use="optional"/>
+        <xsd:attribute name="spcFirstLastPara" type="xsd:boolean" use="optional"/>
+        <xsd:attribute name="vertOverflow" type="ST_TextVertOverflowType" use="optional"/>
+        <xsd:attribute name="horzOverflow" type="ST_TextHorzOverflowType" use="optional"/>
+        <xsd:attribute name="vert" type="ST_TextVerticalType" use="optional"/>
+        <xsd:attribute name="wrap" type="ST_TextWrappingType" use="optional"/>
+        <xsd:attribute name="lIns" type="ST_Coordinate32" use="optional"/>
+        <xsd:attribute name="tIns" type="ST_Coordinate32" use="optional"/>
+        <xsd:attribute name="rIns" type="ST_Coordinate32" use="optional"/>
+        <xsd:attribute name="bIns" type="ST_Coordinate32" use="optional"/>
+        <xsd:attribute name="numCol" type="ST_TextColumnCount" use="optional"/>
+        <xsd:attribute name="spcCol" type="ST_PositiveCoordinate32" use="optional"/>
+        <xsd:attribute name="rtlCol" type="xsd:boolean" use="optional"/>
+        <xsd:attribute name="fromWordArt" type="xsd:boolean" use="optional"/>
+        <xsd:attribute name="anchor" type="ST_TextAnchoringType" use="optional"/>
+        <xsd:attribute name="anchorCtr" type="xsd:boolean" use="optional"/>
+        <xsd:attribute name="forceAA" type="xsd:boolean" use="optional"/>
+        <xsd:attribute name="upright" type="xsd:boolean" use="optional" default="false"/>
+        <xsd:attribute name="compatLnSpc" type="xsd:boolean" use="optional"/>
+    </xsd:complexType>
+     */
+
+    writer.writeEmptyElement(QStringLiteral("a:lstStyle")); // <a:lstStyle/>
+
+    writer.writeStartElement(QStringLiteral("a:p"));
+    /*
+    <xsd:complexType name="CT_TextParagraph">
+        <xsd:sequence>
+            <xsd:element    name="pPr"          type="CT_TextParagraphProperties" minOccurs="0"
+    maxOccurs="1"/> <xsd:group      ref="EG_TextRun"    minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element    name="endParaRPr"   type="CT_TextCharacterProperties" minOccurs="0"
+            maxOccurs="1"/>
+        </xsd:sequence>
+    </xsd:complexType>
+     */
+
+    // <a:pPr lvl="0">
+    writer.writeStartElement(QStringLiteral("a:pPr"));
+
+    writer.writeAttribute(QStringLiteral("lvl"), QStringLiteral("0"));
+
+    // <a:defRPr b="0"/>
+    writer.writeStartElement(QStringLiteral("a:defRPr"));
+
+    writer.writeAttribute(QStringLiteral("b"), QStringLiteral("0"));
+
+    writer.writeEndElement(); // a:defRPr
+
+    writer.writeEndElement(); // a:pPr
+
+    /*
+    <xsd:group name="EG_TextRun">
+        <xsd:choice>
+            <xsd:element name="r"   type="CT_RegularTextRun"/>
+            <xsd:element name="br"  type="CT_TextLineBreak"/>
+            <xsd:element name="fld" type="CT_TextField"/>
+        </xsd:choice>
+    </xsd:group>
+    */
+
+    writer.writeStartElement(QStringLiteral("a:r"));
+    /*
+    <xsd:complexType name="CT_RegularTextRun">
+        <xsd:sequence>
+            <xsd:element name="rPr" type="CT_TextCharacterProperties" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="t"   type="xsd:string" minOccurs="1" maxOccurs="1"/>
+        </xsd:sequence>
+    </xsd:complexType>
+     */
+
+    // <a:t>chart name</a:t>
+    writer.writeTextElement(QStringLiteral("a:t"), chartTitle);
+
+    writer.writeEndElement(); // a:r
+
+    writer.writeEndElement(); // a:p
+
+    writer.writeEndElement(); // c:rich
+
+    writer.writeEndElement(); // c:tx
+
+    // <c:overlay val="0"/>
+    writer.writeStartElement(QStringLiteral("c:overlay"));
+    writer.writeAttribute(QStringLiteral("val"), QStringLiteral("0"));
+    writer.writeEndElement(); // c:overlay
+
+    writer.writeEndElement(); // c:title
 }
 // }}
 
-
 // write 'chart legend'
 void ChartPrivate::saveXmlChartLegend(QXmlStreamWriter &writer) const
 {
-    if ( legendPos == Chart::None )
+    if (legendPos == Chart::None)
         return;
 
-//    <c:legend>
-//    <c:legendPos val="r"/>
-//    <c:overlay val="0"/>
-//    </c:legend>
+    //    <c:legend>
+    //    <c:legendPos val="r"/>
+    //    <c:overlay val="0"/>
+    //    </c:legend>
 
     writer.writeStartElement(QStringLiteral("c:legend"));
 
-        writer.writeStartElement(QStringLiteral("c:legendPos"));
+    writer.writeStartElement(QStringLiteral("c:legendPos"));
 
-            QString pos;
-            switch( legendPos )
-            {
-                //case Chart::ChartAxisPos::Right:
-                case Chart::Right :
-                    pos = QStringLiteral("r");
-                    break;
-
-                // case Chart::ChartAxisPos::Left:
-                case Chart::Left :
-                    pos = QStringLiteral("l");
-                    break;
-
-                // case Chart::ChartAxisPos::Top:
-                case Chart::Top :
-                    pos = QStringLiteral("t");
-                    break;
-
-                // case Chart::ChartAxisPos::Bottom:
-                case Chart::Bottom :
-                    pos = QStringLiteral("b");
-                    break;
-
-                default:
-                    pos = QStringLiteral("r");
-                    break;
-            }
+    QString pos;
+    switch (legendPos) {
+    // case Chart::ChartAxisPos::Right:
+    case Chart::Right:
+        pos = QStringLiteral("r");
+        break;
 
-            writer.writeAttribute(QStringLiteral("val"), pos);
+    // case Chart::ChartAxisPos::Left:
+    case Chart::Left:
+        pos = QStringLiteral("l");
+        break;
 
-        writer.writeEndElement();  // c:legendPos
+    // case Chart::ChartAxisPos::Top:
+    case Chart::Top:
+        pos = QStringLiteral("t");
+        break;
 
-        writer.writeStartElement(QStringLiteral("c:overlay"));
+    // case Chart::ChartAxisPos::Bottom:
+    case Chart::Bottom:
+        pos = QStringLiteral("b");
+        break;
 
-            if( legendOverlay )
-            {
-                writer.writeAttribute(QStringLiteral("val"), QStringLiteral("1"));
-            }
-            else
-            {
-                writer.writeAttribute(QStringLiteral("val"), QStringLiteral("0"));
-            }
+    default:
+        pos = QStringLiteral("r");
+        break;
+    }
+
+    writer.writeAttribute(QStringLiteral("val"), pos);
+
+    writer.writeEndElement(); // c:legendPos
+
+    writer.writeStartElement(QStringLiteral("c:overlay"));
+
+    if (legendOverlay) {
+        writer.writeAttribute(QStringLiteral("val"), QStringLiteral("1"));
+    } else {
+        writer.writeAttribute(QStringLiteral("val"), QStringLiteral("0"));
+    }
 
-        writer.writeEndElement();  // c:overlay
+    writer.writeEndElement(); // c:overlay
 
     writer.writeEndElement(); // c:legend
 }
 
-
 void ChartPrivate::saveXmlPieChart(QXmlStreamWriter &writer) const
 {
-    QString name = chartType == Chart::CT_PieChart ? QStringLiteral("c:pieChart") : QStringLiteral("c:pie3DChart");
+    QString name = chartType == Chart::CT_PieChart ? QStringLiteral("c:pieChart")
+                                                   : QStringLiteral("c:pie3DChart");
 
     writer.writeStartElement(name);
 
-    //Do the same behavior as Excel, Pie prefer varyColors
+    // Do the same behavior as Excel, Pie prefer varyColors
     writer.writeEmptyElement(QStringLiteral("c:varyColors"));
     writer.writeAttribute(QStringLiteral("val"), QStringLiteral("1"));
 
-    for (int i=0; i<seriesList.size(); ++i)
+    for (int i = 0; i < seriesList.size(); ++i)
         saveXmlSer(writer, seriesList[i].get(), i);
 
-    writer.writeEndElement(); //pieChart, pie3DChart
+    writer.writeEndElement(); // pieChart, pie3DChart
 }
 
 void ChartPrivate::saveXmlBarChart(QXmlStreamWriter &writer) const
 {
-    QString name = chartType == Chart::CT_BarChart ? QStringLiteral("c:barChart") : QStringLiteral("c:bar3DChart");
+    QString name = chartType == Chart::CT_BarChart ? QStringLiteral("c:barChart")
+                                                   : QStringLiteral("c:bar3DChart");
 
     writer.writeStartElement(name);
 
     writer.writeEmptyElement(QStringLiteral("c:barDir"));
     writer.writeAttribute(QStringLiteral("val"), QStringLiteral("col"));
 
-    for ( int i = 0 ; i < seriesList.size() ; ++i )
-    {
+    for (int i = 0; i < seriesList.size(); ++i) {
         saveXmlSer(writer, seriesList[i].get(), i);
     }
 
-    if ( axisList.isEmpty() )
-    {
-        const_cast<ChartPrivate*>(this)->axisList.append(
-                    std::make_shared<XlsxAxis>( XlsxAxis::T_Cat, XlsxAxis::Bottom, 0, 1, axisNames[XlsxAxis::Bottom] ));
+    if (axisList.isEmpty()) {
+        const_cast<ChartPrivate *>(this)->axisList.append(std::make_shared<XlsxAxis>(
+            XlsxAxis::T_Cat, XlsxAxis::Bottom, 0, 1, axisNames[XlsxAxis::Bottom]));
 
-        const_cast<ChartPrivate*>(this)->axisList.append(
-                    std::make_shared<XlsxAxis>( XlsxAxis::T_Val, XlsxAxis::Left, 1, 0, axisNames[XlsxAxis::Left] ));
+        const_cast<ChartPrivate *>(this)->axisList.append(std::make_shared<XlsxAxis>(
+            XlsxAxis::T_Val, XlsxAxis::Left, 1, 0, axisNames[XlsxAxis::Left]));
     }
 
-
     // Note: Bar3D have 2~3 axes
     // int axisListSize = axisList.size();
     // [dev62]
     // Q_ASSERT( axisListSize == 2 ||
     //          ( axisListSize == 3 && chartType == Chart::CT_Bar3DChart ) );
 
-    for ( int i = 0 ; i < axisList.size() ; ++i )
-    {
+    for (int i = 0; i < axisList.size(); ++i) {
         writer.writeEmptyElement(QStringLiteral("c:axId"));
         writer.writeAttribute(QStringLiteral("val"), QString::number(axisList[i]->axisId));
     }
 
-    writer.writeEndElement(); //barChart, bar3DChart
+    writer.writeEndElement(); // barChart, bar3DChart
 }
 
 void ChartPrivate::saveXmlLineChart(QXmlStreamWriter &writer) const
 {
-    QString name = chartType==Chart::CT_LineChart ? QStringLiteral("c:lineChart") : QStringLiteral("c:line3DChart");
+    QString name = chartType == Chart::CT_LineChart ? QStringLiteral("c:lineChart")
+                                                    : QStringLiteral("c:line3DChart");
 
     writer.writeStartElement(name);
 
     // writer.writeEmptyElement(QStringLiteral("grouping")); // dev22
 
-    for (int i=0; i<seriesList.size(); ++i)
+    for (int i = 0; i < seriesList.size(); ++i)
         saveXmlSer(writer, seriesList[i].get(), i);
 
-    if (axisList.isEmpty())
-    {
-        const_cast<ChartPrivate*>(this)->axisList.append(std::make_shared<XlsxAxis>(XlsxAxis::T_Cat, XlsxAxis::Bottom, 0, 1, axisNames[XlsxAxis::Bottom] ));
-        const_cast<ChartPrivate*>(this)->axisList.append(std::make_shared<XlsxAxis>(XlsxAxis::T_Val, XlsxAxis::Left, 1, 0, axisNames[XlsxAxis::Left] ));
-        if (chartType==Chart::CT_Line3DChart)
-            const_cast<ChartPrivate*>(this)->axisList.append(std::make_shared<XlsxAxis>(XlsxAxis::T_Ser, XlsxAxis::Bottom, 2, 0));
+    if (axisList.isEmpty()) {
+        const_cast<ChartPrivate *>(this)->axisList.append(std::make_shared<XlsxAxis>(
+            XlsxAxis::T_Cat, XlsxAxis::Bottom, 0, 1, axisNames[XlsxAxis::Bottom]));
+        const_cast<ChartPrivate *>(this)->axisList.append(std::make_shared<XlsxAxis>(
+            XlsxAxis::T_Val, XlsxAxis::Left, 1, 0, axisNames[XlsxAxis::Left]));
+        if (chartType == Chart::CT_Line3DChart)
+            const_cast<ChartPrivate *>(this)->axisList.append(
+                std::make_shared<XlsxAxis>(XlsxAxis::T_Ser, XlsxAxis::Bottom, 2, 0));
     }
 
-    Q_ASSERT((axisList.size()==2||chartType==Chart::CT_LineChart)|| (axisList.size()==3 && chartType==Chart::CT_Line3DChart));
+    Q_ASSERT((axisList.size() == 2 || chartType == Chart::CT_LineChart) ||
+             (axisList.size() == 3 && chartType == Chart::CT_Line3DChart));
 
-    for (int i=0; i<axisList.size(); ++i)
-    {
+    for (int i = 0; i < axisList.size(); ++i) {
         writer.writeEmptyElement(QStringLiteral("c:axId"));
         writer.writeAttribute(QStringLiteral("val"), QString::number(axisList[i]->axisId));
     }
 
-    writer.writeEndElement(); //lineChart, line3DChart
+    writer.writeEndElement(); // lineChart, line3DChart
 }
 
 void ChartPrivate::saveXmlScatterChart(QXmlStreamWriter &writer) const
@@ -1193,56 +1063,55 @@ void ChartPrivate::saveXmlScatterChart(QXmlStreamWriter &writer) const
 
     writer.writeEmptyElement(QStringLiteral("c:scatterStyle"));
 
-    for (int i=0; i<seriesList.size(); ++i)
+    for (int i = 0; i < seriesList.size(); ++i)
         saveXmlSer(writer, seriesList[i].get(), i);
 
-    if (axisList.isEmpty())
-    {
-        const_cast<ChartPrivate*>(this)->axisList.append(
-                    std::make_shared<XlsxAxis>(XlsxAxis::T_Val, XlsxAxis::Bottom, 0, 1, axisNames[XlsxAxis::Bottom] ));
-        const_cast<ChartPrivate*>(this)->axisList.append(
-                    std::make_shared<XlsxAxis>(XlsxAxis::T_Val, XlsxAxis::Left, 1, 0, axisNames[XlsxAxis::Left] ));
+    if (axisList.isEmpty()) {
+        const_cast<ChartPrivate *>(this)->axisList.append(std::make_shared<XlsxAxis>(
+            XlsxAxis::T_Val, XlsxAxis::Bottom, 0, 1, axisNames[XlsxAxis::Bottom]));
+        const_cast<ChartPrivate *>(this)->axisList.append(std::make_shared<XlsxAxis>(
+            XlsxAxis::T_Val, XlsxAxis::Left, 1, 0, axisNames[XlsxAxis::Left]));
     }
 
     int axisListSize = axisList.size();
     Q_ASSERT(axisListSize == 2);
 
-    for (int i=0; i<axisList.size(); ++i)
-    {
+    for (int i = 0; i < axisList.size(); ++i) {
         writer.writeEmptyElement(QStringLiteral("c:axId"));
         writer.writeAttribute(QStringLiteral("val"), QString::number(axisList[i]->axisId));
     }
 
-    writer.writeEndElement(); //c:scatterChart
+    writer.writeEndElement(); // c:scatterChart
 }
 
 void ChartPrivate::saveXmlAreaChart(QXmlStreamWriter &writer) const
 {
-    QString name = chartType==Chart::CT_AreaChart ? QStringLiteral("c:areaChart") : QStringLiteral("c:area3DChart");
+    QString name = chartType == Chart::CT_AreaChart ? QStringLiteral("c:areaChart")
+                                                    : QStringLiteral("c:area3DChart");
 
     writer.writeStartElement(name);
 
     // writer.writeEmptyElement(QStringLiteral("grouping")); // dev22
 
-    for (int i=0; i<seriesList.size(); ++i)
+    for (int i = 0; i < seriesList.size(); ++i)
         saveXmlSer(writer, seriesList[i].get(), i);
 
-    if (axisList.isEmpty())
-    {
-        const_cast<ChartPrivate*>(this)->axisList.append(std::make_shared<XlsxAxis>(XlsxAxis::T_Cat, XlsxAxis::Bottom, 0, 1));
-        const_cast<ChartPrivate*>(this)->axisList.append(std::make_shared<XlsxAxis>(XlsxAxis::T_Val, XlsxAxis::Left, 1, 0));
+    if (axisList.isEmpty()) {
+        const_cast<ChartPrivate *>(this)->axisList.append(
+            std::make_shared<XlsxAxis>(XlsxAxis::T_Cat, XlsxAxis::Bottom, 0, 1));
+        const_cast<ChartPrivate *>(this)->axisList.append(
+            std::make_shared<XlsxAxis>(XlsxAxis::T_Val, XlsxAxis::Left, 1, 0));
     }
 
-    //Note: Area3D have 2~3 axes
-    Q_ASSERT(axisList.size()==2 || (axisList.size()==3 && chartType==Chart::CT_Area3DChart));
+    // Note: Area3D have 2~3 axes
+    Q_ASSERT(axisList.size() == 2 || (axisList.size() == 3 && chartType == Chart::CT_Area3DChart));
 
-    for (int i=0; i<axisList.size(); ++i)
-    {
+    for (int i = 0; i < axisList.size(); ++i) {
         writer.writeEmptyElement(QStringLiteral("c:axId"));
         writer.writeAttribute(QStringLiteral("val"), QString::number(axisList[i]->axisId));
     }
 
-    writer.writeEndElement(); //lineChart, line3DChart
+    writer.writeEndElement(); // lineChart, line3DChart
 }
 
 void ChartPrivate::saveXmlDoughnutChart(QXmlStreamWriter &writer) const
@@ -1254,7 +1123,7 @@ void ChartPrivate::saveXmlDoughnutChart(QXmlStreamWriter &writer) const
     writer.writeEmptyElement(QStringLiteral("c:varyColors"));
     writer.writeAttribute(QStringLiteral("val"), QStringLiteral("1"));
 
-    for (int i=0; i<seriesList.size(); ++i)
+    for (int i = 0; i < seriesList.size(); ++i)
         saveXmlSer(writer, seriesList[i].get(), i);
 
     writer.writeStartElement(QStringLiteral("c:holeSize"));
@@ -1274,27 +1143,22 @@ void ChartPrivate::saveXmlSer(QXmlStreamWriter &writer, XlsxSeries *ser, int id)
 
     QString header1;
     QString header2;
-    if( ser->swapHeader )
-    {
+    if (ser->swapHeader) {
         header1 = ser->headerH_numRef;
         header2 = ser->headerV_numRef;
-    }
-    else
-    {
+    } else {
         header1 = ser->headerV_numRef;
         header2 = ser->headerH_numRef;
     }
 
-    if( !header1.isEmpty() )
-    {
+    if (!header1.isEmpty()) {
         writer.writeStartElement(QStringLiteral("c:tx"));
         writer.writeStartElement(QStringLiteral("c:strRef"));
         writer.writeTextElement(QStringLiteral("c:f"), header1);
         writer.writeEndElement();
         writer.writeEndElement();
     }
-    if( !header2.isEmpty() )
-    {
+    if (!header2.isEmpty()) {
         writer.writeStartElement(QStringLiteral("c:cat"));
         writer.writeStartElement(QStringLiteral("c:strRef"));
         writer.writeTextElement(QStringLiteral("c:f"), header2);
@@ -1321,36 +1185,34 @@ void ChartPrivate::saveXmlSer(QXmlStreamWriter &writer, XlsxSeries *ser, int id)
     }
 #endif
 
-    if (!ser->numberDataSource_numRef.isEmpty())
-    {
+    if (!ser->numberDataSource_numRef.isEmpty()) {
         if (chartType == Chart::CT_ScatterChart || chartType == Chart::CT_BubbleChart)
             writer.writeStartElement(QStringLiteral("c:yVal"));
         else
             writer.writeStartElement(QStringLiteral("c:val"));
         writer.writeStartElement(QStringLiteral("c:numRef"));
         writer.writeTextElement(QStringLiteral("c:f"), ser->numberDataSource_numRef);
-        writer.writeEndElement();//c:numRef
-        writer.writeEndElement();//c:val or c:yVal
+        writer.writeEndElement(); // c:numRef
+        writer.writeEndElement(); // c:val or c:yVal
     }
 
-    writer.writeEndElement();//c:ser
+    writer.writeEndElement(); // c:ser
 }
 
 bool ChartPrivate::loadXmlAxisCatAx(QXmlStreamReader &reader)
 {
 
-    auto axis = std::make_shared<XlsxAxis>();
+    auto axis  = std::make_shared<XlsxAxis>();
     axis->type = XlsxAxis::T_Cat;
     axisList.append(axis);
 
     // load EG_AxShared
-    if ( ! loadXmlAxisEG_AxShared( reader, axis.get() ) )
-    {
+    if (!loadXmlAxisEG_AxShared(reader, axis.get())) {
         qDebug() << "failed to load EG_AxShared";
         return false;
     }
 
-    //!TODO: load element
+    //! TODO: load element
     // auto
     // lblAlgn
     // lblOffset
@@ -1365,18 +1227,17 @@ bool ChartPrivate::loadXmlAxisCatAx(QXmlStreamReader &reader)
 bool ChartPrivate::loadXmlAxisDateAx(QXmlStreamReader &reader)
 {
 
-    auto axis = std::make_shared<XlsxAxis>();
+    auto axis  = std::make_shared<XlsxAxis>();
     axis->type = XlsxAxis::T_Date;
     axisList.append(axis);
 
     // load EG_AxShared
-    if ( ! loadXmlAxisEG_AxShared( reader, axis.get() ) )
-    {
+    if (!loadXmlAxisEG_AxShared(reader, axis.get())) {
         qDebug() << "failed to load EG_AxShared";
         return false;
     }
 
-    //!TODO: load element
+    //! TODO: load element
     // auto
     // lblOffset
     // baseTimeUnit
@@ -1392,18 +1253,17 @@ bool ChartPrivate::loadXmlAxisDateAx(QXmlStreamReader &reader)
 bool ChartPrivate::loadXmlAxisSerAx(QXmlStreamReader &reader)
 {
 
-    auto axis = std::make_shared<XlsxAxis>();
+    auto axis  = std::make_shared<XlsxAxis>();
     axis->type = XlsxAxis::T_Ser;
     axisList.append(axis);
 
     // load EG_AxShared
-    if ( ! loadXmlAxisEG_AxShared( reader, axis.get() ) )
-    {
+    if (!loadXmlAxisEG_AxShared(reader, axis.get())) {
         qDebug() << "failed to load EG_AxShared";
         return false;
     }
 
-    //!TODO: load element
+    //! TODO: load element
     // tickLblSkip
     // tickMarkSkip
     // extLst
@@ -1415,17 +1275,16 @@ bool ChartPrivate::loadXmlAxisValAx(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("valAx"));
 
-    auto axis = std::make_shared<XlsxAxis>();
+    auto axis  = std::make_shared<XlsxAxis>();
     axis->type = XlsxAxis::T_Val;
     axisList.append(axis);
 
-    if ( ! loadXmlAxisEG_AxShared( reader, axis.get() ) )
-    {
+    if (!loadXmlAxisEG_AxShared(reader, axis.get())) {
         qDebug() << "failed to load EG_AxShared";
         return false;
     }
 
-    //!TODO: load element
+    //! TODO: load element
     // crossBetween
     // majorUnit
     // minorUnit
@@ -1459,110 +1318,82 @@ bool ChartPrivate::loadXmlAxisValAx(QXmlStreamReader &reader)
     </xsd:sequence>
 </xsd:group>
 */
-bool ChartPrivate::loadXmlAxisEG_AxShared(QXmlStreamReader &reader, XlsxAxis* axis)
+bool ChartPrivate::loadXmlAxisEG_AxShared(QXmlStreamReader &reader, XlsxAxis *axis)
 {
-    Q_ASSERT( NULL != axis );
-    Q_ASSERT( reader.name().endsWith(QLatin1String("Ax")) );
+    Q_ASSERT(NULL != axis);
+    Q_ASSERT(reader.name().endsWith(QLatin1String("Ax")));
     QString name = reader.name().toString(); //
 
-    while ( !reader.atEnd() )
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
-        if ( reader.tokenType() == QXmlStreamReader::StartElement )
-        {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
             // qDebug() << "[debug]" << QTime::currentTime() << reader.name().toString();
 
-            if ( reader.name() == QLatin1String("axId") ) // mandatory element
+            if (reader.name() == QLatin1String("axId")) // mandatory element
             {
                 // dev57
                 uint axId = reader.attributes().value(QStringLiteral("val")).toUInt(); // for Qt5.1
                 axis->axisId = axId;
-            }
-            else if ( reader.name() == QLatin1String("scaling") )
-            {
+            } else if (reader.name() == QLatin1String("scaling")) {
                 // mandatory element
 
                 loadXmlAxisEG_AxShared_Scaling(reader, axis);
-            }
-            else if ( reader.name() == QLatin1String("delete") )
-            {
-                //!TODO
-            }
-            else if ( reader.name() == QLatin1String("axPos") )
-            {
+            } else if (reader.name() == QLatin1String("delete")) {
+                //! TODO
+            } else if (reader.name() == QLatin1String("axPos")) {
                 // mandatory element
 
                 QString axPosVal = reader.attributes().value(QLatin1String("val")).toString();
 
-                if ( axPosVal == QLatin1String("l") ) { axis->axisPos = XlsxAxis::Left; }
-                else if ( axPosVal == QLatin1String("r") ) { axis->axisPos = XlsxAxis::Right; }
-                else if ( axPosVal == QLatin1String("t") ) { axis->axisPos = XlsxAxis::Top; }
-                else if ( axPosVal == QLatin1String("b") ) { axis->axisPos = XlsxAxis::Bottom; }
-            }
-            else if ( reader.name() == QLatin1String("majorGridlines") )
-            {
-                //!TODO anything else?
+                if (axPosVal == QLatin1String("l")) {
+                    axis->axisPos = XlsxAxis::Left;
+                } else if (axPosVal == QLatin1String("r")) {
+                    axis->axisPos = XlsxAxis::Right;
+                } else if (axPosVal == QLatin1String("t")) {
+                    axis->axisPos = XlsxAxis::Top;
+                } else if (axPosVal == QLatin1String("b")) {
+                    axis->axisPos = XlsxAxis::Bottom;
+                }
+            } else if (reader.name() == QLatin1String("majorGridlines")) {
+                //! TODO anything else?
                 majorGridlinesEnabled = true;
-            }
-            else if ( reader.name() == QLatin1String("minorGridlines") )
-            {
-                //!TODO anything else?
+            } else if (reader.name() == QLatin1String("minorGridlines")) {
+                //! TODO anything else?
                 minorGridlinesEnabled = true;
-            }
-            else if ( reader.name() == QLatin1String("title") )
-            {
+            } else if (reader.name() == QLatin1String("title")) {
                 // title
-                if ( !loadXmlAxisEG_AxShared_Title(reader, axis) )
-                {
+                if (!loadXmlAxisEG_AxShared_Title(reader, axis)) {
                     qDebug() << "failed to load EG_AxShared title.";
                     Q_ASSERT(false);
                     return false;
                 }
-            }
-            else if ( reader.name() == QLatin1String("numFmt") )
-            {
-                //!TODO
-            }
-            else if ( reader.name() == QLatin1String("majorTickMark") )
-            {
-                //!TODO
-            }
-            else if ( reader.name() == QLatin1String("minorTickMark") )
-            {
-                //!TODO
-            }
-            else if ( reader.name() == QLatin1String("tickLblPos") )
-            {
-                //!TODO
-            }
-            else if ( reader.name() == QLatin1String("spPr") )
-            {
-                //!TODO
-            }
-            else if ( reader.name() == QLatin1String("txPr") )
-            {
-                //!TODO
-            }
-            else if ( reader.name() == QLatin1String("crossAx") ) // mandatory element
+            } else if (reader.name() == QLatin1String("numFmt")) {
+                //! TODO
+            } else if (reader.name() == QLatin1String("majorTickMark")) {
+                //! TODO
+            } else if (reader.name() == QLatin1String("minorTickMark")) {
+                //! TODO
+            } else if (reader.name() == QLatin1String("tickLblPos")) {
+                //! TODO
+            } else if (reader.name() == QLatin1String("spPr")) {
+                //! TODO
+            } else if (reader.name() == QLatin1String("txPr")) {
+                //! TODO
+            } else if (reader.name() == QLatin1String("crossAx")) // mandatory element
             {
                 // dev57
-                uint crossAx = reader.attributes().value(QLatin1String("val")).toUInt(); // for Qt5.1
+                uint crossAx =
+                    reader.attributes().value(QLatin1String("val")).toUInt(); // for Qt5.1
                 axis->crossAx = crossAx;
-            }
-            else if ( reader.name() == QLatin1String("crosses") )
-            {
-                //!TODO
-            }
-            else if ( reader.name() == QLatin1String("crossesAt") )
-            {
-                //!TODO
+            } else if (reader.name() == QLatin1String("crosses")) {
+                //! TODO
+            } else if (reader.name() == QLatin1String("crossesAt")) {
+                //! TODO
             }
 
             // reader.readNext();
-        }
-        else if ( reader.tokenType() == QXmlStreamReader::EndElement &&
-                  reader.name().toString() == name )
-        {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name().toString() == name) {
             break;
         }
     }
@@ -1570,26 +1401,19 @@ bool ChartPrivate::loadXmlAxisEG_AxShared(QXmlStreamReader &reader, XlsxAxis* ax
     return true;
 }
 
-bool ChartPrivate::loadXmlAxisEG_AxShared_Scaling(QXmlStreamReader &reader, XlsxAxis* axis)
+bool ChartPrivate::loadXmlAxisEG_AxShared_Scaling(QXmlStreamReader &reader, XlsxAxis *axis)
 {
     Q_UNUSED(axis);
     Q_ASSERT(reader.name() == QLatin1String("scaling"));
 
-    while ( !reader.atEnd() )
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
-        if ( reader.tokenType() == QXmlStreamReader::StartElement )
-        {
-            if ( reader.name() == QLatin1String("orientation") )
-            {
-            }
-            else
-            {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("orientation")) {
+            } else {
             }
-        }
-        else if ( reader.tokenType() == QXmlStreamReader::EndElement &&
-                  reader.name() == QLatin1String("scaling") )
-        {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name() == QLatin1String("scaling")) {
             break;
         }
     }
@@ -1634,31 +1458,22 @@ bool ChartPrivate::loadXmlAxisEG_AxShared_Scaling(QXmlStreamReader &reader, Xlsx
     </xsd:sequence>
 </xsd:complexType>
   */
-bool ChartPrivate::loadXmlAxisEG_AxShared_Title(QXmlStreamReader &reader, XlsxAxis* axis)
+bool ChartPrivate::loadXmlAxisEG_AxShared_Title(QXmlStreamReader &reader, XlsxAxis *axis)
 {
     Q_ASSERT(reader.name() == QLatin1String("title"));
 
-    while ( !reader.atEnd() )
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
-        if ( reader.tokenType() == QXmlStreamReader::StartElement )
-        {
-            if ( reader.name() == QLatin1String("tx") )
-            {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("tx")) {
                 loadXmlAxisEG_AxShared_Title_Tx(reader, axis);
-            }
-            else if ( reader.name() == QLatin1String("overlay") )
-            {
-                //!TODO: load overlay
+            } else if (reader.name() == QLatin1String("overlay")) {
+                //! TODO: load overlay
                 loadXmlAxisEG_AxShared_Title_Overlay(reader, axis);
+            } else {
             }
-            else
-            {
-            }
-        }
-        else if ( reader.tokenType() == QXmlStreamReader::EndElement &&
-                  reader.name() == QLatin1String("title") )
-        {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name() == QLatin1String("title")) {
             break;
         }
     }
@@ -1666,20 +1481,16 @@ bool ChartPrivate::loadXmlAxisEG_AxShared_Title(QXmlStreamReader &reader, XlsxAx
     return true;
 }
 
-bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Overlay(QXmlStreamReader &reader, XlsxAxis* axis)
+bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Overlay(QXmlStreamReader &reader, XlsxAxis *axis)
 {
     Q_UNUSED(axis);
     Q_ASSERT(reader.name() == QLatin1String("overlay"));
 
-    while ( !reader.atEnd() )
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
-        if ( reader.tokenType() == QXmlStreamReader::StartElement )
-        {
-        }
-        else if ( reader.tokenType() == QXmlStreamReader::EndElement &&
-                  reader.name() == QLatin1String("overlay") )
-        {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name() == QLatin1String("overlay")) {
             break;
         }
     }
@@ -1687,26 +1498,19 @@ bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Overlay(QXmlStreamReader &reader
     return true;
 }
 
-bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Tx(QXmlStreamReader &reader, XlsxAxis* axis)
+bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Tx(QXmlStreamReader &reader, XlsxAxis *axis)
 {
     Q_ASSERT(reader.name() == QLatin1String("tx"));
 
-    while ( !reader.atEnd() )
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
-        if ( reader.tokenType() == QXmlStreamReader::StartElement )
-        {
-            if ( reader.name() == QLatin1String("rich") )
-            {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("rich")) {
                 loadXmlAxisEG_AxShared_Title_Tx_Rich(reader, axis);
+            } else {
             }
-            else
-            {
-            }
-        }
-        else if ( reader.tokenType() == QXmlStreamReader::EndElement &&
-                  reader.name() == QLatin1String("tx") )
-        {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name() == QLatin1String("tx")) {
             break;
         }
     }
@@ -1714,26 +1518,19 @@ bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Tx(QXmlStreamReader &reader, Xls
     return true;
 }
 
-bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Tx_Rich(QXmlStreamReader &reader, XlsxAxis* axis)
+bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Tx_Rich(QXmlStreamReader &reader, XlsxAxis *axis)
 {
     Q_ASSERT(reader.name() == QLatin1String("rich"));
 
-    while ( !reader.atEnd() )
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
-        if ( reader.tokenType() == QXmlStreamReader::StartElement )
-        {
-            if ( reader.name() == QLatin1String("p") )
-            {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("p")) {
                 loadXmlAxisEG_AxShared_Title_Tx_Rich_P(reader, axis);
+            } else {
             }
-            else
-            {
-            }
-        }
-        else if ( reader.tokenType() == QXmlStreamReader::EndElement &&
-                  reader.name() == QLatin1String("rich") )
-        {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name() == QLatin1String("rich")) {
             break;
         }
     }
@@ -1741,31 +1538,21 @@ bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Tx_Rich(QXmlStreamReader &reader
     return true;
 }
 
-bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Tx_Rich_P(QXmlStreamReader &reader, XlsxAxis* axis)
+bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Tx_Rich_P(QXmlStreamReader &reader, XlsxAxis *axis)
 {
     Q_ASSERT(reader.name() == QLatin1String("p"));
 
-    while ( !reader.atEnd() )
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
-        if ( reader.tokenType() == QXmlStreamReader::StartElement )
-        {
-            if ( reader.name() == QLatin1String("r") )
-            {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("r")) {
                 loadXmlAxisEG_AxShared_Title_Tx_Rich_P_R(reader, axis);
-            }
-            else if ( reader.name() == QLatin1String("pPr") )
-            {
+            } else if (reader.name() == QLatin1String("pPr")) {
                 loadXmlAxisEG_AxShared_Title_Tx_Rich_P_pPr(reader, axis);
+            } else {
             }
-            else
-            {
-
-            }
-        }
-        else if ( reader.tokenType() == QXmlStreamReader::EndElement &&
-                  reader.name() == QLatin1String("p") )
-        {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name() == QLatin1String("p")) {
             break;
         }
     }
@@ -1773,27 +1560,21 @@ bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Tx_Rich_P(QXmlStreamReader &read
     return true;
 }
 
-bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Tx_Rich_P_pPr(QXmlStreamReader &reader, XlsxAxis* axis)
+bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Tx_Rich_P_pPr(QXmlStreamReader &reader,
+                                                              XlsxAxis *axis)
 {
     Q_UNUSED(axis);
     Q_ASSERT(reader.name() == QLatin1String("pPr"));
 
-    while ( !reader.atEnd() )
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
-        if ( reader.tokenType() == QXmlStreamReader::StartElement )
-        {
-            if ( reader.name() == QLatin1String("defRPr") )
-            {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("defRPr")) {
                 reader.readElementText();
+            } else {
             }
-            else
-            {
-            }
-        }
-        else if ( reader.tokenType() == QXmlStreamReader::EndElement &&
-                  reader.name() == QLatin1String("pPr") )
-        {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name() == QLatin1String("pPr")) {
             break;
         }
     }
@@ -1801,28 +1582,22 @@ bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Tx_Rich_P_pPr(QXmlStreamReader &
     return true;
 }
 
-bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Tx_Rich_P_R(QXmlStreamReader &reader, XlsxAxis* axis)
+bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Tx_Rich_P_R(QXmlStreamReader &reader,
+                                                            XlsxAxis *axis)
 {
     Q_ASSERT(reader.name() == QLatin1String("r"));
 
-    while ( !reader.atEnd() )
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
-        if ( reader.tokenType() == QXmlStreamReader::StartElement )
-        {
-            if ( reader.name() == QLatin1String("t") )
-            {
-                QString strAxisName = reader.readElementText();
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("t")) {
+                QString strAxisName       = reader.readElementText();
                 XlsxAxis::AxisPos axisPos = axis->axisPos;
-                axis->axisNames[ axisPos ] = strAxisName;
-            }
-            else
-            {
+                axis->axisNames[axisPos]  = strAxisName;
+            } else {
             }
-        }
-        else if ( reader.tokenType() == QXmlStreamReader::EndElement &&
-                  reader.name() == QLatin1String("r") )
-        {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name() == QLatin1String("r")) {
             break;
         }
     }
@@ -1849,8 +1624,8 @@ bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Tx_Rich_P_R(QXmlStreamReader &re
             <xsd:element name="bar3DChart" type="CT_Bar3DChart" minOccurs="1" maxOccurs="1"/>
             <xsd:element name="ofPieChart" type="CT_OfPieChart" minOccurs="1" maxOccurs="1"/>
             <xsd:element name="surfaceChart" type="CT_SurfaceChart" minOccurs="1" maxOccurs="1"/>
-            <xsd:element name="surface3DChart" type="CT_Surface3DChart" minOccurs="1" maxOccurs="1"/>
-            <xsd:element name="bubbleChart" type="CT_BubbleChart" minOccurs="1" maxOccurs="1"/>
+            <xsd:element name="surface3DChart" type="CT_Surface3DChart" minOccurs="1"
+maxOccurs="1"/> <xsd:element name="bubbleChart" type="CT_BubbleChart" minOccurs="1" maxOccurs="1"/>
         </xsd:choice>
         <xsd:choice minOccurs="0" maxOccurs="unbounded">
             <xsd:element name="valAx" type="CT_ValAx" minOccurs="1" maxOccurs="1"/>
@@ -1916,42 +1691,48 @@ bool ChartPrivate::loadXmlAxisEG_AxShared_Title_Tx_Rich_P_R(QXmlStreamReader &re
 
 void ChartPrivate::saveXmlAxis(QXmlStreamWriter &writer) const
 {
-    for ( int i = 0 ; i < axisList.size() ; ++i )
-    {
-        XlsxAxis* axis = axisList[i].get();
-        if ( nullptr == axis )
+    for (int i = 0; i < axisList.size(); ++i) {
+        XlsxAxis *axis = axisList[i].get();
+        if (nullptr == axis)
             continue;
 
-        if ( axis->type == XlsxAxis::T_Cat  ) { saveXmlAxisCatAx( writer, axis ); }
-        if ( axis->type == XlsxAxis::T_Val  ) { saveXmlAxisValAx( writer, axis ); }
-        if ( axis->type == XlsxAxis::T_Ser  ) { saveXmlAxisSerAx( writer, axis ); }
-        if ( axis->type == XlsxAxis::T_Date ) { saveXmlAxisDateAx( writer, axis ); }
+        if (axis->type == XlsxAxis::T_Cat) {
+            saveXmlAxisCatAx(writer, axis);
+        }
+        if (axis->type == XlsxAxis::T_Val) {
+            saveXmlAxisValAx(writer, axis);
+        }
+        if (axis->type == XlsxAxis::T_Ser) {
+            saveXmlAxisSerAx(writer, axis);
+        }
+        if (axis->type == XlsxAxis::T_Date) {
+            saveXmlAxisDateAx(writer, axis);
+        }
     }
-
 }
 
-void ChartPrivate::saveXmlAxisCatAx(QXmlStreamWriter &writer, XlsxAxis* axis) const
+void ChartPrivate::saveXmlAxisCatAx(QXmlStreamWriter &writer, XlsxAxis *axis) const
 {
-/*
-<xsd:complexType name="CT_CatAx">
-    <xsd:sequence>
-        <xsd:group ref="EG_AxShared" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="auto" type="CT_Boolean" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="lblAlgn" type="CT_LblAlgn" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="lblOffset" type="CT_LblOffset" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="tickLblSkip" type="CT_Skip" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="tickMarkSkip" type="CT_Skip" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="noMultiLvlLbl" type="CT_Boolean" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="extLst" type="CT_ExtensionList" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-</xsd:complexType>
-*/
+    /*
+    <xsd:complexType name="CT_CatAx">
+        <xsd:sequence>
+            <xsd:group ref="EG_AxShared" minOccurs="1" maxOccurs="1"/>
+            <xsd:element name="auto" type="CT_Boolean" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="lblAlgn" type="CT_LblAlgn" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="lblOffset" type="CT_LblOffset" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="tickLblSkip" type="CT_Skip" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="tickMarkSkip" type="CT_Skip" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="noMultiLvlLbl" type="CT_Boolean" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="extLst" type="CT_ExtensionList" minOccurs="0" maxOccurs="1"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    */
 
     writer.writeStartElement(QStringLiteral("c:catAx"));
 
     saveXmlAxisEG_AxShared(writer, axis); // EG_AxShared
 
-    //!TODO: write element
+    //! TODO: write element
     // auto
     // lblAlgn
     // lblOffset
@@ -1963,29 +1744,29 @@ void ChartPrivate::saveXmlAxisCatAx(QXmlStreamWriter &writer, XlsxAxis* axis) co
     writer.writeEndElement(); // c:catAx
 }
 
-void ChartPrivate::saveXmlAxisDateAx(QXmlStreamWriter &writer, XlsxAxis* axis) const
+void ChartPrivate::saveXmlAxisDateAx(QXmlStreamWriter &writer, XlsxAxis *axis) const
 {
-/*
-<xsd:complexType name="CT_DateAx">
-    <xsd:sequence>
-        <xsd:group ref="EG_AxShared" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="auto" type="CT_Boolean" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="lblOffset" type="CT_LblOffset" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="baseTimeUnit" type="CT_TimeUnit" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="majorUnit" type="CT_AxisUnit" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="majorTimeUnit" type="CT_TimeUnit" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="minorUnit" type="CT_AxisUnit" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="minorTimeUnit" type="CT_TimeUnit" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="extLst" type="CT_ExtensionList" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-</xsd:complexType>
-*/
+    /*
+    <xsd:complexType name="CT_DateAx">
+        <xsd:sequence>
+            <xsd:group ref="EG_AxShared" minOccurs="1" maxOccurs="1"/>
+            <xsd:element name="auto" type="CT_Boolean" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="lblOffset" type="CT_LblOffset" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="baseTimeUnit" type="CT_TimeUnit" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="majorUnit" type="CT_AxisUnit" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="majorTimeUnit" type="CT_TimeUnit" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="minorUnit" type="CT_AxisUnit" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="minorTimeUnit" type="CT_TimeUnit" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="extLst" type="CT_ExtensionList" minOccurs="0" maxOccurs="1"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    */
 
     writer.writeStartElement(QStringLiteral("c:dateAx"));
 
     saveXmlAxisEG_AxShared(writer, axis); // EG_AxShared
 
-    //!TODO: write element
+    //! TODO: write element
     // auto
     // lblOffset
     // baseTimeUnit
@@ -1998,24 +1779,24 @@ void ChartPrivate::saveXmlAxisDateAx(QXmlStreamWriter &writer, XlsxAxis* axis) c
     writer.writeEndElement(); // c:dateAx
 }
 
-void ChartPrivate::saveXmlAxisSerAx(QXmlStreamWriter &writer, XlsxAxis* axis) const
+void ChartPrivate::saveXmlAxisSerAx(QXmlStreamWriter &writer, XlsxAxis *axis) const
 {
-/*
-<xsd:complexType name="CT_SerAx">
-    <xsd:sequence>
-    <xsd:group ref="EG_AxShared" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="tickLblSkip" type="CT_Skip" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="tickMarkSkip" type="CT_Skip" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="extLst" type="CT_ExtensionList" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-</xsd:complexType>
-*/
+    /*
+    <xsd:complexType name="CT_SerAx">
+        <xsd:sequence>
+        <xsd:group ref="EG_AxShared" minOccurs="1" maxOccurs="1"/>
+            <xsd:element name="tickLblSkip" type="CT_Skip" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="tickMarkSkip" type="CT_Skip" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="extLst" type="CT_ExtensionList" minOccurs="0" maxOccurs="1"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    */
 
     writer.writeStartElement(QStringLiteral("c:serAx"));
 
     saveXmlAxisEG_AxShared(writer, axis); // EG_AxShared
 
-    //!TODO: write element
+    //! TODO: write element
     // tickLblSkip
     // tickMarkSkip
     // extLst
@@ -2023,26 +1804,26 @@ void ChartPrivate::saveXmlAxisSerAx(QXmlStreamWriter &writer, XlsxAxis* axis) co
     writer.writeEndElement(); // c:serAx
 }
 
-void ChartPrivate::saveXmlAxisValAx(QXmlStreamWriter &writer, XlsxAxis* axis) const
+void ChartPrivate::saveXmlAxisValAx(QXmlStreamWriter &writer, XlsxAxis *axis) const
 {
-/*
-<xsd:complexType name="CT_ValAx">
-    <xsd:sequence>
-        <xsd:group ref="EG_AxShared" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="crossBetween" type="CT_CrossBetween" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="majorUnit" type="CT_AxisUnit" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="minorUnit" type="CT_AxisUnit" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="dispUnits" type="CT_DispUnits" minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="extLst" type="CT_ExtensionList" minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-</xsd:complexType>
-*/
+    /*
+    <xsd:complexType name="CT_ValAx">
+        <xsd:sequence>
+            <xsd:group ref="EG_AxShared" minOccurs="1" maxOccurs="1"/>
+            <xsd:element name="crossBetween" type="CT_CrossBetween" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="majorUnit" type="CT_AxisUnit" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="minorUnit" type="CT_AxisUnit" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="dispUnits" type="CT_DispUnits" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="extLst" type="CT_ExtensionList" minOccurs="0" maxOccurs="1"/>
+        </xsd:sequence>
+    </xsd:complexType>
+    */
 
     writer.writeStartElement(QStringLiteral("c:valAx"));
 
     saveXmlAxisEG_AxShared(writer, axis); // EG_AxShared
 
-    //!TODO: write element
+    //! TODO: write element
     // crossBetween
     // majorUnit
     // minorUnit
@@ -2052,7 +1833,7 @@ void ChartPrivate::saveXmlAxisValAx(QXmlStreamWriter &writer, XlsxAxis* axis) co
     writer.writeEndElement(); // c:valAx
 }
 
-void ChartPrivate::saveXmlAxisEG_AxShared(QXmlStreamWriter &writer, XlsxAxis* axis) const
+void ChartPrivate::saveXmlAxisEG_AxShared(QXmlStreamWriter &writer, XlsxAxis *axis) const
 {
     /*
     <xsd:group name="EG_AxShared">
@@ -2063,13 +1844,13 @@ void ChartPrivate::saveXmlAxisEG_AxShared(QXmlStreamWriter &writer, XlsxAxis* ax
             <xsd:element name="axPos" type="CT_AxPos" minOccurs="1" maxOccurs="1"/> (*)
             <xsd:element name="majorGridlines" type="CT_ChartLines" minOccurs="0" maxOccurs="1"/>
             <xsd:element name="minorGridlines" type="CT_ChartLines" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="title" type="CT_Title" minOccurs="0" maxOccurs="1"/> (***********************)
-            <xsd:element name="numFmt" type="CT_NumFmt" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="majorTickMark" type="CT_TickMark" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="minorTickMark" type="CT_TickMark" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="tickLblPos" type="CT_TickLblPos" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="0" maxOccurs="1"/>
-            <xsd:element name="txPr" type="a:CT_TextBody" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="title" type="CT_Title" minOccurs="0" maxOccurs="1"/>
+    (***********************) <xsd:element name="numFmt" type="CT_NumFmt" minOccurs="0"
+    maxOccurs="1"/> <xsd:element name="majorTickMark" type="CT_TickMark" minOccurs="0"
+    maxOccurs="1"/> <xsd:element name="minorTickMark" type="CT_TickMark" minOccurs="0"
+    maxOccurs="1"/> <xsd:element name="tickLblPos" type="CT_TickLblPos" minOccurs="0"
+    maxOccurs="1"/> <xsd:element name="spPr" type="a:CT_ShapeProperties" minOccurs="0"
+    maxOccurs="1"/> <xsd:element name="txPr" type="a:CT_TextBody" minOccurs="0" maxOccurs="1"/>
             <xsd:element name="crossAx" type="CT_UnsignedInt" minOccurs="1" maxOccurs="1"/> (*)
             <xsd:choice minOccurs="0" maxOccurs="1">
                 <xsd:element name="crosses" type="CT_Crosses" minOccurs="1" maxOccurs="1"/>
@@ -2079,38 +1860,35 @@ void ChartPrivate::saveXmlAxisEG_AxShared(QXmlStreamWriter &writer, XlsxAxis* ax
     </xsd:group>
     */
 
-    writer.writeEmptyElement(QStringLiteral("c:axId")); // 21.2.2.9. axId (Axis ID) (mandatory value)
-        writer.writeAttribute(QStringLiteral("val"), QString::number(axis->axisId));
+    writer.writeEmptyElement(
+        QStringLiteral("c:axId")); // 21.2.2.9. axId (Axis ID) (mandatory value)
+    writer.writeAttribute(QStringLiteral("val"), QString::number(axis->axisId));
 
-    writer.writeStartElement(QStringLiteral("c:scaling")); // CT_Scaling (mandatory value)
-        writer.writeEmptyElement(QStringLiteral("c:orientation")); // CT_Orientation
-            writer.writeAttribute(QStringLiteral("val"), QStringLiteral("minMax")); // ST_Orientation
-    writer.writeEndElement(); // c:scaling
+    writer.writeStartElement(QStringLiteral("c:scaling"));     // CT_Scaling (mandatory value)
+    writer.writeEmptyElement(QStringLiteral("c:orientation")); // CT_Orientation
+    writer.writeAttribute(QStringLiteral("val"), QStringLiteral("minMax")); // ST_Orientation
+    writer.writeEndElement();                                               // c:scaling
 
     writer.writeEmptyElement(QStringLiteral("c:axPos")); // axPos CT_AxPos (mandatory value)
-        QString pos = GetAxisPosString( axis->axisPos );
-        if ( !pos.isEmpty() )
-        {
-            writer.writeAttribute(QStringLiteral("val"), pos); // ST_AxPos
-        }
+    QString pos = GetAxisPosString(axis->axisPos);
+    if (!pos.isEmpty()) {
+        writer.writeAttribute(QStringLiteral("val"), pos); // ST_AxPos
+    }
 
-    if( majorGridlinesEnabled )
-    {
+    if (majorGridlinesEnabled) {
         writer.writeEmptyElement(QStringLiteral("c:majorGridlines"));
     }
-    if( minorGridlinesEnabled )
-    {
+    if (minorGridlinesEnabled) {
         writer.writeEmptyElement(QStringLiteral("c:minorGridlines"));
     }
 
     saveXmlAxisEG_AxShared_Title(writer, axis); // "c:title" CT_Title
 
     writer.writeEmptyElement(QStringLiteral("c:crossAx")); // crossAx (mandatory value)
-        writer.writeAttribute(QStringLiteral("val"), QString::number(axis->crossAx));
-
+    writer.writeAttribute(QStringLiteral("val"), QString::number(axis->crossAx));
 }
 
-void ChartPrivate::saveXmlAxisEG_AxShared_Title(QXmlStreamWriter &writer, XlsxAxis* axis) const
+void ChartPrivate::saveXmlAxisEG_AxShared_Title(QXmlStreamWriter &writer, XlsxAxis *axis) const
 {
     // CT_Title
 
@@ -2158,74 +1936,80 @@ void ChartPrivate::saveXmlAxisEG_AxShared_Title(QXmlStreamWriter &writer, XlsxAx
     writer.writeStartElement(QStringLiteral("c:title"));
 
     // CT_Tx {{
-     writer.writeStartElement(QStringLiteral("c:tx"));
+    writer.writeStartElement(QStringLiteral("c:tx"));
 
-      writer.writeStartElement(QStringLiteral("c:rich")); // CT_TextBody
+    writer.writeStartElement(QStringLiteral("c:rich")); // CT_TextBody
 
-       writer.writeEmptyElement(QStringLiteral("a:bodyPr")); // CT_TextBodyProperties
+    writer.writeEmptyElement(QStringLiteral("a:bodyPr")); // CT_TextBodyProperties
 
-       writer.writeEmptyElement(QStringLiteral("a:lstStyle")); // CT_TextListStyle
+    writer.writeEmptyElement(QStringLiteral("a:lstStyle")); // CT_TextListStyle
 
-       writer.writeStartElement(QStringLiteral("a:p"));
+    writer.writeStartElement(QStringLiteral("a:p"));
 
-        writer.writeStartElement(QStringLiteral("a:pPr"));
-            writer.writeAttribute(QStringLiteral("lvl"), QString::number(0));
+    writer.writeStartElement(QStringLiteral("a:pPr"));
+    writer.writeAttribute(QStringLiteral("lvl"), QString::number(0));
 
-            writer.writeStartElement(QStringLiteral("a:defRPr"));
-            writer.writeAttribute(QStringLiteral("b"), QString::number(0));
-            writer.writeEndElement(); // a:defRPr
-        writer.writeEndElement(); // a:pPr
+    writer.writeStartElement(QStringLiteral("a:defRPr"));
+    writer.writeAttribute(QStringLiteral("b"), QString::number(0));
+    writer.writeEndElement(); // a:defRPr
+    writer.writeEndElement(); // a:pPr
 
-        writer.writeStartElement(QStringLiteral("a:r"));
-        QString strAxisName = GetAxisName(axis);
-        writer.writeTextElement( QStringLiteral("a:t"), strAxisName );
-        writer.writeEndElement(); // a:r
+    writer.writeStartElement(QStringLiteral("a:r"));
+    QString strAxisName = GetAxisName(axis);
+    writer.writeTextElement(QStringLiteral("a:t"), strAxisName);
+    writer.writeEndElement(); // a:r
 
-       writer.writeEndElement(); // a:p
+    writer.writeEndElement(); // a:p
 
-      writer.writeEndElement(); // c:rich
+    writer.writeEndElement(); // c:rich
 
-     writer.writeEndElement(); // c:tx
-     // CT_Tx }}
+    writer.writeEndElement(); // c:tx
+    // CT_Tx }}
 
-     writer.writeStartElement(QStringLiteral("c:overlay"));
-        writer.writeAttribute(QStringLiteral("val"), QString::number(0)); // CT_Boolean
-     writer.writeEndElement(); // c:overlay
+    writer.writeStartElement(QStringLiteral("c:overlay"));
+    writer.writeAttribute(QStringLiteral("val"), QString::number(0)); // CT_Boolean
+    writer.writeEndElement();                                         // c:overlay
 
     writer.writeEndElement(); // c:title
-
 }
 
-QString ChartPrivate::GetAxisPosString( XlsxAxis::AxisPos axisPos ) const
+QString ChartPrivate::GetAxisPosString(XlsxAxis::AxisPos axisPos) const
 {
     QString pos;
-    switch ( axisPos )
-    {
-        case XlsxAxis::Top    : pos = QStringLiteral("t"); break;
-        case XlsxAxis::Bottom : pos = QStringLiteral("b"); break;
-        case XlsxAxis::Left   : pos = QStringLiteral("l"); break;
-        case XlsxAxis::Right  : pos = QStringLiteral("r"); break;
-        default: break; // ??
+    switch (axisPos) {
+    case XlsxAxis::Top:
+        pos = QStringLiteral("t");
+        break;
+    case XlsxAxis::Bottom:
+        pos = QStringLiteral("b");
+        break;
+    case XlsxAxis::Left:
+        pos = QStringLiteral("l");
+        break;
+    case XlsxAxis::Right:
+        pos = QStringLiteral("r");
+        break;
+    default:
+        break; // ??
     }
 
     return pos;
 }
 
-QString ChartPrivate::GetAxisName(XlsxAxis* axis) const
+QString ChartPrivate::GetAxisName(XlsxAxis *axis) const
 {
     QString strAxisName;
-    if ( NULL == axis )
+    if (NULL == axis)
         return strAxisName;
 
-    QString pos = GetAxisPosString( axis->axisPos ); // l, t, r, b
-    if ( pos.isEmpty() )
+    QString pos = GetAxisPosString(axis->axisPos); // l, t, r, b
+    if (pos.isEmpty())
         return strAxisName;
 
-    strAxisName = axis->axisNames[ axis->axisPos ];
+    strAxisName = axis->axisNames[axis->axisPos];
     return strAxisName;
 }
 
-
 ///
 /// \brief ChartPrivate::readSubTree
 /// \param reader
@@ -2235,37 +2019,33 @@ QString ChartPrivate::readSubTree(QXmlStreamReader &reader)
 {
     QString treeString;
     QString prefix;
-    const auto& treeName = reader.name();
+    const auto &treeName = reader.name();
 
-    while (!reader.atEnd())
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
-        if (reader.tokenType() == QXmlStreamReader::StartElement)
-        {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
             prefix = reader.prefix().toString();
 
             treeString += QLatin1String("<") + reader.qualifiedName().toString();
 
             const QXmlStreamAttributes attributes = reader.attributes();
             for (const QXmlStreamAttribute &attr : attributes) {
-                treeString += QLatin1String(" ") + attr.name().toString() + QLatin1String("=\"") + attr.value().toString() + QLatin1String("\"");
+                treeString += QLatin1String(" ") + attr.name().toString() + QLatin1String("=\"") +
+                              attr.value().toString() + QLatin1String("\"");
             }
             treeString += QStringLiteral(">");
-        }
-        else if (reader.tokenType() == QXmlStreamReader::EndElement )
-        {
-            if( reader.name() == treeName)
-            {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement) {
+            if (reader.name() == treeName) {
                 break;
             }
-            treeString += QLatin1String("</") + reader.qualifiedName().toString() + QLatin1String(">");
+            treeString +=
+                QLatin1String("</") + reader.qualifiedName().toString() + QLatin1String(">");
         }
     }
 
     return treeString;
 }
 
-
 ///
 /// \brief ChartPrivate::loadXmlChartLegend
 /// \param reader
@@ -2276,53 +2056,34 @@ bool ChartPrivate::loadXmlChartLegend(QXmlStreamReader &reader)
 
     Q_ASSERT(reader.name() == QLatin1String("legend"));
 
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement
-                                && reader.name() == QLatin1String("legend")))
-    {
-        if (reader.readNextStartElement())
-        {
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("legend"))) {
+        if (reader.readNextStartElement()) {
             if (reader.name() == QLatin1String("legendPos")) // c:legendPos
             {
                 QString pos = reader.attributes().value(QLatin1String("val")).toString();
-                if( pos.compare(QLatin1String("r"), Qt::CaseInsensitive) == 0)
-                {
+                if (pos.compare(QLatin1String("r"), Qt::CaseInsensitive) == 0) {
                     // legendPos = Chart::ChartAxisPos::Right;
                     legendPos = Chart::Right;
-                }
-                else
-                if( pos.compare(QLatin1String("l"), Qt::CaseInsensitive) == 0)
-                {
+                } else if (pos.compare(QLatin1String("l"), Qt::CaseInsensitive) == 0) {
                     // legendPos = Chart::ChartAxisPos::Left;
                     legendPos = Chart::Left;
-                }
-                else
-                if( pos.compare(QLatin1String("t"), Qt::CaseInsensitive) == 0)
-                {
+                } else if (pos.compare(QLatin1String("t"), Qt::CaseInsensitive) == 0) {
                     // legendPos = Chart::ChartAxisPos::Top;
                     legendPos = Chart::Top;
-                }
-                else
-                if( pos.compare(QLatin1String("b"), Qt::CaseInsensitive) == 0)
-                {
+                } else if (pos.compare(QLatin1String("b"), Qt::CaseInsensitive) == 0) {
                     // legendPos = Chart::ChartAxisPos::Bottom;
                     legendPos = Chart::Bottom;
-                }
-                else
-                {
+                } else {
                     // legendPos = Chart::ChartAxisPos::None;
                     legendPos = Chart::None;
                 }
-            }
-            else
-            if (reader.name() == QLatin1String("overlay")) // c:legendPos
+            } else if (reader.name() == QLatin1String("overlay")) // c:legendPos
             {
                 QString pos = reader.attributes().value(QLatin1String("val")).toString();
-                if( pos.compare(QLatin1String("1"), Qt::CaseInsensitive) == 0 )
-                {
+                if (pos.compare(QLatin1String("1"), Qt::CaseInsensitive) == 0) {
                     legendOverlay = true;
-                }
-                else
-                {
+                } else {
                     legendOverlay = false;
                 }
             }
diff --git a/QXlsx/source/xlsxchartsheet.cpp b/QXlsx/source/xlsxchartsheet.cpp
index 12fdd79c..0674fa30 100644
--- a/QXlsx/source/xlsxchartsheet.cpp
+++ b/QXlsx/source/xlsxchartsheet.cpp
@@ -1,29 +1,28 @@
 // xlsxchartsheet.cpp
 
-#include <QtGlobal>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
-#include <QDir>
-
 #include "xlsxchartsheet.h"
+
+#include "xlsxchart.h"
 #include "xlsxchartsheet_p.h"
-#include "xlsxworkbook.h"
-#include "xlsxutility_p.h"
 #include "xlsxdrawing_p.h"
 #include "xlsxdrawinganchor_p.h"
-#include "xlsxchart.h"
+#include "xlsxutility_p.h"
+#include "xlsxworkbook.h"
+
+#include <QDir>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
 ChartsheetPrivate::ChartsheetPrivate(Chartsheet *p, Chartsheet::CreateFlag flag)
-    : AbstractSheetPrivate(p, flag), chart(0)
+    : AbstractSheetPrivate(p, flag)
+    , chart(0)
 {
-
 }
 
-ChartsheetPrivate::~ChartsheetPrivate()
-{
-}
+ChartsheetPrivate::~ChartsheetPrivate() {}
 
 /*!
   \class Chartsheet
@@ -35,15 +34,15 @@ ChartsheetPrivate::~ChartsheetPrivate()
  * \internal
  */
 Chartsheet::Chartsheet(const QString &name, int id, Workbook *workbook, CreateFlag flag)
-    : AbstractSheet( name, id, workbook, new ChartsheetPrivate(this, flag) )
+    : AbstractSheet(name, id, workbook, new ChartsheetPrivate(this, flag))
 {
     setSheetType(ST_ChartSheet);
 
-    if (flag == Chartsheet::F_NewFromScratch)
-    {
+    if (flag == Chartsheet::F_NewFromScratch) {
         d_func()->drawing = std::make_shared<Drawing>(this, flag);
 
-        DrawingAbsoluteAnchor *anchor = new DrawingAbsoluteAnchor(drawing(), DrawingAnchor::Picture);
+        DrawingAbsoluteAnchor *anchor =
+            new DrawingAbsoluteAnchor(drawing(), DrawingAnchor::Picture);
 
         anchor->pos = QPoint(0, 0);
         anchor->ext = QSize(9293679, 6068786);
@@ -64,7 +63,7 @@ Chartsheet::Chartsheet(const QString &name, int id, Workbook *workbook, CreateFl
 
 Chartsheet *Chartsheet::copy(const QString &distName, int distId) const
 {
-    //:Todo
+    //: Todo
     Q_UNUSED(distName)
     Q_UNUSED(distId)
     return 0;
@@ -73,9 +72,7 @@ Chartsheet *Chartsheet::copy(const QString &distName, int distId) const
 /*!
  * Destroys this workssheet.
  */
-Chartsheet::~Chartsheet()
-{
-}
+Chartsheet::~Chartsheet() {}
 
 /*!
  * Returns the chart object of the sheet.
@@ -95,23 +92,28 @@ void Chartsheet::saveToXmlFile(QIODevice *device) const
     QXmlStreamWriter writer(device);
 
     writer.writeStartDocument(QStringLiteral("1.0"), true);
-    writer.writeDefaultNamespace(QStringLiteral("http://schemas.openxmlformats.org/spreadsheetml/2006/main"));
-    writer.writeNamespace(QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships"), QStringLiteral("r"));
+    writer.writeDefaultNamespace(
+        QStringLiteral("http://schemas.openxmlformats.org/spreadsheetml/2006/main"));
+    writer.writeNamespace(
+        QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships"),
+        QStringLiteral("r"));
     writer.writeStartElement(QStringLiteral("chartsheet"));
 
     writer.writeStartElement(QStringLiteral("sheetViews"));
     writer.writeEmptyElement(QStringLiteral("sheetView"));
     writer.writeAttribute(QStringLiteral("workbookViewId"), QString::number(0));
     writer.writeAttribute(QStringLiteral("zoomToFit"), QStringLiteral("1"));
-    writer.writeEndElement(); //sheetViews
+    writer.writeEndElement(); // sheetViews
 
     int idx = d->workbook->drawings().indexOf(d->drawing.get());
-    d->relationships->addWorksheetRelationship(QStringLiteral("/drawing"), QStringLiteral("../drawings/drawing%1.xml").arg(idx+1));
+    d->relationships->addWorksheetRelationship(
+        QStringLiteral("/drawing"), QStringLiteral("../drawings/drawing%1.xml").arg(idx + 1));
 
     writer.writeEmptyElement(QStringLiteral("drawing"));
-    writer.writeAttribute(QStringLiteral("r:id"), QStringLiteral("rId%1").arg(d->relationships->count()));
+    writer.writeAttribute(QStringLiteral("r:id"),
+                          QStringLiteral("rId%1").arg(d->relationships->count()));
 
-    writer.writeEndElement();//chartsheet
+    writer.writeEndElement(); // chartsheet
     writer.writeEndDocument();
 }
 
@@ -124,11 +126,11 @@ bool Chartsheet::loadFromXmlFile(QIODevice *device)
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("drawing")) {
-                QString rId = reader.attributes().value(QStringLiteral("r:id")).toString();
+                QString rId  = reader.attributes().value(QStringLiteral("r:id")).toString();
                 QString name = d->relationships->getRelationshipById(rId).target;
 
                 const auto parts = splitPath(filePath());
-                QString path = QDir::cleanPath(parts.first() + QLatin1String("/") + name);
+                QString path     = QDir::cleanPath(parts.first() + QLatin1String("/") + name);
 
                 d->drawing = std::make_shared<Drawing>(this, F_LoadFromExists);
                 d->drawing->setFilePath(path);
diff --git a/QXlsx/source/xlsxcolor.cpp b/QXlsx/source/xlsxcolor.cpp
index 84512b66..1fee05d4 100644
--- a/QXlsx/source/xlsxcolor.cpp
+++ b/QXlsx/source/xlsxcolor.cpp
@@ -1,14 +1,14 @@
 // xlsxcolor.cpp
 
-#include <QDataStream>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
-#include <QDebug>
-
 #include "xlsxcolor_p.h"
 #include "xlsxstyles_p.h"
 #include "xlsxutility_p.h"
 
+#include <QDataStream>
+#include <QDebug>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+
 QT_BEGIN_NAMESPACE_XLSX
 
 XlsxColor::XlsxColor(const QColor &color)
@@ -18,15 +18,13 @@ XlsxColor::XlsxColor(const QColor &color)
 }
 
 XlsxColor::XlsxColor(const QString &theme, const QString &tint)
-    :val(QStringList()<<theme<<tint)
+    : val(QStringList() << theme << tint)
 {
-
 }
 
 XlsxColor::XlsxColor(int index)
-    :val(index)
+    : val(index)
 {
-
 }
 
 bool XlsxColor::isRgbColor() const
@@ -67,7 +65,7 @@ QStringList XlsxColor::themeColor() const
 bool XlsxColor::saveToXml(QXmlStreamWriter &writer, const QString &node) const
 {
     if (!node.isEmpty())
-        writer.writeEmptyElement(node); //color, bgColor, fgColor
+        writer.writeEmptyElement(node); // color, bgColor, fgColor
     else
         writer.writeEmptyElement(QStringLiteral("color"));
 
@@ -89,34 +87,33 @@ bool XlsxColor::saveToXml(QXmlStreamWriter &writer, const QString &node) const
 
 bool XlsxColor::loadFromXml(QXmlStreamReader &reader)
 {
-    const auto& attributes = reader.attributes();
+    const auto &attributes = reader.attributes();
 
     if (attributes.hasAttribute(QLatin1String("rgb"))) {
-        const auto& colorString = attributes.value(QLatin1String("rgb")).toString();
+        const auto &colorString = attributes.value(QLatin1String("rgb")).toString();
         val.setValue(fromARGBString(colorString));
     } else if (attributes.hasAttribute(QLatin1String("indexed"))) {
         int index = attributes.value(QLatin1String("indexed")).toInt();
         val.setValue(index);
     } else if (attributes.hasAttribute(QLatin1String("theme"))) {
-        const auto& theme = attributes.value(QLatin1String("theme")).toString();
-        const auto& tint = attributes.value(QLatin1String("tint")).toString();
-        val.setValue(QStringList()<<theme<<tint);
+        const auto &theme = attributes.value(QLatin1String("theme")).toString();
+        const auto &tint  = attributes.value(QLatin1String("tint")).toString();
+        val.setValue(QStringList() << theme << tint);
     }
     return true;
 }
 
 XlsxColor::operator QVariant() const
 {
-    const auto& cref
+    const auto &cref
 #if QT_VERSION >= 0x060000 // Qt 6.0 or over
         = QMetaType::fromType<XlsxColor>();
 #else
-        = qMetaTypeId<XlsxColor>() ;
+        = qMetaTypeId<XlsxColor>();
 #endif
     return QVariant(cref, this);
 }
 
-
 QColor XlsxColor::fromARGBString(const QString &c)
 {
     QColor color;
@@ -137,15 +134,15 @@ QString XlsxColor::toARGBString(const QColor &c)
 QDataStream &operator<<(QDataStream &s, const XlsxColor &color)
 {
     if (color.isInvalid())
-        s<<0;
+        s << 0;
     else if (color.isRgbColor())
-        s<<1<<color.rgbColor();
+        s << 1 << color.rgbColor();
     else if (color.isIndexedColor())
-        s<<2<<color.indexedColor();
+        s << 2 << color.indexedColor();
     else if (color.isThemeColor())
-        s<<3<<color.themeColor();
+        s << 3 << color.themeColor();
     else
-        s<<4;
+        s << 4;
 
     return s;
 }
@@ -153,20 +150,20 @@ QDataStream &operator<<(QDataStream &s, const XlsxColor &color)
 QDataStream &operator>>(QDataStream &s, XlsxColor &color)
 {
     int marker(4);
-    s>>marker;
+    s >> marker;
     if (marker == 0) {
         color = XlsxColor();
     } else if (marker == 1) {
         QColor c;
-        s>>c;
+        s >> c;
         color = XlsxColor(c);
     } else if (marker == 2) {
         int indexed;
-        s>>indexed;
+        s >> indexed;
         color = XlsxColor(indexed);
     } else if (marker == 3) {
         QStringList list;
-        s>>list;
+        s >> list;
         color = XlsxColor(list[0], list[1]);
     }
 
@@ -192,5 +189,4 @@ QDebug operator<<(QDebug dbg, const XlsxColor &c)
 
 #endif
 
-
 QT_END_NAMESPACE_XLSX
diff --git a/QXlsx/source/xlsxconditionalformatting.cpp b/QXlsx/source/xlsxconditionalformatting.cpp
index 510cc2c0..04fb5c03 100644
--- a/QXlsx/source/xlsxconditionalformatting.cpp
+++ b/QXlsx/source/xlsxconditionalformatting.cpp
@@ -1,46 +1,55 @@
 // xlsxconditionalformatting.cpp
 
-#include <QtGlobal>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
-#include <QDebug>
-
 #include "xlsxconditionalformatting.h"
-#include "xlsxconditionalformatting_p.h"
-#include "xlsxworksheet.h"
+
 #include "xlsxcellrange.h"
+#include "xlsxconditionalformatting_p.h"
 #include "xlsxstyles_p.h"
+#include "xlsxworksheet.h"
 
-QT_BEGIN_NAMESPACE_XLSX
+#include <QDebug>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QtGlobal>
 
-ConditionalFormattingPrivate::ConditionalFormattingPrivate()
-{
+QT_BEGIN_NAMESPACE_XLSX
 
-}
+ConditionalFormattingPrivate::ConditionalFormattingPrivate() {}
 
-ConditionalFormattingPrivate::ConditionalFormattingPrivate(const ConditionalFormattingPrivate &other)
-    :QSharedData(other)
+ConditionalFormattingPrivate::ConditionalFormattingPrivate(
+    const ConditionalFormattingPrivate &other)
+    : QSharedData(other)
 {
-
 }
 
-ConditionalFormattingPrivate::~ConditionalFormattingPrivate()
-{
-
-}
+ConditionalFormattingPrivate::~ConditionalFormattingPrivate() {}
 
-void ConditionalFormattingPrivate::writeCfVo(QXmlStreamWriter &writer, const XlsxCfVoData &cfvo) const
+void ConditionalFormattingPrivate::writeCfVo(QXmlStreamWriter &writer,
+                                             const XlsxCfVoData &cfvo) const
 {
     writer.writeEmptyElement(QStringLiteral("cfvo"));
     QString type;
-    switch(cfvo.type) {
-    case ConditionalFormatting::VOT_Formula: type=QStringLiteral("formula"); break;
-    case ConditionalFormatting::VOT_Max: type=QStringLiteral("max"); break;
-    case ConditionalFormatting::VOT_Min: type=QStringLiteral("min"); break;
-    case ConditionalFormatting::VOT_Num: type=QStringLiteral("num"); break;
-    case ConditionalFormatting::VOT_Percent: type=QStringLiteral("percent"); break;
-    case ConditionalFormatting::VOT_Percentile: type=QStringLiteral("percentile"); break;
-    default: break;
+    switch (cfvo.type) {
+    case ConditionalFormatting::VOT_Formula:
+        type = QStringLiteral("formula");
+        break;
+    case ConditionalFormatting::VOT_Max:
+        type = QStringLiteral("max");
+        break;
+    case ConditionalFormatting::VOT_Min:
+        type = QStringLiteral("min");
+        break;
+    case ConditionalFormatting::VOT_Num:
+        type = QStringLiteral("num");
+        break;
+    case ConditionalFormatting::VOT_Percent:
+        type = QStringLiteral("percent");
+        break;
+    case ConditionalFormatting::VOT_Percentile:
+        type = QStringLiteral("percentile");
+        break;
+    default:
+        break;
     }
     writer.writeAttribute(QStringLiteral("type"), type);
     writer.writeAttribute(QStringLiteral("val"), cfvo.value);
@@ -56,7 +65,6 @@ void ConditionalFormattingPrivate::writeCfVo(QXmlStreamWriter &writer, const Xls
  * The conditional formatting can be applied to a single cell or ranges of cells.
  */
 
-
 /*!
     \enum ConditionalFormatting::HighlightRuleType
 
@@ -118,18 +126,16 @@ void ConditionalFormattingPrivate::writeCfVo(QXmlStreamWriter &writer, const Xls
     Construct a conditional formatting object
 */
 ConditionalFormatting::ConditionalFormatting()
-    :d(new ConditionalFormattingPrivate())
+    : d(new ConditionalFormattingPrivate())
 {
-
 }
 
 /*!
     Constructs a copy of \a other.
 */
 ConditionalFormatting::ConditionalFormatting(const ConditionalFormatting &other)
-    :d(other.d)
+    : d(other.d)
 {
-
 }
 
 /*!
@@ -142,20 +148,21 @@ ConditionalFormatting &ConditionalFormatting::operator=(const ConditionalFormatt
     return *this;
 }
 
-
 /*!
  * Destroy the object.
  */
-ConditionalFormatting::~ConditionalFormatting()
-{
-}
+ConditionalFormatting::~ConditionalFormatting() {}
 
 /*!
  * Add a hightlight rule with the given \a type, \a formula1, \a formula2,
  * \a format and \a stopIfTrue.
  * Return false if failed.
  */
-bool ConditionalFormatting::addHighlightCellsRule(HighlightRuleType type, const QString &formula1, const QString &formula2, const Format &format, bool stopIfTrue)
+bool ConditionalFormatting::addHighlightCellsRule(HighlightRuleType type,
+                                                  const QString &formula1,
+                                                  const QString &formula2,
+                                                  const Format &format,
+                                                  bool stopIfTrue)
 {
     if (format.isEmpty())
         return false;
@@ -167,68 +174,90 @@ bool ConditionalFormatting::addHighlightCellsRule(HighlightRuleType type, const
         cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("cellIs");
         QString op;
         switch (type) {
-        case Highlight_Between: op = QStringLiteral("between"); break;
-        case Highlight_Equal: op = QStringLiteral("equal"); break;
-        case Highlight_GreaterThan: op = QStringLiteral("greaterThan"); break;
-        case Highlight_GreaterThanOrEqual: op = QStringLiteral("greaterThanOrEqual"); break;
-        case Highlight_LessThan: op = QStringLiteral("lessThan"); break;
-        case Highlight_LessThanOrEqual: op = QStringLiteral("lessThanOrEqual"); break;
-        case Highlight_NotBetween: op = QStringLiteral("notBetween"); break;
-        case Highlight_NotEqual: op = QStringLiteral("notEqual"); break;
-        default: break;
+        case Highlight_Between:
+            op = QStringLiteral("between");
+            break;
+        case Highlight_Equal:
+            op = QStringLiteral("equal");
+            break;
+        case Highlight_GreaterThan:
+            op = QStringLiteral("greaterThan");
+            break;
+        case Highlight_GreaterThanOrEqual:
+            op = QStringLiteral("greaterThanOrEqual");
+            break;
+        case Highlight_LessThan:
+            op = QStringLiteral("lessThan");
+            break;
+        case Highlight_LessThanOrEqual:
+            op = QStringLiteral("lessThanOrEqual");
+            break;
+        case Highlight_NotBetween:
+            op = QStringLiteral("notBetween");
+            break;
+        case Highlight_NotEqual:
+            op = QStringLiteral("notEqual");
+            break;
+        default:
+            break;
         }
         cfRule->attrs[XlsxCfRuleData::A_operator] = op;
     } else if (type >= Highlight_ContainsText && type <= Highlight_EndsWith) {
         if (type == Highlight_ContainsText) {
-            cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("containsText");
+            cfRule->attrs[XlsxCfRuleData::A_type]     = QStringLiteral("containsText");
             cfRule->attrs[XlsxCfRuleData::A_operator] = QStringLiteral("containsText");
-            cfRule->attrs[XlsxCfRuleData::A_formula1_temp] = QStringLiteral("NOT(ISERROR(SEARCH(\"%1\",%2)))").arg(formula1);
+            cfRule->attrs[XlsxCfRuleData::A_formula1_temp] =
+                QStringLiteral("NOT(ISERROR(SEARCH(\"%1\",%2)))").arg(formula1);
         } else if (type == Highlight_NotContainsText) {
-            cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("notContainsText");
+            cfRule->attrs[XlsxCfRuleData::A_type]     = QStringLiteral("notContainsText");
             cfRule->attrs[XlsxCfRuleData::A_operator] = QStringLiteral("notContains");
-            cfRule->attrs[XlsxCfRuleData::A_formula1_temp] = QStringLiteral("ISERROR(SEARCH(\"%2\",%1))").arg(formula1);
+            cfRule->attrs[XlsxCfRuleData::A_formula1_temp] =
+                QStringLiteral("ISERROR(SEARCH(\"%2\",%1))").arg(formula1);
         } else if (type == Highlight_BeginsWith) {
-            cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("beginsWith");
+            cfRule->attrs[XlsxCfRuleData::A_type]     = QStringLiteral("beginsWith");
             cfRule->attrs[XlsxCfRuleData::A_operator] = QStringLiteral("beginsWith");
-            cfRule->attrs[XlsxCfRuleData::A_formula1_temp] = QStringLiteral("LEFT(%2,LEN(\"%1\"))=\"%1\"").arg(formula1);
+            cfRule->attrs[XlsxCfRuleData::A_formula1_temp] =
+                QStringLiteral("LEFT(%2,LEN(\"%1\"))=\"%1\"").arg(formula1);
         } else {
-            cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("endsWith");
+            cfRule->attrs[XlsxCfRuleData::A_type]     = QStringLiteral("endsWith");
             cfRule->attrs[XlsxCfRuleData::A_operator] = QStringLiteral("endsWith");
-            cfRule->attrs[XlsxCfRuleData::A_formula1_temp] = QStringLiteral("RIGHT(%2,LEN(\"%1\"))=\"%1\"").arg(formula1);
+            cfRule->attrs[XlsxCfRuleData::A_formula1_temp] =
+                QStringLiteral("RIGHT(%2,LEN(\"%1\"))=\"%1\"").arg(formula1);
         }
         cfRule->attrs[XlsxCfRuleData::A_text] = formula1;
-        skipFormula = true;
+        skipFormula                           = true;
     } else if (type == Highlight_TimePeriod) {
         cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("timePeriod");
-        //:Todo
+        //: Todo
         return false;
     } else if (type == Highlight_Duplicate) {
         cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("duplicateValues");
     } else if (type == Highlight_Unique) {
         cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("uniqueValues");
     } else if (type == Highlight_Errors) {
-        cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("containsErrors");
+        cfRule->attrs[XlsxCfRuleData::A_type]          = QStringLiteral("containsErrors");
         cfRule->attrs[XlsxCfRuleData::A_formula1_temp] = QStringLiteral("ISERROR(%1)");
-        skipFormula = true;
+        skipFormula                                    = true;
     } else if (type == Highlight_NoErrors) {
-        cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("notContainsErrors");
+        cfRule->attrs[XlsxCfRuleData::A_type]          = QStringLiteral("notContainsErrors");
         cfRule->attrs[XlsxCfRuleData::A_formula1_temp] = QStringLiteral("NOT(ISERROR(%1))");
-        skipFormula = true;
+        skipFormula                                    = true;
     } else if (type == Highlight_Blanks) {
-        cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("containsBlanks");
+        cfRule->attrs[XlsxCfRuleData::A_type]          = QStringLiteral("containsBlanks");
         cfRule->attrs[XlsxCfRuleData::A_formula1_temp] = QStringLiteral("LEN(TRIM(%1))=0");
-        skipFormula = true;
+        skipFormula                                    = true;
     } else if (type == Highlight_NoBlanks) {
-        cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("notContainsBlanks");
+        cfRule->attrs[XlsxCfRuleData::A_type]          = QStringLiteral("notContainsBlanks");
         cfRule->attrs[XlsxCfRuleData::A_formula1_temp] = QStringLiteral("LEN(TRIM(%1))>0");
-        skipFormula = true;
+        skipFormula                                    = true;
     } else if (type >= Highlight_Top && type <= Highlight_BottomPercent) {
         cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("top10");
         if (type == Highlight_Bottom || type == Highlight_BottomPercent)
             cfRule->attrs[XlsxCfRuleData::A_bottom] = QStringLiteral("1");
         if (type == Highlight_TopPercent || type == Highlight_BottomPercent)
             cfRule->attrs[XlsxCfRuleData::A_percent] = QStringLiteral("1");
-        cfRule->attrs[XlsxCfRuleData::A_rank] = !formula1.isEmpty() ? formula1 : QStringLiteral("10");
+        cfRule->attrs[XlsxCfRuleData::A_rank] =
+            !formula1.isEmpty() ? formula1 : QStringLiteral("10");
         skipFormula = true;
     } else if (type >= Highlight_AboveAverage && type <= Highlight_BelowStdDev3) {
         cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("aboveAverage");
@@ -242,7 +271,7 @@ bool ConditionalFormatting::addHighlightCellsRule(HighlightRuleType type, const
             cfRule->attrs[XlsxCfRuleData::A_stdDev] = QStringLiteral("2");
         else if (type == Highlight_AboveStdDev3 || type == Highlight_BelowStdDev3)
             cfRule->attrs[XlsxCfRuleData::A_stdDev] = QStringLiteral("3");
-    } else if (type == Highlight_Expression){
+    } else if (type == Highlight_Expression) {
         cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("expression");
     } else {
         return false;
@@ -253,9 +282,11 @@ bool ConditionalFormatting::addHighlightCellsRule(HighlightRuleType type, const
         cfRule->attrs[XlsxCfRuleData::A_stopIfTrue] = true;
     if (!skipFormula) {
         if (!formula1.isEmpty())
-            cfRule->attrs[XlsxCfRuleData::A_formula1] = formula1.startsWith(QLatin1String("=")) ? formula1.mid(1) : formula1;
+            cfRule->attrs[XlsxCfRuleData::A_formula1] =
+                formula1.startsWith(QLatin1String("=")) ? formula1.mid(1) : formula1;
         if (!formula2.isEmpty())
-            cfRule->attrs[XlsxCfRuleData::A_formula2] = formula2.startsWith(QLatin1String("=")) ? formula2.mid(1) : formula2;
+            cfRule->attrs[XlsxCfRuleData::A_formula2] =
+                formula2.startsWith(QLatin1String("=")) ? formula2.mid(1) : formula2;
     }
     d->cfRules.append(cfRule);
     return true;
@@ -266,10 +297,12 @@ bool ConditionalFormatting::addHighlightCellsRule(HighlightRuleType type, const
  *
  * Add a hightlight rule with the given \a type \a format and \a stopIfTrue.
  */
-bool ConditionalFormatting::addHighlightCellsRule(HighlightRuleType type, const Format &format, bool stopIfTrue)
+bool ConditionalFormatting::addHighlightCellsRule(HighlightRuleType type,
+                                                  const Format &format,
+                                                  bool stopIfTrue)
 {
-    if ((type >= Highlight_AboveAverage && type <= Highlight_BelowStdDev3)
-            || (type >= Highlight_Duplicate && type <= Highlight_NoErrors)) {
+    if ((type >= Highlight_AboveAverage && type <= Highlight_BelowStdDev3) ||
+        (type >= Highlight_Duplicate && type <= Highlight_NoErrors)) {
         return addHighlightCellsRule(type, QString(), QString(), format, stopIfTrue);
     }
 
@@ -282,7 +315,10 @@ bool ConditionalFormatting::addHighlightCellsRule(HighlightRuleType type, const
  * Add a hightlight rule with the given \a type, \a formula, \a format and \a stopIfTrue.
  * Return false if failed.
  */
-bool ConditionalFormatting::addHighlightCellsRule(HighlightRuleType type, const QString &formula, const Format &format, bool stopIfTrue)
+bool ConditionalFormatting::addHighlightCellsRule(HighlightRuleType type,
+                                                  const QString &formula,
+                                                  const Format &format,
+                                                  bool stopIfTrue)
 {
     if (type == Highlight_Between || type == Highlight_NotBetween)
         return false;
@@ -295,11 +331,17 @@ bool ConditionalFormatting::addHighlightCellsRule(HighlightRuleType type, const
  * , \a type2, \a val2, \a showData and \a stopIfTrue.
  * Return false if failed.
  */
-bool ConditionalFormatting::addDataBarRule(const QColor &color, ValueObjectType type1, const QString &val1, ValueObjectType type2, const QString &val2, bool showData, bool stopIfTrue)
+bool ConditionalFormatting::addDataBarRule(const QColor &color,
+                                           ValueObjectType type1,
+                                           const QString &val1,
+                                           ValueObjectType type2,
+                                           const QString &val2,
+                                           bool showData,
+                                           bool stopIfTrue)
 {
     auto cfRule = std::make_shared<XlsxCfRuleData>();
 
-    cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("dataBar");
+    cfRule->attrs[XlsxCfRuleData::A_type]   = QStringLiteral("dataBar");
     cfRule->attrs[XlsxCfRuleData::A_color1] = XlsxColor(color);
     if (stopIfTrue)
         cfRule->attrs[XlsxCfRuleData::A_stopIfTrue] = true;
@@ -321,23 +363,26 @@ bool ConditionalFormatting::addDataBarRule(const QColor &color, ValueObjectType
  */
 bool ConditionalFormatting::addDataBarRule(const QColor &color, bool showData, bool stopIfTrue)
 {
-    return addDataBarRule(color, VOT_Min, QStringLiteral("0"), VOT_Max, QStringLiteral("0"), showData, stopIfTrue);
+    return addDataBarRule(
+        color, VOT_Min, QStringLiteral("0"), VOT_Max, QStringLiteral("0"), showData, stopIfTrue);
 }
 
 /*!
  * Add a colorScale rule with the given \a minColor, \a maxColor and \a stopIfTrue.
  * Return false if failed.
  */
-bool ConditionalFormatting::add2ColorScaleRule(const QColor &minColor, const QColor &maxColor, bool stopIfTrue)
+bool ConditionalFormatting::add2ColorScaleRule(const QColor &minColor,
+                                               const QColor &maxColor,
+                                               bool stopIfTrue)
 {
     ValueObjectType type1 = VOT_Min;
     ValueObjectType type2 = VOT_Max;
-    QString val1 = QStringLiteral("0");
-    QString val2 = QStringLiteral("0");
+    QString val1          = QStringLiteral("0");
+    QString val2          = QStringLiteral("0");
 
     auto cfRule = std::make_shared<XlsxCfRuleData>();
 
-    cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("colorScale");
+    cfRule->attrs[XlsxCfRuleData::A_type]   = QStringLiteral("colorScale");
     cfRule->attrs[XlsxCfRuleData::A_color1] = XlsxColor(minColor);
     cfRule->attrs[XlsxCfRuleData::A_color2] = XlsxColor(maxColor);
     if (stopIfTrue)
@@ -356,18 +401,21 @@ bool ConditionalFormatting::add2ColorScaleRule(const QColor &minColor, const QCo
  * Add a colorScale rule with the given \a minColor, \a midColor, \a maxColor and \a stopIfTrue.
  * Return false if failed.
  */
-bool ConditionalFormatting::add3ColorScaleRule(const QColor &minColor, const QColor &midColor, const QColor &maxColor, bool stopIfTrue)
+bool ConditionalFormatting::add3ColorScaleRule(const QColor &minColor,
+                                               const QColor &midColor,
+                                               const QColor &maxColor,
+                                               bool stopIfTrue)
 {
     ValueObjectType type1 = VOT_Min;
     ValueObjectType type2 = VOT_Percent;
     ValueObjectType type3 = VOT_Max;
-    QString val1 = QStringLiteral("0");
-    QString val2 = QStringLiteral("50");
-    QString val3 = QStringLiteral("0");
+    QString val1          = QStringLiteral("0");
+    QString val2          = QStringLiteral("50");
+    QString val3          = QStringLiteral("0");
 
     auto cfRule = std::make_shared<XlsxCfRuleData>();
 
-    cfRule->attrs[XlsxCfRuleData::A_type] = QStringLiteral("colorScale");
+    cfRule->attrs[XlsxCfRuleData::A_type]   = QStringLiteral("colorScale");
     cfRule->attrs[XlsxCfRuleData::A_color1] = XlsxColor(minColor);
     cfRule->attrs[XlsxCfRuleData::A_color2] = XlsxColor(midColor);
     cfRule->attrs[XlsxCfRuleData::A_color3] = XlsxColor(maxColor);
@@ -429,7 +477,9 @@ void ConditionalFormatting::addRange(const CellRange &range)
     d->ranges.append(range);
 }
 
-bool ConditionalFormattingPrivate::readCfRule(QXmlStreamReader &reader, XlsxCfRuleData *rule, Styles *styles)
+bool ConditionalFormattingPrivate::readCfRule(QXmlStreamReader &reader,
+                                              XlsxCfRuleData *rule,
+                                              Styles *styles)
 {
     Q_ASSERT(reader.name() == QLatin1String("cfRule"));
     QXmlStreamAttributes attrs = reader.attributes();
@@ -444,19 +494,19 @@ bool ConditionalFormattingPrivate::readCfRule(QXmlStreamReader &reader, XlsxCfRu
     }
     rule->priority = attrs.value(QLatin1String("priority")).toInt();
     if (attrs.value(QLatin1String("stopIfTrue")) == QLatin1String("1")) {
-        //default is false
+        // default is false
         rule->attrs[XlsxCfRuleData::A_stopIfTrue] = QLatin1String("1");
     }
     if (attrs.value(QLatin1String("aboveAverage")) == QLatin1String("0")) {
-        //default is true
+        // default is true
         rule->attrs[XlsxCfRuleData::A_aboveAverage] = QLatin1String("0");
     }
     if (attrs.value(QLatin1String("percent")) == QLatin1String("1")) {
-        //default is false
+        // default is false
         rule->attrs[XlsxCfRuleData::A_percent] = QLatin1String("1");
     }
     if (attrs.value(QLatin1String("bottom")) == QLatin1String("1")) {
-        //default is false
+        // default is false
         rule->attrs[XlsxCfRuleData::A_bottom] = QLatin1String("1");
     }
     if (attrs.hasAttribute(QLatin1String("operator")))
@@ -466,7 +516,8 @@ bool ConditionalFormattingPrivate::readCfRule(QXmlStreamReader &reader, XlsxCfRu
         rule->attrs[XlsxCfRuleData::A_text] = attrs.value(QLatin1String("text")).toString();
 
     if (attrs.hasAttribute(QLatin1String("timePeriod")))
-        rule->attrs[XlsxCfRuleData::A_timePeriod] = attrs.value(QLatin1String("timePeriod")).toString();
+        rule->attrs[XlsxCfRuleData::A_timePeriod] =
+            attrs.value(QLatin1String("timePeriod")).toString();
 
     if (attrs.hasAttribute(QLatin1String("rank")))
         rule->attrs[XlsxCfRuleData::A_rank] = attrs.value(QLatin1String("rank")).toString();
@@ -475,7 +526,7 @@ bool ConditionalFormattingPrivate::readCfRule(QXmlStreamReader &reader, XlsxCfRu
         rule->attrs[XlsxCfRuleData::A_stdDev] = attrs.value(QLatin1String("stdDev")).toString();
 
     if (attrs.value(QLatin1String("equalAverage")) == QLatin1String("1")) {
-        //default is false
+        // default is false
         rule->attrs[XlsxCfRuleData::A_equalAverage] = QLatin1String("1");
     }
 
@@ -496,8 +547,8 @@ bool ConditionalFormattingPrivate::readCfRule(QXmlStreamReader &reader, XlsxCfRu
                 readCfColorScale(reader, rule);
             }
         }
-        if (reader.tokenType() == QXmlStreamReader::EndElement
-                && reader.name() == QStringLiteral("conditionalFormatting")) {
+        if (reader.tokenType() == QXmlStreamReader::EndElement &&
+            reader.name() == QStringLiteral("conditionalFormatting")) {
             break;
         }
     }
@@ -527,8 +578,8 @@ bool ConditionalFormattingPrivate::readCfDataBar(QXmlStreamReader &reader, XlsxC
                 rule->attrs[XlsxCfRuleData::A_color1] = color;
             }
         }
-        if (reader.tokenType() == QXmlStreamReader::EndElement
-                && reader.name() == QStringLiteral("dataBar")) {
+        if (reader.tokenType() == QXmlStreamReader::EndElement &&
+            reader.name() == QStringLiteral("dataBar")) {
             break;
         }
     }
@@ -563,8 +614,8 @@ bool ConditionalFormattingPrivate::readCfColorScale(QXmlStreamReader &reader, Xl
                     rule->attrs[XlsxCfRuleData::A_color3] = color;
             }
         }
-        if (reader.tokenType() == QXmlStreamReader::EndElement
-                && reader.name() == QStringLiteral("colorScale")) {
+        if (reader.tokenType() == QXmlStreamReader::EndElement &&
+            reader.name() == QStringLiteral("colorScale")) {
             break;
         }
     }
@@ -590,13 +641,13 @@ bool ConditionalFormattingPrivate::readCfVo(QXmlStreamReader &reader, XlsxCfVoDa
         t = ConditionalFormatting::VOT_Num;
     else if (type == QLatin1String("percent"))
         t = ConditionalFormatting::VOT_Percent;
-    else //if (type == QLatin1String("percentile"))
+    else // if (type == QLatin1String("percentile"))
         t = ConditionalFormatting::VOT_Percentile;
 
-    cfvo.type = t;
+    cfvo.type  = t;
     cfvo.value = attrs.value(QLatin1String("val")).toString();
     if (attrs.value(QLatin1String("gte")) == QLatin1String("0")) {
-        //default is true
+        // default is true
         cfvo.gte = false;
     }
     return true;
@@ -609,8 +660,8 @@ bool ConditionalFormatting::loadFromXml(QXmlStreamReader &reader, Styles *styles
     d->ranges.clear();
     d->cfRules.clear();
     QXmlStreamAttributes attrs = reader.attributes();
-    const QString sqref = attrs.value(QLatin1String("sqref")).toString();
-    const auto sqrefParts = sqref.split(QLatin1Char(' '));
+    const QString sqref        = attrs.value(QLatin1String("sqref")).toString();
+    const auto sqrefParts      = sqref.split(QLatin1Char(' '));
     for (const QString &range : sqrefParts) {
         this->addRange(range);
     }
@@ -624,13 +675,12 @@ bool ConditionalFormatting::loadFromXml(QXmlStreamReader &reader, Styles *styles
                 d->cfRules.append(cfRule);
             }
         }
-        if (reader.tokenType() == QXmlStreamReader::EndElement
-                && reader.name() == QStringLiteral("conditionalFormatting")) {
+        if (reader.tokenType() == QXmlStreamReader::EndElement &&
+            reader.name() == QStringLiteral("conditionalFormatting")) {
             break;
         }
     }
 
-
     return true;
 }
 
@@ -644,12 +694,14 @@ bool ConditionalFormatting::saveToXml(QXmlStreamWriter &writer) const
     }
     writer.writeAttribute(QStringLiteral("sqref"), sqref.join(QLatin1String(" ")));
 
-    for (int i=0; i<d->cfRules.size(); ++i) {
+    for (int i = 0; i < d->cfRules.size(); ++i) {
         const std::shared_ptr<XlsxCfRuleData> &rule = d->cfRules[i];
         writer.writeStartElement(QStringLiteral("cfRule"));
-        writer.writeAttribute(QStringLiteral("type"), rule->attrs[XlsxCfRuleData::A_type].toString());
+        writer.writeAttribute(QStringLiteral("type"),
+                              rule->attrs[XlsxCfRuleData::A_type].toString());
         if (rule->dxfFormat.dxfIndexValid())
-            writer.writeAttribute(QStringLiteral("dxfId"), QString::number(rule->dxfFormat.dxfIndex()));
+            writer.writeAttribute(QStringLiteral("dxfId"),
+                                  QString::number(rule->dxfFormat.dxfIndex()));
         writer.writeAttribute(QStringLiteral("priority"), QString::number(rule->priority));
 
         auto it = rule->attrs.constFind(XlsxCfRuleData::A_stopIfTrue);
@@ -699,7 +751,7 @@ bool ConditionalFormatting::saveToXml(QXmlStreamWriter &writer) const
             d->writeCfVo(writer, rule->attrs[XlsxCfRuleData::A_cfvo1].value<XlsxCfVoData>());
             d->writeCfVo(writer, rule->attrs[XlsxCfRuleData::A_cfvo2].value<XlsxCfVoData>());
             rule->attrs[XlsxCfRuleData::A_color1].value<XlsxColor>().saveToXml(writer);
-            writer.writeEndElement();//dataBar
+            writer.writeEndElement(); // dataBar
         } else if (rule->attrs[XlsxCfRuleData::A_type] == QLatin1String("colorScale")) {
             writer.writeStartElement(QStringLiteral("colorScale"));
             d->writeCfVo(writer, rule->attrs[XlsxCfRuleData::A_cfvo1].value<XlsxCfVoData>());
@@ -716,20 +768,21 @@ bool ConditionalFormatting::saveToXml(QXmlStreamWriter &writer) const
             if (it != rule->attrs.constEnd())
                 it.value().value<XlsxColor>().saveToXml(writer);
 
-            writer.writeEndElement();//colorScale
+            writer.writeEndElement(); // colorScale
         }
 
-
         it = rule->attrs.constFind(XlsxCfRuleData::A_formula1_temp);
         if (it != rule->attrs.constEnd()) {
             const auto _ranges = ranges();
-            const auto begin = _ranges.begin();
+            const auto begin   = _ranges.begin();
             if (begin != _ranges.end()) {
-                QString str = begin->toString();
+                QString str       = begin->toString();
                 QString startCell = str.mid(0, str.indexOf(u':'));
-                writer.writeTextElement(QStringLiteral("formula"), it.value().toString().arg(startCell));
+                writer.writeTextElement(QStringLiteral("formula"),
+                                        it.value().toString().arg(startCell));
             }
-        } else if ((it = rule->attrs.constFind(XlsxCfRuleData::A_formula1)) != rule->attrs.constEnd()) {
+        } else if ((it = rule->attrs.constFind(XlsxCfRuleData::A_formula1)) !=
+                   rule->attrs.constEnd()) {
             writer.writeTextElement(QStringLiteral("formula"), it.value().toString());
         }
 
@@ -741,10 +794,10 @@ bool ConditionalFormatting::saveToXml(QXmlStreamWriter &writer) const
         if (it != rule->attrs.constEnd())
             writer.writeTextElement(QStringLiteral("formula"), it.value().toString());
 
-        writer.writeEndElement(); //cfRule
+        writer.writeEndElement(); // cfRule
     }
 
-    writer.writeEndElement(); //conditionalFormatting
+    writer.writeEndElement(); // conditionalFormatting
     return true;
 }
 
diff --git a/QXlsx/source/xlsxcontenttypes.cpp b/QXlsx/source/xlsxcontenttypes.cpp
index e3dd1677..c6233ddb 100644
--- a/QXlsx/source/xlsxcontenttypes.cpp
+++ b/QXlsx/source/xlsxcontenttypes.cpp
@@ -1,23 +1,24 @@
 // xlsxcontenttypes.cpp
 
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
-#include <QFile>
-#include <QMapIterator>
+#include "xlsxcontenttypes_p.h"
+
 #include <QBuffer>
 #include <QDebug>
-
-#include "xlsxcontenttypes_p.h"
+#include <QFile>
+#include <QMapIterator>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
 
 QT_BEGIN_NAMESPACE_XLSX
 
 ContentTypes::ContentTypes(CreateFlag flag)
-    :AbstractOOXmlFile(flag)
+    : AbstractOOXmlFile(flag)
 {
-    m_package_prefix = QStringLiteral("application/vnd.openxmlformats-package.");
+    m_package_prefix  = QStringLiteral("application/vnd.openxmlformats-package.");
     m_document_prefix = QStringLiteral("application/vnd.openxmlformats-officedocument.");
 
-    m_defaults.insert(QStringLiteral("rels"), m_package_prefix + QLatin1String("relationships+xml"));
+    m_defaults.insert(QStringLiteral("rels"),
+                      m_package_prefix + QLatin1String("relationships+xml"));
     m_defaults.insert(QStringLiteral("xml"), QStringLiteral("application/xml"));
 }
 
@@ -33,67 +34,80 @@ void ContentTypes::addOverride(const QString &key, const QString &value)
 
 void ContentTypes::addDocPropApp()
 {
-    addOverride(QStringLiteral("/docProps/app.xml"), m_document_prefix + QLatin1String("extended-properties+xml"));
+    addOverride(QStringLiteral("/docProps/app.xml"),
+                m_document_prefix + QLatin1String("extended-properties+xml"));
 }
 
 void ContentTypes::addDocPropCore()
 {
-    addOverride(QStringLiteral("/docProps/core.xml"), m_package_prefix + QLatin1String("core-properties+xml"));
+    addOverride(QStringLiteral("/docProps/core.xml"),
+                m_package_prefix + QLatin1String("core-properties+xml"));
 }
 
 void ContentTypes::addStyles()
 {
-    addOverride(QStringLiteral("/xl/styles.xml"), m_document_prefix + QLatin1String("spreadsheetml.styles+xml"));
+    addOverride(QStringLiteral("/xl/styles.xml"),
+                m_document_prefix + QLatin1String("spreadsheetml.styles+xml"));
 }
 
 void ContentTypes::addTheme()
 {
-    addOverride(QStringLiteral("/xl/theme/theme1.xml"), m_document_prefix + QLatin1String("theme+xml"));
+    addOverride(QStringLiteral("/xl/theme/theme1.xml"),
+                m_document_prefix + QLatin1String("theme+xml"));
 }
 
 void ContentTypes::addWorkbook()
 {
-    addOverride(QStringLiteral("/xl/workbook.xml"), m_document_prefix + QLatin1String("spreadsheetml.sheet.main+xml"));
+    addOverride(QStringLiteral("/xl/workbook.xml"),
+                m_document_prefix + QLatin1String("spreadsheetml.sheet.main+xml"));
 }
 
 void ContentTypes::addWorksheetName(const QString &name)
 {
-    addOverride(QStringLiteral("/xl/worksheets/%1.xml").arg(name), m_document_prefix + QLatin1String("spreadsheetml.worksheet+xml"));
+    addOverride(QStringLiteral("/xl/worksheets/%1.xml").arg(name),
+                m_document_prefix + QLatin1String("spreadsheetml.worksheet+xml"));
 }
 
 void ContentTypes::addChartsheetName(const QString &name)
 {
-    addOverride(QStringLiteral("/xl/chartsheets/%1.xml").arg(name), m_document_prefix + QLatin1String("spreadsheetml.chartsheet+xml"));
+    addOverride(QStringLiteral("/xl/chartsheets/%1.xml").arg(name),
+                m_document_prefix + QLatin1String("spreadsheetml.chartsheet+xml"));
 }
 
 void ContentTypes::addDrawingName(const QString &name)
 {
-    addOverride(QStringLiteral("/xl/drawings/%1.xml").arg(name), m_document_prefix + QLatin1String("drawing+xml"));
+    addOverride(QStringLiteral("/xl/drawings/%1.xml").arg(name),
+                m_document_prefix + QLatin1String("drawing+xml"));
 }
 
 void ContentTypes::addChartName(const QString &name)
 {
-    addOverride(QStringLiteral("/xl/charts/%1.xml").arg(name), m_document_prefix + QLatin1String("drawingml.chart+xml"));
+    addOverride(QStringLiteral("/xl/charts/%1.xml").arg(name),
+                m_document_prefix + QLatin1String("drawingml.chart+xml"));
 }
 
 void ContentTypes::addCommentName(const QString &name)
 {
-    addOverride(QStringLiteral("/xl/%1.xml").arg(name), m_document_prefix + QLatin1String("spreadsheetml.comments+xml"));
+    addOverride(QStringLiteral("/xl/%1.xml").arg(name),
+                m_document_prefix + QLatin1String("spreadsheetml.comments+xml"));
 }
 
 void ContentTypes::addTableName(const QString &name)
 {
-    addOverride(QStringLiteral("/xl/tables/%1.xml").arg(name), m_document_prefix + QLatin1String("spreadsheetml.table+xml"));
+    addOverride(QStringLiteral("/xl/tables/%1.xml").arg(name),
+                m_document_prefix + QLatin1String("spreadsheetml.table+xml"));
 }
 
 void ContentTypes::addExternalLinkName(const QString &name)
 {
-    addOverride(QStringLiteral("/xl/externalLinks/%1.xml").arg(name), m_document_prefix + QLatin1String("spreadsheetml.externalLink+xml"));
+    addOverride(QStringLiteral("/xl/externalLinks/%1.xml").arg(name),
+                m_document_prefix + QLatin1String("spreadsheetml.externalLink+xml"));
 }
 
 void ContentTypes::addSharedString()
 {
-    addOverride(QStringLiteral("/xl/sharedStrings.xml"), m_document_prefix + QLatin1String("spreadsheetml.sharedStrings+xml"));
+    addOverride(QStringLiteral("/xl/sharedStrings.xml"),
+                m_document_prefix + QLatin1String("spreadsheetml.sharedStrings+xml"));
 }
 
 void ContentTypes::addVmlName()
@@ -103,12 +117,13 @@ void ContentTypes::addVmlName()
 
 void ContentTypes::addCalcChain()
 {
-    addOverride(QStringLiteral("/xl/calcChain.xml"), m_document_prefix + QLatin1String("spreadsheetml.calcChain+xml"));
+    addOverride(QStringLiteral("/xl/calcChain.xml"),
+                m_document_prefix + QLatin1String("spreadsheetml.calcChain+xml"));
 }
 
 void ContentTypes::addVbaProject()
 {
-    //:TODO
+    //: TODO
     addOverride(QStringLiteral("bin"), QStringLiteral("application/vnd.ms-office.vbaProject"));
 }
 
@@ -123,33 +138,34 @@ void ContentTypes::saveToXmlFile(QIODevice *device) const
 
     writer.writeStartDocument(QStringLiteral("1.0"), true);
     writer.writeStartElement(QStringLiteral("Types"));
-    writer.writeAttribute(QStringLiteral("xmlns"), QStringLiteral("http://schemas.openxmlformats.org/package/2006/content-types"));
+    writer.writeAttribute(
+        QStringLiteral("xmlns"),
+        QStringLiteral("http://schemas.openxmlformats.org/package/2006/content-types"));
 
     {
-    QMapIterator<QString, QString> it(m_defaults);
-    while (it.hasNext()) {
-        it.next();
-        writer.writeStartElement(QStringLiteral("Default"));
-        writer.writeAttribute(QStringLiteral("Extension"), it.key());
-        writer.writeAttribute(QStringLiteral("ContentType"), it.value());
-        writer.writeEndElement();//Default
-    }
+        QMapIterator<QString, QString> it(m_defaults);
+        while (it.hasNext()) {
+            it.next();
+            writer.writeStartElement(QStringLiteral("Default"));
+            writer.writeAttribute(QStringLiteral("Extension"), it.key());
+            writer.writeAttribute(QStringLiteral("ContentType"), it.value());
+            writer.writeEndElement(); // Default
+        }
     }
 
     {
-    QMapIterator<QString, QString> it(m_overrides);
-    while (it.hasNext()) {
-        it.next();
-        writer.writeStartElement(QStringLiteral("Override"));
-        writer.writeAttribute(QStringLiteral("PartName"), it.key());
-        writer.writeAttribute(QStringLiteral("ContentType"), it.value());
-        writer.writeEndElement(); //Override
-    }
+        QMapIterator<QString, QString> it(m_overrides);
+        while (it.hasNext()) {
+            it.next();
+            writer.writeStartElement(QStringLiteral("Override"));
+            writer.writeAttribute(QStringLiteral("PartName"), it.key());
+            writer.writeAttribute(QStringLiteral("ContentType"), it.value());
+            writer.writeEndElement(); // Override
+        }
     }
 
-    writer.writeEndElement();//Types
+    writer.writeEndElement(); // Types
     writer.writeEndDocument();
-
 }
 
 bool ContentTypes::loadFromXmlFile(QIODevice *device)
@@ -163,19 +179,19 @@ bool ContentTypes::loadFromXmlFile(QIODevice *device)
         if (token == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("Default")) {
                 QXmlStreamAttributes attrs = reader.attributes();
-                QString extension = attrs.value(QLatin1String("Extension")).toString();
-                QString type = attrs.value(QLatin1String("ContentType")).toString();
+                QString extension          = attrs.value(QLatin1String("Extension")).toString();
+                QString type               = attrs.value(QLatin1String("ContentType")).toString();
                 m_defaults.insert(extension, type);
             } else if (reader.name() == QLatin1String("Override")) {
                 QXmlStreamAttributes attrs = reader.attributes();
-                QString partName = attrs.value(QLatin1String("PartName")).toString();
-                QString type = attrs.value(QLatin1String("ContentType")).toString();
+                QString partName           = attrs.value(QLatin1String("PartName")).toString();
+                QString type               = attrs.value(QLatin1String("ContentType")).toString();
                 m_overrides.insert(partName, type);
             }
         }
 
         if (reader.hasError()) {
-            qDebug()<<reader.errorString();
+            qDebug() << reader.errorString();
         }
     }
     return true;
diff --git a/QXlsx/source/xlsxdatavalidation.cpp b/QXlsx/source/xlsxdatavalidation.cpp
index cf4c8e40..d1abb872 100644
--- a/QXlsx/source/xlsxdatavalidation.cpp
+++ b/QXlsx/source/xlsxdatavalidation.cpp
@@ -1,45 +1,55 @@
 // xlsxdatavalidation.cpp
 
-#include <QtGlobal>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
-
 #include "xlsxdatavalidation.h"
+
+#include "xlsxcellrange.h"
 #include "xlsxdatavalidation_p.h"
 #include "xlsxworksheet.h"
-#include "xlsxcellrange.h"
+
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
 DataValidationPrivate::DataValidationPrivate()
-    :validationType(DataValidation::None), validationOperator(DataValidation::Between)
-    , errorStyle(DataValidation::Stop), allowBlank(false), isPromptMessageVisible(true)
+    : validationType(DataValidation::None)
+    , validationOperator(DataValidation::Between)
+    , errorStyle(DataValidation::Stop)
+    , allowBlank(false)
+    , isPromptMessageVisible(true)
     , isErrorMessageVisible(true)
 {
-
 }
 
-DataValidationPrivate::DataValidationPrivate(DataValidation::ValidationType type, DataValidation::ValidationOperator op, const QString &formula1, const QString &formula2, bool allowBlank)
-    :validationType(type), validationOperator(op)
-    , errorStyle(DataValidation::Stop), allowBlank(allowBlank), isPromptMessageVisible(true)
-    , isErrorMessageVisible(true), formula1(formula1), formula2(formula2)
+DataValidationPrivate::DataValidationPrivate(DataValidation::ValidationType type,
+                                             DataValidation::ValidationOperator op,
+                                             const QString &formula1,
+                                             const QString &formula2,
+                                             bool allowBlank)
+    : validationType(type)
+    , validationOperator(op)
+    , errorStyle(DataValidation::Stop)
+    , allowBlank(allowBlank)
+    , isPromptMessageVisible(true)
+    , isErrorMessageVisible(true)
+    , formula1(formula1)
+    , formula2(formula2)
 {
-
 }
 
 DataValidationPrivate::DataValidationPrivate(const DataValidationPrivate &other)
-    :QSharedData(other)
-    , validationType(DataValidation::None), validationOperator(DataValidation::Between)
-    , errorStyle(DataValidation::Stop), allowBlank(false), isPromptMessageVisible(true)
+    : QSharedData(other)
+    , validationType(DataValidation::None)
+    , validationOperator(DataValidation::Between)
+    , errorStyle(DataValidation::Stop)
+    , allowBlank(false)
+    , isPromptMessageVisible(true)
     , isErrorMessageVisible(true)
 {
-
 }
 
-DataValidationPrivate::~DataValidationPrivate()
-{
-
-}
+DataValidationPrivate::~DataValidationPrivate() {}
 
 /*!
  * \class DataValidation
@@ -61,7 +71,8 @@ DataValidationPrivate::~DataValidationPrivate()
  * \value Date restricts the cell to date values.
  * \value Time restricts the cell to time values.
  * \value TextLength restricts the cell data based on an integer string length.
- * \value Custom restricts the cell based on an external Excel formula that returns a true/false value.
+ * \value Custom restricts the cell based on an external Excel formula that returns a true/false
+ * value.
  */
 
 /*!
@@ -95,28 +106,29 @@ DataValidationPrivate::~DataValidationPrivate()
  * Construct a data validation object with the given \a type, \a op, \a formula1
  * \a formula2, and \a allowBlank.
  */
-DataValidation::DataValidation(ValidationType type, ValidationOperator op, const QString &formula1, const QString &formula2, bool allowBlank)
-    :d(new DataValidationPrivate(type, op, formula1, formula2, allowBlank))
+DataValidation::DataValidation(ValidationType type,
+                               ValidationOperator op,
+                               const QString &formula1,
+                               const QString &formula2,
+                               bool allowBlank)
+    : d(new DataValidationPrivate(type, op, formula1, formula2, allowBlank))
 {
-
 }
 
 /*!
     Construct a data validation object
 */
 DataValidation::DataValidation()
-    :d(new DataValidationPrivate())
+    : d(new DataValidationPrivate())
 {
-
 }
 
 /*!
     Constructs a copy of \a other.
 */
 DataValidation::DataValidation(const DataValidation &other)
-    :d(other.d)
+    : d(other.d)
 {
-
 }
 
 /*!
@@ -128,13 +140,10 @@ DataValidation &DataValidation::operator=(const DataValidation &other)
     return *this;
 }
 
-
 /*!
  * Destroy the object.
  */
-DataValidation::~DataValidation()
-{
-}
+DataValidation::~DataValidation() {}
 
 /*!
     Returns the validation type.
@@ -291,7 +300,7 @@ void DataValidation::setFormula2(const QString &formula)
  */
 void DataValidation::setErrorMessage(const QString &error, const QString &title)
 {
-    d->errorMessage = error;
+    d->errorMessage      = error;
     d->errorMessageTitle = title;
 }
 
@@ -300,7 +309,7 @@ void DataValidation::setErrorMessage(const QString &error, const QString &title)
  */
 void DataValidation::setPromptMessage(const QString &prompt, const QString &title)
 {
-    d->promptMessage = prompt;
+    d->promptMessage      = prompt;
     d->promptMessageTitle = title;
 }
 
@@ -376,8 +385,7 @@ bool DataValidation::saveToXml(QXmlStreamWriter &writer) const
         {DataValidation::Date, QStringLiteral("date")},
         {DataValidation::Time, QStringLiteral("time")},
         {DataValidation::TextLength, QStringLiteral("textLength")},
-        {DataValidation::Custom, QStringLiteral("custom")}
-    };
+        {DataValidation::Custom, QStringLiteral("custom")}};
 
     static const QMap<DataValidation::ValidationOperator, QString> opMap = {
         {DataValidation::Between, QStringLiteral("between")},
@@ -387,14 +395,12 @@ bool DataValidation::saveToXml(QXmlStreamWriter &writer) const
         {DataValidation::LessThan, QStringLiteral("lessThan")},
         {DataValidation::LessThanOrEqual, QStringLiteral("lessThanOrEqual")},
         {DataValidation::GreaterThan, QStringLiteral("greaterThan")},
-        {DataValidation::GreaterThanOrEqual, QStringLiteral("greaterThanOrEqual")}
-    };
+        {DataValidation::GreaterThanOrEqual, QStringLiteral("greaterThanOrEqual")}};
 
     static const QMap<DataValidation::ErrorStyle, QString> esMap = {
         {DataValidation::Stop, QStringLiteral("stop")},
         {DataValidation::Warning, QStringLiteral("warning")},
-        {DataValidation::Information, QStringLiteral("information")}
-    };
+        {DataValidation::Information, QStringLiteral("information")}};
 
     writer.writeStartElement(QStringLiteral("dataValidation"));
     if (validationType() != DataValidation::None)
@@ -431,7 +437,7 @@ bool DataValidation::saveToXml(QXmlStreamWriter &writer) const
     if (!formula2().isEmpty())
         writer.writeTextElement(QStringLiteral("formula2"), formula2());
 
-    writer.writeEndElement(); //dataValidation
+    writer.writeEndElement(); // dataValidation
 
     return true;
 }
@@ -451,8 +457,7 @@ DataValidation DataValidation::loadFromXml(QXmlStreamReader &reader)
         {QStringLiteral("date"), DataValidation::Date},
         {QStringLiteral("time"), DataValidation::Time},
         {QStringLiteral("textLength"), DataValidation::TextLength},
-        {QStringLiteral("custom"), DataValidation::Custom}
-    };
+        {QStringLiteral("custom"), DataValidation::Custom}};
 
     static const QMap<QString, DataValidation::ValidationOperator> opMap = {
         {QStringLiteral("between"), DataValidation::Between},
@@ -462,37 +467,36 @@ DataValidation DataValidation::loadFromXml(QXmlStreamReader &reader)
         {QStringLiteral("lessThan"), DataValidation::LessThan},
         {QStringLiteral("lessThanOrEqual"), DataValidation::LessThanOrEqual},
         {QStringLiteral("greaterThan"), DataValidation::GreaterThan},
-        {QStringLiteral("greaterThanOrEqual"), DataValidation::GreaterThanOrEqual}
-    };
+        {QStringLiteral("greaterThanOrEqual"), DataValidation::GreaterThanOrEqual}};
 
     static const QMap<QString, DataValidation::ErrorStyle> esMap = {
         {QStringLiteral("stop"), DataValidation::Stop},
         {QStringLiteral("warning"), DataValidation::Warning},
-        {QStringLiteral("information"), DataValidation::Information}
-    };
+        {QStringLiteral("information"), DataValidation::Information}};
 
     DataValidation validation;
     QXmlStreamAttributes attrs = reader.attributes();
 
-    QString sqref = attrs.value(QLatin1String("sqref")).toString();
+    QString sqref         = attrs.value(QLatin1String("sqref")).toString();
     const auto sqrefParts = sqref.split(QLatin1Char(' '));
     for (const QString &range : sqrefParts)
         validation.addRange(range);
 
     if (attrs.hasAttribute(QLatin1String("type"))) {
         QString t = attrs.value(QLatin1String("type")).toString();
-        auto it = typeMap.constFind(t);
+        auto it   = typeMap.constFind(t);
         validation.setValidationType(it != typeMap.constEnd() ? it.value() : DataValidation::None);
     }
     if (attrs.hasAttribute(QLatin1String("errorStyle"))) {
         QString es = attrs.value(QLatin1String("errorStyle")).toString();
-        auto it = esMap.constFind(es);
+        auto it    = esMap.constFind(es);
         validation.setErrorStyle(it != esMap.constEnd() ? it.value() : DataValidation::Stop);
     }
     if (attrs.hasAttribute(QLatin1String("operator"))) {
         QString op = attrs.value(QLatin1String("operator")).toString();
-        auto it = opMap.constFind(op);
-        validation.setValidationOperator(it != opMap.constEnd() ? it.value() : DataValidation::Between);
+        auto it    = opMap.constFind(op);
+        validation.setValidationOperator(it != opMap.constEnd() ? it.value()
+                                                                : DataValidation::Between);
     }
     if (attrs.hasAttribute(QLatin1String("allowBlank"))) {
         validation.setAllowBlank(true);
@@ -511,17 +515,18 @@ DataValidation DataValidation::loadFromXml(QXmlStreamReader &reader)
     }
 
     QString et = attrs.value(QLatin1String("errorTitle")).toString();
-    QString e = attrs.value(QLatin1String("error")).toString();
+    QString e  = attrs.value(QLatin1String("error")).toString();
     if (!e.isEmpty() || !et.isEmpty())
         validation.setErrorMessage(e, et);
 
     QString pt = attrs.value(QLatin1String("promptTitle")).toString();
-    QString p = attrs.value(QLatin1String("prompt")).toString();
+    QString p  = attrs.value(QLatin1String("prompt")).toString();
     if (!p.isEmpty() || !pt.isEmpty())
         validation.setPromptMessage(p, pt);
 
-    //find the end
-    while(!(reader.name() == QLatin1String("dataValidation") && reader.tokenType() == QXmlStreamReader::EndElement)) {
+    // find the end
+    while (!(reader.name() == QLatin1String("dataValidation") &&
+             reader.tokenType() == QXmlStreamReader::EndElement)) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("formula1")) {
diff --git a/QXlsx/source/xlsxdatetype.cpp b/QXlsx/source/xlsxdatetype.cpp
index 6486b6a9..20a804f6 100644
--- a/QXlsx/source/xlsxdatetype.cpp
+++ b/QXlsx/source/xlsxdatetype.cpp
@@ -1,16 +1,15 @@
 // xlsxdatetype.cpp
 
-#include <QtGlobal>
+#include "xlsxdatetype.h"
 
 #include "xlsxglobal.h"
 #include "xlsxutility_p.h"
-#include "xlsxdatetype.h"
+
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
-DateType::DateType()
-{
-}
+DateType::DateType() {}
 
 /*
 DateType::DateType(bool is1904)
diff --git a/QXlsx/source/xlsxdocpropsapp.cpp b/QXlsx/source/xlsxdocpropsapp.cpp
index 01d40a15..9b828602 100644
--- a/QXlsx/source/xlsxdocpropsapp.cpp
+++ b/QXlsx/source/xlsxdocpropsapp.cpp
@@ -2,18 +2,18 @@
 
 #include "xlsxdocpropsapp_p.h"
 
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
+#include <QBuffer>
+#include <QDateTime>
 #include <QDir>
 #include <QFile>
-#include <QDateTime>
 #include <QVariant>
-#include <QBuffer>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
 
 QT_BEGIN_NAMESPACE_XLSX
 
 DocPropsApp::DocPropsApp(CreateFlag flag)
-    :AbstractOOXmlFile(flag)
+    : AbstractOOXmlFile(flag)
 {
 }
 
@@ -24,14 +24,12 @@ void DocPropsApp::addPartTitle(const QString &title)
 
 void DocPropsApp::addHeadingPair(const QString &name, int value)
 {
-    m_headingPairsList.append({ name, value });
+    m_headingPairsList.append({name, value});
 }
 
 bool DocPropsApp::setProperty(const QString &name, const QString &value)
 {
-    static const QStringList validKeys = {
-        QStringLiteral("manager"), QStringLiteral("company")
-    };
+    static const QStringList validKeys = {QStringLiteral("manager"), QStringLiteral("company")};
 
     if (!validKeys.contains(name))
         return false;
@@ -61,11 +59,13 @@ QStringList DocPropsApp::propertyNames() const
 void DocPropsApp::saveToXmlFile(QIODevice *device) const
 {
     QXmlStreamWriter writer(device);
-    QString vt = QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes");
+    QString vt =
+        QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes");
 
     writer.writeStartDocument(QStringLiteral("1.0"), true);
     writer.writeStartElement(QStringLiteral("Properties"));
-    writer.writeDefaultNamespace(QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"));
+    writer.writeDefaultNamespace(QStringLiteral(
+        "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"));
     writer.writeNamespace(vt, QStringLiteral("vt"));
     writer.writeTextElement(QStringLiteral("Application"), QStringLiteral("Microsoft Excel"));
     writer.writeTextElement(QStringLiteral("DocSecurity"), QStringLiteral("0"));
@@ -73,19 +73,19 @@ void DocPropsApp::saveToXmlFile(QIODevice *device) const
 
     writer.writeStartElement(QStringLiteral("HeadingPairs"));
     writer.writeStartElement(vt, QStringLiteral("vector"));
-    writer.writeAttribute(QStringLiteral("size"), QString::number(m_headingPairsList.size()*2));
+    writer.writeAttribute(QStringLiteral("size"), QString::number(m_headingPairsList.size() * 2));
     writer.writeAttribute(QStringLiteral("baseType"), QStringLiteral("variant"));
 
     for (const auto &pair : m_headingPairsList) {
         writer.writeStartElement(vt, QStringLiteral("variant"));
         writer.writeTextElement(vt, QStringLiteral("lpstr"), pair.first);
-        writer.writeEndElement(); //vt:variant
+        writer.writeEndElement(); // vt:variant
         writer.writeStartElement(vt, QStringLiteral("variant"));
         writer.writeTextElement(vt, QStringLiteral("i4"), QString::number(pair.second));
-        writer.writeEndElement(); //vt:variant
+        writer.writeEndElement(); // vt:variant
     }
-    writer.writeEndElement();//vt:vector
-    writer.writeEndElement();//HeadingPairs
+    writer.writeEndElement(); // vt:vector
+    writer.writeEndElement(); // HeadingPairs
 
     writer.writeStartElement(QStringLiteral("TitlesOfParts"));
     writer.writeStartElement(vt, QStringLiteral("vector"));
@@ -93,22 +93,23 @@ void DocPropsApp::saveToXmlFile(QIODevice *device) const
     writer.writeAttribute(QStringLiteral("baseType"), QStringLiteral("lpstr"));
     for (const QString &title : m_titlesOfPartsList)
         writer.writeTextElement(vt, QStringLiteral("lpstr"), title);
-    writer.writeEndElement();//vt:vector
-    writer.writeEndElement();//TitlesOfParts
+    writer.writeEndElement(); // vt:vector
+    writer.writeEndElement(); // TitlesOfParts
 
     auto it = m_properties.constFind(QStringLiteral("manager"));
     if (it != m_properties.constEnd())
         writer.writeTextElement(QStringLiteral("Manager"), it.value());
-    //Not like "manager", "company" always exists for Excel generated file.
+    // Not like "manager", "company" always exists for Excel generated file.
 
     it = m_properties.constFind(QStringLiteral("company"));
-    writer.writeTextElement(QStringLiteral("Company"), it != m_properties.constEnd() ? it.value() : QString());
+    writer.writeTextElement(QStringLiteral("Company"),
+                            it != m_properties.constEnd() ? it.value() : QString());
     writer.writeTextElement(QStringLiteral("LinksUpToDate"), QStringLiteral("false"));
     writer.writeTextElement(QStringLiteral("SharedDoc"), QStringLiteral("false"));
     writer.writeTextElement(QStringLiteral("HyperlinksChanged"), QStringLiteral("false"));
     writer.writeTextElement(QStringLiteral("AppVersion"), QStringLiteral("12.0000"));
 
-    writer.writeEndElement(); //Properties
+    writer.writeEndElement(); // Properties
     writer.writeEndDocument();
 }
 
@@ -116,21 +117,21 @@ bool DocPropsApp::loadFromXmlFile(QIODevice *device)
 {
     QXmlStreamReader reader(device);
     while (!reader.atEnd()) {
-         QXmlStreamReader::TokenType token = reader.readNext();
-         if (token == QXmlStreamReader::StartElement) {
-             if (reader.name() == QLatin1String("Properties"))
-                 continue;
-
-             if (reader.name() == QStringLiteral("Manager")) {
-                 setProperty(QStringLiteral("manager"), reader.readElementText());
-             } else if (reader.name() == QStringLiteral("Company")) {
-                 setProperty(QStringLiteral("company"), reader.readElementText());
-             }
-         }
-
-         if (reader.hasError()) {
-             qDebug("Error when read doc props app file.");
-         }
+        QXmlStreamReader::TokenType token = reader.readNext();
+        if (token == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("Properties"))
+                continue;
+
+            if (reader.name() == QStringLiteral("Manager")) {
+                setProperty(QStringLiteral("manager"), reader.readElementText());
+            } else if (reader.name() == QStringLiteral("Company")) {
+                setProperty(QStringLiteral("company"), reader.readElementText());
+            }
+        }
+
+        if (reader.hasError()) {
+            qDebug("Error when read doc props app file.");
+        }
     }
     return true;
 }
diff --git a/QXlsx/source/xlsxdocpropscore.cpp b/QXlsx/source/xlsxdocpropscore.cpp
index b11c8b67..450b8124 100644
--- a/QXlsx/source/xlsxdocpropscore.cpp
+++ b/QXlsx/source/xlsxdocpropscore.cpp
@@ -1,31 +1,33 @@
 // xlsxdocpropscore.cpp
 
-#include <QtGlobal>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
-#include <QDir>
-#include <QFile>
+#include "xlsxdocpropscore_p.h"
+
+#include <QBuffer>
 #include <QDateTime>
 #include <QDebug>
-#include <QBuffer>
-
-#include "xlsxdocpropscore_p.h"
+#include <QDir>
+#include <QFile>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
 DocPropsCore::DocPropsCore(CreateFlag flag)
-    :AbstractOOXmlFile(flag)
+    : AbstractOOXmlFile(flag)
 {
 }
 
 bool DocPropsCore::setProperty(const QString &name, const QString &value)
 {
-    static const QStringList validKeys = {
-        QStringLiteral("title"), QStringLiteral("subject"),
-        QStringLiteral("keywords"), QStringLiteral("description"),
-        QStringLiteral("category"), QStringLiteral("status"),
-        QStringLiteral("created"), QStringLiteral("creator")
-    };
+    static const QStringList validKeys = {QStringLiteral("title"),
+                                          QStringLiteral("subject"),
+                                          QStringLiteral("keywords"),
+                                          QStringLiteral("description"),
+                                          QStringLiteral("category"),
+                                          QStringLiteral("status"),
+                                          QStringLiteral("created"),
+                                          QStringLiteral("creator")};
 
     if (!validKeys.contains(name))
         return false;
@@ -55,11 +57,12 @@ QStringList DocPropsCore::propertyNames() const
 void DocPropsCore::saveToXmlFile(QIODevice *device) const
 {
     QXmlStreamWriter writer(device);
-    const QString cp = QStringLiteral("http://schemas.openxmlformats.org/package/2006/metadata/core-properties");
-    const QString dc = QStringLiteral("http://purl.org/dc/elements/1.1/");
-    const QString dcterms = QStringLiteral("http://purl.org/dc/terms/");
+    const QString cp =
+        QStringLiteral("http://schemas.openxmlformats.org/package/2006/metadata/core-properties");
+    const QString dc       = QStringLiteral("http://purl.org/dc/elements/1.1/");
+    const QString dcterms  = QStringLiteral("http://purl.org/dc/terms/");
     const QString dcmitype = QStringLiteral("http://purl.org/dc/dcmitype/");
-    const QString xsi = QStringLiteral("http://www.w3.org/2001/XMLSchema-instance");
+    const QString xsi      = QStringLiteral("http://www.w3.org/2001/XMLSchema-instance");
     writer.writeStartDocument(QStringLiteral("1.0"), true);
     writer.writeStartElement(QStringLiteral("cp:coreProperties"));
     writer.writeNamespace(cp, QStringLiteral("cp"));
@@ -77,7 +80,10 @@ void DocPropsCore::saveToXmlFile(QIODevice *device) const
         writer.writeTextElement(dc, QStringLiteral("subject"), it.value());
 
     it = m_properties.constFind(QStringLiteral("creator"));
-    writer.writeTextElement(dc, QStringLiteral("creator"), it != m_properties.constEnd() ? it.value() : QStringLiteral("Qt Xlsx Library"));
+    writer.writeTextElement(dc,
+                            QStringLiteral("creator"),
+                            it != m_properties.constEnd() ? it.value()
+                                                          : QStringLiteral("Qt Xlsx Library"));
 
     it = m_properties.constFind(QStringLiteral("keywords"));
     if (it != m_properties.constEnd())
@@ -88,18 +94,23 @@ void DocPropsCore::saveToXmlFile(QIODevice *device) const
         writer.writeTextElement(dc, QStringLiteral("description"), it.value());
 
     it = m_properties.constFind(QStringLiteral("creator"));
-    writer.writeTextElement(cp, QStringLiteral("lastModifiedBy"), it != m_properties.constEnd() ? it.value() : QStringLiteral("Qt Xlsx Library"));
+    writer.writeTextElement(cp,
+                            QStringLiteral("lastModifiedBy"),
+                            it != m_properties.constEnd() ? it.value()
+                                                          : QStringLiteral("Qt Xlsx Library"));
 
     writer.writeStartElement(dcterms, QStringLiteral("created"));
     writer.writeAttribute(xsi, QStringLiteral("type"), QStringLiteral("dcterms:W3CDTF"));
     it = m_properties.constFind(QStringLiteral("created"));
-    writer.writeCharacters(it != m_properties.constEnd() ? it.value() : QDateTime::currentDateTime().toString(Qt::ISODate));
-    writer.writeEndElement();//dcterms:created
+    writer.writeCharacters(it != m_properties.constEnd()
+                               ? it.value()
+                               : QDateTime::currentDateTime().toString(Qt::ISODate));
+    writer.writeEndElement(); // dcterms:created
 
     writer.writeStartElement(dcterms, QStringLiteral("modified"));
     writer.writeAttribute(xsi, QStringLiteral("type"), QStringLiteral("dcterms:W3CDTF"));
     writer.writeCharacters(QDateTime::currentDateTime().toString(Qt::ISODate));
-    writer.writeEndElement();//dcterms:created
+    writer.writeEndElement(); // dcterms:created
 
     it = m_properties.constFind(QStringLiteral("category"));
     if (it != m_properties.constEnd())
@@ -109,7 +120,7 @@ void DocPropsCore::saveToXmlFile(QIODevice *device) const
     if (it != m_properties.constEnd())
         writer.writeTextElement(cp, QStringLiteral("contentStatus"), it.value());
 
-    writer.writeEndElement(); //cp:coreProperties
+    writer.writeEndElement(); // cp:coreProperties
     writer.writeEndDocument();
 }
 
@@ -117,58 +128,41 @@ bool DocPropsCore::loadFromXmlFile(QIODevice *device)
 {
     QXmlStreamReader reader(device);
 
-    const QString cp = QStringLiteral("http://schemas.openxmlformats.org/package/2006/metadata/core-properties");
-    const QString dc = QStringLiteral("http://purl.org/dc/elements/1.1/");
+    const QString cp =
+        QStringLiteral("http://schemas.openxmlformats.org/package/2006/metadata/core-properties");
+    const QString dc      = QStringLiteral("http://purl.org/dc/elements/1.1/");
     const QString dcterms = QStringLiteral("http://purl.org/dc/terms/");
 
-    while (!reader.atEnd())
-    {
-         QXmlStreamReader::TokenType token = reader.readNext();
-
-         if (token == QXmlStreamReader::StartElement)
-         {
-
-             const auto& nsUri = reader.namespaceUri();
-             const auto& name = reader.name();
-
-             if (name == QStringLiteral("subject") && nsUri == dc)
-             {
-                 setProperty(QStringLiteral("subject"), reader.readElementText());
-             }
-             else if (name == QStringLiteral("title") && nsUri == dc)
-             {
-                 setProperty(QStringLiteral("title"), reader.readElementText());
-             }
-             else if (name == QStringLiteral("creator") && nsUri == dc)
-             {
-                 setProperty(QStringLiteral("creator"), reader.readElementText());
-             }
-             else if (name == QStringLiteral("description") && nsUri == dc)
-             {
-                 setProperty(QStringLiteral("description"), reader.readElementText());
-             }
-             else if (name == QStringLiteral("keywords") && nsUri == cp)
-             {
-                 setProperty(QStringLiteral("keywords"), reader.readElementText());
-             }
-             else if (name == QStringLiteral("created") && nsUri == dcterms)
-             {
-                 setProperty(QStringLiteral("created"), reader.readElementText());
-             }
-             else if (name == QStringLiteral("category") && nsUri == cp)
-             {
-                 setProperty(QStringLiteral("category"), reader.readElementText());
-             }
-             else if (name == QStringLiteral("contentStatus") && nsUri == cp)
-             {
-                 setProperty(QStringLiteral("status"), reader.readElementText());
-             }
-         }
-
-         if (reader.hasError())
-         {
-             qDebug() << "Error when read doc props core file." << reader.errorString();
-         }
+    while (!reader.atEnd()) {
+        QXmlStreamReader::TokenType token = reader.readNext();
+
+        if (token == QXmlStreamReader::StartElement) {
+
+            const auto &nsUri = reader.namespaceUri();
+            const auto &name  = reader.name();
+
+            if (name == QStringLiteral("subject") && nsUri == dc) {
+                setProperty(QStringLiteral("subject"), reader.readElementText());
+            } else if (name == QStringLiteral("title") && nsUri == dc) {
+                setProperty(QStringLiteral("title"), reader.readElementText());
+            } else if (name == QStringLiteral("creator") && nsUri == dc) {
+                setProperty(QStringLiteral("creator"), reader.readElementText());
+            } else if (name == QStringLiteral("description") && nsUri == dc) {
+                setProperty(QStringLiteral("description"), reader.readElementText());
+            } else if (name == QStringLiteral("keywords") && nsUri == cp) {
+                setProperty(QStringLiteral("keywords"), reader.readElementText());
+            } else if (name == QStringLiteral("created") && nsUri == dcterms) {
+                setProperty(QStringLiteral("created"), reader.readElementText());
+            } else if (name == QStringLiteral("category") && nsUri == cp) {
+                setProperty(QStringLiteral("category"), reader.readElementText());
+            } else if (name == QStringLiteral("contentStatus") && nsUri == cp) {
+                setProperty(QStringLiteral("status"), reader.readElementText());
+            }
+        }
+
+        if (reader.hasError()) {
+            qDebug() << "Error when read doc props core file." << reader.errorString();
+        }
     }
     return true;
 }
diff --git a/QXlsx/source/xlsxdocument.cpp b/QXlsx/source/xlsxdocument.cpp
index cf6d898b..8efebb54 100644
--- a/QXlsx/source/xlsxdocument.cpp
+++ b/QXlsx/source/xlsxdocument.cpp
@@ -1,162 +1,161 @@
 // xlsxdocument.cpp
 
-#include <QtGlobal>
-#include <QFile>
-#include <QPointF>
-#include <QBuffer>
-#include <QDir>
-#include <QTemporaryFile>
-#include <QFile>
-#include <QSharedPointer>
-#include <QDebug>
-
 #include "xlsxdocument.h"
-#include "xlsxdocument_p.h"
-#include "xlsxworkbook.h"
-#include "xlsxworksheet.h"
+
+#include "xlsxchart.h"
 #include "xlsxcontenttypes_p.h"
-#include "xlsxrelationships_p.h"
-#include "xlsxstyles_p.h"
-#include "xlsxtheme_p.h"
 #include "xlsxdocpropsapp_p.h"
 #include "xlsxdocpropscore_p.h"
+#include "xlsxdocument_p.h"
+#include "xlsxdrawing_p.h"
+#include "xlsxmediafile_p.h"
+#include "xlsxrelationships_p.h"
 #include "xlsxsharedstrings_p.h"
+#include "xlsxstyles_p.h"
+#include "xlsxtheme_p.h"
 #include "xlsxutility_p.h"
+#include "xlsxworkbook.h"
 #include "xlsxworkbook_p.h"
-#include "xlsxdrawing_p.h"
-#include "xlsxmediafile_p.h"
-#include "xlsxchart.h"
+#include "xlsxworksheet.h"
 #include "xlsxzipreader_p.h"
 #include "xlsxzipwriter_p.h"
 
+#include <QBuffer>
+#include <QDebug>
+#include <QDir>
+#include <QFile>
+#include <QPointF>
+#include <QSharedPointer>
+#include <QTemporaryFile>
+#include <QtGlobal>
+
 /*
-	From Wikipedia: The Open Packaging Conventions (OPC) is a
-	container-file technology initially created by Microsoft to store
-	a combination of XML and non-XML files that together form a single
-	entity such as an Open XML Paper Specification (OpenXPS)
-	document. http://en.wikipedia.org/wiki/Open_Packaging_Conventions.
-
-	At its simplest an Excel XLSX file contains the following elements:
-
-		 ____ [Content_Types].xml
-		|
-		|____ docProps
-		| |____ app.xml
-		| |____ core.xml
-		|
-		|____ xl
-		| |____ workbook.xml
-		| |____ worksheets
-		| | |____ sheet1.xml
-		| |
-		| |____ styles.xml
-		| |
-		| |____ theme
-		| | |____ theme1.xml
-		| |
-		| |_____rels
-		| |____ workbook.xml.rels
-		|
-		|_____rels
-		  |____ .rels
-
-	The Packager class coordinates the classes that represent the
-	elements of the package and writes them into the XLSX file.
+        From Wikipedia: The Open Packaging Conventions (OPC) is a
+        container-file technology initially created by Microsoft to store
+        a combination of XML and non-XML files that together form a single
+        entity such as an Open XML Paper Specification (OpenXPS)
+        document. http://en.wikipedia.org/wiki/Open_Packaging_Conventions.
+
+        At its simplest an Excel XLSX file contains the following elements:
+
+                 ____ [Content_Types].xml
+                |
+                |____ docProps
+                | |____ app.xml
+                | |____ core.xml
+                |
+                |____ xl
+                | |____ workbook.xml
+                | |____ worksheets
+                | | |____ sheet1.xml
+                | |
+                | |____ styles.xml
+                | |
+                | |____ theme
+                | | |____ theme1.xml
+                | |
+                | |_____rels
+                | |____ workbook.xml.rels
+                |
+                |_____rels
+                  |____ .rels
+
+        The Packager class coordinates the classes that represent the
+        elements of the package and writes them into the XLSX file.
 */
 
 QT_BEGIN_NAMESPACE_XLSX
 
 namespace xlsxDocumentCpp {
-	std::string copyTag(const std::string &sFrom, const std::string &sTo, const std::string &tag) {
-		const std::string tagToFindStart = "<" + tag;
-		const std::string tagToFindEnd = "</" + tag;
-		const std::string tagEnd = "</" + tag + ">";
-
-		// search all occurrences of tag in 'sFrom'
-		std::string sFromData = "";
-		size_t startIndex = 0;
-		while (true) {
-			std::size_t startPos = sFrom.find(tagToFindStart, startIndex);
-			if (startPos != std::string::npos) {
-				std::size_t endPos = sFrom.find(tagToFindEnd, startPos);
-				std::string tagEndTmp = tagEnd;
-				if (endPos == std::string::npos) {	// second try to find the ending, maybe it is "/>" 
-					endPos = sFrom.find("/>", startPos);
-					tagEndTmp = "/>";
-				}
-				if (endPos != std::string::npos) {
-					sFromData += sFrom.substr(startPos, endPos - startPos) + tagEndTmp;
-					startIndex = endPos + strlen(tagEndTmp.c_str());
-				}
-				else {
-					break;
-				}
-			}
-			else {
-				break;
-			}
-		}
-
-		std::string sOut = sTo; // copy 'sTo' in the output string
-
-		if (!sFromData.empty()) { // tag found in 'from'?
-								  // search all occurrences of tag in 'sOut' and delete them
-			int firstPosTag = -1;
-			while (true) {
-				std::size_t startPos = sOut.find(tagToFindStart);
-				if (startPos != std::string::npos) {
-					std::size_t endPos = sOut.find(tagToFindEnd);
-					std::string tagEndTmp = tagEnd;
-					if (endPos == std::string::npos) {	// second try to find the ending, maybe it is "/>" 
-						endPos = sOut.find("/>", startPos);
-						tagEndTmp = "/>";
-					}
-					if (endPos != std::string::npos) {
-						if (firstPosTag < 0)
-							firstPosTag = startPos;
-						std::string stringBefore = sOut.substr(0, startPos);
-						endPos += strlen(tagEndTmp.c_str());
-						std::string stringAfter = sOut.substr(endPos, strlen(sOut.c_str()) - endPos);
-						sOut = stringBefore + stringAfter;
-					}
-					else {
-						break;
-					}
-				}
-				else {
-					break;
-				}
-			}
-
-			if (firstPosTag == -1) {
-				// tag not found in 'sTo' file
-				// try to find a default pos using standard tags
-				std::vector<std::string> defaultPos{ "</styleSheet>", "<pageMargins", "</workbook>" };
-				for (unsigned int i = 0; i < defaultPos.size(); ++i) {
-					std::size_t iDefaultPos = sOut.find(defaultPos[i]);
-					if (iDefaultPos != std::string::npos) {
-						firstPosTag = iDefaultPos;
-						break;
-					}
-				}
-			}
-
-			// add the tag extracted from 'sFrom' in 'sOut'
-			// add in the position of the first tag found in 'sOut' ('firstPosTag')
-			if (firstPosTag >= 0) {
-				std::string stringBefore = sOut.substr(0, firstPosTag);
-				std::string stringAfter = sOut.substr(firstPosTag, strlen(sOut.c_str()) - firstPosTag);
-				sOut = stringBefore + sFromData + stringAfter;
-			}
-		}
-
-		return sOut;
-	}
-}
-
-DocumentPrivate::DocumentPrivate(Document *p) :
-	q_ptr(p), defaultPackageName(QStringLiteral("Book1.xlsx")),
-	isLoad(false)
+std::string copyTag(const std::string &sFrom, const std::string &sTo, const std::string &tag)
+{
+    const std::string tagToFindStart = "<" + tag;
+    const std::string tagToFindEnd   = "</" + tag;
+    const std::string tagEnd         = "</" + tag + ">";
+
+    // search all occurrences of tag in 'sFrom'
+    std::string sFromData = "";
+    size_t startIndex     = 0;
+    while (true) {
+        std::size_t startPos = sFrom.find(tagToFindStart, startIndex);
+        if (startPos != std::string::npos) {
+            std::size_t endPos    = sFrom.find(tagToFindEnd, startPos);
+            std::string tagEndTmp = tagEnd;
+            if (endPos == std::string::npos) { // second try to find the ending, maybe it is "/>"
+                endPos    = sFrom.find("/>", startPos);
+                tagEndTmp = "/>";
+            }
+            if (endPos != std::string::npos) {
+                sFromData += sFrom.substr(startPos, endPos - startPos) + tagEndTmp;
+                startIndex = endPos + strlen(tagEndTmp.c_str());
+            } else {
+                break;
+            }
+        } else {
+            break;
+        }
+    }
+
+    std::string sOut = sTo; // copy 'sTo' in the output string
+
+    if (!sFromData.empty()) { // tag found in 'from'?
+                              // search all occurrences of tag in 'sOut' and delete them
+        int firstPosTag = -1;
+        while (true) {
+            std::size_t startPos = sOut.find(tagToFindStart);
+            if (startPos != std::string::npos) {
+                std::size_t endPos    = sOut.find(tagToFindEnd);
+                std::string tagEndTmp = tagEnd;
+                if (endPos ==
+                    std::string::npos) { // second try to find the ending, maybe it is "/>"
+                    endPos    = sOut.find("/>", startPos);
+                    tagEndTmp = "/>";
+                }
+                if (endPos != std::string::npos) {
+                    if (firstPosTag < 0)
+                        firstPosTag = startPos;
+                    std::string stringBefore = sOut.substr(0, startPos);
+                    endPos += strlen(tagEndTmp.c_str());
+                    std::string stringAfter = sOut.substr(endPos, strlen(sOut.c_str()) - endPos);
+                    sOut                    = stringBefore + stringAfter;
+                } else {
+                    break;
+                }
+            } else {
+                break;
+            }
+        }
+
+        if (firstPosTag == -1) {
+            // tag not found in 'sTo' file
+            // try to find a default pos using standard tags
+            std::vector<std::string> defaultPos{"</styleSheet>", "<pageMargins", "</workbook>"};
+            for (unsigned int i = 0; i < defaultPos.size(); ++i) {
+                std::size_t iDefaultPos = sOut.find(defaultPos[i]);
+                if (iDefaultPos != std::string::npos) {
+                    firstPosTag = iDefaultPos;
+                    break;
+                }
+            }
+        }
+
+        // add the tag extracted from 'sFrom' in 'sOut'
+        // add in the position of the first tag found in 'sOut' ('firstPosTag')
+        if (firstPosTag >= 0) {
+            std::string stringBefore = sOut.substr(0, firstPosTag);
+            std::string stringAfter  = sOut.substr(firstPosTag, strlen(sOut.c_str()) - firstPosTag);
+            sOut                     = stringBefore + sFromData + stringAfter;
+        }
+    }
+
+    return sOut;
+}
+} // namespace xlsxDocumentCpp
+
+DocumentPrivate::DocumentPrivate(Document *p)
+    : q_ptr(p)
+    , defaultPackageName(QStringLiteral("Book1.xlsx"))
+    , isLoad(false)
 {
 }
 
@@ -171,361 +170,382 @@ void DocumentPrivate::init()
 
 bool DocumentPrivate::loadPackage(QIODevice *device)
 {
-	Q_Q(Document);
-	ZipReader zipReader(device);
-	QStringList filePaths = zipReader.filePaths();
+    Q_Q(Document);
+    ZipReader zipReader(device);
+    QStringList filePaths = zipReader.filePaths();
 
-	//Load the Content_Types file
-	if (!filePaths.contains(QLatin1String("[Content_Types].xml")))
-		return false;
+    // Load the Content_Types file
+    if (!filePaths.contains(QLatin1String("[Content_Types].xml")))
+        return false;
     contentTypes = std::make_shared<ContentTypes>(ContentTypes::F_LoadFromExists);
-	contentTypes->loadFromXmlData(zipReader.fileData(QStringLiteral("[Content_Types].xml")));
-
-	//Load root rels file
-	if (!filePaths.contains(QLatin1String("_rels/.rels")))
-		return false;
-	Relationships rootRels;
-	rootRels.loadFromXmlData(zipReader.fileData(QStringLiteral("_rels/.rels")));
-
-	//load core property
-	QList<XlsxRelationship> rels_core = rootRels.packageRelationships(QStringLiteral("/metadata/core-properties"));
-	if (!rels_core.isEmpty()) {
-		//Get the core property file name if it exists.
-		//In normal case, this should be "docProps/core.xml"
-		QString docPropsCore_Name = rels_core[0].target;
-
-		DocPropsCore props(DocPropsCore::F_LoadFromExists);
-		props.loadFromXmlData(zipReader.fileData(docPropsCore_Name));
+    contentTypes->loadFromXmlData(zipReader.fileData(QStringLiteral("[Content_Types].xml")));
+
+    // Load root rels file
+    if (!filePaths.contains(QLatin1String("_rels/.rels")))
+        return false;
+    Relationships rootRels;
+    rootRels.loadFromXmlData(zipReader.fileData(QStringLiteral("_rels/.rels")));
+
+    // load core property
+    QList<XlsxRelationship> rels_core =
+        rootRels.packageRelationships(QStringLiteral("/metadata/core-properties"));
+    if (!rels_core.isEmpty()) {
+        // Get the core property file name if it exists.
+        // In normal case, this should be "docProps/core.xml"
+        QString docPropsCore_Name = rels_core[0].target;
+
+        DocPropsCore props(DocPropsCore::F_LoadFromExists);
+        props.loadFromXmlData(zipReader.fileData(docPropsCore_Name));
         const auto propNames = props.propertyNames();
         for (const QString &name : propNames)
-			q->setDocumentProperty(name, props.property(name));
-	}
-
-	//load app property
-	QList<XlsxRelationship> rels_app = rootRels.documentRelationships(QStringLiteral("/extended-properties"));
-	if (!rels_app.isEmpty()) {
-		//Get the app property file name if it exists.
-		//In normal case, this should be "docProps/app.xml"
-		QString docPropsApp_Name = rels_app[0].target;
-
-		DocPropsApp props(DocPropsApp::F_LoadFromExists);
-		props.loadFromXmlData(zipReader.fileData(docPropsApp_Name));
+            q->setDocumentProperty(name, props.property(name));
+    }
+
+    // load app property
+    QList<XlsxRelationship> rels_app =
+        rootRels.documentRelationships(QStringLiteral("/extended-properties"));
+    if (!rels_app.isEmpty()) {
+        // Get the app property file name if it exists.
+        // In normal case, this should be "docProps/app.xml"
+        QString docPropsApp_Name = rels_app[0].target;
+
+        DocPropsApp props(DocPropsApp::F_LoadFromExists);
+        props.loadFromXmlData(zipReader.fileData(docPropsApp_Name));
         const auto propNames = props.propertyNames();
         for (const QString &name : propNames)
-			q->setDocumentProperty(name, props.property(name));
-	}
+            q->setDocumentProperty(name, props.property(name));
+    }
 
-	//load workbook now, Get the workbook file path from the root rels file
-	//In normal case, this should be "xl/workbook.xml"
+    // load workbook now, Get the workbook file path from the root rels file
+    // In normal case, this should be "xl/workbook.xml"
     workbook = QSharedPointer<Workbook>(new Workbook(Workbook::F_LoadFromExists));
-	QList<XlsxRelationship> rels_xl = rootRels.documentRelationships(QStringLiteral("/officeDocument"));
-	if (rels_xl.isEmpty())
-		return false;
+    QList<XlsxRelationship> rels_xl =
+        rootRels.documentRelationships(QStringLiteral("/officeDocument"));
+    if (rels_xl.isEmpty())
+        return false;
     const QString xlworkbook_Path = rels_xl[0].target;
-    const auto parts = splitPath(xlworkbook_Path);
-    const QString xlworkbook_Dir = parts.first();
-    const QString relFilePath = getRelFilePath(xlworkbook_Path);
+    const auto parts              = splitPath(xlworkbook_Path);
+    const QString xlworkbook_Dir  = parts.first();
+    const QString relFilePath     = getRelFilePath(xlworkbook_Path);
 
-    workbook->relationships()->loadFromXmlData( zipReader.fileData(relFilePath) );
-	workbook->setFilePath(xlworkbook_Path);
-	workbook->loadFromXmlData(zipReader.fileData(xlworkbook_Path));
+    workbook->relationships()->loadFromXmlData(zipReader.fileData(relFilePath));
+    workbook->setFilePath(xlworkbook_Path);
+    workbook->loadFromXmlData(zipReader.fileData(xlworkbook_Path));
 
-	//load styles
-	QList<XlsxRelationship> rels_styles = workbook->relationships()->documentRelationships(QStringLiteral("/styles"));
-	if (!rels_styles.isEmpty()) {
-		//In normal case this should be styles.xml which in xl
-		QString name = rels_styles[0].target;
+    // load styles
+    QList<XlsxRelationship> rels_styles =
+        workbook->relationships()->documentRelationships(QStringLiteral("/styles"));
+    if (!rels_styles.isEmpty()) {
+        // In normal case this should be styles.xml which in xl
+        QString name = rels_styles[0].target;
 
         // dev34
         QString path;
-        if ( xlworkbook_Dir == QLatin1String(".") ) // root
+        if (xlworkbook_Dir == QLatin1String(".")) // root
         {
             path = name;
-        }
-        else
-        {
+        } else {
             path = xlworkbook_Dir + QLatin1String("/") + name;
         }
 
-		QSharedPointer<Styles> styles (new Styles(Styles::F_LoadFromExists));
-		styles->loadFromXmlData(zipReader.fileData(path));
-		workbook->d_func()->styles = styles;
-	}
-
-	//load sharedStrings
-	QList<XlsxRelationship> rels_sharedStrings = workbook->relationships()->documentRelationships(QStringLiteral("/sharedStrings"));
-	if (!rels_sharedStrings.isEmpty()) {
-		//In normal case this should be sharedStrings.xml which in xl
-		QString name = rels_sharedStrings[0].target;
-		QString path = xlworkbook_Dir + QLatin1String("/") + name;
-		workbook->d_func()->sharedStrings->loadFromXmlData(zipReader.fileData(path));
-	}
-
-	//load theme
-	QList<XlsxRelationship> rels_theme = workbook->relationships()->documentRelationships(QStringLiteral("/theme"));
-	if (!rels_theme.isEmpty()) {
-		//In normal case this should be theme/theme1.xml which in xl
-		QString name = rels_theme[0].target;
-		QString path = xlworkbook_Dir + QLatin1String("/") + name;
-		workbook->theme()->loadFromXmlData(zipReader.fileData(path));
-	}
-
-	//load sheets
-	for (int i=0; i<workbook->sheetCount(); ++i) {
-		AbstractSheet *sheet = workbook->sheet(i);
-        QString strFilePath = sheet->filePath();
-        QString rel_path = getRelFilePath(strFilePath);
-		//If the .rel file exists, load it.
-		if (zipReader.filePaths().contains(rel_path))
-			sheet->relationships()->loadFromXmlData(zipReader.fileData(rel_path));
-		sheet->loadFromXmlData(zipReader.fileData(sheet->filePath()));
-	}
-
-	//load external links
-	for (int i=0; i<workbook->d_func()->externalLinks.count(); ++i) {
-		SimpleOOXmlFile *link = workbook->d_func()->externalLinks[i].data();
-		QString rel_path = getRelFilePath(link->filePath());
-		//If the .rel file exists, load it.
-		if (zipReader.filePaths().contains(rel_path))
-			link->relationships()->loadFromXmlData(zipReader.fileData(rel_path));
-		link->loadFromXmlData(zipReader.fileData(link->filePath()));
-	}
-
-	//load drawings
-	for (int i=0; i<workbook->drawings().size(); ++i) {
-		Drawing *drawing = workbook->drawings()[i];
-		QString rel_path = getRelFilePath(drawing->filePath());
-		if (zipReader.filePaths().contains(rel_path))
-			drawing->relationships()->loadFromXmlData(zipReader.fileData(rel_path));
-		drawing->loadFromXmlData(zipReader.fileData(drawing->filePath()));
-	}
-
-	//load charts
-	QList<QSharedPointer<Chart> > chartFileToLoad = workbook->chartFiles();
-	for (int i=0; i<chartFileToLoad.size(); ++i) {
-		QSharedPointer<Chart> cf = chartFileToLoad[i];
-		cf->loadFromXmlData(zipReader.fileData(cf->filePath()));
-	}
-
-	//load media files
+        QSharedPointer<Styles> styles(new Styles(Styles::F_LoadFromExists));
+        styles->loadFromXmlData(zipReader.fileData(path));
+        workbook->d_func()->styles = styles;
+    }
+
+    // load sharedStrings
+    QList<XlsxRelationship> rels_sharedStrings =
+        workbook->relationships()->documentRelationships(QStringLiteral("/sharedStrings"));
+    if (!rels_sharedStrings.isEmpty()) {
+        // In normal case this should be sharedStrings.xml which in xl
+        QString name = rels_sharedStrings[0].target;
+        QString path = xlworkbook_Dir + QLatin1String("/") + name;
+        workbook->d_func()->sharedStrings->loadFromXmlData(zipReader.fileData(path));
+    }
+
+    // load theme
+    QList<XlsxRelationship> rels_theme =
+        workbook->relationships()->documentRelationships(QStringLiteral("/theme"));
+    if (!rels_theme.isEmpty()) {
+        // In normal case this should be theme/theme1.xml which in xl
+        QString name = rels_theme[0].target;
+        QString path = xlworkbook_Dir + QLatin1String("/") + name;
+        workbook->theme()->loadFromXmlData(zipReader.fileData(path));
+    }
+
+    // load sheets
+    for (int i = 0; i < workbook->sheetCount(); ++i) {
+        AbstractSheet *sheet = workbook->sheet(i);
+        QString strFilePath  = sheet->filePath();
+        QString rel_path     = getRelFilePath(strFilePath);
+        // If the .rel file exists, load it.
+        if (zipReader.filePaths().contains(rel_path))
+            sheet->relationships()->loadFromXmlData(zipReader.fileData(rel_path));
+        sheet->loadFromXmlData(zipReader.fileData(sheet->filePath()));
+    }
+
+    // load external links
+    for (int i = 0; i < workbook->d_func()->externalLinks.count(); ++i) {
+        SimpleOOXmlFile *link = workbook->d_func()->externalLinks[i].data();
+        QString rel_path      = getRelFilePath(link->filePath());
+        // If the .rel file exists, load it.
+        if (zipReader.filePaths().contains(rel_path))
+            link->relationships()->loadFromXmlData(zipReader.fileData(rel_path));
+        link->loadFromXmlData(zipReader.fileData(link->filePath()));
+    }
+
+    // load drawings
+    for (int i = 0; i < workbook->drawings().size(); ++i) {
+        Drawing *drawing = workbook->drawings()[i];
+        QString rel_path = getRelFilePath(drawing->filePath());
+        if (zipReader.filePaths().contains(rel_path))
+            drawing->relationships()->loadFromXmlData(zipReader.fileData(rel_path));
+        drawing->loadFromXmlData(zipReader.fileData(drawing->filePath()));
+    }
+
+    // load charts
+    QList<QSharedPointer<Chart>> chartFileToLoad = workbook->chartFiles();
+    for (int i = 0; i < chartFileToLoad.size(); ++i) {
+        QSharedPointer<Chart> cf = chartFileToLoad[i];
+        cf->loadFromXmlData(zipReader.fileData(cf->filePath()));
+    }
+
+    // load media files
     const auto mediaFileToLoad = workbook->mediaFiles();
     for (const auto &mf : mediaFileToLoad) {
-		const QString path = mf->fileName();
-		const QString suffix = path.mid(path.lastIndexOf(QLatin1Char('.'))+1);
-		mf->set(zipReader.fileData(path), suffix);
-	}
+        const QString path   = mf->fileName();
+        const QString suffix = path.mid(path.lastIndexOf(QLatin1Char('.')) + 1);
+        mf->set(zipReader.fileData(path), suffix);
+    }
 
-	isLoad = true; 
-	return true;
+    isLoad = true;
+    return true;
 }
 
 bool DocumentPrivate::savePackage(QIODevice *device) const
 {
-	Q_Q(const Document);
+    Q_Q(const Document);
 
-	ZipWriter zipWriter(device);
-	if (zipWriter.error())
-		return false;
+    ZipWriter zipWriter(device);
+    if (zipWriter.error())
+        return false;
 
-	contentTypes->clearOverrides();
+    contentTypes->clearOverrides();
 
-	DocPropsApp docPropsApp(DocPropsApp::F_NewFromScratch);
-	DocPropsCore docPropsCore(DocPropsCore::F_NewFromScratch);
+    DocPropsApp docPropsApp(DocPropsApp::F_NewFromScratch);
+    DocPropsCore docPropsCore(DocPropsCore::F_NewFromScratch);
 
-	// save worksheet xml files
-	QList<QSharedPointer<AbstractSheet> > worksheets = workbook->getSheetsByTypes(AbstractSheet::ST_WorkSheet);
-	if (!worksheets.isEmpty())
-		docPropsApp.addHeadingPair(QStringLiteral("Worksheets"), worksheets.size());
+    // save worksheet xml files
+    QList<QSharedPointer<AbstractSheet>> worksheets =
+        workbook->getSheetsByTypes(AbstractSheet::ST_WorkSheet);
+    if (!worksheets.isEmpty())
+        docPropsApp.addHeadingPair(QStringLiteral("Worksheets"), worksheets.size());
 
-    for (int i = 0 ; i < worksheets.size(); ++i)
-    {
-		QSharedPointer<AbstractSheet> sheet = worksheets[i];
-        contentTypes->addWorksheetName(QStringLiteral("sheet%1").arg(i+1));
-		docPropsApp.addPartTitle(sheet->sheetName());
+    for (int i = 0; i < worksheets.size(); ++i) {
+        QSharedPointer<AbstractSheet> sheet = worksheets[i];
+        contentTypes->addWorksheetName(QStringLiteral("sheet%1").arg(i + 1));
+        docPropsApp.addPartTitle(sheet->sheetName());
 
-        zipWriter.addFile(QStringLiteral("xl/worksheets/sheet%1.xml").arg(i+1), sheet->saveToXmlData());
+        zipWriter.addFile(QStringLiteral("xl/worksheets/sheet%1.xml").arg(i + 1),
+                          sheet->saveToXmlData());
 
-		Relationships *rel = sheet->relationships();
-		if (!rel->isEmpty())
-            zipWriter.addFile(QStringLiteral("xl/worksheets/_rels/sheet%1.xml.rels").arg(i+1), rel->saveToXmlData());
-	}
+        Relationships *rel = sheet->relationships();
+        if (!rel->isEmpty())
+            zipWriter.addFile(QStringLiteral("xl/worksheets/_rels/sheet%1.xml.rels").arg(i + 1),
+                              rel->saveToXmlData());
+    }
 
-	//save chartsheet xml files
-	QList<QSharedPointer<AbstractSheet> > chartsheets = workbook->getSheetsByTypes(AbstractSheet::ST_ChartSheet);
-	if (!chartsheets.isEmpty())
+    // save chartsheet xml files
+    QList<QSharedPointer<AbstractSheet>> chartsheets =
+        workbook->getSheetsByTypes(AbstractSheet::ST_ChartSheet);
+    if (!chartsheets.isEmpty())
         docPropsApp.addHeadingPair(QStringLiteral("Chartsheets"), chartsheets.size());
-    for (int i=0; i<chartsheets.size(); ++i)
-    {
-		QSharedPointer<AbstractSheet> sheet = chartsheets[i];
-        contentTypes->addWorksheetName(QStringLiteral("sheet%1").arg(i+1));
-		docPropsApp.addPartTitle(sheet->sheetName());
-
-        zipWriter.addFile(QStringLiteral("xl/chartsheets/sheet%1.xml").arg(i+1), sheet->saveToXmlData());
-		Relationships *rel = sheet->relationships();
-		if (!rel->isEmpty())
-            zipWriter.addFile(QStringLiteral("xl/chartsheets/_rels/sheet%1.xml.rels").arg(i+1), rel->saveToXmlData());
-	}
-
-	// save external links xml files
-    for (int i=0; i<workbook->d_func()->externalLinks.count(); ++i)
-    {
-		SimpleOOXmlFile *link = workbook->d_func()->externalLinks[i].data();
-        contentTypes->addExternalLinkName(QStringLiteral("externalLink%1").arg(i+1));
-
-        zipWriter.addFile(QStringLiteral("xl/externalLinks/externalLink%1.xml").arg(i+1), link->saveToXmlData());
-		Relationships *rel = link->relationships();
-		if (!rel->isEmpty())
-            zipWriter.addFile(QStringLiteral("xl/externalLinks/_rels/externalLink%1.xml.rels").arg(i+1), rel->saveToXmlData());
-	}
-
-	// save workbook xml file
-	contentTypes->addWorkbook();
-	zipWriter.addFile(QStringLiteral("xl/workbook.xml"), workbook->saveToXmlData());
-	zipWriter.addFile(QStringLiteral("xl/_rels/workbook.xml.rels"), workbook->relationships()->saveToXmlData());
-
-	// save drawing xml files
-    for (int i=0; i<workbook->drawings().size(); ++i)
-    {
-        contentTypes->addDrawingName(QStringLiteral("drawing%1").arg(i+1));
-
-		Drawing *drawing = workbook->drawings()[i];
-        zipWriter.addFile(QStringLiteral("xl/drawings/drawing%1.xml").arg(i+1), drawing->saveToXmlData());
-		if (!drawing->relationships()->isEmpty())
-            zipWriter.addFile(QStringLiteral("xl/drawings/_rels/drawing%1.xml.rels").arg(i+1), drawing->relationships()->saveToXmlData());
-	}
-
-	// save docProps app/core xml file
+    for (int i = 0; i < chartsheets.size(); ++i) {
+        QSharedPointer<AbstractSheet> sheet = chartsheets[i];
+        contentTypes->addWorksheetName(QStringLiteral("sheet%1").arg(i + 1));
+        docPropsApp.addPartTitle(sheet->sheetName());
+
+        zipWriter.addFile(QStringLiteral("xl/chartsheets/sheet%1.xml").arg(i + 1),
+                          sheet->saveToXmlData());
+        Relationships *rel = sheet->relationships();
+        if (!rel->isEmpty())
+            zipWriter.addFile(QStringLiteral("xl/chartsheets/_rels/sheet%1.xml.rels").arg(i + 1),
+                              rel->saveToXmlData());
+    }
+
+    // save external links xml files
+    for (int i = 0; i < workbook->d_func()->externalLinks.count(); ++i) {
+        SimpleOOXmlFile *link = workbook->d_func()->externalLinks[i].data();
+        contentTypes->addExternalLinkName(QStringLiteral("externalLink%1").arg(i + 1));
+
+        zipWriter.addFile(QStringLiteral("xl/externalLinks/externalLink%1.xml").arg(i + 1),
+                          link->saveToXmlData());
+        Relationships *rel = link->relationships();
+        if (!rel->isEmpty())
+            zipWriter.addFile(
+                QStringLiteral("xl/externalLinks/_rels/externalLink%1.xml.rels").arg(i + 1),
+                rel->saveToXmlData());
+    }
+
+    // save workbook xml file
+    contentTypes->addWorkbook();
+    zipWriter.addFile(QStringLiteral("xl/workbook.xml"), workbook->saveToXmlData());
+    zipWriter.addFile(QStringLiteral("xl/_rels/workbook.xml.rels"),
+                      workbook->relationships()->saveToXmlData());
+
+    // save drawing xml files
+    for (int i = 0; i < workbook->drawings().size(); ++i) {
+        contentTypes->addDrawingName(QStringLiteral("drawing%1").arg(i + 1));
+
+        Drawing *drawing = workbook->drawings()[i];
+        zipWriter.addFile(QStringLiteral("xl/drawings/drawing%1.xml").arg(i + 1),
+                          drawing->saveToXmlData());
+        if (!drawing->relationships()->isEmpty())
+            zipWriter.addFile(QStringLiteral("xl/drawings/_rels/drawing%1.xml.rels").arg(i + 1),
+                              drawing->relationships()->saveToXmlData());
+    }
+
+    // save docProps app/core xml file
     const auto docPropNames = q->documentPropertyNames();
     for (const QString &name : docPropNames) {
-		docPropsApp.setProperty(name, q->documentProperty(name));
-		docPropsCore.setProperty(name, q->documentProperty(name));
-	}
-	contentTypes->addDocPropApp();
-	contentTypes->addDocPropCore();
-	zipWriter.addFile(QStringLiteral("docProps/app.xml"), docPropsApp.saveToXmlData());
-	zipWriter.addFile(QStringLiteral("docProps/core.xml"), docPropsCore.saveToXmlData());
-
-	// save sharedStrings xml file
-	if (!workbook->sharedStrings()->isEmpty()) {
-		contentTypes->addSharedString();
-		zipWriter.addFile(QStringLiteral("xl/sharedStrings.xml"), workbook->sharedStrings()->saveToXmlData());
-	}
+        docPropsApp.setProperty(name, q->documentProperty(name));
+        docPropsCore.setProperty(name, q->documentProperty(name));
+    }
+    contentTypes->addDocPropApp();
+    contentTypes->addDocPropCore();
+    zipWriter.addFile(QStringLiteral("docProps/app.xml"), docPropsApp.saveToXmlData());
+    zipWriter.addFile(QStringLiteral("docProps/core.xml"), docPropsCore.saveToXmlData());
+
+    // save sharedStrings xml file
+    if (!workbook->sharedStrings()->isEmpty()) {
+        contentTypes->addSharedString();
+        zipWriter.addFile(QStringLiteral("xl/sharedStrings.xml"),
+                          workbook->sharedStrings()->saveToXmlData());
+    }
 
     // save calc chain [dev16]
     contentTypes->addCalcChain();
     zipWriter.addFile(QStringLiteral("xl/calcChain.xml"), workbook->styles()->saveToXmlData());
 
-	// save styles xml file
-	contentTypes->addStyles();
-	zipWriter.addFile(QStringLiteral("xl/styles.xml"), workbook->styles()->saveToXmlData());
+    // save styles xml file
+    contentTypes->addStyles();
+    zipWriter.addFile(QStringLiteral("xl/styles.xml"), workbook->styles()->saveToXmlData());
 
-	// save theme xml file
-	contentTypes->addTheme();
-	zipWriter.addFile(QStringLiteral("xl/theme/theme1.xml"), workbook->theme()->saveToXmlData());
+    // save theme xml file
+    contentTypes->addTheme();
+    zipWriter.addFile(QStringLiteral("xl/theme/theme1.xml"), workbook->theme()->saveToXmlData());
 
-	// save chart xml files
-    for (int i=0; i<workbook->chartFiles().size(); ++i)
-    {
-        contentTypes->addChartName(QStringLiteral("chart%1").arg(i+1));
-		QSharedPointer<Chart> cf = workbook->chartFiles()[i];
-        zipWriter.addFile(QStringLiteral("xl/charts/chart%1.xml").arg(i+1), cf->saveToXmlData());
-	}
+    // save chart xml files
+    for (int i = 0; i < workbook->chartFiles().size(); ++i) {
+        contentTypes->addChartName(QStringLiteral("chart%1").arg(i + 1));
+        QSharedPointer<Chart> cf = workbook->chartFiles()[i];
+        zipWriter.addFile(QStringLiteral("xl/charts/chart%1.xml").arg(i + 1), cf->saveToXmlData());
+    }
 
-	// save image files
+    // save image files
     const auto mfs = workbook->mediaFiles();
-    for (int i=0; i < mfs.size(); ++i)
-    {
+    for (int i = 0; i < mfs.size(); ++i) {
         auto mf = mfs[i];
-		if (!mf->mimeType().isEmpty())
-			contentTypes->addDefault(mf->suffix(), mf->mimeType());
+        if (!mf->mimeType().isEmpty())
+            contentTypes->addDefault(mf->suffix(), mf->mimeType());
 
-        zipWriter.addFile(QStringLiteral("xl/media/image%1.%2").arg(i+1).arg(mf->suffix()), mf->contents());
-	}
+        zipWriter.addFile(QStringLiteral("xl/media/image%1.%2").arg(i + 1).arg(mf->suffix()),
+                          mf->contents());
+    }
 
-	// save root .rels xml file
-	Relationships rootrels;
-	rootrels.addDocumentRelationship(QStringLiteral("/officeDocument"), QStringLiteral("xl/workbook.xml"));
-	rootrels.addPackageRelationship(QStringLiteral("/metadata/core-properties"), QStringLiteral("docProps/core.xml"));
-	rootrels.addDocumentRelationship(QStringLiteral("/extended-properties"), QStringLiteral("docProps/app.xml"));
-	zipWriter.addFile(QStringLiteral("_rels/.rels"), rootrels.saveToXmlData());
+    // save root .rels xml file
+    Relationships rootrels;
+    rootrels.addDocumentRelationship(QStringLiteral("/officeDocument"),
+                                     QStringLiteral("xl/workbook.xml"));
+    rootrels.addPackageRelationship(QStringLiteral("/metadata/core-properties"),
+                                    QStringLiteral("docProps/core.xml"));
+    rootrels.addDocumentRelationship(QStringLiteral("/extended-properties"),
+                                     QStringLiteral("docProps/app.xml"));
+    zipWriter.addFile(QStringLiteral("_rels/.rels"), rootrels.saveToXmlData());
 
-	// save content types xml file
-	zipWriter.addFile(QStringLiteral("[Content_Types].xml"), contentTypes->saveToXmlData());
+    // save content types xml file
+    zipWriter.addFile(QStringLiteral("[Content_Types].xml"), contentTypes->saveToXmlData());
 
-	zipWriter.close();
-	return true;
+    zipWriter.close();
+    return true;
 }
 
 bool DocumentPrivate::copyStyle(const QString &from, const QString &to)
 {
-	// create a temp file because the zip writer cannot modify already existing zips
-	QTemporaryFile tempFile;
-	tempFile.open();
-	tempFile.close();
-	QString temFilePath = QFileInfo(tempFile).absoluteFilePath();
+    // create a temp file because the zip writer cannot modify already existing zips
+    QTemporaryFile tempFile;
+    tempFile.open();
+    tempFile.close();
+    QString temFilePath = QFileInfo(tempFile).absoluteFilePath();
 
-	ZipWriter temporalZip(temFilePath);
+    ZipWriter temporalZip(temFilePath);
 
-	ZipReader zipReader(from);
-	QStringList filePaths = zipReader.filePaths();
+    ZipReader zipReader(from);
+    QStringList filePaths = zipReader.filePaths();
 
     QSharedPointer<ZipReader> toReader = QSharedPointer<ZipReader>(new ZipReader(to));
 
-	QStringList toFilePaths = toReader->filePaths();
+    QStringList toFilePaths = toReader->filePaths();
 
-	// copy all files from "to" zip except those related to style
-	for (int i = 0; i < toFilePaths.size(); i++) {
+    // copy all files from "to" zip except those related to style
+    for (int i = 0; i < toFilePaths.size(); i++) {
         if (toFilePaths[i].contains(QLatin1String("xl/styles"))) {
-			if (filePaths.contains(toFilePaths[i])) {	// style file exist in 'from' as well
-				// modify style file
-                std::string fromData = QString::fromUtf8(zipReader.fileData(toFilePaths[i])).toStdString();
-                std::string toData = QString::fromUtf8(toReader->fileData(toFilePaths[i])).toStdString();
-				// copy default theme style from 'from' to 'to'
-				toData = xlsxDocumentCpp::copyTag(fromData, toData, "dxfs");
-				temporalZip.addFile(toFilePaths.at(i), QString::fromUtf8(toData.c_str()).toUtf8());
-
-				continue;
-			}
-		}
+            if (filePaths.contains(toFilePaths[i])) { // style file exist in 'from' as well
+                                                      // modify style file
+                std::string fromData =
+                    QString::fromUtf8(zipReader.fileData(toFilePaths[i])).toStdString();
+                std::string toData =
+                    QString::fromUtf8(toReader->fileData(toFilePaths[i])).toStdString();
+                // copy default theme style from 'from' to 'to'
+                toData = xlsxDocumentCpp::copyTag(fromData, toData, "dxfs");
+                temporalZip.addFile(toFilePaths.at(i), QString::fromUtf8(toData.c_str()).toUtf8());
+
+                continue;
+            }
+        }
 
         if (toFilePaths[i].contains(QLatin1String("xl/workbook"))) {
-			if (filePaths.contains(toFilePaths[i])) {	// workbook file exist in 'from' as well
-				// modify workbook file
-                std::string fromData = QString::fromUtf8(zipReader.fileData(toFilePaths[i])).toStdString();
-                std::string toData = QString::fromUtf8(toReader->fileData(toFilePaths[i])).toStdString();
-				// copy default theme style from 'from' to 'to'
-				toData = xlsxDocumentCpp::copyTag(fromData, toData, "workbookPr");
-				temporalZip.addFile(toFilePaths.at(i), QString::fromUtf8(toData.c_str()).toUtf8());
-				continue;
-			}
-		}
+            if (filePaths.contains(toFilePaths[i])) { // workbook file exist in 'from' as well
+                                                      // modify workbook file
+                std::string fromData =
+                    QString::fromUtf8(zipReader.fileData(toFilePaths[i])).toStdString();
+                std::string toData =
+                    QString::fromUtf8(toReader->fileData(toFilePaths[i])).toStdString();
+                // copy default theme style from 'from' to 'to'
+                toData = xlsxDocumentCpp::copyTag(fromData, toData, "workbookPr");
+                temporalZip.addFile(toFilePaths.at(i), QString::fromUtf8(toData.c_str()).toUtf8());
+                continue;
+            }
+        }
 
         if (toFilePaths[i].contains(QLatin1String("xl/worksheets/sheet"))) {
-			if (filePaths.contains(toFilePaths[i])) {	// sheet file exist in 'from' as well
-				// modify sheet file
-                std::string fromData = QString::fromUtf8(zipReader.fileData(toFilePaths[i])).toStdString();
-                std::string toData = QString::fromUtf8(toReader->fileData(toFilePaths[i])).toStdString();
-				// copy "conditionalFormatting" from 'from' to 'to'
-				toData = xlsxDocumentCpp::copyTag(fromData, toData, "conditionalFormatting");
-				temporalZip.addFile(toFilePaths.at(i), QString::fromUtf8(toData.c_str()).toUtf8());
-				continue;
-			}
-		}
-
-		QByteArray data = toReader->fileData(toFilePaths.at(i));
-		temporalZip.addFile(toFilePaths.at(i), data);
-	}
-
-	temporalZip.close();
+            if (filePaths.contains(toFilePaths[i])) { // sheet file exist in 'from' as well
+                                                      // modify sheet file
+                std::string fromData =
+                    QString::fromUtf8(zipReader.fileData(toFilePaths[i])).toStdString();
+                std::string toData =
+                    QString::fromUtf8(toReader->fileData(toFilePaths[i])).toStdString();
+                // copy "conditionalFormatting" from 'from' to 'to'
+                toData = xlsxDocumentCpp::copyTag(fromData, toData, "conditionalFormatting");
+                temporalZip.addFile(toFilePaths.at(i), QString::fromUtf8(toData.c_str()).toUtf8());
+                continue;
+            }
+        }
+
+        QByteArray data = toReader->fileData(toFilePaths.at(i));
+        temporalZip.addFile(toFilePaths.at(i), data);
+    }
+
+    temporalZip.close();
 
     toReader.clear();
 
-	tempFile.close();
+    tempFile.close();
 
-	QFile::remove(to);
-	tempFile.copy(to);
+    QFile::remove(to);
+    tempFile.copy(to);
 
-	return true;
+    return true;
 }
 
 /*!
@@ -539,10 +559,11 @@ bool DocumentPrivate::copyStyle(const QString &from, const QString &to)
  * Creates a new empty xlsx document.
  * The \a parent argument is passed to QObject's constructor.
  */
-Document::Document(QObject *parent) :
-	QObject(parent), d_ptr(new DocumentPrivate(this))
+Document::Document(QObject *parent)
+    : QObject(parent)
+    , d_ptr(new DocumentPrivate(this))
 {
-	d_ptr->init();
+    d_ptr->init();
 }
 
 /*!
@@ -550,26 +571,22 @@ Document::Document(QObject *parent) :
  * Try to open an existing xlsx document named \a name.
  * The \a parent argument is passed to QObject's constructor.
  */
-Document::Document(const QString &name, 
-					QObject *parent) :
-	QObject(parent), 
-	d_ptr(new DocumentPrivate(this))
+Document::Document(const QString &name, QObject *parent)
+    : QObject(parent)
+    , d_ptr(new DocumentPrivate(this))
 {
-	d_ptr->packageName = name; 
+    d_ptr->packageName = name;
 
-	if (QFile::exists(name)) 
-	{
-		QFile xlsx(name);
-		if (xlsx.open(QFile::ReadOnly))
-		{
-			if (! d_ptr->loadPackage(&xlsx))
-			{
-				// NOTICE: failed to load package 
-			}
-		}
-	}
+    if (QFile::exists(name)) {
+        QFile xlsx(name);
+        if (xlsx.open(QFile::ReadOnly)) {
+            if (!d_ptr->loadPackage(&xlsx)) {
+                // NOTICE: failed to load package
+            }
+        }
+    }
 
-	d_ptr->init();
+    d_ptr->init();
 }
 
 /*!
@@ -577,29 +594,28 @@ Document::Document(const QString &name,
  * Try to open an existing xlsx document from \a device.
  * The \a parent argument is passed to QObject's constructor.
  */
-Document::Document(QIODevice *device, QObject *parent) :
-	QObject(parent), d_ptr(new DocumentPrivate(this))
+Document::Document(QIODevice *device, QObject *parent)
+    : QObject(parent)
+    , d_ptr(new DocumentPrivate(this))
 {
-	if (device && device->isReadable())
-	{
-		if (!d_ptr->loadPackage(device))
-		{
-			// NOTICE: failed to load package 
-		}
-	}
-	d_ptr->init();
+    if (device && device->isReadable()) {
+        if (!d_ptr->loadPackage(device)) {
+            // NOTICE: failed to load package
+        }
+    }
+    d_ptr->init();
 }
 
 /*!
-	\overload
+        \overload
 
-	Write \a value to cell \a row_column with the given \a format.
+        Write \a value to cell \a row_column with the given \a format.
  */
 bool Document::write(const CellReference &row_column, const QVariant &value, const Format &format)
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->write(row_column, value, format);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->write(row_column, value, format);
+    return false;
 }
 
 /*!
@@ -608,34 +624,34 @@ bool Document::write(const CellReference &row_column, const QVariant &value, con
  */
 bool Document::write(int row, int col, const QVariant &value, const Format &format)
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->write(row, col, value, format);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->write(row, col, value, format);
+    return false;
 }
 
 /*!
-	\overload
-	Returns the contents of the cell \a cell.
+        \overload
+        Returns the contents of the cell \a cell.
 
-	\sa cellAt()
+        \sa cellAt()
 */
 QVariant Document::read(const CellReference &cell) const
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->read(cell);
-	return QVariant();
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->read(cell);
+    return QVariant();
 }
 
 /*!
-	Returns the contents of the cell (\a row, \a col).
+        Returns the contents of the cell (\a row, \a col).
 
-	\sa cellAt()
+        \sa cellAt()
  */
 QVariant Document::read(int row, int col) const
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->read(row, col);
-	return QVariant();
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->read(row, col);
+    return QVariant();
 }
 
 /*!
@@ -644,18 +660,18 @@ QVariant Document::read(int row, int col) const
  */
 int Document::insertImage(int row, int column, const QImage &image)
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->insertImage(row, column, image);
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->insertImage(row, column, image);
 
     return 0;
 }
 
-bool Document::getImage(int imageIndex, QImage& img)
+bool Document::getImage(int imageIndex, QImage &img)
 {
     if (Worksheet *sheet = currentWorksheet())
         return sheet->getImage(imageIndex, img);
 
-    return  false;
+    return false;
 }
 
 bool Document::getImage(int row, int col, QImage &img)
@@ -663,7 +679,7 @@ bool Document::getImage(int row, int col, QImage &img)
     if (Worksheet *sheet = currentWorksheet())
         return sheet->getImage(row, col, img);
 
-    return  false;
+    return false;
 }
 
 uint Document::getImageCount()
@@ -674,7 +690,6 @@ uint Document::getImageCount()
     return 0;
 }
 
-
 /*!
  * Creates an chart with the given \a size and insert it to the current
  * active worksheet at the position \a row, \a col.
@@ -682,9 +697,9 @@ uint Document::getImageCount()
  */
 Chart *Document::insertChart(int row, int col, const QSize &size)
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->insertChart(row, col, size);
-	return 0;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->insertChart(row, col, size);
+    return 0;
 }
 
 /*!
@@ -696,9 +711,9 @@ Chart *Document::insertChart(int row, int col, const QSize &size)
  */
 bool Document::mergeCells(const CellRange &range, const Format &format)
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->mergeCells(range, format);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->mergeCells(range, format);
+    return false;
 }
 
 /*!
@@ -707,9 +722,9 @@ bool Document::mergeCells(const CellRange &range, const Format &format)
 */
 bool Document::unmergeCells(const CellRange &range)
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->unmergeCells(range);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->unmergeCells(range);
+    return false;
 }
 
 /*!
@@ -718,9 +733,9 @@ bool Document::unmergeCells(const CellRange &range)
  */
 bool Document::setColumnWidth(const CellRange &range, double width)
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->setColumnWidth(range, width);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->setColumnWidth(range, width);
+    return false;
 }
 
 /*!
@@ -729,9 +744,9 @@ bool Document::setColumnWidth(const CellRange &range, double width)
  */
 bool Document::setColumnFormat(const CellRange &range, const Format &format)
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->setColumnFormat(range, format);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->setColumnFormat(range, format);
+    return false;
 }
 
 /*!
@@ -741,9 +756,9 @@ bool Document::setColumnFormat(const CellRange &range, const Format &format)
  */
 bool Document::setColumnHidden(const CellRange &range, bool hidden)
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->setColumnWidth(range, hidden);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->setColumnWidth(range, hidden);
+    return false;
 }
 
 /*!
@@ -752,7 +767,7 @@ bool Document::setColumnHidden(const CellRange &range, bool hidden)
  */
 bool Document::setColumnWidth(int column, double width)
 {
-	return setColumnWidth(column,column,width);
+    return setColumnWidth(column, column, width);
 }
 
 /*!
@@ -761,7 +776,7 @@ bool Document::setColumnWidth(int column, double width)
  */
 bool Document::setColumnFormat(int column, const Format &format)
 {
-	return setColumnFormat(column,column,format);
+    return setColumnFormat(column, column, format);
 }
 
 /*!
@@ -770,7 +785,7 @@ bool Document::setColumnFormat(int column, const Format &format)
  */
 bool Document::setColumnHidden(int column, bool hidden)
 {
-	return setColumnHidden(column,column,hidden);
+    return setColumnHidden(column, column, hidden);
 }
 
 /*!
@@ -779,9 +794,9 @@ bool Document::setColumnHidden(int column, bool hidden)
  */
 bool Document::setColumnWidth(int colFirst, int colLast, double width)
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->setColumnWidth(colFirst, colLast, width);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->setColumnWidth(colFirst, colLast, width);
+    return false;
 }
 
 /*!
@@ -791,12 +806,11 @@ bool Document::setColumnWidth(int colFirst, int colLast, double width)
  */
 bool Document::setColumnFormat(int colFirst, int colLast, const Format &format)
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->setColumnFormat(colFirst, colLast, format);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->setColumnFormat(colFirst, colLast, format);
+    return false;
 }
 
-
 /*!
   Sets hidden property of columns [\a colFirst, \a colLast] to \a hidden.
   Columns are 1-indexed.
@@ -804,9 +818,9 @@ bool Document::setColumnFormat(int colFirst, int colLast, const Format &format)
  */
 bool Document::setColumnHidden(int colFirst, int colLast, bool hidden)
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->setColumnHidden(colFirst, colLast, hidden);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->setColumnHidden(colFirst, colLast, hidden);
+    return false;
 }
 
 /*!
@@ -816,9 +830,9 @@ bool Document::setColumnHidden(int colFirst, int colLast, bool hidden)
  */
 double Document::columnWidth(int column)
 {
-	if (Worksheet *sheet = currentWorksheet())
-	  return sheet->columnWidth(column);
-	return 0.0;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->columnWidth(column);
+    return 0.0;
 }
 
 /*!
@@ -826,9 +840,9 @@ double Document::columnWidth(int column)
  */
 Format Document::columnFormat(int column)
 {
-	if (Worksheet *sheet = currentWorksheet())
-	   return sheet->columnFormat(column);
-	return Format();
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->columnFormat(column);
+    return Format();
 }
 
 /*!
@@ -836,9 +850,9 @@ Format Document::columnFormat(int column)
  */
 bool Document::isColumnHidden(int column)
 {
-	if (Worksheet *sheet = currentWorksheet())
-	   return sheet->isColumnHidden(column);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->isColumnHidden(column);
+    return false;
 }
 
 /*!
@@ -849,7 +863,7 @@ bool Document::isColumnHidden(int column)
 */
 bool Document::setRowFormat(int row, const Format &format)
 {
-	return setRowFormat(row,row, format);
+    return setRowFormat(row, row, format);
 }
 
 /*!
@@ -860,9 +874,9 @@ bool Document::setRowFormat(int row, const Format &format)
 */
 bool Document::setRowFormat(int rowFirst, int rowLast, const Format &format)
 {
-	if (Worksheet *sheet = currentWorksheet())
-	   return sheet->setRowFormat(rowFirst, rowLast, format);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->setRowFormat(rowFirst, rowLast, format);
+    return false;
 }
 
 /*!
@@ -873,7 +887,7 @@ bool Document::setRowFormat(int rowFirst, int rowLast, const Format &format)
 */
 bool Document::setRowHidden(int row, bool hidden)
 {
-	return setRowHidden(row,row,hidden);
+    return setRowHidden(row, row, hidden);
 }
 
 /*!
@@ -884,9 +898,9 @@ bool Document::setRowHidden(int row, bool hidden)
 */
 bool Document::setRowHidden(int rowFirst, int rowLast, bool hidden)
 {
-	if (Worksheet *sheet = currentWorksheet())
-	   return sheet->setRowHidden(rowFirst, rowLast, hidden);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->setRowHidden(rowFirst, rowLast, hidden);
+    return false;
 }
 
 /*!
@@ -898,7 +912,7 @@ bool Document::setRowHidden(int rowFirst, int rowLast, bool hidden)
 */
 bool Document::setRowHeight(int row, double height)
 {
-	return setRowHeight(row,row,height);
+    return setRowHeight(row, row, height);
 }
 
 /*!
@@ -910,9 +924,9 @@ bool Document::setRowHeight(int row, double height)
 */
 bool Document::setRowHeight(int rowFirst, int rowLast, double height)
 {
-	if (Worksheet *sheet = currentWorksheet())
-	   return sheet->setRowHeight(rowFirst, rowLast, height);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->setRowHeight(rowFirst, rowLast, height);
+    return false;
 }
 
 /*!
@@ -920,9 +934,9 @@ bool Document::setRowHeight(int rowFirst, int rowLast, double height)
 */
 double Document::rowHeight(int row)
 {
-   if (Worksheet *sheet = currentWorksheet())
-	  return sheet->rowHeight(row);
-	return 0.0;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->rowHeight(row);
+    return 0.0;
 }
 
 /*!
@@ -930,9 +944,9 @@ double Document::rowHeight(int row)
 */
 Format Document::rowFormat(int row)
 {
-	if (Worksheet *sheet = currentWorksheet())
-	   return sheet->rowFormat(row);
-	 return Format();
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->rowFormat(row);
+    return Format();
 }
 
 /*!
@@ -940,9 +954,9 @@ Format Document::rowFormat(int row)
 */
 bool Document::isRowHidden(int row)
 {
-	if (Worksheet *sheet = currentWorksheet())
-	   return sheet->isRowHidden(row);
-	 return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->isRowHidden(row);
+    return false;
 }
 
 /*!
@@ -951,9 +965,9 @@ bool Document::isRowHidden(int row)
  */
 bool Document::groupRows(int rowFirst, int rowLast, bool collapsed)
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->groupRows(rowFirst, rowLast, collapsed);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->groupRows(rowFirst, rowLast, collapsed);
+    return false;
 }
 
 /*!
@@ -962,9 +976,9 @@ bool Document::groupRows(int rowFirst, int rowLast, bool collapsed)
  */
 bool Document::groupColumns(int colFirst, int colLast, bool collapsed)
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->groupColumns(colFirst, colLast, collapsed);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->groupColumns(colFirst, colLast, collapsed);
+    return false;
 }
 
 /*!
@@ -972,9 +986,9 @@ bool Document::groupColumns(int colFirst, int colLast, bool collapsed)
  */
 bool Document::addDataValidation(const DataValidation &validation)
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->addDataValidation(validation);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->addDataValidation(validation);
+    return false;
 }
 
 /*!
@@ -982,9 +996,9 @@ bool Document::addDataValidation(const DataValidation &validation)
  */
 bool Document::addConditionalFormatting(const ConditionalFormatting &cf)
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->addConditionalFormatting(cf);
-	return false;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->addConditionalFormatting(cf);
+    return false;
 }
 
 /*!
@@ -996,9 +1010,9 @@ bool Document::addConditionalFormatting(const ConditionalFormatting &cf)
  */
 Cell *Document::cellAt(const CellReference &pos) const
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->cellAt(pos);
-	return 0;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->cellAt(pos);
+    return 0;
 }
 
 /*!
@@ -1009,9 +1023,9 @@ Cell *Document::cellAt(const CellReference &pos) const
  */
 Cell *Document::cellAt(int row, int col) const
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->cellAt(row, col);
-	return 0;
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->cellAt(row, col);
+    return 0;
 }
 
 /*!
@@ -1023,21 +1037,24 @@ Cell *Document::cellAt(int row, int col) const
  * \param scope The name of one worksheet, or empty which means golbal scope.
  * \return Return false if the name invalid.
  */
-bool Document::defineName(const QString &name, const QString &formula, const QString &comment, const QString &scope)
+bool Document::defineName(const QString &name,
+                          const QString &formula,
+                          const QString &comment,
+                          const QString &scope)
 {
-	Q_D(Document);
+    Q_D(Document);
 
-	return d->workbook->defineName(name, formula, comment, scope);
+    return d->workbook->defineName(name, formula, comment, scope);
 }
 
 /*!
-	Return the range that contains cell data.
+        Return the range that contains cell data.
  */
 CellRange Document::dimension() const
 {
-	if (Worksheet *sheet = currentWorksheet())
-		return sheet->dimension();
-	return CellRange();
+    if (Worksheet *sheet = currentWorksheet())
+        return sheet->dimension();
+    return CellRange();
 }
 
 /*!
@@ -1045,40 +1062,40 @@ CellRange Document::dimension() const
  */
 QString Document::documentProperty(const QString &key) const
 {
-	Q_D(const Document);
+    Q_D(const Document);
     auto it = d->documentProperties.constFind(key);
     if (it != d->documentProperties.constEnd())
         return it.value();
-	else
-		return QString();
+    else
+        return QString();
 }
 
 /*!
-	Set the document properties such as Title, Author etc.
+        Set the document properties such as Title, Author etc.
 
-	The method can be used to set the document properties of the Excel
-	file created by Qt Xlsx. These properties are visible when you use the
-	Office Button -> Prepare -> Properties option in Excel and are also
-	available to external applications that read or index windows files.
+        The method can be used to set the document properties of the Excel
+        file created by Qt Xlsx. These properties are visible when you use the
+        Office Button -> Prepare -> Properties option in Excel and are also
+        available to external applications that read or index windows files.
 
-	The \a property \a key that can be set are:
+        The \a property \a key that can be set are:
 
-	\list
-	\li title
-	\li subject
-	\li creator
-	\li manager
-	\li company
-	\li category
-	\li keywords
-	\li description
-	\li status
-	\endlist
+        \list
+        \li title
+        \li subject
+        \li creator
+        \li manager
+        \li company
+        \li category
+        \li keywords
+        \li description
+        \li status
+        \endlist
 */
 void Document::setDocumentProperty(const QString &key, const QString &property)
 {
-	Q_D(Document);
-	d->documentProperties[key] = property;
+    Q_D(Document);
+    d->documentProperties[key] = property;
 }
 
 /*!
@@ -1086,8 +1103,8 @@ void Document::setDocumentProperty(const QString &key, const QString &property)
  */
 QStringList Document::documentPropertyNames() const
 {
-	Q_D(const Document);
-	return d->documentProperties.keys();
+    Q_D(const Document);
+    return d->documentProperties.keys();
 }
 
 /*!
@@ -1095,7 +1112,7 @@ QStringList Document::documentPropertyNames() const
  */
 Workbook *Document::workbook() const
 {
-	Q_D(const Document);
+    Q_D(const Document);
     return d->workbook.data();
 }
 
@@ -1104,8 +1121,8 @@ Workbook *Document::workbook() const
  */
 AbstractSheet *Document::sheet(const QString &sheetName) const
 {
-	Q_D(const Document);
-	return d->workbook->sheet(sheetNames().indexOf(sheetName));
+    Q_D(const Document);
+    return d->workbook->sheet(sheetNames().indexOf(sheetName));
 }
 
 /*!
@@ -1114,8 +1131,8 @@ AbstractSheet *Document::sheet(const QString &sheetName) const
  */
 bool Document::addSheet(const QString &name, AbstractSheet::SheetType type)
 {
-	Q_D(Document);
-	return d->workbook->addSheet(name, type);
+    Q_D(Document);
+    return d->workbook->addSheet(name, type);
 }
 
 /*!
@@ -1124,8 +1141,8 @@ bool Document::addSheet(const QString &name, AbstractSheet::SheetType type)
  */
 bool Document::insertSheet(int index, const QString &name, AbstractSheet::SheetType type)
 {
-	Q_D(Document);
-	return d->workbook->insertSheet(index, name, type);
+    Q_D(Document);
+    return d->workbook->insertSheet(index, name, type);
 }
 
 /*!
@@ -1134,10 +1151,10 @@ bool Document::insertSheet(int index, const QString &name, AbstractSheet::SheetT
  */
 bool Document::renameSheet(const QString &oldName, const QString &newName)
 {
-	Q_D(Document);
-	if (oldName == newName)
-		return false;
-	return d->workbook->renameSheet(sheetNames().indexOf(oldName), newName);
+    Q_D(Document);
+    if (oldName == newName)
+        return false;
+    return d->workbook->renameSheet(sheetNames().indexOf(oldName), newName);
 }
 
 /*!
@@ -1146,10 +1163,10 @@ bool Document::renameSheet(const QString &oldName, const QString &newName)
  */
 bool Document::copySheet(const QString &srcName, const QString &distName)
 {
-	Q_D(Document);
-	if (srcName == distName)
-		return false;
-	return d->workbook->copySheet(sheetNames().indexOf(srcName), distName);
+    Q_D(Document);
+    if (srcName == distName)
+        return false;
+    return d->workbook->copySheet(sheetNames().indexOf(srcName), distName);
 }
 
 /*!
@@ -1158,8 +1175,8 @@ bool Document::copySheet(const QString &srcName, const QString &distName)
  */
 bool Document::moveSheet(const QString &srcName, int distIndex)
 {
-	Q_D(Document);
-	return d->workbook->moveSheet(sheetNames().indexOf(srcName), distIndex);
+    Q_D(Document);
+    return d->workbook->moveSheet(sheetNames().indexOf(srcName), distIndex);
 }
 
 /*!
@@ -1168,8 +1185,8 @@ bool Document::moveSheet(const QString &srcName, int distIndex)
  */
 bool Document::deleteSheet(const QString &name)
 {
-	Q_D(Document);
-	return d->workbook->deleteSheet(sheetNames().indexOf(name));
+    Q_D(Document);
+    return d->workbook->deleteSheet(sheetNames().indexOf(name));
 }
 
 /*!
@@ -1177,9 +1194,9 @@ bool Document::deleteSheet(const QString &name)
  */
 AbstractSheet *Document::currentSheet() const
 {
-	Q_D(const Document);
+    Q_D(const Document);
 
-	return d->workbook->activeSheet();
+    return d->workbook->activeSheet();
 }
 
 /*!
@@ -1188,11 +1205,11 @@ AbstractSheet *Document::currentSheet() const
  */
 Worksheet *Document::currentWorksheet() const
 {
-	AbstractSheet *st = currentSheet();
-	if (st && st->sheetType() == AbstractSheet::ST_WorkSheet)
-		return static_cast<Worksheet *>(st);
-	else
-		return 0;
+    AbstractSheet *st = currentSheet();
+    if (st && st->sheetType() == AbstractSheet::ST_WorkSheet)
+        return static_cast<Worksheet *>(st);
+    else
+        return 0;
 }
 
 /*!
@@ -1201,8 +1218,8 @@ Worksheet *Document::currentWorksheet() const
  */
 bool Document::selectSheet(const QString &name)
 {
-	Q_D(Document);
-	return d->workbook->setActiveSheet(sheetNames().indexOf(name));
+    Q_D(Document);
+    return d->workbook->setActiveSheet(sheetNames().indexOf(name));
 }
 
 /*!
@@ -1211,8 +1228,8 @@ bool Document::selectSheet(const QString &name)
  */
 bool Document::selectSheet(int index)
 {
-	Q_D(Document);
-	return d->workbook->setActiveSheet(index);
+    Q_D(Document);
+    return d->workbook->setActiveSheet(index);
 }
 
 /*!
@@ -1220,8 +1237,8 @@ bool Document::selectSheet(int index)
  */
 QStringList Document::sheetNames() const
 {
-	Q_D(const Document);
-	return d->workbook->worksheetNames();
+    Q_D(const Document);
+    return d->workbook->worksheetNames();
 }
 
 /*!
@@ -1231,10 +1248,10 @@ QStringList Document::sheetNames() const
  */
 bool Document::save() const
 {
-	Q_D(const Document);
-	QString name = d->packageName.isEmpty() ? d->defaultPackageName : d->packageName;
+    Q_D(const Document);
+    QString name = d->packageName.isEmpty() ? d->defaultPackageName : d->packageName;
 
-	return saveAs(name);
+    return saveAs(name);
 }
 
 /*!
@@ -1243,10 +1260,10 @@ bool Document::save() const
  */
 bool Document::saveAs(const QString &name) const
 {
-	QFile file(name);
-	if (file.open(QIODevice::WriteOnly))
-		return saveAs(&file);
-	return false;
+    QFile file(name);
+    if (file.open(QIODevice::WriteOnly))
+        return saveAs(&file);
+    return false;
 }
 
 /*!
@@ -1257,23 +1274,24 @@ bool Document::saveAs(const QString &name) const
  */
 bool Document::saveAs(QIODevice *device) const
 {
-	Q_D(const Document);
-	return d->savePackage(device);
+    Q_D(const Document);
+    return d->savePackage(device);
 }
 
 bool Document::isLoadPackage() const
 {
-	Q_D(const Document);
-	return d->isLoad; 
+    Q_D(const Document);
+    return d->isLoad;
 }
 
 bool Document::load() const
 {
-	return isLoadPackage();
+    return isLoadPackage();
 }
 
-bool Document::copyStyle(const QString &from, const QString &to) {
-	return DocumentPrivate::copyStyle(from, to);
+bool Document::copyStyle(const QString &from, const QString &to)
+{
+    return DocumentPrivate::copyStyle(from, to);
 }
 
 /*!
@@ -1281,75 +1299,72 @@ bool Document::copyStyle(const QString &from, const QString &to) {
  */
 Document::~Document()
 {
-	delete d_ptr;
+    delete d_ptr;
 }
 
 //  add by liufeijin 20181025 {{
 bool Document::changeimage(int filenoinmidea, QString newfile)
 {
-	Q_D(const Document);
+    Q_D(const Document);
 
     QImage newpic(newfile);
-	
+
     auto mediaFileToLoad = d->workbook->mediaFiles();
-    const auto mf = mediaFileToLoad[filenoinmidea];
-	
-	const QString suffix = newfile.mid(newfile.lastIndexOf(QLatin1Char('.'))+1);
-	QString mimetypemy;
-    if(QString::compare(QLatin1String("jpg"), suffix, Qt::CaseInsensitive)==0)
-       mimetypemy=QStringLiteral("image/jpeg");
-    if(QString::compare(QLatin1String("bmp"), suffix, Qt::CaseInsensitive)==0)
-       mimetypemy=QStringLiteral("image/bmp");
-    if(QString::compare(QLatin1String("gif"), suffix, Qt::CaseInsensitive)==0)
-       mimetypemy=QStringLiteral("image/gif");
-    if(QString::compare(QLatin1String("png"), suffix, Qt::CaseInsensitive)==0)
-       mimetypemy=QStringLiteral("image/png");
-	
-	QByteArray ba;
-	QBuffer buffer(&ba);
-	buffer.setBuffer(&ba);
-	buffer.open(QIODevice::WriteOnly);
-	newpic.save(&buffer,suffix.toLocal8Bit().data());
-	
-	mf->set(ba,suffix,mimetypemy);
-	mediaFileToLoad[filenoinmidea]=mf;
-	
-	return true;
+    const auto mf        = mediaFileToLoad[filenoinmidea];
+
+    const QString suffix = newfile.mid(newfile.lastIndexOf(QLatin1Char('.')) + 1);
+    QString mimetypemy;
+    if (QString::compare(QLatin1String("jpg"), suffix, Qt::CaseInsensitive) == 0)
+        mimetypemy = QStringLiteral("image/jpeg");
+    if (QString::compare(QLatin1String("bmp"), suffix, Qt::CaseInsensitive) == 0)
+        mimetypemy = QStringLiteral("image/bmp");
+    if (QString::compare(QLatin1String("gif"), suffix, Qt::CaseInsensitive) == 0)
+        mimetypemy = QStringLiteral("image/gif");
+    if (QString::compare(QLatin1String("png"), suffix, Qt::CaseInsensitive) == 0)
+        mimetypemy = QStringLiteral("image/png");
+
+    QByteArray ba;
+    QBuffer buffer(&ba);
+    buffer.setBuffer(&ba);
+    buffer.open(QIODevice::WriteOnly);
+    newpic.save(&buffer, suffix.toLocal8Bit().data());
+
+    mf->set(ba, suffix, mimetypemy);
+    mediaFileToLoad[filenoinmidea] = mf;
+
+    return true;
 }
 // liufeijin }}
 
-
 /*!
   Returns map of columns with there maximal width
  */
 QMap<int, int> Document::getMaximalColumnWidth(int firstRow, int lastRow)
 {
-    const int defaultPixelSize = 11;    //Default font pixel size of excel?
-    int maxRows = -1;
-    int maxCols = -1;
+    const int defaultPixelSize = 11; // Default font pixel size of excel?
+    int maxRows                = -1;
+    int maxCols                = -1;
     QMap<int, int> colWidth;
-    if (!currentWorksheet()) return colWidth;
+    if (!currentWorksheet())
+        return colWidth;
     QVector<CellLocation> cellLocation = currentWorksheet()->getFullCells(&maxRows, &maxCols);
-    
-    for(int i=0; i < cellLocation.size(); i++)
-    {
+
+    for (int i = 0; i < cellLocation.size(); i++) {
         int col = cellLocation.at(i).col;
         int row = cellLocation.at(i).row;
-        int fs = cellLocation.at(i).cell->format().fontSize();
-        if( fs <= 0)
-        {
+        int fs  = cellLocation.at(i).cell->format().fontSize();
+        if (fs <= 0) {
             fs = defaultPixelSize;
         }
 
-//        QString str = cellLocation.at(i).cell.data()->value().toString();
+        //        QString str = cellLocation.at(i).cell.data()->value().toString();
         QString str = read(row, col).toString();
 
-        double w = str.length() * double(fs) / defaultPixelSize + 1; // width not perfect, but works reasonably well
+        double w = str.length() * double(fs) / defaultPixelSize +
+                   1; // width not perfect, but works reasonably well
 
-        if( (row >= firstRow) && (row <= lastRow))
-        {
-            if( w > colWidth.value(col))
-            {
+        if ((row >= firstRow) && (row <= lastRow)) {
+            if (w > colWidth.value(col)) {
                 colWidth.insert(col, int(w));
             }
         }
@@ -1358,7 +1373,6 @@ QMap<int, int> Document::getMaximalColumnWidth(int firstRow, int lastRow)
     return colWidth;
 }
 
-
 /*!
   Auto ets width in characters of columns with the given \a range.
   Returns true on success.
@@ -1367,16 +1381,14 @@ bool Document::autosizeColumnWidth(const CellRange &range)
 {
     bool erg = false;
 
-    if( !range.isValid())
-    {
+    if (!range.isValid()) {
         return false;
     }
 
     const QMap<int, int> colWidth = getMaximalColumnWidth(range.firstRow(), range.lastRow());
-    auto it = colWidth.constBegin();
+    auto it                       = colWidth.constBegin();
     while (it != colWidth.constEnd()) {
-        if( (it.key() >= range.firstColumn()) && (it.key() <= range.lastColumn()) )
-        {
+        if ((it.key() >= range.firstColumn()) && (it.key() <= range.lastColumn())) {
             erg |= setColumnWidth(it.key(), it.value());
         }
         ++it;
@@ -1385,7 +1397,6 @@ bool Document::autosizeColumnWidth(const CellRange &range)
     return erg;
 }
 
-
 /*!
   Auto sets width in characters \a column . Columns are 1-indexed.
   Returns true on success.
@@ -1395,10 +1406,9 @@ bool Document::autosizeColumnWidth(int column)
     bool erg = false;
 
     const QMap<int, int> colWidth = getMaximalColumnWidth();
-    auto it = colWidth.constBegin();
+    auto it                       = colWidth.constBegin();
     while (it != colWidth.constEnd()) {
-        if( it.key() == column)
-        {
+        if (it.key() == column) {
             erg |= setColumnWidth(it.key(), it.value());
         }
         ++it;
@@ -1407,7 +1417,6 @@ bool Document::autosizeColumnWidth(int column)
     return erg;
 }
 
-
 /*!
   Auto sets width in characters for columns [\a colFirst, \a colLast]. Columns are 1-indexed.
   Returns true on success.
@@ -1419,10 +1428,9 @@ bool Document::autosizeColumnWidth(int colFirst, int colLast)
     bool erg = false;
 
     const QMap<int, int> colWidth = getMaximalColumnWidth();
-    auto it = colWidth.constBegin();
+    auto it                       = colWidth.constBegin();
     while (it != colWidth.constEnd()) {
-        if( (it.key() >= colFirst) && (it.key() <= colLast) )
-        {
+        if ((it.key() >= colFirst) && (it.key() <= colLast)) {
             erg |= setColumnWidth(it.key(), it.value());
         }
         ++it;
@@ -1431,7 +1439,6 @@ bool Document::autosizeColumnWidth(int colFirst, int colLast)
     return erg;
 }
 
-
 /*!
   Auto sets width in characters for all columns.
   Returns true on success.
@@ -1441,7 +1448,7 @@ bool Document::autosizeColumnWidth(void)
     bool erg = false;
 
     const QMap<int, int> colWidth = getMaximalColumnWidth();
-    auto it = colWidth.constBegin();
+    auto it                       = colWidth.constBegin();
     while (it != colWidth.constEnd()) {
         erg |= setColumnWidth(it.key(), it.value());
         ++it;
@@ -1450,5 +1457,4 @@ bool Document::autosizeColumnWidth(void)
     return erg;
 }
 
-
 QT_END_NAMESPACE_XLSX
diff --git a/QXlsx/source/xlsxdrawing.cpp b/QXlsx/source/xlsxdrawing.cpp
index 2675310d..fc37502a 100644
--- a/QXlsx/source/xlsxdrawing.cpp
+++ b/QXlsx/source/xlsxdrawing.cpp
@@ -1,18 +1,19 @@
 // xlsxdrawing.cpp
 
-#include <QtGlobal>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
-#include <QBuffer>
-
+#include "xlsxabstractsheet.h"
 #include "xlsxdrawing_p.h"
 #include "xlsxdrawinganchor_p.h"
-#include "xlsxabstractsheet.h"
+
+#include <QBuffer>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
 Drawing::Drawing(AbstractSheet *sheet, CreateFlag flag)
-    :AbstractOOXmlFile(flag), sheet(sheet)
+    : AbstractOOXmlFile(flag)
+    , sheet(sheet)
 {
     workbook = sheet->workbook();
 }
@@ -30,13 +31,16 @@ void Drawing::saveToXmlFile(QIODevice *device) const
 
     writer.writeStartDocument(QStringLiteral("1.0"), true);
     writer.writeStartElement(QStringLiteral("xdr:wsDr"));
-    writer.writeAttribute(QStringLiteral("xmlns:xdr"), QStringLiteral("http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"));
-    writer.writeAttribute(QStringLiteral("xmlns:a"), QStringLiteral("http://schemas.openxmlformats.org/drawingml/2006/main"));
+    writer.writeAttribute(
+        QStringLiteral("xmlns:xdr"),
+        QStringLiteral("http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"));
+    writer.writeAttribute(QStringLiteral("xmlns:a"),
+                          QStringLiteral("http://schemas.openxmlformats.org/drawingml/2006/main"));
 
     for (DrawingAnchor *anchor : anchors)
         anchor->saveToXml(writer);
 
-    writer.writeEndElement();//xdr:wsDr
+    writer.writeEndElement(); // xdr:wsDr
     writer.writeEndDocument();
 }
 
@@ -55,24 +59,20 @@ bool Drawing::loadFromXmlFile(QIODevice *device)
 
     QXmlStreamReader reader(device);
 
-    while (!reader.atEnd())
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
-        if (reader.tokenType() == QXmlStreamReader::StartElement)
-        {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("absoluteAnchor")) // CT_AbsoluteAnchor
             {
-                DrawingAbsoluteAnchor * anchor = new DrawingAbsoluteAnchor(this);
+                DrawingAbsoluteAnchor *anchor = new DrawingAbsoluteAnchor(this);
                 anchor->loadFromXml(reader);
-            }
-            else if (reader.name() == QLatin1String("oneCellAnchor")) // CT_OneCellAnchor
+            } else if (reader.name() == QLatin1String("oneCellAnchor")) // CT_OneCellAnchor
             {
-                DrawingOneCellAnchor * anchor = new DrawingOneCellAnchor(this);
+                DrawingOneCellAnchor *anchor = new DrawingOneCellAnchor(this);
                 anchor->loadFromXml(reader);
-            }
-            else if (reader.name() == QLatin1String("twoCellAnchor")) // CT_TwoCellAnchor
+            } else if (reader.name() == QLatin1String("twoCellAnchor")) // CT_TwoCellAnchor
             {
-                DrawingTwoCellAnchor * anchor = new DrawingTwoCellAnchor(this);
+                DrawingTwoCellAnchor *anchor = new DrawingTwoCellAnchor(this);
                 anchor->loadFromXml(reader);
             }
         }
diff --git a/QXlsx/source/xlsxdrawinganchor.cpp b/QXlsx/source/xlsxdrawinganchor.cpp
index 89d27eb2..e2f108bb 100644
--- a/QXlsx/source/xlsxdrawinganchor.cpp
+++ b/QXlsx/source/xlsxdrawinganchor.cpp
@@ -1,18 +1,18 @@
 // xlsxdrawinganchor.cpp
 
-#include <QtGlobal>
-#include <QDebug>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
-#include <QBuffer>
-#include <QDir>
-
-#include "xlsxdrawinganchor_p.h"
+#include "xlsxchart.h"
 #include "xlsxdrawing_p.h"
+#include "xlsxdrawinganchor_p.h"
 #include "xlsxmediafile_p.h"
-#include "xlsxchart.h"
-#include "xlsxworkbook.h"
 #include "xlsxutility_p.h"
+#include "xlsxworkbook.h"
+
+#include <QBuffer>
+#include <QDebug>
+#include <QDir>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -47,19 +47,17 @@ QT_BEGIN_NAMESPACE_XLSX
      variable and have to be taken into account.
 */
 
-//anchor
+// anchor
 
 DrawingAnchor::DrawingAnchor(Drawing *drawing, ObjectType objectType)
-    :m_drawing(drawing), m_objectType(objectType)
+    : m_drawing(drawing)
+    , m_objectType(objectType)
 {
     m_drawing->anchors.append(this);
-    m_id = m_drawing->anchors.size();//must be unique in one drawing{x}.xml file.
+    m_id = m_drawing->anchors.size(); // must be unique in one drawing{x}.xml file.
 }
 
-DrawingAnchor::~DrawingAnchor()
-{
-
-}
+DrawingAnchor::~DrawingAnchor() {}
 
 void DrawingAnchor::setObjectPicture(const QImage &img)
 {
@@ -68,7 +66,8 @@ void DrawingAnchor::setObjectPicture(const QImage &img)
     buffer.open(QIODevice::WriteOnly);
     img.save(&buffer, "PNG");
 
-    m_pictureFile = std::make_shared<MediaFile>(ba, QStringLiteral("png"), QStringLiteral("image/png"));
+    m_pictureFile =
+        std::make_shared<MediaFile>(ba, QStringLiteral("png"), QStringLiteral("image/png"));
     m_drawing->workbook->addMediaFile(m_pictureFile);
 
     m_objectType = Picture;
@@ -76,10 +75,10 @@ void DrawingAnchor::setObjectPicture(const QImage &img)
 
 bool DrawingAnchor::getObjectPicture(QImage &img)
 {
-    if ( m_pictureFile == nullptr )
+    if (m_pictureFile == nullptr)
         return false;
 
-    bool ret = img.loadFromData( m_pictureFile->contents() );
+    bool ret = img.loadFromData(m_pictureFile->contents());
     return ret;
 }
 
@@ -91,7 +90,8 @@ void DrawingAnchor::setObjectShape(const QImage &img)
     buffer.open(QIODevice::WriteOnly);
     img.save(&buffer, "PNG");
 
-    m_pictureFile = std::make_shared<MediaFile>(ba, QStringLiteral("png"), QStringLiteral("image/png"));
+    m_pictureFile =
+        std::make_shared<MediaFile>(ba, QStringLiteral("png"), QStringLiteral("image/png"));
     m_drawing->workbook->addMediaFile(m_pictureFile);
 
     m_objectType = Shape;
@@ -142,35 +142,23 @@ XlsxMarker DrawingAnchor::loadXmlMarker(QXmlStreamReader &reader, const QString
 {
     Q_ASSERT(reader.name() == node);
 
-    int col = 0;
+    int col       = 0;
     int colOffset = 0;
-    int row = 0;
+    int row       = 0;
     int rowOffset = 0;
-    while (!reader.atEnd())
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
-        if (reader.tokenType() == QXmlStreamReader::StartElement)
-        {
-            if (reader.name() == QLatin1String("col"))
-            {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("col")) {
                 col = reader.readElementText().toInt();
-            }
-            else if (reader.name() == QLatin1String("colOff"))
-            {
+            } else if (reader.name() == QLatin1String("colOff")) {
                 colOffset = reader.readElementText().toInt();
-            }
-            else if (reader.name() == QLatin1String("row"))
-            {
+            } else if (reader.name() == QLatin1String("row")) {
                 row = reader.readElementText().toInt();
-            }
-            else if (reader.name() == QLatin1String("rowOff"))
-            {
+            } else if (reader.name() == QLatin1String("rowOff")) {
                 rowOffset = reader.readElementText().toInt();
             }
-        }
-        else if (reader.tokenType() == QXmlStreamReader::EndElement
-                   && reader.name() == node)
-        {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement && reader.name() == node) {
             break;
         }
     }
@@ -200,10 +188,10 @@ void DrawingAnchor::loadXmlObject(QXmlStreamReader &reader)
         // Shape
         m_objectType = Shape;
 
-		//{{ liufeijin
+        //{{ liufeijin
         sp_textlink = reader.attributes().value(QLatin1String("textlink")).toString();
-        sp_macro = reader.attributes().value(QLatin1String("macro")).toString();
-		//}} 
+        sp_macro    = reader.attributes().value(QLatin1String("macro")).toString();
+        //}}
 
         // <xsd:attribute name="macro" type="xsd:string" use="optional"/>
         // <xsd:attribute name="textlink" type="xsd:string" use="optional"/>
@@ -211,37 +199,36 @@ void DrawingAnchor::loadXmlObject(QXmlStreamReader &reader)
         // <xsd:attribute name="fPublished" type="xsd:boolean" use="optional" default="false"/>
 
         loadXmlObjectShape(reader); // CT_Shape
-    }
-    else if (reader.name() == QLatin1String("grpSp")) // <xsd:element name="grpSp" type="CT_GroupShape"/>
+    } else if (reader.name() ==
+               QLatin1String("grpSp")) // <xsd:element name="grpSp" type="CT_GroupShape"/>
     {
-        //Group Shape
+        // Group Shape
         m_objectType = GroupShape;
         loadXmlObjectGroupShape(reader);
-    }
-    else if (reader.name() == QLatin1String("graphicFrame")) // <xsd:element name="graphicFrame" type="CT_GraphicalObjectFrame"/>
+    } else if (reader.name() == QLatin1String("graphicFrame")) // <xsd:element name="graphicFrame"
+                                                               // type="CT_GraphicalObjectFrame"/>
     {
-        //Graphic Frame
+        // Graphic Frame
         m_objectType = GraphicFrame;
         loadXmlObjectGraphicFrame(reader);
-    }
-    else if (reader.name() == QLatin1String("cxnSp")) // <xsd:element name="cxnSp" type="CT_Connector"/>
+    } else if (reader.name() ==
+               QLatin1String("cxnSp")) // <xsd:element name="cxnSp" type="CT_Connector"/>
     {
-        //Connection Shape
+        // Connection Shape
         m_objectType = ConnectionShape;
 
-		// {{ liufeijin
+        // {{ liufeijin
         cxnSp_macro = reader.attributes().value(QLatin1String("macro")).toString();
-		// }}
+        // }}
 
         loadXmlObjectConnectionShape(reader);
-    }
-    else if (reader.name() == QLatin1String("pic")) // <xsd:element name="pic" type="CT_Picture"/>
+    } else if (reader.name() == QLatin1String("pic")) // <xsd:element name="pic" type="CT_Picture"/>
     {
         // Picture
         m_objectType = Picture;
         loadXmlObjectPicture(reader);
-    }
-    else if (reader.name() == QLatin1String("contentPart")) // <xsd:element name="contentPart" type="CT_Rel"/>
+    } else if (reader.name() ==
+               QLatin1String("contentPart")) // <xsd:element name="contentPart" type="CT_Rel"/>
     {
         // contentPart
         /// TODO:
@@ -251,80 +238,92 @@ void DrawingAnchor::loadXmlObject(QXmlStreamReader &reader)
 void DrawingAnchor::loadXmlObjectConnectionShape(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("cxnSp"));
-    bool hasoffext=false;
+    bool hasoffext = false;
     while (!reader.atEnd()) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
-            if (reader.name() == QLatin1String("cNvPr")){
-                xsp_cNvPR_name= reader.attributes().value(QLatin1String("name")).toString();
-                xsp_cNvPR_id= reader.attributes().value(QLatin1String("id")).toString();
-             }else if(reader.name() == QLatin1String("spPr")){
-                 xbwMode= reader.attributes().value(QLatin1String("bwMode")).toString();
-            }else if(reader.name() == QLatin1String("xfrm")){
-                cxnSp_filpV= reader.attributes().value(QLatin1String("flipV")).toString();
-            }else if (reader.name() == QLatin1String("off")) {
-               posTA = loadXmlPos(reader);
-               hasoffext=true;
-            } else if (reader.name() == QLatin1String("ext")&&hasoffext) {
-               extTA = loadXmlExt(reader);
-               hasoffext=false;
-            }else if(reader.name() == QLatin1String("prstGeom")){
-                xprstGeom_prst= reader.attributes().value(QLatin1String("prst")).toString().trimmed();
-            }else if(reader.name() == QLatin1String("ln")){
-                xIn_algn= reader.attributes().value(QLatin1String("algn")).toString().trimmed();
-                xIn_cmpd= reader.attributes().value(QLatin1String("cmpd")).toString().trimmed();
-                xIn_cap= reader.attributes().value(QLatin1String("cap")).toString().trimmed();
-                xIn_w= reader.attributes().value(QLatin1String("w")).toString().trimmed();
-            }else if(reader.name() == QLatin1String("headEnd")){
-                x_headEnd_w= reader.attributes().value(QLatin1String("w")).toString().trimmed();
-                x_headEnd_len= reader.attributes().value(QLatin1String("len")).toString().trimmed();
-                x_headEnd_tyep= reader.attributes().value(QLatin1String("type")).toString().trimmed();
-            }else if(reader.name() == QLatin1String("tailEnd")){
-                x_tailEnd_w= reader.attributes().value(QLatin1String("w")).toString().trimmed();
-                x_tailEnd_len= reader.attributes().value(QLatin1String("len")).toString().trimmed();
-                x_tailEnd_tyep= reader.attributes().value(QLatin1String("type")).toString().trimmed();
-            }else if(reader.name() == QLatin1String("lnRef")){
-                Style_inref_idx= reader.attributes().value(QLatin1String("idx")).toString().trimmed();
+            if (reader.name() == QLatin1String("cNvPr")) {
+                xsp_cNvPR_name = reader.attributes().value(QLatin1String("name")).toString();
+                xsp_cNvPR_id   = reader.attributes().value(QLatin1String("id")).toString();
+            } else if (reader.name() == QLatin1String("spPr")) {
+                xbwMode = reader.attributes().value(QLatin1String("bwMode")).toString();
+            } else if (reader.name() == QLatin1String("xfrm")) {
+                cxnSp_filpV = reader.attributes().value(QLatin1String("flipV")).toString();
+            } else if (reader.name() == QLatin1String("off")) {
+                posTA     = loadXmlPos(reader);
+                hasoffext = true;
+            } else if (reader.name() == QLatin1String("ext") && hasoffext) {
+                extTA     = loadXmlExt(reader);
+                hasoffext = false;
+            } else if (reader.name() == QLatin1String("prstGeom")) {
+                xprstGeom_prst =
+                    reader.attributes().value(QLatin1String("prst")).toString().trimmed();
+            } else if (reader.name() == QLatin1String("ln")) {
+                xIn_algn = reader.attributes().value(QLatin1String("algn")).toString().trimmed();
+                xIn_cmpd = reader.attributes().value(QLatin1String("cmpd")).toString().trimmed();
+                xIn_cap  = reader.attributes().value(QLatin1String("cap")).toString().trimmed();
+                xIn_w    = reader.attributes().value(QLatin1String("w")).toString().trimmed();
+            } else if (reader.name() == QLatin1String("headEnd")) {
+                x_headEnd_w = reader.attributes().value(QLatin1String("w")).toString().trimmed();
+                x_headEnd_len =
+                    reader.attributes().value(QLatin1String("len")).toString().trimmed();
+                x_headEnd_tyep =
+                    reader.attributes().value(QLatin1String("type")).toString().trimmed();
+            } else if (reader.name() == QLatin1String("tailEnd")) {
+                x_tailEnd_w = reader.attributes().value(QLatin1String("w")).toString().trimmed();
+                x_tailEnd_len =
+                    reader.attributes().value(QLatin1String("len")).toString().trimmed();
+                x_tailEnd_tyep =
+                    reader.attributes().value(QLatin1String("type")).toString().trimmed();
+            } else if (reader.name() == QLatin1String("lnRef")) {
+                Style_inref_idx =
+                    reader.attributes().value(QLatin1String("idx")).toString().trimmed();
                 reader.readNextStartElement();
                 if (reader.tokenType() == QXmlStreamReader::StartElement) {
-                    if(reader.name() == QLatin1String("schemeClr")){
-                        Style_inref_val=reader.attributes().value(QLatin1String("val")).toString().trimmed();
+                    if (reader.name() == QLatin1String("schemeClr")) {
+                        Style_inref_val =
+                            reader.attributes().value(QLatin1String("val")).toString().trimmed();
                     }
                 }
-            }else if(reader.name() == QLatin1String("fillRef")){
-                style_fillref_idx= reader.attributes().value(QLatin1String("idx")).toString().trimmed();
+            } else if (reader.name() == QLatin1String("fillRef")) {
+                style_fillref_idx =
+                    reader.attributes().value(QLatin1String("idx")).toString().trimmed();
                 reader.readNextStartElement();
                 if (reader.tokenType() == QXmlStreamReader::StartElement) {
-                    if(reader.name() == QLatin1String("schemeClr")){
-                       style_fillref_val=reader.attributes().value(QLatin1String("val")).toString().trimmed();
+                    if (reader.name() == QLatin1String("schemeClr")) {
+                        style_fillref_val =
+                            reader.attributes().value(QLatin1String("val")).toString().trimmed();
                     }
                 }
-            }else if(reader.name() == QLatin1String("effectRef")){
-                style_effectref_idx= reader.attributes().value(QLatin1String("idx")).toString().trimmed();
+            } else if (reader.name() == QLatin1String("effectRef")) {
+                style_effectref_idx =
+                    reader.attributes().value(QLatin1String("idx")).toString().trimmed();
                 reader.readNextStartElement();
                 if (reader.tokenType() == QXmlStreamReader::StartElement) {
-                    if(reader.name() == QLatin1String("schemeClr")){
-                      style_effectref_val=reader.attributes().value(QLatin1String("val")).toString().trimmed();
+                    if (reader.name() == QLatin1String("schemeClr")) {
+                        style_effectref_val =
+                            reader.attributes().value(QLatin1String("val")).toString().trimmed();
                     }
                 }
-            }else if(reader.name() == QLatin1String("fontRef")){
-                style_forntref_idx= reader.attributes().value(QLatin1String("idx")).toString().trimmed();
+            } else if (reader.name() == QLatin1String("fontRef")) {
+                style_forntref_idx =
+                    reader.attributes().value(QLatin1String("idx")).toString().trimmed();
                 reader.readNextStartElement();
                 if (reader.tokenType() == QXmlStreamReader::StartElement) {
-                    if(reader.name() == QLatin1String("schemeClr")){
-                        style_forntref_val=reader.attributes().value(QLatin1String("val")).toString().trimmed();
+                    if (reader.name() == QLatin1String("schemeClr")) {
+                        style_forntref_val =
+                            reader.attributes().value(QLatin1String("val")).toString().trimmed();
                     }
                 }
             }
 
-        } else if (reader.tokenType() == QXmlStreamReader::EndElement
-                   && reader.name() == QLatin1String("cxnSp")) {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name() == QLatin1String("cxnSp")) {
             break;
         }
     }
 
     return;
-
 }
 
 void DrawingAnchor::loadXmlObjectGraphicFrame(QXmlStreamReader &reader)
@@ -335,29 +334,30 @@ void DrawingAnchor::loadXmlObjectGraphicFrame(QXmlStreamReader &reader)
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("chart")) {
-                QString rId = reader.attributes().value(QLatin1String("r:id")).toString();
+                QString rId  = reader.attributes().value(QLatin1String("r:id")).toString();
                 QString name = m_drawing->relationships()->getRelationshipById(rId).target;
 
                 const auto parts = splitPath(m_drawing->filePath());
-                QString path = QDir::cleanPath(parts.first() + QLatin1String("/") + name);
+                QString path     = QDir::cleanPath(parts.first() + QLatin1String("/") + name);
 
-                bool exist = false;
-                QList<QSharedPointer<Chart> > cfs = m_drawing->workbook->chartFiles();
-                for (int i=0; i<cfs.size(); ++i) {
+                bool exist                       = false;
+                QList<QSharedPointer<Chart>> cfs = m_drawing->workbook->chartFiles();
+                for (int i = 0; i < cfs.size(); ++i) {
                     if (cfs[i]->filePath() == path) {
-                        //already exist
-                        exist = true;
+                        // already exist
+                        exist       = true;
                         m_chartFile = cfs[i];
                     }
                 }
                 if (!exist) {
-                    m_chartFile = QSharedPointer<Chart> (new Chart(m_drawing->sheet, Chart::F_LoadFromExists));
+                    m_chartFile =
+                        QSharedPointer<Chart>(new Chart(m_drawing->sheet, Chart::F_LoadFromExists));
                     m_chartFile->setFilePath(path);
                     m_drawing->workbook->addChartFile(m_chartFile);
                 }
             }
-        } else if (reader.tokenType() == QXmlStreamReader::EndElement
-                   && reader.name() == QLatin1String("graphicFrame")) {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name() == QLatin1String("graphicFrame")) {
             break;
         }
     }
@@ -378,18 +378,18 @@ void DrawingAnchor::loadXmlObjectPicture(QXmlStreamReader &reader)
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("blip")) {
-                QString rId = reader.attributes().value(QLatin1String("r:embed")).toString();
+                QString rId  = reader.attributes().value(QLatin1String("r:embed")).toString();
                 QString name = m_drawing->relationships()->getRelationshipById(rId).target;
 
                 const auto parts = splitPath(m_drawing->filePath());
-                QString path = QDir::cleanPath(parts.first() + QLatin1String("/") + name);
+                QString path     = QDir::cleanPath(parts.first() + QLatin1String("/") + name);
 
-                bool exist = false;
+                bool exist     = false;
                 const auto mfs = m_drawing->workbook->mediaFiles();
                 for (const auto &mf : mfs) {
                     if (mf->fileName() == path) {
-                        //already exist
-                        exist = true;
+                        // already exist
+                        exist         = true;
                         m_pictureFile = mf;
                     }
                 }
@@ -398,8 +398,8 @@ void DrawingAnchor::loadXmlObjectPicture(QXmlStreamReader &reader)
                     m_drawing->workbook->addMediaFile(m_pictureFile, true);
                 }
             }
-        } else if (reader.tokenType() == QXmlStreamReader::EndElement
-                   && reader.name() == QLatin1String("pic")) {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name() == QLatin1String("pic")) {
             break;
         }
     }
@@ -427,41 +427,30 @@ void DrawingAnchor::loadXmlObjectShape(QXmlStreamReader &reader)
     <xsd:complexType name="CT_ShapeNonVisual">
         <xsd:sequence>
         <xsd:element name="cNvPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="cNvSpPr" type="a:CT_NonVisualDrawingShapeProps" minOccurs="1" maxOccurs="1"/>
+        <xsd:element name="cNvSpPr" type="a:CT_NonVisualDrawingShapeProps" minOccurs="1"
+    maxOccurs="1"/>
         </xsd:sequence>
     </xsd:complexType>
     */
 
     Q_ASSERT(reader.name() == QLatin1String("sp"));
 
-    while (!reader.atEnd())
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
 
         // qDebug() << __FUNCTION__ << reader.name().toString();
 
-        if (reader.tokenType() == QXmlStreamReader::StartElement)
-        {
-            if (reader.name() == QLatin1String("nvSpPr"))
-            {
-
-            }
-            else if (reader.name() == QLatin1String("spPr"))
-            {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("nvSpPr")) {
 
-            }
-            else if (reader.name() == QLatin1String("style"))
-            {
+            } else if (reader.name() == QLatin1String("spPr")) {
 
-            }
-            else if (reader.name() == QLatin1String("txBody"))
-            {
+            } else if (reader.name() == QLatin1String("style")) {
 
+            } else if (reader.name() == QLatin1String("txBody")) {
             }
-        }
-        else if (reader.tokenType() == QXmlStreamReader::EndElement
-                   && reader.name() == QLatin1String("sp"))
-        {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name() == QLatin1String("sp")) {
             break;
         }
     }
@@ -484,10 +473,9 @@ void DrawingAnchor::loadXmlObjectShape(QXmlStreamReader &reader)
                 sp_blip_cstate=reader.attributes().value(QLatin1String("cstate")).toString();
                 rId=sp_blip_rembed;
                 QString name = m_drawing->relationships()->getRelationshipById(rId).target;
-                QString path = QDir::cleanPath(splitPath(m_drawing->filePath())[0] + QLatin1String("/") + name);
-                   bool exist = false;
-                   QList<QSharedPointer<MediaFile> > mfs = m_drawing->workbook->mediaFiles();
-                   for (int i=0; i<mfs.size(); ++i)
+                QString path = QDir::cleanPath(splitPath(m_drawing->filePath())[0] +
+    QLatin1String("/") + name); bool exist = false; QList<QSharedPointer<MediaFile> > mfs =
+    m_drawing->workbook->mediaFiles(); for (int i=0; i<mfs.size(); ++i)
                    {
                        if (mfs[i]->fileName() == path)
                        {
@@ -515,10 +503,12 @@ void DrawingAnchor::loadXmlObjectShape(QXmlStreamReader &reader)
             {
                 // dev24 : fixed for old Qt 5
 
-                rotWithShapeTA = reader.attributes().value(QLatin1String("rotWithShape")).toString().toInt();
-                dpiTA = reader.attributes().value(QLatin1String("dpi")).toString().toInt();
+                rotWithShapeTA =
+    reader.attributes().value(QLatin1String("rotWithShape")).toString().toInt(); dpiTA =
+    reader.attributes().value(QLatin1String("dpi")).toString().toInt();
 
-                // rotWithShapeTA = reader.attributes().value(QLatin1String("rotWithShape")).toInt();
+                // rotWithShapeTA =
+    reader.attributes().value(QLatin1String("rotWithShape")).toInt();
                 // dpiTA = reader.attributes().value(QLatin1String("dpi")).toInt();
 
             }else if(reader.name() == QLatin1String("cNvPr"))
@@ -555,7 +545,8 @@ void DrawingAnchor::loadXmlObjectShape(QXmlStreamReader &reader)
             }
             else if(reader.name() == QLatin1String("lnRef"))
             {
-                Style_inref_idx= reader.attributes().value(QLatin1String("idx")).toString().trimmed();
+                Style_inref_idx=
+    reader.attributes().value(QLatin1String("idx")).toString().trimmed();
                 reader.readNextStartElement();
                 if (reader.tokenType() == QXmlStreamReader::StartElement) {
                     if(reader.name() == QLatin1String("schemeClr")){
@@ -565,7 +556,8 @@ void DrawingAnchor::loadXmlObjectShape(QXmlStreamReader &reader)
             }
             else if(reader.name() == QLatin1String("fillRef"))
             {
-                style_fillref_idx= reader.attributes().value(QLatin1String("idx")).toString().trimmed();
+                style_fillref_idx=
+    reader.attributes().value(QLatin1String("idx")).toString().trimmed();
                 reader.readNextStartElement();
                 if (reader.tokenType() == QXmlStreamReader::StartElement)
                 {
@@ -577,7 +569,8 @@ void DrawingAnchor::loadXmlObjectShape(QXmlStreamReader &reader)
             }
             else if(reader.name() == QLatin1String("effectRef"))
             {
-                style_effectref_idx= reader.attributes().value(QLatin1String("idx")).toString().trimmed();
+                style_effectref_idx=
+    reader.attributes().value(QLatin1String("idx")).toString().trimmed();
                 reader.readNextStartElement();
                 if (reader.tokenType() == QXmlStreamReader::StartElement) {
                     if(reader.name() == QLatin1String("schemeClr")){
@@ -587,7 +580,8 @@ void DrawingAnchor::loadXmlObjectShape(QXmlStreamReader &reader)
             }
             else if(reader.name() == QLatin1String("fontRef"))
             {
-                style_forntref_idx= reader.attributes().value(QLatin1String("idx")).toString().trimmed();
+                style_forntref_idx=
+    reader.attributes().value(QLatin1String("idx")).toString().trimmed();
                 reader.readNextStartElement();
                 if (reader.tokenType() == QXmlStreamReader::StartElement) {
                     if(reader.name() == QLatin1String("schemeClr")){
@@ -621,12 +615,14 @@ void DrawingAnchor::saveXmlExt(QXmlStreamWriter &writer, const QSize &ext) const
     writer.writeStartElement(QStringLiteral("xdr:ext"));
     writer.writeAttribute(QStringLiteral("cx"), QString::number(ext.width()));
     writer.writeAttribute(QStringLiteral("cy"), QString::number(ext.height()));
-    writer.writeEndElement(); //xdr:ext
+    writer.writeEndElement(); // xdr:ext
 }
 
-void DrawingAnchor::saveXmlMarker(QXmlStreamWriter &writer, const XlsxMarker &marker, const QString &node) const
+void DrawingAnchor::saveXmlMarker(QXmlStreamWriter &writer,
+                                  const XlsxMarker &marker,
+                                  const QString &node) const
 {
-    writer.writeStartElement(node); //xdr:from or xdr:to
+    writer.writeStartElement(node); // xdr:from or xdr:to
     writer.writeTextElement(QStringLiteral("xdr:col"), QString::number(marker.col()));
     writer.writeTextElement(QStringLiteral("xdr:colOff"), QString::number(marker.colOff()));
     writer.writeTextElement(QStringLiteral("xdr:row"), QString::number(marker.row()));
@@ -650,109 +646,111 @@ void DrawingAnchor::saveXmlObject(QXmlStreamWriter &writer) const
 
 void DrawingAnchor::saveXmlObjectConnectionShape(QXmlStreamWriter &writer) const
 {
-    writer.writeStartElement(QStringLiteral("xdr:cxnSp"));  ///?
+    writer.writeStartElement(QStringLiteral("xdr:cxnSp")); ///?
     writer.writeAttribute(QStringLiteral("macro"), cxnSp_macro);
 
-        writer.writeStartElement(QStringLiteral("xdr:nvCxnSpPr"));
-           writer.writeEmptyElement(QStringLiteral("xdr:cNvPr"));
-           writer.writeAttribute(QStringLiteral("id"), xsp_cNvPR_id);
-           writer.writeAttribute(QStringLiteral("name"), xsp_cNvPR_name);
-           writer.writeEmptyElement(QStringLiteral("xdr:cNvCxnSpPr"));
-        writer.writeEndElement(); //xdr:nvCxnSpPr
+    writer.writeStartElement(QStringLiteral("xdr:nvCxnSpPr"));
+    writer.writeEmptyElement(QStringLiteral("xdr:cNvPr"));
+    writer.writeAttribute(QStringLiteral("id"), xsp_cNvPR_id);
+    writer.writeAttribute(QStringLiteral("name"), xsp_cNvPR_name);
+    writer.writeEmptyElement(QStringLiteral("xdr:cNvCxnSpPr"));
+    writer.writeEndElement(); // xdr:nvCxnSpPr
 
     writer.writeStartElement(QStringLiteral("xdr:spPr"));
-    if(!xbwMode.isNull()){
-         writer.writeAttribute(QStringLiteral("bwMode"), xbwMode);
+    if (!xbwMode.isNull()) {
+        writer.writeAttribute(QStringLiteral("bwMode"), xbwMode);
     }
 
-        writer.writeStartElement(QStringLiteral("a:xfrm"));
-        if(!cxnSp_filpV.isEmpty()){
-        writer.writeAttribute(QStringLiteral("flipV"), cxnSp_filpV);}
-        writer.writeEmptyElement(QStringLiteral("a:off"));
-        writer.writeAttribute(QStringLiteral("x"), QString::number(posTA.x()));
-        writer.writeAttribute(QStringLiteral("y"), QString::number(posTA.y()));
-        writer.writeEmptyElement(QStringLiteral("a:ext"));
-        writer.writeAttribute(QStringLiteral("cx"), QString::number(extTA.width()));
-        writer.writeAttribute(QStringLiteral("cy"), QString::number(extTA.height()));
-        writer.writeEndElement(); //a:xfrm
-
-        writer.writeStartElement(QStringLiteral("a:prstGeom"));
-        writer.writeAttribute(QStringLiteral("prst"), xprstGeom_prst);
-        writer.writeEmptyElement(QStringLiteral("a:avLst"));
-        writer.writeEndElement(); //a:prstGeom
-
-
-         writer.writeStartElement(QStringLiteral("a:ln"));
-            if(!xIn_w.isEmpty()&&!xIn_cap.isEmpty()){
-                if(!xIn_w.isEmpty()){
-                    writer.writeAttribute(QStringLiteral("w"), xIn_w);
-                }
-                if(!xIn_cap.isEmpty()){
-                    writer.writeAttribute(QStringLiteral("cap"), xIn_cap);
-                }
-                if(!xIn_cmpd.isEmpty()){
-                    writer.writeAttribute(QStringLiteral("cmpd"), xIn_cmpd);
-                }
-                if(!xIn_algn.isEmpty()){
-                    writer.writeAttribute(QStringLiteral("algn"), xIn_algn);
-                }
-            }
-             if((!x_headEnd_tyep.isEmpty())||(!x_headEnd_w.isEmpty())||(!x_headEnd_len.isEmpty())){
-                 writer.writeEmptyElement(QStringLiteral("a:headEnd"));
-                 if(!x_headEnd_tyep.isEmpty()){
-                    writer.writeAttribute(QStringLiteral("type"),x_headEnd_tyep);
-                 }
-                 if(!x_headEnd_w.isEmpty()){
-                   writer.writeAttribute(QStringLiteral("w"),x_headEnd_w);
-                 }
-                 if(!x_headEnd_len.isEmpty()){
-                   writer.writeAttribute(QStringLiteral("len"),x_headEnd_len);
-                 }
-             }
-             if((!x_tailEnd_tyep.isEmpty())||(!x_tailEnd_w.isEmpty())||(!x_tailEnd_len.isEmpty())){
-                  writer.writeEmptyElement(QStringLiteral("a:tailEnd"));
-                  if(!x_tailEnd_tyep.isEmpty()){
-                      writer.writeAttribute(QStringLiteral("type"),x_tailEnd_tyep);}
-                  if(!x_tailEnd_w.isEmpty()){
-                      writer.writeAttribute(QStringLiteral("w"),x_tailEnd_w);}
-                  if(!x_tailEnd_len.isEmpty()){
-                      writer.writeAttribute(QStringLiteral("len"),x_tailEnd_len);}
-              }
-
-         writer.writeEndElement();//a:ln
-
-
-      writer.writeEndElement(); //xdr:spPr
-      // writer style
-
-      writer.writeStartElement(QStringLiteral("xdr:style"));// style
-             writer.writeStartElement(QStringLiteral("a:lnRef"));//lnRef
-             writer.writeAttribute(QStringLiteral("idx"),Style_inref_idx);
-                writer.writeStartElement(QStringLiteral("a:schemeClr"));//val
-                writer.writeAttribute(QStringLiteral("val"),Style_inref_val);
-                writer.writeEndElement(); // val
-             writer.writeEndElement(); // lnRef
-             writer.writeStartElement(QStringLiteral("a:fillRef"));//fillRef
-             writer.writeAttribute(QStringLiteral("idx"),style_fillref_idx);
-                writer.writeStartElement(QStringLiteral("a:schemeClr"));//val
-                writer.writeAttribute(QStringLiteral("val"),style_fillref_val);
-                writer.writeEndElement(); // val
-             writer.writeEndElement(); // fillRef
-             writer.writeStartElement(QStringLiteral("a:effectRef"));//effectRef
-             writer.writeAttribute(QStringLiteral("idx"),style_effectref_idx);
-                writer.writeStartElement(QStringLiteral("a:schemeClr"));//val
-                writer.writeAttribute(QStringLiteral("val"),style_effectref_val);
-                writer.writeEndElement(); // val
-             writer.writeEndElement(); // effectRef
-             writer.writeStartElement(QStringLiteral("a:fontRef"));//fontRef
-             writer.writeAttribute(QStringLiteral("idx"),style_forntref_idx);
-                writer.writeStartElement(QStringLiteral("a:schemeClr"));//val
-                writer.writeAttribute(QStringLiteral("val"),style_forntref_val);
-                writer.writeEndElement(); // val
-             writer.writeEndElement(); // fontRef
-      writer.writeEndElement(); // style
-
-      writer.writeEndElement(); //xdr:sp
+    writer.writeStartElement(QStringLiteral("a:xfrm"));
+    if (!cxnSp_filpV.isEmpty()) {
+        writer.writeAttribute(QStringLiteral("flipV"), cxnSp_filpV);
+    }
+    writer.writeEmptyElement(QStringLiteral("a:off"));
+    writer.writeAttribute(QStringLiteral("x"), QString::number(posTA.x()));
+    writer.writeAttribute(QStringLiteral("y"), QString::number(posTA.y()));
+    writer.writeEmptyElement(QStringLiteral("a:ext"));
+    writer.writeAttribute(QStringLiteral("cx"), QString::number(extTA.width()));
+    writer.writeAttribute(QStringLiteral("cy"), QString::number(extTA.height()));
+    writer.writeEndElement(); // a:xfrm
+
+    writer.writeStartElement(QStringLiteral("a:prstGeom"));
+    writer.writeAttribute(QStringLiteral("prst"), xprstGeom_prst);
+    writer.writeEmptyElement(QStringLiteral("a:avLst"));
+    writer.writeEndElement(); // a:prstGeom
+
+    writer.writeStartElement(QStringLiteral("a:ln"));
+    if (!xIn_w.isEmpty() && !xIn_cap.isEmpty()) {
+        if (!xIn_w.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("w"), xIn_w);
+        }
+        if (!xIn_cap.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("cap"), xIn_cap);
+        }
+        if (!xIn_cmpd.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("cmpd"), xIn_cmpd);
+        }
+        if (!xIn_algn.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("algn"), xIn_algn);
+        }
+    }
+    if ((!x_headEnd_tyep.isEmpty()) || (!x_headEnd_w.isEmpty()) || (!x_headEnd_len.isEmpty())) {
+        writer.writeEmptyElement(QStringLiteral("a:headEnd"));
+        if (!x_headEnd_tyep.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("type"), x_headEnd_tyep);
+        }
+        if (!x_headEnd_w.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("w"), x_headEnd_w);
+        }
+        if (!x_headEnd_len.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("len"), x_headEnd_len);
+        }
+    }
+    if ((!x_tailEnd_tyep.isEmpty()) || (!x_tailEnd_w.isEmpty()) || (!x_tailEnd_len.isEmpty())) {
+        writer.writeEmptyElement(QStringLiteral("a:tailEnd"));
+        if (!x_tailEnd_tyep.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("type"), x_tailEnd_tyep);
+        }
+        if (!x_tailEnd_w.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("w"), x_tailEnd_w);
+        }
+        if (!x_tailEnd_len.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("len"), x_tailEnd_len);
+        }
+    }
+
+    writer.writeEndElement(); // a:ln
+
+    writer.writeEndElement(); // xdr:spPr
+    // writer style
+
+    writer.writeStartElement(QStringLiteral("xdr:style")); // style
+    writer.writeStartElement(QStringLiteral("a:lnRef"));   // lnRef
+    writer.writeAttribute(QStringLiteral("idx"), Style_inref_idx);
+    writer.writeStartElement(QStringLiteral("a:schemeClr")); // val
+    writer.writeAttribute(QStringLiteral("val"), Style_inref_val);
+    writer.writeEndElement();                              // val
+    writer.writeEndElement();                              // lnRef
+    writer.writeStartElement(QStringLiteral("a:fillRef")); // fillRef
+    writer.writeAttribute(QStringLiteral("idx"), style_fillref_idx);
+    writer.writeStartElement(QStringLiteral("a:schemeClr")); // val
+    writer.writeAttribute(QStringLiteral("val"), style_fillref_val);
+    writer.writeEndElement();                                // val
+    writer.writeEndElement();                                // fillRef
+    writer.writeStartElement(QStringLiteral("a:effectRef")); // effectRef
+    writer.writeAttribute(QStringLiteral("idx"), style_effectref_idx);
+    writer.writeStartElement(QStringLiteral("a:schemeClr")); // val
+    writer.writeAttribute(QStringLiteral("val"), style_effectref_val);
+    writer.writeEndElement();                              // val
+    writer.writeEndElement();                              // effectRef
+    writer.writeStartElement(QStringLiteral("a:fontRef")); // fontRef
+    writer.writeAttribute(QStringLiteral("idx"), style_forntref_idx);
+    writer.writeStartElement(QStringLiteral("a:schemeClr")); // val
+    writer.writeAttribute(QStringLiteral("val"), style_forntref_val);
+    writer.writeEndElement(); // val
+    writer.writeEndElement(); // fontRef
+    writer.writeEndElement(); // style
+
+    writer.writeEndElement(); // xdr:sp
 }
 
 void DrawingAnchor::saveXmlObjectGraphicFrame(QXmlStreamWriter &writer) const
@@ -765,26 +763,32 @@ void DrawingAnchor::saveXmlObjectGraphicFrame(QXmlStreamWriter &writer) const
     writer.writeAttribute(QStringLiteral("id"), QString::number(m_id));
     writer.writeAttribute(QStringLiteral("name"), QStringLiteral("Chart %1").arg(m_id));
     writer.writeEmptyElement(QStringLiteral("xdr:cNvGraphicFramePr"));
-    writer.writeEndElement();//xdr:nvGraphicFramePr
+    writer.writeEndElement(); // xdr:nvGraphicFramePr
 
     writer.writeStartElement(QStringLiteral("xdr:xfrm"));
-    writer.writeEndElement(); //xdr:xfrm
+    writer.writeEndElement(); // xdr:xfrm
 
     writer.writeStartElement(QStringLiteral("a:graphic"));
     writer.writeStartElement(QStringLiteral("a:graphicData"));
-    writer.writeAttribute(QStringLiteral("uri"), QStringLiteral("http://schemas.openxmlformats.org/drawingml/2006/chart"));
+    writer.writeAttribute(QStringLiteral("uri"),
+                          QStringLiteral("http://schemas.openxmlformats.org/drawingml/2006/chart"));
 
     int idx = m_drawing->workbook->chartFiles().indexOf(m_chartFile);
-    m_drawing->relationships()->addDocumentRelationship(QStringLiteral("/chart"), QStringLiteral("../charts/chart%1.xml").arg(idx+1));
+    m_drawing->relationships()->addDocumentRelationship(
+        QStringLiteral("/chart"), QStringLiteral("../charts/chart%1.xml").arg(idx + 1));
 
     writer.writeEmptyElement(QStringLiteral("c:chart"));
-    writer.writeAttribute(QStringLiteral("xmlns:c"), QStringLiteral("http://schemas.openxmlformats.org/drawingml/2006/chart"));
-    writer.writeAttribute(QStringLiteral("xmlns:r"), QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships"));
-    writer.writeAttribute(QStringLiteral("r:id"), QStringLiteral("rId%1").arg(m_drawing->relationships()->count()));
-
-    writer.writeEndElement(); //a:graphicData
-    writer.writeEndElement(); //a:graphic
-    writer.writeEndElement(); //xdr:graphicFrame
+    writer.writeAttribute(QStringLiteral("xmlns:c"),
+                          QStringLiteral("http://schemas.openxmlformats.org/drawingml/2006/chart"));
+    writer.writeAttribute(
+        QStringLiteral("xmlns:r"),
+        QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships"));
+    writer.writeAttribute(QStringLiteral("r:id"),
+                          QStringLiteral("rId%1").arg(m_drawing->relationships()->count()));
+
+    writer.writeEndElement(); // a:graphicData
+    writer.writeEndElement(); // a:graphic
+    writer.writeEndElement(); // xdr:graphicFrame
 }
 
 void DrawingAnchor::saveXmlObjectGroupShape(QXmlStreamWriter &writer) const
@@ -800,39 +804,43 @@ void DrawingAnchor::saveXmlObjectPicture(QXmlStreamWriter &writer) const
 
     writer.writeStartElement(QStringLiteral("xdr:nvPicPr"));
     writer.writeEmptyElement(QStringLiteral("xdr:cNvPr"));
-    writer.writeAttribute(QStringLiteral("id"), QString::number(m_id+1)); // liufeijin
+    writer.writeAttribute(QStringLiteral("id"), QString::number(m_id + 1)); // liufeijin
     writer.writeAttribute(QStringLiteral("name"), QStringLiteral("Picture %1").arg(m_id));
 
     writer.writeStartElement(QStringLiteral("xdr:cNvPicPr"));
     writer.writeEmptyElement(QStringLiteral("a:picLocks"));
     writer.writeAttribute(QStringLiteral("noChangeAspect"), QStringLiteral("1"));
-    writer.writeEndElement(); //xdr:cNvPicPr
+    writer.writeEndElement(); // xdr:cNvPicPr
 
-    writer.writeEndElement(); //xdr:nvPicPr
+    writer.writeEndElement(); // xdr:nvPicPr
 
-    m_drawing->relationships()->addDocumentRelationship(QStringLiteral("/image"), QStringLiteral("../media/image%1.%2")
-                                                     .arg(m_pictureFile->index()+1)
-                                                     .arg(m_pictureFile->suffix()));
+    m_drawing->relationships()->addDocumentRelationship(QStringLiteral("/image"),
+                                                        QStringLiteral("../media/image%1.%2")
+                                                            .arg(m_pictureFile->index() + 1)
+                                                            .arg(m_pictureFile->suffix()));
 
     writer.writeStartElement(QStringLiteral("xdr:blipFill"));
     writer.writeEmptyElement(QStringLiteral("a:blip"));
-    writer.writeAttribute(QStringLiteral("xmlns:r"), QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships"));
-    writer.writeAttribute(QStringLiteral("r:embed"), QStringLiteral("rId%1").arg(m_drawing->relationships()->count()));
+    writer.writeAttribute(
+        QStringLiteral("xmlns:r"),
+        QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships"));
+    writer.writeAttribute(QStringLiteral("r:embed"),
+                          QStringLiteral("rId%1").arg(m_drawing->relationships()->count()));
     writer.writeStartElement(QStringLiteral("a:stretch"));
     writer.writeEmptyElement(QStringLiteral("a:fillRect"));
-    writer.writeEndElement(); //a:stretch
-    writer.writeEndElement();//xdr:blipFill
+    writer.writeEndElement(); // a:stretch
+    writer.writeEndElement(); // xdr:blipFill
 
     writer.writeStartElement(QStringLiteral("xdr:spPr"));
 
     writer.writeStartElement(QStringLiteral("a:prstGeom"));
     writer.writeAttribute(QStringLiteral("prst"), QStringLiteral("rect"));
     writer.writeEmptyElement(QStringLiteral("a:avLst"));
-    writer.writeEndElement(); //a:prstGeom
+    writer.writeEndElement(); // a:prstGeom
 
-    writer.writeEndElement(); //xdr:spPr
+    writer.writeEndElement(); // xdr:spPr
 
-    writer.writeEndElement(); //xdr:pic
+    writer.writeEndElement(); // xdr:pic
 }
 
 int DrawingAnchor::getm_id()
@@ -842,142 +850,152 @@ int DrawingAnchor::getm_id()
 
 void DrawingAnchor::saveXmlObjectShape(QXmlStreamWriter &writer) const
 {
-//{{ liufeijin
-    writer.writeStartElement(QStringLiteral("xdr:sp"));  //xdr:sp
-        writer.writeAttribute(QStringLiteral("macro"), sp_macro);
-        writer.writeAttribute(QStringLiteral("textlink"),sp_textlink);
+    //{{ liufeijin
+    writer.writeStartElement(QStringLiteral("xdr:sp")); // xdr:sp
+    writer.writeAttribute(QStringLiteral("macro"), sp_macro);
+    writer.writeAttribute(QStringLiteral("textlink"), sp_textlink);
 
-    writer.writeStartElement(QStringLiteral("xdr:nvSpPr"));//xdr:nvSpPr
+    writer.writeStartElement(QStringLiteral("xdr:nvSpPr")); // xdr:nvSpPr
 
-           writer.writeStartElement(QStringLiteral("xdr:cNvPr"));
-              writer.writeAttribute(QStringLiteral("id"), xsp_cNvPR_id);
-              writer.writeAttribute(QStringLiteral("name"), xsp_cNvPR_name);
-              writer.writeStartElement(QStringLiteral("a:extLst"));
-              writer.writeEndElement();
-           writer.writeEndElement();//xdr:cNvPr
+    writer.writeStartElement(QStringLiteral("xdr:cNvPr"));
+    writer.writeAttribute(QStringLiteral("id"), xsp_cNvPR_id);
+    writer.writeAttribute(QStringLiteral("name"), xsp_cNvPR_name);
+    writer.writeStartElement(QStringLiteral("a:extLst"));
+    writer.writeEndElement();
+    writer.writeEndElement(); // xdr:cNvPr
 
-          writer.writeEmptyElement(QStringLiteral("xdr:cNvSpPr"));
+    writer.writeEmptyElement(QStringLiteral("xdr:cNvSpPr"));
 
-    writer.writeEndElement(); //xdr:nvSpPr
+    writer.writeEndElement(); // xdr:nvSpPr
 
     writer.writeStartElement(QStringLiteral("xdr:spPr"));
-    if(!xbwMode.isNull()){
-         writer.writeAttribute(QStringLiteral("bwMode"), xbwMode);
+    if (!xbwMode.isNull()) {
+        writer.writeAttribute(QStringLiteral("bwMode"), xbwMode);
     }
-        writer.writeStartElement(QStringLiteral("a:xfrm"));
-        writer.writeEmptyElement(QStringLiteral("a:off"));
-        writer.writeAttribute(QStringLiteral("x"), QString::number(posTA.x()));
-        writer.writeAttribute(QStringLiteral("y"), QString::number(posTA.y()));
-        writer.writeEmptyElement(QStringLiteral("a:ext"));
-        writer.writeAttribute(QStringLiteral("cx"), QString::number(extTA.width()));
-        writer.writeAttribute(QStringLiteral("cy"), QString::number(extTA.height()));
-        writer.writeEndElement(); //a:xfrm
-
-        writer.writeStartElement(QStringLiteral("a:prstGeom"));
-        writer.writeAttribute(QStringLiteral("prst"), xprstGeom_prst);
-        writer.writeEmptyElement(QStringLiteral("a:avLst"));
-        writer.writeEndElement(); //a:prstGeom
-
-    if(m_pictureFile){
-        m_drawing->relationships()->addDocumentRelationship(QStringLiteral("/image"), QStringLiteral("../media/image%1.%2").arg(m_pictureFile->index()+1).arg(m_pictureFile->suffix()));
+    writer.writeStartElement(QStringLiteral("a:xfrm"));
+    writer.writeEmptyElement(QStringLiteral("a:off"));
+    writer.writeAttribute(QStringLiteral("x"), QString::number(posTA.x()));
+    writer.writeAttribute(QStringLiteral("y"), QString::number(posTA.y()));
+    writer.writeEmptyElement(QStringLiteral("a:ext"));
+    writer.writeAttribute(QStringLiteral("cx"), QString::number(extTA.width()));
+    writer.writeAttribute(QStringLiteral("cy"), QString::number(extTA.height()));
+    writer.writeEndElement(); // a:xfrm
+
+    writer.writeStartElement(QStringLiteral("a:prstGeom"));
+    writer.writeAttribute(QStringLiteral("prst"), xprstGeom_prst);
+    writer.writeEmptyElement(QStringLiteral("a:avLst"));
+    writer.writeEndElement(); // a:prstGeom
+
+    if (m_pictureFile) {
+        m_drawing->relationships()->addDocumentRelationship(QStringLiteral("/image"),
+                                                            QStringLiteral("../media/image%1.%2")
+                                                                .arg(m_pictureFile->index() + 1)
+                                                                .arg(m_pictureFile->suffix()));
         writer.writeStartElement(QStringLiteral("a:blipFill"));
         writer.writeAttribute(QStringLiteral("dpi"), QString::number(dpiTA));
-        writer.writeAttribute(QStringLiteral("rotWithShape"),QString::number(rotWithShapeTA));
-
-         writer.writeStartElement(QStringLiteral("a:blip"));
-           writer.writeAttribute(QStringLiteral("r:embed"), QStringLiteral("rId%1").arg(m_drawing->relationships()->count()));  //sp_blip_rembed  QStringLiteral("rId%1").arg(m_drawing->relationships()->count()) can't made new pic
-           writer.writeAttribute(QStringLiteral("xmlns:r"), QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships"));
-           if(!sp_blip_cstate.isNull()){
-             writer.writeAttribute(QStringLiteral("cstate"), sp_blip_cstate);
-           }
-          writer.writeEndElement();//a:blip
-             writer.writeEmptyElement(QStringLiteral("a:srcRect"));
-             writer.writeStartElement(QStringLiteral("a:stretch"));
-                    writer.writeEmptyElement(QStringLiteral("a:fillRect"));
-             writer.writeEndElement(); //a:stretch
-         writer.writeEndElement();//a:blipFill
-      }
+        writer.writeAttribute(QStringLiteral("rotWithShape"), QString::number(rotWithShapeTA));
+
+        writer.writeStartElement(QStringLiteral("a:blip"));
+        writer.writeAttribute(
+            QStringLiteral("r:embed"),
+            QStringLiteral("rId%1").arg(m_drawing->relationships()->count())); // sp_blip_rembed
+                                                                               // QStringLiteral("rId%1").arg(m_drawing->relationships()->count())
+                                                                               // can't made new pic
+        writer.writeAttribute(
+            QStringLiteral("xmlns:r"),
+            QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships"));
+        if (!sp_blip_cstate.isNull()) {
+            writer.writeAttribute(QStringLiteral("cstate"), sp_blip_cstate);
+        }
+        writer.writeEndElement(); // a:blip
+        writer.writeEmptyElement(QStringLiteral("a:srcRect"));
+        writer.writeStartElement(QStringLiteral("a:stretch"));
+        writer.writeEmptyElement(QStringLiteral("a:fillRect"));
+        writer.writeEndElement(); // a:stretch
+        writer.writeEndElement(); // a:blipFill
+    }
     writer.writeStartElement(QStringLiteral("a:ln"));
-       if(!xIn_w.isEmpty()&&!xIn_cap.isEmpty()){
-           if(!xIn_w.isEmpty()){
-               writer.writeAttribute(QStringLiteral("w"), xIn_w);
-           }
-           if(!xIn_cap.isEmpty()){
-               writer.writeAttribute(QStringLiteral("cap"), xIn_cap);
-           }
-           if(!xIn_cmpd.isEmpty()){
-               writer.writeAttribute(QStringLiteral("cmpd"), xIn_cmpd);
-           }
-           if(!xIn_algn.isEmpty()){
-               writer.writeAttribute(QStringLiteral("algn"), xIn_algn);
-           }
-       }
-        if((!x_headEnd_tyep.isEmpty())||(!x_headEnd_w.isEmpty())||(!x_headEnd_len.isEmpty())){
-            writer.writeEmptyElement(QStringLiteral("a:headEnd"));
-            if(!x_headEnd_tyep.isEmpty()){
-               writer.writeAttribute(QStringLiteral("type"),x_headEnd_tyep);
-            }
-            if(!x_headEnd_w.isEmpty()){
-              writer.writeAttribute(QStringLiteral("w"),x_headEnd_w);
-            }
-            if(!x_headEnd_len.isEmpty()){
-              writer.writeAttribute(QStringLiteral("len"),x_headEnd_len);
-            }
+    if (!xIn_w.isEmpty() && !xIn_cap.isEmpty()) {
+        if (!xIn_w.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("w"), xIn_w);
+        }
+        if (!xIn_cap.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("cap"), xIn_cap);
+        }
+        if (!xIn_cmpd.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("cmpd"), xIn_cmpd);
+        }
+        if (!xIn_algn.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("algn"), xIn_algn);
+        }
+    }
+    if ((!x_headEnd_tyep.isEmpty()) || (!x_headEnd_w.isEmpty()) || (!x_headEnd_len.isEmpty())) {
+        writer.writeEmptyElement(QStringLiteral("a:headEnd"));
+        if (!x_headEnd_tyep.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("type"), x_headEnd_tyep);
         }
-        if((!x_tailEnd_tyep.isEmpty())||(!x_tailEnd_w.isEmpty())||(!x_tailEnd_len.isEmpty())){
-             writer.writeEmptyElement(QStringLiteral("a:tailEnd"));
-             if(!x_tailEnd_tyep.isEmpty()){
-                 writer.writeAttribute(QStringLiteral("type"),x_tailEnd_tyep);}
-             if(!x_tailEnd_w.isEmpty()){
-                 writer.writeAttribute(QStringLiteral("w"),x_tailEnd_w);}
-             if(!x_tailEnd_len.isEmpty()){
-                 writer.writeAttribute(QStringLiteral("len"),x_tailEnd_len);}
-         }
-
-    writer.writeEndElement();//a:ln
-
-
- writer.writeEndElement(); //xdr:spPr
- // writer style
-
- writer.writeStartElement(QStringLiteral("xdr:style"));// style
-        writer.writeStartElement(QStringLiteral("a:lnRef"));//lnRef
-        writer.writeAttribute(QStringLiteral("idx"),Style_inref_idx);
-           writer.writeStartElement(QStringLiteral("a:schemeClr"));//val
-           writer.writeAttribute(QStringLiteral("val"),Style_inref_val);
-           writer.writeEndElement(); // val
-        writer.writeEndElement(); // lnRef
-        writer.writeStartElement(QStringLiteral("a:fillRef"));//fillRef
-        writer.writeAttribute(QStringLiteral("idx"),style_fillref_idx);
-           writer.writeStartElement(QStringLiteral("a:schemeClr"));//val
-           writer.writeAttribute(QStringLiteral("val"),style_fillref_val);
-           writer.writeEndElement(); // val
-        writer.writeEndElement(); // fillRef
-        writer.writeStartElement(QStringLiteral("a:effectRef"));//effectRef
-        writer.writeAttribute(QStringLiteral("idx"),style_effectref_idx);
-           writer.writeStartElement(QStringLiteral("a:schemeClr"));//val
-           writer.writeAttribute(QStringLiteral("val"),style_effectref_val);
-           writer.writeEndElement(); // val
-        writer.writeEndElement(); // effectRef
-        writer.writeStartElement(QStringLiteral("a:fontRef"));//fontRef
-        writer.writeAttribute(QStringLiteral("idx"),style_forntref_idx);
-           writer.writeStartElement(QStringLiteral("a:schemeClr"));//val
-           writer.writeAttribute(QStringLiteral("val"),style_forntref_val);
-           writer.writeEndElement(); // val
-        writer.writeEndElement(); // fontRef
- writer.writeEndElement(); // style
-
-     writer.writeEndElement(); //xdr:sp
-
-	//}} liufeijin
+        if (!x_headEnd_w.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("w"), x_headEnd_w);
+        }
+        if (!x_headEnd_len.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("len"), x_headEnd_len);
+        }
+    }
+    if ((!x_tailEnd_tyep.isEmpty()) || (!x_tailEnd_w.isEmpty()) || (!x_tailEnd_len.isEmpty())) {
+        writer.writeEmptyElement(QStringLiteral("a:tailEnd"));
+        if (!x_tailEnd_tyep.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("type"), x_tailEnd_tyep);
+        }
+        if (!x_tailEnd_w.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("w"), x_tailEnd_w);
+        }
+        if (!x_tailEnd_len.isEmpty()) {
+            writer.writeAttribute(QStringLiteral("len"), x_tailEnd_len);
+        }
+    }
+
+    writer.writeEndElement(); // a:ln
+
+    writer.writeEndElement(); // xdr:spPr
+    // writer style
+
+    writer.writeStartElement(QStringLiteral("xdr:style")); // style
+    writer.writeStartElement(QStringLiteral("a:lnRef"));   // lnRef
+    writer.writeAttribute(QStringLiteral("idx"), Style_inref_idx);
+    writer.writeStartElement(QStringLiteral("a:schemeClr")); // val
+    writer.writeAttribute(QStringLiteral("val"), Style_inref_val);
+    writer.writeEndElement();                              // val
+    writer.writeEndElement();                              // lnRef
+    writer.writeStartElement(QStringLiteral("a:fillRef")); // fillRef
+    writer.writeAttribute(QStringLiteral("idx"), style_fillref_idx);
+    writer.writeStartElement(QStringLiteral("a:schemeClr")); // val
+    writer.writeAttribute(QStringLiteral("val"), style_fillref_val);
+    writer.writeEndElement();                                // val
+    writer.writeEndElement();                                // fillRef
+    writer.writeStartElement(QStringLiteral("a:effectRef")); // effectRef
+    writer.writeAttribute(QStringLiteral("idx"), style_effectref_idx);
+    writer.writeStartElement(QStringLiteral("a:schemeClr")); // val
+    writer.writeAttribute(QStringLiteral("val"), style_effectref_val);
+    writer.writeEndElement();                              // val
+    writer.writeEndElement();                              // effectRef
+    writer.writeStartElement(QStringLiteral("a:fontRef")); // fontRef
+    writer.writeAttribute(QStringLiteral("idx"), style_forntref_idx);
+    writer.writeStartElement(QStringLiteral("a:schemeClr")); // val
+    writer.writeAttribute(QStringLiteral("val"), style_forntref_val);
+    writer.writeEndElement(); // val
+    writer.writeEndElement(); // fontRef
+    writer.writeEndElement(); // style
+
+    writer.writeEndElement(); // xdr:sp
+
+    //}} liufeijin
 }
 
-//absolute anchor
+// absolute anchor
 
 DrawingAbsoluteAnchor::DrawingAbsoluteAnchor(Drawing *drawing, ObjectType objectType)
-    :DrawingAnchor(drawing, objectType)
+    : DrawingAnchor(drawing, objectType)
 {
-
 }
 
 // check point
@@ -988,22 +1006,15 @@ bool DrawingAbsoluteAnchor::loadFromXml(QXmlStreamReader &reader)
     while (!reader.atEnd()) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
-            if (reader.name() == QLatin1String("pos"))
-            {
+            if (reader.name() == QLatin1String("pos")) {
                 pos = loadXmlPos(reader);
-            }
-            else if (reader.name() == QLatin1String("ext"))
-            {
+            } else if (reader.name() == QLatin1String("ext")) {
                 ext = loadXmlExt(reader);
-            }
-            else
-            {
+            } else {
                 loadXmlObject(reader);
             }
-        }
-        else if (reader.tokenType() == QXmlStreamReader::EndElement
-                   && reader.name() == QLatin1String("absoluteAnchor"))
-        {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name() == QLatin1String("absoluteAnchor")) {
             break;
         }
     }
@@ -1019,15 +1030,14 @@ void DrawingAbsoluteAnchor::saveToXml(QXmlStreamWriter &writer) const
     saveXmlObject(writer);
 
     writer.writeEmptyElement(QStringLiteral("xdr:clientData"));
-    writer.writeEndElement(); //xdr:absoluteAnchor
+    writer.writeEndElement(); // xdr:absoluteAnchor
 }
 
-//one cell anchor
+// one cell anchor
 
 DrawingOneCellAnchor::DrawingOneCellAnchor(Drawing *drawing, ObjectType objectType)
-    :DrawingAnchor(drawing, objectType)
+    : DrawingAnchor(drawing, objectType)
 {
-
 }
 
 int DrawingOneCellAnchor::row() const
@@ -1045,27 +1055,18 @@ bool DrawingOneCellAnchor::loadFromXml(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("oneCellAnchor"));
 
-    while (!reader.atEnd())
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
-        if (reader.tokenType() == QXmlStreamReader::StartElement)
-        {
-            if (reader.name() == QLatin1String("from"))
-            {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("from")) {
                 from = loadXmlMarker(reader, QLatin1String("from"));
-            }
-            else if (reader.name() == QLatin1String("ext"))
-            {
+            } else if (reader.name() == QLatin1String("ext")) {
                 ext = loadXmlExt(reader);
-            }
-            else
-            {
+            } else {
                 loadXmlObject(reader);
             }
-        }
-        else if (reader.tokenType() == QXmlStreamReader::EndElement
-                   && reader.name() == QLatin1String("oneCellAnchor"))
-        {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name() == QLatin1String("oneCellAnchor")) {
             break;
         }
     }
@@ -1082,7 +1083,7 @@ void DrawingOneCellAnchor::saveToXml(QXmlStreamWriter &writer) const
     saveXmlObject(writer);
 
     writer.writeEmptyElement(QStringLiteral("xdr:clientData"));
-    writer.writeEndElement(); //xdr:oneCellAnchor
+    writer.writeEndElement(); // xdr:oneCellAnchor
 }
 
 /*
@@ -1093,9 +1094,8 @@ void DrawingOneCellAnchor::saveToXml(QXmlStreamWriter &writer) const
    cells and its extents are in EMU units.
 */
 DrawingTwoCellAnchor::DrawingTwoCellAnchor(Drawing *drawing, ObjectType objectType)
-    :DrawingAnchor(drawing, objectType)
+    : DrawingAnchor(drawing, objectType)
 {
-
 }
 
 int DrawingTwoCellAnchor::row() const
@@ -1125,31 +1125,23 @@ bool DrawingTwoCellAnchor::loadFromXml(QXmlStreamReader &reader)
     </xsd:complexType>
     */
 
-	//{{ liufeijin
-	QXmlStreamAttributes attrs = reader.attributes();  // for absolute twocell aadd by liufeijin 20181024
+    //{{ liufeijin
+    QXmlStreamAttributes attrs =
+        reader.attributes(); // for absolute twocell aadd by liufeijin 20181024
     editASName = attrs.value(QLatin1String("editAs")).toString();
-	//}}
+    //}}
 
-    while (!reader.atEnd())
-    {
+    while (!reader.atEnd()) {
         reader.readNextStartElement();
 
-        if (reader.tokenType() == QXmlStreamReader::StartElement)
-        {
-            if (reader.name() == QLatin1String("from"))
-            {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("from")) {
                 from = loadXmlMarker(reader, QLatin1String("from"));
-            }
-            else if (reader.name() == QLatin1String("to"))
-            {
+            } else if (reader.name() == QLatin1String("to")) {
                 to = loadXmlMarker(reader, QLatin1String("to"));
-            }
-            else if (reader.name() == QLatin1String("clientData"))
-            {
+            } else if (reader.name() == QLatin1String("clientData")) {
                 // clientData
-            }
-            else
-            {
+            } else {
                 /*
                 <xsd:group name="EG_ObjectChoices">
                     <xsd:sequence>
@@ -1167,27 +1159,24 @@ bool DrawingTwoCellAnchor::loadFromXml(QXmlStreamReader &reader)
 
                 loadXmlObject(reader);
             }
-        }
-        else if (reader.tokenType() == QXmlStreamReader::EndElement
-                   && reader.name() == QLatin1String("twoCellAnchor"))
-        {
+        } else if (reader.tokenType() == QXmlStreamReader::EndElement &&
+                   reader.name() == QLatin1String("twoCellAnchor")) {
             break;
         }
     }
     return true;
 }
 
-
-   void DrawingTwoCellAnchor::saveToXml(QXmlStreamWriter &writer) const
+void DrawingTwoCellAnchor::saveToXml(QXmlStreamWriter &writer) const
 {
     writer.writeStartElement(QStringLiteral("xdr:twoCellAnchor"));
 
-	//{{ liufeijin
+    //{{ liufeijin
     // writer.writeAttribute(QStringLiteral("editAs"), QStringLiteral("oneCell"));
-   if(!editASName.isNull()){
-       writer.writeAttribute(QStringLiteral("editAs"), editASName ); //QStringLiteral("oneCell")
-   }
-	// }}
+    if (!editASName.isNull()) {
+        writer.writeAttribute(QStringLiteral("editAs"), editASName); // QStringLiteral("oneCell")
+    }
+    // }}
 
     saveXmlMarker(writer, from, QStringLiteral("xdr:from"));
     saveXmlMarker(writer, to, QStringLiteral("xdr:to"));
@@ -1195,9 +1184,7 @@ bool DrawingTwoCellAnchor::loadFromXml(QXmlStreamReader &reader)
     saveXmlObject(writer);
 
     writer.writeEmptyElement(QStringLiteral("xdr:clientData"));
-    writer.writeEndElement(); //xdr:twoCellAnchor
-
+    writer.writeEndElement(); // xdr:twoCellAnchor
 }
 
-
 QT_END_NAMESPACE_XLSX
diff --git a/QXlsx/source/xlsxformat.cpp b/QXlsx/source/xlsxformat.cpp
index cc506772..13bbc9e2 100644
--- a/QXlsx/source/xlsxformat.cpp
+++ b/QXlsx/source/xlsxformat.cpp
@@ -1,45 +1,64 @@
 // xlsxformat.cpp
 
-#include <QtGlobal>
-#include <QDataStream>
-#include <QDebug>
-
 #include "xlsxformat.h"
-#include "xlsxformat_p.h"
+
 #include "xlsxcolor_p.h"
+#include "xlsxformat_p.h"
 #include "xlsxnumformatparser_p.h"
 
+#include <QDataStream>
+#include <QDebug>
+#include <QtGlobal>
+
 QT_BEGIN_NAMESPACE_XLSX
 
 FormatPrivate::FormatPrivate()
-	: dirty(true)
-	, font_dirty(true), font_index_valid(false), font_index(0)
-	, fill_dirty(true), fill_index_valid(false), fill_index(0)
-	, border_dirty(true), border_index_valid(false), border_index(0)
-	, xf_index(-1), xf_indexValid(false)
-	, is_dxf_fomat(false), dxf_index(-1), dxf_indexValid(false)
-	, theme(0)
+    : dirty(true)
+    , font_dirty(true)
+    , font_index_valid(false)
+    , font_index(0)
+    , fill_dirty(true)
+    , fill_index_valid(false)
+    , fill_index(0)
+    , border_dirty(true)
+    , border_index_valid(false)
+    , border_index(0)
+    , xf_index(-1)
+    , xf_indexValid(false)
+    , is_dxf_fomat(false)
+    , dxf_index(-1)
+    , dxf_indexValid(false)
+    , theme(0)
 {
 }
 
 FormatPrivate::FormatPrivate(const FormatPrivate &other)
-	: QSharedData(other)
-	, dirty(other.dirty), formatKey(other.formatKey)
-	, font_dirty(other.font_dirty), font_index_valid(other.font_index_valid), font_key(other.font_key), font_index(other.font_index)
-	, fill_dirty(other.fill_dirty), fill_index_valid(other.fill_index_valid), fill_key(other.fill_key), fill_index(other.fill_index)
-	, border_dirty(other.border_dirty), border_index_valid(other.border_index_valid), border_key(other.border_key), border_index(other.border_index)
-	, xf_index(other.xf_index), xf_indexValid(other.xf_indexValid)
-	, is_dxf_fomat(other.is_dxf_fomat), dxf_index(other.dxf_index), dxf_indexValid(other.dxf_indexValid)
-	, theme(other.theme)
-	, properties(other.properties)
-{
-
-}
-
-FormatPrivate::~FormatPrivate()
-{
-
-}
+    : QSharedData(other)
+    , dirty(other.dirty)
+    , formatKey(other.formatKey)
+    , font_dirty(other.font_dirty)
+    , font_index_valid(other.font_index_valid)
+    , font_key(other.font_key)
+    , font_index(other.font_index)
+    , fill_dirty(other.fill_dirty)
+    , fill_index_valid(other.fill_index_valid)
+    , fill_key(other.fill_key)
+    , fill_index(other.fill_index)
+    , border_dirty(other.border_dirty)
+    , border_index_valid(other.border_index_valid)
+    , border_key(other.border_key)
+    , border_index(other.border_index)
+    , xf_index(other.xf_index)
+    , xf_indexValid(other.xf_indexValid)
+    , is_dxf_fomat(other.is_dxf_fomat)
+    , dxf_index(other.dxf_index)
+    , dxf_indexValid(other.dxf_indexValid)
+    , theme(other.theme)
+    , properties(other.properties)
+{
+}
+
+FormatPrivate::~FormatPrivate() {}
 
 /*!
  * \class Format
@@ -57,7 +76,6 @@ FormatPrivate::~FormatPrivate()
  * \value FontScriptSub sub script
  */
 
-
 /*!
  * \enum Format::FontUnderline
  *
@@ -116,7 +134,7 @@ FormatPrivate::~FormatPrivate()
  * \value BorderDashDotDot
  * \value BorderMediumDashDotDot
  * \value BorderSlantDashDot
-*/
+ */
 
 /*!
  * \enum Format::DiagonalBorderType
@@ -160,41 +178,38 @@ FormatPrivate::~FormatPrivate()
  */
 Format::Format()
 {
-	//The d pointer is initialized with a null pointer
+    // The d pointer is initialized with a null pointer
 }
 
 /*!
    Creates a new format with the same attributes as the \a other format.
  */
 Format::Format(const Format &other)
-	:d(other.d)
+    : d(other.d)
 {
-
 }
 
 /*!
    Assigns the \a other format to this format, and returns a
    reference to this format.
  */
-Format &Format::operator =(const Format &other)
+Format &Format::operator=(const Format &other)
 {
-	d = other.d;
-	return *this;
+    d = other.d;
+    return *this;
 }
 
 /*!
  * Destroys this format.
  */
-Format::~Format()
-{
-}
+Format::~Format() {}
 
 /*!
  * Returns the number format identifier.
  */
 int Format::numberFormatIndex() const
 {
-	return intProperty(FormatPrivate::P_NumFmt_Id, 0);
+    return intProperty(FormatPrivate::P_NumFmt_Id, 0);
 }
 
 /*!
@@ -204,8 +219,8 @@ int Format::numberFormatIndex() const
  */
 void Format::setNumberFormatIndex(int format)
 {
-	setProperty(FormatPrivate::P_NumFmt_Id, format);
-	clearProperty(FormatPrivate::P_NumFmt_FormatCode);
+    setProperty(FormatPrivate::P_NumFmt_Id, format);
+    clearProperty(FormatPrivate::P_NumFmt_FormatCode);
 }
 
 /*!
@@ -215,7 +230,7 @@ void Format::setNumberFormatIndex(int format)
  */
 QString Format::numberFormat() const
 {
-	return stringProperty(FormatPrivate::P_NumFmt_FormatCode);
+    return stringProperty(FormatPrivate::P_NumFmt_FormatCode);
 }
 
 /*!
@@ -224,10 +239,10 @@ QString Format::numberFormat() const
  */
 void Format::setNumberFormat(const QString &format)
 {
-	if (format.isEmpty())
-		return;
-	setProperty(FormatPrivate::P_NumFmt_FormatCode, format);
-	clearProperty(FormatPrivate::P_NumFmt_Id); //numFmt id must be re-generated.
+    if (format.isEmpty())
+        return;
+    setProperty(FormatPrivate::P_NumFmt_FormatCode, format);
+    clearProperty(FormatPrivate::P_NumFmt_Id); // numFmt id must be re-generated.
 }
 
 /*!
@@ -235,65 +250,61 @@ void Format::setNumberFormat(const QString &format)
  */
 bool Format::isDateTimeFormat() const
 {
-	//NOTICE:
+    // NOTICE:
 
-	if (hasProperty(FormatPrivate::P_NumFmt_FormatCode)) 
-	{
-		//Custom numFmt, so
-		//Gauss from the number string
-		return NumFormatParser::isDateTime(numberFormat());
-	} 
-	else if (hasProperty(FormatPrivate::P_NumFmt_Id))
-	{
-		//Non-custom numFmt
-		int idx = numberFormatIndex();
+    if (hasProperty(FormatPrivate::P_NumFmt_FormatCode)) {
+        // Custom numFmt, so
+        // Gauss from the number string
+        return NumFormatParser::isDateTime(numberFormat());
+    } else if (hasProperty(FormatPrivate::P_NumFmt_Id)) {
+        // Non-custom numFmt
+        int idx = numberFormatIndex();
 
-		//Is built-in date time number id?
-		if ((idx >= 14 && idx <= 22) || (idx >= 45 && idx <= 47))
-			return true;
+        // Is built-in date time number id?
+        if ((idx >= 14 && idx <= 22) || (idx >= 45 && idx <= 47))
+            return true;
 
-		if ((idx >= 27 && idx <= 36) || (idx >= 50 && idx <= 58)) //Used in CHS\CHT\JPN\KOR
-			return true;
-	}
+        if ((idx >= 27 && idx <= 36) || (idx >= 50 && idx <= 58)) // Used in CHS\CHT\JPN\KOR
+            return true;
+    }
 
-	return false;
+    return false;
 }
 
 /*!
-	\internal
-	Set a custom num \a format with the given \a id.
+        \internal
+        Set a custom num \a format with the given \a id.
  */
 void Format::setNumberFormat(int id, const QString &format)
 {
-	setProperty(FormatPrivate::P_NumFmt_Id, id);
-	setProperty(FormatPrivate::P_NumFmt_FormatCode, format);
+    setProperty(FormatPrivate::P_NumFmt_Id, id);
+    setProperty(FormatPrivate::P_NumFmt_FormatCode, format);
 }
 
 /*!
-	\internal
-	Called by styles to fix the numFmt
+        \internal
+        Called by styles to fix the numFmt
  */
 void Format::fixNumberFormat(int id, const QString &format)
 {
-	setProperty(FormatPrivate::P_NumFmt_Id, id, 0, false);
-	setProperty(FormatPrivate::P_NumFmt_FormatCode, format, QString(), false);
+    setProperty(FormatPrivate::P_NumFmt_Id, id, 0, false);
+    setProperty(FormatPrivate::P_NumFmt_FormatCode, format, QString(), false);
 }
 
 /*!
-	\internal
-	Return true if the format has number format.
+        \internal
+        Return true if the format has number format.
  */
 bool Format::hasNumFmtData() const
 {
-	if (!d)
-		return false;
+    if (!d)
+        return false;
 
-    if ( hasProperty(FormatPrivate::P_NumFmt_Id) ||
-         hasProperty(FormatPrivate::P_NumFmt_FormatCode) )
-    {
-		return true;
-	}
-	return false;
+    if (hasProperty(FormatPrivate::P_NumFmt_Id) ||
+        hasProperty(FormatPrivate::P_NumFmt_FormatCode)) {
+        return true;
+    }
+    return false;
 }
 
 /*!
@@ -301,7 +312,7 @@ bool Format::hasNumFmtData() const
  */
 int Format::fontSize() const
 {
-	return intProperty(FormatPrivate::P_Font_Size);
+    return intProperty(FormatPrivate::P_Font_Size);
 }
 
 /*!
@@ -309,7 +320,7 @@ int Format::fontSize() const
  */
 void Format::setFontSize(int size)
 {
-	setProperty(FormatPrivate::P_Font_Size, size, 0);
+    setProperty(FormatPrivate::P_Font_Size, size, 0);
 }
 
 /*!
@@ -317,7 +328,7 @@ void Format::setFontSize(int size)
  */
 bool Format::fontItalic() const
 {
-	return boolProperty(FormatPrivate::P_Font_Italic);
+    return boolProperty(FormatPrivate::P_Font_Italic);
 }
 
 /*!
@@ -325,7 +336,7 @@ bool Format::fontItalic() const
  */
 void Format::setFontItalic(bool italic)
 {
-	setProperty(FormatPrivate::P_Font_Italic, italic, false);
+    setProperty(FormatPrivate::P_Font_Italic, italic, false);
 }
 
 /*!
@@ -333,7 +344,7 @@ void Format::setFontItalic(bool italic)
  */
 bool Format::fontStrikeOut() const
 {
-	return boolProperty(FormatPrivate::P_Font_StrikeOut);
+    return boolProperty(FormatPrivate::P_Font_StrikeOut);
 }
 
 /*!
@@ -341,7 +352,7 @@ bool Format::fontStrikeOut() const
  */
 void Format::setFontStrikeOut(bool strikeOut)
 {
-	setProperty(FormatPrivate::P_Font_StrikeOut, strikeOut, false);
+    setProperty(FormatPrivate::P_Font_StrikeOut, strikeOut, false);
 }
 
 /*!
@@ -349,9 +360,9 @@ void Format::setFontStrikeOut(bool strikeOut)
  */
 QColor Format::fontColor() const
 {
-	if (hasProperty(FormatPrivate::P_Font_Color))
-		return colorProperty(FormatPrivate::P_Font_Color);
-	return QColor();
+    if (hasProperty(FormatPrivate::P_Font_Color))
+        return colorProperty(FormatPrivate::P_Font_Color);
+    return QColor();
 }
 
 /*!
@@ -359,7 +370,7 @@ QColor Format::fontColor() const
  */
 void Format::setFontColor(const QColor &color)
 {
-	setProperty(FormatPrivate::P_Font_Color, XlsxColor(color), XlsxColor());
+    setProperty(FormatPrivate::P_Font_Color, XlsxColor(color), XlsxColor());
 }
 
 /*!
@@ -367,7 +378,7 @@ void Format::setFontColor(const QColor &color)
  */
 bool Format::fontBold() const
 {
-	return boolProperty(FormatPrivate::P_Font_Bold);
+    return boolProperty(FormatPrivate::P_Font_Bold);
 }
 
 /*!
@@ -375,7 +386,7 @@ bool Format::fontBold() const
  */
 void Format::setFontBold(bool bold)
 {
-	setProperty(FormatPrivate::P_Font_Bold, bold, false);
+    setProperty(FormatPrivate::P_Font_Bold, bold, false);
 }
 
 /*!
@@ -383,7 +394,7 @@ void Format::setFontBold(bool bold)
  */
 Format::FontScript Format::fontScript() const
 {
-	return static_cast<Format::FontScript>(intProperty(FormatPrivate::P_Font_Script));
+    return static_cast<Format::FontScript>(intProperty(FormatPrivate::P_Font_Script));
 }
 
 /*!
@@ -391,7 +402,7 @@ Format::FontScript Format::fontScript() const
  */
 void Format::setFontScript(FontScript script)
 {
-	setProperty(FormatPrivate::P_Font_Script, script, FontScriptNormal);
+    setProperty(FormatPrivate::P_Font_Script, script, FontScriptNormal);
 }
 
 /*!
@@ -399,7 +410,7 @@ void Format::setFontScript(FontScript script)
  */
 Format::FontUnderline Format::fontUnderline() const
 {
-	return static_cast<Format::FontUnderline>(intProperty(FormatPrivate::P_Font_Underline));
+    return static_cast<Format::FontUnderline>(intProperty(FormatPrivate::P_Font_Underline));
 }
 
 /*!
@@ -407,7 +418,7 @@ Format::FontUnderline Format::fontUnderline() const
  */
 void Format::setFontUnderline(FontUnderline underline)
 {
-	setProperty(FormatPrivate::P_Font_Underline, underline, FontUnderlineNone);
+    setProperty(FormatPrivate::P_Font_Underline, underline, FontUnderlineNone);
 }
 
 /*!
@@ -415,7 +426,7 @@ void Format::setFontUnderline(FontUnderline underline)
  */
 bool Format::fontOutline() const
 {
-	return boolProperty(FormatPrivate::P_Font_Outline);
+    return boolProperty(FormatPrivate::P_Font_Outline);
 }
 
 /*!
@@ -423,7 +434,7 @@ bool Format::fontOutline() const
  */
 void Format::setFontOutline(bool outline)
 {
-	setProperty(FormatPrivate::P_Font_Outline, outline, false);
+    setProperty(FormatPrivate::P_Font_Outline, outline, false);
 }
 
 /*!
@@ -431,7 +442,7 @@ void Format::setFontOutline(bool outline)
  */
 QString Format::fontName() const
 {
-	return stringProperty(FormatPrivate::P_Font_Name, QStringLiteral("Calibri"));
+    return stringProperty(FormatPrivate::P_Font_Name, QStringLiteral("Calibri"));
 }
 
 /*!
@@ -439,7 +450,7 @@ QString Format::fontName() const
  */
 void Format::setFontName(const QString &name)
 {
-	setProperty(FormatPrivate::P_Font_Name, name, QStringLiteral("Calibri"));
+    setProperty(FormatPrivate::P_Font_Name, name, QStringLiteral("Calibri"));
 }
 
 /*!
@@ -447,15 +458,15 @@ void Format::setFontName(const QString &name)
  */
 QFont Format::font() const
 {
-   QFont font;
-   font.setFamily(fontName());
-   if (fontSize() > 0)
-	   font.setPointSize(fontSize());
-   font.setBold(fontBold());
-   font.setItalic(fontItalic());
-   font.setUnderline(fontUnderline()!=FontUnderlineNone);
-   font.setStrikeOut(fontStrikeOut());
-   return font;
+    QFont font;
+    font.setFamily(fontName());
+    if (fontSize() > 0)
+        font.setPointSize(fontSize());
+    font.setBold(fontBold());
+    font.setItalic(fontItalic());
+    font.setUnderline(fontUnderline() != FontUnderlineNone);
+    font.setStrikeOut(fontStrikeOut());
+    return font;
 }
 
 /*!
@@ -463,13 +474,13 @@ QFont Format::font() const
  */
 void Format::setFont(const QFont &font)
 {
-	setFontName(font.family());
-	if (font.pointSize() > 0)
-		setFontSize(font.pointSize());
-	setFontBold(font.bold());
-	setFontItalic(font.italic());
-	setFontUnderline(font.underline() ? FontUnderlineSingle : FontUnderlineNone);
-	setFontStrikeOut(font.strikeOut());
+    setFontName(font.family());
+    if (font.pointSize() > 0)
+        setFontSize(font.pointSize());
+    setFontBold(font.bold());
+    setFontItalic(font.italic());
+    setFontUnderline(font.underline() ? FontUnderlineSingle : FontUnderlineNone);
+    setFontStrikeOut(font.strikeOut());
 }
 
 /*!
@@ -479,9 +490,9 @@ void Format::setFont(const QFont &font)
  */
 bool Format::fontIndexValid() const
 {
-	if (!hasFontData())
-		return false;
-	return d->font_index_valid;
+    if (!hasFontData())
+        return false;
+    return d->font_index_valid;
 }
 
 /*!
@@ -489,10 +500,10 @@ bool Format::fontIndexValid() const
  */
 int Format::fontIndex() const
 {
-	if (fontIndexValid())
-		return d->font_index;
+    if (fontIndexValid())
+        return d->font_index;
 
-	return 0;
+    return 0;
 }
 
 /*!
@@ -500,8 +511,8 @@ int Format::fontIndex() const
  */
 void Format::setFontIndex(int index)
 {
-	d->font_index = index;
-	d->font_index_valid = true;
+    d->font_index       = index;
+    d->font_index_valid = true;
 }
 
 /*!
@@ -509,39 +520,39 @@ void Format::setFontIndex(int index)
  */
 QByteArray Format::fontKey() const
 {
-	if (isEmpty())
-		return QByteArray();
+    if (isEmpty())
+        return QByteArray();
 
-	if (d->font_dirty) {
-		QByteArray key;
-		QDataStream stream(&key, QIODevice::WriteOnly);
-		for (int i=FormatPrivate::P_Font_STARTID; i<FormatPrivate::P_Font_ENDID; ++i) {
+    if (d->font_dirty) {
+        QByteArray key;
+        QDataStream stream(&key, QIODevice::WriteOnly);
+        for (int i = FormatPrivate::P_Font_STARTID; i < FormatPrivate::P_Font_ENDID; ++i) {
             auto it = d->properties.constFind(i);
             if (it != d->properties.constEnd())
                 stream << i << it.value();
-		};
+        };
 
-		const_cast<Format*>(this)->d->font_key = key;
-		const_cast<Format*>(this)->d->font_dirty = false;
-	}
+        const_cast<Format *>(this)->d->font_key   = key;
+        const_cast<Format *>(this)->d->font_dirty = false;
+    }
 
-	return d->font_key;
+    return d->font_key;
 }
 
 /*!
-	\internal
-	Return true if the format has font format, otherwise return false.
+        \internal
+        Return true if the format has font format, otherwise return false.
  */
 bool Format::hasFontData() const
 {
-	if (!d)
-		return false;
+    if (!d)
+        return false;
 
-	for (int i=FormatPrivate::P_Font_STARTID; i<FormatPrivate::P_Font_ENDID; ++i) {
-		if (hasProperty(i))
-			return true;
-	}
-	return false;
+    for (int i = FormatPrivate::P_Font_STARTID; i < FormatPrivate::P_Font_ENDID; ++i) {
+        if (hasProperty(i))
+            return true;
+    }
+    return false;
 }
 
 /*!
@@ -549,7 +560,8 @@ bool Format::hasFontData() const
  */
 Format::HorizontalAlignment Format::horizontalAlignment() const
 {
-	return static_cast<Format::HorizontalAlignment>(intProperty(FormatPrivate::P_Alignment_AlignH, AlignHGeneral));
+    return static_cast<Format::HorizontalAlignment>(
+        intProperty(FormatPrivate::P_Alignment_AlignH, AlignHGeneral));
 }
 
 /*!
@@ -557,17 +569,18 @@ Format::HorizontalAlignment Format::horizontalAlignment() const
  */
 void Format::setHorizontalAlignment(HorizontalAlignment align)
 {
-	if (hasProperty(FormatPrivate::P_Alignment_Indent)
-			&&(align != AlignHGeneral && align != AlignLeft && align != AlignRight && align != AlignHDistributed)) {
-		clearProperty(FormatPrivate::P_Alignment_Indent);
-	}
+    if (hasProperty(FormatPrivate::P_Alignment_Indent) &&
+        (align != AlignHGeneral && align != AlignLeft && align != AlignRight &&
+         align != AlignHDistributed)) {
+        clearProperty(FormatPrivate::P_Alignment_Indent);
+    }
 
-	if (hasProperty(FormatPrivate::P_Alignment_ShinkToFit)
-			&& (align == AlignHFill || align == AlignHJustify || align == AlignHDistributed)) {
-		clearProperty(FormatPrivate::P_Alignment_ShinkToFit);
-	}
+    if (hasProperty(FormatPrivate::P_Alignment_ShinkToFit) &&
+        (align == AlignHFill || align == AlignHJustify || align == AlignHDistributed)) {
+        clearProperty(FormatPrivate::P_Alignment_ShinkToFit);
+    }
 
-	setProperty(FormatPrivate::P_Alignment_AlignH, align, AlignHGeneral);
+    setProperty(FormatPrivate::P_Alignment_AlignH, align, AlignHGeneral);
 }
 
 /*!
@@ -575,7 +588,8 @@ void Format::setHorizontalAlignment(HorizontalAlignment align)
  */
 Format::VerticalAlignment Format::verticalAlignment() const
 {
-	return static_cast<Format::VerticalAlignment>(intProperty(FormatPrivate::P_Alignment_AlignV, AlignBottom));
+    return static_cast<Format::VerticalAlignment>(
+        intProperty(FormatPrivate::P_Alignment_AlignV, AlignBottom));
 }
 
 /*!
@@ -583,7 +597,7 @@ Format::VerticalAlignment Format::verticalAlignment() const
  */
 void Format::setVerticalAlignment(VerticalAlignment align)
 {
-	setProperty(FormatPrivate::P_Alignment_AlignV, align, AlignBottom);
+    setProperty(FormatPrivate::P_Alignment_AlignV, align, AlignBottom);
 }
 
 /*!
@@ -591,7 +605,7 @@ void Format::setVerticalAlignment(VerticalAlignment align)
  */
 bool Format::textWrap() const
 {
-	return boolProperty(FormatPrivate::P_Alignment_Wrap);
+    return boolProperty(FormatPrivate::P_Alignment_Wrap);
 }
 
 /*!
@@ -599,10 +613,10 @@ bool Format::textWrap() const
  */
 void Format::setTextWrap(bool wrap)
 {
-	if (wrap && hasProperty(FormatPrivate::P_Alignment_ShinkToFit))
-		clearProperty(FormatPrivate::P_Alignment_ShinkToFit);
+    if (wrap && hasProperty(FormatPrivate::P_Alignment_ShinkToFit))
+        clearProperty(FormatPrivate::P_Alignment_ShinkToFit);
 
-	setProperty(FormatPrivate::P_Alignment_Wrap, wrap, false);
+    setProperty(FormatPrivate::P_Alignment_Wrap, wrap, false);
 }
 
 /*!
@@ -610,7 +624,7 @@ void Format::setTextWrap(bool wrap)
  */
 int Format::rotation() const
 {
-	return intProperty(FormatPrivate::P_Alignment_Rotation);
+    return intProperty(FormatPrivate::P_Alignment_Rotation);
 }
 
 /*!
@@ -618,7 +632,7 @@ int Format::rotation() const
  */
 void Format::setRotation(int rotation)
 {
-	setProperty(FormatPrivate::P_Alignment_Rotation, rotation, 0);
+    setProperty(FormatPrivate::P_Alignment_Rotation, rotation, 0);
 }
 
 /*!
@@ -626,7 +640,7 @@ void Format::setRotation(int rotation)
  */
 int Format::indent() const
 {
-	return intProperty(FormatPrivate::P_Alignment_Indent);
+    return intProperty(FormatPrivate::P_Alignment_Indent);
 }
 
 /*!
@@ -634,15 +648,15 @@ int Format::indent() const
  */
 void Format::setIndent(int indent)
 {
-	if (indent && hasProperty(FormatPrivate::P_Alignment_AlignH)) {
-		HorizontalAlignment hl = horizontalAlignment();
+    if (indent && hasProperty(FormatPrivate::P_Alignment_AlignH)) {
+        HorizontalAlignment hl = horizontalAlignment();
 
-		if (hl != AlignHGeneral && hl != AlignLeft && hl!= AlignRight && hl!= AlignHJustify) {
-			setHorizontalAlignment(AlignLeft);
-		}
-	}
+        if (hl != AlignHGeneral && hl != AlignLeft && hl != AlignRight && hl != AlignHJustify) {
+            setHorizontalAlignment(AlignLeft);
+        }
+    }
 
-	setProperty(FormatPrivate::P_Alignment_Indent, indent, 0);
+    setProperty(FormatPrivate::P_Alignment_Indent, indent, 0);
 }
 
 /*!
@@ -650,7 +664,7 @@ void Format::setIndent(int indent)
  */
 bool Format::shrinkToFit() const
 {
-	return boolProperty(FormatPrivate::P_Alignment_ShinkToFit);
+    return boolProperty(FormatPrivate::P_Alignment_ShinkToFit);
 }
 
 /*!
@@ -658,16 +672,16 @@ bool Format::shrinkToFit() const
  */
 void Format::setShrinkToFit(bool shink)
 {
-	if (shink && hasProperty(FormatPrivate::P_Alignment_Wrap))
-		clearProperty(FormatPrivate::P_Alignment_Wrap);
+    if (shink && hasProperty(FormatPrivate::P_Alignment_Wrap))
+        clearProperty(FormatPrivate::P_Alignment_Wrap);
 
-	if (shink && hasProperty(FormatPrivate::P_Alignment_AlignH)) {
-		HorizontalAlignment hl = horizontalAlignment();
-		if (hl == AlignHFill || hl == AlignHJustify || hl == AlignHDistributed)
-			setHorizontalAlignment(AlignLeft);
-	}
+    if (shink && hasProperty(FormatPrivate::P_Alignment_AlignH)) {
+        HorizontalAlignment hl = horizontalAlignment();
+        if (hl == AlignHFill || hl == AlignHJustify || hl == AlignHDistributed)
+            setHorizontalAlignment(AlignLeft);
+    }
 
-	setProperty(FormatPrivate::P_Alignment_ShinkToFit, shink, false);
+    setProperty(FormatPrivate::P_Alignment_ShinkToFit, shink, false);
 }
 
 /*!
@@ -675,14 +689,14 @@ void Format::setShrinkToFit(bool shink)
  */
 bool Format::hasAlignmentData() const
 {
-	if (!d)
-		return false;
+    if (!d)
+        return false;
 
-	for (int i=FormatPrivate::P_Alignment_STARTID; i<FormatPrivate::P_Alignment_ENDID; ++i) {
-		if (hasProperty(i))
-			return true;
-	}
-	return false;
+    for (int i = FormatPrivate::P_Alignment_STARTID; i < FormatPrivate::P_Alignment_ENDID; ++i) {
+        if (hasProperty(i))
+            return true;
+    }
+    return false;
 }
 
 /*!
@@ -690,10 +704,10 @@ bool Format::hasAlignmentData() const
  */
 void Format::setBorderStyle(BorderStyle style)
 {
-	setLeftBorderStyle(style);
-	setRightBorderStyle(style);
-	setBottomBorderStyle(style);
-	setTopBorderStyle(style);
+    setLeftBorderStyle(style);
+    setRightBorderStyle(style);
+    setBottomBorderStyle(style);
+    setTopBorderStyle(style);
 }
 
 /*!
@@ -701,10 +715,10 @@ void Format::setBorderStyle(BorderStyle style)
  */
 void Format::setBorderColor(const QColor &color)
 {
-	setLeftBorderColor(color);
-	setRightBorderColor(color);
-	setTopBorderColor(color);
-	setBottomBorderColor(color);
+    setLeftBorderColor(color);
+    setRightBorderColor(color);
+    setTopBorderColor(color);
+    setBottomBorderColor(color);
 }
 
 /*!
@@ -712,7 +726,7 @@ void Format::setBorderColor(const QColor &color)
  */
 Format::BorderStyle Format::leftBorderStyle() const
 {
-	return static_cast<BorderStyle>(intProperty(FormatPrivate::P_Border_LeftStyle));
+    return static_cast<BorderStyle>(intProperty(FormatPrivate::P_Border_LeftStyle));
 }
 
 /*!
@@ -720,7 +734,7 @@ Format::BorderStyle Format::leftBorderStyle() const
  */
 void Format::setLeftBorderStyle(BorderStyle style)
 {
-	setProperty(FormatPrivate::P_Border_LeftStyle, style, BorderNone);
+    setProperty(FormatPrivate::P_Border_LeftStyle, style, BorderNone);
 }
 
 /*!
@@ -728,181 +742,181 @@ void Format::setLeftBorderStyle(BorderStyle style)
  */
 QColor Format::leftBorderColor() const
 {
-	return colorProperty(FormatPrivate::P_Border_LeftColor);
+    return colorProperty(FormatPrivate::P_Border_LeftColor);
 }
 
 /*!
-	Sets the left border color to the given \a color
+        Sets the left border color to the given \a color
 */
 void Format::setLeftBorderColor(const QColor &color)
 {
-	setProperty(FormatPrivate::P_Border_LeftColor, XlsxColor(color), XlsxColor());
+    setProperty(FormatPrivate::P_Border_LeftColor, XlsxColor(color), XlsxColor());
 }
 
 /*!
-	Returns the right border style.
+        Returns the right border style.
 */
 Format::BorderStyle Format::rightBorderStyle() const
 {
-	return static_cast<BorderStyle>(intProperty(FormatPrivate::P_Border_RightStyle));
+    return static_cast<BorderStyle>(intProperty(FormatPrivate::P_Border_RightStyle));
 }
 
 /*!
-	Sets the right border style to the given \a style.
+        Sets the right border style to the given \a style.
 */
 void Format::setRightBorderStyle(BorderStyle style)
 {
-	setProperty(FormatPrivate::P_Border_RightStyle, style, BorderNone);
+    setProperty(FormatPrivate::P_Border_RightStyle, style, BorderNone);
 }
 
 /*!
-	Returns the right border color.
+        Returns the right border color.
 */
 QColor Format::rightBorderColor() const
 {
-	return colorProperty(FormatPrivate::P_Border_RightColor);
+    return colorProperty(FormatPrivate::P_Border_RightColor);
 }
 
 /*!
-	Sets the right border color to the given \a color
+        Sets the right border color to the given \a color
 */
 void Format::setRightBorderColor(const QColor &color)
 {
-	setProperty(FormatPrivate::P_Border_RightColor, XlsxColor(color), XlsxColor());
+    setProperty(FormatPrivate::P_Border_RightColor, XlsxColor(color), XlsxColor());
 }
 
 /*!
-	Returns the top border style.
+        Returns the top border style.
 */
 Format::BorderStyle Format::topBorderStyle() const
 {
-	return static_cast<BorderStyle>(intProperty(FormatPrivate::P_Border_TopStyle));
+    return static_cast<BorderStyle>(intProperty(FormatPrivate::P_Border_TopStyle));
 }
 
 /*!
-	Sets the top border style to the given \a style.
+        Sets the top border style to the given \a style.
 */
 void Format::setTopBorderStyle(BorderStyle style)
 {
-	setProperty(FormatPrivate::P_Border_TopStyle, style, BorderNone);
+    setProperty(FormatPrivate::P_Border_TopStyle, style, BorderNone);
 }
 
 /*!
-	Returns the top border color.
+        Returns the top border color.
 */
 QColor Format::topBorderColor() const
 {
-	return colorProperty(FormatPrivate::P_Border_TopColor);
+    return colorProperty(FormatPrivate::P_Border_TopColor);
 }
 
 /*!
-	Sets the top border color to the given \a color.
+        Sets the top border color to the given \a color.
 */
 void Format::setTopBorderColor(const QColor &color)
 {
-	setProperty(FormatPrivate::P_Border_TopColor, XlsxColor(color), XlsxColor());
+    setProperty(FormatPrivate::P_Border_TopColor, XlsxColor(color), XlsxColor());
 }
 
 /*!
-	Returns the bottom border style.
+        Returns the bottom border style.
 */
 Format::BorderStyle Format::bottomBorderStyle() const
 {
-	return static_cast<BorderStyle>(intProperty(FormatPrivate::P_Border_BottomStyle));
+    return static_cast<BorderStyle>(intProperty(FormatPrivate::P_Border_BottomStyle));
 }
 
 /*!
-	Sets the bottom border style to the given \a style.
+        Sets the bottom border style to the given \a style.
 */
 void Format::setBottomBorderStyle(BorderStyle style)
 {
-	setProperty(FormatPrivate::P_Border_BottomStyle, style, BorderNone);
+    setProperty(FormatPrivate::P_Border_BottomStyle, style, BorderNone);
 }
 
 /*!
-	Returns the bottom border color.
+        Returns the bottom border color.
 */
 QColor Format::bottomBorderColor() const
 {
-	return colorProperty(FormatPrivate::P_Border_BottomColor);
+    return colorProperty(FormatPrivate::P_Border_BottomColor);
 }
 
 /*!
-	Sets the bottom border color to the given \a color.
+        Sets the bottom border color to the given \a color.
 */
 void Format::setBottomBorderColor(const QColor &color)
 {
-	setProperty(FormatPrivate::P_Border_BottomColor, XlsxColor(color), XlsxColor());
+    setProperty(FormatPrivate::P_Border_BottomColor, XlsxColor(color), XlsxColor());
 }
 
 /*!
-	Return the diagonla border style.
+        Return the diagonla border style.
 */
 Format::BorderStyle Format::diagonalBorderStyle() const
 {
-	return static_cast<BorderStyle>(intProperty(FormatPrivate::P_Border_DiagonalStyle));
+    return static_cast<BorderStyle>(intProperty(FormatPrivate::P_Border_DiagonalStyle));
 }
 
 /*!
-	Sets the diagonal border style to the given \a style.
+        Sets the diagonal border style to the given \a style.
 */
 void Format::setDiagonalBorderStyle(BorderStyle style)
 {
-	setProperty(FormatPrivate::P_Border_DiagonalStyle, style, BorderNone);
+    setProperty(FormatPrivate::P_Border_DiagonalStyle, style, BorderNone);
 }
 
 /*!
-	Returns the diagonal border type.
+        Returns the diagonal border type.
 */
 Format::DiagonalBorderType Format::diagonalBorderType() const
 {
-	return static_cast<DiagonalBorderType>(intProperty(FormatPrivate::P_Border_DiagonalType));
+    return static_cast<DiagonalBorderType>(intProperty(FormatPrivate::P_Border_DiagonalType));
 }
 
 /*!
-	Sets the diagonal border type to the given \a style
+        Sets the diagonal border type to the given \a style
 */
 void Format::setDiagonalBorderType(DiagonalBorderType style)
 {
-	setProperty(FormatPrivate::P_Border_DiagonalType, style, DiagonalBorderNone);
+    setProperty(FormatPrivate::P_Border_DiagonalType, style, DiagonalBorderNone);
 }
 
 /*!
-	Returns the diagonal border color.
+        Returns the diagonal border color.
 */
 QColor Format::diagonalBorderColor() const
 {
-	return colorProperty(FormatPrivate::P_Border_DiagonalColor);
+    return colorProperty(FormatPrivate::P_Border_DiagonalColor);
 }
 
 /*!
-	Sets the diagonal border color to the given \a color
+        Sets the diagonal border color to the given \a color
 */
 void Format::setDiagonalBorderColor(const QColor &color)
 {
-	setProperty(FormatPrivate::P_Border_DiagonalColor, XlsxColor(color), XlsxColor());
+    setProperty(FormatPrivate::P_Border_DiagonalColor, XlsxColor(color), XlsxColor());
 }
 
 /*!
-	\internal
-	Returns whether this format has been set valid border index.
+        \internal
+        Returns whether this format has been set valid border index.
 */
 bool Format::borderIndexValid() const
 {
-	if (!hasBorderData())
-		return false;
-	return d->border_index_valid;
+    if (!hasBorderData())
+        return false;
+    return d->border_index_valid;
 }
 
 /*!
-	\internal
-	Returns the border index.
+        \internal
+        Returns the border index.
 */
 int Format::borderIndex() const
 {
-	if (borderIndexValid())
-		return d->border_index;
-	return 0;
+    if (borderIndexValid())
+        return d->border_index;
+    return 0;
 }
 
 /*!
@@ -910,99 +924,99 @@ int Format::borderIndex() const
  */
 void Format::setBorderIndex(int index)
 {
-	d->border_index = index;
-	d->border_index_valid = true;
+    d->border_index       = index;
+    d->border_index_valid = true;
 }
 
 /*! \internal
  */
 QByteArray Format::borderKey() const
 {
-	if (isEmpty())
-		return QByteArray();
+    if (isEmpty())
+        return QByteArray();
 
-	if (d->border_dirty) {
-		QByteArray key;
-		QDataStream stream(&key, QIODevice::WriteOnly);
-		for (int i=FormatPrivate::P_Border_STARTID; i<FormatPrivate::P_Border_ENDID; ++i) {
+    if (d->border_dirty) {
+        QByteArray key;
+        QDataStream stream(&key, QIODevice::WriteOnly);
+        for (int i = FormatPrivate::P_Border_STARTID; i < FormatPrivate::P_Border_ENDID; ++i) {
             auto it = d->properties.constFind(i);
             if (it != d->properties.constEnd())
                 stream << i << it.value();
-		};
+        };
 
-		const_cast<Format*>(this)->d->border_key = key;
-		const_cast<Format*>(this)->d->border_dirty = false;
-	}
+        const_cast<Format *>(this)->d->border_key   = key;
+        const_cast<Format *>(this)->d->border_dirty = false;
+    }
 
-	return d->border_key;
+    return d->border_key;
 }
 
 /*!
-	\internal
-	Return true if the format has border format, otherwise return false.
+        \internal
+        Return true if the format has border format, otherwise return false.
  */
 bool Format::hasBorderData() const
 {
-	if (!d)
-		return false;
+    if (!d)
+        return false;
 
-	for (int i=FormatPrivate::P_Border_STARTID; i<FormatPrivate::P_Border_ENDID; ++i) {
-		if (hasProperty(i))
-			return true;
-	}
-	return false;
+    for (int i = FormatPrivate::P_Border_STARTID; i < FormatPrivate::P_Border_ENDID; ++i) {
+        if (hasProperty(i))
+            return true;
+    }
+    return false;
 }
 
 /*!
-	Return the fill pattern.
+        Return the fill pattern.
 */
 Format::FillPattern Format::fillPattern() const
 {
-	return static_cast<FillPattern>(intProperty(FormatPrivate::P_Fill_Pattern, PatternNone));
+    return static_cast<FillPattern>(intProperty(FormatPrivate::P_Fill_Pattern, PatternNone));
 }
 
 /*!
-	Sets the fill pattern to the given \a pattern.
+        Sets the fill pattern to the given \a pattern.
 */
 void Format::setFillPattern(FillPattern pattern)
 {
-	setProperty(FormatPrivate::P_Fill_Pattern, pattern, PatternNone);
+    setProperty(FormatPrivate::P_Fill_Pattern, pattern, PatternNone);
 }
 
 /*!
-	Returns the foreground color of the pattern.
+        Returns the foreground color of the pattern.
 */
 QColor Format::patternForegroundColor() const
 {
-	return colorProperty(FormatPrivate::P_Fill_FgColor);
+    return colorProperty(FormatPrivate::P_Fill_FgColor);
 }
 
 /*!
-	Sets the foreground color of the pattern with the given \a color.
+        Sets the foreground color of the pattern with the given \a color.
 */
 void Format::setPatternForegroundColor(const QColor &color)
 {
-	if (color.isValid() && !hasProperty(FormatPrivate::P_Fill_Pattern))
-		setFillPattern(PatternSolid);
-	setProperty(FormatPrivate::P_Fill_FgColor, XlsxColor(color), XlsxColor());
+    if (color.isValid() && !hasProperty(FormatPrivate::P_Fill_Pattern))
+        setFillPattern(PatternSolid);
+    setProperty(FormatPrivate::P_Fill_FgColor, XlsxColor(color), XlsxColor());
 }
 
 /*!
-	Returns the background color of the pattern.
+        Returns the background color of the pattern.
 */
 QColor Format::patternBackgroundColor() const
 {
-	return colorProperty(FormatPrivate::P_Fill_BgColor);
+    return colorProperty(FormatPrivate::P_Fill_BgColor);
 }
 
 /*!
-	Sets the background color of the pattern with the given \a color.
+        Sets the background color of the pattern with the given \a color.
 */
 void Format::setPatternBackgroundColor(const QColor &color)
 {
-	if (color.isValid() && !hasProperty(FormatPrivate::P_Fill_Pattern))
-		setFillPattern(PatternSolid);
-	setProperty(FormatPrivate::P_Fill_BgColor, XlsxColor(color), XlsxColor());
+    if (color.isValid() && !hasProperty(FormatPrivate::P_Fill_Pattern))
+        setFillPattern(PatternSolid);
+    setProperty(FormatPrivate::P_Fill_BgColor, XlsxColor(color), XlsxColor());
 }
 
 /*!
@@ -1010,9 +1024,9 @@ void Format::setPatternBackgroundColor(const QColor &color)
  */
 bool Format::fillIndexValid() const
 {
-	if (!hasFillData())
-		return false;
-	return d->fill_index_valid;
+    if (!hasFillData())
+        return false;
+    return d->fill_index_valid;
 }
 
 /*!
@@ -1020,9 +1034,9 @@ bool Format::fillIndexValid() const
  */
 int Format::fillIndex() const
 {
-	if (fillIndexValid())
-		return d->fill_index;
-	return 0;
+    if (fillIndexValid())
+        return d->fill_index;
+    return 0;
 }
 
 /*!
@@ -1030,8 +1044,8 @@ int Format::fillIndex() const
  */
 void Format::setFillIndex(int index)
 {
-	d->fill_index = index;
-	d->fill_index_valid = true;
+    d->fill_index       = index;
+    d->fill_index_valid = true;
 }
 
 /*!
@@ -1039,127 +1053,127 @@ void Format::setFillIndex(int index)
  */
 QByteArray Format::fillKey() const
 {
-	if (isEmpty())
-		return QByteArray();
+    if (isEmpty())
+        return QByteArray();
 
-	if (d->fill_dirty) {
-		QByteArray key;
-		QDataStream stream(&key, QIODevice::WriteOnly);
-		for (int i=FormatPrivate::P_Fill_STARTID; i<FormatPrivate::P_Fill_ENDID; ++i) {
+    if (d->fill_dirty) {
+        QByteArray key;
+        QDataStream stream(&key, QIODevice::WriteOnly);
+        for (int i = FormatPrivate::P_Fill_STARTID; i < FormatPrivate::P_Fill_ENDID; ++i) {
             auto it = d->properties.constFind(i);
             if (it != d->properties.constEnd())
                 stream << i << it.value();
-		};
+        };
 
-		const_cast<Format*>(this)->d->fill_key = key;
-		const_cast<Format*>(this)->d->fill_dirty = false;
-	}
+        const_cast<Format *>(this)->d->fill_key   = key;
+        const_cast<Format *>(this)->d->fill_dirty = false;
+    }
 
-	return d->fill_key;
+    return d->fill_key;
 }
 
 /*!
-	\internal
-	Return true if the format has fill format, otherwise return false.
+        \internal
+        Return true if the format has fill format, otherwise return false.
  */
 bool Format::hasFillData() const
 {
-	if (!d)
-		return false;
+    if (!d)
+        return false;
 
-	for (int i=FormatPrivate::P_Fill_STARTID; i<FormatPrivate::P_Fill_ENDID; ++i) {
-		if (hasProperty(i))
-			return true;
-	}
-	return false;
+    for (int i = FormatPrivate::P_Fill_STARTID; i < FormatPrivate::P_Fill_ENDID; ++i) {
+        if (hasProperty(i))
+            return true;
+    }
+    return false;
 }
 
 /*!
-	Returns whether the hidden protection property is set to true.
+        Returns whether the hidden protection property is set to true.
 */
 bool Format::hidden() const
 {
-	return boolProperty(FormatPrivate::P_Protection_Hidden);
+    return boolProperty(FormatPrivate::P_Protection_Hidden);
 }
 
 /*!
-	Sets the hidden protection property with the given \a hidden.
+        Sets the hidden protection property with the given \a hidden.
 */
 void Format::setHidden(bool hidden)
 {
-	setProperty(FormatPrivate::P_Protection_Hidden, hidden);
+    setProperty(FormatPrivate::P_Protection_Hidden, hidden);
 }
 
 /*!
-	Returns whether the locked protection property is set to true.
+        Returns whether the locked protection property is set to true.
 */
 bool Format::locked() const
 {
-	return boolProperty(FormatPrivate::P_Protection_Locked);
+    return boolProperty(FormatPrivate::P_Protection_Locked);
 }
 
 /*!
-	Sets the locked protection property with the given \a locked.
+        Sets the locked protection property with the given \a locked.
 */
 void Format::setLocked(bool locked)
 {
-	setProperty(FormatPrivate::P_Protection_Locked, locked);
+    setProperty(FormatPrivate::P_Protection_Locked, locked);
 }
 
 /*!
-	\internal
-	Return true if the format has protection data, otherwise return false.
+        \internal
+        Return true if the format has protection data, otherwise return false.
  */
 bool Format::hasProtectionData() const
 {
-	if (!d)
-		return false;
+    if (!d)
+        return false;
 
-	if (hasProperty(FormatPrivate::P_Protection_Hidden)
-			|| hasProperty(FormatPrivate::P_Protection_Locked)) {
-		return true;
-	}
-	return false;
+    if (hasProperty(FormatPrivate::P_Protection_Hidden) ||
+        hasProperty(FormatPrivate::P_Protection_Locked)) {
+        return true;
+    }
+    return false;
 }
 
 /*!
-	Merges the current format with the properties described by format \a modifier.
+        Merges the current format with the properties described by format \a modifier.
  */
 void Format::mergeFormat(const Format &modifier)
 {
-	if (!modifier.isValid())
-		return;
+    if (!modifier.isValid())
+        return;
 
-	if (!isValid()) {
-		d = modifier.d;
-		return;
-	}
+    if (!isValid()) {
+        d = modifier.d;
+        return;
+    }
 
-	QMapIterator<int, QVariant> it(modifier.d->properties);
-	while(it.hasNext()) {
-		it.next();
-		setProperty(it.key(), it.value());
-	}
+    QMapIterator<int, QVariant> it(modifier.d->properties);
+    while (it.hasNext()) {
+        it.next();
+        setProperty(it.key(), it.value());
+    }
 }
 
 /*!
-	Returns true if the format is valid; otherwise returns false.
+        Returns true if the format is valid; otherwise returns false.
  */
 bool Format::isValid() const
 {
-	if (d)
-		return true;
-	return false;
+    if (d)
+        return true;
+    return false;
 }
 
 /*!
-	Returns true if the format is empty; otherwise returns false.
+        Returns true if the format is empty; otherwise returns false.
  */
 bool Format::isEmpty() const
 {
-	if (!d)
-		return true;
-	return d->properties.isEmpty();
+    if (!d)
+        return true;
+    return d->properties.isEmpty();
 }
 
 /*!
@@ -1167,24 +1181,24 @@ bool Format::isEmpty() const
  */
 QByteArray Format::formatKey() const
 {
-	if (isEmpty())
-		return QByteArray();
+    if (isEmpty())
+        return QByteArray();
 
-	if (d->dirty) {
-		QByteArray key;
-		QDataStream stream(&key, QIODevice::WriteOnly);
+    if (d->dirty) {
+        QByteArray key;
+        QDataStream stream(&key, QIODevice::WriteOnly);
 
-		QMapIterator<int, QVariant> i(d->properties);
-		while (i.hasNext()) {
-			i.next();
-			stream<<i.key()<<i.value();
-		}
+        QMapIterator<int, QVariant> i(d->properties);
+        while (i.hasNext()) {
+            i.next();
+            stream << i.key() << i.value();
+        }
 
-		d->formatKey = key;
-		d->dirty = false;
-	}
+        d->formatKey = key;
+        d->dirty     = false;
+    }
 
-	return d->formatKey;
+    return d->formatKey;
 }
 
 /*!
@@ -1193,10 +1207,10 @@ QByteArray Format::formatKey() const
  */
 void Format::setXfIndex(int index)
 {
-	if (!d)
-		d = new FormatPrivate;
-	d->xf_index = index;
-	d->xf_indexValid = true;
+    if (!d)
+        d = new FormatPrivate;
+    d->xf_index      = index;
+    d->xf_indexValid = true;
 }
 
 /*!
@@ -1204,9 +1218,9 @@ void Format::setXfIndex(int index)
  */
 int Format::xfIndex() const
 {
-	if (!d)
-		return -1;
-	return d->xf_index;
+    if (!d)
+        return -1;
+    return d->xf_index;
 }
 
 /*!
@@ -1214,9 +1228,9 @@ int Format::xfIndex() const
  */
 bool Format::xfIndexValid() const
 {
-	if (!d)
-		return false;
-	return d->xf_indexValid;
+    if (!d)
+        return false;
+    return d->xf_indexValid;
 }
 
 /*!
@@ -1225,10 +1239,10 @@ bool Format::xfIndexValid() const
  */
 void Format::setDxfIndex(int index)
 {
-	if (!d)
-		d = new FormatPrivate;
-	d->dxf_index = index;
-	d->dxf_indexValid = true;
+    if (!d)
+        d = new FormatPrivate;
+    d->dxf_index      = index;
+    d->dxf_indexValid = true;
 }
 
 /*!
@@ -1237,9 +1251,9 @@ void Format::setDxfIndex(int index)
  */
 int Format::dxfIndex() const
 {
-	if (!d)
-		return -1;
-	return d->dxf_index;
+    if (!d)
+        return -1;
+    return d->dxf_index;
 }
 
 /*!
@@ -1248,30 +1262,30 @@ int Format::dxfIndex() const
  */
 bool Format::dxfIndexValid() const
 {
-	if (!d)
-		return false;
-	return d->dxf_indexValid;
+    if (!d)
+        return false;
+    return d->dxf_indexValid;
 }
 
 /*!
-	Returns ture if the \a format is equal to this format.
+        Returns ture if the \a format is equal to this format.
 */
-bool Format::operator ==(const Format &format) const
+bool Format::operator==(const Format &format) const
 {
-	return this->formatKey() == format.formatKey();
+    return this->formatKey() == format.formatKey();
 }
 
 /*!
-	Returns ture if the \a format is not equal to this format.
+        Returns ture if the \a format is not equal to this format.
 */
-bool Format::operator !=(const Format &format) const
+bool Format::operator!=(const Format &format) const
 {
-	return this->formatKey() != format.formatKey();
+    return this->formatKey() != format.formatKey();
 }
 
 int Format::theme() const
 {
-	return d->theme;
+    return d->theme;
 }
 
 /*!
@@ -1284,58 +1298,55 @@ QVariant Format::property(int propertyId, const QVariant &defaultValue) const
         if (it != d->properties.constEnd())
             return it.value();
     }
-	return defaultValue;
+    return defaultValue;
 }
 
 /*!
  * \internal
  */
-void Format::setProperty(int propertyId, const QVariant &value, const QVariant &clearValue, bool detach)
+void Format::setProperty(int propertyId,
+                         const QVariant &value,
+                         const QVariant &clearValue,
+                         bool detach)
 {
-	if (!d)
-		d = new FormatPrivate;
+    if (!d)
+        d = new FormatPrivate;
 
-    if (value != clearValue)
-    {
+    if (value != clearValue) {
         auto it = d->properties.constFind(propertyId);
         if (it != d->properties.constEnd() && it.value() == value)
-			return;
-
-		if (detach)
-			d.detach();
+            return;
 
-		d->properties[propertyId] = value;
-    }
-    else
-    {
-		if (!d->properties.contains(propertyId))
-			return;
+        if (detach)
+            d.detach();
 
-		if (detach)
-			d.detach();
+        d->properties[propertyId] = value;
+    } else {
+        if (!d->properties.contains(propertyId))
+            return;
 
-		d->properties.remove(propertyId);
-	}
+        if (detach)
+            d.detach();
 
-	d->dirty = true;
-	d->xf_indexValid = false;
-	d->dxf_indexValid = false;
-
-    if (propertyId >= FormatPrivate::P_Font_STARTID && propertyId < FormatPrivate::P_Font_ENDID)
-    {
-		d->font_dirty = true;
-		d->font_index_valid = false;
+        d->properties.remove(propertyId);
     }
-    else if (propertyId >= FormatPrivate::P_Border_STARTID && propertyId < FormatPrivate::P_Border_ENDID)
-    {
-		d->border_dirty = true;
-		d->border_index_valid = false;
+
+    d->dirty          = true;
+    d->xf_indexValid  = false;
+    d->dxf_indexValid = false;
+
+    if (propertyId >= FormatPrivate::P_Font_STARTID && propertyId < FormatPrivate::P_Font_ENDID) {
+        d->font_dirty       = true;
+        d->font_index_valid = false;
+    } else if (propertyId >= FormatPrivate::P_Border_STARTID &&
+               propertyId < FormatPrivate::P_Border_ENDID) {
+        d->border_dirty       = true;
+        d->border_index_valid = false;
+    } else if (propertyId >= FormatPrivate::P_Fill_STARTID &&
+               propertyId < FormatPrivate::P_Fill_ENDID) {
+        d->fill_dirty       = true;
+        d->fill_index_valid = false;
     }
-    else if (propertyId >= FormatPrivate::P_Fill_STARTID && propertyId < FormatPrivate::P_Fill_ENDID)
-    {
-		d->fill_dirty = true;
-		d->fill_index_valid = false;
-	}
 }
 
 /*!
@@ -1343,7 +1354,7 @@ void Format::setProperty(int propertyId, const QVariant &value, const QVariant &
  */
 void Format::clearProperty(int propertyId)
 {
-	setProperty(propertyId, QVariant());
+    setProperty(propertyId, QVariant());
 }
 
 /*!
@@ -1351,9 +1362,9 @@ void Format::clearProperty(int propertyId)
  */
 bool Format::hasProperty(int propertyId) const
 {
-	if (!d)
-		return false;
-	return d->properties.contains(propertyId);
+    if (!d)
+        return false;
+    return d->properties.contains(propertyId);
 }
 
 /*!
@@ -1361,13 +1372,13 @@ bool Format::hasProperty(int propertyId) const
  */
 bool Format::boolProperty(int propertyId, bool defaultValue) const
 {
-	if (!hasProperty(propertyId))
-		return defaultValue;
+    if (!hasProperty(propertyId))
+        return defaultValue;
 
-	const QVariant prop = d->properties[propertyId];
-	if (prop.userType() != QMetaType::Bool)
-		return defaultValue;
-	return prop.toBool();
+    const QVariant prop = d->properties[propertyId];
+    if (prop.userType() != QMetaType::Bool)
+        return defaultValue;
+    return prop.toBool();
 }
 
 /*!
@@ -1375,13 +1386,13 @@ bool Format::boolProperty(int propertyId, bool defaultValue) const
  */
 int Format::intProperty(int propertyId, int defaultValue) const
 {
-	if (!hasProperty(propertyId))
-		return defaultValue;
+    if (!hasProperty(propertyId))
+        return defaultValue;
 
-	const QVariant prop = d->properties[propertyId];
-	if (prop.userType() != QMetaType::Int)
-		return defaultValue;
-	return prop.toInt();
+    const QVariant prop = d->properties[propertyId];
+    if (prop.userType() != QMetaType::Int)
+        return defaultValue;
+    return prop.toInt();
 }
 
 /*!
@@ -1389,13 +1400,13 @@ int Format::intProperty(int propertyId, int defaultValue) const
  */
 double Format::doubleProperty(int propertyId, double defaultValue) const
 {
-	if (!hasProperty(propertyId))
-		return defaultValue;
+    if (!hasProperty(propertyId))
+        return defaultValue;
 
-	const QVariant prop = d->properties[propertyId];
-	if (prop.userType() != QMetaType::Double && prop.userType() != QMetaType::Float)
-		return defaultValue;
-	return prop.toDouble();
+    const QVariant prop = d->properties[propertyId];
+    if (prop.userType() != QMetaType::Double && prop.userType() != QMetaType::Float)
+        return defaultValue;
+    return prop.toDouble();
 }
 
 /*!
@@ -1403,13 +1414,13 @@ double Format::doubleProperty(int propertyId, double defaultValue) const
  */
 QString Format::stringProperty(int propertyId, const QString &defaultValue) const
 {
-	if (!hasProperty(propertyId))
-		return defaultValue;
+    if (!hasProperty(propertyId))
+        return defaultValue;
 
-	const QVariant prop = d->properties[propertyId];
-	if (prop.userType() != QMetaType::QString)
-		return defaultValue;
-	return prop.toString();
+    const QVariant prop = d->properties[propertyId];
+    if (prop.userType() != QMetaType::QString)
+        return defaultValue;
+    return prop.toString();
 }
 
 /*!
@@ -1417,20 +1428,20 @@ QString Format::stringProperty(int propertyId, const QString &defaultValue) cons
  */
 QColor Format::colorProperty(int propertyId, const QColor &defaultValue) const
 {
-	if (!hasProperty(propertyId))
-		return defaultValue;
+    if (!hasProperty(propertyId))
+        return defaultValue;
 
-	const QVariant prop = d->properties[propertyId];
-	if (prop.userType() != qMetaTypeId<XlsxColor>())
-		return defaultValue;
-	return qvariant_cast<XlsxColor>(prop).rgbColor();
+    const QVariant prop = d->properties[propertyId];
+    if (prop.userType() != qMetaTypeId<XlsxColor>())
+        return defaultValue;
+    return qvariant_cast<XlsxColor>(prop).rgbColor();
 }
 
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug dbg, const Format &f)
 {
-	dbg.nospace() << "QXlsx::Format(" << f.d->properties << ")";
-	return dbg.space();
+    dbg.nospace() << "QXlsx::Format(" << f.d->properties << ")";
+    return dbg.space();
 }
 #endif
 
diff --git a/QXlsx/source/xlsxmediafile.cpp b/QXlsx/source/xlsxmediafile.cpp
index f9c6ce5f..f930f8f3 100644
--- a/QXlsx/source/xlsxmediafile.cpp
+++ b/QXlsx/source/xlsxmediafile.cpp
@@ -1,31 +1,35 @@
 // xlsxmediafile.cpp
 
-#include <QtGlobal>
-#include <QCryptographicHash>
-
 #include "xlsxmediafile_p.h"
 
+#include <QCryptographicHash>
+#include <QtGlobal>
+
 QT_BEGIN_NAMESPACE_XLSX
 
 MediaFile::MediaFile(const QByteArray &bytes, const QString &suffix, const QString &mimeType)
-    : m_contents(bytes), m_suffix(suffix), m_mimeType(mimeType)
-      , m_index(0), m_indexValid(false)
+    : m_contents(bytes)
+    , m_suffix(suffix)
+    , m_mimeType(mimeType)
+    , m_index(0)
+    , m_indexValid(false)
 {
     m_hashKey = QCryptographicHash::hash(m_contents, QCryptographicHash::Md5);
 }
 
 MediaFile::MediaFile(const QString &fileName)
-    :m_fileName(fileName), m_index(0), m_indexValid(false)
+    : m_fileName(fileName)
+    , m_index(0)
+    , m_indexValid(false)
 {
-
 }
 
 void MediaFile::set(const QByteArray &bytes, const QString &suffix, const QString &mimeType)
 {
-    m_contents = bytes;
-    m_suffix = suffix;
-    m_mimeType = mimeType;
-    m_hashKey = QCryptographicHash::hash(m_contents, QCryptographicHash::Md5);
+    m_contents   = bytes;
+    m_suffix     = suffix;
+    m_mimeType   = mimeType;
+    m_hashKey    = QCryptographicHash::hash(m_contents, QCryptographicHash::Md5);
     m_indexValid = false;
 }
 
@@ -66,7 +70,7 @@ bool MediaFile::isIndexValid() const
 
 void MediaFile::setIndex(int idx)
 {
-    m_index = idx;
+    m_index      = idx;
     m_indexValid = true;
 }
 
diff --git a/QXlsx/source/xlsxnumformatparser.cpp b/QXlsx/source/xlsxnumformatparser.cpp
index d00923a0..eaf28e2a 100644
--- a/QXlsx/source/xlsxnumformatparser.cpp
+++ b/QXlsx/source/xlsxnumformatparser.cpp
@@ -2,8 +2,8 @@
 
 #include "xlsxnumformatparser_p.h"
 
-#include <QtGlobal>
 #include <QString>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -15,11 +15,11 @@ bool NumFormatParser::isDateTime(const QString &formatCode)
         switch (c.unicode()) {
         case '[':
             // [h], [m], [s] are valid format for time
-            if (i < formatCode.length()-2 && formatCode[i+2] == QLatin1Char(']')) {
-                const QChar cc = formatCode[i+1].toLower();
+            if (i < formatCode.length() - 2 && formatCode[i + 2] == QLatin1Char(']')) {
+                const QChar cc = formatCode[i + 1].toLower();
                 if (cc == QLatin1Char('h') || cc == QLatin1Char('m') || cc == QLatin1Char('s'))
                     return true;
-                i+=2;
+                i += 2;
                 break;
             } else {
                 // condition or color: don't care, ignore
@@ -30,7 +30,7 @@ bool NumFormatParser::isDateTime(const QString &formatCode)
 
         // quoted plain text block: don't care, ignore
         case '"':
-            while (i < formatCode.length()-1 && formatCode[++i] != QLatin1Char('"'))
+            while (i < formatCode.length() - 1 && formatCode[++i] != QLatin1Char('"'))
                 ;
             break;
 
diff --git a/QXlsx/source/xlsxrelationships.cpp b/QXlsx/source/xlsxrelationships.cpp
index f5c32821..6c7c5962 100644
--- a/QXlsx/source/xlsxrelationships.cpp
+++ b/QXlsx/source/xlsxrelationships.cpp
@@ -1,23 +1,23 @@
 // xlsxrelationships.cpp
 
-#include <QtGlobal>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
+#include "xlsxrelationships_p.h"
+
+#include <QBuffer>
 #include <QDir>
 #include <QFile>
-#include <QBuffer>
-
-#include "xlsxrelationships_p.h"
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
-const QLatin1String schema_doc("http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+const QLatin1String
+    schema_doc("http://schemas.openxmlformats.org/officeDocument/2006/relationships");
 const QLatin1String schema_msPackage("http://schemas.microsoft.com/office/2006/relationships");
 const QLatin1String schema_package("http://schemas.openxmlformats.org/package/2006/relationships");
-//const QString schema_worksheet = QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships");
-Relationships::Relationships()
-{
-}
+// const QString schema_worksheet =
+// QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships");
+Relationships::Relationships() {}
 
 QList<XlsxRelationship> Relationships::documentRelationships(const QString &relativeType) const
 {
@@ -54,7 +54,9 @@ QList<XlsxRelationship> Relationships::worksheetRelationships(const QString &rel
     return relationships(schema_doc + relativeType);
 }
 
-void Relationships::addWorksheetRelationship(const QString &relativeType, const QString &target, const QString &targetMode)
+void Relationships::addWorksheetRelationship(const QString &relativeType,
+                                             const QString &target,
+                                             const QString &targetMode)
 {
     addRelationship(schema_doc + relativeType, target, targetMode);
 }
@@ -69,12 +71,14 @@ QList<XlsxRelationship> Relationships::relationships(const QString &type) const
     return res;
 }
 
-void Relationships::addRelationship(const QString &type, const QString &target, const QString &targetMode)
+void Relationships::addRelationship(const QString &type,
+                                    const QString &target,
+                                    const QString &targetMode)
 {
     XlsxRelationship relation;
-    relation.id = QStringLiteral("rId%1").arg(m_relationships.size()+1);
-    relation.type = type;
-    relation.target = target;
+    relation.id         = QStringLiteral("rId%1").arg(m_relationships.size() + 1);
+    relation.type       = type;
+    relation.target     = target;
     relation.targetMode = targetMode;
 
     m_relationships.append(relation);
@@ -86,7 +90,9 @@ void Relationships::saveToXmlFile(QIODevice *device) const
 
     writer.writeStartDocument(QStringLiteral("1.0"), true);
     writer.writeStartElement(QStringLiteral("Relationships"));
-    writer.writeAttribute(QStringLiteral("xmlns"), QStringLiteral("http://schemas.openxmlformats.org/package/2006/relationships"));
+    writer.writeAttribute(
+        QStringLiteral("xmlns"),
+        QStringLiteral("http://schemas.openxmlformats.org/package/2006/relationships"));
     for (const XlsxRelationship &relation : m_relationships) {
         writer.writeStartElement(QStringLiteral("Relationship"));
         writer.writeAttribute(QStringLiteral("Id"), relation.id);
@@ -96,7 +102,7 @@ void Relationships::saveToXmlFile(QIODevice *device) const
             writer.writeAttribute(QStringLiteral("TargetMode"), relation.targetMode);
         writer.writeEndElement();
     }
-    writer.writeEndElement();//Relationships
+    writer.writeEndElement(); // Relationships
     writer.writeEndDocument();
 }
 
@@ -115,20 +121,20 @@ bool Relationships::loadFromXmlFile(QIODevice *device)
     clear();
     QXmlStreamReader reader(device);
     while (!reader.atEnd()) {
-         QXmlStreamReader::TokenType token = reader.readNext();
-         if (token == QXmlStreamReader::StartElement) {
-             if (reader.name() == QStringLiteral("Relationship")) {
-                 QXmlStreamAttributes attributes = reader.attributes();
-                 XlsxRelationship relationship;
-                 relationship.id = attributes.value(QLatin1String("Id")).toString();
-                 relationship.type = attributes.value(QLatin1String("Type")).toString();
-                 relationship.target = attributes.value(QLatin1String("Target")).toString();
-                 relationship.targetMode = attributes.value(QLatin1String("TargetMode")).toString();
-                 m_relationships.append(relationship);
-             }
-         }
-
-         if (reader.hasError())
+        QXmlStreamReader::TokenType token = reader.readNext();
+        if (token == QXmlStreamReader::StartElement) {
+            if (reader.name() == QStringLiteral("Relationship")) {
+                QXmlStreamAttributes attributes = reader.attributes();
+                XlsxRelationship relationship;
+                relationship.id         = attributes.value(QLatin1String("Id")).toString();
+                relationship.type       = attributes.value(QLatin1String("Type")).toString();
+                relationship.target     = attributes.value(QLatin1String("Target")).toString();
+                relationship.targetMode = attributes.value(QLatin1String("TargetMode")).toString();
+                m_relationships.append(relationship);
+            }
+        }
+
+        if (reader.hasError())
             return false;
     }
     return true;
diff --git a/QXlsx/source/xlsxrichstring.cpp b/QXlsx/source/xlsxrichstring.cpp
index 0bf3f12c..d63f172f 100644
--- a/QXlsx/source/xlsxrichstring.cpp
+++ b/QXlsx/source/xlsxrichstring.cpp
@@ -1,34 +1,32 @@
 // xlsxrichstring.cpp
 
-#include <QtGlobal>
+#include "xlsxrichstring.h"
+
+#include "xlsxformat_p.h"
+#include "xlsxrichstring_p.h"
+
 #include <QDebug>
 #include <QTextDocument>
 #include <QTextFragment>
-
-#include "xlsxrichstring.h"
-#include "xlsxrichstring_p.h"
-#include "xlsxformat_p.h"
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
 RichStringPrivate::RichStringPrivate()
-    :_dirty(true)
+    : _dirty(true)
 {
-
 }
 
 RichStringPrivate::RichStringPrivate(const RichStringPrivate &other)
-    :QSharedData(other), fragmentTexts(other.fragmentTexts)
-    ,fragmentFormats(other.fragmentFormats)
-    , _idKey(other.idKey()), _dirty(other._dirty)
+    : QSharedData(other)
+    , fragmentTexts(other.fragmentTexts)
+    , fragmentFormats(other.fragmentFormats)
+    , _idKey(other.idKey())
+    , _dirty(other._dirty)
 {
-
 }
 
-RichStringPrivate::~RichStringPrivate()
-{
-
-}
+RichStringPrivate::~RichStringPrivate() {}
 
 /*!
     \class RichString
@@ -40,15 +38,15 @@ RichStringPrivate::~RichStringPrivate()
     Constructs a null string.
  */
 RichString::RichString()
-    :d(new RichStringPrivate)
+    : d(new RichStringPrivate)
 {
 }
 
 /*!
     Constructs a plain string with the given \a text.
 */
-RichString::RichString(const QString& text)
-    :d(new RichStringPrivate)
+RichString::RichString(const QString &text)
+    : d(new RichStringPrivate)
 {
     addFragment(text, Format());
 }
@@ -57,23 +55,19 @@ RichString::RichString(const QString& text)
     Constructs a copy of \a other.
  */
 RichString::RichString(const RichString &other)
-    :d(other.d)
+    : d(other.d)
 {
-
 }
 
 /*!
     Destructs the string.
  */
-RichString::~RichString()
-{
-
-}
+RichString::~RichString() {}
 
 /*!
     Assigns \a other to this string and returns a reference to this string
  */
-RichString &RichString::operator =(const RichString &other)
+RichString &RichString::operator=(const RichString &other)
 {
     this->d = other.d;
     return *this;
@@ -84,11 +78,11 @@ RichString &RichString::operator =(const RichString &other)
 */
 RichString::operator QVariant() const
 {
-    const auto& cref
+    const auto &cref
 #if QT_VERSION >= 0x060000 // Qt 6.0 or over
         = QMetaType::fromType<RichString>();
 #else
-        = qMetaTypeId<RichString>() ;
+        = qMetaTypeId<RichString>();
 #endif
     return QVariant(cref, this);
 }
@@ -98,7 +92,7 @@ RichString::operator QVariant() const
  */
 bool RichString::isRichString() const
 {
-    if (fragmentCount() > 1) //Is this enough??
+    if (fragmentCount() > 1) // Is this enough??
         return true;
     return false;
 }
@@ -116,7 +110,7 @@ bool RichString::isNull() const
  */
 bool RichString::isEmtpy() const
 {
-    for (const auto& str : d->fragmentTexts) {
+    for (const auto &str : d->fragmentTexts) {
         if (!str.isEmpty())
             return false;
     }
@@ -218,9 +212,9 @@ QByteArray RichStringPrivate::idKey() const
         if (fragmentTexts.size() == 1) {
             bytes = fragmentTexts[0].toUtf8();
         } else {
-            //Generate a hash value base on QByteArray ?
+            // Generate a hash value base on QByteArray ?
             bytes.append("@@QtXlsxRichString=");
-            for (int i=0; i<fragmentTexts.size(); ++i) {
+            for (int i = 0; i < fragmentTexts.size(); ++i) {
                 bytes.append("@Text");
                 bytes.append(fragmentTexts[i].toUtf8());
                 bytes.append("@Format");
@@ -272,9 +266,9 @@ bool operator<(const RichString &rs1, const RichString &rs2)
     Returns true if this string \a rs1 is equal to string \a rs2;
     otherwise returns false.
  */
-bool operator ==(const RichString &rs1, const QString &rs2)
+bool operator==(const RichString &rs1, const QString &rs2)
 {
-    if (rs1.fragmentCount() == 1 && rs1.fragmentText(0) == rs2) //format == 0
+    if (rs1.fragmentCount() == 1 && rs1.fragmentText(0) == rs2) // format == 0
         return true;
 
     return false;
@@ -285,9 +279,9 @@ bool operator ==(const RichString &rs1, const QString &rs2)
     Returns true if this string \a rs1 is not equal to string \a rs2;
     otherwise returns false.
  */
-bool operator !=(const RichString &rs1, const QString &rs2)
+bool operator!=(const RichString &rs1, const QString &rs2)
 {
-    if (rs1.fragmentCount() == 1 && rs1.fragmentText(0) == rs2) //format == 0
+    if (rs1.fragmentCount() == 1 && rs1.fragmentText(0) == rs2) // format == 0
         return false;
 
     return true;
@@ -298,7 +292,7 @@ bool operator !=(const RichString &rs1, const QString &rs2)
     Returns true if this string \a rs1 is equal to string \a rs2;
     otherwise returns false.
  */
-bool operator ==(const QString &rs1, const RichString &rs2)
+bool operator==(const QString &rs1, const RichString &rs2)
 {
     return rs2 == rs1;
 }
@@ -308,14 +302,14 @@ bool operator ==(const QString &rs1, const RichString &rs2)
     Returns true if this string \a rs1 is not equal to string \a rs2;
     otherwise returns false.
  */
-bool operator !=(const QString &rs1, const RichString &rs2)
+bool operator!=(const QString &rs1, const RichString &rs2)
 {
     return rs2 != rs1;
 }
 
 uint qHash(const RichString &rs, uint seed) Q_DECL_NOTHROW
 {
-   return qHash(rs.d->idKey(), seed);
+    return qHash(rs.d->idKey(), seed);
 }
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/QXlsx/source/xlsxsharedstrings.cpp b/QXlsx/source/xlsxsharedstrings.cpp
index dbb4a2a3..be8e3979 100644
--- a/QXlsx/source/xlsxsharedstrings.cpp
+++ b/QXlsx/source/xlsxsharedstrings.cpp
@@ -1,18 +1,18 @@
 // xlsxsharedstrings.cpp
 
-#include <QtGlobal>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
-#include <QDir>
-#include <QFile>
-#include <QDebug>
-#include <QBuffer>
-
+#include "xlsxcolor_p.h"
+#include "xlsxformat_p.h"
 #include "xlsxrichstring.h"
 #include "xlsxsharedstrings_p.h"
 #include "xlsxutility_p.h"
-#include "xlsxformat_p.h"
-#include "xlsxcolor_p.h"
+
+#include <QBuffer>
+#include <QDebug>
+#include <QDir>
+#include <QFile>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE_XLSX
  */
 
 SharedStrings::SharedStrings(CreateFlag flag)
-    :AbstractOOXmlFile(flag)
+    : AbstractOOXmlFile(flag)
 {
     m_stringCount = 0;
 }
@@ -55,7 +55,7 @@ int SharedStrings::addSharedString(const RichString &string)
         return it->index;
     }
 
-    int index = m_stringList.size();
+    int index             = m_stringList.size();
     m_stringTable[string] = XlsxSharedStringInfo(index);
     m_stringList.append(string);
     return index;
@@ -63,7 +63,7 @@ int SharedStrings::addSharedString(const RichString &string)
 
 void SharedStrings::incRefByStringIndex(int idx)
 {
-    if (idx <0 || idx >= m_stringList.size()) {
+    if (idx < 0 || idx >= m_stringList.size()) {
         qDebug("SharedStrings: invlid index");
         return;
     }
@@ -93,7 +93,7 @@ void SharedStrings::removeSharedString(const RichString &string)
     it->count -= 1;
 
     if (it->count <= 0) {
-        for (int i=it->index+1; i<m_stringList.size(); ++i)
+        for (int i = it->index + 1; i < m_stringList.size(); ++i)
             m_stringTable[m_stringList[i]].index -= 1;
 
         m_stringList.removeAt(it->index);
@@ -145,7 +145,7 @@ void SharedStrings::writeRichStringPart_rPr(QXmlStreamWriter &writer, const Form
         Format::FontUnderline u = format.fontUnderline();
         if (u != Format::FontUnderlineNone) {
             writer.writeEmptyElement(QStringLiteral("u"));
-            if (u== Format::FontUnderlineDouble)
+            if (u == Format::FontUnderlineDouble)
                 writer.writeAttribute(QStringLiteral("val"), QStringLiteral("double"));
             else if (u == Format::FontUnderlineSingleAccounting)
                 writer.writeAttribute(QStringLiteral("val"), QStringLiteral("singleAccounting"));
@@ -180,12 +180,14 @@ void SharedStrings::writeRichStringPart_rPr(QXmlStreamWriter &writer, const Form
     }
     if (format.hasProperty(FormatPrivate::P_Font_Family)) {
         writer.writeEmptyElement(QStringLiteral("family"));
-        writer.writeAttribute(QStringLiteral("val"), QString::number(format.intProperty(FormatPrivate::P_Font_Family)));
+        writer.writeAttribute(QStringLiteral("val"),
+                              QString::number(format.intProperty(FormatPrivate::P_Font_Family)));
     }
 
     if (format.hasProperty(FormatPrivate::P_Font_Scheme)) {
         writer.writeEmptyElement(QStringLiteral("scheme"));
-        writer.writeAttribute(QStringLiteral("val"), format.stringProperty(FormatPrivate::P_Font_Scheme));
+        writer.writeAttribute(QStringLiteral("val"),
+                              format.stringProperty(FormatPrivate::P_Font_Scheme));
     }
 }
 
@@ -194,35 +196,37 @@ void SharedStrings::saveToXmlFile(QIODevice *device) const
     QXmlStreamWriter writer(device);
 
     if (m_stringList.size() != m_stringTable.size()) {
-        //Duplicated string items exist in m_stringList
-        //Clean up can not be done here, as the indices
-        //have been used when we save the worksheets part.
+        // Duplicated string items exist in m_stringList
+        // Clean up can not be done here, as the indices
+        // have been used when we save the worksheets part.
     }
 
     writer.writeStartDocument(QStringLiteral("1.0"), true);
     writer.writeStartElement(QStringLiteral("sst"));
-    writer.writeAttribute(QStringLiteral("xmlns"), QStringLiteral("http://schemas.openxmlformats.org/spreadsheetml/2006/main"));
+    writer.writeAttribute(
+        QStringLiteral("xmlns"),
+        QStringLiteral("http://schemas.openxmlformats.org/spreadsheetml/2006/main"));
     writer.writeAttribute(QStringLiteral("count"), QString::number(m_stringCount));
     writer.writeAttribute(QStringLiteral("uniqueCount"), QString::number(m_stringList.size()));
 
     for (const RichString &string : m_stringList) {
         writer.writeStartElement(QStringLiteral("si"));
         if (string.isRichString()) {
-            //Rich text string
-            for (int i=0; i<string.fragmentCount(); ++i) {
+            // Rich text string
+            for (int i = 0; i < string.fragmentCount(); ++i) {
                 writer.writeStartElement(QStringLiteral("r"));
                 if (string.fragmentFormat(i).hasFontData()) {
                     writer.writeStartElement(QStringLiteral("rPr"));
                     writeRichStringPart_rPr(writer, string.fragmentFormat(i));
-                    writer.writeEndElement();// rPr
+                    writer.writeEndElement(); // rPr
                 }
                 writer.writeStartElement(QStringLiteral("t"));
                 if (isSpaceReserveNeeded(string.fragmentText(i)))
                     writer.writeAttribute(QStringLiteral("xml:space"), QStringLiteral("preserve"));
                 writer.writeCharacters(string.fragmentText(i));
-                writer.writeEndElement();// t
+                writer.writeEndElement(); // t
 
-                writer.writeEndElement(); //r
+                writer.writeEndElement(); // r
             }
         } else {
             writer.writeStartElement(QStringLiteral("t"));
@@ -230,12 +234,12 @@ void SharedStrings::saveToXmlFile(QIODevice *device) const
             if (isSpaceReserveNeeded(pString))
                 writer.writeAttribute(QStringLiteral("xml:space"), QStringLiteral("preserve"));
             writer.writeCharacters(pString);
-            writer.writeEndElement();//t
+            writer.writeEndElement(); // t
         }
-        writer.writeEndElement();//si
+        writer.writeEndElement(); // si
     }
 
-    writer.writeEndElement(); //sst
+    writer.writeEndElement(); // sst
     writer.writeEndDocument();
 }
 
@@ -245,7 +249,8 @@ void SharedStrings::readString(QXmlStreamReader &reader)
 
     RichString richString;
 
-    while (!reader.atEnd() && !(reader.name() == QLatin1String("si") && reader.tokenType() == QXmlStreamReader::EndElement)) {
+    while (!reader.atEnd() && !(reader.name() == QLatin1String("si") &&
+                                reader.tokenType() == QXmlStreamReader::EndElement)) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("r"))
@@ -255,7 +260,7 @@ void SharedStrings::readString(QXmlStreamReader &reader)
         }
     }
 
-    int idx = m_stringList.size();
+    int idx                   = m_stringList.size();
     m_stringTable[richString] = XlsxSharedStringInfo(idx, 0);
     m_stringList.append(richString);
 }
@@ -266,7 +271,8 @@ void SharedStrings::readRichStringPart(QXmlStreamReader &reader, RichString &ric
 
     QString text;
     Format format;
-    while (!reader.atEnd() && !(reader.name() == QLatin1String("r") && reader.tokenType() == QXmlStreamReader::EndElement)) {
+    while (!reader.atEnd() && !(reader.name() == QLatin1String("r") &&
+                                reader.tokenType() == QXmlStreamReader::EndElement)) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("rPr")) {
@@ -283,9 +289,9 @@ void SharedStrings::readPlainStringPart(QXmlStreamReader &reader, RichString &ri
 {
     Q_ASSERT(reader.name() == QLatin1String("t"));
 
-    //QXmlStreamAttributes attributes = reader.attributes();
+    // QXmlStreamAttributes attributes = reader.attributes();
 
-	// NOTICE: CHECK POINT
+    // NOTICE: CHECK POINT
     QString text = reader.readElementText();
     richString.addFragment(text, Format());
 }
@@ -294,16 +300,19 @@ Format SharedStrings::readRichStringPart_rPr(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("rPr"));
     Format format;
-    while (!reader.atEnd() && !(reader.name() == QLatin1String("rPr") && reader.tokenType() == QXmlStreamReader::EndElement)) {
+    while (!reader.atEnd() && !(reader.name() == QLatin1String("rPr") &&
+                                reader.tokenType() == QXmlStreamReader::EndElement)) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             QXmlStreamAttributes attributes = reader.attributes();
             if (reader.name() == QLatin1String("rFont")) {
                 format.setFontName(attributes.value(QLatin1String("val")).toString());
             } else if (reader.name() == QLatin1String("charset")) {
-                format.setProperty(FormatPrivate::P_Font_Charset, attributes.value(QLatin1String("val")).toInt());
+                format.setProperty(FormatPrivate::P_Font_Charset,
+                                   attributes.value(QLatin1String("val")).toInt());
             } else if (reader.name() == QLatin1String("family")) {
-                format.setProperty(FormatPrivate::P_Font_Family, attributes.value(QLatin1String("val")).toInt());
+                format.setProperty(FormatPrivate::P_Font_Family,
+                                   attributes.value(QLatin1String("val")).toInt());
             } else if (reader.name() == QLatin1String("b")) {
                 format.setFontBold(true);
             } else if (reader.name() == QLatin1String("i")) {
@@ -315,9 +324,11 @@ Format SharedStrings::readRichStringPart_rPr(QXmlStreamReader &reader)
             } else if (reader.name() == QLatin1String("shadow")) {
                 format.setProperty(FormatPrivate::P_Font_Shadow, true);
             } else if (reader.name() == QLatin1String("condense")) {
-                format.setProperty(FormatPrivate::P_Font_Condense, attributes.value(QLatin1String("val")).toInt());
+                format.setProperty(FormatPrivate::P_Font_Condense,
+                                   attributes.value(QLatin1String("val")).toInt());
             } else if (reader.name() == QLatin1String("extend")) {
-                format.setProperty(FormatPrivate::P_Font_Extend, attributes.value(QLatin1String("val")).toInt());
+                format.setProperty(FormatPrivate::P_Font_Extend,
+                                   attributes.value(QLatin1String("val")).toInt());
             } else if (reader.name() == QLatin1String("color")) {
                 XlsxColor color;
                 color.loadFromXml(reader);
@@ -341,7 +352,8 @@ Format SharedStrings::readRichStringPart_rPr(QXmlStreamReader &reader)
                 else if (value == QLatin1String("subscript"))
                     format.setFontScript(Format::FontScriptSub);
             } else if (reader.name() == QLatin1String("scheme")) {
-                format.setProperty(FormatPrivate::P_Font_Scheme, attributes.value(QLatin1String("val")).toString());
+                format.setProperty(FormatPrivate::P_Font_Scheme,
+                                   attributes.value(QLatin1String("val")).toString());
             }
         }
     }
@@ -351,19 +363,19 @@ Format SharedStrings::readRichStringPart_rPr(QXmlStreamReader &reader)
 bool SharedStrings::loadFromXmlFile(QIODevice *device)
 {
     QXmlStreamReader reader(device);
-    int count = 0;
-    bool hasUniqueCountAttr=true;
+    int count               = 0;
+    bool hasUniqueCountAttr = true;
     while (!reader.atEnd()) {
-         QXmlStreamReader::TokenType token = reader.readNext();
-         if (token == QXmlStreamReader::StartElement) {
-             if (reader.name() == QLatin1String("sst")) {
-                 QXmlStreamAttributes attributes = reader.attributes();
-                 if ((hasUniqueCountAttr = attributes.hasAttribute(QLatin1String("uniqueCount"))))
-                     count = attributes.value(QLatin1String("uniqueCount")).toInt();
-             } else if (reader.name() == QLatin1String("si")) {
-                 readString(reader);
-             }
-         }
+        QXmlStreamReader::TokenType token = reader.readNext();
+        if (token == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("sst")) {
+                QXmlStreamAttributes attributes = reader.attributes();
+                if ((hasUniqueCountAttr = attributes.hasAttribute(QLatin1String("uniqueCount"))))
+                    count = attributes.value(QLatin1String("uniqueCount")).toInt();
+            } else if (reader.name() == QLatin1String("si")) {
+                readString(reader);
+            }
+        }
     }
 
     if (hasUniqueCountAttr && m_stringList.size() != count) {
@@ -372,8 +384,8 @@ bool SharedStrings::loadFromXmlFile(QIODevice *device)
     }
 
     if (m_stringList.size() != m_stringTable.size()) {
-        //qDebug("Warning: Duplicated items exist in shared string table.");
-        //Nothing we can do here, as indices of the strings will be used when loading sheets.
+        // qDebug("Warning: Duplicated items exist in shared string table.");
+        // Nothing we can do here, as indices of the strings will be used when loading sheets.
     }
 
     return true;
diff --git a/QXlsx/source/xlsxsimpleooxmlfile.cpp b/QXlsx/source/xlsxsimpleooxmlfile.cpp
index 380ce6b6..dda49003 100644
--- a/QXlsx/source/xlsxsimpleooxmlfile.cpp
+++ b/QXlsx/source/xlsxsimpleooxmlfile.cpp
@@ -2,13 +2,13 @@
 
 #include "xlsxsimpleooxmlfile_p.h"
 
-#include <QtGlobal>
 #include <QIODevice>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
 SimpleOOXmlFile::SimpleOOXmlFile(CreateFlag flag)
-    :AbstractOOXmlFile(flag)
+    : AbstractOOXmlFile(flag)
 {
 }
 
diff --git a/QXlsx/source/xlsxstyles.cpp b/QXlsx/source/xlsxstyles.cpp
index 9be9a60b..833caf8c 100644
--- a/QXlsx/source/xlsxstyles.cpp
+++ b/QXlsx/source/xlsxstyles.cpp
@@ -1,19 +1,19 @@
 // xlsxstyles.cpp
 
-#include <QtGlobal>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
-#include <QFile>
-#include <QMap>
-#include <QDataStream>
-#include <QDebug>
-#include <QBuffer>
-
+#include "xlsxcolor_p.h"
+#include "xlsxformat_p.h"
 #include "xlsxglobal.h"
 #include "xlsxstyles_p.h"
-#include "xlsxformat_p.h"
 #include "xlsxutility_p.h"
-#include "xlsxcolor_p.h"
+
+#include <QBuffer>
+#include <QDataStream>
+#include <QDebug>
+#include <QFile>
+#include <QMap>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -23,12 +23,14 @@ QT_BEGIN_NAMESPACE_XLSX
 
 */
 Styles::Styles(CreateFlag flag)
-    : AbstractOOXmlFile(flag), m_nextCustomNumFmtId(176), m_isIndexedColorsDefault(true)
+    : AbstractOOXmlFile(flag)
+    , m_nextCustomNumFmtId(176)
+    , m_isIndexedColorsDefault(true)
     , m_emptyFormatAdded(false)
 {
-    //!Fix me. Should the custom num fmt Id starts with 164 or 176 or others??
+    //! Fix me. Should the custom num fmt Id starts with 164 or 176 or others??
 
-    //!Fix me! Where should we put these register code?
+    //! Fix me! Where should we put these register code?
 
     // issue #172, #89
 #if QT_VERSION >= 0x060000 // Qt 6.0 or over
@@ -42,7 +44,7 @@ Styles::Styles(CreateFlag flag)
 #if QT_VERSION >= 0x060000
         // Qt 6
 
-        ///TODO:
+        /// TODO:
 
 #else
         // Qt 5
@@ -55,11 +57,11 @@ Styles::Styles(CreateFlag flag)
     }
 
     if (flag == F_NewFromScratch) {
-        //Add default Format
+        // Add default Format
         Format defaultFmt;
         addXfFormat(defaultFmt);
 
-        //Add another fill format
+        // Add another fill format
         Format fillFmt;
         fillFmt.setFillPattern(Format::PatternGray125);
         m_fillsList.append(fillFmt);
@@ -67,13 +69,11 @@ Styles::Styles(CreateFlag flag)
     }
 }
 
-Styles::~Styles()
-{
-}
+Styles::~Styles() {}
 
 Format Styles::xfFormat(int idx) const
 {
-    if (idx <0 || idx >= m_xf_formatsList.size())
+    if (idx < 0 || idx >= m_xf_formatsList.size())
         return Format();
 
     return m_xf_formatsList[idx];
@@ -81,7 +81,7 @@ Format Styles::xfFormat(int idx) const
 
 Format Styles::dxfFormat(int idx) const
 {
-    if (idx <0 || idx >= m_dxf_formatsList.size())
+    if (idx < 0 || idx >= m_dxf_formatsList.size())
         return Format();
 
     return m_dxf_formatsList[idx];
@@ -93,28 +93,28 @@ void Styles::fixNumFmt(const Format &format)
     if (!format.hasNumFmtData())
         return;
 
-    if (format.hasProperty(FormatPrivate::P_NumFmt_Id)
-            && !format.stringProperty(FormatPrivate::P_NumFmt_FormatCode).isEmpty())
-    {
+    if (format.hasProperty(FormatPrivate::P_NumFmt_Id) &&
+        !format.stringProperty(FormatPrivate::P_NumFmt_FormatCode).isEmpty()) {
         return;
     }
 
-    if ( m_builtinNumFmtsHash.isEmpty() )
-    {
+    if (m_builtinNumFmtsHash.isEmpty()) {
         m_builtinNumFmtsHash.insert(QStringLiteral("General"), 0);
         m_builtinNumFmtsHash.insert(QStringLiteral("0"), 1);
         m_builtinNumFmtsHash.insert(QStringLiteral("0.00"), 2);
         m_builtinNumFmtsHash.insert(QStringLiteral("#,##0"), 3);
         m_builtinNumFmtsHash.insert(QStringLiteral("#,##0.00"), 4);
-//            m_builtinNumFmtsHash.insert(QStringLiteral("($#,##0_);($#,##0)"), 5);
-//            m_builtinNumFmtsHash.insert(QStringLiteral("($#,##0_);[Red]($#,##0)"), 6);
-//            m_builtinNumFmtsHash.insert(QStringLiteral("($#,##0.00_);($#,##0.00)"), 7);
-//            m_builtinNumFmtsHash.insert(QStringLiteral("($#,##0.00_);[Red]($#,##0.00)"), 8);
+        //            m_builtinNumFmtsHash.insert(QStringLiteral("($#,##0_);($#,##0)"), 5);
+        //            m_builtinNumFmtsHash.insert(QStringLiteral("($#,##0_);[Red]($#,##0)"), 6);
+        //            m_builtinNumFmtsHash.insert(QStringLiteral("($#,##0.00_);($#,##0.00)"), 7);
+        //            m_builtinNumFmtsHash.insert(QStringLiteral("($#,##0.00_);[Red]($#,##0.00)"),
+        //            8);
         m_builtinNumFmtsHash.insert(QStringLiteral("0%"), 9);
         m_builtinNumFmtsHash.insert(QStringLiteral("0.00%"), 10);
         m_builtinNumFmtsHash.insert(QStringLiteral("0.00E+00"), 11);
         m_builtinNumFmtsHash.insert(QStringLiteral("# ?/?"), 12);
-        m_builtinNumFmtsHash.insert(QStringLiteral("# ?\?/??"), 13);// Note: "??/" is a c++ trigraph, so escape one "?"
+        m_builtinNumFmtsHash.insert(QStringLiteral("# ?\?/??"),
+                                    13); // Note: "??/" is a c++ trigraph, so escape one "?"
         m_builtinNumFmtsHash.insert(QStringLiteral("m/d/yy"), 14);
         m_builtinNumFmtsHash.insert(QStringLiteral("d-mmm-yy"), 15);
         m_builtinNumFmtsHash.insert(QStringLiteral("d-mmm"), 16);
@@ -129,10 +129,12 @@ void Styles::fixNumFmt(const Format &format)
         m_builtinNumFmtsHash.insert(QStringLiteral("(#,##0_);[Red](#,##0)"), 38);
         m_builtinNumFmtsHash.insert(QStringLiteral("(#,##0.00_);(#,##0.00)"), 39);
         m_builtinNumFmtsHash.insert(QStringLiteral("(#,##0.00_);[Red](#,##0.00)"), 40);
-//            m_builtinNumFmtsHash.insert(QStringLiteral("_(* #,##0_);_(* (#,##0);_(* \"-\"_);_(_)"), 41);
-//            m_builtinNumFmtsHash.insert(QStringLiteral("_($* #,##0_);_($* (#,##0);_($* \"-\"_);_(_)"), 42);
-//            m_builtinNumFmtsHash.insert(QStringLiteral("_(* #,##0.00_);_(* (#,##0.00);_(* \"-\"??_);_(_)"), 43);
-//            m_builtinNumFmtsHash.insert(QStringLiteral("_($* #,##0.00_);_($* (#,##0.00);_($* \"-\"??_);_(_)"), 44);
+        //            m_builtinNumFmtsHash.insert(QStringLiteral("_(* #,##0_);_(* (#,##0);_(*
+        //            \"-\"_);_(_)"), 41); m_builtinNumFmtsHash.insert(QStringLiteral("_($*
+        //            #,##0_);_($* (#,##0);_($* \"-\"_);_(_)"), 42);
+        //            m_builtinNumFmtsHash.insert(QStringLiteral("_(* #,##0.00_);_(* (#,##0.00);_(*
+        //            \"-\"??_);_(_)"), 43); m_builtinNumFmtsHash.insert(QStringLiteral("_($*
+        //            #,##0.00_);_($* (#,##0.00);_($* \"-\"??_);_(_)"), 44);
         m_builtinNumFmtsHash.insert(QStringLiteral("mm:ss"), 45);
         m_builtinNumFmtsHash.insert(QStringLiteral("[h]:mm:ss"), 46);
         m_builtinNumFmtsHash.insert(QStringLiteral("mm:ss.0"), 47);
@@ -141,62 +143,49 @@ void Styles::fixNumFmt(const Format &format)
 
         // dev74
         // m_builtinNumFmtsHash.insert(QStringLiteral("0.####"), 176);
-
     }
 
-    const auto& str = format.numberFormat();
-    if (!str.isEmpty())
-    {
-        QHash<QString, QSharedPointer<XlsxFormatNumberData> >::ConstIterator cIt;
-        //Assign proper number format index
-        const auto& it = m_builtinNumFmtsHash.constFind(str);
-        if (it != m_builtinNumFmtsHash.constEnd())
-        {
+    const auto &str = format.numberFormat();
+    if (!str.isEmpty()) {
+        QHash<QString, QSharedPointer<XlsxFormatNumberData>>::ConstIterator cIt;
+        // Assign proper number format index
+        const auto &it = m_builtinNumFmtsHash.constFind(str);
+        if (it != m_builtinNumFmtsHash.constEnd()) {
             const_cast<Format *>(&format)->fixNumberFormat(it.value(), str);
-        }
-        else if ((cIt = m_customNumFmtsHash.constFind(str)) != m_customNumFmtsHash.constEnd())
-        {
+        } else if ((cIt = m_customNumFmtsHash.constFind(str)) != m_customNumFmtsHash.constEnd()) {
             const_cast<Format *>(&format)->fixNumberFormat(cIt.value()->formatIndex, str);
-        }
-        else
-        {
-            //Assign a new fmt Id.
+        } else {
+            // Assign a new fmt Id.
             const_cast<Format *>(&format)->fixNumberFormat(m_nextCustomNumFmtId, str);
 
             QSharedPointer<XlsxFormatNumberData> fmt(new XlsxFormatNumberData);
-            fmt->formatIndex = m_nextCustomNumFmtId;
+            fmt->formatIndex  = m_nextCustomNumFmtId;
             fmt->formatString = str;
             m_customNumFmtIdMap.insert(m_nextCustomNumFmtId, fmt);
             m_customNumFmtsHash.insert(str, fmt);
 
             m_nextCustomNumFmtId += 1;
         }
-    }
-    else
-    {
+    } else {
         const auto id = format.numberFormatIndex();
-        //Assign proper format code, this is needed by dxf format
-        const auto& it = m_customNumFmtIdMap.constFind(id);
-        if (it != m_customNumFmtIdMap.constEnd())
-        {
+        // Assign proper format code, this is needed by dxf format
+        const auto &it = m_customNumFmtIdMap.constFind(id);
+        if (it != m_customNumFmtIdMap.constEnd()) {
             const_cast<Format *>(&format)->fixNumberFormat(id, it.value()->formatString);
-        }
-        else
-        {
+        } else {
             bool found = false;
-            for ( auto&& it = m_builtinNumFmtsHash.constBegin() ; it != m_builtinNumFmtsHash.constEnd() ; ++it )
-            {
-                if (it.value() == id)
-                {
+            for (auto &&it = m_builtinNumFmtsHash.constBegin();
+                 it != m_builtinNumFmtsHash.constEnd();
+                 ++it) {
+                if (it.value() == id) {
                     const_cast<Format *>(&format)->fixNumberFormat(id, it.key());
                     found = true;
                     break;
                 }
             }
 
-            if (!found)
-            {
-                //Wrong numFmt
+            if (!found) {
+                // Wrong numFmt
                 const_cast<Format *>(&format)->fixNumberFormat(id, QStringLiteral("General"));
             }
         }
@@ -212,82 +201,74 @@ void Styles::fixNumFmt(const Format &format)
 */
 void Styles::addXfFormat(const Format &format, bool force)
 {
-    if (format.isEmpty())
-    {
-        //Try do something for empty Format.
+    if (format.isEmpty()) {
+        // Try do something for empty Format.
         if (m_emptyFormatAdded && !force)
             return;
 
         m_emptyFormatAdded = true;
     }
 
-    //numFmt
-    if (format.hasNumFmtData() &&
-            !format.hasProperty(FormatPrivate::P_NumFmt_Id))
-    {
+    // numFmt
+    if (format.hasNumFmtData() && !format.hasProperty(FormatPrivate::P_NumFmt_Id)) {
         fixNumFmt(format);
     }
 
-    //Font
-    const auto& fontIt = m_fontsHash.constFind(format.fontKey());
-    if (format.hasFontData() && !format.fontIndexValid())
-    {
-        //Assign proper font index, if has font data.
+    // Font
+    const auto &fontIt = m_fontsHash.constFind(format.fontKey());
+    if (format.hasFontData() && !format.fontIndexValid()) {
+        // Assign proper font index, if has font data.
         if (fontIt == m_fontsHash.constEnd())
             const_cast<Format *>(&format)->setFontIndex(m_fontsList.size());
         else
             const_cast<Format *>(&format)->setFontIndex(fontIt->fontIndex());
     }
-    if (fontIt == m_fontsHash.constEnd())
-    {
-        //Still a valid font if the format has no fontData. (All font properties are default)
+    if (fontIt == m_fontsHash.constEnd()) {
+        // Still a valid font if the format has no fontData. (All font properties are default)
         m_fontsList.append(format);
         m_fontsHash[format.fontKey()] = format;
     }
 
-    //Fill
-    const auto& fillIt = m_fillsHash.constFind(format.fillKey());
+    // Fill
+    const auto &fillIt = m_fillsHash.constFind(format.fillKey());
     if (format.hasFillData() && !format.fillIndexValid()) {
-        //Assign proper fill index, if has fill data.
+        // Assign proper fill index, if has fill data.
         if (fillIt == m_fillsHash.constEnd())
             const_cast<Format *>(&format)->setFillIndex(m_fillsList.size());
         else
             const_cast<Format *>(&format)->setFillIndex(fillIt->fillIndex());
     }
     if (fillIt == m_fillsHash.constEnd()) {
-        //Still a valid fill if the format has no fillData. (All fill properties are default)
+        // Still a valid fill if the format has no fillData. (All fill properties are default)
         m_fillsList.append(format);
         m_fillsHash[format.fillKey()] = format;
     }
 
-    //Border
-    const auto& borderIt = m_bordersHash.constFind(format.borderKey());
+    // Border
+    const auto &borderIt = m_bordersHash.constFind(format.borderKey());
     if (format.hasBorderData() && !format.borderIndexValid()) {
-        //Assign proper border index, if has border data.
+        // Assign proper border index, if has border data.
         if (borderIt == m_bordersHash.constEnd())
             const_cast<Format *>(&format)->setBorderIndex(m_bordersList.size());
         else
             const_cast<Format *>(&format)->setBorderIndex(borderIt->borderIndex());
     }
     if (borderIt == m_bordersHash.constEnd()) {
-        //Still a valid border if the format has no borderData. (All border properties are default)
+        // Still a valid border if the format has no borderData. (All border properties are default)
         m_bordersList.append(format);
         m_bordersHash[format.borderKey()] = format;
     }
 
-    //Format
-    const auto& formatIt = m_xf_formatsHash.constFind(format.formatKey());
-    if (!format.isEmpty() && !format.xfIndexValid())
-    {
+    // Format
+    const auto &formatIt = m_xf_formatsHash.constFind(format.formatKey());
+    if (!format.isEmpty() && !format.xfIndexValid()) {
         if (formatIt == m_xf_formatsHash.constEnd())
             const_cast<Format *>(&format)->setXfIndex(m_xf_formatsList.size());
         else
             const_cast<Format *>(&format)->setXfIndex(formatIt->xfIndex());
     }
 
-    if (formatIt == m_xf_formatsHash.constEnd() ||
-            force)
-    {
+    if (formatIt == m_xf_formatsHash.constEnd() || force) {
         m_xf_formatsList.append(format);
         m_xf_formatsHash[format.formatKey()] = format;
     }
@@ -295,31 +276,24 @@ void Styles::addXfFormat(const Format &format, bool force)
 
 void Styles::addDxfFormat(const Format &format, bool force)
 {
-    //numFmt
-    if ( format.hasNumFmtData() )
-    {
+    // numFmt
+    if (format.hasNumFmtData()) {
         fixNumFmt(format);
     }
 
-    const auto& formatIt = m_dxf_formatsHash.constFind(format.formatKey());
-    if ( !format.isEmpty() &&
-            !format.dxfIndexValid() )
-    {
-        if (formatIt ==  m_dxf_formatsHash.constEnd() ) // m_xf_formatsHash.constEnd()) // issue #108
-        {
-            const_cast<Format *>(&format)->setDxfIndex( m_dxf_formatsList.size() );
-        }
-        else
+    const auto &formatIt = m_dxf_formatsHash.constFind(format.formatKey());
+    if (!format.isEmpty() && !format.dxfIndexValid()) {
+        if (formatIt == m_dxf_formatsHash.constEnd()) // m_xf_formatsHash.constEnd()) // issue #108
         {
-            const_cast<Format *>(&format)->setDxfIndex( formatIt->dxfIndex() );
+            const_cast<Format *>(&format)->setDxfIndex(m_dxf_formatsList.size());
+        } else {
+            const_cast<Format *>(&format)->setDxfIndex(formatIt->dxfIndex());
         }
     }
 
-    if (formatIt == m_xf_formatsHash.constEnd() ||
-         force )
-    {
+    if (formatIt == m_xf_formatsHash.constEnd() || force) {
         m_dxf_formatsList.append(format);
-        m_dxf_formatsHash[ format.formatKey() ] = format;
+        m_dxf_formatsHash[format.formatKey()] = format;
     }
 }
 
@@ -329,7 +303,9 @@ void Styles::saveToXmlFile(QIODevice *device) const
 
     writer.writeStartDocument(QStringLiteral("1.0"), true);
     writer.writeStartElement(QStringLiteral("styleSheet"));
-    writer.writeAttribute(QStringLiteral("xmlns"), QStringLiteral("http://schemas.openxmlformats.org/spreadsheetml/2006/main"));
+    writer.writeAttribute(
+        QStringLiteral("xmlns"),
+        QStringLiteral("http://schemas.openxmlformats.org/spreadsheetml/2006/main"));
 
     writeNumFmts(writer);
     writeFonts(writer);
@@ -343,8 +319,8 @@ void Styles::saveToXmlFile(QIODevice *device) const
     writer.writeAttribute(QStringLiteral("fontId"), QStringLiteral("0"));
     writer.writeAttribute(QStringLiteral("fillId"), QStringLiteral("0"));
     writer.writeAttribute(QStringLiteral("borderId"), QStringLiteral("0"));
-    writer.writeEndElement();//xf
-    writer.writeEndElement();//cellStyleXfs
+    writer.writeEndElement(); // xf
+    writer.writeEndElement(); // cellStyleXfs
 
     writeCellXfs(writer);
 
@@ -354,8 +330,8 @@ void Styles::saveToXmlFile(QIODevice *device) const
     writer.writeAttribute(QStringLiteral("name"), QStringLiteral("Normal"));
     writer.writeAttribute(QStringLiteral("xfId"), QStringLiteral("0"));
     writer.writeAttribute(QStringLiteral("builtinId"), QStringLiteral("0"));
-    writer.writeEndElement();//cellStyle
-    writer.writeEndElement();//cellStyles
+    writer.writeEndElement(); // cellStyle
+    writer.writeEndElement(); // cellStyles
 
     writeDxfs(writer);
 
@@ -363,11 +339,11 @@ void Styles::saveToXmlFile(QIODevice *device) const
     writer.writeAttribute(QStringLiteral("count"), QStringLiteral("0"));
     writer.writeAttribute(QStringLiteral("defaultTableStyle"), QStringLiteral("TableStyleMedium9"));
     writer.writeAttribute(QStringLiteral("defaultPivotStyle"), QStringLiteral("PivotStyleLight16"));
-    writer.writeEndElement();//tableStyles
+    writer.writeEndElement(); // tableStyles
 
     writeColors(writer);
 
-    writer.writeEndElement();//styleSheet
+    writer.writeEndElement(); // styleSheet
     writer.writeEndDocument();
 }
 
@@ -379,18 +355,18 @@ void Styles::writeNumFmts(QXmlStreamWriter &writer) const
     writer.writeStartElement(QStringLiteral("numFmts"));
     writer.writeAttribute(QStringLiteral("count"), QString::number(m_customNumFmtIdMap.count()));
 
-    QMapIterator<int, QSharedPointer<XlsxFormatNumberData> > it(m_customNumFmtIdMap);
+    QMapIterator<int, QSharedPointer<XlsxFormatNumberData>> it(m_customNumFmtIdMap);
     while (it.hasNext()) {
         it.next();
         writer.writeEmptyElement(QStringLiteral("numFmt"));
         writer.writeAttribute(QStringLiteral("numFmtId"), QString::number(it.value()->formatIndex));
         writer.writeAttribute(QStringLiteral("formatCode"), it.value()->formatString);
     }
-    writer.writeEndElement();//numFmts
+    writer.writeEndElement(); // numFmts
 }
 
 /*
-*/
+ */
 void Styles::writeFonts(QXmlStreamWriter &writer) const
 {
     writer.writeStartElement(QStringLiteral("fonts"));
@@ -398,21 +374,21 @@ void Styles::writeFonts(QXmlStreamWriter &writer) const
     for (const auto &font : m_fontsList) {
         writeFont(writer, font, false);
     }
-    writer.writeEndElement();//fonts
+    writer.writeEndElement(); // fonts
 }
 
 void Styles::writeFont(QXmlStreamWriter &writer, const Format &format, bool isDxf) const
 {
     writer.writeStartElement(QStringLiteral("font"));
 
-    //The condense and extend elements are mainly used in dxf format
-    if (format.hasProperty(FormatPrivate::P_Font_Condense)
-            && !format.boolProperty(FormatPrivate::P_Font_Condense)) {
+    // The condense and extend elements are mainly used in dxf format
+    if (format.hasProperty(FormatPrivate::P_Font_Condense) &&
+        !format.boolProperty(FormatPrivate::P_Font_Condense)) {
         writer.writeEmptyElement(QStringLiteral("condense"));
         writer.writeAttribute(QStringLiteral("val"), QStringLiteral("0"));
     }
-    if (format.hasProperty(FormatPrivate::P_Font_Extend)
-            && !format.boolProperty(FormatPrivate::P_Font_Extend)) {
+    if (format.hasProperty(FormatPrivate::P_Font_Extend) &&
+        !format.boolProperty(FormatPrivate::P_Font_Extend)) {
         writer.writeEmptyElement(QStringLiteral("extend"));
         writer.writeAttribute(QStringLiteral("val"), QStringLiteral("0"));
     }
@@ -431,7 +407,7 @@ void Styles::writeFont(QXmlStreamWriter &writer, const Format &format, bool isDx
         Format::FontUnderline u = format.fontUnderline();
         if (u != Format::FontUnderlineNone) {
             writer.writeEmptyElement(QStringLiteral("u"));
-            if (u== Format::FontUnderlineDouble)
+            if (u == Format::FontUnderlineDouble)
                 writer.writeAttribute(QStringLiteral("val"), QStringLiteral("double"));
             else if (u == Format::FontUnderlineSingleAccounting)
                 writer.writeAttribute(QStringLiteral("val"), QStringLiteral("singleAccounting"));
@@ -467,19 +443,24 @@ void Styles::writeFont(QXmlStreamWriter &writer, const Format &format, bool isDx
         }
         if (format.hasProperty(FormatPrivate::P_Font_Charset)) {
             writer.writeEmptyElement(QStringLiteral("charset"));
-            writer.writeAttribute(QStringLiteral("val"), QString::number(format.intProperty(FormatPrivate::P_Font_Charset)));
+            writer.writeAttribute(
+                QStringLiteral("val"),
+                QString::number(format.intProperty(FormatPrivate::P_Font_Charset)));
         }
         if (format.hasProperty(FormatPrivate::P_Font_Family)) {
             writer.writeEmptyElement(QStringLiteral("family"));
-            writer.writeAttribute(QStringLiteral("val"), QString::number(format.intProperty(FormatPrivate::P_Font_Family)));
+            writer.writeAttribute(
+                QStringLiteral("val"),
+                QString::number(format.intProperty(FormatPrivate::P_Font_Family)));
         }
 
         if (format.hasProperty(FormatPrivate::P_Font_Scheme)) {
             writer.writeEmptyElement(QStringLiteral("scheme"));
-            writer.writeAttribute(QStringLiteral("val"), format.stringProperty(FormatPrivate::P_Font_Scheme));
+            writer.writeAttribute(QStringLiteral("val"),
+                                  format.stringProperty(FormatPrivate::P_Font_Scheme));
         }
     }
-    writer.writeEndElement(); //font
+    writer.writeEndElement(); // font
 }
 
 void Styles::writeFills(QXmlStreamWriter &writer) const
@@ -491,7 +472,7 @@ void Styles::writeFills(QXmlStreamWriter &writer) const
         writeFill(writer, fill);
     }
 
-    writer.writeEndElement(); //fills
+    writer.writeEndElement(); // fills
 }
 
 void Styles::writeFill(QXmlStreamWriter &writer, const Format &fill, bool isDxf) const
@@ -515,31 +496,39 @@ void Styles::writeFill(QXmlStreamWriter &writer, const Format &fill, bool isDxf)
         {Format::PatternLightTrellis, QStringLiteral("lightTrellis")},
         {Format::PatternGray125, QStringLiteral("gray125")},
         {Format::PatternGray0625, QStringLiteral("gray0625")},
-        {Format::PatternLightGrid, QStringLiteral("lightGrid")}
-    };
+        {Format::PatternLightGrid, QStringLiteral("lightGrid")}};
 
     writer.writeStartElement(QStringLiteral("fill"));
     writer.writeStartElement(QStringLiteral("patternFill"));
     Format::FillPattern pattern = fill.fillPattern();
     // For normal fill formats, Excel prefer to outputing the default "none" attribute
     // But for dxf, Excel prefer to omiting the default "none"
-    // Though not make any difference, but it make easier to compare origin files with generate files during debug
+    // Though not make any difference, but it make easier to compare origin files with generate
+    // files during debug
     if (!(pattern == Format::PatternNone && isDxf))
         writer.writeAttribute(QStringLiteral("patternType"), patternStrings[pattern]);
     // For a solid fill, Excel reverses the role of foreground and background colours
     if (fill.fillPattern() == Format::PatternSolid) {
         if (fill.hasProperty(FormatPrivate::P_Fill_BgColor))
-            fill.property(FormatPrivate::P_Fill_BgColor).value<XlsxColor>().saveToXml(writer, QStringLiteral("fgColor"));
+            fill.property(FormatPrivate::P_Fill_BgColor)
+                .value<XlsxColor>()
+                .saveToXml(writer, QStringLiteral("fgColor"));
         if (fill.hasProperty(FormatPrivate::P_Fill_FgColor))
-            fill.property(FormatPrivate::P_Fill_FgColor).value<XlsxColor>().saveToXml(writer, QStringLiteral("bgColor"));
+            fill.property(FormatPrivate::P_Fill_FgColor)
+                .value<XlsxColor>()
+                .saveToXml(writer, QStringLiteral("bgColor"));
     } else {
         if (fill.hasProperty(FormatPrivate::P_Fill_FgColor))
-            fill.property(FormatPrivate::P_Fill_FgColor).value<XlsxColor>().saveToXml(writer, QStringLiteral("fgColor"));
+            fill.property(FormatPrivate::P_Fill_FgColor)
+                .value<XlsxColor>()
+                .saveToXml(writer, QStringLiteral("fgColor"));
         if (fill.hasProperty(FormatPrivate::P_Fill_BgColor))
-            fill.property(FormatPrivate::P_Fill_BgColor).value<XlsxColor>().saveToXml(writer, QStringLiteral("bgColor"));
+            fill.property(FormatPrivate::P_Fill_BgColor)
+                .value<XlsxColor>()
+                .saveToXml(writer, QStringLiteral("bgColor"));
     }
-    writer.writeEndElement();//patternFill
-    writer.writeEndElement();//fill
+    writer.writeEndElement(); // patternFill
+    writer.writeEndElement(); // fill
 }
 
 void Styles::writeBorders(QXmlStreamWriter &writer) const
@@ -551,7 +540,7 @@ void Styles::writeBorders(QXmlStreamWriter &writer) const
         writeBorder(writer, border);
     }
 
-    writer.writeEndElement();//borders
+    writer.writeEndElement(); // borders
 }
 
 void Styles::writeBorder(QXmlStreamWriter &writer, const Format &border, bool isDxf) const
@@ -569,24 +558,42 @@ void Styles::writeBorder(QXmlStreamWriter &writer, const Format &border, bool is
         }
     }
 
-    writeSubBorder(writer, QStringLiteral("left"), border.leftBorderStyle(), border.property(FormatPrivate::P_Border_LeftColor).value<XlsxColor>());
-    writeSubBorder(writer, QStringLiteral("right"), border.rightBorderStyle(), border.property(FormatPrivate::P_Border_RightColor).value<XlsxColor>());
-    writeSubBorder(writer, QStringLiteral("top"), border.topBorderStyle(), border.property(FormatPrivate::P_Border_TopColor).value<XlsxColor>());
-    writeSubBorder(writer, QStringLiteral("bottom"), border.bottomBorderStyle(), border.property(FormatPrivate::P_Border_BottomColor).value<XlsxColor>());
-
-    //Condition DXF formats don't allow diagonal style
+    writeSubBorder(writer,
+                   QStringLiteral("left"),
+                   border.leftBorderStyle(),
+                   border.property(FormatPrivate::P_Border_LeftColor).value<XlsxColor>());
+    writeSubBorder(writer,
+                   QStringLiteral("right"),
+                   border.rightBorderStyle(),
+                   border.property(FormatPrivate::P_Border_RightColor).value<XlsxColor>());
+    writeSubBorder(writer,
+                   QStringLiteral("top"),
+                   border.topBorderStyle(),
+                   border.property(FormatPrivate::P_Border_TopColor).value<XlsxColor>());
+    writeSubBorder(writer,
+                   QStringLiteral("bottom"),
+                   border.bottomBorderStyle(),
+                   border.property(FormatPrivate::P_Border_BottomColor).value<XlsxColor>());
+
+    // Condition DXF formats don't allow diagonal style
     if (!isDxf)
-        writeSubBorder(writer, QStringLiteral("diagonal"), border.diagonalBorderStyle(), border.property(FormatPrivate::P_Border_DiagonalColor).value<XlsxColor>());
+        writeSubBorder(writer,
+                       QStringLiteral("diagonal"),
+                       border.diagonalBorderStyle(),
+                       border.property(FormatPrivate::P_Border_DiagonalColor).value<XlsxColor>());
 
     if (isDxf) {
-//        writeSubBorder(wirter, QStringLiteral("vertical"), );
-//        writeSubBorder(writer, QStringLiteral("horizontal"), );
+        //        writeSubBorder(wirter, QStringLiteral("vertical"), );
+        //        writeSubBorder(writer, QStringLiteral("horizontal"), );
     }
 
-    writer.writeEndElement();//border
+    writer.writeEndElement(); // border
 }
 
-void Styles::writeSubBorder(QXmlStreamWriter &writer, const QString &type, int style, const XlsxColor &color) const
+void Styles::writeSubBorder(QXmlStreamWriter &writer,
+                            const QString &type,
+                            int style,
+                            const XlsxColor &color) const
 {
     if (style == Format::BorderNone) {
         writer.writeEmptyElement(type);
@@ -607,14 +614,13 @@ void Styles::writeSubBorder(QXmlStreamWriter &writer, const QString &type, int s
         {Format::BorderMediumDashDot, QStringLiteral("mediumDashDot")},
         {Format::BorderDashDotDot, QStringLiteral("dashDotDot")},
         {Format::BorderMediumDashDotDot, QStringLiteral("mediumDashDotDot")},
-        {Format::BorderSlantDashDot, QStringLiteral("slantDashDot")}
-    };
+        {Format::BorderSlantDashDot, QStringLiteral("slantDashDot")}};
 
     writer.writeStartElement(type);
     writer.writeAttribute(QStringLiteral("style"), stylesString[style]);
-    color.saveToXml(writer); //write color element
+    color.saveToXml(writer); // write color element
 
-    writer.writeEndElement();//type
+    writer.writeEndElement(); // type
 }
 
 void Styles::writeCellXfs(QXmlStreamWriter &writer) const
@@ -624,7 +630,8 @@ void Styles::writeCellXfs(QXmlStreamWriter &writer) const
     for (const Format &format : m_xf_formatsList) {
         int xf_id = 0;
         writer.writeStartElement(QStringLiteral("xf"));
-        writer.writeAttribute(QStringLiteral("numFmtId"), QString::number(format.numberFormatIndex()));
+        writer.writeAttribute(QStringLiteral("numFmtId"),
+                              QString::number(format.numberFormatIndex()));
         writer.writeAttribute(QStringLiteral("fontId"), QString::number(format.fontIndex()));
         writer.writeAttribute(QStringLiteral("fillId"), QString::number(format.fillIndex()));
         writer.writeAttribute(QStringLiteral("borderId"), QString::number(format.borderIndex()));
@@ -660,10 +667,12 @@ void Styles::writeCellXfs(QXmlStreamWriter &writer) const
                     writer.writeAttribute(QStringLiteral("horizontal"), QStringLiteral("justify"));
                     break;
                 case Format::AlignHMerge:
-                    writer.writeAttribute(QStringLiteral("horizontal"), QStringLiteral("centerContinuous"));
+                    writer.writeAttribute(QStringLiteral("horizontal"),
+                                          QStringLiteral("centerContinuous"));
                     break;
                 case Format::AlignHDistributed:
-                    writer.writeAttribute(QStringLiteral("horizontal"), QStringLiteral("distributed"));
+                    writer.writeAttribute(QStringLiteral("horizontal"),
+                                          QStringLiteral("distributed"));
                     break;
                 default:
                     break;
@@ -682,7 +691,8 @@ void Styles::writeCellXfs(QXmlStreamWriter &writer) const
                     writer.writeAttribute(QStringLiteral("vertical"), QStringLiteral("justify"));
                     break;
                 case Format::AlignVDistributed:
-                    writer.writeAttribute(QStringLiteral("vertical"), QStringLiteral("distributed"));
+                    writer.writeAttribute(QStringLiteral("vertical"),
+                                          QStringLiteral("distributed"));
                     break;
                 default:
                     break;
@@ -695,12 +705,13 @@ void Styles::writeCellXfs(QXmlStreamWriter &writer) const
             if (format.hasProperty(FormatPrivate::P_Alignment_ShinkToFit) && format.shrinkToFit())
                 writer.writeAttribute(QStringLiteral("shrinkToFit"), QStringLiteral("1"));
             if (format.hasProperty(FormatPrivate::P_Alignment_Rotation))
-                writer.writeAttribute(QStringLiteral("textRotation"), QString::number(format.rotation()));
+                writer.writeAttribute(QStringLiteral("textRotation"),
+                                      QString::number(format.rotation()));
         }
 
-        writer.writeEndElement();//xf
+        writer.writeEndElement(); // xf
     }
-    writer.writeEndElement();//cellXfs
+    writer.writeEndElement(); // cellXfs
 }
 
 void Styles::writeDxfs(QXmlStreamWriter &writer) const
@@ -709,7 +720,7 @@ void Styles::writeDxfs(QXmlStreamWriter &writer) const
     writer.writeAttribute(QStringLiteral("count"), QString::number(m_dxf_formatsList.size()));
     for (const Format &format : m_dxf_formatsList)
         writeDxf(writer, format);
-    writer.writeEndElement(); //dxfs
+    writer.writeEndElement(); // dxfs
 }
 
 void Styles::writeDxf(QXmlStreamWriter &writer, const Format &format) const
@@ -721,7 +732,8 @@ void Styles::writeDxf(QXmlStreamWriter &writer, const Format &format) const
 
     if (format.hasNumFmtData()) {
         writer.writeEmptyElement(QStringLiteral("numFmt"));
-        writer.writeAttribute(QStringLiteral("numFmtId"), QString::number(format.numberFormatIndex()));
+        writer.writeAttribute(QStringLiteral("numFmtId"),
+                              QString::number(format.numberFormatIndex()));
         writer.writeAttribute(QStringLiteral("formatCode"), format.numberFormat());
     }
 
@@ -731,12 +743,12 @@ void Styles::writeDxf(QXmlStreamWriter &writer, const Format &format) const
     if (format.hasBorderData())
         writeBorder(writer, format, true);
 
-    writer.writeEndElement();//dxf
+    writer.writeEndElement(); // dxf
 }
 
 void Styles::writeColors(QXmlStreamWriter &writer) const
 {
-    if (m_isIndexedColorsDefault) //Don't output the default indexdeColors
+    if (m_isIndexedColorsDefault) // Don't output the default indexdeColors
         return;
 
     writer.writeStartElement(QStringLiteral("colors"));
@@ -747,27 +759,27 @@ void Styles::writeColors(QXmlStreamWriter &writer) const
         writer.writeAttribute(QStringLiteral("rgb"), XlsxColor::toARGBString(color));
     }
 
-    writer.writeEndElement();//indexedColors
+    writer.writeEndElement(); // indexedColors
 
-    writer.writeEndElement();//colors
+    writer.writeEndElement(); // colors
 }
 
 bool Styles::readNumFmts(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("numFmts"));
-    const auto& attributes = reader.attributes();
-    const auto hasCount = attributes.hasAttribute(QLatin1String("count"));
-    const auto count = hasCount ? attributes.value(QLatin1String("count")).toInt() : -1;
+    const auto &attributes = reader.attributes();
+    const auto hasCount    = attributes.hasAttribute(QLatin1String("count"));
+    const auto count       = hasCount ? attributes.value(QLatin1String("count")).toInt() : -1;
 
-    //Read utill we find the numFmts end tag or ....
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement
-           && reader.name() == QLatin1String("numFmts"))) {
+    // Read utill we find the numFmts end tag or ....
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("numFmts"))) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("numFmt")) {
-                const auto& attributes = reader.attributes();
-                QSharedPointer<XlsxFormatNumberData> fmt (new XlsxFormatNumberData);
-                fmt->formatIndex = attributes.value(QLatin1String("numFmtId")).toInt();
+                const auto &attributes = reader.attributes();
+                QSharedPointer<XlsxFormatNumberData> fmt(new XlsxFormatNumberData);
+                fmt->formatIndex  = attributes.value(QLatin1String("numFmtId")).toInt();
                 fmt->formatString = attributes.value(QLatin1String("formatCode")).toString();
                 if (fmt->formatIndex >= m_nextCustomNumFmtId)
                     m_nextCustomNumFmtId = fmt->formatIndex + 1;
@@ -778,7 +790,7 @@ bool Styles::readNumFmts(QXmlStreamReader &reader)
     }
 
     if (reader.hasError())
-        qWarning()<<reader.errorString();
+        qWarning() << reader.errorString();
 
     if (hasCount && (count != m_customNumFmtIdMap.size()))
         qWarning("error read custom numFmts");
@@ -789,11 +801,11 @@ bool Styles::readNumFmts(QXmlStreamReader &reader)
 bool Styles::readFonts(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("fonts"));
-    const auto& attributes = reader.attributes();
-    const auto hasCount = attributes.hasAttribute(QLatin1String("count"));
-    const auto count = hasCount ? attributes.value(QLatin1String("count")).toInt() : -1;
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement
-                               && reader.name() == QLatin1String("fonts"))) {
+    const auto &attributes = reader.attributes();
+    const auto hasCount    = attributes.hasAttribute(QLatin1String("count"));
+    const auto count       = hasCount ? attributes.value(QLatin1String("count")).toInt() : -1;
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("fonts"))) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("font")) {
@@ -802,12 +814,12 @@ bool Styles::readFonts(QXmlStreamReader &reader)
                 m_fontsList.append(format);
                 m_fontsHash.insert(format.fontKey(), format);
                 if (format.isValid())
-                    format.setFontIndex(m_fontsList.size()-1);
+                    format.setFontIndex(m_fontsList.size() - 1);
             }
         }
     }
     if (reader.hasError())
-        qWarning()<<reader.errorString();
+        qWarning() << reader.errorString();
 
     if (hasCount && (count != m_fontsList.size()))
         qWarning("error read fonts");
@@ -817,17 +829,19 @@ bool Styles::readFonts(QXmlStreamReader &reader)
 bool Styles::readFont(QXmlStreamReader &reader, Format &format)
 {
     Q_ASSERT(reader.name() == QLatin1String("font"));
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement
-                               && reader.name() == QLatin1String("font"))) {
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("font"))) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
-            const auto& attributes = reader.attributes();
+            const auto &attributes = reader.attributes();
             if (reader.name() == QLatin1String("name")) {
                 format.setFontName(attributes.value(QLatin1String("val")).toString());
             } else if (reader.name() == QLatin1String("charset")) {
-                format.setProperty(FormatPrivate::P_Font_Charset, attributes.value(QLatin1String("val")).toInt());
+                format.setProperty(FormatPrivate::P_Font_Charset,
+                                   attributes.value(QLatin1String("val")).toInt());
             } else if (reader.name() == QLatin1String("family")) {
-                format.setProperty(FormatPrivate::P_Font_Family, attributes.value(QLatin1String("val")).toInt());
+                format.setProperty(FormatPrivate::P_Font_Family,
+                                   attributes.value(QLatin1String("val")).toInt());
             } else if (reader.name() == QLatin1String("b")) {
                 format.setFontBold(true);
             } else if (reader.name() == QLatin1String("i")) {
@@ -839,9 +853,11 @@ bool Styles::readFont(QXmlStreamReader &reader, Format &format)
             } else if (reader.name() == QLatin1String("shadow")) {
                 format.setProperty(FormatPrivate::P_Font_Shadow, true);
             } else if (reader.name() == QLatin1String("condense")) {
-                format.setProperty(FormatPrivate::P_Font_Condense, attributes.value(QLatin1String("val")).toInt());
+                format.setProperty(FormatPrivate::P_Font_Condense,
+                                   attributes.value(QLatin1String("val")).toInt());
             } else if (reader.name() == QLatin1String("extend")) {
-                format.setProperty(FormatPrivate::P_Font_Extend, attributes.value(QLatin1String("val")).toInt());
+                format.setProperty(FormatPrivate::P_Font_Extend,
+                                   attributes.value(QLatin1String("val")).toInt());
             } else if (reader.name() == QLatin1String("color")) {
                 XlsxColor color;
                 color.loadFromXml(reader);
@@ -866,7 +882,8 @@ bool Styles::readFont(QXmlStreamReader &reader, Format &format)
                 else if (value == QLatin1String("subscript"))
                     format.setFontScript(Format::FontScriptSub);
             } else if (reader.name() == QLatin1String("scheme")) {
-                format.setProperty(FormatPrivate::P_Font_Scheme, attributes.value(QLatin1String("val")).toString());
+                format.setProperty(FormatPrivate::P_Font_Scheme,
+                                   attributes.value(QLatin1String("val")).toString());
             }
         }
     }
@@ -877,11 +894,11 @@ bool Styles::readFills(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("fills"));
 
-    const auto& attributes = reader.attributes();
-    const auto hasCount = attributes.hasAttribute(QLatin1String("count"));
-    const auto count = hasCount ? attributes.value(QLatin1String("count")).toInt() : -1;
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement
-                               && reader.name() == QLatin1String("fills"))) {
+    const auto &attributes = reader.attributes();
+    const auto hasCount    = attributes.hasAttribute(QLatin1String("count"));
+    const auto count       = hasCount ? attributes.value(QLatin1String("count")).toInt() : -1;
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("fills"))) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("fill")) {
@@ -890,12 +907,12 @@ bool Styles::readFills(QXmlStreamReader &reader)
                 m_fillsList.append(fill);
                 m_fillsHash.insert(fill.fillKey(), fill);
                 if (fill.isValid())
-                    fill.setFillIndex(m_fillsList.size()-1);
+                    fill.setFillIndex(m_fillsList.size() - 1);
             }
         }
     }
     if (reader.hasError())
-        qWarning()<<reader.errorString();
+        qWarning() << reader.errorString();
 
     if (hasCount && (count != m_fillsList.size()))
         qWarning("error read fills");
@@ -925,26 +942,29 @@ bool Styles::readFill(QXmlStreamReader &reader, Format &fill)
         {QStringLiteral("lightTrellis"), Format::PatternLightTrellis},
         {QStringLiteral("gray125"), Format::PatternGray125},
         {QStringLiteral("gray0625"), Format::PatternGray0625},
-        {QStringLiteral("lightGrid"), Format::PatternLightGrid}
-    };
+        {QStringLiteral("lightGrid"), Format::PatternLightGrid}};
 
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement && reader.name() == QLatin1String("fill"))) {
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("fill"))) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("patternFill")) {
-                const auto& attributes = reader.attributes();
+                const auto &attributes = reader.attributes();
                 if (attributes.hasAttribute(QLatin1String("patternType"))) {
-                    const auto& it = patternValues.constFind(attributes.value(QLatin1String("patternType")).toString());
-                    fill.setFillPattern(it != patternValues.constEnd() ? it.value() : Format::PatternNone);
-
-                    //parse foreground and background colors if they exist
-                    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement && reader.name() == QLatin1String("patternFill"))) {
+                    const auto &it = patternValues.constFind(
+                        attributes.value(QLatin1String("patternType")).toString());
+                    fill.setFillPattern(it != patternValues.constEnd() ? it.value()
+                                                                       : Format::PatternNone);
+
+                    // parse foreground and background colors if they exist
+                    while (!reader.atEnd() &&
+                           !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                             reader.name() == QLatin1String("patternFill"))) {
                         reader.readNextStartElement();
                         if (reader.tokenType() == QXmlStreamReader::StartElement) {
                             if (reader.name() == QLatin1String("fgColor")) {
                                 XlsxColor c;
-                                if ( c.loadFromXml(reader) )
-                                {
+                                if (c.loadFromXml(reader)) {
                                     if (fill.fillPattern() == Format::PatternSolid)
                                         fill.setProperty(FormatPrivate::P_Fill_BgColor, c);
                                     else
@@ -952,8 +972,7 @@ bool Styles::readFill(QXmlStreamReader &reader, Format &fill)
                                 }
                             } else if (reader.name() == QLatin1String("bgColor")) {
                                 XlsxColor c;
-                                if ( c.loadFromXml(reader) )
-                                {
+                                if (c.loadFromXml(reader)) {
                                     if (fill.fillPattern() == Format::PatternSolid)
                                         fill.setProperty(FormatPrivate::P_Fill_FgColor, c);
                                     else
@@ -974,11 +993,11 @@ bool Styles::readBorders(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("borders"));
 
-    const auto& attributes = reader.attributes();
-    const auto hasCount = attributes.hasAttribute(QLatin1String("count"));
-    const auto count = hasCount ? attributes.value(QLatin1String("count")).toInt() : -1;
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement
-                               && reader.name() == QLatin1String("borders"))) {
+    const auto &attributes = reader.attributes();
+    const auto hasCount    = attributes.hasAttribute(QLatin1String("count"));
+    const auto count       = hasCount ? attributes.value(QLatin1String("count")).toInt() : -1;
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("borders"))) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("border")) {
@@ -987,13 +1006,13 @@ bool Styles::readBorders(QXmlStreamReader &reader)
                 m_bordersList.append(border);
                 m_bordersHash.insert(border.borderKey(), border);
                 if (border.isValid())
-                    border.setBorderIndex(m_bordersList.size()-1);
+                    border.setBorderIndex(m_bordersList.size() - 1);
             }
         }
     }
 
     if (reader.hasError())
-        qWarning()<<reader.errorString();
+        qWarning() << reader.errorString();
 
     if (hasCount && (count != m_bordersList.size()))
         qWarning("error read borders");
@@ -1005,9 +1024,9 @@ bool Styles::readBorder(QXmlStreamReader &reader, Format &border)
 {
     Q_ASSERT(reader.name() == QLatin1String("border"));
 
-    const auto& attributes = reader.attributes();
-    const auto isUp = attributes.hasAttribute(QLatin1String("diagonalUp"));
-    const auto isDown = attributes.hasAttribute(QLatin1String("diagonalDown"));
+    const auto &attributes = reader.attributes();
+    const auto isUp        = attributes.hasAttribute(QLatin1String("diagonalUp"));
+    const auto isDown      = attributes.hasAttribute(QLatin1String("diagonalDown"));
     if (isUp && isDown)
         border.setDiagonalBorderType(Format::DiagnoalBorderBoth);
     else if (isUp)
@@ -1015,12 +1034,13 @@ bool Styles::readBorder(QXmlStreamReader &reader, Format &border)
     else if (isDown)
         border.setDiagonalBorderType(Format::DiagonalBorderDown);
 
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement && reader.name() == QLatin1String("border"))) {
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("border"))) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
-            if (reader.name() == QLatin1String("left") || reader.name() == QLatin1String("right")
-                    || reader.name() == QLatin1String("top") || reader.name() == QLatin1String("bottom")
-                    || reader.name() == QLatin1String("diagonal") ) {
+            if (reader.name() == QLatin1String("left") || reader.name() == QLatin1String("right") ||
+                reader.name() == QLatin1String("top") || reader.name() == QLatin1String("bottom") ||
+                reader.name() == QLatin1String("diagonal")) {
                 Format::BorderStyle style(Format::BorderNone);
                 XlsxColor color;
                 readSubBorder(reader, reader.name().toString(), style, color);
@@ -1049,7 +1069,8 @@ bool Styles::readBorder(QXmlStreamReader &reader, Format &border)
             }
         }
 
-        if (reader.tokenType() == QXmlStreamReader::EndElement && reader.name() == QLatin1String("border"))
+        if (reader.tokenType() == QXmlStreamReader::EndElement &&
+            reader.name() == QLatin1String("border"))
             break;
     }
 
@@ -1062,7 +1083,10 @@ bool Styles::readCellStyleXfs(QXmlStreamReader &reader)
     return true;
 }
 
-bool Styles::readSubBorder(QXmlStreamReader &reader, const QString &name, Format::BorderStyle &style, XlsxColor &color)
+bool Styles::readSubBorder(QXmlStreamReader &reader,
+                           const QString &name,
+                           Format::BorderStyle &style,
+                           XlsxColor &color)
 {
     Q_ASSERT(reader.name() == name);
 
@@ -1080,17 +1104,17 @@ bool Styles::readSubBorder(QXmlStreamReader &reader, const QString &name, Format
         {QStringLiteral("mediumDashDot"), Format::BorderMediumDashDot},
         {QStringLiteral("dashDotDot"), Format::BorderDashDotDot},
         {QStringLiteral("mediumDashDotDot"), Format::BorderMediumDashDotDot},
-        {QStringLiteral("slantDashDot"), Format::BorderSlantDashDot}
-    };
+        {QStringLiteral("slantDashDot"), Format::BorderSlantDashDot}};
 
-    const auto& attributes = reader.attributes();
+    const auto &attributes = reader.attributes();
     if (attributes.hasAttribute(QLatin1String("style"))) {
         QString styleString = attributes.value(QLatin1String("style")).toString();
-        const auto& it = stylesStringsMap.constFind(styleString);
+        const auto &it      = stylesStringsMap.constFind(styleString);
         if (it != stylesStringsMap.constEnd()) {
-            //get style
+            // get style
             style = it.value();
-            while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement && reader.name() == name)) {
+            while (!reader.atEnd() &&
+                   !(reader.tokenType() == QXmlStreamReader::EndElement && reader.name() == name)) {
                 reader.readNextStartElement();
                 if (reader.tokenType() == QXmlStreamReader::StartElement) {
                     if (reader.name() == QLatin1String("color"))
@@ -1106,17 +1130,17 @@ bool Styles::readSubBorder(QXmlStreamReader &reader, const QString &name, Format
 bool Styles::readCellXfs(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("cellXfs"));
-    const auto& attributes = reader.attributes();
-    const auto hasCount = attributes.hasAttribute(QLatin1String("count"));
-    const auto count = hasCount ? attributes.value(QLatin1String("count")).toInt() : -1;
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement
-                                && reader.name() == QLatin1String("cellXfs"))) {
+    const auto &attributes = reader.attributes();
+    const auto hasCount    = attributes.hasAttribute(QLatin1String("count"));
+    const auto count       = hasCount ? attributes.value(QLatin1String("count")).toInt() : -1;
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("cellXfs"))) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("xf")) {
 
                 Format format;
-                const auto& xfAttrs = reader.attributes();
+                const auto &xfAttrs = reader.attributes();
 
                 //        qDebug()<<reader.name()<<reader.tokenString()<<" .........";
                 //        for (int i=0; i<xfAttrs.size(); ++i)
@@ -1124,9 +1148,10 @@ bool Styles::readCellXfs(QXmlStreamReader &reader)
 
                 if (xfAttrs.hasAttribute(QLatin1String("numFmtId"))) {
                     const auto numFmtIndex = xfAttrs.value(QLatin1String("numFmtId")).toInt();
-                    const auto apply = parseXsdBoolean(xfAttrs.value(QLatin1String("applyNumberFormat")).toString());
-                    if(apply) {
-                        const auto& it = m_customNumFmtIdMap.constFind(numFmtIndex);
+                    const auto apply       = parseXsdBoolean(
+                        xfAttrs.value(QLatin1String("applyNumberFormat")).toString());
+                    if (apply) {
+                        const auto &it = m_customNumFmtIdMap.constFind(numFmtIndex);
                         if (it == m_customNumFmtIdMap.constEnd())
                             format.setNumberFormatIndex(numFmtIndex);
                         else
@@ -1139,10 +1164,13 @@ bool Styles::readCellXfs(QXmlStreamReader &reader)
                     if (fontIndex >= m_fontsList.size()) {
                         qDebug("Error read styles.xml, cellXfs fontId");
                     } else {
-                        const auto apply = parseXsdBoolean(xfAttrs.value(QLatin1String("applyFont")).toString());
-                        if(apply) {
+                        const auto apply =
+                            parseXsdBoolean(xfAttrs.value(QLatin1String("applyFont")).toString());
+                        if (apply) {
                             Format fontFormat = m_fontsList[fontIndex];
-                            for (int i=FormatPrivate::P_Font_STARTID; i<FormatPrivate::P_Font_ENDID; ++i) {
+                            for (int i = FormatPrivate::P_Font_STARTID;
+                                 i < FormatPrivate::P_Font_ENDID;
+                                 ++i) {
                                 if (fontFormat.hasProperty(i))
                                     format.setProperty(i, fontFormat.property(i));
                             }
@@ -1160,18 +1188,19 @@ bool Styles::readCellXfs(QXmlStreamReader &reader)
                         // NOTE: MIcrosoft Excel does not have 'applyFill' tag.
                         //
 
-                        // bool apply = parseXsdBoolean(xfAttrs.value(QLatin1String("applyFill")).toString());
-                        // if (apply)
+                        // bool apply =
+                        // parseXsdBoolean(xfAttrs.value(QLatin1String("applyFill")).toString()); if
+                        // (apply)
 
                         {
                             Format fillFormat = m_fillsList[id];
-                            for (int i=FormatPrivate::P_Fill_STARTID; i<FormatPrivate::P_Fill_ENDID; ++i)
-                            {
+                            for (int i = FormatPrivate::P_Fill_STARTID;
+                                 i < FormatPrivate::P_Fill_ENDID;
+                                 ++i) {
                                 if (fillFormat.hasProperty(i))
                                     format.setProperty(i, fillFormat.property(i));
                             }
                         }
-
                     }
                 }
 
@@ -1180,10 +1209,13 @@ bool Styles::readCellXfs(QXmlStreamReader &reader)
                     if (id >= m_bordersList.size()) {
                         qDebug("Error read styles.xml, cellXfs borderId");
                     } else {
-                        const auto apply = parseXsdBoolean(xfAttrs.value(QLatin1String("applyBorder")).toString());
-                        if(apply) {
+                        const auto apply =
+                            parseXsdBoolean(xfAttrs.value(QLatin1String("applyBorder")).toString());
+                        if (apply) {
                             Format borderFormat = m_bordersList[id];
-                            for (int i=FormatPrivate::P_Border_STARTID; i<FormatPrivate::P_Border_ENDID; ++i) {
+                            for (int i = FormatPrivate::P_Border_STARTID;
+                                 i < FormatPrivate::P_Border_ENDID;
+                                 ++i) {
                                 if (borderFormat.hasProperty(i))
                                     format.setProperty(i, borderFormat.property(i));
                             }
@@ -1191,23 +1223,24 @@ bool Styles::readCellXfs(QXmlStreamReader &reader)
                     }
                 }
 
-                const auto apply = parseXsdBoolean(xfAttrs.value(QLatin1String("applyAlignment")).toString());
-                if(apply) {
+                const auto apply =
+                    parseXsdBoolean(xfAttrs.value(QLatin1String("applyAlignment")).toString());
+                if (apply) {
                     reader.readNextStartElement();
                     if (reader.name() == QLatin1String("alignment")) {
-                        const auto& alignAttrs = reader.attributes();
+                        const auto &alignAttrs = reader.attributes();
 
                         if (alignAttrs.hasAttribute(QLatin1String("horizontal"))) {
-                            static const QMap<QString, Format::HorizontalAlignment> alignStringMap = {
-                                {QStringLiteral("left"), Format::AlignLeft},
-                                {QStringLiteral("center"), Format::AlignHCenter},
-                                {QStringLiteral("right"), Format::AlignRight},
-                                {QStringLiteral("justify"), Format::AlignHJustify},
-                                {QStringLiteral("centerContinuous"), Format::AlignHMerge},
-                                {QStringLiteral("distributed"), Format::AlignHDistributed}
-                            };
-
-                            const auto& it = alignStringMap.constFind(alignAttrs.value(QLatin1String("horizontal")).toString());
+                            static const QMap<QString, Format::HorizontalAlignment> alignStringMap =
+                                {{QStringLiteral("left"), Format::AlignLeft},
+                                 {QStringLiteral("center"), Format::AlignHCenter},
+                                 {QStringLiteral("right"), Format::AlignRight},
+                                 {QStringLiteral("justify"), Format::AlignHJustify},
+                                 {QStringLiteral("centerContinuous"), Format::AlignHMerge},
+                                 {QStringLiteral("distributed"), Format::AlignHDistributed}};
+
+                            const auto &it = alignStringMap.constFind(
+                                alignAttrs.value(QLatin1String("horizontal")).toString());
                             if (it != alignStringMap.constEnd())
                                 format.setHorizontalAlignment(it.value());
                         }
@@ -1217,10 +1250,10 @@ bool Styles::readCellXfs(QXmlStreamReader &reader)
                                 {QStringLiteral("top"), Format::AlignTop},
                                 {QStringLiteral("center"), Format::AlignVCenter},
                                 {QStringLiteral("justify"), Format::AlignVJustify},
-                                {QStringLiteral("distributed"), Format::AlignVDistributed}
-                            };
+                                {QStringLiteral("distributed"), Format::AlignVDistributed}};
 
-                            const auto& it = alignStringMap.constFind(alignAttrs.value(QLatin1String("vertical")).toString());
+                            const auto &it = alignStringMap.constFind(
+                                alignAttrs.value(QLatin1String("vertical")).toString());
                             if (it != alignStringMap.constEnd())
                                 format.setVerticalAlignment(it.value());
                         }
@@ -1231,7 +1264,8 @@ bool Styles::readCellXfs(QXmlStreamReader &reader)
                         }
 
                         if (alignAttrs.hasAttribute(QLatin1String("textRotation"))) {
-                            const auto rotation = alignAttrs.value(QLatin1String("textRotation")).toInt();
+                            const auto rotation =
+                                alignAttrs.value(QLatin1String("textRotation")).toInt();
                             format.setRotation(rotation);
                         }
 
@@ -1240,7 +1274,6 @@ bool Styles::readCellXfs(QXmlStreamReader &reader)
 
                         if (alignAttrs.hasAttribute(QLatin1String("shrinkToFit")))
                             format.setShrinkToFit(true);
-
                     }
                 }
 
@@ -1250,7 +1283,7 @@ bool Styles::readCellXfs(QXmlStreamReader &reader)
     }
 
     if (reader.hasError())
-        qWarning()<<reader.errorString();
+        qWarning() << reader.errorString();
 
     if (hasCount && (count != m_xf_formatsList.size()))
         qWarning("error read CellXfs");
@@ -1261,11 +1294,11 @@ bool Styles::readCellXfs(QXmlStreamReader &reader)
 bool Styles::readDxfs(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("dxfs"));
-    const auto& attributes = reader.attributes();
-    const auto hasCount = attributes.hasAttribute(QLatin1String("count"));
-    const auto count = hasCount ? attributes.value(QLatin1String("count")).toInt() : -1;
-    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement
-                                && reader.name() == QLatin1String("dxfs"))) {
+    const auto &attributes = reader.attributes();
+    const auto hasCount    = attributes.hasAttribute(QLatin1String("count"));
+    const auto count       = hasCount ? attributes.value(QLatin1String("count")).toInt() : -1;
+    while (!reader.atEnd() && !(reader.tokenType() == QXmlStreamReader::EndElement &&
+                                reader.name() == QLatin1String("dxfs"))) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("dxf"))
@@ -1273,7 +1306,7 @@ bool Styles::readDxfs(QXmlStreamReader &reader)
         }
     }
     if (reader.hasError())
-        qWarning()<<reader.errorString();
+        qWarning() << reader.errorString();
 
     if (hasCount && (count != m_dxf_formatsList.size()))
         qWarning("error read dxfs");
@@ -1285,13 +1318,14 @@ bool Styles::readDxf(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("dxf"));
     Format format;
-    while (!reader.atEnd() && !(reader.name() == QLatin1String("dxf") && reader.tokenType() == QXmlStreamReader::EndElement)) {
+    while (!reader.atEnd() && !(reader.name() == QLatin1String("dxf") &&
+                                reader.tokenType() == QXmlStreamReader::EndElement)) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("numFmt")) {
-                const auto& attributes = reader.attributes();
-                const auto id = attributes.value(QLatin1String("numFmtId")).toInt();
-                QString code = attributes.value(QLatin1String("formatCode")).toString();
+                const auto &attributes = reader.attributes();
+                const auto id          = attributes.value(QLatin1String("numFmtId")).toInt();
+                QString code           = attributes.value(QLatin1String("formatCode")).toString();
                 format.setNumberFormat(id, code);
             } else if (reader.name() == QLatin1String("font")) {
                 readFont(reader, format);
@@ -1309,13 +1343,13 @@ bool Styles::readDxf(QXmlStreamReader &reader)
 bool Styles::readColors(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("colors"));
-    while (!reader.atEnd() && !(reader.name() == QLatin1String("colors") && reader.tokenType() == QXmlStreamReader::EndElement)) {
+    while (!reader.atEnd() && !(reader.name() == QLatin1String("colors") &&
+                                reader.tokenType() == QXmlStreamReader::EndElement)) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("indexedColors")) {
                 readIndexedColors(reader);
             } else if (reader.name() == QLatin1String("mruColors")) {
-
             }
         }
     }
@@ -1326,11 +1360,12 @@ bool Styles::readIndexedColors(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("indexedColors"));
     m_indexedColors.clear();
-    while (!reader.atEnd() && !(reader.name() == QLatin1String("indexedColors") && reader.tokenType() == QXmlStreamReader::EndElement)) {
+    while (!reader.atEnd() && !(reader.name() == QLatin1String("indexedColors") &&
+                                reader.tokenType() == QXmlStreamReader::EndElement)) {
         reader.readNextStartElement();
         if (reader.tokenType() == QXmlStreamReader::StartElement) {
             if (reader.name() == QLatin1String("rgbColor")) {
-                const auto& color = reader.attributes().value(QLatin1String("rgb")).toString();
+                const auto &color = reader.attributes().value(QLatin1String("rgb")).toString();
                 m_indexedColors.append(XlsxColor::fromARGBString(color));
             }
         }
@@ -1372,7 +1407,7 @@ bool Styles::loadFromXmlFile(QIODevice *device)
         }
 
         if (reader.hasError()) {
-            qDebug()<<"Error when read style file: "<<reader.errorString();
+            qDebug() << "Error when read style file: " << reader.errorString();
         }
     }
     return true;
@@ -1382,22 +1417,38 @@ QColor Styles::getColorByIndex(int idx)
 {
     if (m_indexedColors.isEmpty()) {
         m_indexedColors = {
-            QColor(QRgba64::fromArgb32(0x000000)), QColor(QRgba64::fromArgb32(0xFFFFFF)), QColor(QRgba64::fromArgb32(0xFF0000)), QColor(QRgba64::fromArgb32(0x00FF00)),
-            QColor(QRgba64::fromArgb32(0x0000FF)), QColor(QRgba64::fromArgb32(0xFFFF00)), QColor(QRgba64::fromArgb32(0xFF00FF)), QColor(QRgba64::fromArgb32(0x00FFFF)),
-            QColor(QRgba64::fromArgb32(0x000000)), QColor(QRgba64::fromArgb32(0xFFFFFF)), QColor(QRgba64::fromArgb32(0xFF0000)), QColor(QRgba64::fromArgb32(0x00FF00)),
-            QColor(QRgba64::fromArgb32(0x0000FF)), QColor(QRgba64::fromArgb32(0xFFFF00)), QColor(QRgba64::fromArgb32(0xFF00FF)), QColor(QRgba64::fromArgb32(0x00FFFF)),
-            QColor(QRgba64::fromArgb32(0x800000)), QColor(QRgba64::fromArgb32(0x008000)), QColor(QRgba64::fromArgb32(0x000080)), QColor(QRgba64::fromArgb32(0x808000)),
-            QColor(QRgba64::fromArgb32(0x800080)), QColor(QRgba64::fromArgb32(0x008080)), QColor(QRgba64::fromArgb32(0xC0C0C0)), QColor(QRgba64::fromArgb32(0x808080)),
-            QColor(QRgba64::fromArgb32(0x9999FF)), QColor(QRgba64::fromArgb32(0x993366)), QColor(QRgba64::fromArgb32(0xFFFFCC)), QColor(QRgba64::fromArgb32(0xCCFFFF)),
-            QColor(QRgba64::fromArgb32(0x660066)), QColor(QRgba64::fromArgb32(0xFF8080)), QColor(QRgba64::fromArgb32(0x0066CC)), QColor(QRgba64::fromArgb32(0xCCCCFF)),
-            QColor(QRgba64::fromArgb32(0x000080)), QColor(QRgba64::fromArgb32(0xFF00FF)), QColor(QRgba64::fromArgb32(0xFFFF00)), QColor(QRgba64::fromArgb32(0x00FFFF)),
-            QColor(QRgba64::fromArgb32(0x800080)), QColor(QRgba64::fromArgb32(0x800000)), QColor(QRgba64::fromArgb32(0x008080)), QColor(QRgba64::fromArgb32(0x0000FF)),
-            QColor(QRgba64::fromArgb32(0x00CCFF)), QColor(QRgba64::fromArgb32(0xCCFFFF)), QColor(QRgba64::fromArgb32(0xCCFFCC)), QColor(QRgba64::fromArgb32(0xFFFF99)),
-            QColor(QRgba64::fromArgb32(0x99CCFF)), QColor(QRgba64::fromArgb32(0xFF99CC)), QColor(QRgba64::fromArgb32(0xCC99FF)), QColor(QRgba64::fromArgb32(0xFFCC99)),
-            QColor(QRgba64::fromArgb32(0x3366FF)), QColor(QRgba64::fromArgb32(0x33CCCC)), QColor(QRgba64::fromArgb32(0x99CC00)), QColor(QRgba64::fromArgb32(0xFFCC00)),
-            QColor(QRgba64::fromArgb32(0xFF9900)), QColor(QRgba64::fromArgb32(0xFF6600)), QColor(QRgba64::fromArgb32(0x666699)), QColor(QRgba64::fromArgb32(0x969696)),
-            QColor(QRgba64::fromArgb32(0x003366)), QColor(QRgba64::fromArgb32(0x339966)), QColor(QRgba64::fromArgb32(0x003300)), QColor(QRgba64::fromArgb32(0x333300)),
-            QColor(QRgba64::fromArgb32(0x993300)), QColor(QRgba64::fromArgb32(0x993366)), QColor(QRgba64::fromArgb32(0x333399)), QColor(QRgba64::fromArgb32(0x333333)),
+            QColor(QRgba64::fromArgb32(0x000000)), QColor(QRgba64::fromArgb32(0xFFFFFF)),
+            QColor(QRgba64::fromArgb32(0xFF0000)), QColor(QRgba64::fromArgb32(0x00FF00)),
+            QColor(QRgba64::fromArgb32(0x0000FF)), QColor(QRgba64::fromArgb32(0xFFFF00)),
+            QColor(QRgba64::fromArgb32(0xFF00FF)), QColor(QRgba64::fromArgb32(0x00FFFF)),
+            QColor(QRgba64::fromArgb32(0x000000)), QColor(QRgba64::fromArgb32(0xFFFFFF)),
+            QColor(QRgba64::fromArgb32(0xFF0000)), QColor(QRgba64::fromArgb32(0x00FF00)),
+            QColor(QRgba64::fromArgb32(0x0000FF)), QColor(QRgba64::fromArgb32(0xFFFF00)),
+            QColor(QRgba64::fromArgb32(0xFF00FF)), QColor(QRgba64::fromArgb32(0x00FFFF)),
+            QColor(QRgba64::fromArgb32(0x800000)), QColor(QRgba64::fromArgb32(0x008000)),
+            QColor(QRgba64::fromArgb32(0x000080)), QColor(QRgba64::fromArgb32(0x808000)),
+            QColor(QRgba64::fromArgb32(0x800080)), QColor(QRgba64::fromArgb32(0x008080)),
+            QColor(QRgba64::fromArgb32(0xC0C0C0)), QColor(QRgba64::fromArgb32(0x808080)),
+            QColor(QRgba64::fromArgb32(0x9999FF)), QColor(QRgba64::fromArgb32(0x993366)),
+            QColor(QRgba64::fromArgb32(0xFFFFCC)), QColor(QRgba64::fromArgb32(0xCCFFFF)),
+            QColor(QRgba64::fromArgb32(0x660066)), QColor(QRgba64::fromArgb32(0xFF8080)),
+            QColor(QRgba64::fromArgb32(0x0066CC)), QColor(QRgba64::fromArgb32(0xCCCCFF)),
+            QColor(QRgba64::fromArgb32(0x000080)), QColor(QRgba64::fromArgb32(0xFF00FF)),
+            QColor(QRgba64::fromArgb32(0xFFFF00)), QColor(QRgba64::fromArgb32(0x00FFFF)),
+            QColor(QRgba64::fromArgb32(0x800080)), QColor(QRgba64::fromArgb32(0x800000)),
+            QColor(QRgba64::fromArgb32(0x008080)), QColor(QRgba64::fromArgb32(0x0000FF)),
+            QColor(QRgba64::fromArgb32(0x00CCFF)), QColor(QRgba64::fromArgb32(0xCCFFFF)),
+            QColor(QRgba64::fromArgb32(0xCCFFCC)), QColor(QRgba64::fromArgb32(0xFFFF99)),
+            QColor(QRgba64::fromArgb32(0x99CCFF)), QColor(QRgba64::fromArgb32(0xFF99CC)),
+            QColor(QRgba64::fromArgb32(0xCC99FF)), QColor(QRgba64::fromArgb32(0xFFCC99)),
+            QColor(QRgba64::fromArgb32(0x3366FF)), QColor(QRgba64::fromArgb32(0x33CCCC)),
+            QColor(QRgba64::fromArgb32(0x99CC00)), QColor(QRgba64::fromArgb32(0xFFCC00)),
+            QColor(QRgba64::fromArgb32(0xFF9900)), QColor(QRgba64::fromArgb32(0xFF6600)),
+            QColor(QRgba64::fromArgb32(0x666699)), QColor(QRgba64::fromArgb32(0x969696)),
+            QColor(QRgba64::fromArgb32(0x003366)), QColor(QRgba64::fromArgb32(0x339966)),
+            QColor(QRgba64::fromArgb32(0x003300)), QColor(QRgba64::fromArgb32(0x333300)),
+            QColor(QRgba64::fromArgb32(0x993300)), QColor(QRgba64::fromArgb32(0x993366)),
+            QColor(QRgba64::fromArgb32(0x333399)), QColor(QRgba64::fromArgb32(0x333333)),
         };
         m_isIndexedColorsDefault = true;
     }
diff --git a/QXlsx/source/xlsxtheme.cpp b/QXlsx/source/xlsxtheme.cpp
index 87f93640..b69b7fee 100644
--- a/QXlsx/source/xlsxtheme.cpp
+++ b/QXlsx/source/xlsxtheme.cpp
@@ -7,181 +7,198 @@
 QT_BEGIN_NAMESPACE_XLSX
 
 const char *defaultXmlData =
-        "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
-        "<a:theme xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" name=\"Office \xe4\xb8\xbb\xe9\xa2\x98\">"
-        "<a:themeElements>"
-        "<a:clrScheme name=\"Office\">"
-        "<a:dk1><a:sysClr val=\"windowText\" lastClr=\"000000\"/></a:dk1>"
-        "<a:lt1><a:sysClr val=\"window\" lastClr=\"FFFFFF\"/></a:lt1>"
-        "<a:dk2><a:srgbClr val=\"1F497D\"/></a:dk2>"
-        "<a:lt2><a:srgbClr val=\"EEECE1\"/></a:lt2>"
-        "<a:accent1><a:srgbClr val=\"4F81BD\"/></a:accent1>"
-        "<a:accent2><a:srgbClr val=\"C0504D\"/></a:accent2>"
-        "<a:accent3><a:srgbClr val=\"9BBB59\"/></a:accent3>"
-        "<a:accent4><a:srgbClr val=\"8064A2\"/></a:accent4>"
-        "<a:accent5><a:srgbClr val=\"4BACC6\"/></a:accent5>"
-        "<a:accent6><a:srgbClr val=\"F79646\"/></a:accent6>"
-        "<a:hlink><a:srgbClr val=\"0000FF\"/></a:hlink>"
-        "<a:folHlink><a:srgbClr val=\"800080\"/></a:folHlink>"
-        "</a:clrScheme>"
-        "<a:fontScheme name=\"Office\">"
-        "<a:majorFont>"
-        "<a:latin typeface=\"Cambria\"/>"
-        "<a:ea typeface=\"\"/>"
-        "<a:cs typeface=\"\"/>"
-        "<a:font script=\"Jpan\" typeface=\"\xef\xbc\xad\xef\xbc\xb3 \xef\xbc\xb0\xe3\x82\xb4\xe3\x82\xb7\xe3\x83\x83\xe3\x82\xaf\"/>"
-        "<a:font script=\"Hang\" typeface=\"\xeb\xa7\x91\xec\x9d\x80 \xea\xb3\xa0\xeb\x94\x95\"/>"
-        "<a:font script=\"Hans\" typeface=\"\xe5\xae\x8b\xe4\xbd\x93\"/>"
-        "<a:font script=\"Hant\" typeface=\"\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94\"/>"
-        "<a:font script=\"Arab\" typeface=\"Times New Roman\"/>"
-        "<a:font script=\"Hebr\" typeface=\"Times New Roman\"/>"
-        "<a:font script=\"Thai\" typeface=\"Tahoma\"/>"
-        "<a:font script=\"Ethi\" typeface=\"Nyala\"/>"
-        "<a:font script=\"Beng\" typeface=\"Vrinda\"/>"
-        "<a:font script=\"Gujr\" typeface=\"Shruti\"/>"
-        "<a:font script=\"Khmr\" typeface=\"MoolBoran\"/>"
-        "<a:font script=\"Knda\" typeface=\"Tunga\"/>"
-        "<a:font script=\"Guru\" typeface=\"Raavi\"/>"
-        "<a:font script=\"Cans\" typeface=\"Euphemia\"/>"
-        "<a:font script=\"Cher\" typeface=\"Plantagenet Cherokee\"/>"
-        "<a:font script=\"Yiii\" typeface=\"Microsoft Yi Baiti\"/>"
-        "<a:font script=\"Tibt\" typeface=\"Microsoft Himalaya\"/>"
-        "<a:font script=\"Thaa\" typeface=\"MV Boli\"/>"
-        "<a:font script=\"Deva\" typeface=\"Mangal\"/>"
-        "<a:font script=\"Telu\" typeface=\"Gautami\"/>"
-        "<a:font script=\"Taml\" typeface=\"Latha\"/>"
-        "<a:font script=\"Syrc\" typeface=\"Estrangelo Edessa\"/>"
-        "<a:font script=\"Orya\" typeface=\"Kalinga\"/>"
-        "<a:font script=\"Mlym\" typeface=\"Kartika\"/>"
-        "<a:font script=\"Laoo\" typeface=\"DokChampa\"/>"
-        "<a:font script=\"Sinh\" typeface=\"Iskoola Pota\"/>"
-        "<a:font script=\"Mong\" typeface=\"Mongolian Baiti\"/>"
-        "<a:font script=\"Viet\" typeface=\"Times New Roman\"/>"
-        "<a:font script=\"Uigh\" typeface=\"Microsoft Uighur\"/>"
-        "</a:majorFont>"
-        "<a:minorFont>"
-        "<a:latin typeface=\"Calibri\"/>"
-        "<a:ea typeface=\"\"/>"
-        "<a:cs typeface=\"\"/>"
-        "<a:font script=\"Jpan\" typeface=\"\xef\xbc\xad\xef\xbc\xb3 \xef\xbc\xb0\xe3\x82\xb4\xe3\x82\xb7\xe3\x83\x83\xe3\x82\xaf\"/>"
-        "<a:font script=\"Hang\" typeface=\"\xeb\xa7\x91\xec\x9d\x80 \xea\xb3\xa0\xeb\x94\x95\"/>"
-        "<a:font script=\"Hans\" typeface=\"\xe5\xae\x8b\xe4\xbd\x93\"/>"
-        "<a:font script=\"Hant\" typeface=\"\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94\"/>"
-        "<a:font script=\"Arab\" typeface=\"Arial\"/>"
-        "<a:font script=\"Hebr\" typeface=\"Arial\"/>"
-        "<a:font script=\"Thai\" typeface=\"Tahoma\"/>"
-        "<a:font script=\"Ethi\" typeface=\"Nyala\"/>"
-        "<a:font script=\"Beng\" typeface=\"Vrinda\"/>"
-        "<a:font script=\"Gujr\" typeface=\"Shruti\"/>"
-        "<a:font script=\"Khmr\" typeface=\"DaunPenh\"/>"
-        "<a:font script=\"Knda\" typeface=\"Tunga\"/>"
-        "<a:font script=\"Guru\" typeface=\"Raavi\"/>"
-        "<a:font script=\"Cans\" typeface=\"Euphemia\"/>"
-        "<a:font script=\"Cher\" typeface=\"Plantagenet Cherokee\"/>"
-        "<a:font script=\"Yiii\" typeface=\"Microsoft Yi Baiti\"/>"
-        "<a:font script=\"Tibt\" typeface=\"Microsoft Himalaya\"/>"
-        "<a:font script=\"Thaa\" typeface=\"MV Boli\"/>"
-        "<a:font script=\"Deva\" typeface=\"Mangal\"/>"
-        "<a:font script=\"Telu\" typeface=\"Gautami\"/>"
-        "<a:font script=\"Taml\" typeface=\"Latha\"/>"
-        "<a:font script=\"Syrc\" typeface=\"Estrangelo Edessa\"/>"
-        "<a:font script=\"Orya\" typeface=\"Kalinga\"/>"
-        "<a:font script=\"Mlym\" typeface=\"Kartika\"/>"
-        "<a:font script=\"Laoo\" typeface=\"DokChampa\"/>"
-        "<a:font script=\"Sinh\" typeface=\"Iskoola Pota\"/>"
-        "<a:font script=\"Mong\" typeface=\"Mongolian Baiti\"/>"
-        "<a:font script=\"Viet\" typeface=\"Arial\"/>"
-        "<a:font script=\"Uigh\" typeface=\"Microsoft Uighur\"/>"
-        "</a:minorFont>"
-        "</a:fontScheme>"
-        "<a:fmtScheme name=\"Office\">"
-        "<a:fillStyleLst>"
-        "<a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill>"
-        "<a:gradFill rotWithShape=\"1\">"
-        "<a:gsLst>"
-        "<a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:tint val=\"50000\"/><a:satMod val=\"300000\"/></a:schemeClr></a:gs>"
-        "<a:gs pos=\"35000\"><a:schemeClr val=\"phClr\"><a:tint val=\"37000\"/><a:satMod val=\"300000\"/></a:schemeClr></a:gs>"
-        "<a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:tint val=\"15000\"/><a:satMod val=\"350000\"/></a:schemeClr></a:gs>"
-        "</a:gsLst>"
-        "<a:lin ang=\"16200000\" scaled=\"1\"/>"
-        "</a:gradFill>"
-        "<a:gradFill rotWithShape=\"1\">"
-        "<a:gsLst>"
-        "<a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:shade val=\"51000\"/><a:satMod val=\"130000\"/></a:schemeClr></a:gs>"
-        "<a:gs pos=\"80000\"><a:schemeClr val=\"phClr\"><a:shade val=\"93000\"/><a:satMod val=\"130000\"/></a:schemeClr></a:gs>"
-        "<a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:shade val=\"94000\"/><a:satMod val=\"135000\"/></a:schemeClr></a:gs>"
-        "</a:gsLst>"
-        "<a:lin ang=\"16200000\" scaled=\"0\"/>"
-        "</a:gradFill>"
-        "</a:fillStyleLst>"
-        "<a:lnStyleLst>"
-        "<a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\">"
-        "<a:solidFill><a:schemeClr val=\"phClr\"><a:shade val=\"95000\"/><a:satMod val=\"105000\"/></a:schemeClr></a:solidFill>"
-        "<a:prstDash val=\"solid\"/>"
-        "</a:ln>"
-        "<a:ln w=\"25400\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\">"
-        "<a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill>"
-        "<a:prstDash val=\"solid\"/>"
-        "</a:ln>"
-        "<a:ln w=\"38100\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\">"
-        "<a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill>"
-        "<a:prstDash val=\"solid\"/>"
-        "</a:ln>"
-        "</a:lnStyleLst>"
-        "<a:effectStyleLst>"
-        "<a:effectStyle>"
-        "<a:effectLst>"
-        "<a:outerShdw blurRad=\"40000\" dist=\"20000\" dir=\"5400000\" rotWithShape=\"0\">"
-        "<a:srgbClr val=\"000000\"><a:alpha val=\"38000\"/></a:srgbClr>"
-        "</a:outerShdw>"
-        "</a:effectLst>"
-        "</a:effectStyle>"
-        "<a:effectStyle>"
-        "<a:effectLst>"
-        "<a:outerShdw blurRad=\"40000\" dist=\"23000\" dir=\"5400000\" rotWithShape=\"0\">"
-        "<a:srgbClr val=\"000000\"><a:alpha val=\"35000\"/></a:srgbClr>"
-        "</a:outerShdw>"
-        "</a:effectLst>"
-        "</a:effectStyle>"
-        "<a:effectStyle>"
-        "<a:effectLst>"
-        "<a:outerShdw blurRad=\"40000\" dist=\"23000\" dir=\"5400000\" rotWithShape=\"0\">"
-        "<a:srgbClr val=\"000000\"><a:alpha val=\"35000\"/></a:srgbClr>"
-        "</a:outerShdw>"
-        "</a:effectLst>"
-        "<a:scene3d>"
-        "<a:camera prst=\"orthographicFront\"><a:rot lat=\"0\" lon=\"0\" rev=\"0\"/></a:camera>"
-        "<a:lightRig rig=\"threePt\" dir=\"t\"><a:rot lat=\"0\" lon=\"0\" rev=\"1200000\"/></a:lightRig>"
-        "</a:scene3d>"
-        "<a:sp3d><a:bevelT w=\"63500\" h=\"25400\"/></a:sp3d>"
-        "</a:effectStyle>"
-        "</a:effectStyleLst>"
-        "<a:bgFillStyleLst>"
-        "<a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill>"
-        "<a:gradFill rotWithShape=\"1\">"
-        "<a:gsLst>"
-        "<a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:tint val=\"40000\"/><a:satMod val=\"350000\"/></a:schemeClr></a:gs>"
-        "<a:gs pos=\"40000\"><a:schemeClr val=\"phClr\"><a:tint val=\"45000\"/><a:shade val=\"99000\"/><a:satMod val=\"350000\"/></a:schemeClr></a:gs>"
-        "<a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:shade val=\"20000\"/><a:satMod val=\"255000\"/></a:schemeClr></a:gs></a:gsLst>"
-        "<a:path path=\"circle\"><a:fillToRect l=\"50000\" t=\"-80000\" r=\"50000\" b=\"180000\"/></a:path>"
-        "</a:gradFill>"
-        "<a:gradFill rotWithShape=\"1\">"
-        "<a:gsLst>"
-        "<a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:tint val=\"80000\"/><a:satMod val=\"300000\"/></a:schemeClr></a:gs>"
-        "<a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:shade val=\"30000\"/><a:satMod val=\"200000\"/></a:schemeClr></a:gs>"
-        "</a:gsLst>"
-        "<a:path path=\"circle\"><a:fillToRect l=\"50000\" t=\"50000\" r=\"50000\" b=\"50000\"/></a:path>"
-        "</a:gradFill>"
-        "</a:bgFillStyleLst>"
-        "</a:fmtScheme>"
-        "</a:themeElements>"
-        "<a:objectDefaults/>"
-        "<a:extraClrSchemeLst/>"
-        "</a:theme>"
-        ;
+    "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+    "<a:theme xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" name=\"Office "
+    "\xe4\xb8\xbb\xe9\xa2\x98\">"
+    "<a:themeElements>"
+    "<a:clrScheme name=\"Office\">"
+    "<a:dk1><a:sysClr val=\"windowText\" lastClr=\"000000\"/></a:dk1>"
+    "<a:lt1><a:sysClr val=\"window\" lastClr=\"FFFFFF\"/></a:lt1>"
+    "<a:dk2><a:srgbClr val=\"1F497D\"/></a:dk2>"
+    "<a:lt2><a:srgbClr val=\"EEECE1\"/></a:lt2>"
+    "<a:accent1><a:srgbClr val=\"4F81BD\"/></a:accent1>"
+    "<a:accent2><a:srgbClr val=\"C0504D\"/></a:accent2>"
+    "<a:accent3><a:srgbClr val=\"9BBB59\"/></a:accent3>"
+    "<a:accent4><a:srgbClr val=\"8064A2\"/></a:accent4>"
+    "<a:accent5><a:srgbClr val=\"4BACC6\"/></a:accent5>"
+    "<a:accent6><a:srgbClr val=\"F79646\"/></a:accent6>"
+    "<a:hlink><a:srgbClr val=\"0000FF\"/></a:hlink>"
+    "<a:folHlink><a:srgbClr val=\"800080\"/></a:folHlink>"
+    "</a:clrScheme>"
+    "<a:fontScheme name=\"Office\">"
+    "<a:majorFont>"
+    "<a:latin typeface=\"Cambria\"/>"
+    "<a:ea typeface=\"\"/>"
+    "<a:cs typeface=\"\"/>"
+    "<a:font script=\"Jpan\" typeface=\"\xef\xbc\xad\xef\xbc\xb3 "
+    "\xef\xbc\xb0\xe3\x82\xb4\xe3\x82\xb7\xe3\x83\x83\xe3\x82\xaf\"/>"
+    "<a:font script=\"Hang\" typeface=\"\xeb\xa7\x91\xec\x9d\x80 \xea\xb3\xa0\xeb\x94\x95\"/>"
+    "<a:font script=\"Hans\" typeface=\"\xe5\xae\x8b\xe4\xbd\x93\"/>"
+    "<a:font script=\"Hant\" typeface=\"\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94\"/>"
+    "<a:font script=\"Arab\" typeface=\"Times New Roman\"/>"
+    "<a:font script=\"Hebr\" typeface=\"Times New Roman\"/>"
+    "<a:font script=\"Thai\" typeface=\"Tahoma\"/>"
+    "<a:font script=\"Ethi\" typeface=\"Nyala\"/>"
+    "<a:font script=\"Beng\" typeface=\"Vrinda\"/>"
+    "<a:font script=\"Gujr\" typeface=\"Shruti\"/>"
+    "<a:font script=\"Khmr\" typeface=\"MoolBoran\"/>"
+    "<a:font script=\"Knda\" typeface=\"Tunga\"/>"
+    "<a:font script=\"Guru\" typeface=\"Raavi\"/>"
+    "<a:font script=\"Cans\" typeface=\"Euphemia\"/>"
+    "<a:font script=\"Cher\" typeface=\"Plantagenet Cherokee\"/>"
+    "<a:font script=\"Yiii\" typeface=\"Microsoft Yi Baiti\"/>"
+    "<a:font script=\"Tibt\" typeface=\"Microsoft Himalaya\"/>"
+    "<a:font script=\"Thaa\" typeface=\"MV Boli\"/>"
+    "<a:font script=\"Deva\" typeface=\"Mangal\"/>"
+    "<a:font script=\"Telu\" typeface=\"Gautami\"/>"
+    "<a:font script=\"Taml\" typeface=\"Latha\"/>"
+    "<a:font script=\"Syrc\" typeface=\"Estrangelo Edessa\"/>"
+    "<a:font script=\"Orya\" typeface=\"Kalinga\"/>"
+    "<a:font script=\"Mlym\" typeface=\"Kartika\"/>"
+    "<a:font script=\"Laoo\" typeface=\"DokChampa\"/>"
+    "<a:font script=\"Sinh\" typeface=\"Iskoola Pota\"/>"
+    "<a:font script=\"Mong\" typeface=\"Mongolian Baiti\"/>"
+    "<a:font script=\"Viet\" typeface=\"Times New Roman\"/>"
+    "<a:font script=\"Uigh\" typeface=\"Microsoft Uighur\"/>"
+    "</a:majorFont>"
+    "<a:minorFont>"
+    "<a:latin typeface=\"Calibri\"/>"
+    "<a:ea typeface=\"\"/>"
+    "<a:cs typeface=\"\"/>"
+    "<a:font script=\"Jpan\" typeface=\"\xef\xbc\xad\xef\xbc\xb3 "
+    "\xef\xbc\xb0\xe3\x82\xb4\xe3\x82\xb7\xe3\x83\x83\xe3\x82\xaf\"/>"
+    "<a:font script=\"Hang\" typeface=\"\xeb\xa7\x91\xec\x9d\x80 \xea\xb3\xa0\xeb\x94\x95\"/>"
+    "<a:font script=\"Hans\" typeface=\"\xe5\xae\x8b\xe4\xbd\x93\"/>"
+    "<a:font script=\"Hant\" typeface=\"\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94\"/>"
+    "<a:font script=\"Arab\" typeface=\"Arial\"/>"
+    "<a:font script=\"Hebr\" typeface=\"Arial\"/>"
+    "<a:font script=\"Thai\" typeface=\"Tahoma\"/>"
+    "<a:font script=\"Ethi\" typeface=\"Nyala\"/>"
+    "<a:font script=\"Beng\" typeface=\"Vrinda\"/>"
+    "<a:font script=\"Gujr\" typeface=\"Shruti\"/>"
+    "<a:font script=\"Khmr\" typeface=\"DaunPenh\"/>"
+    "<a:font script=\"Knda\" typeface=\"Tunga\"/>"
+    "<a:font script=\"Guru\" typeface=\"Raavi\"/>"
+    "<a:font script=\"Cans\" typeface=\"Euphemia\"/>"
+    "<a:font script=\"Cher\" typeface=\"Plantagenet Cherokee\"/>"
+    "<a:font script=\"Yiii\" typeface=\"Microsoft Yi Baiti\"/>"
+    "<a:font script=\"Tibt\" typeface=\"Microsoft Himalaya\"/>"
+    "<a:font script=\"Thaa\" typeface=\"MV Boli\"/>"
+    "<a:font script=\"Deva\" typeface=\"Mangal\"/>"
+    "<a:font script=\"Telu\" typeface=\"Gautami\"/>"
+    "<a:font script=\"Taml\" typeface=\"Latha\"/>"
+    "<a:font script=\"Syrc\" typeface=\"Estrangelo Edessa\"/>"
+    "<a:font script=\"Orya\" typeface=\"Kalinga\"/>"
+    "<a:font script=\"Mlym\" typeface=\"Kartika\"/>"
+    "<a:font script=\"Laoo\" typeface=\"DokChampa\"/>"
+    "<a:font script=\"Sinh\" typeface=\"Iskoola Pota\"/>"
+    "<a:font script=\"Mong\" typeface=\"Mongolian Baiti\"/>"
+    "<a:font script=\"Viet\" typeface=\"Arial\"/>"
+    "<a:font script=\"Uigh\" typeface=\"Microsoft Uighur\"/>"
+    "</a:minorFont>"
+    "</a:fontScheme>"
+    "<a:fmtScheme name=\"Office\">"
+    "<a:fillStyleLst>"
+    "<a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill>"
+    "<a:gradFill rotWithShape=\"1\">"
+    "<a:gsLst>"
+    "<a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:tint val=\"50000\"/><a:satMod "
+    "val=\"300000\"/></a:schemeClr></a:gs>"
+    "<a:gs pos=\"35000\"><a:schemeClr val=\"phClr\"><a:tint val=\"37000\"/><a:satMod "
+    "val=\"300000\"/></a:schemeClr></a:gs>"
+    "<a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:tint val=\"15000\"/><a:satMod "
+    "val=\"350000\"/></a:schemeClr></a:gs>"
+    "</a:gsLst>"
+    "<a:lin ang=\"16200000\" scaled=\"1\"/>"
+    "</a:gradFill>"
+    "<a:gradFill rotWithShape=\"1\">"
+    "<a:gsLst>"
+    "<a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:shade val=\"51000\"/><a:satMod "
+    "val=\"130000\"/></a:schemeClr></a:gs>"
+    "<a:gs pos=\"80000\"><a:schemeClr val=\"phClr\"><a:shade val=\"93000\"/><a:satMod "
+    "val=\"130000\"/></a:schemeClr></a:gs>"
+    "<a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:shade val=\"94000\"/><a:satMod "
+    "val=\"135000\"/></a:schemeClr></a:gs>"
+    "</a:gsLst>"
+    "<a:lin ang=\"16200000\" scaled=\"0\"/>"
+    "</a:gradFill>"
+    "</a:fillStyleLst>"
+    "<a:lnStyleLst>"
+    "<a:ln w=\"9525\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\">"
+    "<a:solidFill><a:schemeClr val=\"phClr\"><a:shade val=\"95000\"/><a:satMod "
+    "val=\"105000\"/></a:schemeClr></a:solidFill>"
+    "<a:prstDash val=\"solid\"/>"
+    "</a:ln>"
+    "<a:ln w=\"25400\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\">"
+    "<a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill>"
+    "<a:prstDash val=\"solid\"/>"
+    "</a:ln>"
+    "<a:ln w=\"38100\" cap=\"flat\" cmpd=\"sng\" algn=\"ctr\">"
+    "<a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill>"
+    "<a:prstDash val=\"solid\"/>"
+    "</a:ln>"
+    "</a:lnStyleLst>"
+    "<a:effectStyleLst>"
+    "<a:effectStyle>"
+    "<a:effectLst>"
+    "<a:outerShdw blurRad=\"40000\" dist=\"20000\" dir=\"5400000\" rotWithShape=\"0\">"
+    "<a:srgbClr val=\"000000\"><a:alpha val=\"38000\"/></a:srgbClr>"
+    "</a:outerShdw>"
+    "</a:effectLst>"
+    "</a:effectStyle>"
+    "<a:effectStyle>"
+    "<a:effectLst>"
+    "<a:outerShdw blurRad=\"40000\" dist=\"23000\" dir=\"5400000\" rotWithShape=\"0\">"
+    "<a:srgbClr val=\"000000\"><a:alpha val=\"35000\"/></a:srgbClr>"
+    "</a:outerShdw>"
+    "</a:effectLst>"
+    "</a:effectStyle>"
+    "<a:effectStyle>"
+    "<a:effectLst>"
+    "<a:outerShdw blurRad=\"40000\" dist=\"23000\" dir=\"5400000\" rotWithShape=\"0\">"
+    "<a:srgbClr val=\"000000\"><a:alpha val=\"35000\"/></a:srgbClr>"
+    "</a:outerShdw>"
+    "</a:effectLst>"
+    "<a:scene3d>"
+    "<a:camera prst=\"orthographicFront\"><a:rot lat=\"0\" lon=\"0\" rev=\"0\"/></a:camera>"
+    "<a:lightRig rig=\"threePt\" dir=\"t\"><a:rot lat=\"0\" lon=\"0\" "
+    "rev=\"1200000\"/></a:lightRig>"
+    "</a:scene3d>"
+    "<a:sp3d><a:bevelT w=\"63500\" h=\"25400\"/></a:sp3d>"
+    "</a:effectStyle>"
+    "</a:effectStyleLst>"
+    "<a:bgFillStyleLst>"
+    "<a:solidFill><a:schemeClr val=\"phClr\"/></a:solidFill>"
+    "<a:gradFill rotWithShape=\"1\">"
+    "<a:gsLst>"
+    "<a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:tint val=\"40000\"/><a:satMod "
+    "val=\"350000\"/></a:schemeClr></a:gs>"
+    "<a:gs pos=\"40000\"><a:schemeClr val=\"phClr\"><a:tint val=\"45000\"/><a:shade "
+    "val=\"99000\"/><a:satMod val=\"350000\"/></a:schemeClr></a:gs>"
+    "<a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:shade val=\"20000\"/><a:satMod "
+    "val=\"255000\"/></a:schemeClr></a:gs></a:gsLst>"
+    "<a:path path=\"circle\"><a:fillToRect l=\"50000\" t=\"-80000\" r=\"50000\" "
+    "b=\"180000\"/></a:path>"
+    "</a:gradFill>"
+    "<a:gradFill rotWithShape=\"1\">"
+    "<a:gsLst>"
+    "<a:gs pos=\"0\"><a:schemeClr val=\"phClr\"><a:tint val=\"80000\"/><a:satMod "
+    "val=\"300000\"/></a:schemeClr></a:gs>"
+    "<a:gs pos=\"100000\"><a:schemeClr val=\"phClr\"><a:shade val=\"30000\"/><a:satMod "
+    "val=\"200000\"/></a:schemeClr></a:gs>"
+    "</a:gsLst>"
+    "<a:path path=\"circle\"><a:fillToRect l=\"50000\" t=\"50000\" r=\"50000\" "
+    "b=\"50000\"/></a:path>"
+    "</a:gradFill>"
+    "</a:bgFillStyleLst>"
+    "</a:fmtScheme>"
+    "</a:themeElements>"
+    "<a:objectDefaults/>"
+    "<a:extraClrSchemeLst/>"
+    "</a:theme>";
 
 Theme::Theme(CreateFlag flag)
-    :AbstractOOXmlFile(flag)
+    : AbstractOOXmlFile(flag)
 {
 }
 
diff --git a/QXlsx/source/xlsxutility.cpp b/QXlsx/source/xlsxutility.cpp
index dd8680a3..d4eb5f5d 100644
--- a/QXlsx/source/xlsxutility.cpp
+++ b/QXlsx/source/xlsxutility.cpp
@@ -1,19 +1,19 @@
 // xlsxutility.cpp
 
-#include "xlsxutility_p.h"
 #include "xlsxcellreference.h"
+#include "xlsxutility_p.h"
+
+#include <cmath>
+#include <string>
 
-#include <QString>
-#include <QPoint>
-#include <QRegularExpression>
-#include <QMap>
-#include <QStringList>
 #include <QColor>
 #include <QDateTime>
 #include <QDebug>
-
-#include <cmath>
-#include <string>
+#include <QMap>
+#include <QPoint>
+#include <QRegularExpression>
+#include <QString>
+#include <QStringList>
 
 QT_BEGIN_NAMESPACE_XLSX
 
@@ -30,9 +30,9 @@ QStringList splitPath(const QString &path)
 {
     int idx = path.lastIndexOf(QLatin1Char('/'));
     if (idx == -1)
-        return { QStringLiteral("."), path };
+        return {QStringLiteral("."), path};
 
-    return { path.left(idx), path.mid(idx+1) };
+    return {path.left(idx), path.mid(idx + 1)};
 }
 
 /*
@@ -52,22 +52,23 @@ QString getRelFilePath(const QString &filePath)
         return ret;
     }
 
-    ret = QString( filePath.left(idx) + QLatin1String("/_rels/") +  filePath.mid(idx+1) + QLatin1String(".rels"));
+    ret = QString(filePath.left(idx) + QLatin1String("/_rels/") + filePath.mid(idx + 1) +
+                  QLatin1String(".rels"));
     return ret;
 }
 
 double datetimeToNumber(const QDateTime &dt, bool is1904)
 {
-    //Note, for number 0, Excel2007 shown as 1900-1-0, which should be 1899-12-31
-    QDateTime epoch(is1904 ? QDate(1904, 1, 1): QDate(1899, 12, 31), QTime(0,0));
+    // Note, for number 0, Excel2007 shown as 1900-1-0, which should be 1899-12-31
+    QDateTime epoch(is1904 ? QDate(1904, 1, 1) : QDate(1899, 12, 31), QTime(0, 0));
 
-    double excel_time = epoch.msecsTo(dt) / (1000*60*60*24.0);
+    double excel_time = epoch.msecsTo(dt) / (1000 * 60 * 60 * 24.0);
 
-    if (dt.isDaylightTime())    // Add one hour if the date is Daylight
+    if (dt.isDaylightTime()) // Add one hour if the date is Daylight
         excel_time += 1.0 / 24.0;
 
-    if (!is1904 && excel_time > 59) {//31+28
-        //Account for Excel erroneously treating 1900 as a leap year.
+    if (!is1904 && excel_time > 59) { // 31+28
+        // Account for Excel erroneously treating 1900 as a leap year.
         excel_time += 1;
     }
 
@@ -76,7 +77,7 @@ double datetimeToNumber(const QDateTime &dt, bool is1904)
 
 double timeToNumber(const QTime &time)
 {
-    return QTime(0,0).msecsTo(time) / (1000*60*60*24.0);
+    return QTime(0, 0).msecsTo(time) / (1000 * 60 * 60 * 24.0);
 }
 
 QVariant datetimeFromNumber(double num, bool is1904)
@@ -88,30 +89,27 @@ QVariant datetimeFromNumber(double num, bool is1904)
         num = num - 1;
     }
 
-    qint64 msecs = static_cast<qint64>(num * 1000*60*60*24.0 + 0.5);
-    QDateTime epoch(is1904 ? QDate(1904, 1, 1): QDate(1899, 12, 31), QTime(0,0));
+    qint64 msecs = static_cast<qint64>(num * 1000 * 60 * 60 * 24.0 + 0.5);
+    QDateTime epoch(is1904 ? QDate(1904, 1, 1) : QDate(1899, 12, 31), QTime(0, 0));
     QDateTime dtOld = epoch.addMSecs(msecs);
-    dtRet = dtOld;
+    dtRet           = dtOld;
 
     // Remove one hour to see whether the date is Daylight
-    QDateTime dtNew = dtRet.addMSecs( -3600000 ); // issue102
-    if ( dtNew.isDaylightTime() )
-    {
+    QDateTime dtNew = dtRet.addMSecs(-3600000); // issue102
+    if (dtNew.isDaylightTime()) {
         dtRet = dtNew;
     }
 
-    double whole = 0;
+    double whole      = 0;
     double fractional = std::modf(num, &whole);
 
-    if ( num < double(1) )
-    {
+    if (num < double(1)) {
         // only time
         QTime t = dtRet.time();
         return QVariant(t);
     }
 
-    if ( fractional == 0.0 )
-    {
+    if (fractional == 0.0) {
         // only date
         QDate onlyDT = dtRet.date();
         return QVariant(onlyDT);
@@ -135,10 +133,11 @@ QString createSafeSheetName(const QString &nameProposal)
         return QString();
 
     QString ret = nameProposal;
-    if (nameProposal.length() > 2 && nameProposal.startsWith(QLatin1Char('\'')) && nameProposal.endsWith(QLatin1Char('\'')))
+    if (nameProposal.length() > 2 && nameProposal.startsWith(QLatin1Char('\'')) &&
+        nameProposal.endsWith(QLatin1Char('\'')))
         ret = unescapeSheetName(ret);
 
-    //Replace invalid chars with space.
+    // Replace invalid chars with space.
     static QRegularExpression invalidChars(QStringLiteral("[/\\\\?*\\][:]"));
     if (nameProposal.contains(invalidChars)) {
         static QRegularExpression validChars(QStringLiteral("[/\\\\?*\\][:]"));
@@ -149,7 +148,7 @@ QString createSafeSheetName(const QString &nameProposal)
         ret[0] = QLatin1Char(' ');
 
     if (ret.endsWith(QLatin1Char('\'')))
-        ret[ret.size()-1] = QLatin1Char(' ');
+        ret[ret.size() - 1] = QLatin1Char(' ');
 
     if (ret.size() > 31)
         ret = ret.left(31);
@@ -157,19 +156,20 @@ QString createSafeSheetName(const QString &nameProposal)
 }
 
 /*
- * When sheetName contains space or apostrophe, escaped is needed by cellFormula/definedName/chartSerials.
+ * When sheetName contains space or apostrophe, escaped is needed by
+ * cellFormula/definedName/chartSerials.
  */
 QString escapeSheetName(const QString &sheetName)
 {
-    //Already escaped.
+    // Already escaped.
     Q_ASSERT(!sheetName.startsWith(QLatin1Char('\'')) && !sheetName.endsWith(QLatin1Char('\'')));
 
-    //These is no need to escape
+    // These is no need to escape
     static const auto escape = QRegularExpression(QStringLiteral("[ +\\-,%^=<>'&]"));
     if (!sheetName.contains(escape))
         return sheetName;
 
-    //OK, escape is needed.
+    // OK, escape is needed.
     QString name = sheetName;
     name.replace(QLatin1Char('\''), QLatin1String("\'\'"));
     return QLatin1Char('\'') + name + QLatin1Char('\'');
@@ -179,9 +179,10 @@ QString escapeSheetName(const QString &sheetName)
  */
 QString unescapeSheetName(const QString &sheetName)
 {
-    Q_ASSERT(sheetName.length() > 2 && sheetName.startsWith(QLatin1Char('\'')) && sheetName.endsWith(QLatin1Char('\'')));
+    Q_ASSERT(sheetName.length() > 2 && sheetName.startsWith(QLatin1Char('\'')) &&
+             sheetName.endsWith(QLatin1Char('\'')));
 
-    QString name = sheetName.mid(1, sheetName.length()-2);
+    QString name = sheetName.mid(1, sheetName.length() - 2);
     name.replace(QLatin1String("\'\'"), QLatin1String("\'"));
     return name;
 }
@@ -192,7 +193,7 @@ QString unescapeSheetName(const QString &sheetName)
 bool isSpaceReserveNeeded(const QString &s)
 {
     QString spaces(QStringLiteral(" \t\n\r"));
-    return !s.isEmpty() && (spaces.contains(s.at(0))||spaces.contains(s.at(s.length()-1)));
+    return !s.isEmpty() && (spaces.contains(s.at(0)) || spaces.contains(s.at(s.length() - 1)));
 }
 
 /*
@@ -206,18 +207,20 @@ bool isSpaceReserveNeeded(const QString &s)
  *
  * For long run, we need a formula parser.
  */
-QString convertSharedFormula(const QString &rootFormula, const CellReference &rootCell, const CellReference &cell)
+QString convertSharedFormula(const QString &rootFormula,
+                             const CellReference &rootCell,
+                             const CellReference &cell)
 {
     Q_UNUSED(rootCell)
     Q_UNUSED(cell)
-    //Find all the "$?[A-Z]+$?[0-9]+" patterns in the rootFormula.
-    QVector<std::pair<QString, int> > segments;
+    // Find all the "$?[A-Z]+$?[0-9]+" patterns in the rootFormula.
+    QVector<std::pair<QString, int>> segments;
 
     QString segment;
     bool inQuote = false;
-    enum RefState{INVALID, PRE_AZ, AZ, PRE_09, _09};
+    enum RefState { INVALID, PRE_AZ, AZ, PRE_09, _09 };
     RefState refState = INVALID;
-    int refFlag = 0; // 0x00, 0x01, 0x02, 0x03 ==> A1, $A1, A$1, $A$1
+    int refFlag       = 0; // 0x00, 0x01, 0x02, 0x03 ==> A1, $A1, A$1, $A$1
     for (QChar ch : rootFormula) {
         if (inQuote) {
             segment.append(ch);
@@ -225,7 +228,7 @@ QString convertSharedFormula(const QString &rootFormula, const CellReference &ro
                 inQuote = false;
         } else {
             if (ch == QLatin1Char('"')) {
-                inQuote = true;
+                inQuote  = true;
                 refState = INVALID;
                 segment.append(ch);
             } else if (ch == QLatin1Char('$')) {
@@ -234,21 +237,21 @@ QString convertSharedFormula(const QString &rootFormula, const CellReference &ro
                     refState = PRE_09;
                     refFlag |= 0x02;
                 } else {
-                    segments.append(std::make_pair(segment, refState==_09 ? refFlag : -1 ));
-                    segment = QString(ch); //Start new segment.
+                    segments.append(std::make_pair(segment, refState == _09 ? refFlag : -1));
+                    segment  = QString(ch); // Start new segment.
                     refState = PRE_AZ;
-                    refFlag = 0x01;
+                    refFlag  = 0x01;
                 }
-            } else if (ch >= QLatin1Char('A') && ch <=QLatin1Char('Z')) {
+            } else if (ch >= QLatin1Char('A') && ch <= QLatin1Char('Z')) {
                 if (refState == PRE_AZ || refState == AZ) {
                     segment.append(ch);
                 } else {
-                    segments.append(std::make_pair(segment, refState==_09 ? refFlag : -1 ));
-                    segment = QString(ch); //Start new segment.
+                    segments.append(std::make_pair(segment, refState == _09 ? refFlag : -1));
+                    segment = QString(ch); // Start new segment.
                     refFlag = 0x00;
                 }
                 refState = AZ;
-            } else if (ch >= QLatin1Char('0') && ch <=QLatin1Char('9')) {
+            } else if (ch >= QLatin1Char('0') && ch <= QLatin1Char('9')) {
                 segment.append(ch);
 
                 if (refState == AZ || refState == PRE_09 || refState == _09)
@@ -257,8 +260,8 @@ QString convertSharedFormula(const QString &rootFormula, const CellReference &ro
                     refState = INVALID;
             } else {
                 if (refState == _09) {
-                    segments.append(std::make_pair(segment, refFlag ));
-                    segment = QString(ch); //Start new segment.
+                    segments.append(std::make_pair(segment, refFlag));
+                    segment = QString(ch); // Start new segment.
                 } else {
                     segment.append(ch);
                 }
@@ -268,23 +271,24 @@ QString convertSharedFormula(const QString &rootFormula, const CellReference &ro
     }
 
     if (!segment.isEmpty())
-        segments.append(std::make_pair(segment, refState==_09 ? refFlag : -1 ));
+        segments.append(std::make_pair(segment, refState == _09 ? refFlag : -1));
 
-    //Replace "A1", "$A1", "A$1" segment with proper one.
+    // Replace "A1", "$A1", "A$1" segment with proper one.
     QStringList result;
     for (const auto &p : segments) {
-        //qDebug()<<p.first<<p.second;
+        // qDebug()<<p.first<<p.second;
         if (p.second != -1 && p.second != 3) {
             CellReference oldRef(p.first);
-            int row = p.second & 0x02 ? oldRef.row() : oldRef.row()-rootCell.row()+cell.row();
-            int col = p.second & 0x01 ? oldRef.column() : oldRef.column()-rootCell.column()+cell.column();
+            int row = p.second & 0x02 ? oldRef.row() : oldRef.row() - rootCell.row() + cell.row();
+            int col = p.second & 0x01 ? oldRef.column()
+                                      : oldRef.column() - rootCell.column() + cell.column();
             result.append(CellReference(row, col).toString(p.second & 0x02, p.second & 0x01));
         } else {
             result.append(p.first);
         }
     }
 
-    //OK
+    // OK
     return result.join(QString());
 }
 
diff --git a/QXlsx/source/xlsxworkbook.cpp b/QXlsx/source/xlsxworkbook.cpp
index 25036797..98fe24dc 100644
--- a/QXlsx/source/xlsxworkbook.cpp
+++ b/QXlsx/source/xlsxworkbook.cpp
@@ -1,63 +1,61 @@
 // xlsxworkbook.cpp
 
-#include <QtGlobal>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
-#include <QFile>
-#include <QBuffer>
-#include <QDir>
-#include <QtDebug>
-
 #include "xlsxworkbook.h"
-#include "xlsxworkbook_p.h"
-#include "xlsxsharedstrings_p.h"
-#include "xlsxworksheet.h"
+
+#include "xlsxchart.h"
 #include "xlsxchartsheet.h"
-#include "xlsxstyles_p.h"
 #include "xlsxformat.h"
-#include "xlsxworksheet_p.h"
 #include "xlsxformat_p.h"
 #include "xlsxmediafile_p.h"
+#include "xlsxsharedstrings_p.h"
+#include "xlsxstyles_p.h"
 #include "xlsxutility_p.h"
-#include "xlsxchart.h"
+#include "xlsxworkbook_p.h"
+#include "xlsxworksheet.h"
+#include "xlsxworksheet_p.h"
+
+#include <QBuffer>
+#include <QDir>
+#include <QFile>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QtDebug>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
-WorkbookPrivate::WorkbookPrivate(Workbook *q, Workbook::CreateFlag flag) :
-    AbstractOOXmlFilePrivate(q, flag)
+WorkbookPrivate::WorkbookPrivate(Workbook *q, Workbook::CreateFlag flag)
+    : AbstractOOXmlFilePrivate(q, flag)
 {
-    sharedStrings = QSharedPointer<SharedStrings> (new SharedStrings(flag));
-    styles = QSharedPointer<Styles>(new Styles(flag));
-    theme = QSharedPointer<Theme>(new Theme(flag));
+    sharedStrings = QSharedPointer<SharedStrings>(new SharedStrings(flag));
+    styles        = QSharedPointer<Styles>(new Styles(flag));
+    theme         = QSharedPointer<Theme>(new Theme(flag));
 
-    x_window = 240;
-    y_window = 15;
-    window_width = 16095;
+    x_window      = 240;
+    y_window      = 15;
+    window_width  = 16095;
     window_height = 9660;
 
-    strings_to_numbers_enabled = false;
+    strings_to_numbers_enabled    = false;
     strings_to_hyperlinks_enabled = true;
-    html_to_richstring_enabled = false;
-    date1904 = false;
-    defaultDateFormat = QStringLiteral("yyyy-mm-dd");
-    activesheetIndex = 0;
-    firstsheet = 0;
-    table_count = 0;
-
-    last_worksheet_index = 0;
+    html_to_richstring_enabled    = false;
+    date1904                      = false;
+    defaultDateFormat             = QStringLiteral("yyyy-mm-dd");
+    activesheetIndex              = 0;
+    firstsheet                    = 0;
+    table_count                   = 0;
+
+    last_worksheet_index  = 0;
     last_chartsheet_index = 0;
-    last_sheet_id = 0;
+    last_sheet_id         = 0;
 }
 
 Workbook::Workbook(CreateFlag flag)
     : AbstractOOXmlFile(new WorkbookPrivate(this, flag))
 {
-
 }
 
-Workbook::~Workbook()
-{
-}
+Workbook::~Workbook() {}
 
 bool Workbook::isDate1904() const
 {
@@ -144,18 +142,21 @@ void Workbook::setDefaultDateFormat(const QString &format)
  * \param scope The name of one worksheet, or empty which means golbal scope.
  * \return Return false if the name invalid.
  */
-bool Workbook::defineName(const QString &name, const QString &formula, const QString &comment, const QString &scope)
+bool Workbook::defineName(const QString &name,
+                          const QString &formula,
+                          const QString &comment,
+                          const QString &scope)
 {
     Q_D(Workbook);
 
-    //Remove the = sign from the formula if it exists.
+    // Remove the = sign from the formula if it exists.
     QString formulaString = formula;
     if (formulaString.startsWith(QLatin1Char('=')))
         formulaString = formula.mid(1);
 
-    int id=-1;
+    int id = -1;
     if (!scope.isEmpty()) {
-        for (int i=0; i<d->sheets.size(); ++i) {
+        for (int i = 0; i < d->sheets.size(); ++i) {
             if (d->sheets[i]->sheetName() == scope) {
                 id = d->sheets[i]->sheetId();
                 break;
@@ -193,18 +194,13 @@ AbstractSheet *Workbook::addSheet(const QString &name, int sheetId, AbstractShee
         d->last_sheet_id = sheetId;
 
     AbstractSheet *sheet = NULL;
-    if (type == AbstractSheet::ST_WorkSheet)
-    {
+    if (type == AbstractSheet::ST_WorkSheet) {
         // create work sheet (value sheet)
         sheet = new Worksheet(name, sheetId, this, F_LoadFromExists);
-    }
-    else if (type == AbstractSheet::ST_ChartSheet)
-    {
+    } else if (type == AbstractSheet::ST_ChartSheet) {
         // create chart sheet
         sheet = new Chartsheet(name, sheetId, this, F_LoadFromExists);
-    }
-    else
-    {
+    } else {
         qWarning("unsupported sheet type.");
         Q_ASSERT(false);
     }
@@ -219,12 +215,12 @@ AbstractSheet *Workbook::insertSheet(int index, const QString &name, AbstractShe
 {
     Q_D(Workbook);
     QString sheetName = createSafeSheetName(name);
-    if(index > d->last_sheet_id){
-        //User tries to insert, where no sheet has gone before.
+    if (index > d->last_sheet_id) {
+        // User tries to insert, where no sheet has gone before.
         return 0;
     }
     if (!sheetName.isEmpty()) {
-        //If user given an already in-used name, we should not continue any more!
+        // If user given an already in-used name, we should not continue any more!
         if (d->sheetNames.contains(sheetName))
             return 0;
     } else {
@@ -247,16 +243,11 @@ AbstractSheet *Workbook::insertSheet(int index, const QString &name, AbstractShe
     ++d->last_sheet_id;
 
     AbstractSheet *sheet = NULL;
-    if ( type == AbstractSheet::ST_WorkSheet )
-    {
+    if (type == AbstractSheet::ST_WorkSheet) {
         sheet = new Worksheet(sheetName, d->last_sheet_id, this, F_NewFromScratch);
-    }
-    else if ( type == AbstractSheet::ST_ChartSheet )
-    {
+    } else if (type == AbstractSheet::ST_ChartSheet) {
         sheet = new Chartsheet(sheetName, d->last_sheet_id, this, F_NewFromScratch);
-    }
-    else
-    {
+    } else {
         qWarning("unsupported sheet type.");
         Q_ASSERT(false);
     }
@@ -275,7 +266,7 @@ AbstractSheet *Workbook::activeSheet() const
 {
     Q_D(const Workbook);
     if (d->sheets.isEmpty())
-        const_cast<Workbook*>(this)->addSheet();
+        const_cast<Workbook *>(this)->addSheet();
     return d->sheets[d->activesheetIndex].data();
 }
 
@@ -283,7 +274,7 @@ bool Workbook::setActiveSheet(int index)
 {
     Q_D(Workbook);
     if (index < 0 || index >= d->sheets.size()) {
-        //warning
+        // warning
         return false;
     }
     d->activesheetIndex = index;
@@ -300,8 +291,8 @@ bool Workbook::renameSheet(int index, const QString &newName)
     if (index < 0 || index >= d->sheets.size())
         return false;
 
-    //If user given an already in-used name, return false
-    for (int i=0; i<d->sheets.size(); ++i) {
+    // If user given an already in-used name, return false
+    for (int i = 0; i < d->sheets.size(); ++i) {
         if (d->sheets[i]->sheetName() == name)
             return false;
     }
@@ -358,20 +349,21 @@ bool Workbook::copySheet(int index, const QString &newName)
 
     QString worksheetName = createSafeSheetName(newName);
     if (!newName.isEmpty()) {
-        //If user given an already in-used name, we should not continue any more!
+        // If user given an already in-used name, we should not continue any more!
         if (d->sheetNames.contains(newName))
             return false;
     } else {
         int copy_index = 1;
         do {
             ++copy_index;
-            worksheetName = QStringLiteral("%1(%2)").arg(d->sheets[index]->sheetName()).arg(copy_index);
+            worksheetName =
+                QStringLiteral("%1(%2)").arg(d->sheets[index]->sheetName()).arg(copy_index);
         } while (d->sheetNames.contains(worksheetName));
     }
 
     ++d->last_sheet_id;
     AbstractSheet *sheet = d->sheets[index]->copy(worksheetName, d->last_sheet_id);
-    d->sheets.append(QSharedPointer<AbstractSheet> (sheet));
+    d->sheets.append(QSharedPointer<AbstractSheet>(sheet));
     d->sheetNames.append(sheet->sheetName());
 
     return true; // #162
@@ -424,10 +416,10 @@ QList<Drawing *> Workbook::drawings()
 {
     Q_D(Workbook);
     QList<Drawing *> ds;
-    for (int i=0; i<d->sheets.size(); ++i) {
+    for (int i = 0; i < d->sheets.size(); ++i) {
         QSharedPointer<AbstractSheet> sheet = d->sheets[i];
         if (sheet->drawing())
-        ds.append(sheet->drawing());
+            ds.append(sheet->drawing());
     }
 
     return ds;
@@ -436,11 +428,11 @@ QList<Drawing *> Workbook::drawings()
 /*!
  * \internal
  */
-QList<QSharedPointer<AbstractSheet> > Workbook::getSheetsByTypes(AbstractSheet::SheetType type) const
+QList<QSharedPointer<AbstractSheet>> Workbook::getSheetsByTypes(AbstractSheet::SheetType type) const
 {
     Q_D(const Workbook);
-    QList<QSharedPointer<AbstractSheet> > list;
-    for (int i=0; i<d->sheets.size(); ++i) {
+    QList<QSharedPointer<AbstractSheet>> list;
+    for (int i = 0; i < d->sheets.size(); ++i) {
         if (d->sheets[i]->sheetType() == type)
             list.append(d->sheets[i]);
     }
@@ -458,15 +450,20 @@ void Workbook::saveToXmlFile(QIODevice *device) const
 
     writer.writeStartDocument(QStringLiteral("1.0"), true);
     writer.writeStartElement(QStringLiteral("workbook"));
-    writer.writeAttribute(QStringLiteral("xmlns"), QStringLiteral("http://schemas.openxmlformats.org/spreadsheetml/2006/main"));
-    writer.writeAttribute(QStringLiteral("xmlns:r"), QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships"));
+    writer.writeAttribute(
+        QStringLiteral("xmlns"),
+        QStringLiteral("http://schemas.openxmlformats.org/spreadsheetml/2006/main"));
+    writer.writeAttribute(
+        QStringLiteral("xmlns:r"),
+        QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships"));
 
     writer.writeEmptyElement(QStringLiteral("fileVersion"));
     writer.writeAttribute(QStringLiteral("appName"), QStringLiteral("xl"));
     writer.writeAttribute(QStringLiteral("lastEdited"), QStringLiteral("4"));
     writer.writeAttribute(QStringLiteral("lowestEdited"), QStringLiteral("4"));
     writer.writeAttribute(QStringLiteral("rupBuild"), QStringLiteral("4505"));
-//    writer.writeAttribute(QStringLiteral("codeName"), QStringLiteral("{37E998C4-C9E5-D4B9-71C8-EB1FF731991C}"));
+    //    writer.writeAttribute(QStringLiteral("codeName"),
+    //    QStringLiteral("{37E998C4-C9E5-D4B9-71C8-EB1FF731991C}"));
 
     writer.writeEmptyElement(QStringLiteral("workbookPr"));
     if (d->date1904)
@@ -479,19 +476,19 @@ void Workbook::saveToXmlFile(QIODevice *device) const
     writer.writeAttribute(QStringLiteral("yWindow"), QString::number(d->y_window));
     writer.writeAttribute(QStringLiteral("windowWidth"), QString::number(d->window_width));
     writer.writeAttribute(QStringLiteral("windowHeight"), QString::number(d->window_height));
-    //Store the firstSheet when it isn't the default
-    //For example, when "the first sheet 0 is hidden", the first sheet will be 1
+    // Store the firstSheet when it isn't the default
+    // For example, when "the first sheet 0 is hidden", the first sheet will be 1
     if (d->firstsheet > 0)
         writer.writeAttribute(QStringLiteral("firstSheet"), QString::number(d->firstsheet + 1));
-    //Store the activeTab when it isn't the first sheet
+    // Store the activeTab when it isn't the first sheet
     if (d->activesheetIndex > 0)
         writer.writeAttribute(QStringLiteral("activeTab"), QString::number(d->activesheetIndex));
-    writer.writeEndElement();//bookViews
+    writer.writeEndElement(); // bookViews
 
     writer.writeStartElement(QStringLiteral("sheets"));
-    int worksheetIndex = 0;
+    int worksheetIndex  = 0;
     int chartsheetIndex = 0;
-    for (int i=0; i<d->sheets.size(); ++i) {
+    for (int i = 0; i < d->sheets.size(); ++i) {
         QSharedPointer<AbstractSheet> sheet = d->sheets[i];
         writer.writeEmptyElement(QStringLiteral("sheet"));
         writer.writeAttribute(QStringLiteral("name"), sheet->sheetName());
@@ -502,22 +499,30 @@ void Workbook::saveToXmlFile(QIODevice *device) const
             writer.writeAttribute(QStringLiteral("state"), QStringLiteral("veryHidden"));
 
         if (sheet->sheetType() == AbstractSheet::ST_WorkSheet)
-            d->relationships->addDocumentRelationship(QStringLiteral("/worksheet"), QStringLiteral("worksheets/sheet%1.xml").arg(++worksheetIndex));
+            d->relationships->addDocumentRelationship(
+                QStringLiteral("/worksheet"),
+                QStringLiteral("worksheets/sheet%1.xml").arg(++worksheetIndex));
         else
-            d->relationships->addDocumentRelationship(QStringLiteral("/chartsheet"), QStringLiteral("chartsheets/sheet%1.xml").arg(++chartsheetIndex));
+            d->relationships->addDocumentRelationship(
+                QStringLiteral("/chartsheet"),
+                QStringLiteral("chartsheets/sheet%1.xml").arg(++chartsheetIndex));
 
-        writer.writeAttribute(QStringLiteral("r:id"), QStringLiteral("rId%1").arg(d->relationships->count()));
+        writer.writeAttribute(QStringLiteral("r:id"),
+                              QStringLiteral("rId%1").arg(d->relationships->count()));
     }
-    writer.writeEndElement();//sheets
+    writer.writeEndElement(); // sheets
 
     if (d->externalLinks.size() > 0) {
         writer.writeStartElement(QStringLiteral("externalReferences"));
-        for (int i=0; i<d->externalLinks.size(); ++i) {
+        for (int i = 0; i < d->externalLinks.size(); ++i) {
             writer.writeEmptyElement(QStringLiteral("externalReference"));
-            d->relationships->addDocumentRelationship(QStringLiteral("/externalLink"), QStringLiteral("externalLinks/externalLink%1.xml").arg(i+1));
-            writer.writeAttribute(QStringLiteral("r:id"), QStringLiteral("rId%1").arg(d->relationships->count()));
+            d->relationships->addDocumentRelationship(
+                QStringLiteral("/externalLink"),
+                QStringLiteral("externalLinks/externalLink%1.xml").arg(i + 1));
+            writer.writeAttribute(QStringLiteral("r:id"),
+                                  QStringLiteral("rId%1").arg(d->relationships->count()));
         }
-        writer.writeEndElement();//externalReferences
+        writer.writeEndElement(); // externalReferences
     }
 
     if (!d->definedNamesList.isEmpty()) {
@@ -528,8 +533,8 @@ void Workbook::saveToXmlFile(QIODevice *device) const
             if (!data.comment.isEmpty())
                 writer.writeAttribute(QStringLiteral("comment"), data.comment);
             if (data.sheetId != -1) {
-                //find the local index of the sheet.
-                for (int i=0; i<d->sheets.size(); ++i) {
+                // find the local index of the sheet.
+                for (int i = 0; i < d->sheets.size(); ++i) {
                     if (d->sheets[i]->sheetId() == data.sheetId) {
                         writer.writeAttribute(QStringLiteral("localSheetId"), QString::number(i));
                         break;
@@ -537,22 +542,25 @@ void Workbook::saveToXmlFile(QIODevice *device) const
                 }
             }
             writer.writeCharacters(data.formula);
-            writer.writeEndElement();//definedName
+            writer.writeEndElement(); // definedName
         }
-        writer.writeEndElement();//definedNames
+        writer.writeEndElement(); // definedNames
     }
 
     writer.writeStartElement(QStringLiteral("calcPr"));
     writer.writeAttribute(QStringLiteral("calcId"), QStringLiteral("124519"));
-    writer.writeEndElement(); //calcPr
+    writer.writeEndElement(); // calcPr
 
-    writer.writeEndElement();//workbook
+    writer.writeEndElement(); // workbook
     writer.writeEndDocument();
 
-    d->relationships->addDocumentRelationship(QStringLiteral("/theme"), QStringLiteral("theme/theme1.xml"));
-    d->relationships->addDocumentRelationship(QStringLiteral("/styles"), QStringLiteral("styles.xml"));
+    d->relationships->addDocumentRelationship(QStringLiteral("/theme"),
+                                              QStringLiteral("theme/theme1.xml"));
+    d->relationships->addDocumentRelationship(QStringLiteral("/styles"),
+                                              QStringLiteral("styles.xml"));
     if (!sharedStrings()->isEmpty())
-        d->relationships->addDocumentRelationship(QStringLiteral("/sharedStrings"), QStringLiteral("sharedStrings.xml"));
+        d->relationships->addDocumentRelationship(QStringLiteral("/sharedStrings"),
+                                                  QStringLiteral("sharedStrings.xml"));
 }
 
 bool Workbook::loadFromXmlFile(QIODevice *device)
@@ -560,79 +568,62 @@ bool Workbook::loadFromXmlFile(QIODevice *device)
     Q_D(Workbook);
 
     QXmlStreamReader reader(device);
-    while (!reader.atEnd())
-    {
-         QXmlStreamReader::TokenType token = reader.readNext();
-         if (token == QXmlStreamReader::StartElement)
-         {
-             if (reader.name() == QLatin1String("sheet"))
-             {
-                 QXmlStreamAttributes attributes = reader.attributes();
-
-                 const auto& name = attributes.value(QLatin1String("name")).toString();
-
-                 int sheetId = attributes.value(QLatin1String("sheetId")).toInt();
-
-                 const auto& rId = attributes.value(QLatin1String("r:id")).toString();
-
-                 const auto& stateString = attributes.value(QLatin1String("state"));
-
-                 AbstractSheet::SheetState state = AbstractSheet::SS_Visible;
-                 if (stateString == QLatin1String("hidden"))
-                     state = AbstractSheet::SS_Hidden;
-                 else if (stateString == QLatin1String("veryHidden"))
-                     state = AbstractSheet::SS_VeryHidden;
-
-                 XlsxRelationship relationship = d->relationships->getRelationshipById(rId);
-
-                 AbstractSheet::SheetType type = AbstractSheet::ST_WorkSheet;
-                 if (relationship.type.endsWith(QLatin1String("/worksheet")))
-                 {
-                     type = AbstractSheet::ST_WorkSheet;
-                 }
-                 else if (relationship.type.endsWith(QLatin1String("/chartsheet")))
-                 {
-                     type = AbstractSheet::ST_ChartSheet;
-                 }
-                 else if (relationship.type.endsWith(QLatin1String("/dialogsheet")))
-                 {
-                     type = AbstractSheet::ST_DialogSheet;
-                 }
-                 else if (relationship.type.endsWith(QLatin1String("/xlMacrosheet")))
-                 {
-                     type = AbstractSheet::ST_MacroSheet;
-                 }
-                 else
-                 {
-                     qWarning() << "unknown sheet type : " << relationship.type ;
-                 }
-
-                 AbstractSheet *sheet = addSheet(name, sheetId, type);
-                 sheet->setSheetState(state);
-                 QString strFilePath = filePath();
-
-                 // const QString fullPath = QDir::cleanPath(splitPath(strFilePath).constFirst() + QLatin1String("/") + relationship.target);
-                 const auto parts = splitPath(strFilePath);
-                 QString fullPath = QDir::cleanPath(parts.first() + QLatin1String("/") + relationship.target);
-
-                 sheet->setFilePath(fullPath);
-             }
-             else if (reader.name() == QLatin1String("workbookPr"))
-             {
+    while (!reader.atEnd()) {
+        QXmlStreamReader::TokenType token = reader.readNext();
+        if (token == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("sheet")) {
+                QXmlStreamAttributes attributes = reader.attributes();
+
+                const auto &name = attributes.value(QLatin1String("name")).toString();
+
+                int sheetId = attributes.value(QLatin1String("sheetId")).toInt();
+
+                const auto &rId = attributes.value(QLatin1String("r:id")).toString();
+
+                const auto &stateString = attributes.value(QLatin1String("state"));
+
+                AbstractSheet::SheetState state = AbstractSheet::SS_Visible;
+                if (stateString == QLatin1String("hidden"))
+                    state = AbstractSheet::SS_Hidden;
+                else if (stateString == QLatin1String("veryHidden"))
+                    state = AbstractSheet::SS_VeryHidden;
+
+                XlsxRelationship relationship = d->relationships->getRelationshipById(rId);
+
+                AbstractSheet::SheetType type = AbstractSheet::ST_WorkSheet;
+                if (relationship.type.endsWith(QLatin1String("/worksheet"))) {
+                    type = AbstractSheet::ST_WorkSheet;
+                } else if (relationship.type.endsWith(QLatin1String("/chartsheet"))) {
+                    type = AbstractSheet::ST_ChartSheet;
+                } else if (relationship.type.endsWith(QLatin1String("/dialogsheet"))) {
+                    type = AbstractSheet::ST_DialogSheet;
+                } else if (relationship.type.endsWith(QLatin1String("/xlMacrosheet"))) {
+                    type = AbstractSheet::ST_MacroSheet;
+                } else {
+                    qWarning() << "unknown sheet type : " << relationship.type;
+                }
+
+                AbstractSheet *sheet = addSheet(name, sheetId, type);
+                sheet->setSheetState(state);
+                QString strFilePath = filePath();
+
+                // const QString fullPath = QDir::cleanPath(splitPath(strFilePath).constFirst() +
+                // QLatin1String("/") + relationship.target);
+                const auto parts = splitPath(strFilePath);
+                QString fullPath =
+                    QDir::cleanPath(parts.first() + QLatin1String("/") + relationship.target);
+
+                sheet->setFilePath(fullPath);
+            } else if (reader.name() == QLatin1String("workbookPr")) {
                 QXmlStreamAttributes attrs = reader.attributes();
                 if (attrs.hasAttribute(QLatin1String("date1904")))
                     d->date1904 = true;
-             }
-             else if (reader.name() == QLatin1String("bookviews"))
-             {
+            } else if (reader.name() == QLatin1String("bookviews")) {
                 while (!(reader.name() == QLatin1String("bookviews") &&
-                         reader.tokenType() == QXmlStreamReader::EndElement))
-                {
+                         reader.tokenType() == QXmlStreamReader::EndElement)) {
                     reader.readNextStartElement();
-                    if (reader.tokenType() == QXmlStreamReader::StartElement)
-                    {
-                        if (reader.name() == QLatin1String("workbookView"))
-                        {
+                    if (reader.tokenType() == QXmlStreamReader::StartElement) {
+                        if (reader.name() == QLatin1String("workbookView")) {
                             QXmlStreamAttributes attrs = reader.attributes();
                             if (attrs.hasAttribute(QLatin1String("xWindow")))
                                 d->x_window = attrs.value(QLatin1String("xWindow")).toInt();
@@ -641,44 +632,45 @@ bool Workbook::loadFromXmlFile(QIODevice *device)
                             if (attrs.hasAttribute(QLatin1String("windowWidth")))
                                 d->window_width = attrs.value(QLatin1String("windowWidth")).toInt();
                             if (attrs.hasAttribute(QLatin1String("windowHeight")))
-                                d->window_height = attrs.value(QLatin1String("windowHeight")).toInt();
+                                d->window_height =
+                                    attrs.value(QLatin1String("windowHeight")).toInt();
                             if (attrs.hasAttribute(QLatin1String("firstSheet")))
                                 d->firstsheet = attrs.value(QLatin1String("firstSheet")).toInt();
                             if (attrs.hasAttribute(QLatin1String("activeTab")))
-                                d->activesheetIndex = attrs.value(QLatin1String("activeTab")).toInt();
+                                d->activesheetIndex =
+                                    attrs.value(QLatin1String("activeTab")).toInt();
                         }
                     }
                 }
-             }
-             else if (reader.name() == QLatin1String("externalReference"))
-             {
-                 QXmlStreamAttributes attributes = reader.attributes();
-                 const QString rId = attributes.value(QLatin1String("r:id")).toString();
-                 XlsxRelationship relationship = d->relationships->getRelationshipById(rId);
-
-                 QSharedPointer<SimpleOOXmlFile> link(new SimpleOOXmlFile(F_LoadFromExists));
-
-                 const auto parts = splitPath(filePath());
-                 QString fullPath = QDir::cleanPath(parts.first() + QLatin1String("/") + relationship.target);
-
-                 link->setFilePath(fullPath);
-                 d->externalLinks.append(link);
-             } else if (reader.name() == QLatin1String("definedName")) {
-                 QXmlStreamAttributes attrs = reader.attributes();
-                 XlsxDefineNameData data;
-
-                 data.name = attrs.value(QLatin1String("name")).toString();
-                 if (attrs.hasAttribute(QLatin1String("comment")))
-                     data.comment = attrs.value(QLatin1String("comment")).toString();
-                 if (attrs.hasAttribute(QLatin1String("localSheetId"))) {
-                     int localId = attrs.value(QLatin1String("localSheetId")).toInt();
-                     int sheetId = d->sheets.at(localId)->sheetId();
-                     data.sheetId = sheetId;
-                 }
-                 data.formula = reader.readElementText();
-                 d->definedNamesList.append(data);
-             }
-         }
+            } else if (reader.name() == QLatin1String("externalReference")) {
+                QXmlStreamAttributes attributes = reader.attributes();
+                const QString rId             = attributes.value(QLatin1String("r:id")).toString();
+                XlsxRelationship relationship = d->relationships->getRelationshipById(rId);
+
+                QSharedPointer<SimpleOOXmlFile> link(new SimpleOOXmlFile(F_LoadFromExists));
+
+                const auto parts = splitPath(filePath());
+                QString fullPath =
+                    QDir::cleanPath(parts.first() + QLatin1String("/") + relationship.target);
+
+                link->setFilePath(fullPath);
+                d->externalLinks.append(link);
+            } else if (reader.name() == QLatin1String("definedName")) {
+                QXmlStreamAttributes attrs = reader.attributes();
+                XlsxDefineNameData data;
+
+                data.name = attrs.value(QLatin1String("name")).toString();
+                if (attrs.hasAttribute(QLatin1String("comment")))
+                    data.comment = attrs.value(QLatin1String("comment")).toString();
+                if (attrs.hasAttribute(QLatin1String("localSheetId"))) {
+                    int localId  = attrs.value(QLatin1String("localSheetId")).toInt();
+                    int sheetId  = d->sheets.at(localId)->sheetId();
+                    data.sheetId = sheetId;
+                }
+                data.formula = reader.readElementText();
+                d->definedNamesList.append(data);
+            }
+        }
     }
     return true;
 }
@@ -686,7 +678,7 @@ bool Workbook::loadFromXmlFile(QIODevice *device)
 /*!
  * \internal
  */
-QList<std::shared_ptr<MediaFile> > Workbook::mediaFiles() const
+QList<std::shared_ptr<MediaFile>> Workbook::mediaFiles() const
 {
     Q_D(const Workbook);
 
@@ -700,12 +692,9 @@ void Workbook::addMediaFile(std::shared_ptr<MediaFile> media, bool force)
 {
     Q_D(Workbook);
 
-    if (!force)
-    {
-        for (int i=0; i<d->mediaFiles.size(); ++i)
-        {
-            if (d->mediaFiles[i]->hashKey() == media->hashKey())
-            {
+    if (!force) {
+        for (int i = 0; i < d->mediaFiles.size(); ++i) {
+            if (d->mediaFiles[i]->hashKey() == media->hashKey()) {
                 media->setIndex(i);
                 return;
             }
@@ -719,7 +708,7 @@ void Workbook::addMediaFile(std::shared_ptr<MediaFile> media, bool force)
 /*!
  * \internal
  */
-QList<QSharedPointer<Chart> > Workbook::chartFiles() const
+QList<QSharedPointer<Chart>> Workbook::chartFiles() const
 {
     Q_D(const Workbook);
 
diff --git a/QXlsx/source/xlsxworksheet.cpp b/QXlsx/source/xlsxworksheet.cpp
index 93517045..e3dd1f46 100644
--- a/QXlsx/source/xlsxworksheet.cpp
+++ b/QXlsx/source/xlsxworksheet.cpp
@@ -1,73 +1,72 @@
 // xlsxworksheet.cpp
 
-#include <QtGlobal>
-#include <QVariant>
-#include <QDateTime>
-#include <QDate>
-#include <QTime>
-#include <QPoint>
-#include <QFile>
-#include <QUrl>
-#include <QDebug>
-#include <QBuffer>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
-#include <QTextDocument>
-#include <QDir>
-#include <QMapIterator>
-#include <QMap>
-
-#include <cmath>
-
-#include "xlsxrichstring.h"
-#include "xlsxcellreference.h"
 #include "xlsxworksheet.h"
-#include "xlsxworksheet_p.h"
-#include "xlsxworkbook.h"
-#include "xlsxformat.h"
-#include "xlsxformat_p.h"
-#include "xlsxutility_p.h"
-#include "xlsxsharedstrings_p.h"
-#include "xlsxdrawing_p.h"
-#include "xlsxstyles_p.h"
+
 #include "xlsxcell.h"
 #include "xlsxcell_p.h"
-#include "xlsxcellrange.h"
-#include "xlsxconditionalformatting_p.h"
-#include "xlsxdrawinganchor_p.h"
-#include "xlsxchart.h"
 #include "xlsxcellformula.h"
 #include "xlsxcellformula_p.h"
 #include "xlsxcelllocation.h"
+#include "xlsxcellrange.h"
+#include "xlsxcellreference.h"
+#include "xlsxchart.h"
+#include "xlsxconditionalformatting_p.h"
+#include "xlsxdrawing_p.h"
+#include "xlsxdrawinganchor_p.h"
+#include "xlsxformat.h"
+#include "xlsxformat_p.h"
+#include "xlsxrichstring.h"
+#include "xlsxsharedstrings_p.h"
+#include "xlsxstyles_p.h"
+#include "xlsxutility_p.h"
+#include "xlsxworkbook.h"
+#include "xlsxworksheet_p.h"
+
+#include <cmath>
+
+#include <QBuffer>
+#include <QDate>
+#include <QDateTime>
+#include <QDebug>
+#include <QDir>
+#include <QFile>
+#include <QMap>
+#include <QMapIterator>
+#include <QPoint>
+#include <QTextDocument>
+#include <QTime>
+#include <QUrl>
+#include <QVariant>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QtGlobal>
 
 QT_BEGIN_NAMESPACE_XLSX
 
 WorksheetPrivate::WorksheetPrivate(Worksheet *p, Worksheet::CreateFlag flag)
-: AbstractSheetPrivate(p, flag),
-  windowProtection(false),
-  showFormulas(false),
-  showGridLines(true),
-  showRowColHeaders(true),
-  showZeros(true),
-  rightToLeft(false),
-  tabSelected(false),
-  showRuler(false),
-  showOutlineSymbols(true),
-  showWhiteSpace(true),
-  urlPattern(QStringLiteral("^([fh]tt?ps?://)|(mailto:)|(file://)"))
+    : AbstractSheetPrivate(p, flag)
+    , windowProtection(false)
+    , showFormulas(false)
+    , showGridLines(true)
+    , showRowColHeaders(true)
+    , showZeros(true)
+    , rightToLeft(false)
+    , tabSelected(false)
+    , showRuler(false)
+    , showOutlineSymbols(true)
+    , showWhiteSpace(true)
+    , urlPattern(QStringLiteral("^([fh]tt?ps?://)|(mailto:)|(file://)"))
 {
-	previous_row = 0;
+    previous_row = 0;
 
-	outline_row_level = 0;
-	outline_col_level = 0;
+    outline_row_level = 0;
+    outline_col_level = 0;
 
-	default_row_height = 15;
-	default_row_zeroed = false;
+    default_row_height = 15;
+    default_row_zeroed = false;
 }
 
-WorksheetPrivate::~WorksheetPrivate()
-{
-}
+WorksheetPrivate::~WorksheetPrivate() {}
 
 /*
   Calculate the "spans" attribute of the <row> tag. This is an
@@ -77,61 +76,62 @@ WorksheetPrivate::~WorksheetPrivate()
  */
 void WorksheetPrivate::calculateSpans() const
 {
-	row_spans.clear();
-	int span_min = XLSX_COLUMN_MAX+1;
-	int span_max = -1;
+    row_spans.clear();
+    int span_min = XLSX_COLUMN_MAX + 1;
+    int span_max = -1;
 
-	for (int row_num = dimension.firstRow(); row_num <= dimension.lastRow(); row_num++) {
+    for (int row_num = dimension.firstRow(); row_num <= dimension.lastRow(); row_num++) {
         auto it = cellTable.constFind(row_num);
         if (it != cellTable.constEnd()) {
-			for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn(); col_num++) {
+            for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn();
+                 col_num++) {
                 if (it->contains(col_num)) {
-					if (span_max == -1) {
-						span_min = col_num;
-						span_max = col_num;
-					} else {
-						if (col_num < span_min)
-							span_min = col_num;
-						else if (col_num > span_max)
-							span_max = col_num;
-					}
-				}
-			}
-		}
+                    if (span_max == -1) {
+                        span_min = col_num;
+                        span_max = col_num;
+                    } else {
+                        if (col_num < span_min)
+                            span_min = col_num;
+                        else if (col_num > span_max)
+                            span_max = col_num;
+                    }
+                }
+            }
+        }
         auto cIt = comments.constFind(row_num);
         if (cIt != comments.constEnd()) {
-			for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn(); col_num++) {
+            for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn();
+                 col_num++) {
                 if (cIt->contains(col_num)) {
-					if (span_max == -1) {
-						span_min = col_num;
-						span_max = col_num;
-					} else {
-						if (col_num < span_min)
-							span_min = col_num;
-						else if (col_num > span_max)
-							span_max = col_num;
-					}
-				}
-			}
-		}
-
-		if (row_num%16 == 0 || row_num == dimension.lastRow()) {
-			if (span_max != -1) {
+                    if (span_max == -1) {
+                        span_min = col_num;
+                        span_max = col_num;
+                    } else {
+                        if (col_num < span_min)
+                            span_min = col_num;
+                        else if (col_num > span_max)
+                            span_max = col_num;
+                    }
+                }
+            }
+        }
+
+        if (row_num % 16 == 0 || row_num == dimension.lastRow()) {
+            if (span_max != -1) {
                 row_spans[row_num / 16] = QStringLiteral("%1:%2").arg(span_min).arg(span_max);
-				span_min = XLSX_COLUMN_MAX+1;
-				span_max = -1;
-			}
-		}
-	}
+                span_min                = XLSX_COLUMN_MAX + 1;
+                span_max                = -1;
+            }
+        }
+    }
 }
 
-
 QString WorksheetPrivate::generateDimensionString() const
 {
-	if (!dimension.isValid())
-		return QStringLiteral("A1");
-	else
-		return dimension.toString();
+    if (!dimension.isValid())
+        return QStringLiteral("A1");
+    else
+        return dimension.toString();
 }
 
 /*
@@ -143,22 +143,26 @@ QString WorksheetPrivate::generateDimensionString() const
 */
 int WorksheetPrivate::checkDimensions(int row, int col, bool ignore_row, bool ignore_col)
 {
-	Q_ASSERT_X(row!=0, "checkDimensions", "row should start from 1 instead of 0");
-	Q_ASSERT_X(col!=0, "checkDimensions", "column should start from 1 instead of 0");
+    Q_ASSERT_X(row != 0, "checkDimensions", "row should start from 1 instead of 0");
+    Q_ASSERT_X(col != 0, "checkDimensions", "column should start from 1 instead of 0");
 
-	if (row > XLSX_ROW_MAX || row < 1 || col > XLSX_COLUMN_MAX || col < 1)
-		return -1;
+    if (row > XLSX_ROW_MAX || row < 1 || col > XLSX_COLUMN_MAX || col < 1)
+        return -1;
 
-	if (!ignore_row) {
-		if (row < dimension.firstRow() || dimension.firstRow() == -1) dimension.setFirstRow(row);
-		if (row > dimension.lastRow()) dimension.setLastRow(row);
-	}
-	if (!ignore_col) {
-		if (col < dimension.firstColumn() || dimension.firstColumn() == -1) dimension.setFirstColumn(col);
-		if (col > dimension.lastColumn()) dimension.setLastColumn(col);
-	}
+    if (!ignore_row) {
+        if (row < dimension.firstRow() || dimension.firstRow() == -1)
+            dimension.setFirstRow(row);
+        if (row > dimension.lastRow())
+            dimension.setLastRow(row);
+    }
+    if (!ignore_col) {
+        if (col < dimension.firstColumn() || dimension.firstColumn() == -1)
+            dimension.setFirstColumn(col);
+        if (col > dimension.lastColumn())
+            dimension.setLastColumn(col);
+    }
 
-	return 0;
+    return 0;
 }
 
 /*!
@@ -171,10 +175,10 @@ int WorksheetPrivate::checkDimensions(int row, int col, bool ignore_row, bool ig
  * \internal
  */
 Worksheet::Worksheet(const QString &name, int id, Workbook *workbook, CreateFlag flag)
-	:AbstractSheet(name, id, workbook, new WorksheetPrivate(this, flag))
+    : AbstractSheet(name, id, workbook, new WorksheetPrivate(this, flag))
 {
-	if (!workbook) //For unit test propose only. Ignore the memery leak.
-		d_func()->workbook = new Workbook(flag);
+    if (!workbook) // For unit test propose only. Ignore the memery leak.
+        d_func()->workbook = new Workbook(flag);
 }
 
 /*!
@@ -185,57 +189,53 @@ Worksheet::Worksheet(const QString &name, int id, Workbook *workbook, CreateFlag
 
 Worksheet *Worksheet::copy(const QString &distName, int distId) const
 {
-	Q_D(const Worksheet);
-	Worksheet *sheet = new Worksheet(distName, distId, d->workbook, F_NewFromScratch);
-	WorksheetPrivate *sheet_d = sheet->d_func();
+    Q_D(const Worksheet);
+    Worksheet *sheet          = new Worksheet(distName, distId, d->workbook, F_NewFromScratch);
+    WorksheetPrivate *sheet_d = sheet->d_func();
 
-	sheet_d->dimension = d->dimension;
+    sheet_d->dimension = d->dimension;
 
-    QMapIterator<int, QMap<int, std::shared_ptr<Cell> > > it(d->cellTable);
-    while (it.hasNext())
-    {
-		it.next();
-		int row = it.key();
-        QMapIterator<int, std::shared_ptr<Cell> > it2(it.value());
-        while (it2.hasNext())
-        {
-			it2.next();
-			int col = it2.key();
+    QMapIterator<int, QMap<int, std::shared_ptr<Cell>>> it(d->cellTable);
+    while (it.hasNext()) {
+        it.next();
+        int row = it.key();
+        QMapIterator<int, std::shared_ptr<Cell>> it2(it.value());
+        while (it2.hasNext()) {
+            it2.next();
+            int col = it2.key();
 
-            auto cell = std::make_shared<Cell>(it2.value().get());
-			cell->d_ptr->parent = sheet;
+            auto cell           = std::make_shared<Cell>(it2.value().get());
+            cell->d_ptr->parent = sheet;
 
-			if (cell->cellType() == Cell::SharedStringType)
-				d->workbook->sharedStrings()->addSharedString(cell->d_ptr->richString);
+            if (cell->cellType() == Cell::SharedStringType)
+                d->workbook->sharedStrings()->addSharedString(cell->d_ptr->richString);
 
-			sheet_d->cellTable[row][col] = cell;
-		}
-	}
+            sheet_d->cellTable[row][col] = cell;
+        }
+    }
 
-	sheet_d->merges = d->merges;
-//    sheet_d->rowsInfo = d->rowsInfo;
-//    sheet_d->colsInfo = d->colsInfo;
-//    sheet_d->colsInfoHelper = d->colsInfoHelper;
-//    sheet_d->dataValidationsList = d->dataValidationsList;
-//    sheet_d->conditionalFormattingList = d->conditionalFormattingList;
+    sheet_d->merges = d->merges;
+    //    sheet_d->rowsInfo = d->rowsInfo;
+    //    sheet_d->colsInfo = d->colsInfo;
+    //    sheet_d->colsInfoHelper = d->colsInfoHelper;
+    //    sheet_d->dataValidationsList = d->dataValidationsList;
+    //    sheet_d->conditionalFormattingList = d->conditionalFormattingList;
 
-	return sheet;
+    return sheet;
 }
 
 /*!
  * Destroys this workssheet.
  */
-Worksheet::~Worksheet()
-{
-}
+Worksheet::~Worksheet() {}
 
 /*!
  * Returns whether sheet is protected.
  */
 bool Worksheet::isWindowProtected() const
 {
-	Q_D(const Worksheet);
-	return d->windowProtection;
+    Q_D(const Worksheet);
+    return d->windowProtection;
 }
 
 /*!
@@ -243,8 +243,8 @@ bool Worksheet::isWindowProtected() const
  */
 void Worksheet::setWindowProtected(bool protect)
 {
-	Q_D(Worksheet);
-	d->windowProtection = protect;
+    Q_D(Worksheet);
+    d->windowProtection = protect;
 }
 
 /*!
@@ -252,8 +252,8 @@ void Worksheet::setWindowProtected(bool protect)
  */
 bool Worksheet::isFormulasVisible() const
 {
-	Q_D(const Worksheet);
-	return d->showFormulas;
+    Q_D(const Worksheet);
+    return d->showFormulas;
 }
 
 /*!
@@ -261,8 +261,8 @@ bool Worksheet::isFormulasVisible() const
  */
 void Worksheet::setFormulasVisible(bool visible)
 {
-	Q_D(Worksheet);
-	d->showFormulas = visible;
+    Q_D(Worksheet);
+    d->showFormulas = visible;
 }
 
 /*!
@@ -270,8 +270,8 @@ void Worksheet::setFormulasVisible(bool visible)
  */
 bool Worksheet::isGridLinesVisible() const
 {
-	Q_D(const Worksheet);
-	return d->showGridLines;
+    Q_D(const Worksheet);
+    return d->showGridLines;
 }
 
 /*!
@@ -279,8 +279,8 @@ bool Worksheet::isGridLinesVisible() const
  */
 void Worksheet::setGridLinesVisible(bool visible)
 {
-	Q_D(Worksheet);
-	d->showGridLines = visible;
+    Q_D(Worksheet);
+    d->showGridLines = visible;
 }
 
 /*!
@@ -288,8 +288,8 @@ void Worksheet::setGridLinesVisible(bool visible)
  */
 bool Worksheet::isRowColumnHeadersVisible() const
 {
-	Q_D(const Worksheet);
-	return d->showRowColHeaders;
+    Q_D(const Worksheet);
+    return d->showRowColHeaders;
 }
 
 /*!
@@ -297,18 +297,17 @@ bool Worksheet::isRowColumnHeadersVisible() const
  */
 void Worksheet::setRowColumnHeadersVisible(bool visible)
 {
-	Q_D(Worksheet);
-	d->showRowColHeaders = visible;
+    Q_D(Worksheet);
+    d->showRowColHeaders = visible;
 }
 
-
 /*!
  * Return whether the sheet is shown right-to-left or not.
  */
 bool Worksheet::isRightToLeft() const
 {
-	Q_D(const Worksheet);
-	return d->rightToLeft;
+    Q_D(const Worksheet);
+    return d->rightToLeft;
 }
 
 /*!
@@ -316,8 +315,8 @@ bool Worksheet::isRightToLeft() const
  */
 void Worksheet::setRightToLeft(bool enable)
 {
-	Q_D(Worksheet);
-	d->rightToLeft = enable;
+    Q_D(Worksheet);
+    d->rightToLeft = enable;
 }
 
 /*!
@@ -325,8 +324,8 @@ void Worksheet::setRightToLeft(bool enable)
  */
 bool Worksheet::isZerosVisible() const
 {
-	Q_D(const Worksheet);
-	return d->showZeros;
+    Q_D(const Worksheet);
+    return d->showZeros;
 }
 
 /*!
@@ -334,8 +333,8 @@ bool Worksheet::isZerosVisible() const
  */
 void Worksheet::setZerosVisible(bool visible)
 {
-	Q_D(Worksheet);
-	d->showZeros = visible;
+    Q_D(Worksheet);
+    d->showZeros = visible;
 }
 
 /*!
@@ -343,8 +342,8 @@ void Worksheet::setZerosVisible(bool visible)
  */
 bool Worksheet::isSelected() const
 {
-	Q_D(const Worksheet);
-	return d->tabSelected;
+    Q_D(const Worksheet);
+    return d->tabSelected;
 }
 
 /*!
@@ -352,8 +351,8 @@ bool Worksheet::isSelected() const
  */
 void Worksheet::setSelected(bool select)
 {
-	Q_D(Worksheet);
-	d->tabSelected = select;
+    Q_D(Worksheet);
+    d->tabSelected = select;
 }
 
 /*!
@@ -361,9 +360,8 @@ void Worksheet::setSelected(bool select)
  */
 bool Worksheet::isRulerVisible() const
 {
-	Q_D(const Worksheet);
-	return d->showRuler;
-
+    Q_D(const Worksheet);
+    return d->showRuler;
 }
 
 /*!
@@ -371,9 +369,8 @@ bool Worksheet::isRulerVisible() const
  */
 void Worksheet::setRulerVisible(bool visible)
 {
-	Q_D(Worksheet);
-	d->showRuler = visible;
-
+    Q_D(Worksheet);
+    d->showRuler = visible;
 }
 
 /*!
@@ -381,8 +378,8 @@ void Worksheet::setRulerVisible(bool visible)
  */
 bool Worksheet::isOutlineSymbolsVisible() const
 {
-	Q_D(const Worksheet);
-	return d->showOutlineSymbols;
+    Q_D(const Worksheet);
+    return d->showOutlineSymbols;
 }
 
 /*!
@@ -390,8 +387,8 @@ bool Worksheet::isOutlineSymbolsVisible() const
  */
 void Worksheet::setOutlineSymbolsVisible(bool visible)
 {
-	Q_D(Worksheet);
-	d->showOutlineSymbols = visible;
+    Q_D(Worksheet);
+    d->showOutlineSymbols = visible;
 }
 
 /*!
@@ -399,8 +396,8 @@ void Worksheet::setOutlineSymbolsVisible(bool visible)
  */
 bool Worksheet::isWhiteSpaceVisible() const
 {
-	Q_D(const Worksheet);
-	return d->showWhiteSpace;
+    Q_D(const Worksheet);
+    return d->showWhiteSpace;
 }
 
 /*!
@@ -408,8 +405,8 @@ bool Worksheet::isWhiteSpaceVisible() const
  */
 void Worksheet::setWhiteSpaceVisible(bool visible)
 {
-	Q_D(Worksheet);
-	d->showWhiteSpace = visible;
+    Q_D(Worksheet);
+    d->showWhiteSpace = visible;
 }
 
 /*!
@@ -420,88 +417,65 @@ void Worksheet::setWhiteSpaceVisible(bool visible)
  */
 bool Worksheet::write(int row, int column, const QVariant &value, const Format &format)
 {
-	Q_D(Worksheet);
-
-	if (d->checkDimensions(row, column))
-		return false;
+    Q_D(Worksheet);
 
-	bool ret = true;
-    if (value.isNull())
-    {
-		//Blank
-		ret = writeBlank(row, column, format);
-    }
-    else if (value.userType() == QMetaType::QString)
-    {
-		//String
-		QString token = value.toString();
-		bool ok;
+    if (d->checkDimensions(row, column))
+        return false;
 
-        if (token.startsWith(QLatin1String("=")))
-        {
-			//convert to formula
-			ret = writeFormula(row, column, CellFormula(token), format);
-        }
-        else if (d->workbook->isStringsToHyperlinksEnabled() && token.contains(d->urlPattern))
-        {
-			//convert to url
-			ret = writeHyperlink(row, column, QUrl(token));
+    bool ret = true;
+    if (value.isNull()) {
+        // Blank
+        ret = writeBlank(row, column, format);
+    } else if (value.userType() == QMetaType::QString) {
+        // String
+        QString token = value.toString();
+        bool ok;
+
+        if (token.startsWith(QLatin1String("="))) {
+            // convert to formula
+            ret = writeFormula(row, column, CellFormula(token), format);
+        } else if (d->workbook->isStringsToHyperlinksEnabled() && token.contains(d->urlPattern)) {
+            // convert to url
+            ret = writeHyperlink(row, column, QUrl(token));
+        } else if (d->workbook->isStringsToNumbersEnabled() && (value.toDouble(&ok), ok)) {
+            // Try convert string to number if the flag enabled.
+            ret = writeNumeric(row, column, value.toDouble(), format);
+        } else {
+            // normal string now
+            ret = writeString(row, column, token, format);
         }
-        else if (d->workbook->isStringsToNumbersEnabled() && (value.toDouble(&ok), ok))
-        {
-			//Try convert string to number if the flag enabled.
-			ret = writeNumeric(row, column, value.toDouble(), format);
-        }
-        else
-        {
-			//normal string now
-			ret = writeString(row, column, token, format);
-		}
-    }
-    else if (value.userType() == qMetaTypeId<RichString>())
-    {
-		ret = writeString(row, column, value.value<RichString>(), format);
-    }
-    else if (value.userType() == QMetaType::Int || value.userType() == QMetaType::UInt
-			   || value.userType() == QMetaType::LongLong || value.userType() == QMetaType::ULongLong
-               || value.userType() == QMetaType::Double || value.userType() == QMetaType::Float)
+    } else if (value.userType() == qMetaTypeId<RichString>()) {
+        ret = writeString(row, column, value.value<RichString>(), format);
+    } else if (value.userType() == QMetaType::Int || value.userType() == QMetaType::UInt ||
+               value.userType() == QMetaType::LongLong ||
+               value.userType() == QMetaType::ULongLong || value.userType() == QMetaType::Double ||
+               value.userType() == QMetaType::Float) {
+        // Number
+
+        ret = writeNumeric(row, column, value.toDouble(), format);
+    } else if (value.userType() == QMetaType::Bool) {
+        // Bool
+        ret = writeBool(row, column, value.toBool(), format);
+    } else if (value.userType() == QMetaType::QDateTime) // dev67
     {
-		//Number
-
-		ret = writeNumeric(row, column, value.toDouble(), format);
-    }
-    else if (value.userType() == QMetaType::Bool)
-    {
-		//Bool
-		ret = writeBool(row,column, value.toBool(), format);
-    }
-    else if (value.userType() == QMetaType::QDateTime ) // dev67
-    {
-		//DateTime, Date
-		//  note that, QTime cann't convert to QDateTime
-		ret = writeDateTime(row, column, value.toDateTime(), format);
-    }
-    else if ( value.userType() == QMetaType::QDate ) // dev67
+        // DateTime, Date
+        //   note that, QTime cann't convert to QDateTime
+        ret = writeDateTime(row, column, value.toDateTime(), format);
+    } else if (value.userType() == QMetaType::QDate) // dev67
     {
         ret = writeDate(row, column, value.toDate(), format);
+    } else if (value.userType() == QMetaType::QTime) {
+        // Time
+        ret = writeTime(row, column, value.toTime(), format);
+    } else if (value.userType() == QMetaType::QUrl) {
+        // Url
+        ret = writeHyperlink(row, column, value.toUrl(), format);
+    } else {
+        // Wrong type
+        return false;
     }
-    else if (value.userType() == QMetaType::QTime)
-    {
-		//Time
-		ret = writeTime(row, column, value.toTime(), format);
-    }
-    else if (value.userType() == QMetaType::QUrl)
-    {
-		//Url
-		ret = writeHyperlink(row, column, value.toUrl(), format);
-    }
-    else
-    {
-		//Wrong type
-		return false;
-	}
 
-	return ret;
+    return ret;
 }
 
 /*!
@@ -512,66 +486,59 @@ bool Worksheet::write(int row, int column, const QVariant &value, const Format &
  */
 bool Worksheet::write(const CellReference &row_column, const QVariant &value, const Format &format)
 {
-	if (!row_column.isValid())
-		return false;
+    if (!row_column.isValid())
+        return false;
 
-	return write(row_column.row(), row_column.column(), value, format);
+    return write(row_column.row(), row_column.column(), value, format);
 }
 
 /*!
-	\overload
-	Return the contents of the cell \a row_column.
+        \overload
+        Return the contents of the cell \a row_column.
  */
 QVariant Worksheet::read(const CellReference &row_column) const
 {
-	if (!row_column.isValid())
-		return QVariant();
+    if (!row_column.isValid())
+        return QVariant();
 
-	return read(row_column.row(), row_column.column());
+    return read(row_column.row(), row_column.column());
 }
 
 /*!
-	Return the contents of the cell (\a row, \a column).
+        Return the contents of the cell (\a row, \a column).
  */
 QVariant Worksheet::read(int row, int column) const
 {
-	Q_D(const Worksheet);
-
-	Cell *cell = cellAt(row, column);
-	if (!cell)
-		return QVariant();
+    Q_D(const Worksheet);
 
-    if (cell->hasFormula())
-    {
-        if (cell->formula().formulaType() == CellFormula::NormalType)
-        {
-			return QVariant(QLatin1String("=")+cell->formula().formulaText());
-        }
-        else if (cell->formula().formulaType() == CellFormula::SharedType)
-        {
-            if (!cell->formula().formulaText().isEmpty())
-            {
-				return QVariant(QLatin1String("=")+cell->formula().formulaText());
+    Cell *cell = cellAt(row, column);
+    if (!cell)
+        return QVariant();
+
+    if (cell->hasFormula()) {
+        if (cell->formula().formulaType() == CellFormula::NormalType) {
+            return QVariant(QLatin1String("=") + cell->formula().formulaText());
+        } else if (cell->formula().formulaType() == CellFormula::SharedType) {
+            if (!cell->formula().formulaText().isEmpty()) {
+                return QVariant(QLatin1String("=") + cell->formula().formulaText());
+            } else {
+                int si                         = cell->formula().sharedIndex();
+                const CellFormula &rootFormula = d->sharedFormulaMap[si];
+                CellReference rootCellRef      = rootFormula.reference().topLeft();
+                QString rootFormulaText        = rootFormula.formulaText();
+                QString newFormulaText =
+                    convertSharedFormula(rootFormulaText, rootCellRef, CellReference(row, column));
+                return QVariant(QLatin1String("=") + newFormulaText);
             }
-            else
-            {
-                int si = cell->formula().sharedIndex();
-                const CellFormula &rootFormula = d->sharedFormulaMap[ si ];
-				CellReference rootCellRef = rootFormula.reference().topLeft();
-				QString rootFormulaText = rootFormula.formulaText();
-				QString newFormulaText = convertSharedFormula(rootFormulaText, rootCellRef, CellReference(row, column));
-				return QVariant(QLatin1String("=")+newFormulaText);
-			}
-		}
-	}
-
-    if (cell->isDateTime())
-    {
+        }
+    }
+
+    if (cell->isDateTime()) {
         QVariant vDateTime = cell->dateTime();
         return vDateTime;
-	}
+    }
 
-	return cell->value();
+    return cell->value();
 }
 
 /*!
@@ -580,10 +547,10 @@ QVariant Worksheet::read(int row, int column) const
  */
 Cell *Worksheet::cellAt(const CellReference &row_column) const
 {
-	if (!row_column.isValid())
-		return 0;
+    if (!row_column.isValid())
+        return 0;
 
-	return cellAt(row_column.row(), row_column.column());
+    return cellAt(row_column.row(), row_column.column());
 }
 
 /*!
@@ -592,12 +559,12 @@ Cell *Worksheet::cellAt(const CellReference &row_column) const
  */
 Cell *Worksheet::cellAt(int row, int col) const
 {
-	Q_D(const Worksheet);
+    Q_D(const Worksheet);
     auto it = d->cellTable.constFind(row);
     if (it == d->cellTable.constEnd())
-		return 0;
+        return 0;
     if (!it->contains(col))
-		return 0;
+        return 0;
 
     return (*it)[col].get();
 }
@@ -606,9 +573,9 @@ Format WorksheetPrivate::cellFormat(int row, int col) const
 {
     auto it = cellTable.constFind(row);
     if (it == cellTable.constEnd())
-		return Format();
+        return Format();
     if (!it->contains(col))
-		return Format();
+        return Format();
     return (*it)[col]->format();
 }
 
@@ -618,12 +585,14 @@ Format WorksheetPrivate::cellFormat(int row, int col) const
 
   Returns true on success.
  */
-bool Worksheet::writeString(const CellReference &row_column, const RichString &value, const Format &format)
+bool Worksheet::writeString(const CellReference &row_column,
+                            const RichString &value,
+                            const Format &format)
 {
-	if (!row_column.isValid())
-		return false;
+    if (!row_column.isValid())
+        return false;
 
-	return writeString(row_column.row(), row_column.column(), value, format);
+    return writeString(row_column.row(), row_column.column(), value, format);
 }
 
 /*!
@@ -632,285 +601,295 @@ bool Worksheet::writeString(const CellReference &row_column, const RichString &v
 */
 bool Worksheet::writeString(int row, int column, const RichString &value, const Format &format)
 {
-	Q_D(Worksheet);
-//    QString content = value.toPlainString();
-	if (d->checkDimensions(row, column))
-		return false;
-
-//    if (content.size() > d->xls_strmax) {
-//        content = content.left(d->xls_strmax);
-//        error = -2;
-//    }
-
-	d->sharedStrings()->addSharedString(value);
-	Format fmt = format.isValid() ? format : d->cellFormat(row, column);
-	if (value.fragmentCount() == 1 && value.fragmentFormat(0).isValid())
-		fmt.mergeFormat(value.fragmentFormat(0));
-	d->workbook->styles()->addXfFormat(fmt);
+    Q_D(Worksheet);
+    //    QString content = value.toPlainString();
+    if (d->checkDimensions(row, column))
+        return false;
+
+    //    if (content.size() > d->xls_strmax) {
+    //        content = content.left(d->xls_strmax);
+    //        error = -2;
+    //    }
+
+    d->sharedStrings()->addSharedString(value);
+    Format fmt = format.isValid() ? format : d->cellFormat(row, column);
+    if (value.fragmentCount() == 1 && value.fragmentFormat(0).isValid())
+        fmt.mergeFormat(value.fragmentFormat(0));
+    d->workbook->styles()->addXfFormat(fmt);
     auto cell = std::make_shared<Cell>(value.toPlainString(), Cell::SharedStringType, fmt, this);
-	cell->d_ptr->richString = value;
-	d->cellTable[row][column] = cell;
-	return true;
+    cell->d_ptr->richString   = value;
+    d->cellTable[row][column] = cell;
+    return true;
 }
 
 /*!
-	\overload
-	Write string \a value to the cell \a row_column with the \a format.
+        \overload
+        Write string \a value to the cell \a row_column with the \a format.
  */
-bool Worksheet::writeString(const CellReference &row_column, const QString &value, const Format &format)
+bool Worksheet::writeString(const CellReference &row_column,
+                            const QString &value,
+                            const Format &format)
 {
-	if (!row_column.isValid())
-		return false;
+    if (!row_column.isValid())
+        return false;
 
-	return writeString(row_column.row(), row_column.column(), value, format);
+    return writeString(row_column.row(), row_column.column(), value, format);
 }
 
 /*!
-	\overload
+        \overload
 
-	Write string \a value to the cell (\a row, \a column) with the \a format.
-	Returns true on success.
+        Write string \a value to the cell (\a row, \a column) with the \a format.
+        Returns true on success.
 */
 bool Worksheet::writeString(int row, int column, const QString &value, const Format &format)
 {
-	Q_D(Worksheet);
-	if (d->checkDimensions(row, column))
-		return false;
+    Q_D(Worksheet);
+    if (d->checkDimensions(row, column))
+        return false;
 
-	RichString rs;
-	if (d->workbook->isHtmlToRichStringEnabled() && Qt::mightBeRichText(value))
-		rs.setHtml(value);
-	else
-		rs.addFragment(value, Format());
+    RichString rs;
+    if (d->workbook->isHtmlToRichStringEnabled() && Qt::mightBeRichText(value))
+        rs.setHtml(value);
+    else
+        rs.addFragment(value, Format());
 
-	return writeString(row, column, rs, format);
+    return writeString(row, column, rs, format);
 }
 
 /*!
-	\overload
-	Write string \a value to the cell \a row_column with the \a format
+        \overload
+        Write string \a value to the cell \a row_column with the \a format
  */
-bool Worksheet::writeInlineString(const CellReference &row_column, const QString &value, const Format &format)
+bool Worksheet::writeInlineString(const CellReference &row_column,
+                                  const QString &value,
+                                  const Format &format)
 {
-	if (!row_column.isValid())
-		return false;
+    if (!row_column.isValid())
+        return false;
 
-	return writeInlineString(row_column.row(), row_column.column(), value, format);
+    return writeInlineString(row_column.row(), row_column.column(), value, format);
 }
 
 /*!
-	Write string \a value to the cell (\a row, \a column) with the \a format.
-	Returns true on success.
+        Write string \a value to the cell (\a row, \a column) with the \a format.
+        Returns true on success.
 */
 bool Worksheet::writeInlineString(int row, int column, const QString &value, const Format &format)
 {
-	Q_D(Worksheet);
-	//int error = 0;
-	QString content = value;
-	if (d->checkDimensions(row, column))
-		return false;
+    Q_D(Worksheet);
+    // int error = 0;
+    QString content = value;
+    if (d->checkDimensions(row, column))
+        return false;
 
-	if (value.size() > XLSX_STRING_MAX) {
-		content = value.left(XLSX_STRING_MAX);
-		//error = -2;
-	}
+    if (value.size() > XLSX_STRING_MAX) {
+        content = value.left(XLSX_STRING_MAX);
+        // error = -2;
+    }
 
-	Format fmt = format.isValid() ? format : d->cellFormat(row, column);
-	d->workbook->styles()->addXfFormat(fmt);
+    Format fmt = format.isValid() ? format : d->cellFormat(row, column);
+    d->workbook->styles()->addXfFormat(fmt);
     d->cellTable[row][column] = std::make_shared<Cell>(value, Cell::InlineStringType, fmt, this);
-	return true;
+    return true;
 }
 
 /*!
-	\overload
-	Write numeric \a value to the cell \a row_column with the \a format.
-	Returns true on success.
+        \overload
+        Write numeric \a value to the cell \a row_column with the \a format.
+        Returns true on success.
  */
 bool Worksheet::writeNumeric(const CellReference &row_column, double value, const Format &format)
 {
-	if (!row_column.isValid())
-		return false;
+    if (!row_column.isValid())
+        return false;
 
-	return writeNumeric(row_column.row(), row_column.column(), value, format);
+    return writeNumeric(row_column.row(), row_column.column(), value, format);
 }
 
 /*!
-	Write numeric \a value to the cell (\a row, \a column) with the \a format.
-	Returns true on success.
+        Write numeric \a value to the cell (\a row, \a column) with the \a format.
+        Returns true on success.
 */
 bool Worksheet::writeNumeric(int row, int column, double value, const Format &format)
 {
-	Q_D(Worksheet);
-	if (d->checkDimensions(row, column))
-		return false;
+    Q_D(Worksheet);
+    if (d->checkDimensions(row, column))
+        return false;
 
-	Format fmt = format.isValid() ? format : d->cellFormat(row, column);
-	d->workbook->styles()->addXfFormat(fmt);
+    Format fmt = format.isValid() ? format : d->cellFormat(row, column);
+    d->workbook->styles()->addXfFormat(fmt);
     d->cellTable[row][column] = std::make_shared<Cell>(value, Cell::NumberType, fmt, this);
-	return true;
+    return true;
 }
 
-
 /*!
-	\overload
-	Write \a formula to the cell \a row_column with the \a format and \a result.
-	Returns true on success.
+        \overload
+        Write \a formula to the cell \a row_column with the \a format and \a result.
+        Returns true on success.
  */
-bool Worksheet::writeFormula(const CellReference &row_column, const CellFormula &formula, const Format &format, double result)
+bool Worksheet::writeFormula(const CellReference &row_column,
+                             const CellFormula &formula,
+                             const Format &format,
+                             double result)
 {
-	if (!row_column.isValid())
-		return false;
+    if (!row_column.isValid())
+        return false;
 
-	return writeFormula(row_column.row(), row_column.column(), formula, format, result);
+    return writeFormula(row_column.row(), row_column.column(), formula, format, result);
 }
 
 /*!
-	Write \a formula_ to the cell (\a row, \a column) with the \a format and \a result.
-	Returns true on success.
+        Write \a formula_ to the cell (\a row, \a column) with the \a format and \a result.
+        Returns true on success.
 */
-bool Worksheet::writeFormula(int row, int column, const CellFormula &formula_, const Format &format, double result)
+bool Worksheet::writeFormula(int row,
+                             int column,
+                             const CellFormula &formula_,
+                             const Format &format,
+                             double result)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
 
-	if (d->checkDimensions(row, column))
-		return false;
+    if (d->checkDimensions(row, column))
+        return false;
 
-	Format fmt = format.isValid() ? format : d->cellFormat(row, column);
-	d->workbook->styles()->addXfFormat(fmt);
+    Format fmt = format.isValid() ? format : d->cellFormat(row, column);
+    d->workbook->styles()->addXfFormat(fmt);
 
-	CellFormula formula = formula_;
-	formula.d->ca = true;
-    if (formula.formulaType() == CellFormula::SharedType)
-    {
-		//Assign proper shared index for shared formula
+    CellFormula formula = formula_;
+    formula.d->ca       = true;
+    if (formula.formulaType() == CellFormula::SharedType) {
+        // Assign proper shared index for shared formula
         int si = 0;
-        while ( d->sharedFormulaMap.contains(si) )
-        {
-			++si;
+        while (d->sharedFormulaMap.contains(si)) {
+            ++si;
         }
-		formula.d->si = si;
-		d->sharedFormulaMap[si] = formula;
-	}
-
-    auto data = std::make_shared<Cell>(result, Cell::NumberType, fmt, this);
-	data->d_ptr->formula = formula;
-	d->cellTable[row][column] = data;
-
-	CellRange range = formula.reference();
-	if (formula.formulaType() == CellFormula::SharedType) {
-		CellFormula sf(QString(), CellFormula::SharedType);
-		sf.d->si = formula.sharedIndex();
-		for (int r=range.firstRow(); r<=range.lastRow(); ++r) {
-			for (int c=range.firstColumn(); c<=range.lastColumn(); ++c) {
-				if (!(r==row && c==column)) {
-					if(Cell *cell = cellAt(r, c)) {
-						cell->d_ptr->formula = sf;
-					} else {
+        formula.d->si           = si;
+        d->sharedFormulaMap[si] = formula;
+    }
+
+    auto data                 = std::make_shared<Cell>(result, Cell::NumberType, fmt, this);
+    data->d_ptr->formula      = formula;
+    d->cellTable[row][column] = data;
+
+    CellRange range = formula.reference();
+    if (formula.formulaType() == CellFormula::SharedType) {
+        CellFormula sf(QString(), CellFormula::SharedType);
+        sf.d->si = formula.sharedIndex();
+        for (int r = range.firstRow(); r <= range.lastRow(); ++r) {
+            for (int c = range.firstColumn(); c <= range.lastColumn(); ++c) {
+                if (!(r == row && c == column)) {
+                    if (Cell *cell = cellAt(r, c)) {
+                        cell->d_ptr->formula = sf;
+                    } else {
                         auto newCell = std::make_shared<Cell>(result, Cell::NumberType, fmt, this);
-						newCell->d_ptr->formula = sf;
-						d->cellTable[r][c] = newCell;
-					}
-				}
-			}
-		}
-	}
+                        newCell->d_ptr->formula = sf;
+                        d->cellTable[r][c]      = newCell;
+                    }
+                }
+            }
+        }
+    }
 
-	return true;
+    return true;
 }
 
 /*!
-	\overload
-	Write a empty cell \a row_column with the \a format.
-	Returns true on success.
+        \overload
+        Write a empty cell \a row_column with the \a format.
+        Returns true on success.
  */
 bool Worksheet::writeBlank(const CellReference &row_column, const Format &format)
 {
-	if (!row_column.isValid())
-		return false;
+    if (!row_column.isValid())
+        return false;
 
-	return writeBlank(row_column.row(), row_column.column(), format);
+    return writeBlank(row_column.row(), row_column.column(), format);
 }
 
 /*!
-	Write a empty cell (\a row, \a column) with the \a format.
-	Returns true on success.
+        Write a empty cell (\a row, \a column) with the \a format.
+        Returns true on success.
  */
 bool Worksheet::writeBlank(int row, int column, const Format &format)
 {
-	Q_D(Worksheet);
-	if (d->checkDimensions(row, column))
-		return false;
+    Q_D(Worksheet);
+    if (d->checkDimensions(row, column))
+        return false;
 
-	Format fmt = format.isValid() ? format : d->cellFormat(row, column);
-	d->workbook->styles()->addXfFormat(fmt);
+    Format fmt = format.isValid() ? format : d->cellFormat(row, column);
+    d->workbook->styles()->addXfFormat(fmt);
 
-	//Note: NumberType with an invalid QVariant value means blank.
+    // Note: NumberType with an invalid QVariant value means blank.
     d->cellTable[row][column] = std::make_shared<Cell>(QVariant{}, Cell::NumberType, fmt, this);
 
-	return true;
+    return true;
 }
 /*!
-	\overload
-	Write a bool \a value to the cell \a row_column with the \a format.
-	Returns true on success.
+        \overload
+        Write a bool \a value to the cell \a row_column with the \a format.
+        Returns true on success.
  */
 bool Worksheet::writeBool(const CellReference &row_column, bool value, const Format &format)
 {
-	if (!row_column.isValid())
-		return false;
+    if (!row_column.isValid())
+        return false;
 
-	return writeBool(row_column.row(), row_column.column(), value, format);
+    return writeBool(row_column.row(), row_column.column(), value, format);
 }
 
 /*!
-	Write a bool \a value to the cell (\a row, \a column) with the \a format.
-	Returns true on success.
+        Write a bool \a value to the cell (\a row, \a column) with the \a format.
+        Returns true on success.
  */
 bool Worksheet::writeBool(int row, int column, bool value, const Format &format)
 {
-	Q_D(Worksheet);
-	if (d->checkDimensions(row, column))
-		return false;
+    Q_D(Worksheet);
+    if (d->checkDimensions(row, column))
+        return false;
 
-	Format fmt = format.isValid() ? format : d->cellFormat(row, column);
-	d->workbook->styles()->addXfFormat(fmt);
+    Format fmt = format.isValid() ? format : d->cellFormat(row, column);
+    d->workbook->styles()->addXfFormat(fmt);
     d->cellTable[row][column] = std::make_shared<Cell>(value, Cell::BooleanType, fmt, this);
 
-	return true;
+    return true;
 }
 /*!
-	\overload
-	Write a QDateTime \a dt to the cell \a row_column with the \a format.
-	Returns true on success.
+        \overload
+        Write a QDateTime \a dt to the cell \a row_column with the \a format.
+        Returns true on success.
  */
-bool Worksheet::writeDateTime(const CellReference &row_column, const QDateTime &dt, const Format &format)
+bool Worksheet::writeDateTime(const CellReference &row_column,
+                              const QDateTime &dt,
+                              const Format &format)
 {
-	if (!row_column.isValid())
-		return false;
+    if (!row_column.isValid())
+        return false;
 
-	return writeDateTime(row_column.row(), row_column.column(), dt, format);
+    return writeDateTime(row_column.row(), row_column.column(), dt, format);
 }
 
 /*!
-	Write a QDateTime \a dt to the cell (\a row, \a column) with the \a format.
-	Returns true on success.
+        Write a QDateTime \a dt to the cell (\a row, \a column) with the \a format.
+        Returns true on success.
  */
 bool Worksheet::writeDateTime(int row, int column, const QDateTime &dt, const Format &format)
 {
-	Q_D(Worksheet);
-	if (d->checkDimensions(row, column))
-		return false;
+    Q_D(Worksheet);
+    if (d->checkDimensions(row, column))
+        return false;
 
-	Format fmt = format.isValid() ? format : d->cellFormat(row, column);
-	if (!fmt.isValid() || !fmt.isDateTimeFormat())
-		fmt.setNumberFormat(d->workbook->defaultDateFormat());
-	d->workbook->styles()->addXfFormat(fmt);
+    Format fmt = format.isValid() ? format : d->cellFormat(row, column);
+    if (!fmt.isValid() || !fmt.isDateTimeFormat())
+        fmt.setNumberFormat(d->workbook->defaultDateFormat());
+    d->workbook->styles()->addXfFormat(fmt);
 
-	double value = datetimeToNumber(dt, d->workbook->isDate1904());
+    double value = datetimeToNumber(dt, d->workbook->isDate1904());
 
     d->cellTable[row][column] = std::make_shared<Cell>(value, Cell::NumberType, fmt, this);
 
-	return true;
+    return true;
 }
 
 // dev67
@@ -936,7 +915,7 @@ bool Worksheet::writeDate(int row, int column, const QDate &dt, const Format &fo
 
     d->workbook->styles()->addXfFormat(fmt);
 
-    double value = datetimeToNumber(QDateTime(dt, QTime(0,0,0)), d->workbook->isDate1904());
+    double value = datetimeToNumber(QDateTime(dt, QTime(0, 0, 0)), d->workbook->isDate1904());
 
     d->cellTable[row][column] = std::make_shared<Cell>(value, Cell::NumberType, fmt, this);
 
@@ -944,105 +923,117 @@ bool Worksheet::writeDate(int row, int column, const QDate &dt, const Format &fo
 }
 
 /*!
-	\overload
-	Write a QTime \a t to the cell \a row_column with the \a format.
-	Returns true on success.
+        \overload
+        Write a QTime \a t to the cell \a row_column with the \a format.
+        Returns true on success.
  */
 bool Worksheet::writeTime(const CellReference &row_column, const QTime &t, const Format &format)
 {
-	if (!row_column.isValid())
-		return false;
+    if (!row_column.isValid())
+        return false;
 
-	return writeTime(row_column.row(), row_column.column(), t, format);
+    return writeTime(row_column.row(), row_column.column(), t, format);
 }
 
 /*!
-	Write a QTime \a t to the cell (\a row, \a column) with the \a format.
-	Returns true on success.
+        Write a QTime \a t to the cell (\a row, \a column) with the \a format.
+        Returns true on success.
  */
 bool Worksheet::writeTime(int row, int column, const QTime &t, const Format &format)
 {
-	Q_D(Worksheet);
-	if (d->checkDimensions(row, column))
-		return false;
+    Q_D(Worksheet);
+    if (d->checkDimensions(row, column))
+        return false;
 
-	Format fmt = format.isValid() ? format : d->cellFormat(row, column);
-	if (!fmt.isValid() || !fmt.isDateTimeFormat())
-		fmt.setNumberFormat(QStringLiteral("hh:mm:ss"));
-	d->workbook->styles()->addXfFormat(fmt);
+    Format fmt = format.isValid() ? format : d->cellFormat(row, column);
+    if (!fmt.isValid() || !fmt.isDateTimeFormat())
+        fmt.setNumberFormat(QStringLiteral("hh:mm:ss"));
+    d->workbook->styles()->addXfFormat(fmt);
 
-    d->cellTable[row][column] = std::make_shared<Cell>(timeToNumber(t), Cell::NumberType, fmt, this);
+    d->cellTable[row][column] =
+        std::make_shared<Cell>(timeToNumber(t), Cell::NumberType, fmt, this);
 
-	return true;
+    return true;
 }
 
 /*!
-	\overload
-	Write a QUrl \a url to the cell \a row_column with the given \a format \a display and \a tip.
-	Returns true on success.
+        \overload
+        Write a QUrl \a url to the cell \a row_column with the given \a format \a display and \a
+   tip. Returns true on success.
  */
-bool Worksheet::writeHyperlink(const CellReference &row_column, const QUrl &url, const Format &format, const QString &display, const QString &tip)
+bool Worksheet::writeHyperlink(const CellReference &row_column,
+                               const QUrl &url,
+                               const Format &format,
+                               const QString &display,
+                               const QString &tip)
 {
-	if (!row_column.isValid())
-		return false;
+    if (!row_column.isValid())
+        return false;
 
-	return writeHyperlink(row_column.row(), row_column.column(), url, format, display, tip);
+    return writeHyperlink(row_column.row(), row_column.column(), url, format, display, tip);
 }
 
 /*!
-	Write a QUrl \a url to the cell (\a row, \a column) with the given \a format \a display and \a tip.
-	Returns true on success.
+        Write a QUrl \a url to the cell (\a row, \a column) with the given \a format \a display and
+   \a tip. Returns true on success.
  */
-bool Worksheet::writeHyperlink(int row, int column, const QUrl &url, const Format &format, const QString &display, const QString &tip)
+bool Worksheet::writeHyperlink(int row,
+                               int column,
+                               const QUrl &url,
+                               const Format &format,
+                               const QString &display,
+                               const QString &tip)
 {
-	Q_D(Worksheet);
-	if (d->checkDimensions(row, column))
-		return false;
-
-	//int error = 0;
+    Q_D(Worksheet);
+    if (d->checkDimensions(row, column))
+        return false;
 
-	QString urlString = url.toString();
+    // int error = 0;
 
-	//Generate proper display string
-	QString displayString = display.isEmpty() ? urlString : display;
-	if (displayString.startsWith(QLatin1String("mailto:")))
-		displayString.replace(QLatin1String("mailto:"), QString());
-	if (displayString.size() > XLSX_STRING_MAX) {
-		displayString = displayString.left(XLSX_STRING_MAX);
-		//error = -2;
-	}
+    QString urlString = url.toString();
 
-	/*
-	  Location within target. If target is a workbook (or this workbook)
-	  this shall refer to a sheet and cell or a defined name. Can also
-	  be an HTML anchor if target is HTML file.
+    // Generate proper display string
+    QString displayString = display.isEmpty() ? urlString : display;
+    if (displayString.startsWith(QLatin1String("mailto:")))
+        displayString.replace(QLatin1String("mailto:"), QString());
+    if (displayString.size() > XLSX_STRING_MAX) {
+        displayString = displayString.left(XLSX_STRING_MAX);
+        // error = -2;
+    }
 
-	  c:\temp\file.xlsx#Sheet!A1
-	  http://a.com/aaa.html#aaaaa
-	*/
-	QString locationString;
-	if (url.hasFragment()) {
-		locationString = url.fragment();
-		urlString = url.toString(QUrl::RemoveFragment);
-	}
+    /*
+      Location within target. If target is a workbook (or this workbook)
+      this shall refer to a sheet and cell or a defined name. Can also
+      be an HTML anchor if target is HTML file.
+
+      c:\temp\file.xlsx#Sheet!A1
+      http://a.com/aaa.html#aaaaa
+    */
+    QString locationString;
+    if (url.hasFragment()) {
+        locationString = url.fragment();
+        urlString      = url.toString(QUrl::RemoveFragment);
+    }
 
-	Format fmt = format.isValid() ? format : d->cellFormat(row, column);
-	//Given a default style for hyperlink
-	if (!fmt.isValid()) {
-		fmt.setVerticalAlignment(Format::AlignVCenter);
-		fmt.setFontColor(Qt::blue);
-		fmt.setFontUnderline(Format::FontUnderlineSingle);
-	}
-	d->workbook->styles()->addXfFormat(fmt);
+    Format fmt = format.isValid() ? format : d->cellFormat(row, column);
+    // Given a default style for hyperlink
+    if (!fmt.isValid()) {
+        fmt.setVerticalAlignment(Format::AlignVCenter);
+        fmt.setFontColor(Qt::blue);
+        fmt.setFontUnderline(Format::FontUnderlineSingle);
+    }
+    d->workbook->styles()->addXfFormat(fmt);
 
-	//Write the hyperlink string as normal string.
-	d->sharedStrings()->addSharedString(displayString);
-    d->cellTable[row][column] = std::make_shared<Cell>(displayString, Cell::SharedStringType, fmt, this);
+    // Write the hyperlink string as normal string.
+    d->sharedStrings()->addSharedString(displayString);
+    d->cellTable[row][column] =
+        std::make_shared<Cell>(displayString, Cell::SharedStringType, fmt, this);
 
-	//Store the hyperlink data in a separate table
-	d->urlTable[row][column] = QSharedPointer<XlsxHyperlinkData>(new XlsxHyperlinkData(XlsxHyperlinkData::External, urlString, locationString, QString(), tip));
+    // Store the hyperlink data in a separate table
+    d->urlTable[row][column] = QSharedPointer<XlsxHyperlinkData>(new XlsxHyperlinkData(
+        XlsxHyperlinkData::External, urlString, locationString, QString(), tip));
 
-	return true;
+    return true;
 }
 
 /*!
@@ -1051,12 +1042,12 @@ bool Worksheet::writeHyperlink(int row, int column, const QUrl &url, const Forma
  */
 bool Worksheet::addDataValidation(const DataValidation &validation)
 {
-	Q_D(Worksheet);
-	if (validation.ranges().isEmpty() || validation.validationType()==DataValidation::None)
-		return false;
+    Q_D(Worksheet);
+    if (validation.ranges().isEmpty() || validation.validationType() == DataValidation::None)
+        return false;
 
-	d->dataValidationsList.append(validation);
-	return true;
+    d->dataValidationsList.append(validation);
+    return true;
 }
 
 /*!
@@ -1065,18 +1056,18 @@ bool Worksheet::addDataValidation(const DataValidation &validation)
  */
 bool Worksheet::addConditionalFormatting(const ConditionalFormatting &cf)
 {
-	Q_D(Worksheet);
-	if (cf.ranges().isEmpty())
-		return false;
+    Q_D(Worksheet);
+    if (cf.ranges().isEmpty())
+        return false;
 
-	for (int i=0; i<cf.d->cfRules.size(); ++i) {
+    for (int i = 0; i < cf.d->cfRules.size(); ++i) {
         const std::shared_ptr<XlsxCfRuleData> &rule = cf.d->cfRules[i];
-		if (!rule->dxfFormat.isEmpty())
-			d->workbook->styles()->addDxfFormat(rule->dxfFormat);
-		rule->priority = 1;
-	}
-	d->conditionalFormattingList.append(cf);
-	return true;
+        if (!rule->dxfFormat.isEmpty())
+            d->workbook->styles()->addDxfFormat(rule->dxfFormat);
+        rule->priority = 1;
+    }
+    d->conditionalFormattingList.append(cf);
+    return true;
 }
 
 /*!
@@ -1085,84 +1076,77 @@ bool Worksheet::addConditionalFormatting(const ConditionalFormatting &cf)
  */
 int Worksheet::insertImage(int row, int column, const QImage &image)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
 
     int imageIndex = 0;
 
-	if (image.isNull())
+    if (image.isNull())
         return imageIndex;
 
-	if (!d->drawing)
-    {
+    if (!d->drawing) {
         d->drawing = std::make_shared<Drawing>(this, F_NewFromScratch);
     }
 
-    DrawingOneCellAnchor* anchor = new DrawingOneCellAnchor(d->drawing.get(), DrawingAnchor::Picture);
+    DrawingOneCellAnchor *anchor =
+        new DrawingOneCellAnchor(d->drawing.get(), DrawingAnchor::Picture);
 
-	/*
-		The size are expressed as English Metric Units (EMUs).
-		EMU is 1/360 000 of centimiter.
-	*/
-	anchor->from = XlsxMarker(row, column, 0, 0);
-	float scaleX = 36e6f / std::max(1,image.dotsPerMeterX());
-	float scaleY = 36e6f / std::max(1,image.dotsPerMeterY());
-	anchor->ext = QSize( int(image.width() * scaleX), int(image.height() * scaleY) );
+    /*
+            The size are expressed as English Metric Units (EMUs).
+            EMU is 1/360 000 of centimiter.
+    */
+    anchor->from = XlsxMarker(row, column, 0, 0);
+    float scaleX = 36e6f / std::max(1, image.dotsPerMeterX());
+    float scaleY = 36e6f / std::max(1, image.dotsPerMeterY());
+    anchor->ext  = QSize(int(image.width() * scaleX), int(image.height() * scaleY));
 
-	anchor->setObjectPicture(image);
+    anchor->setObjectPicture(image);
 
     imageIndex = anchor->getm_id();
 
     return imageIndex;
 }
 
-bool Worksheet::getImage(int imageIndex, QImage& img)
+bool Worksheet::getImage(int imageIndex, QImage &img)
 {
     Q_D(Worksheet);
 
-    if( imageIndex <= (-1) )
-    {
+    if (imageIndex <= (-1)) {
         return false;
     }
 
-    if ( d->drawing == nullptr )
-    {
+    if (d->drawing == nullptr) {
         return false;
     }
 
     int realImageIndex = imageIndex - 1; // minus one
 
-   DrawingAnchor* danchor = d->drawing->anchors.at( realImageIndex );
-   // QSharedPointer<Drawing> // for multithread
-   if ( danchor == nullptr )
-   {
-       return false;
-   }
+    DrawingAnchor *danchor = d->drawing->anchors.at(realImageIndex);
+    // QSharedPointer<Drawing> // for multithread
+    if (danchor == nullptr) {
+        return false;
+    }
 
-   bool ret= danchor->getObjectPicture(img);
-   return ret;
+    bool ret = danchor->getObjectPicture(img);
+    return ret;
 }
 
 bool Worksheet::getImage(int row, int column, QImage &img)
 {
     Q_D(Worksheet);
 
-    if ( d->drawing == nullptr )
-    {
+    if (d->drawing == nullptr) {
         return false;
     }
 
-    for(int i = 0; i < d->drawing->anchors.size(); i++)
-    {
-        if(d->drawing->anchors[i]->row() == row && d->drawing->anchors[i]->col() == column)
-        {
-            DrawingAnchor* danchor = d->drawing->anchors.at( i );
+    for (int i = 0; i < d->drawing->anchors.size(); i++) {
+        if (d->drawing->anchors[i]->row() == row && d->drawing->anchors[i]->col() == column) {
+            DrawingAnchor *danchor = d->drawing->anchors.at(i);
 
-            if ( danchor == nullptr )
-            {
+            if (danchor == nullptr) {
                 return false;
             }
 
-            bool ret= danchor->getObjectPicture(img);
+            bool ret = danchor->getObjectPicture(img);
             return ret;
         }
     }
@@ -1173,8 +1157,7 @@ uint Worksheet::getImageCount()
 {
     Q_D(Worksheet);
 
-    if ( d->drawing == nullptr )
-    {
+    if (d->drawing == nullptr) {
         return false;
     }
 
@@ -1182,8 +1165,6 @@ uint Worksheet::getImageCount()
     return uint(size);
 }
 
-
-
 /*!
  * Creates an chart with the given \a size and insert
  * at the position \a row, \a column.
@@ -1191,78 +1172,70 @@ uint Worksheet::getImageCount()
  */
 Chart *Worksheet::insertChart(int row, int column, const QSize &size)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
 
-	if (!d->drawing)
+    if (!d->drawing)
         d->drawing = std::make_shared<Drawing>(this, F_NewFromScratch);
 
-    DrawingOneCellAnchor *anchor = new DrawingOneCellAnchor(d->drawing.get(), DrawingAnchor::Picture);
+    DrawingOneCellAnchor *anchor =
+        new DrawingOneCellAnchor(d->drawing.get(), DrawingAnchor::Picture);
 
-	/*
-		The size are expressed as English Metric Units (EMUs). There are
-		12,700 EMUs per point. Therefore, 12,700 * 3 /4 = 9,525 EMUs per
-		pixel
-	*/
-	anchor->from = XlsxMarker(row, column, 0, 0);
-	anchor->ext = size * 9525;
+    /*
+            The size are expressed as English Metric Units (EMUs). There are
+            12,700 EMUs per point. Therefore, 12,700 * 3 /4 = 9,525 EMUs per
+            pixel
+    */
+    anchor->from = XlsxMarker(row, column, 0, 0);
+    anchor->ext  = size * 9525;
 
-	QSharedPointer<Chart> chart = QSharedPointer<Chart>(new Chart(this, F_NewFromScratch));
-	anchor->setObjectGraphicFrame(chart);
+    QSharedPointer<Chart> chart = QSharedPointer<Chart>(new Chart(this, F_NewFromScratch));
+    anchor->setObjectGraphicFrame(chart);
 
-	return chart.data();
+    return chart.data();
 }
 
 /*!
-	Merge a \a range of cells. The first cell should contain the data and the others should
-	be blank. All cells will be applied the same style if a valid \a format is given.
-	Returns true on success.
+        Merge a \a range of cells. The first cell should contain the data and the others should
+        be blank. All cells will be applied the same style if a valid \a format is given.
+        Returns true on success.
 
-	\note All cells except the top-left one will be cleared.
+        \note All cells except the top-left one will be cleared.
  */
 bool Worksheet::mergeCells(const CellRange &range, const Format &format)
 {
-	Q_D(Worksheet);
-	if (range.rowCount() < 2 && range.columnCount() < 2)
-		return false;
+    Q_D(Worksheet);
+    if (range.rowCount() < 2 && range.columnCount() < 2)
+        return false;
 
-	if (d->checkDimensions(range.firstRow(), range.firstColumn()))
-		return false;
+    if (d->checkDimensions(range.firstRow(), range.firstColumn()))
+        return false;
 
-	if (format.isValid())
-    {
-		d->workbook->styles()->addXfFormat(format);
+    if (format.isValid()) {
+        d->workbook->styles()->addXfFormat(format);
     }
 
-    for (int row = range.firstRow(); row <= range.lastRow(); ++row)
-    {
-        for (int col = range.firstColumn(); col <= range.lastColumn(); ++col)
-        {
-            if (row == range.firstRow() && col == range.firstColumn())
-            {
-				Cell *cell = cellAt(row, col);
-                if (cell)
-                {
-					if (format.isValid())
-						cell->d_ptr->format = format;
+    for (int row = range.firstRow(); row <= range.lastRow(); ++row) {
+        for (int col = range.firstColumn(); col <= range.lastColumn(); ++col) {
+            if (row == range.firstRow() && col == range.firstColumn()) {
+                Cell *cell = cellAt(row, col);
+                if (cell) {
+                    if (format.isValid())
+                        cell->d_ptr->format = format;
+                } else {
+                    writeBlank(row, col, format);
                 }
-                else
-                {
-					writeBlank(row, col, format);
-				}
+            } else {
+                writeBlank(row, col, format);
             }
-            else
-            {
-				writeBlank(row, col, format);
-			}
-		}
-	}
+        }
+    }
 
-	d->merges.append(range);
-	return true;
+    d->merges.append(range);
+    return true;
 }
 
 /*!
-	Unmerge the cells in the \a range. Returns true on success.
+        Unmerge the cells in the \a range. Returns true on success.
 
 */
 bool Worksheet::unmergeCells(const CellRange &range)
@@ -1276,27 +1249,18 @@ bool Worksheet::unmergeCells(const CellRange &range)
 */
 QList<CellRange> Worksheet::mergedCells() const
 {
-	Q_D(const Worksheet);
+    Q_D(const Worksheet);
 
     // dev57
 
     QList<CellRange> emptyList;
 
-    if ( d->type == AbstractSheet::ST_WorkSheet )
-    {
+    if (d->type == AbstractSheet::ST_WorkSheet) {
         return d->merges;
-    }
-    else if ( d->type == AbstractSheet::ST_ChartSheet )
-    {
-    }
-    else if ( d->type == AbstractSheet::ST_DialogSheet )
-    {
-    }
-    else if ( d->type == AbstractSheet::ST_MacroSheet )
-    {
-    }
-    else
-    { // undefined
+    } else if (d->type == AbstractSheet::ST_ChartSheet) {
+    } else if (d->type == AbstractSheet::ST_DialogSheet) {
+    } else if (d->type == AbstractSheet::ST_MacroSheet) {
+    } else { // undefined
     }
 
     return emptyList;
@@ -1307,102 +1271,112 @@ QList<CellRange> Worksheet::mergedCells() const
  */
 void Worksheet::saveToXmlFile(QIODevice *device) const
 {
-	Q_D(const Worksheet);
-	d->relationships->clear();
-
-	QXmlStreamWriter writer(device);
-
-	writer.writeStartDocument(QStringLiteral("1.0"), true);
-	writer.writeStartElement(QStringLiteral("worksheet"));
-	writer.writeAttribute(QStringLiteral("xmlns"), QStringLiteral("http://schemas.openxmlformats.org/spreadsheetml/2006/main"));
-	writer.writeAttribute(QStringLiteral("xmlns:r"), QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships"));
-
-	//for Excel 2010
-	//    writer.writeAttribute("xmlns:mc", "http://schemas.openxmlformats.org/markup-compatibility/2006");
-	//    writer.writeAttribute("xmlns:x14ac", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac");
-	//    writer.writeAttribute("mc:Ignorable", "x14ac");
-
-	writer.writeStartElement(QStringLiteral("dimension"));
-	writer.writeAttribute(QStringLiteral("ref"), d->generateDimensionString());
-	writer.writeEndElement();//dimension
-
-	writer.writeStartElement(QStringLiteral("sheetViews"));
-	writer.writeStartElement(QStringLiteral("sheetView"));
-	if (d->windowProtection)
-		writer.writeAttribute(QStringLiteral("windowProtection"), QStringLiteral("1"));
-	if (d->showFormulas)
-		writer.writeAttribute(QStringLiteral("showFormulas"), QStringLiteral("1"));
-	if (!d->showGridLines)
-		writer.writeAttribute(QStringLiteral("showGridLines"), QStringLiteral("0"));
-	if (!d->showRowColHeaders)
-		writer.writeAttribute(QStringLiteral("showRowColHeaders"), QStringLiteral("0"));
-	if (!d->showZeros)
-		writer.writeAttribute(QStringLiteral("showZeros"), QStringLiteral("0"));
-	if (d->rightToLeft)
-		writer.writeAttribute(QStringLiteral("rightToLeft"), QStringLiteral("1"));
-	if (d->tabSelected)
-		writer.writeAttribute(QStringLiteral("tabSelected"), QStringLiteral("1"));
-	if (!d->showRuler)
-		writer.writeAttribute(QStringLiteral("showRuler"), QStringLiteral("0"));
-	if (!d->showOutlineSymbols)
-		writer.writeAttribute(QStringLiteral("showOutlineSymbols"), QStringLiteral("0"));
-	if (!d->showWhiteSpace)
-		writer.writeAttribute(QStringLiteral("showWhiteSpace"), QStringLiteral("0"));
-	writer.writeAttribute(QStringLiteral("workbookViewId"), QStringLiteral("0"));
-	writer.writeEndElement();//sheetView
-	writer.writeEndElement();//sheetViews
-
-	writer.writeStartElement(QStringLiteral("sheetFormatPr"));
-	writer.writeAttribute(QStringLiteral("defaultRowHeight"), QString::number(d->default_row_height));
-	if (d->default_row_height != 15)
-		writer.writeAttribute(QStringLiteral("customHeight"), QStringLiteral("1"));
-	if (d->default_row_zeroed)
-		writer.writeAttribute(QStringLiteral("zeroHeight"), QStringLiteral("1"));
-	if (d->outline_row_level)
-		writer.writeAttribute(QStringLiteral("outlineLevelRow"), QString::number(d->outline_row_level));
-	if (d->outline_col_level)
-		writer.writeAttribute(QStringLiteral("outlineLevelCol"), QString::number(d->outline_col_level));
-	//for Excel 2010
-	//    writer.writeAttribute("x14ac:dyDescent", "0.25");
-	writer.writeEndElement();//sheetFormatPr
-
-    if (!d->colsInfo.isEmpty())
-    {
-		writer.writeStartElement(QStringLiteral("cols"));
-		QMapIterator<int, QSharedPointer<XlsxColumnInfo> > it(d->colsInfo);
-        while (it.hasNext())
-        {
-			it.next();
-			QSharedPointer<XlsxColumnInfo> col_info = it.value();
-			writer.writeStartElement(QStringLiteral("col"));
-			writer.writeAttribute(QStringLiteral("min"), QString::number(col_info->firstColumn));
-			writer.writeAttribute(QStringLiteral("max"), QString::number(col_info->lastColumn));
-			if (col_info->width)
-				writer.writeAttribute(QStringLiteral("width"), QString::number(col_info->width, 'g', 15));
-			if (!col_info->format.isEmpty())
-				writer.writeAttribute(QStringLiteral("style"), QString::number(col_info->format.xfIndex()));
-			if (col_info->hidden)
-				writer.writeAttribute(QStringLiteral("hidden"), QStringLiteral("1"));
-			if (col_info->width)
-				writer.writeAttribute(QStringLiteral("customWidth"), QStringLiteral("1"));
-			if (col_info->outlineLevel)
-				writer.writeAttribute(QStringLiteral("outlineLevel"), QString::number(col_info->outlineLevel));
-			if (col_info->collapsed)
-				writer.writeAttribute(QStringLiteral("collapsed"), QStringLiteral("1"));
-			writer.writeEndElement();//col
-		}
-		writer.writeEndElement();//cols
-	}
-
-	writer.writeStartElement(QStringLiteral("sheetData"));
-	if (d->dimension.isValid())
-		d->saveXmlSheetData(writer);
-	writer.writeEndElement();//sheetData
-
-	d->saveXmlMergeCells(writer);
+    Q_D(const Worksheet);
+    d->relationships->clear();
+
+    QXmlStreamWriter writer(device);
+
+    writer.writeStartDocument(QStringLiteral("1.0"), true);
+    writer.writeStartElement(QStringLiteral("worksheet"));
+    writer.writeAttribute(
+        QStringLiteral("xmlns"),
+        QStringLiteral("http://schemas.openxmlformats.org/spreadsheetml/2006/main"));
+    writer.writeAttribute(
+        QStringLiteral("xmlns:r"),
+        QStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships"));
+
+    // for Excel 2010
+    //     writer.writeAttribute("xmlns:mc",
+    //     "http://schemas.openxmlformats.org/markup-compatibility/2006");
+    //     writer.writeAttribute("xmlns:x14ac",
+    //     "http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac");
+    //     writer.writeAttribute("mc:Ignorable", "x14ac");
+
+    writer.writeStartElement(QStringLiteral("dimension"));
+    writer.writeAttribute(QStringLiteral("ref"), d->generateDimensionString());
+    writer.writeEndElement(); // dimension
+
+    writer.writeStartElement(QStringLiteral("sheetViews"));
+    writer.writeStartElement(QStringLiteral("sheetView"));
+    if (d->windowProtection)
+        writer.writeAttribute(QStringLiteral("windowProtection"), QStringLiteral("1"));
+    if (d->showFormulas)
+        writer.writeAttribute(QStringLiteral("showFormulas"), QStringLiteral("1"));
+    if (!d->showGridLines)
+        writer.writeAttribute(QStringLiteral("showGridLines"), QStringLiteral("0"));
+    if (!d->showRowColHeaders)
+        writer.writeAttribute(QStringLiteral("showRowColHeaders"), QStringLiteral("0"));
+    if (!d->showZeros)
+        writer.writeAttribute(QStringLiteral("showZeros"), QStringLiteral("0"));
+    if (d->rightToLeft)
+        writer.writeAttribute(QStringLiteral("rightToLeft"), QStringLiteral("1"));
+    if (d->tabSelected)
+        writer.writeAttribute(QStringLiteral("tabSelected"), QStringLiteral("1"));
+    if (!d->showRuler)
+        writer.writeAttribute(QStringLiteral("showRuler"), QStringLiteral("0"));
+    if (!d->showOutlineSymbols)
+        writer.writeAttribute(QStringLiteral("showOutlineSymbols"), QStringLiteral("0"));
+    if (!d->showWhiteSpace)
+        writer.writeAttribute(QStringLiteral("showWhiteSpace"), QStringLiteral("0"));
+    writer.writeAttribute(QStringLiteral("workbookViewId"), QStringLiteral("0"));
+    writer.writeEndElement(); // sheetView
+    writer.writeEndElement(); // sheetViews
+
+    writer.writeStartElement(QStringLiteral("sheetFormatPr"));
+    writer.writeAttribute(QStringLiteral("defaultRowHeight"),
+                          QString::number(d->default_row_height));
+    if (d->default_row_height != 15)
+        writer.writeAttribute(QStringLiteral("customHeight"), QStringLiteral("1"));
+    if (d->default_row_zeroed)
+        writer.writeAttribute(QStringLiteral("zeroHeight"), QStringLiteral("1"));
+    if (d->outline_row_level)
+        writer.writeAttribute(QStringLiteral("outlineLevelRow"),
+                              QString::number(d->outline_row_level));
+    if (d->outline_col_level)
+        writer.writeAttribute(QStringLiteral("outlineLevelCol"),
+                              QString::number(d->outline_col_level));
+    // for Excel 2010
+    //     writer.writeAttribute("x14ac:dyDescent", "0.25");
+    writer.writeEndElement(); // sheetFormatPr
+
+    if (!d->colsInfo.isEmpty()) {
+        writer.writeStartElement(QStringLiteral("cols"));
+        QMapIterator<int, QSharedPointer<XlsxColumnInfo>> it(d->colsInfo);
+        while (it.hasNext()) {
+            it.next();
+            QSharedPointer<XlsxColumnInfo> col_info = it.value();
+            writer.writeStartElement(QStringLiteral("col"));
+            writer.writeAttribute(QStringLiteral("min"), QString::number(col_info->firstColumn));
+            writer.writeAttribute(QStringLiteral("max"), QString::number(col_info->lastColumn));
+            if (col_info->width)
+                writer.writeAttribute(QStringLiteral("width"),
+                                      QString::number(col_info->width, 'g', 15));
+            if (!col_info->format.isEmpty())
+                writer.writeAttribute(QStringLiteral("style"),
+                                      QString::number(col_info->format.xfIndex()));
+            if (col_info->hidden)
+                writer.writeAttribute(QStringLiteral("hidden"), QStringLiteral("1"));
+            if (col_info->width)
+                writer.writeAttribute(QStringLiteral("customWidth"), QStringLiteral("1"));
+            if (col_info->outlineLevel)
+                writer.writeAttribute(QStringLiteral("outlineLevel"),
+                                      QString::number(col_info->outlineLevel));
+            if (col_info->collapsed)
+                writer.writeAttribute(QStringLiteral("collapsed"), QStringLiteral("1"));
+            writer.writeEndElement(); // col
+        }
+        writer.writeEndElement(); // cols
+    }
+
+    writer.writeStartElement(QStringLiteral("sheetData"));
+    if (d->dimension.isValid())
+        d->saveXmlSheetData(writer);
+    writer.writeEndElement(); // sheetData
+
+    d->saveXmlMergeCells(writer);
     for (const ConditionalFormatting &cf : d->conditionalFormattingList)
-		cf.saveToXml(writer);
-	d->saveXmlDataValidations(writer);
+        cf.saveToXml(writer);
+    d->saveXmlDataValidations(writer);
 
     //{{ liufeijin :  write  pagesettings  add by liufeijin 20181028
 
@@ -1410,70 +1384,56 @@ void Worksheet::saveToXmlFile(QIODevice *device) const
     // NOTE: empty element is not problem. but, empty structure of element is not parsed by Excel.
 
     // pageMargins
-    if ( false == d->PMleft.isEmpty() &&
-         false == d->PMright.isEmpty() &&
-         false == d->PMtop.isEmpty() &&
-         false == d->PMbotton.isEmpty() &&
-         false == d->PMheader.isEmpty() &&
-         false == d->PMfooter.isEmpty()
-         )
-    {
+    if (false == d->PMleft.isEmpty() && false == d->PMright.isEmpty() &&
+        false == d->PMtop.isEmpty() && false == d->PMbotton.isEmpty() &&
+        false == d->PMheader.isEmpty() && false == d->PMfooter.isEmpty()) {
         writer.writeStartElement(QStringLiteral("pageMargins"));
 
-        writer.writeAttribute(QStringLiteral("left"),   d->PMleft );
-        writer.writeAttribute(QStringLiteral("right"),  d->PMright );
-        writer.writeAttribute(QStringLiteral("top"),    d->PMtop );
-        writer.writeAttribute(QStringLiteral("bottom"), d->PMbotton );
-        writer.writeAttribute(QStringLiteral("header"), d->PMheader );
-        writer.writeAttribute(QStringLiteral("footer"), d->PMfooter );
+        writer.writeAttribute(QStringLiteral("left"), d->PMleft);
+        writer.writeAttribute(QStringLiteral("right"), d->PMright);
+        writer.writeAttribute(QStringLiteral("top"), d->PMtop);
+        writer.writeAttribute(QStringLiteral("bottom"), d->PMbotton);
+        writer.writeAttribute(QStringLiteral("header"), d->PMheader);
+        writer.writeAttribute(QStringLiteral("footer"), d->PMfooter);
 
         writer.writeEndElement(); // pageMargins
     }
 
     // dev57
-    if ( !d->Prid.isEmpty() )
-    {
+    if (!d->Prid.isEmpty()) {
         writer.writeStartElement(QStringLiteral("pageSetup")); // pageSetup
 
         writer.writeAttribute(QStringLiteral("r:id"), d->Prid);
 
-        if ( !d->PverticalDpi.isEmpty() )
-        {
+        if (!d->PverticalDpi.isEmpty()) {
             writer.writeAttribute(QStringLiteral("verticalDpi"), d->PverticalDpi);
         }
 
-        if ( !d->PhorizontalDpi.isEmpty() )
-        {
+        if (!d->PhorizontalDpi.isEmpty()) {
             writer.writeAttribute(QStringLiteral("horizontalDpi"), d->PhorizontalDpi);
         }
 
-        if ( !d->PuseFirstPageNumber.isEmpty() )
-        {
+        if (!d->PuseFirstPageNumber.isEmpty()) {
             writer.writeAttribute(QStringLiteral("useFirstPageNumber"), d->PuseFirstPageNumber);
         }
 
-        if ( !d->PfirstPageNumber.isEmpty() )
-        {
+        if (!d->PfirstPageNumber.isEmpty()) {
             writer.writeAttribute(QStringLiteral("firstPageNumber"), d->PfirstPageNumber);
         }
 
-        if ( !d->Pscale.isEmpty() )
-        {
+        if (!d->Pscale.isEmpty()) {
             writer.writeAttribute(QStringLiteral("scale"), d->Pscale);
         }
 
-        if ( !d->PpaperSize.isEmpty() )
-        {
+        if (!d->PpaperSize.isEmpty()) {
             writer.writeAttribute(QStringLiteral("paperSize"), d->PpaperSize);
         }
 
-        if ( !d->Porientation.isEmpty() )
-        {
+        if (!d->Porientation.isEmpty()) {
             writer.writeAttribute(QStringLiteral("orientation"), d->Porientation);
         }
 
-        if(!d->Pcopies.isEmpty())
-        {
+        if (!d->Pcopies.isEmpty()) {
             writer.writeAttribute(QStringLiteral("copies"), d->Pcopies);
         }
 
@@ -1482,36 +1442,31 @@ void Worksheet::saveToXmlFile(QIODevice *device) const
     } // if ( !d->Prid.isEmpty() )
 
     // headerFooter
-    if( !(d->ModdHeader.isNull()) ||
-        !(d->MoodFooter.isNull()) )
-    {
+    if (!(d->ModdHeader.isNull()) || !(d->MoodFooter.isNull())) {
         writer.writeStartElement(QStringLiteral("headerFooter")); // headerFooter
 
-        if ( !d->MoodalignWithMargins.isEmpty() )
-        {
+        if (!d->MoodalignWithMargins.isEmpty()) {
             writer.writeAttribute(QStringLiteral("alignWithMargins"), d->MoodalignWithMargins);
         }
 
-        if ( !d->ModdHeader.isNull() )
-        {
+        if (!d->ModdHeader.isNull()) {
             writer.writeStartElement(QStringLiteral("oddHeader"));
             writer.writeCharacters(d->ModdHeader);
             writer.writeEndElement(); // oddHeader
         }
 
-        if ( !d->MoodFooter.isNull() )
-        {
+        if (!d->MoodFooter.isNull()) {
             writer.writeTextElement(QStringLiteral("oddFooter"), d->MoodFooter);
         }
 
         writer.writeEndElement(); // headerFooter
     }
 
-	d->saveXmlHyperlinks(writer);
-	d->saveXmlDrawings(writer);
+    d->saveXmlHyperlinks(writer);
+    d->saveXmlDrawings(writer);
 
     writer.writeEndElement(); // worksheet
-	writer.writeEndDocument();
+    writer.writeEndDocument();
 }
 
 //{{ liufeijin
@@ -1519,7 +1474,7 @@ bool Worksheet::setStartPage(int spagen)
 {
     Q_D(Worksheet);
 
-    d->PfirstPageNumber=QString::number(spagen);
+    d->PfirstPageNumber = QString::number(spagen);
 
     return true;
 }
@@ -1527,212 +1482,197 @@ bool Worksheet::setStartPage(int spagen)
 
 void WorksheetPrivate::saveXmlSheetData(QXmlStreamWriter &writer) const
 {
-	calculateSpans();
-    for (int row_num = dimension.firstRow(); row_num <= dimension.lastRow(); row_num++)
-    {
+    calculateSpans();
+    for (int row_num = dimension.firstRow(); row_num <= dimension.lastRow(); row_num++) {
         auto ctIt = cellTable.constFind(row_num);
         auto riIt = rowsInfo.constFind(row_num);
-        if (ctIt == cellTable.constEnd() && riIt == rowsInfo.constEnd() && !comments.contains(row_num))
-        {
-			//Only process rows with cell data / comments / formatting
-			continue;
-		}
+        if (ctIt == cellTable.constEnd() && riIt == rowsInfo.constEnd() &&
+            !comments.contains(row_num)) {
+            // Only process rows with cell data / comments / formatting
+            continue;
+        }
 
-		int span_index = (row_num-1) / 16;
-		QString span;
+        int span_index = (row_num - 1) / 16;
+        QString span;
         auto rsIt = row_spans.constFind(span_index);
         if (rsIt != row_spans.constEnd())
             span = rsIt.value();
 
-		writer.writeStartElement(QStringLiteral("row"));
-		writer.writeAttribute(QStringLiteral("r"), QString::number(row_num));
+        writer.writeStartElement(QStringLiteral("row"));
+        writer.writeAttribute(QStringLiteral("r"), QString::number(row_num));
 
-		if (!span.isEmpty())
-			writer.writeAttribute(QStringLiteral("spans"), span);
+        if (!span.isEmpty())
+            writer.writeAttribute(QStringLiteral("spans"), span);
 
-        if (riIt != rowsInfo.constEnd())
-        {
+        if (riIt != rowsInfo.constEnd()) {
             QSharedPointer<XlsxRowInfo> rowInfo = riIt.value();
-            if (!rowInfo->format.isEmpty())
-            {
-				writer.writeAttribute(QStringLiteral("s"), QString::number(rowInfo->format.xfIndex()));
-				writer.writeAttribute(QStringLiteral("customFormat"), QStringLiteral("1"));
-			}
-
-			//!Todo: support customHeight from info struct
-			//!Todo: where does this magic number '15' come from?
-			if (rowInfo->customHeight) {
-				writer.writeAttribute(QStringLiteral("ht"), QString::number(rowInfo->height));
-				writer.writeAttribute(QStringLiteral("customHeight"), QStringLiteral("1"));
-			} else {
-				writer.writeAttribute(QStringLiteral("customHeight"), QStringLiteral("0"));
-			}
-
-			if (rowInfo->hidden)
-				writer.writeAttribute(QStringLiteral("hidden"), QStringLiteral("1"));
-			if (rowInfo->outlineLevel > 0)
-				writer.writeAttribute(QStringLiteral("outlineLevel"), QString::number(rowInfo->outlineLevel));
-			if (rowInfo->collapsed)
-				writer.writeAttribute(QStringLiteral("collapsed"), QStringLiteral("1"));
-		}
-
-		//Write cell data if row contains filled cells
-        if (ctIt != cellTable.constEnd())
-        {
-            for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn(); col_num++)
-            {
-                if (ctIt->contains(col_num))
-                {
+            if (!rowInfo->format.isEmpty()) {
+                writer.writeAttribute(QStringLiteral("s"),
+                                      QString::number(rowInfo->format.xfIndex()));
+                writer.writeAttribute(QStringLiteral("customFormat"), QStringLiteral("1"));
+            }
+
+            //! Todo: support customHeight from info struct
+            //! Todo: where does this magic number '15' come from?
+            if (rowInfo->customHeight) {
+                writer.writeAttribute(QStringLiteral("ht"), QString::number(rowInfo->height));
+                writer.writeAttribute(QStringLiteral("customHeight"), QStringLiteral("1"));
+            } else {
+                writer.writeAttribute(QStringLiteral("customHeight"), QStringLiteral("0"));
+            }
+
+            if (rowInfo->hidden)
+                writer.writeAttribute(QStringLiteral("hidden"), QStringLiteral("1"));
+            if (rowInfo->outlineLevel > 0)
+                writer.writeAttribute(QStringLiteral("outlineLevel"),
+                                      QString::number(rowInfo->outlineLevel));
+            if (rowInfo->collapsed)
+                writer.writeAttribute(QStringLiteral("collapsed"), QStringLiteral("1"));
+        }
+
+        // Write cell data if row contains filled cells
+        if (ctIt != cellTable.constEnd()) {
+            for (int col_num = dimension.firstColumn(); col_num <= dimension.lastColumn();
+                 col_num++) {
+                if (ctIt->contains(col_num)) {
                     saveXmlCellData(writer, row_num, col_num, (*ctIt)[col_num]);
-				}
-			}
-		}
-		writer.writeEndElement(); //row
-	}
+                }
+            }
+        }
+        writer.writeEndElement(); // row
+    }
 }
 
-void WorksheetPrivate::saveXmlCellData(QXmlStreamWriter &writer, int row, int col, std::shared_ptr<Cell> cell) const
+void WorksheetPrivate::saveXmlCellData(QXmlStreamWriter &writer,
+                                       int row,
+                                       int col,
+                                       std::shared_ptr<Cell> cell) const
 {
     Q_Q(const Worksheet);
 
-	//This is the innermost loop so efficiency is important.
-	QString cell_pos = CellReference(row, col).toString();
+    // This is the innermost loop so efficiency is important.
+    QString cell_pos = CellReference(row, col).toString();
 
-	writer.writeStartElement(QStringLiteral("c"));
-	writer.writeAttribute(QStringLiteral("r"), cell_pos);
+    writer.writeStartElement(QStringLiteral("c"));
+    writer.writeAttribute(QStringLiteral("r"), cell_pos);
 
-    QMap<int, QSharedPointer<XlsxRowInfo> >::ConstIterator rIt;
-    QMap<int, QSharedPointer<XlsxColumnInfo> >::ConstIterator cIt;
+    QMap<int, QSharedPointer<XlsxRowInfo>>::ConstIterator rIt;
+    QMap<int, QSharedPointer<XlsxColumnInfo>>::ConstIterator cIt;
 
-	//Style used by the cell, row or col
-	if (!cell->format().isEmpty())
-		writer.writeAttribute(QStringLiteral("s"), QString::number(cell->format().xfIndex()));
+    // Style used by the cell, row or col
+    if (!cell->format().isEmpty())
+        writer.writeAttribute(QStringLiteral("s"), QString::number(cell->format().xfIndex()));
     else if ((rIt = rowsInfo.constFind(row)) != rowsInfo.constEnd() && !(*rIt)->format.isEmpty())
         writer.writeAttribute(QStringLiteral("s"), QString::number((*rIt)->format.xfIndex()));
-    else if ((cIt = colsInfoHelper.constFind(col)) != colsInfoHelper.constEnd() && !(*cIt)->format.isEmpty())
+    else if ((cIt = colsInfoHelper.constFind(col)) != colsInfoHelper.constEnd() &&
+             !(*cIt)->format.isEmpty())
         writer.writeAttribute(QStringLiteral("s"), QString::number((*cIt)->format.xfIndex()));
 
     if (cell->cellType() == Cell::SharedStringType) // 's'
     {
-		int sst_idx;
-		if (cell->isRichString())
-			sst_idx = sharedStrings()->getSharedStringIndex(cell->d_ptr->richString);
-		else
-			sst_idx = sharedStrings()->getSharedStringIndex(cell->value().toString());
-
-		writer.writeAttribute(QStringLiteral("t"), QStringLiteral("s"));
-		writer.writeTextElement(QStringLiteral("v"), QString::number(sst_idx));
-    }
-    else if (cell->cellType() == Cell::InlineStringType) // 'inlineStr'
-    {
-		writer.writeAttribute(QStringLiteral("t"), QStringLiteral("inlineStr"));
-		writer.writeStartElement(QStringLiteral("is"));
+        int sst_idx;
         if (cell->isRichString())
-        {
-			//Rich text string
-			RichString string = cell->d_ptr->richString;
-            for (int i=0; i<string.fragmentCount(); ++i)
-            {
-				writer.writeStartElement(QStringLiteral("r"));
-                if (string.fragmentFormat(i).hasFontData())
-                {
-					writer.writeStartElement(QStringLiteral("rPr"));
-					//:Todo
-					writer.writeEndElement();// rPr
-				}
-				writer.writeStartElement(QStringLiteral("t"));
-				if (isSpaceReserveNeeded(string.fragmentText(i)))
-					writer.writeAttribute(QStringLiteral("xml:space"), QStringLiteral("preserve"));
-				writer.writeCharacters(string.fragmentText(i));
-				writer.writeEndElement();// t
-				writer.writeEndElement(); // r
-			}
-        }
+            sst_idx = sharedStrings()->getSharedStringIndex(cell->d_ptr->richString);
         else
-        {
-			writer.writeStartElement(QStringLiteral("t"));
-			QString string = cell->value().toString();
-			if (isSpaceReserveNeeded(string))
-				writer.writeAttribute(QStringLiteral("xml:space"), QStringLiteral("preserve"));
-			writer.writeCharacters(string);
-			writer.writeEndElement(); // t
-		}
-		writer.writeEndElement();//is
-    }
-    else if (cell->cellType() == Cell::NumberType) // 'n'
+            sst_idx = sharedStrings()->getSharedStringIndex(cell->value().toString());
+
+        writer.writeAttribute(QStringLiteral("t"), QStringLiteral("s"));
+        writer.writeTextElement(QStringLiteral("v"), QString::number(sst_idx));
+    } else if (cell->cellType() == Cell::InlineStringType) // 'inlineStr'
+    {
+        writer.writeAttribute(QStringLiteral("t"), QStringLiteral("inlineStr"));
+        writer.writeStartElement(QStringLiteral("is"));
+        if (cell->isRichString()) {
+            // Rich text string
+            RichString string = cell->d_ptr->richString;
+            for (int i = 0; i < string.fragmentCount(); ++i) {
+                writer.writeStartElement(QStringLiteral("r"));
+                if (string.fragmentFormat(i).hasFontData()) {
+                    writer.writeStartElement(QStringLiteral("rPr"));
+                    //: Todo
+                    writer.writeEndElement(); // rPr
+                }
+                writer.writeStartElement(QStringLiteral("t"));
+                if (isSpaceReserveNeeded(string.fragmentText(i)))
+                    writer.writeAttribute(QStringLiteral("xml:space"), QStringLiteral("preserve"));
+                writer.writeCharacters(string.fragmentText(i));
+                writer.writeEndElement(); // t
+                writer.writeEndElement(); // r
+            }
+        } else {
+            writer.writeStartElement(QStringLiteral("t"));
+            QString string = cell->value().toString();
+            if (isSpaceReserveNeeded(string))
+                writer.writeAttribute(QStringLiteral("xml:space"), QStringLiteral("preserve"));
+            writer.writeCharacters(string);
+            writer.writeEndElement(); // t
+        }
+        writer.writeEndElement();                    // is
+    } else if (cell->cellType() == Cell::NumberType) // 'n'
     {
         writer.writeAttribute(QStringLiteral("t"), QStringLiteral("n")); // dev67
 
-        if (cell->hasFormula())
-        {
+        if (cell->hasFormula()) {
             QString strFormula = cell->formula().d->formula;
             Q_UNUSED(strFormula);
             cell->formula().saveToXml(writer);
         }
 
-        if (cell->value().isValid())
-        {   //note that, invalid value means 'v' is blank
-			double value = cell->value().toDouble();
-			writer.writeTextElement(QStringLiteral("v"), QString::number(value, 'g', 15));
-		}
-    }
-    else if (cell->cellType() == Cell::StringType) // 'str'
+        if (cell->value().isValid()) { // note that, invalid value means 'v' is blank
+            double value = cell->value().toDouble();
+            writer.writeTextElement(QStringLiteral("v"), QString::number(value, 'g', 15));
+        }
+    } else if (cell->cellType() == Cell::StringType) // 'str'
     {
-		writer.writeAttribute(QStringLiteral("t"), QStringLiteral("str"));
-		if (cell->hasFormula())
-			cell->formula().saveToXml(writer);
+        writer.writeAttribute(QStringLiteral("t"), QStringLiteral("str"));
+        if (cell->hasFormula())
+            cell->formula().saveToXml(writer);
 
-		writer.writeTextElement(QStringLiteral("v"), cell->value().toString());
-    }
-    else if (cell->cellType() == Cell::BooleanType) // 'b'
+        writer.writeTextElement(QStringLiteral("v"), cell->value().toString());
+    } else if (cell->cellType() == Cell::BooleanType) // 'b'
     {
-		writer.writeAttribute(QStringLiteral("t"), QStringLiteral("b"));
+        writer.writeAttribute(QStringLiteral("t"), QStringLiteral("b"));
 
         // dev34
 
-        if (cell->hasFormula())
-        {
+        if (cell->hasFormula()) {
             QString strFormula = cell->formula().d->formula;
             Q_UNUSED(strFormula);
             cell->formula().saveToXml(writer);
         }
 
-		writer.writeTextElement(QStringLiteral("v"), cell->value().toBool() ? QStringLiteral("1") : QStringLiteral("0"));
-	}
-    else if (cell->cellType() == Cell::DateType) // 'd'
+        writer.writeTextElement(QStringLiteral("v"),
+                                cell->value().toBool() ? QStringLiteral("1") : QStringLiteral("0"));
+    } else if (cell->cellType() == Cell::DateType) // 'd'
     {
         // dev67
 
-         double num = cell->value().toDouble();
-         bool is1904 = q->workbook()->isDate1904();
-         if (!is1904 && num > 60) // for mac os excel
-         {
-             num = num - 1;
-         }
+        double num  = cell->value().toDouble();
+        bool is1904 = q->workbook()->isDate1904();
+        if (!is1904 && num > 60) // for mac os excel
+        {
+            num = num - 1;
+        }
 
-         // number type. see for 18.18.11 ST_CellType (Cell Type) more information.
-         writer.writeAttribute(QStringLiteral("t"), QStringLiteral("n"));
-         writer.writeTextElement(QStringLiteral("v"), cell->value().toString() );
+        // number type. see for 18.18.11 ST_CellType (Cell Type) more information.
+        writer.writeAttribute(QStringLiteral("t"), QStringLiteral("n"));
+        writer.writeTextElement(QStringLiteral("v"), cell->value().toString());
 
-    }
-    else if (cell->cellType() == Cell::ErrorType) // 'e'
+    } else if (cell->cellType() == Cell::ErrorType) // 'e'
     {
         writer.writeAttribute(QStringLiteral("t"), QStringLiteral("e"));
-        writer.writeTextElement(QStringLiteral("v"), cell->value().toString() );
-    }
-    else // if (cell->cellType() == Cell::CustomType)
+        writer.writeTextElement(QStringLiteral("v"), cell->value().toString());
+    } else // if (cell->cellType() == Cell::CustomType)
     {
         // custom type
 
-        if (cell->hasFormula())
-        {
+        if (cell->hasFormula()) {
             QString strFormula = cell->formula().d->formula;
             Q_UNUSED(strFormula);
             cell->formula().saveToXml(writer);
         }
 
-        if (cell->value().isValid())
-        {   //note that, invalid value means 'v' is blank
+        if (cell->value().isValid()) { // note that, invalid value means 'v' is blank
             double value = cell->value().toDouble();
             writer.writeTextElement(QStringLiteral("v"), QString::number(value, 'g', 15));
         }
@@ -1743,55 +1683,52 @@ void WorksheetPrivate::saveXmlCellData(QXmlStreamWriter &writer, int row, int co
 
 void WorksheetPrivate::saveXmlMergeCells(QXmlStreamWriter &writer) const
 {
-	if (merges.isEmpty())
-		return;
+    if (merges.isEmpty())
+        return;
 
-	writer.writeStartElement(QStringLiteral("mergeCells"));
-	writer.writeAttribute(QStringLiteral("count"), QString::number(merges.size()));
+    writer.writeStartElement(QStringLiteral("mergeCells"));
+    writer.writeAttribute(QStringLiteral("count"), QString::number(merges.size()));
 
-    for (const CellRange &range : merges)
-    {
-		writer.writeEmptyElement(QStringLiteral("mergeCell"));
-		writer.writeAttribute(QStringLiteral("ref"), range.toString());
-	}
+    for (const CellRange &range : merges) {
+        writer.writeEmptyElement(QStringLiteral("mergeCell"));
+        writer.writeAttribute(QStringLiteral("ref"), range.toString());
+    }
 
-	writer.writeEndElement(); //mergeCells
+    writer.writeEndElement(); // mergeCells
 }
 
 void WorksheetPrivate::saveXmlDataValidations(QXmlStreamWriter &writer) const
 {
-	if (dataValidationsList.isEmpty())
-		return;
+    if (dataValidationsList.isEmpty())
+        return;
 
-	writer.writeStartElement(QStringLiteral("dataValidations"));
-	writer.writeAttribute(QStringLiteral("count"), QString::number(dataValidationsList.size()));
+    writer.writeStartElement(QStringLiteral("dataValidations"));
+    writer.writeAttribute(QStringLiteral("count"), QString::number(dataValidationsList.size()));
 
     for (const DataValidation &validation : dataValidationsList)
-		validation.saveToXml(writer);
+        validation.saveToXml(writer);
 
-	writer.writeEndElement(); //dataValidations
+    writer.writeEndElement(); // dataValidations
 }
 
 void WorksheetPrivate::saveXmlHyperlinks(QXmlStreamWriter &writer) const
 {
-	if (urlTable.isEmpty())
-		return;
+    if (urlTable.isEmpty())
+        return;
 
-	writer.writeStartElement(QStringLiteral("hyperlinks"));
-    QMapIterator<int, QMap< int, QSharedPointer<XlsxHyperlinkData> > > it(urlTable);
+    writer.writeStartElement(QStringLiteral("hyperlinks"));
+    QMapIterator<int, QMap<int, QSharedPointer<XlsxHyperlinkData>>> it(urlTable);
 
-    while (it.hasNext())
-    {
-		it.next();
-		int row = it.key();
-        QMapIterator< int, QSharedPointer<XlsxHyperlinkData> > it2(it.value());
+    while (it.hasNext()) {
+        it.next();
+        int row = it.key();
+        QMapIterator<int, QSharedPointer<XlsxHyperlinkData>> it2(it.value());
 
-        while (it2.hasNext())
-        {
-			it2.next();
-			int col = it2.key();
-			QSharedPointer<XlsxHyperlinkData> data = it2.value();
-			QString ref = CellReference(row, col).toString();
+        while (it2.hasNext()) {
+            it2.next();
+            int col                                = it2.key();
+            QSharedPointer<XlsxHyperlinkData> data = it2.value();
+            QString ref                            = CellReference(row, col).toString();
 
             // dev57
             // writer.writeEmptyElement(QStringLiteral("hyperlink"));
@@ -1799,128 +1736,126 @@ void WorksheetPrivate::saveXmlHyperlinks(QXmlStreamWriter &writer) const
 
             writer.writeAttribute(QStringLiteral("ref"), ref); // required field
 
-            if ( data->linkType == XlsxHyperlinkData::External )
-            {
+            if (data->linkType == XlsxHyperlinkData::External) {
                 // Update relationships
-				relationships->addWorksheetRelationship(QStringLiteral("/hyperlink"), data->target, QStringLiteral("External"));
+                relationships->addWorksheetRelationship(
+                    QStringLiteral("/hyperlink"), data->target, QStringLiteral("External"));
 
-                writer.writeAttribute(QStringLiteral("r:id"), QStringLiteral("rId%1").arg(relationships->count()));
-			}
+                writer.writeAttribute(QStringLiteral("r:id"),
+                                      QStringLiteral("rId%1").arg(relationships->count()));
+            }
 
-			if (!data->location.isEmpty())
-            {
-				writer.writeAttribute(QStringLiteral("location"), data->location);
+            if (!data->location.isEmpty()) {
+                writer.writeAttribute(QStringLiteral("location"), data->location);
             }
 
-			if (!data->display.isEmpty())
-            {
-				writer.writeAttribute(QStringLiteral("display"), data->display);
+            if (!data->display.isEmpty()) {
+                writer.writeAttribute(QStringLiteral("display"), data->display);
             }
 
-			if (!data->tooltip.isEmpty())
-            {
-				writer.writeAttribute(QStringLiteral("tooltip"), data->tooltip);
+            if (!data->tooltip.isEmpty()) {
+                writer.writeAttribute(QStringLiteral("tooltip"), data->tooltip);
             }
 
             // dev57
             writer.writeEndElement(); // hyperlink
-		}
-	}
+        }
+    }
 
     writer.writeEndElement(); // hyperlinks
 }
 
 void WorksheetPrivate::saveXmlDrawings(QXmlStreamWriter &writer) const
 {
-	if (!drawing)
-		return;
+    if (!drawing)
+        return;
 
     int idx = workbook->drawings().indexOf(drawing.get());
-    relationships->addWorksheetRelationship(QStringLiteral("/drawing"), QStringLiteral("../drawings/drawing%1.xml").arg(idx+1));
+    relationships->addWorksheetRelationship(
+        QStringLiteral("/drawing"), QStringLiteral("../drawings/drawing%1.xml").arg(idx + 1));
 
-	writer.writeEmptyElement(QStringLiteral("drawing"));
-    writer.writeAttribute(QStringLiteral("r:id"), QStringLiteral("rId%1").arg(relationships->count()));
+    writer.writeEmptyElement(QStringLiteral("drawing"));
+    writer.writeAttribute(QStringLiteral("r:id"),
+                          QStringLiteral("rId%1").arg(relationships->count()));
 }
 
 void WorksheetPrivate::splitColsInfo(int colFirst, int colLast)
 {
-	// Split current columnInfo, for example, if "A:H" has been set,
-	// we are trying to set "B:D", there should be "A", "B:D", "E:H".
-	// This will be more complex if we try to set "C:F" after "B:D".
-	{
-		QMapIterator<int, QSharedPointer<XlsxColumnInfo> > it(colsInfo);
-		while (it.hasNext()) {
-			it.next();
-			QSharedPointer<XlsxColumnInfo> info = it.value();
-			if (colFirst > info->firstColumn && colFirst <= info->lastColumn) {
-				//split the range,
-				QSharedPointer<XlsxColumnInfo> info2(new XlsxColumnInfo(*info));
-				info->lastColumn = colFirst - 1;
-				info2->firstColumn = colFirst;
-				colsInfo.insert(colFirst, info2);
-				for (int c = info2->firstColumn; c <= info2->lastColumn; ++c)
-					colsInfoHelper[c] = info2;
-
-				break;
-			}
-		}
-	}
-	{
-		QMapIterator<int, QSharedPointer<XlsxColumnInfo> > it(colsInfo);
-		while (it.hasNext()) {
-			it.next();
-			QSharedPointer<XlsxColumnInfo> info = it.value();
-			if (colLast >= info->firstColumn && colLast < info->lastColumn) {
-				QSharedPointer<XlsxColumnInfo> info2(new XlsxColumnInfo(*info));
-				info->lastColumn = colLast;
-				info2->firstColumn = colLast + 1;
-				colsInfo.insert(colLast + 1, info2);
-				for (int c = info2->firstColumn; c <= info2->lastColumn; ++c)
-					colsInfoHelper[c] = info2;
-
-				break;
-			}
-		}
-	}
+    // Split current columnInfo, for example, if "A:H" has been set,
+    // we are trying to set "B:D", there should be "A", "B:D", "E:H".
+    // This will be more complex if we try to set "C:F" after "B:D".
+    {
+        QMapIterator<int, QSharedPointer<XlsxColumnInfo>> it(colsInfo);
+        while (it.hasNext()) {
+            it.next();
+            QSharedPointer<XlsxColumnInfo> info = it.value();
+            if (colFirst > info->firstColumn && colFirst <= info->lastColumn) {
+                // split the range,
+                QSharedPointer<XlsxColumnInfo> info2(new XlsxColumnInfo(*info));
+                info->lastColumn   = colFirst - 1;
+                info2->firstColumn = colFirst;
+                colsInfo.insert(colFirst, info2);
+                for (int c = info2->firstColumn; c <= info2->lastColumn; ++c)
+                    colsInfoHelper[c] = info2;
+
+                break;
+            }
+        }
+    }
+    {
+        QMapIterator<int, QSharedPointer<XlsxColumnInfo>> it(colsInfo);
+        while (it.hasNext()) {
+            it.next();
+            QSharedPointer<XlsxColumnInfo> info = it.value();
+            if (colLast >= info->firstColumn && colLast < info->lastColumn) {
+                QSharedPointer<XlsxColumnInfo> info2(new XlsxColumnInfo(*info));
+                info->lastColumn   = colLast;
+                info2->firstColumn = colLast + 1;
+                colsInfo.insert(colLast + 1, info2);
+                for (int c = info2->firstColumn; c <= info2->lastColumn; ++c)
+                    colsInfoHelper[c] = info2;
+
+                break;
+            }
+        }
+    }
 }
 
 bool WorksheetPrivate::isColumnRangeValid(int colFirst, int colLast)
 {
-	bool ignore_row = true;
-	bool ignore_col = false;
+    bool ignore_row = true;
+    bool ignore_col = false;
 
-	if (colFirst > colLast)
-		return false;
+    if (colFirst > colLast)
+        return false;
 
-	if (checkDimensions(1, colLast, ignore_row, ignore_col))
-		return false;
-	if (checkDimensions(1, colFirst, ignore_row, ignore_col))
-		return false;
+    if (checkDimensions(1, colLast, ignore_row, ignore_col))
+        return false;
+    if (checkDimensions(1, colFirst, ignore_row, ignore_col))
+        return false;
 
-	return true;
+    return true;
 }
 
 QList<int> WorksheetPrivate ::getColumnIndexes(int colFirst, int colLast)
 {
-	splitColsInfo(colFirst, colLast);
+    splitColsInfo(colFirst, colLast);
 
-	QList<int> nodes;
-	nodes.append(colFirst);
-    for (int col = colFirst; col <= colLast; ++col)
-    {
+    QList<int> nodes;
+    nodes.append(colFirst);
+    for (int col = colFirst; col <= colLast; ++col) {
         auto it = colsInfo.constFind(col);
-        if (it != colsInfo.constEnd())
-        {
-			if (nodes.last() != col)
-				nodes.append(col);
+        if (it != colsInfo.constEnd()) {
+            if (nodes.last() != col)
+                nodes.append(col);
 
             int nextCol = (*it)->lastColumn + 1;
-			if (nextCol <= colLast)
-				nodes.append(nextCol);
-		}
-	}
+            if (nextCol <= colLast)
+                nodes.append(nextCol);
+        }
+    }
 
-	return nodes;
+    return nodes;
 }
 
 /*!
@@ -1929,22 +1864,22 @@ QList<int> WorksheetPrivate ::getColumnIndexes(int colFirst, int colLast)
  */
 bool Worksheet::setColumnWidth(const CellRange &range, double width)
 {
-	if (!range.isValid())
-		return false;
+    if (!range.isValid())
+        return false;
 
-	return setColumnWidth(range.firstColumn(), range.lastColumn(), width);
+    return setColumnWidth(range.firstColumn(), range.lastColumn(), width);
 }
 
 /*!
   Sets format property of a \a range of columns to \a format. Columns are 1-indexed.
   Returns true on success.
  */
-bool Worksheet::setColumnFormat(const CellRange& range, const Format &format)
+bool Worksheet::setColumnFormat(const CellRange &range, const Format &format)
 {
-	if (!range.isValid())
-		return false;
+    if (!range.isValid())
+        return false;
 
-	return setColumnFormat(range.firstColumn(), range.lastColumn(), format);
+    return setColumnFormat(range.firstColumn(), range.lastColumn(), format);
 }
 
 /*!
@@ -1954,10 +1889,10 @@ bool Worksheet::setColumnFormat(const CellRange& range, const Format &format)
  */
 bool Worksheet::setColumnHidden(const CellRange &range, bool hidden)
 {
-	if (!range.isValid())
-		return false;
+    if (!range.isValid())
+        return false;
 
-	return setColumnHidden(range.firstColumn(), range.lastColumn(), hidden);
+    return setColumnHidden(range.firstColumn(), range.lastColumn(), hidden);
 }
 
 /*!
@@ -1967,15 +1902,15 @@ bool Worksheet::setColumnHidden(const CellRange &range, bool hidden)
  */
 bool Worksheet::setColumnWidth(int colFirst, int colLast, double width)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
 
-    const QList <QSharedPointer<XlsxColumnInfo> > columnInfoList = d->getColumnInfoList(colFirst, colLast);
-    for (const QSharedPointer<XlsxColumnInfo> &columnInfo : columnInfoList)
-    {
-	   columnInfo->width = width;
+    const QList<QSharedPointer<XlsxColumnInfo>> columnInfoList =
+        d->getColumnInfoList(colFirst, colLast);
+    for (const QSharedPointer<XlsxColumnInfo> &columnInfo : columnInfoList) {
+        columnInfo->width = width;
     }
 
-	return (columnInfoList.count() > 0);
+    return (columnInfoList.count() > 0);
 }
 
 /*!
@@ -1985,18 +1920,19 @@ bool Worksheet::setColumnWidth(int colFirst, int colLast, double width)
  */
 bool Worksheet::setColumnFormat(int colFirst, int colLast, const Format &format)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
 
-    const QList <QSharedPointer<XlsxColumnInfo> > columnInfoList = d->getColumnInfoList(colFirst, colLast);
+    const QList<QSharedPointer<XlsxColumnInfo>> columnInfoList =
+        d->getColumnInfoList(colFirst, colLast);
     for (const QSharedPointer<XlsxColumnInfo> &columnInfo : columnInfoList)
-	   columnInfo->format = format;
+        columnInfo->format = format;
 
-	if(columnInfoList.count() > 0) {
-	   d->workbook->styles()->addXfFormat(format);
-	   return true;
-	}
+    if (columnInfoList.count() > 0) {
+        d->workbook->styles()->addXfFormat(format);
+        return true;
+    }
 
-	return false;
+    return false;
 }
 
 /*!
@@ -2005,13 +1941,14 @@ bool Worksheet::setColumnFormat(int colFirst, int colLast, const Format &format)
  */
 bool Worksheet::setColumnHidden(int colFirst, int colLast, bool hidden)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
 
-    const QList <QSharedPointer<XlsxColumnInfo> > columnInfoList = d->getColumnInfoList(colFirst, colLast);
+    const QList<QSharedPointer<XlsxColumnInfo>> columnInfoList =
+        d->getColumnInfoList(colFirst, colLast);
     for (const QSharedPointer<XlsxColumnInfo> &columnInfo : columnInfoList)
-	   columnInfo->hidden = hidden;
+        columnInfo->hidden = hidden;
 
-	return (columnInfoList.count() > 0);
+    return (columnInfoList.count() > 0);
 }
 
 /*!
@@ -2019,25 +1956,23 @@ bool Worksheet::setColumnHidden(int colFirst, int colLast, bool hidden)
  */
 double Worksheet::columnWidth(int column)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
 
-    QList< QSharedPointer<XlsxColumnInfo> > columnInfoList = d->getColumnInfoList(column, column);
+    QList<QSharedPointer<XlsxColumnInfo>> columnInfoList = d->getColumnInfoList(column, column);
 
     // [dev54]
-    if ( columnInfoList.size() == 0 )
-    {
+    if (columnInfoList.size() == 0) {
         // column information is not found
         // qDebug() << "[debug]" << __FUNCTION__ <<  "column (info) is not found. " << column;
     }
 
-	if (columnInfoList.count() == 1)
-    {
+    if (columnInfoList.count() == 1) {
         // column information is found
-        // qDebug() << "[debug]" << __FUNCTION__ <<  "column (info) is found. " << column << oneColWidth;
+        // qDebug() << "[debug]" << __FUNCTION__ <<  "column (info) is found. " << column <<
+        // oneColWidth;
         double oneColWidth = columnInfoList.at(0)->width;
-        bool isSetWidth = columnInfoList.at(0)->isSetWidth;
-        if ( isSetWidth )
-        {
+        bool isSetWidth    = columnInfoList.at(0)->isSetWidth;
+        if (isSetWidth) {
             return oneColWidth;
         }
     }
@@ -2052,13 +1987,13 @@ double Worksheet::columnWidth(int column)
  */
 Format Worksheet::columnFormat(int column)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
 
-	QList <QSharedPointer<XlsxColumnInfo> > columnInfoList = d->getColumnInfoList(column, column);
-	if (columnInfoList.count() == 1)
-	   return columnInfoList.at(0)->format;
+    QList<QSharedPointer<XlsxColumnInfo>> columnInfoList = d->getColumnInfoList(column, column);
+    if (columnInfoList.count() == 1)
+        return columnInfoList.at(0)->format;
 
-	return Format();
+    return Format();
 }
 
 /*!
@@ -2066,13 +2001,13 @@ Format Worksheet::columnFormat(int column)
  */
 bool Worksheet::isColumnHidden(int column)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
 
-	QList <QSharedPointer<XlsxColumnInfo> > columnInfoList = d->getColumnInfoList(column, column);
-	if (columnInfoList.count() == 1)
-	   return columnInfoList.at(0)->hidden;
+    QList<QSharedPointer<XlsxColumnInfo>> columnInfoList = d->getColumnInfoList(column, column);
+    if (columnInfoList.count() == 1)
+        return columnInfoList.at(0)->hidden;
 
-	return false;
+    return false;
 }
 
 /*!
@@ -2082,17 +2017,17 @@ bool Worksheet::isColumnHidden(int column)
 
   Returns true if success.
 */
-bool Worksheet::setRowHeight(int rowFirst,int rowLast, double height)
+bool Worksheet::setRowHeight(int rowFirst, int rowLast, double height)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
 
-    const QList <QSharedPointer<XlsxRowInfo> > rowInfoList = d->getRowInfoList(rowFirst,rowLast);
+    const QList<QSharedPointer<XlsxRowInfo>> rowInfoList = d->getRowInfoList(rowFirst, rowLast);
     for (const QSharedPointer<XlsxRowInfo> &rowInfo : rowInfoList) {
-		rowInfo->height = height;
-		rowInfo->customHeight = true;
-	}
+        rowInfo->height       = height;
+        rowInfo->customHeight = true;
+    }
 
-	return rowInfoList.count() > 0;
+    return rowInfoList.count() > 0;
 }
 
 /*!
@@ -2101,16 +2036,16 @@ bool Worksheet::setRowHeight(int rowFirst,int rowLast, double height)
 
   Returns true if success.
 */
-bool Worksheet::setRowFormat(int rowFirst,int rowLast, const Format &format)
+bool Worksheet::setRowFormat(int rowFirst, int rowLast, const Format &format)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
 
-    const QList <QSharedPointer<XlsxRowInfo> > rowInfoList = d->getRowInfoList(rowFirst,rowLast);
+    const QList<QSharedPointer<XlsxRowInfo>> rowInfoList = d->getRowInfoList(rowFirst, rowLast);
     for (const QSharedPointer<XlsxRowInfo> &rowInfo : rowInfoList)
-		rowInfo->format = format;
+        rowInfo->format = format;
 
-	d->workbook->styles()->addXfFormat(format);
-	return rowInfoList.count() > 0;
+    d->workbook->styles()->addXfFormat(format);
+    return rowInfoList.count() > 0;
 }
 
 /*!
@@ -2119,15 +2054,15 @@ bool Worksheet::setRowFormat(int rowFirst,int rowLast, const Format &format)
 
   Returns true if success.
 */
-bool Worksheet::setRowHidden(int rowFirst,int rowLast, bool hidden)
+bool Worksheet::setRowHidden(int rowFirst, int rowLast, bool hidden)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
 
-    const QList <QSharedPointer<XlsxRowInfo> > rowInfoList = d->getRowInfoList(rowFirst,rowLast);
+    const QList<QSharedPointer<XlsxRowInfo>> rowInfoList = d->getRowInfoList(rowFirst, rowLast);
     for (const QSharedPointer<XlsxRowInfo> &rowInfo : rowInfoList)
-		rowInfo->hidden = hidden;
+        rowInfo->hidden = hidden;
 
-	return rowInfoList.count() > 0;
+    return rowInfoList.count() > 0;
 }
 
 /*!
@@ -2135,13 +2070,12 @@ bool Worksheet::setRowHidden(int rowFirst,int rowLast, bool hidden)
 */
 double Worksheet::rowHeight(int row)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
     const int min_col = d->dimension.isValid() ? d->dimension.firstColumn() : 1;
 
     auto it = d->rowsInfo.constFind(row);
-    if (d->checkDimensions(row, min_col, false, true) || it == d->rowsInfo.constEnd())
-    {
-		return d->sheetFormatProps.defaultRowHeight; //return default on invalid row
+    if (d->checkDimensions(row, min_col, false, true) || it == d->rowsInfo.constEnd()) {
+        return d->sheetFormatProps.defaultRowHeight; // return default on invalid row
     }
 
     return (*it)->height;
@@ -2152,11 +2086,11 @@ double Worksheet::rowHeight(int row)
 */
 Format Worksheet::rowFormat(int row)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
     const int min_col = d->dimension.isValid() ? d->dimension.firstColumn() : 1;
-    auto it = d->rowsInfo.constFind(row);
+    auto it           = d->rowsInfo.constFind(row);
     if (d->checkDimensions(row, min_col, false, true) || it == d->rowsInfo.constEnd())
-		return Format(); //return default on invalid row
+        return Format(); // return default on invalid row
 
     return (*it)->format;
 }
@@ -2166,11 +2100,11 @@ Format Worksheet::rowFormat(int row)
 */
 bool Worksheet::isRowHidden(int row)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
     const int min_col = d->dimension.isValid() ? d->dimension.firstColumn() : 1;
-    auto it = d->rowsInfo.constFind(row);
+    auto it           = d->rowsInfo.constFind(row);
     if (d->checkDimensions(row, min_col, false, true) || it == d->rowsInfo.constEnd())
-		return false; //return default on invalid row
+        return false; // return default on invalid row
 
     return (*it)->hidden;
 }
@@ -2182,40 +2116,40 @@ bool Worksheet::isRowHidden(int row)
  */
 bool Worksheet::groupRows(int rowFirst, int rowLast, bool collapsed)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
 
-	for (int row=rowFirst; row<=rowLast; ++row) {
+    for (int row = rowFirst; row <= rowLast; ++row) {
         auto it = d->rowsInfo.find(row);
         if (it != d->rowsInfo.end()) {
             (*it)->outlineLevel += 1;
-		} else {
-			QSharedPointer<XlsxRowInfo> info(new XlsxRowInfo);
-			info->outlineLevel += 1;
+        } else {
+            QSharedPointer<XlsxRowInfo> info(new XlsxRowInfo);
+            info->outlineLevel += 1;
             it = d->rowsInfo.insert(row, info);
-		}
-		if (collapsed)
+        }
+        if (collapsed)
             (*it)->hidden = true;
-	}
-	if (collapsed) {
-        auto it = d->rowsInfo.find(rowLast+1);
+    }
+    if (collapsed) {
+        auto it = d->rowsInfo.find(rowLast + 1);
         if (it == d->rowsInfo.end())
-            it = d->rowsInfo.insert(rowLast+1, QSharedPointer<XlsxRowInfo>(new XlsxRowInfo));
+            it = d->rowsInfo.insert(rowLast + 1, QSharedPointer<XlsxRowInfo>(new XlsxRowInfo));
         (*it)->collapsed = true;
-	}
-	return true;
+    }
+    return true;
 }
 
 /*!
-	\overload
+        \overload
 
-	Groups columns with the given \a range and \a collapsed.
+        Groups columns with the given \a range and \a collapsed.
  */
 bool Worksheet::groupColumns(const CellRange &range, bool collapsed)
 {
-	if (!range.isValid())
-		return false;
+    if (!range.isValid())
+        return false;
 
-	return groupColumns(range.firstColumn(), range.lastColumn(), collapsed);
+    return groupColumns(range.firstColumn(), range.lastColumn(), collapsed);
 }
 
 /*!
@@ -2224,70 +2158,66 @@ bool Worksheet::groupColumns(const CellRange &range, bool collapsed)
 */
 bool Worksheet::groupColumns(int colFirst, int colLast, bool collapsed)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
 
-	d->splitColsInfo(colFirst, colLast);
+    d->splitColsInfo(colFirst, colLast);
 
-	QList<int> nodes;
-	nodes.append(colFirst);
-	for (int col = colFirst; col <= colLast; ++col) {
+    QList<int> nodes;
+    nodes.append(colFirst);
+    for (int col = colFirst; col <= colLast; ++col) {
         auto it = d->colsInfo.constFind(col);
         if (it != d->colsInfo.constEnd()) {
-			if (nodes.last() != col)
-				nodes.append(col);
+            if (nodes.last() != col)
+                nodes.append(col);
             int nextCol = (*it)->lastColumn + 1;
-			if (nextCol <= colLast)
-				nodes.append(nextCol);
-		}
-	}
+            if (nextCol <= colLast)
+                nodes.append(nextCol);
+        }
+    }
 
-    for (int idx = 0; idx < nodes.size(); ++idx)
-    {
-		int colStart = nodes[idx];
-        auto it = d->colsInfo.constFind(colStart);
-        if (it != d->colsInfo.constEnd())
-        {
+    for (int idx = 0; idx < nodes.size(); ++idx) {
+        int colStart = nodes[idx];
+        auto it      = d->colsInfo.constFind(colStart);
+        if (it != d->colsInfo.constEnd()) {
             (*it)->outlineLevel += 1;
-			if (collapsed)
+            if (collapsed)
                 (*it)->hidden = true;
-        }
-        else
-        {
-			int colEnd = (idx == nodes.size() - 1) ? colLast : nodes[idx+1] - 1;
+        } else {
+            int colEnd = (idx == nodes.size() - 1) ? colLast : nodes[idx + 1] - 1;
             QSharedPointer<XlsxColumnInfo> info(new XlsxColumnInfo(colStart, colEnd, false));
-			info->outlineLevel += 1;
-			d->colsInfo.insert(colFirst, info);
-			if (collapsed)
-				info->hidden = true;
-			for (int c = colStart; c <= colEnd; ++c)
-				d->colsInfoHelper[c] = info;
-		}
-	}
-
-	if (collapsed) {
-		int col = colLast+1;
-		d->splitColsInfo(col, col);
+            info->outlineLevel += 1;
+            d->colsInfo.insert(colFirst, info);
+            if (collapsed)
+                info->hidden = true;
+            for (int c = colStart; c <= colEnd; ++c)
+                d->colsInfoHelper[c] = info;
+        }
+    }
+
+    if (collapsed) {
+        int col = colLast + 1;
+        d->splitColsInfo(col, col);
         auto it = d->colsInfo.constFind(col);
         if (it != d->colsInfo.constEnd())
             (*it)->collapsed = true;
-		else {
+        else {
             QSharedPointer<XlsxColumnInfo> info(new XlsxColumnInfo(col, col, false));
-			info->collapsed = true;
-			d->colsInfo.insert(col, info);
-			d->colsInfoHelper[col] = info;
-		}
-	}
+            info->collapsed = true;
+            d->colsInfo.insert(col, info);
+            d->colsInfoHelper[col] = info;
+        }
+    }
 
-	return false;
+    return false;
 }
 
 /*!
-	Return the range that contains cell data.
+        Return the range that contains cell data.
  */
 CellRange Worksheet::dimension() const
 {
-	Q_D(const Worksheet);
-	return d->dimension;
+    Q_D(const Worksheet);
+    return d->dimension;
 }
 
 /*
@@ -2297,13 +2227,13 @@ CellRange Worksheet::dimension() const
 */
 int WorksheetPrivate::rowPixelsSize(int row) const
 {
-	double height;
+    double height;
     auto it = row_sizes.constFind(row);
     if (it != row_sizes.constEnd())
         height = it.value();
-	else
-		height = default_row_height;
-	return static_cast<int>(4.0 / 3.0 *height);
+    else
+        height = default_row_height;
+    return static_cast<int>(4.0 / 3.0 * height);
 }
 
 /*
@@ -2314,300 +2244,257 @@ int WorksheetPrivate::rowPixelsSize(int row) const
 */
 int WorksheetPrivate::colPixelsSize(int col) const
 {
-	double max_digit_width = 7.0; //For Calabri 11
-	double padding = 5.0;
-	int pixels = 0;
+    double max_digit_width = 7.0; // For Calabri 11
+    double padding         = 5.0;
+    int pixels             = 0;
 
     auto it = col_sizes.constFind(col);
     if (it != col_sizes.constEnd()) {
         double width = it.value();
-		if (width < 1)
-			pixels = static_cast<int>(width * (max_digit_width + padding) + 0.5);
-		else
-			pixels = static_cast<int>(width * max_digit_width + 0.5) + padding;
-	} else {
-		pixels = 64;
-	}
-	return pixels;
+        if (width < 1)
+            pixels = static_cast<int>(width * (max_digit_width + padding) + 0.5);
+        else
+            pixels = static_cast<int>(width * max_digit_width + 0.5) + padding;
+    } else {
+        pixels = 64;
+    }
+    return pixels;
 }
 
 void WorksheetPrivate::loadXmlSheetData(QXmlStreamReader &reader)
 {
-	Q_Q(Worksheet);
+    Q_Q(Worksheet);
 
-	Q_ASSERT(reader.name() == QLatin1String("sheetData"));
+    Q_ASSERT(reader.name() == QLatin1String("sheetData"));
 
-	while (!reader.atEnd() && !(reader.name() == QLatin1String("sheetData") && reader.tokenType() == QXmlStreamReader::EndElement))
-	{
-		if (reader.readNextStartElement())
-		{
-			if (reader.name() == QLatin1String("row"))
-			{
-				QXmlStreamAttributes attributes = reader.attributes();
+    while (!reader.atEnd() && !(reader.name() == QLatin1String("sheetData") &&
+                                reader.tokenType() == QXmlStreamReader::EndElement)) {
+        if (reader.readNextStartElement()) {
+            if (reader.name() == QLatin1String("row")) {
+                QXmlStreamAttributes attributes = reader.attributes();
 
-				if (attributes.hasAttribute(QLatin1String("customFormat"))
-						|| attributes.hasAttribute(QLatin1String("customHeight"))
-						|| attributes.hasAttribute(QLatin1String("hidden"))
-						|| attributes.hasAttribute(QLatin1String("outlineLevel"))
-						|| attributes.hasAttribute(QLatin1String("collapsed")))
-				{
+                if (attributes.hasAttribute(QLatin1String("customFormat")) ||
+                    attributes.hasAttribute(QLatin1String("customHeight")) ||
+                    attributes.hasAttribute(QLatin1String("hidden")) ||
+                    attributes.hasAttribute(QLatin1String("outlineLevel")) ||
+                    attributes.hasAttribute(QLatin1String("collapsed"))) {
 
-					QSharedPointer<XlsxRowInfo> info(new XlsxRowInfo);
+                    QSharedPointer<XlsxRowInfo> info(new XlsxRowInfo);
                     if (attributes.hasAttribute(QLatin1String("customFormat")) &&
-                            attributes.hasAttribute(QLatin1String("s")))
-                    {
-						int idx = attributes.value(QLatin1String("s")).toInt();
-						info->format = workbook->styles()->xfFormat(idx);
-					}
+                        attributes.hasAttribute(QLatin1String("s"))) {
+                        int idx      = attributes.value(QLatin1String("s")).toInt();
+                        info->format = workbook->styles()->xfFormat(idx);
+                    }
 
-                    if (attributes.hasAttribute(QLatin1String("customHeight")))
-                    {
-						info->customHeight = attributes.value(QLatin1String("customHeight")) == QLatin1String("1");
-						//Row height is only specified when customHeight is set
-                        if(attributes.hasAttribute(QLatin1String("ht")))
-                        {
-							info->height = attributes.value(QLatin1String("ht")).toDouble();
-						}
-					}
+                    if (attributes.hasAttribute(QLatin1String("customHeight"))) {
+                        info->customHeight =
+                            attributes.value(QLatin1String("customHeight")) == QLatin1String("1");
+                        // Row height is only specified when customHeight is set
+                        if (attributes.hasAttribute(QLatin1String("ht"))) {
+                            info->height = attributes.value(QLatin1String("ht")).toDouble();
+                        }
+                    }
 
-					//both "hidden" and "collapsed" default are false
-					info->hidden = attributes.value(QLatin1String("hidden")) == QLatin1String("1");
-					info->collapsed = attributes.value(QLatin1String("collapsed")) == QLatin1String("1");
+                    // both "hidden" and "collapsed" default are false
+                    info->hidden = attributes.value(QLatin1String("hidden")) == QLatin1String("1");
+                    info->collapsed =
+                        attributes.value(QLatin1String("collapsed")) == QLatin1String("1");
 
-					if (attributes.hasAttribute(QLatin1String("outlineLevel")))
-						info->outlineLevel = attributes.value(QLatin1String("outlineLevel")).toInt();
+                    if (attributes.hasAttribute(QLatin1String("outlineLevel")))
+                        info->outlineLevel =
+                            attributes.value(QLatin1String("outlineLevel")).toInt();
 
-					//"r" is optional too.
-                    if (attributes.hasAttribute(QLatin1String("r")))
-                    {
-						int row = attributes.value(QLatin1String("r")).toInt();
-						rowsInfo[row] = info;
-					}
-				}
-
-			}
-			else if (reader.name() == QLatin1String("c")) // Cell
-			{
-
-				//Cell
-				QXmlStreamAttributes attributes = reader.attributes();
-				QString r = attributes.value(QLatin1String("r")).toString();
-				CellReference pos(r);
-
-				//get format
-				Format format;
-				qint32 styleIndex = -1;
-				if (attributes.hasAttribute(QLatin1String("s"))) // Style (defined in the styles.xml file)
-				{
-					//"s" == style index
-					int idx = attributes.value(QLatin1String("s")).toInt();
-					format = workbook->styles()->xfFormat(idx);
-					styleIndex = idx;
-				}
+                    //"r" is optional too.
+                    if (attributes.hasAttribute(QLatin1String("r"))) {
+                        int row       = attributes.value(QLatin1String("r")).toInt();
+                        rowsInfo[row] = info;
+                    }
+                }
+
+            } else if (reader.name() == QLatin1String("c")) // Cell
+            {
+
+                // Cell
+                QXmlStreamAttributes attributes = reader.attributes();
+                QString r                       = attributes.value(QLatin1String("r")).toString();
+                CellReference pos(r);
+
+                // get format
+                Format format;
+                qint32 styleIndex = -1;
+                if (attributes.hasAttribute(
+                        QLatin1String("s"))) // Style (defined in the styles.xml file)
+                {
+                    //"s" == style index
+                    int idx    = attributes.value(QLatin1String("s")).toInt();
+                    format     = workbook->styles()->xfFormat(idx);
+                    styleIndex = idx;
+                }
 
                 // Cell::CellType cellType = Cell::NumberType;
                 Cell::CellType cellType = Cell::CustomType;
 
-				if (attributes.hasAttribute(QLatin1String("t"))) // Type
-				{
-					const auto typeString = attributes.value(QLatin1String("t"));
+                if (attributes.hasAttribute(QLatin1String("t"))) // Type
+                {
+                    const auto typeString = attributes.value(QLatin1String("t"));
                     if (typeString == QLatin1String("s")) // Shared string
-					{
-						cellType = Cell::SharedStringType;
-					}
-                    else if (typeString == QLatin1String("inlineStr")) //  Inline String
-					{
-						cellType = Cell::InlineStringType;
-					}
-                    else if (typeString == QLatin1String("str")) // String
-					{
-						cellType = Cell::StringType;
-					}
-                    else if (typeString == QLatin1String("b")) // Boolean
-					{
-						cellType = Cell::BooleanType;
-					}
-                    else if (typeString == QLatin1String("e")) // Error
-					{
-						cellType = Cell::ErrorType;
-					}
-                    else if (typeString == QLatin1String("d")) // Date
+                    {
+                        cellType = Cell::SharedStringType;
+                    } else if (typeString == QLatin1String("inlineStr")) //  Inline String
+                    {
+                        cellType = Cell::InlineStringType;
+                    } else if (typeString == QLatin1String("str")) // String
+                    {
+                        cellType = Cell::StringType;
+                    } else if (typeString == QLatin1String("b")) // Boolean
+                    {
+                        cellType = Cell::BooleanType;
+                    } else if (typeString == QLatin1String("e")) // Error
+                    {
+                        cellType = Cell::ErrorType;
+                    } else if (typeString == QLatin1String("d")) // Date
                     {
                         cellType = Cell::DateType;
-                    }
-                    else if (typeString == QLatin1String("n")) // Number
+                    } else if (typeString == QLatin1String("n")) // Number
                     {
                         cellType = Cell::NumberType;
-                    }
-					else
-					{
+                    } else {
                         // custom type
                         cellType = Cell::CustomType;
-					}
-				}
+                    }
+                }
 
-				if (Cell::isDateType(cellType, format))
-				{
-					cellType = Cell::DateType;
-				}
+                if (Cell::isDateType(cellType, format)) {
+                    cellType = Cell::DateType;
+                }
 
-				// create a heap of new cell
+                // create a heap of new cell
                 auto cell = std::make_shared<Cell>(QVariant{}, cellType, format, q, styleIndex);
 
-                while (!reader.atEnd() &&
-                       !(reader.name() == QLatin1String("c") &&
-                         reader.tokenType() == QXmlStreamReader::EndElement))
-				{
-					if (reader.readNextStartElement())
-					{
+                while (!reader.atEnd() && !(reader.name() == QLatin1String("c") &&
+                                            reader.tokenType() == QXmlStreamReader::EndElement)) {
+                    if (reader.readNextStartElement()) {
                         if (reader.name() == QLatin1String("f")) // formula
-						{
-							CellFormula &formula = cell->d_func()->formula;
-							formula.loadFromXml(reader);
+                        {
+                            CellFormula &formula = cell->d_func()->formula;
+                            formula.loadFromXml(reader);
                             if (formula.formulaType() == CellFormula::SharedType &&
-                                    !formula.formulaText().isEmpty())
-							{
-                                int si = formula.sharedIndex();
-                                sharedFormulaMap[ si ] = formula;
-							}
-						}
-						else if (reader.name() == QLatin1String("v")) // Value
-						{
-							QString value = reader.readElementText();
-							if (cellType == Cell::SharedStringType)
-							{
-								int sst_idx = value.toInt();
-								sharedStrings()->incRefByStringIndex(sst_idx);
-								RichString rs = sharedStrings()->getSharedString(sst_idx);
-								QString strPlainString = rs.toPlainString();
-								cell->d_func()->value = strPlainString;
-								if (rs.isRichString())
-									cell->d_func()->richString = rs;
-							}
-							else if (cellType == Cell::NumberType)
-							{
-								cell->d_func()->value = value.toDouble();
-							}
-							else if (cellType == Cell::BooleanType)
-							{
-								cell->d_func()->value = value.toInt() ? true : false;
-							}
-                            else  if (cellType == Cell::DateType)
-                            {
+                                !formula.formulaText().isEmpty()) {
+                                int si               = formula.sharedIndex();
+                                sharedFormulaMap[si] = formula;
+                            }
+                        } else if (reader.name() == QLatin1String("v")) // Value
+                        {
+                            QString value = reader.readElementText();
+                            if (cellType == Cell::SharedStringType) {
+                                int sst_idx = value.toInt();
+                                sharedStrings()->incRefByStringIndex(sst_idx);
+                                RichString rs          = sharedStrings()->getSharedString(sst_idx);
+                                QString strPlainString = rs.toPlainString();
+                                cell->d_func()->value  = strPlainString;
+                                if (rs.isRichString())
+                                    cell->d_func()->richString = rs;
+                            } else if (cellType == Cell::NumberType) {
+                                cell->d_func()->value = value.toDouble();
+                            } else if (cellType == Cell::BooleanType) {
+                                cell->d_func()->value = value.toInt() ? true : false;
+                            } else if (cellType == Cell::DateType) {
                                 // [dev54] DateType
 
-                                double dValue = value.toDouble(); // days from 1900(or 1904)
+                                double dValue    = value.toDouble(); // days from 1900(or 1904)
                                 bool bIsDate1904 = q->workbook()->isDate1904();
 
-                                QVariant vDatetimeValue = datetimeFromNumber( dValue, bIsDate1904 );
+                                QVariant vDatetimeValue = datetimeFromNumber(dValue, bIsDate1904);
                                 Q_UNUSED(vDatetimeValue);
                                 // cell->d_func()->value = vDatetimeValue;
                                 cell->d_func()->value = dValue; // dev67
-                            }
-							else
-                            {
+                            } else {
                                 // ELSE type
-								cell->d_func()->value = value;
-							}
+                                cell->d_func()->value = value;
+                            }
 
-                        }
-                        else if (reader.name() == QLatin1String("is"))
-                        {
+                        } else if (reader.name() == QLatin1String("is")) {
                             while (!reader.atEnd() &&
                                    !(reader.name() == QLatin1String("is") &&
-                                   reader.tokenType() == QXmlStreamReader::EndElement))
-                            {
-                                if (reader.readNextStartElement())
-                                {
-									//:Todo, add rich text read support
-                                    if (reader.name() == QLatin1String("t"))
-                                    {
-										cell->d_func()->value = reader.readElementText();
-									}
-								}
-							}
+                                     reader.tokenType() == QXmlStreamReader::EndElement)) {
+                                if (reader.readNextStartElement()) {
+                                    //: Todo, add rich text read support
+                                    if (reader.name() == QLatin1String("t")) {
+                                        cell->d_func()->value = reader.readElementText();
+                                    }
+                                }
+                            }
+                        } else if (reader.name() == QLatin1String("extLst")) {
+                            // skip extLst element
+                            while (!reader.atEnd() &&
+                                   !(reader.name() == QLatin1String("extLst") &&
+                                     reader.tokenType() == QXmlStreamReader::EndElement)) {
+                                reader.readNextStartElement();
+                            }
                         }
-                        else if (reader.name() == QLatin1String("extLst"))
-                        {
-							//skip extLst element
-                            while ( !reader.atEnd() &&
-                                    !(reader.name() == QLatin1String("extLst") &&
-                                    reader.tokenType() == QXmlStreamReader::EndElement))
-                            {
-								reader.readNextStartElement();
-							}
-						}
-					}
-				}
-
-                cellTable[ pos.row() ][ pos.column() ] = cell;
+                    }
+                }
 
-			}
-		}
-	}
+                cellTable[pos.row()][pos.column()] = cell;
+            }
+        }
+    }
 }
 
 void WorksheetPrivate::loadXmlColumnsInfo(QXmlStreamReader &reader)
 {
-	Q_ASSERT(reader.name() == QLatin1String("cols"));
+    Q_ASSERT(reader.name() == QLatin1String("cols"));
 
-    while (!reader.atEnd() &&
-           !(reader.name() == QLatin1String("cols") &&
-             reader.tokenType() == QXmlStreamReader::EndElement))
-    {
-		reader.readNextStartElement();
-        if (reader.tokenType() == QXmlStreamReader::StartElement)
-        {
-            if (reader.name() == QLatin1String("col"))
-            {
+    while (!reader.atEnd() && !(reader.name() == QLatin1String("cols") &&
+                                reader.tokenType() == QXmlStreamReader::EndElement)) {
+        reader.readNextStartElement();
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("col")) {
                 QSharedPointer<XlsxColumnInfo> info(new XlsxColumnInfo(0, 1, false));
 
-				QXmlStreamAttributes colAttrs = reader.attributes();
-				int min = colAttrs.value(QLatin1String("min")).toInt();
-				int max = colAttrs.value(QLatin1String("max")).toInt();
-				info->firstColumn = min;
-				info->lastColumn = max;
-
-				//Flag indicating that the column width for the affected column(s) is different from the
-				// default or has been manually set
-                if(colAttrs.hasAttribute(QLatin1String("customWidth")))
-                {
-					info->customWidth = colAttrs.value(QLatin1String("customWidth")) == QLatin1String("1");
-				}
+                QXmlStreamAttributes colAttrs = reader.attributes();
+                int min                       = colAttrs.value(QLatin1String("min")).toInt();
+                int max                       = colAttrs.value(QLatin1String("max")).toInt();
+                info->firstColumn             = min;
+                info->lastColumn              = max;
+
+                // Flag indicating that the column width for the affected column(s) is different
+                // from the
+                //  default or has been manually set
+                if (colAttrs.hasAttribute(QLatin1String("customWidth"))) {
+                    info->customWidth =
+                        colAttrs.value(QLatin1String("customWidth")) == QLatin1String("1");
+                }
 
-				//Note, node may have "width" without "customWidth"
+                // Note, node may have "width" without "customWidth"
                 // [dev54]
-                if (colAttrs.hasAttribute(QLatin1String("width")))
-                {
-					double width = colAttrs.value(QLatin1String("width")).toDouble();
-					info->width = width;
+                if (colAttrs.hasAttribute(QLatin1String("width"))) {
+                    double width     = colAttrs.value(QLatin1String("width")).toDouble();
+                    info->width      = width;
                     info->isSetWidth = true; // [dev54]
-				}
+                }
 
-				info->hidden = colAttrs.value(QLatin1String("hidden")) == QLatin1String("1");
-				info->collapsed = colAttrs.value(QLatin1String("collapsed")) == QLatin1String("1");
+                info->hidden    = colAttrs.value(QLatin1String("hidden")) == QLatin1String("1");
+                info->collapsed = colAttrs.value(QLatin1String("collapsed")) == QLatin1String("1");
 
-                if (colAttrs.hasAttribute(QLatin1String("style")))
-                {
-					int idx = colAttrs.value(QLatin1String("style")).toInt();
-					info->format = workbook->styles()->xfFormat(idx);
-				}
+                if (colAttrs.hasAttribute(QLatin1String("style"))) {
+                    int idx      = colAttrs.value(QLatin1String("style")).toInt();
+                    info->format = workbook->styles()->xfFormat(idx);
+                }
 
-				if (colAttrs.hasAttribute(QLatin1String("outlineLevel")))
-                {
-					info->outlineLevel = colAttrs.value(QLatin1String("outlineLevel")).toInt();
+                if (colAttrs.hasAttribute(QLatin1String("outlineLevel"))) {
+                    info->outlineLevel = colAttrs.value(QLatin1String("outlineLevel")).toInt();
                 }
 
                 // qDebug() << "[debug] " << __FUNCTION__ << min << max << info->width << hasWidth;
 
-				colsInfo.insert(min, info);
-                for (int col = min ; col <= max ; ++col)
-                {
-					colsInfoHelper[col] = info;
+                colsInfo.insert(min, info);
+                for (int col = min; col <= max; ++col) {
+                    colsInfoHelper[col] = info;
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 }
 
 void WorksheetPrivate::loadXmlMergeCells(QXmlStreamReader &reader)
@@ -2619,354 +2506,296 @@ void WorksheetPrivate::loadXmlMergeCells(QXmlStreamReader &reader)
     QXmlStreamAttributes attributes = reader.attributes();
 
     bool isCount = attributes.hasAttribute(QLatin1String("count"));
-    int count = 0;
-    if ( !isCount )
-    {
+    int count    = 0;
+    if (!isCount) {
         qWarning("no count");
-    }
-    else
-    {
+    } else {
         count = attributes.value(QLatin1String("count")).toInt();
     }
 
-    while ( !reader.atEnd() &&
-            !(reader.name() == QLatin1String("mergeCells") &&
-            reader.tokenType() == QXmlStreamReader::EndElement) )
-    {
+    while (!reader.atEnd() && !(reader.name() == QLatin1String("mergeCells") &&
+                                reader.tokenType() == QXmlStreamReader::EndElement)) {
         reader.readNextStartElement();
-        if (reader.tokenType() == QXmlStreamReader::StartElement)
-        {
-            if (reader.name() == QLatin1String("mergeCell"))
-            {
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("mergeCell")) {
                 QXmlStreamAttributes attrs = reader.attributes();
-                QString rangeStr = attrs.value(QLatin1String("ref")).toString();
+                QString rangeStr           = attrs.value(QLatin1String("ref")).toString();
                 merges.append(CellRange(rangeStr));
             }
         }
     }
 
-    if (isCount)
-    {
+    if (isCount) {
         int mergesSize = merges.size();
-        if ( mergesSize != count )
-        {
+        if (mergesSize != count) {
             qWarning("read merge cells error");
         }
     }
-
 }
 
 void WorksheetPrivate::loadXmlDataValidations(QXmlStreamReader &reader)
 {
-	Q_ASSERT(reader.name() == QLatin1String("dataValidations"));
-	QXmlStreamAttributes attributes = reader.attributes();
-	int count = attributes.value(QLatin1String("count")).toInt();
+    Q_ASSERT(reader.name() == QLatin1String("dataValidations"));
+    QXmlStreamAttributes attributes = reader.attributes();
+    int count                       = attributes.value(QLatin1String("count")).toInt();
 
-	while (!reader.atEnd() && !(reader.name() == QLatin1String("dataValidations")
-			&& reader.tokenType() == QXmlStreamReader::EndElement)) {
-		reader.readNextStartElement();
-		if (reader.tokenType() == QXmlStreamReader::StartElement
-				&& reader.name() == QLatin1String("dataValidation")) {
-			dataValidationsList.append(DataValidation::loadFromXml(reader));
-		}
-	}
+    while (!reader.atEnd() && !(reader.name() == QLatin1String("dataValidations") &&
+                                reader.tokenType() == QXmlStreamReader::EndElement)) {
+        reader.readNextStartElement();
+        if (reader.tokenType() == QXmlStreamReader::StartElement &&
+            reader.name() == QLatin1String("dataValidation")) {
+            dataValidationsList.append(DataValidation::loadFromXml(reader));
+        }
+    }
 
-	if (dataValidationsList.size() != count)
-		qDebug("read data validation error");
+    if (dataValidationsList.size() != count)
+        qDebug("read data validation error");
 }
 
 void WorksheetPrivate::loadXmlSheetViews(QXmlStreamReader &reader)
 {
-	Q_ASSERT(reader.name() == QLatin1String("sheetViews"));
-
-	while (!reader.atEnd() && !(reader.name() == QLatin1String("sheetViews")
-			&& reader.tokenType() == QXmlStreamReader::EndElement)) {
-		reader.readNextStartElement();
-		if (reader.tokenType() == QXmlStreamReader::StartElement && reader.name() == QLatin1String("sheetView")) {
-			QXmlStreamAttributes attrs = reader.attributes();
-			//default false
-			windowProtection = attrs.value(QLatin1String("windowProtection")) == QLatin1String("1");
-			showFormulas = attrs.value(QLatin1String("showFormulas")) == QLatin1String("1");
-			rightToLeft = attrs.value(QLatin1String("rightToLeft")) == QLatin1String("1");
-			tabSelected = attrs.value(QLatin1String("tabSelected")) == QLatin1String("1");
-			//default true
-			showGridLines = attrs.value(QLatin1String("showGridLines")) != QLatin1String("0");
-			showRowColHeaders = attrs.value(QLatin1String("showRowColHeaders")) != QLatin1String("0");
-			showZeros = attrs.value(QLatin1String("showZeros")) != QLatin1String("0");
-			showRuler = attrs.value(QLatin1String("showRuler")) != QLatin1String("0");
-			showOutlineSymbols = attrs.value(QLatin1String("showOutlineSymbols")) != QLatin1String("0");
-			showWhiteSpace = attrs.value(QLatin1String("showWhiteSpace")) != QLatin1String("0");
-		}
-	}
+    Q_ASSERT(reader.name() == QLatin1String("sheetViews"));
+
+    while (!reader.atEnd() && !(reader.name() == QLatin1String("sheetViews") &&
+                                reader.tokenType() == QXmlStreamReader::EndElement)) {
+        reader.readNextStartElement();
+        if (reader.tokenType() == QXmlStreamReader::StartElement &&
+            reader.name() == QLatin1String("sheetView")) {
+            QXmlStreamAttributes attrs = reader.attributes();
+            // default false
+            windowProtection = attrs.value(QLatin1String("windowProtection")) == QLatin1String("1");
+            showFormulas     = attrs.value(QLatin1String("showFormulas")) == QLatin1String("1");
+            rightToLeft      = attrs.value(QLatin1String("rightToLeft")) == QLatin1String("1");
+            tabSelected      = attrs.value(QLatin1String("tabSelected")) == QLatin1String("1");
+            // default true
+            showGridLines = attrs.value(QLatin1String("showGridLines")) != QLatin1String("0");
+            showRowColHeaders =
+                attrs.value(QLatin1String("showRowColHeaders")) != QLatin1String("0");
+            showZeros = attrs.value(QLatin1String("showZeros")) != QLatin1String("0");
+            showRuler = attrs.value(QLatin1String("showRuler")) != QLatin1String("0");
+            showOutlineSymbols =
+                attrs.value(QLatin1String("showOutlineSymbols")) != QLatin1String("0");
+            showWhiteSpace = attrs.value(QLatin1String("showWhiteSpace")) != QLatin1String("0");
+        }
+    }
 }
 
 void WorksheetPrivate::loadXmlSheetFormatProps(QXmlStreamReader &reader)
 {
-	Q_ASSERT(reader.name() == QLatin1String("sheetFormatPr"));
+    Q_ASSERT(reader.name() == QLatin1String("sheetFormatPr"));
 
     const QXmlStreamAttributes attributes = reader.attributes();
-	XlsxSheetFormatProps formatProps;
+    XlsxSheetFormatProps formatProps;
     bool isSetWidth = false;
 
     // Retain default values
-    for  (const QXmlStreamAttribute &attrib : attributes)
-    {
-        if(attrib.name() == QLatin1String("baseColWidth") )
-        {
-			formatProps.baseColWidth = attrib.value().toInt();
-        }
-        else if(attrib.name() == QLatin1String("customHeight"))
-        {
-			formatProps.customHeight = attrib.value() == QLatin1String("1");
-        }
-        else if(attrib.name() == QLatin1String("defaultColWidth"))
-        {
-            double dDefaultColWidth = attrib.value().toDouble();
+    for (const QXmlStreamAttribute &attrib : attributes) {
+        if (attrib.name() == QLatin1String("baseColWidth")) {
+            formatProps.baseColWidth = attrib.value().toInt();
+        } else if (attrib.name() == QLatin1String("customHeight")) {
+            formatProps.customHeight = attrib.value() == QLatin1String("1");
+        } else if (attrib.name() == QLatin1String("defaultColWidth")) {
+            double dDefaultColWidth     = attrib.value().toDouble();
             formatProps.defaultColWidth = dDefaultColWidth;
-            isSetWidth = true;
-        }
-        else if(attrib.name() == QLatin1String("defaultRowHeight"))
-        {
-			formatProps.defaultRowHeight = attrib.value().toDouble();
-        }
-        else if(attrib.name() == QLatin1String("outlineLevelCol"))
-        {
-			formatProps.outlineLevelCol = attrib.value().toInt();
-        }
-        else if(attrib.name() == QLatin1String("outlineLevelRow"))
-        {
-			formatProps.outlineLevelRow = attrib.value().toInt();
-        }
-        else if(attrib.name() == QLatin1String("thickBottom"))
-        {
-			formatProps.thickBottom = attrib.value() == QLatin1String("1");
-        }
-        else if(attrib.name() == QLatin1String("thickTop"))
-        {
-			formatProps.thickTop  = attrib.value() == QLatin1String("1");
+            isSetWidth                  = true;
+        } else if (attrib.name() == QLatin1String("defaultRowHeight")) {
+            formatProps.defaultRowHeight = attrib.value().toDouble();
+        } else if (attrib.name() == QLatin1String("outlineLevelCol")) {
+            formatProps.outlineLevelCol = attrib.value().toInt();
+        } else if (attrib.name() == QLatin1String("outlineLevelRow")) {
+            formatProps.outlineLevelRow = attrib.value().toInt();
+        } else if (attrib.name() == QLatin1String("thickBottom")) {
+            formatProps.thickBottom = attrib.value() == QLatin1String("1");
+        } else if (attrib.name() == QLatin1String("thickTop")) {
+            formatProps.thickTop = attrib.value() == QLatin1String("1");
+        } else if (attrib.name() == QLatin1String("zeroHeight")) {
+            formatProps.zeroHeight = attrib.value() == QLatin1String("1");
         }
-        else if(attrib.name() == QLatin1String("zeroHeight"))
-        {
-			formatProps.zeroHeight = attrib.value() == QLatin1String("1");
-		}
-	}
+    }
 
     // if (formatProps.defaultColWidth == 0.0)
-    if ( !isSetWidth )
-    {
-        //not set
-        double dCalcWidth = WorksheetPrivate::calculateColWidth(formatProps.baseColWidth);
+    if (!isSetWidth) {
+        // not set
+        double dCalcWidth           = WorksheetPrivate::calculateColWidth(formatProps.baseColWidth);
         formatProps.defaultColWidth = dCalcWidth;
-	}
+    }
 
     // [dev54]
     // Where is code of setting 'formatProps'?
     this->sheetFormatProps = formatProps;
-
 }
 double WorksheetPrivate::calculateColWidth(int characters)
 {
     // //!Todo
-	//Take normal style' font maximum width and add padding and margin pixels
+    // Take normal style' font maximum width and add padding and margin pixels
     // return characters + 0.5;
     return characters;
 }
 
 void WorksheetPrivate::loadXmlHyperlinks(QXmlStreamReader &reader)
 {
-	Q_ASSERT(reader.name() == QLatin1String("hyperlinks"));
-
-	while (!reader.atEnd() && !(reader.name() == QLatin1String("hyperlinks")
-			&& reader.tokenType() == QXmlStreamReader::EndElement)) {
-		reader.readNextStartElement();
-		if (reader.tokenType() == QXmlStreamReader::StartElement && reader.name() == QLatin1String("hyperlink")) {
-			QXmlStreamAttributes attrs = reader.attributes();
-			CellReference pos(attrs.value(QLatin1String("ref")).toString());
-			if (pos.isValid()) { //Valid
-				QSharedPointer<XlsxHyperlinkData> link(new XlsxHyperlinkData);
-				link->display = attrs.value(QLatin1String("display")).toString();
-				link->tooltip = attrs.value(QLatin1String("tooltip")).toString();
-				link->location = attrs.value(QLatin1String("location")).toString();
-
-				if (attrs.hasAttribute(QLatin1String("r:id"))) {
-					link->linkType = XlsxHyperlinkData::External;
-					XlsxRelationship ship = relationships->getRelationshipById(attrs.value(QLatin1String("r:id")).toString());
-					link->target = ship.target;
-				} else {
-					link->linkType = XlsxHyperlinkData::Internal;
-				}
-
-				urlTable[pos.row()][pos.column()] = link;
-			}
-		}
-	}
-}
-
-QList <QSharedPointer<XlsxColumnInfo> > WorksheetPrivate::getColumnInfoList(int colFirst, int colLast)
-{
-	QList <QSharedPointer<XlsxColumnInfo> > columnsInfoList;
-    if (isColumnRangeValid(colFirst,colLast))
-	{
-		QList<int> nodes = getColumnIndexes(colFirst, colLast);
-
-        for (int idx = 0; idx < nodes.size(); ++idx)
-        {
-			int colStart = nodes[idx];
-            auto it = colsInfo.constFind(colStart);
-            if (it != colsInfo.constEnd())
-            {
-                columnsInfoList.append(*it);
+    Q_ASSERT(reader.name() == QLatin1String("hyperlinks"));
+
+    while (!reader.atEnd() && !(reader.name() == QLatin1String("hyperlinks") &&
+                                reader.tokenType() == QXmlStreamReader::EndElement)) {
+        reader.readNextStartElement();
+        if (reader.tokenType() == QXmlStreamReader::StartElement &&
+            reader.name() == QLatin1String("hyperlink")) {
+            QXmlStreamAttributes attrs = reader.attributes();
+            CellReference pos(attrs.value(QLatin1String("ref")).toString());
+            if (pos.isValid()) { // Valid
+                QSharedPointer<XlsxHyperlinkData> link(new XlsxHyperlinkData);
+                link->display  = attrs.value(QLatin1String("display")).toString();
+                link->tooltip  = attrs.value(QLatin1String("tooltip")).toString();
+                link->location = attrs.value(QLatin1String("location")).toString();
+
+                if (attrs.hasAttribute(QLatin1String("r:id"))) {
+                    link->linkType        = XlsxHyperlinkData::External;
+                    XlsxRelationship ship = relationships->getRelationshipById(
+                        attrs.value(QLatin1String("r:id")).toString());
+                    link->target = ship.target;
+                } else {
+                    link->linkType = XlsxHyperlinkData::Internal;
+                }
+
+                urlTable[pos.row()][pos.column()] = link;
             }
-            else
-            {
-				int colEnd = (idx == nodes.size() - 1) ? colLast : nodes[idx+1] - 1;
+        }
+    }
+}
+
+QList<QSharedPointer<XlsxColumnInfo>> WorksheetPrivate::getColumnInfoList(int colFirst, int colLast)
+{
+    QList<QSharedPointer<XlsxColumnInfo>> columnsInfoList;
+    if (isColumnRangeValid(colFirst, colLast)) {
+        QList<int> nodes = getColumnIndexes(colFirst, colLast);
+
+        for (int idx = 0; idx < nodes.size(); ++idx) {
+            int colStart = nodes[idx];
+            auto it      = colsInfo.constFind(colStart);
+            if (it != colsInfo.constEnd()) {
+                columnsInfoList.append(*it);
+            } else {
+                int colEnd = (idx == nodes.size() - 1) ? colLast : nodes[idx + 1] - 1;
                 QSharedPointer<XlsxColumnInfo> info(new XlsxColumnInfo(colStart, colEnd, false));
-				colsInfo.insert(colFirst, info);
-				columnsInfoList.append(info);
-				for (int c = colStart; c <= colEnd; ++c)
-                {
-					colsInfoHelper[c] = info;
+                colsInfo.insert(colFirst, info);
+                columnsInfoList.append(info);
+                for (int c = colStart; c <= colEnd; ++c) {
+                    colsInfoHelper[c] = info;
                 }
-			}
-		}
-	}
+            }
+        }
+    }
 
-	return columnsInfoList;
+    return columnsInfoList;
 }
 
-QList <QSharedPointer<XlsxRowInfo> > WorksheetPrivate::getRowInfoList(int rowFirst, int rowLast)
+QList<QSharedPointer<XlsxRowInfo>> WorksheetPrivate::getRowInfoList(int rowFirst, int rowLast)
 {
-	QList <QSharedPointer<XlsxRowInfo> > rowInfoList;
+    QList<QSharedPointer<XlsxRowInfo>> rowInfoList;
 
-	int min_col = dimension.firstColumn() < 1 ? 1 : dimension.firstColumn();
+    int min_col = dimension.firstColumn() < 1 ? 1 : dimension.firstColumn();
 
-	for(int row = rowFirst; row <= rowLast; ++row) {
-		if (checkDimensions(row, min_col, false, true))
-			continue;
+    for (int row = rowFirst; row <= rowLast; ++row) {
+        if (checkDimensions(row, min_col, false, true))
+            continue;
 
-		QSharedPointer<XlsxRowInfo> rowInfo;
-		if ((rowsInfo[row]).isNull()){
-			rowsInfo[row] = QSharedPointer<XlsxRowInfo>(new XlsxRowInfo());
-		}
-		rowInfoList.append(rowsInfo[row]);
-	}
+        QSharedPointer<XlsxRowInfo> rowInfo;
+        if ((rowsInfo[row]).isNull()) {
+            rowsInfo[row] = QSharedPointer<XlsxRowInfo>(new XlsxRowInfo());
+        }
+        rowInfoList.append(rowsInfo[row]);
+    }
 
-	return rowInfoList;
+    return rowInfoList;
 }
 
 bool Worksheet::loadFromXmlFile(QIODevice *device)
 {
-	Q_D(Worksheet);
+    Q_D(Worksheet);
 
-	QXmlStreamReader reader(device);
-    while (!reader.atEnd())
-    {
-		reader.readNextStartElement();
-        if (reader.tokenType() == QXmlStreamReader::StartElement)
-        {
-            if (reader.name() == QLatin1String("dimension"))
-            {
-				QXmlStreamAttributes attributes = reader.attributes();
-				QString range = attributes.value(QLatin1String("ref")).toString();
-				d->dimension = CellRange(range);
-            }
-            else if (reader.name() == QLatin1String("sheetViews"))
-            {
-				d->loadXmlSheetViews(reader);
-            }
-            else if (reader.name() == QLatin1String("sheetFormatPr"))
-            {
-				d->loadXmlSheetFormatProps(reader);
-            }
-            else if (reader.name() == QLatin1String("cols"))
-            {
-				d->loadXmlColumnsInfo(reader);
-            }
-            else if (reader.name() == QLatin1String("sheetData"))
-            {
-				d->loadXmlSheetData(reader);
-            }
-            else if (reader.name() == QLatin1String("mergeCells"))
-            {
-				d->loadXmlMergeCells(reader);
-            }
-            else if (reader.name() == QLatin1String("dataValidations"))
-            {
-				d->loadXmlDataValidations(reader);
-            }
-            else if (reader.name() == QLatin1String("conditionalFormatting"))
-            {
-				ConditionalFormatting cf;
-				cf.loadFromXml(reader, workbook()->styles());
-				d->conditionalFormattingList.append(cf);
-            }
-            else if (reader.name() == QLatin1String("hyperlinks"))
-            {
-				d->loadXmlHyperlinks(reader);
-            }
-            else if(reader.name() == QLatin1String("pageSetup"))
-            {
+    QXmlStreamReader reader(device);
+    while (!reader.atEnd()) {
+        reader.readNextStartElement();
+        if (reader.tokenType() == QXmlStreamReader::StartElement) {
+            if (reader.name() == QLatin1String("dimension")) {
+                QXmlStreamAttributes attributes = reader.attributes();
+                QString range                   = attributes.value(QLatin1String("ref")).toString();
+                d->dimension                    = CellRange(range);
+            } else if (reader.name() == QLatin1String("sheetViews")) {
+                d->loadXmlSheetViews(reader);
+            } else if (reader.name() == QLatin1String("sheetFormatPr")) {
+                d->loadXmlSheetFormatProps(reader);
+            } else if (reader.name() == QLatin1String("cols")) {
+                d->loadXmlColumnsInfo(reader);
+            } else if (reader.name() == QLatin1String("sheetData")) {
+                d->loadXmlSheetData(reader);
+            } else if (reader.name() == QLatin1String("mergeCells")) {
+                d->loadXmlMergeCells(reader);
+            } else if (reader.name() == QLatin1String("dataValidations")) {
+                d->loadXmlDataValidations(reader);
+            } else if (reader.name() == QLatin1String("conditionalFormatting")) {
+                ConditionalFormatting cf;
+                cf.loadFromXml(reader, workbook()->styles());
+                d->conditionalFormattingList.append(cf);
+            } else if (reader.name() == QLatin1String("hyperlinks")) {
+                d->loadXmlHyperlinks(reader);
+            } else if (reader.name() == QLatin1String("pageSetup")) {
                 QXmlStreamAttributes attributes = reader.attributes();
 
                 d->PpaperSize = attributes.value(QLatin1String("paperSize")).toString().trimmed();
-                d->Pscale = attributes.value(QLatin1String("scale")).toString().trimmed();
-                d->PfirstPageNumber = attributes.value(QLatin1String("firstPageNumber")).toString().trimmed();
-                d->Porientation = attributes.value(QLatin1String("orientation")).toString().trimmed();
-                d->PuseFirstPageNumber = attributes.value(QLatin1String("useFirstPageNumber")).toString().trimmed();
-                d->PhorizontalDpi = attributes.value(QLatin1String("horizontalDpi")).toString().trimmed();
-                d->PverticalDpi = attributes.value(QLatin1String("verticalDpi")).toString().trimmed();
-                d->Prid = attributes.value(QLatin1String("r:id")).toString().trimmed();
+                d->Pscale     = attributes.value(QLatin1String("scale")).toString().trimmed();
+                d->PfirstPageNumber =
+                    attributes.value(QLatin1String("firstPageNumber")).toString().trimmed();
+                d->Porientation =
+                    attributes.value(QLatin1String("orientation")).toString().trimmed();
+                d->PuseFirstPageNumber =
+                    attributes.value(QLatin1String("useFirstPageNumber")).toString().trimmed();
+                d->PhorizontalDpi =
+                    attributes.value(QLatin1String("horizontalDpi")).toString().trimmed();
+                d->PverticalDpi =
+                    attributes.value(QLatin1String("verticalDpi")).toString().trimmed();
+                d->Prid    = attributes.value(QLatin1String("r:id")).toString().trimmed();
                 d->Pcopies = attributes.value(QLatin1String("copies")).toString().trimmed();
-            }
-            else if(reader.name() == QLatin1String("pageMargins"))
-            {
+            } else if (reader.name() == QLatin1String("pageMargins")) {
                 QXmlStreamAttributes attributes = reader.attributes();
 
-                d->PMfooter= attributes.value(QLatin1String("footer")).toString().trimmed();
+                d->PMfooter = attributes.value(QLatin1String("footer")).toString().trimmed();
                 d->PMheader = attributes.value(QLatin1String("header")).toString().trimmed();
                 d->PMbotton = attributes.value(QLatin1String("bottom")).toString().trimmed();
-                d->PMtop = attributes.value(QLatin1String("top")).toString().trimmed();
-                d->PMright = attributes.value(QLatin1String("right")).toString().trimmed();
-                d->PMleft = attributes.value(QLatin1String("left")).toString().trimmed();
-            }
-            else if(reader.name() == QLatin1String("headerFooter"))
-            {
+                d->PMtop    = attributes.value(QLatin1String("top")).toString().trimmed();
+                d->PMright  = attributes.value(QLatin1String("right")).toString().trimmed();
+                d->PMleft   = attributes.value(QLatin1String("left")).toString().trimmed();
+            } else if (reader.name() == QLatin1String("headerFooter")) {
                 // dev40
-                while (reader.readNextStartElement())
-                {
+                while (reader.readNextStartElement()) {
                     if (reader.name() == QLatin1String("oddHeader"))
                         d->ModdHeader = reader.readElementText();
 
                     if (reader.name() == QLatin1String("oddFooter"))
-                            d->MoodFooter = reader.readElementText();
+                        d->MoodFooter = reader.readElementText();
                 }
-            }
-            else if (reader.name() == QLatin1String("drawing"))
-            {
-				QString rId = reader.attributes().value(QStringLiteral("r:id")).toString();
-				QString name = d->relationships->getRelationshipById(rId).target;
+            } else if (reader.name() == QLatin1String("drawing")) {
+                QString rId  = reader.attributes().value(QStringLiteral("r:id")).toString();
+                QString name = d->relationships->getRelationshipById(rId).target;
 
                 const auto parts = splitPath(filePath());
-                QString path = QDir::cleanPath(parts.first() + QLatin1String("/") + name);
+                QString path     = QDir::cleanPath(parts.first() + QLatin1String("/") + name);
 
                 d->drawing = std::make_shared<Drawing>(this, F_LoadFromExists);
-				d->drawing->setFilePath(path);
+                d->drawing->setFilePath(path);
+            } else if (reader.name() == QLatin1String("extLst")) {
+                // Todo: add extLst support
+                while (!reader.atEnd() && !(reader.name() == QLatin1String("extLst") &&
+                                            reader.tokenType() == QXmlStreamReader::EndElement)) {
+                    reader.readNextStartElement();
+                }
             }
-            else if (reader.name() == QLatin1String("extLst"))
-            {
-				//Todo: add extLst support
-                while ( !reader.atEnd() &&
-                        !(reader.name() == QLatin1String("extLst") &&
-                          reader.tokenType() == QXmlStreamReader::EndElement))
-                {
-					reader.readNextStartElement();
-				}
-			}
-		}
-	}
+        }
+    }
 
-	d->validateDimension();
-	return true;
+    d->validateDimension();
+    return true;
 }
 
 /*
@@ -2974,35 +2803,31 @@ bool Worksheet::loadFromXmlFile(QIODevice *device)
  */
 void WorksheetPrivate::validateDimension()
 {
-	if (dimension.isValid() || cellTable.isEmpty())
-		return;
+    if (dimension.isValid() || cellTable.isEmpty())
+        return;
 
-	const auto firstRow = cellTable.constBegin().key();
+    const auto firstRow = cellTable.constBegin().key();
 
     const auto lastRow = (--cellTable.constEnd()).key();
 
-	int firstColumn = -1;
-	int lastColumn = -1;
+    int firstColumn = -1;
+    int lastColumn  = -1;
 
-    for ( auto&& it = cellTable.constBegin()
-            ; it != cellTable.constEnd()
-            ; ++it )
-    {
+    for (auto &&it = cellTable.constBegin(); it != cellTable.constEnd(); ++it) {
         Q_ASSERT(!it.value().isEmpty());
 
         if (firstColumn == -1 || it.value().constBegin().key() < firstColumn)
             firstColumn = it.value().constBegin().key();
 
-        if (lastColumn == -1 || (--it.value().constEnd()).key() > lastColumn)
-        {
+        if (lastColumn == -1 || (--it.value().constEnd()).key() > lastColumn) {
             lastColumn = (--it.value().constEnd()).key();
         }
     }
 
-	CellRange cr(firstRow, firstColumn, lastRow, lastColumn);
+    CellRange cr(firstRow, firstColumn, lastRow, lastColumn);
 
-	if (cr.isValid())
-		dimension = cr;
+    if (cr.isValid())
+        dimension = cr;
 }
 
 /*!
@@ -3011,10 +2836,10 @@ void WorksheetPrivate::validateDimension()
  */
 SharedStrings *WorksheetPrivate::sharedStrings() const
 {
-	return workbook->sharedStrings();
+    return workbook->sharedStrings();
 }
 
-QVector<CellLocation> Worksheet::getFullCells(int* maxRow, int* maxCol)
+QVector<CellLocation> Worksheet::getFullCells(int *maxRow, int *maxCol)
 {
     Q_D(const Worksheet);
 
@@ -3026,54 +2851,45 @@ QVector<CellLocation> Worksheet::getFullCells(int* maxRow, int* maxCol)
     // QString privateName = d->name; // name of sheet (not object type)
     // qDebug() << privateName ;
 
-    if ( d->type == AbstractSheet::ST_WorkSheet  )
-    {
+    if (d->type == AbstractSheet::ST_WorkSheet) {
         // use current sheet
-    }
-    else if ( d->type == AbstractSheet::ST_ChartSheet )
-    {
+    } else if (d->type == AbstractSheet::ST_ChartSheet) {
         return ret;
-    }
-    else
-    {
+    } else {
         qWarning("unsupported sheet type.");
         Q_ASSERT(false);
         return ret;
     }
 
-    QMapIterator< int, QMap< int, std::shared_ptr<Cell> > > _it( d->cellTable );
+    QMapIterator<int, QMap<int, std::shared_ptr<Cell>>> _it(d->cellTable);
 
-    while ( _it.hasNext() )
-    {
+    while (_it.hasNext()) {
         _it.next();
 
-        int keyI = _it.key(); // key (cell row)
-        QMapIterator<int, std::shared_ptr<Cell> > _iit( _it.value() ); // value
+        int keyI = _it.key();                                       // key (cell row)
+        QMapIterator<int, std::shared_ptr<Cell>> _iit(_it.value()); // value
 
-        while ( _iit.hasNext() )
-        {
+        while (_iit.hasNext()) {
             _iit.next();
 
-            int keyII = _iit.key(); // key (cell column)
+            int keyII                     = _iit.key();   // key (cell column)
             std::shared_ptr<Cell> ptrCell = _iit.value(); // value
 
             CellLocation cl;
 
             cl.row = keyI;
-            if ( keyI > (*maxRow) )
-            {
+            if (keyI > (*maxRow)) {
                 (*maxRow) = keyI;
             }
 
             cl.col = keyII;
-            if ( keyII > (*maxCol) )
-            {
+            if (keyII > (*maxCol)) {
                 (*maxCol) = keyII;
             }
 
             cl.cell = ptrCell;
 
-            ret.push_back( cl );
+            ret.push_back(cl);
         }
     }
 
diff --git a/QXlsx/source/xlsxzipreader.cpp b/QXlsx/source/xlsxzipreader.cpp
index 6710a3b3..aac845f2 100644
--- a/QXlsx/source/xlsxzipreader.cpp
+++ b/QXlsx/source/xlsxzipreader.cpp
@@ -6,26 +6,23 @@
 
 QT_BEGIN_NAMESPACE_XLSX
 
-ZipReader::ZipReader(const QString &filePath) :
-    m_reader(new QZipReader(filePath))
+ZipReader::ZipReader(const QString &filePath)
+    : m_reader(new QZipReader(filePath))
 {
     init();
 }
 
-ZipReader::ZipReader(QIODevice *device) :
-    m_reader(new QZipReader(device))
+ZipReader::ZipReader(QIODevice *device)
+    : m_reader(new QZipReader(device))
 {
     init();
 }
 
-ZipReader::~ZipReader()
-{
-
-}
+ZipReader::~ZipReader() {}
 
 void ZipReader::init()
 {
-    const auto& allFiles = m_reader->fileInfoList();
+    const auto &allFiles = m_reader->fileInfoList();
     for (const auto &fi : allFiles) {
         if (fi.isFile || (!fi.isDir && !fi.isFile && !fi.isSymLink))
             m_filePaths.append(fi.filePath);
diff --git a/QXlsx/source/xlsxzipwriter.cpp b/QXlsx/source/xlsxzipwriter.cpp
index 63f91c3a..0ee17e37 100644
--- a/QXlsx/source/xlsxzipwriter.cpp
+++ b/QXlsx/source/xlsxzipwriter.cpp
@@ -2,10 +2,11 @@
 
 #include "xlsxzipwriter_p.h"
 
-#include <QtGlobal>
-#include <QDebug>
 #include <private/qzipwriter_p.h>
 
+#include <QDebug>
+#include <QtGlobal>
+
 QT_BEGIN_NAMESPACE_XLSX
 
 ZipWriter::ZipWriter(const QString &filePath)
diff --git a/ReadColor/main.cpp b/ReadColor/main.cpp
index 11362878..156e2632 100644
--- a/ReadColor/main.cpp
+++ b/ReadColor/main.cpp
@@ -1,67 +1,63 @@
 // main.cpp
 
-#include <QtGlobal>
-#include <QCoreApplication>
-#include <QtCore>
-#include <QVariant>
-#include <QDir>
+#include <iostream>
+
 #include <QColor>
+#include <QCoreApplication>
 #include <QDebug>
-
-#include <iostream>
+#include <QDir>
+#include <QVariant>
+#include <QtCore>
+#include <QtGlobal>
 using namespace std;
 
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
 #include "xlsxrichstring.h"
 #include "xlsxworkbook.h"
 using namespace QXlsx;
 
-void printColor(Cell* cell);
-void saveColor(Cell* cell);
+void printColor(Cell *cell);
+void saveColor(Cell *cell);
 
 int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);
 
     Document xlsxR(":/color.xlsx");
-    if ( !xlsxR.load() )
-    {
+    if (!xlsxR.load()) {
         return (-1);
     }
 
-    printColor( xlsxR.cellAt(1, 1) );
-    printColor( xlsxR.cellAt(1, 2) );
-    printColor( xlsxR.cellAt(2, 1) );
-    printColor( xlsxR.cellAt(2, 2) );
+    printColor(xlsxR.cellAt(1, 1));
+    printColor(xlsxR.cellAt(1, 2));
+    printColor(xlsxR.cellAt(2, 1));
+    printColor(xlsxR.cellAt(2, 2));
 
-    xlsxR.write( 3, 3, QVariant("HELLO") );
-    saveColor( xlsxR.cellAt(3, 3) );
+    xlsxR.write(3, 3, QVariant("HELLO"));
+    saveColor(xlsxR.cellAt(3, 3));
 
     xlsxR.saveAs("color2.xlsx");
 
     return 0;
 }
 
-void printColor(Cell* cell)
+void printColor(Cell *cell)
 {
-    if ( NULL == cell )
+    if (NULL == cell)
         return;
 
-     QColor clrForeGround = cell->format().patternForegroundColor();
-     QColor clrBackGround = cell->format().patternBackgroundColor();
-
-     if ( clrForeGround.isValid() &&
-          clrBackGround.isValid() )
-     {
-           qDebug() << "[debug] color : " << clrForeGround << clrBackGround;
-     }
+    QColor clrForeGround = cell->format().patternForegroundColor();
+    QColor clrBackGround = cell->format().patternBackgroundColor();
 
+    if (clrForeGround.isValid() && clrBackGround.isValid()) {
+        qDebug() << "[debug] color : " << clrForeGround << clrBackGround;
+    }
 }
 
-void saveColor(Cell* cell)
+void saveColor(Cell *cell)
 {
 
     cell->format().setVerticalAlignment(QXlsx::Format::AlignVCenter);
@@ -70,6 +66,4 @@ void saveColor(Cell* cell)
     // fmt->setTextWarp(false);
     cell->format().setPatternBackgroundColor(Qt::blue);
     cell->format().setPatternForegroundColor(Qt::white);
-
 }
-
diff --git a/ShowConsole/fort.h b/ShowConsole/fort.h
index 345b110b..ea930ae3 100644
--- a/ShowConsole/fort.h
+++ b/ShowConsole/fort.h
@@ -35,10 +35,10 @@ SOFTWARE.
 #ifndef LIBFORT_H
 #define LIBFORT_H
 
+#include <limits.h>
 #include <stddef.h>
-#include <stdlib.h>
 #include <stdint.h>
-#include <limits.h>
+#include <stdlib.h>
 
 /*****************************************************************************
  *               VERSION
@@ -49,7 +49,6 @@ SOFTWARE.
 #define LIBFORT_REVISION 6
 #define LIBFORT_VERSION_STR "0.1.6"
 
-
 /*****************************************************************************
  *               Configuration
  *****************************************************************************/
@@ -60,24 +59,20 @@ SOFTWARE.
 /** #define FT_CONGIG_HAVE_WCHAR */
 
 #if defined(FT_CONGIG_HAVE_WCHAR)
-#define FT_HAVE_WCHAR
+#    define FT_HAVE_WCHAR
 #endif
 
-
 /*****************************************************************************
  *               RETURN CODES
  *****************************************************************************/
 typedef int fort_status_t;
-#define FT_SUCCESS        0
-#define FT_MEMORY_ERROR   -1
-#define FT_ERROR          -2
-#define FT_EINVAL         -3
+#define FT_SUCCESS 0
+#define FT_MEMORY_ERROR -1
+#define FT_ERROR -2
+#define FT_EINVAL -3
 #define FT_IS_SUCCESS(arg) ((arg) >= 0)
 #define FT_IS_ERROR(arg) ((arg) < 0)
 
-
-
-
 /**
  * @cond HELPER_MACROS
  */
@@ -87,55 +82,50 @@ typedef int fort_status_t;
  *****************************************************************************/
 
 #if defined(__clang__)
-#define FT_CLANG_COMPILER
+#    define FT_CLANG_COMPILER
 #elif defined(__GNUC__)
-#define FT_GCC_COMPILER
+#    define FT_GCC_COMPILER
 #elif defined(_MSC_VER)
-#define FT_MICROSOFT_COMPILER
+#    define FT_MICROSOFT_COMPILER
 #else
-#define FT_UNDEFINED_COMPILER
+#    define FT_UNDEFINED_COMPILER
 #endif
 
-
 /*****************************************************************************
  *               Declare inline
  *****************************************************************************/
 
 #if defined(__cplusplus)
-#define FT_INLINE inline
+#    define FT_INLINE inline
 #else
-#define FT_INLINE __inline
+#    define FT_INLINE __inline
 #endif /* if defined(__cplusplus) */
 
-
 /*****************************************************************************
  *    C++ needs to know that types and declarations are C, not C++.
  *****************************************************************************/
 
 #ifdef __cplusplus
-# define FT_BEGIN_DECLS extern "C" {
-# define FT_END_DECLS }
+#    define FT_BEGIN_DECLS extern "C" {
+#    define FT_END_DECLS }
 #else
-# define FT_BEGIN_DECLS
-# define FT_END_DECLS
+#    define FT_BEGIN_DECLS
+#    define FT_END_DECLS
 #endif
 
-
 /*****************************************************************************
  *               Helper macros
  *****************************************************************************/
 
-#define FT_STR_2_CAT_(arg1, arg2) \
-    arg1##arg2
-#define FT_STR_2_CAT(arg1, arg2) \
-    FT_STR_2_CAT_(arg1, arg2)
+#define FT_STR_2_CAT_(arg1, arg2) arg1##arg2
+#define FT_STR_2_CAT(arg1, arg2) FT_STR_2_CAT_(arg1, arg2)
 
 /**
  * @interanl
  */
 static FT_INLINE int ft_check_if_string_helper(const char *str)
 {
-    (void)str;
+    (void) str;
     return 0;
 }
 
@@ -144,77 +134,107 @@ static FT_INLINE int ft_check_if_string_helper(const char *str)
  */
 static FT_INLINE int ft_check_if_wstring_helper(const wchar_t *str)
 {
-    (void)str;
+    (void) str;
     return 0;
 }
 
-#define FT_NARGS_IMPL_(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,N,...) N
+#define FT_NARGS_IMPL_(x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, N, ...) N
 #define FT_EXPAND_(x) x
 #define FT_PP_NARG_(...) \
-    FT_EXPAND_(FT_NARGS_IMPL_(__VA_ARGS__,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0))
-
-#define FT_CHECK_IF_STR_32(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_31(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_31(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_30(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_30(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_29(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_29(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_28(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_28(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_27(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_27(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_26(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_26(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_25(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_25(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_24(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_24(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_23(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_23(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_22(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_22(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_21(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_21(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_20(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_20(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_19(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_19(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_18(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_18(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_17(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_17(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_16(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_16(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_15(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_15(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_14(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_14(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_13(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_13(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_12(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_12(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_11(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_11(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_10(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_10(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_9(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_9(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_8(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_8(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_7(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_7(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_6(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_6(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_5(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_5(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_4(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_4(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_3(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_3(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_2(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_2(checker,arg,...) (checker(arg),FT_EXPAND_(FT_CHECK_IF_STR_1(checker,__VA_ARGS__)))
-#define FT_CHECK_IF_STR_1(checker,arg) (checker(arg))
-
-#define FT_CHECK_IF_ARGS_ARE_STRINGS__(checker,func, ...) \
-    FT_EXPAND_(func(checker,__VA_ARGS__))
-#define FT_CHECK_IF_ARGS_ARE_STRINGS_(checker,basis, n, ...) \
-    FT_CHECK_IF_ARGS_ARE_STRINGS__(checker,FT_STR_2_CAT_(basis, n), __VA_ARGS__)
+    FT_EXPAND_(FT_NARGS_IMPL_(__VA_ARGS__, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0))
+
+#define FT_CHECK_IF_STR_32(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_31(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_31(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_30(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_30(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_29(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_29(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_28(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_28(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_27(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_27(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_26(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_26(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_25(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_25(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_24(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_24(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_23(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_23(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_22(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_22(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_21(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_21(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_20(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_20(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_19(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_19(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_18(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_18(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_17(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_17(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_16(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_16(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_15(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_15(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_14(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_14(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_13(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_13(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_12(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_12(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_11(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_11(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_10(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_10(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_9(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_9(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_8(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_8(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_7(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_7(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_6(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_6(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_5(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_5(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_4(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_4(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_3(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_3(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_2(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_2(checker, arg, ...) \
+    (checker(arg), FT_EXPAND_(FT_CHECK_IF_STR_1(checker, __VA_ARGS__)))
+#define FT_CHECK_IF_STR_1(checker, arg) (checker(arg))
+
+#define FT_CHECK_IF_ARGS_ARE_STRINGS__(checker, func, ...) FT_EXPAND_(func(checker, __VA_ARGS__))
+#define FT_CHECK_IF_ARGS_ARE_STRINGS_(checker, basis, n, ...) \
+    FT_CHECK_IF_ARGS_ARE_STRINGS__(checker, FT_STR_2_CAT_(basis, n), __VA_ARGS__)
 #define FT_CHECK_IF_ARGS_ARE_STRINGS(...) \
-    FT_CHECK_IF_ARGS_ARE_STRINGS_(ft_check_if_string_helper,FT_CHECK_IF_STR_,FT_PP_NARG_(__VA_ARGS__), __VA_ARGS__)
+    FT_CHECK_IF_ARGS_ARE_STRINGS_( \
+        ft_check_if_string_helper, FT_CHECK_IF_STR_, FT_PP_NARG_(__VA_ARGS__), __VA_ARGS__)
 
 #ifdef FT_HAVE_WCHAR
-#define CHECK_IF_ARGS_ARE_WSTRINGS(...) \
-    FT_CHECK_IF_ARGS_ARE_STRINGS_(ft_check_if_wstring_helper,FT_CHECK_IF_STR_,FT_PP_NARG_(__VA_ARGS__), __VA_ARGS__)
+#    define CHECK_IF_ARGS_ARE_WSTRINGS(...) \
+        FT_CHECK_IF_ARGS_ARE_STRINGS_( \
+            ft_check_if_wstring_helper, FT_CHECK_IF_STR_, FT_PP_NARG_(__VA_ARGS__), __VA_ARGS__)
 #endif
 
 /**
  * @endcond
  */
 
-
 /*****************************************************************************
  *               Attribute format for argument checking
  *****************************************************************************/
 
 #if defined(FT_CLANG_COMPILER) || defined(FT_GCC_COMPILER)
-#define FT_PRINTF_ATTRIBUTE_FORMAT(string_index, first_to_check) \
-    __attribute__ ((format (printf, string_index, first_to_check)))
+#    define FT_PRINTF_ATTRIBUTE_FORMAT(string_index, first_to_check) \
+        __attribute__((format(printf, string_index, first_to_check)))
 #else
-#define FT_PRINTF_ATTRIBUTE_FORMAT(string_index, first_to_check)
+#    define FT_PRINTF_ATTRIBUTE_FORMAT(string_index, first_to_check)
 #endif /* defined(FT_CLANG_COMPILER) || defined(FT_GCC_COMPILER) */
 
-
 /*****************************************************************************
  *                   libfort API
  *****************************************************************************/
@@ -308,8 +328,6 @@ size_t ft_cur_col(ft_table_t *table);
  */
 void ft_set_cur_cell(ft_table_t *table, size_t row, size_t col);
 
-
-
 #if defined(FT_CLANG_COMPILER) || defined(FT_GCC_COMPILER)
 
 /**
@@ -375,10 +393,10 @@ int ft_printf_ln(ft_table_t *table, const char *fmt, ...) FT_PRINTF_ATTRIBUTE_FO
 int ft_printf_impl(ft_table_t *table, const char *fmt, ...) FT_PRINTF_ATTRIBUTE_FORMAT(2, 3);
 int ft_printf_ln_impl(ft_table_t *table, const char *fmt, ...) FT_PRINTF_ATTRIBUTE_FORMAT(2, 3);
 
-#define ft_printf(table, ...) \
-    (( 0 ? fprintf(stderr, __VA_ARGS__) : 1), ft_printf_impl(table, __VA_ARGS__))
-#define ft_printf_ln(table, ...) \
-    (( 0 ? fprintf(stderr, __VA_ARGS__) : 1), ft_printf_ln_impl(table, __VA_ARGS__))
+#    define ft_printf(table, ...) \
+        ((0 ? fprintf(stderr, __VA_ARGS__) : 1), ft_printf_impl(table, __VA_ARGS__))
+#    define ft_printf_ln(table, ...) \
+        ((0 ? fprintf(stderr, __VA_ARGS__) : 1), ft_printf_ln_impl(table, __VA_ARGS__))
 
 /**
  * @endcond
@@ -394,7 +412,6 @@ int ft_printf_ln_impl(ft_table_t *table, const char *fmt, ...) FT_PRINTF_ATTRIBU
  */
 void ft_set_default_printf_field_separator(char separator);
 
-
 /**
  * Write strings to the table.
  *
@@ -409,8 +426,9 @@ void ft_set_default_printf_field_separator(char separator);
  *   - 0: Success; data were written
  *   - (<0): In case of error
  */
-#define ft_write(table, ...)\
-    (0 ? FT_CHECK_IF_ARGS_ARE_STRINGS(__VA_ARGS__) : ft_nwrite(table, FT_PP_NARG_(__VA_ARGS__), __VA_ARGS__))
+#define ft_write(table, ...) \
+    (0 ? FT_CHECK_IF_ARGS_ARE_STRINGS(__VA_ARGS__) \
+       : ft_nwrite(table, FT_PP_NARG_(__VA_ARGS__), __VA_ARGS__))
 
 /**
  * Write strings to the table and go to the next line.
@@ -427,8 +445,9 @@ void ft_set_default_printf_field_separator(char separator);
  *   - 0: Success; data were written
  *   - (<0): In case of error
  */
-#define ft_write_ln(table, ...)\
-    (0 ? FT_CHECK_IF_ARGS_ARE_STRINGS(__VA_ARGS__) : ft_nwrite_ln(table, FT_PP_NARG_(__VA_ARGS__), __VA_ARGS__))
+#define ft_write_ln(table, ...) \
+    (0 ? FT_CHECK_IF_ARGS_ARE_STRINGS(__VA_ARGS__) \
+       : ft_nwrite_ln(table, FT_PP_NARG_(__VA_ARGS__), __VA_ARGS__))
 
 /**
  * Write specified number of strings to the table.
@@ -481,10 +500,6 @@ int ft_nwrite(ft_table_t *table, size_t count, const char *cell_content, ...);
  */
 int ft_nwrite_ln(ft_table_t *table, size_t count, const char *cell_content, ...);
 
-
-
-
-
 /**
  * Write strings from the array to the table.
  *
@@ -522,7 +537,6 @@ int ft_row_write(ft_table_t *table, size_t cols, const char *row_cells[]);
  */
 int ft_row_write_ln(ft_table_t *table, size_t cols, const char *row_cells[]);
 
-
 /**
  * Write strings from the 2D array to the table.
  *
@@ -562,7 +576,6 @@ int ft_table_write(ft_table_t *table, size_t rows, size_t cols, const char *tabl
  */
 int ft_table_write_ln(ft_table_t *table, size_t rows, size_t cols, const char *table_cells[]);
 
-
 /**
  * Add separator after the current row.
  *
@@ -574,7 +587,6 @@ int ft_table_write_ln(ft_table_t *table, size_t rows, size_t cols, const char *t
  */
 int ft_add_separator(ft_table_t *table);
 
-
 /**
  * Convert table to string representation.
  *
@@ -594,12 +606,6 @@ int ft_add_separator(ft_table_t *table);
  */
 const char *ft_to_string(const ft_table_t *table);
 
-
-
-
-
-
-
 /**
  * Structure describing border appearance.
  */
@@ -648,8 +654,6 @@ extern const struct ft_border_style *const FT_BOLD2_STYLE;
 extern const struct ft_border_style *const FT_FRAME_STYLE;
 /** @} */
 
-
-
 /**
  * Set default border style for all new formatted tables.
  *
@@ -674,61 +678,56 @@ int ft_set_default_border_style(const struct ft_border_style *style);
  */
 int ft_set_border_style(ft_table_t *table, const struct ft_border_style *style);
 
-
-
 /**
  * @name Special macros to define cell position (row and column).
  * @{
  */
 #define FT_ANY_COLUMN (UINT_MAX)     /**< Any column (can be used to refer to all cells in a row)*/
 #define FT_CUR_COLUMN (UINT_MAX - 1) /**< Current column */
-#define FT_ANY_ROW    (UINT_MAX)     /**< Any row (can be used to refer to all cells in a column)*/
-#define FT_CUR_ROW    (UINT_MAX - 1) /**< Current row */
+#define FT_ANY_ROW (UINT_MAX)        /**< Any row (can be used to refer to all cells in a column)*/
+#define FT_CUR_ROW (UINT_MAX - 1)    /**< Current row */
 /** @} */
 
-
-
 /**
  * @name Cell properties identifiers.
  * @{
  */
-#define FT_CPROP_MIN_WIDTH        (0x01U << 0) /**< Minimum width */
-#define FT_CPROP_TEXT_ALIGN       (0x01U << 1) /**< Text alignment */
-#define FT_CPROP_TOP_PADDING      (0x01U << 2) /**< Top padding for cell content */
-#define FT_CPROP_BOTTOM_PADDING   (0x01U << 3) /**< Bottom padding for cell content */
-#define FT_CPROP_LEFT_PADDING     (0x01U << 4) /**< Left padding for cell content */
-#define FT_CPROP_RIGHT_PADDING    (0x01U << 5) /**< Right padding for cell content */
+#define FT_CPROP_MIN_WIDTH (0x01U << 0)        /**< Minimum width */
+#define FT_CPROP_TEXT_ALIGN (0x01U << 1)       /**< Text alignment */
+#define FT_CPROP_TOP_PADDING (0x01U << 2)      /**< Top padding for cell content */
+#define FT_CPROP_BOTTOM_PADDING (0x01U << 3)   /**< Bottom padding for cell content */
+#define FT_CPROP_LEFT_PADDING (0x01U << 4)     /**< Left padding for cell content */
+#define FT_CPROP_RIGHT_PADDING (0x01U << 5)    /**< Right padding for cell content */
 #define FT_CPROP_EMPTY_STR_HEIGHT (0x01U << 6) /**< Height of empty cell */
-#define FT_CPROP_ROW_TYPE         (0x01U << 7) /**< Row type */
-#define FT_CPROP_CONT_FG_COLOR    (0x01U << 8) /**< Cell content foreground text color */
-#define FT_CPROP_CELL_BG_COLOR    (0x01U << 9) /**< Cell background color */
-#define FT_CPROP_CONT_BG_COLOR    (0x01U << 10) /**< Cell content background color */
-#define FT_CPROP_CELL_TEXT_STYLE  (0x01U << 11) /**< Cell text style */
-#define FT_CPROP_CONT_TEXT_STYLE  (0x01U << 12) /**< Cell content text style */
+#define FT_CPROP_ROW_TYPE (0x01U << 7)         /**< Row type */
+#define FT_CPROP_CONT_FG_COLOR (0x01U << 8)    /**< Cell content foreground text color */
+#define FT_CPROP_CELL_BG_COLOR (0x01U << 9)    /**< Cell background color */
+#define FT_CPROP_CONT_BG_COLOR (0x01U << 10)   /**< Cell content background color */
+#define FT_CPROP_CELL_TEXT_STYLE (0x01U << 11) /**< Cell text style */
+#define FT_CPROP_CONT_TEXT_STYLE (0x01U << 12) /**< Cell content text style */
 /** @} */
 
-
 /**
  * Colors.
  */
 enum ft_color {
-    FT_COLOR_DEFAULT        = 0,  /**< Default color */
-    FT_COLOR_BLACK          = 1,  /**< Black color*/
-    FT_COLOR_RED            = 2,  /**< Red color */
-    FT_COLOR_GREEN          = 3,  /**< Green color */
-    FT_COLOR_YELLOW         = 4,  /**< Yellow color */
-    FT_COLOR_BLUE           = 5,  /**< Blue color */
-    FT_COLOR_MAGENTA        = 6,  /**< Magenta color */
-    FT_COLOR_CYAN           = 7,  /**< Cyan color */
-    FT_COLOR_LIGHT_GRAY     = 8,  /**< Light gray color */
-    FT_COLOR_DARK_GRAY      = 9,  /**< Dark gray color */
-    FT_COLOR_LIGHT_RED      = 10, /**< Light red color */
-    FT_COLOR_LIGHT_GREEN    = 11, /**< Light green color */
-    FT_COLOR_LIGHT_YELLOW   = 12, /**< Light yellow color */
-    FT_COLOR_LIGHT_BLUE     = 13, /**< Light blue color */
-    FT_COLOR_LIGHT_MAGENTA  = 15, /**< Light magenta color */
-    FT_COLOR_LIGHT_CYAN     = 16, /**< Light cyan color */
-    FT_COLOR_LIGHT_WHYTE    = 17  /**< Light whyte color */
+    FT_COLOR_DEFAULT       = 0,  /**< Default color */
+    FT_COLOR_BLACK         = 1,  /**< Black color*/
+    FT_COLOR_RED           = 2,  /**< Red color */
+    FT_COLOR_GREEN         = 3,  /**< Green color */
+    FT_COLOR_YELLOW        = 4,  /**< Yellow color */
+    FT_COLOR_BLUE          = 5,  /**< Blue color */
+    FT_COLOR_MAGENTA       = 6,  /**< Magenta color */
+    FT_COLOR_CYAN          = 7,  /**< Cyan color */
+    FT_COLOR_LIGHT_GRAY    = 8,  /**< Light gray color */
+    FT_COLOR_DARK_GRAY     = 9,  /**< Dark gray color */
+    FT_COLOR_LIGHT_RED     = 10, /**< Light red color */
+    FT_COLOR_LIGHT_GREEN   = 11, /**< Light green color */
+    FT_COLOR_LIGHT_YELLOW  = 12, /**< Light yellow color */
+    FT_COLOR_LIGHT_BLUE    = 13, /**< Light blue color */
+    FT_COLOR_LIGHT_MAGENTA = 15, /**< Light magenta color */
+    FT_COLOR_LIGHT_CYAN    = 16, /**< Light cyan color */
+    FT_COLOR_LIGHT_WHYTE   = 17  /**< Light whyte color */
 };
 
 /**
@@ -745,22 +744,21 @@ enum ft_text_style {
     FT_TSTYLE_HIDDEN     = (1U << 7)  /**< Hidden (useful for passwords)  */
 };
 
-
 /**
  * Alignment of cell content.
  */
 enum ft_text_alignment {
-    FT_ALIGNED_LEFT = 0,     /**< Align left */
-    FT_ALIGNED_CENTER,       /**< Align center */
-    FT_ALIGNED_RIGHT         /**< Align right */
+    FT_ALIGNED_LEFT = 0, /**< Align left */
+    FT_ALIGNED_CENTER,   /**< Align center */
+    FT_ALIGNED_RIGHT     /**< Align right */
 };
 
 /**
  * Type of table row. Determines appearance of row.
  */
 enum ft_row_type {
-    FT_ROW_COMMON = 0,      /**< Common row */
-    FT_ROW_HEADER           /**< Header row */
+    FT_ROW_COMMON = 0, /**< Common row */
+    FT_ROW_HEADER      /**< Header row */
 };
 
 /**
@@ -795,19 +793,16 @@ int ft_set_default_cell_prop(uint32_t property, int value);
  */
 int ft_set_cell_prop(ft_table_t *table, size_t row, size_t col, uint32_t property, int value);
 
-
 /**
  * @name Table properties identifiers.
  * @{
  */
-#define FT_TPROP_LEFT_MARGIN   (0x01U << 0)
-#define FT_TPROP_TOP_MARGIN    (0x01U << 1)
-#define FT_TPROP_RIGHT_MARGIN  (0x01U << 2)
+#define FT_TPROP_LEFT_MARGIN (0x01U << 0)
+#define FT_TPROP_TOP_MARGIN (0x01U << 1)
+#define FT_TPROP_RIGHT_MARGIN (0x01U << 2)
 #define FT_TPROP_BOTTOM_MARGIN (0x01U << 3)
 /** @} */
 
-
-
 /**
  * Set default table property.
  *
@@ -836,7 +831,6 @@ int ft_set_default_tbl_prop(uint32_t property, int value);
  */
 int ft_set_tbl_prop(ft_table_t *table, uint32_t property, int value);
 
-
 /**
  * Set column span for the specified cell of the table.
  *
@@ -854,7 +848,6 @@ int ft_set_tbl_prop(ft_table_t *table, uint32_t property, int value);
  */
 int ft_set_cell_span(ft_table_t *table, size_t row, size_t col, size_t hor_span);
 
-
 /**
  * Set functions for memory allocation and deallocation to be used instead of
  * standard ones.
@@ -871,20 +864,17 @@ int ft_set_cell_span(ft_table_t *table, size_t row, size_t col, size_t hor_span)
  */
 void ft_set_memory_funcs(void *(*f_malloc)(size_t size), void (*f_free)(void *ptr));
 
-
-
-
 #ifdef FT_HAVE_WCHAR
 
-
 int ft_wprintf(ft_table_t *table, const wchar_t *fmt, ...);
 int ft_wprintf_ln(ft_table_t *table, const wchar_t *fmt, ...);
 
-
-#define ft_wwrite(table, ...)\
-    (0 ? CHECK_IF_ARGS_ARE_WSTRINGS(__VA_ARGS__) : ft_nwwrite(table, FT_PP_NARG_(__VA_ARGS__), __VA_ARGS__))
-#define ft_wwrite_ln(table, ...)\
-    (0 ? CHECK_IF_ARGS_ARE_WSTRINGS(__VA_ARGS__) : ft_nwwrite_ln(table, FT_PP_NARG_(__VA_ARGS__), __VA_ARGS__))
+#    define ft_wwrite(table, ...) \
+        (0 ? CHECK_IF_ARGS_ARE_WSTRINGS(__VA_ARGS__) \
+           : ft_nwwrite(table, FT_PP_NARG_(__VA_ARGS__), __VA_ARGS__))
+#    define ft_wwrite_ln(table, ...) \
+        (0 ? CHECK_IF_ARGS_ARE_WSTRINGS(__VA_ARGS__) \
+           : ft_nwwrite_ln(table, FT_PP_NARG_(__VA_ARGS__), __VA_ARGS__))
 int ft_nwwrite(ft_table_t *table, size_t n, const wchar_t *cell_content, ...);
 int ft_nwwrite_ln(ft_table_t *table, size_t n, const wchar_t *cell_content, ...);
 
@@ -897,8 +887,6 @@ int ft_table_wwrite_ln(ft_table_t *table, size_t rows, size_t cols, const wchar_
 const wchar_t *ft_to_wstring(const ft_table_t *table);
 #endif
 
-
-
 FT_END_DECLS
 
 #endif /* LIBFORT_H */
diff --git a/ShowConsole/main.cpp b/ShowConsole/main.cpp
index e9556187..41f054a2 100644
--- a/ShowConsole/main.cpp
+++ b/ShowConsole/main.cpp
@@ -3,21 +3,19 @@
 #include <iostream>
 #include <vector>
 
-#include <QtGlobal>
 #include <QCoreApplication>
-#include <QtCore>
-#include <QVariant>
-#include <QDir>
 #include <QDebug>
-
-#include <iostream>
+#include <QDir>
+#include <QVariant>
+#include <QtCore>
+#include <QtGlobal>
 using namespace std;
 
 // [0] include QXlsx headers
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
 #include "xlsxrichstring.h"
 #include "xlsxworkbook.h"
 using namespace QXlsx;
@@ -28,8 +26,7 @@ int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);
 
-    if ( argc != 2 )
-    {
+    if (argc != 2) {
         std::cout << "[Usage] ShowConsole *.xlsx" << std::endl;
         return 0;
     }
@@ -39,54 +36,47 @@ int main(int argc, char *argv[])
     qDebug() << xlsxFileName;
 
     // tried to load xlsx using temporary document
-    QXlsx::Document xlsxTmp( xlsxFileName );
-    if ( !xlsxTmp.isLoadPackage() )
-    {
+    QXlsx::Document xlsxTmp(xlsxFileName);
+    if (!xlsxTmp.isLoadPackage()) {
         qCritical() << "Failed to load" << xlsxFileName;
         return (-1); // failed to load
     }
 
     // load new xlsx using new document
-    QXlsx::Document xlsxDoc( xlsxFileName );
+    QXlsx::Document xlsxDoc(xlsxFileName);
     xlsxDoc.isLoadPackage();
 
     int sheetIndexNumber = 0;
-    foreach( QString curretnSheetName, xlsxDoc.sheetNames() )
-    {
-        QXlsx::AbstractSheet* currentSheet = xlsxDoc.sheet( curretnSheetName );
-        if ( NULL == currentSheet )
+    foreach (QString curretnSheetName, xlsxDoc.sheetNames()) {
+        QXlsx::AbstractSheet *currentSheet = xlsxDoc.sheet(curretnSheetName);
+        if (NULL == currentSheet)
             continue;
 
         // get full cells of sheet
         int maxRow = -1;
         int maxCol = -1;
-        currentSheet->workbook()->setActiveSheet( sheetIndexNumber );
-        Worksheet* wsheet = (Worksheet*) currentSheet->workbook()->activeSheet();
-        if ( NULL == wsheet )
+        currentSheet->workbook()->setActiveSheet(sheetIndexNumber);
+        Worksheet *wsheet = (Worksheet *) currentSheet->workbook()->activeSheet();
+        if (NULL == wsheet)
             continue;
 
         QString strSheetName = wsheet->sheetName(); // sheet name
 
         // display sheet name
-        std::cout
-                << std::string( strSheetName.toLocal8Bit() )
-                << std::endl;
+        std::cout << std::string(strSheetName.toLocal8Bit()) << std::endl;
 
-        QVector<CellLocation> clList = wsheet->getFullCells( &maxRow, &maxCol );
+        QVector<CellLocation> clList = wsheet->getFullCells(&maxRow, &maxCol);
 
-        QVector< QVector<QString> > cellValues;
-        for (int rc = 0; rc < maxRow; rc++)
-        {
+        QVector<QVector<QString>> cellValues;
+        for (int rc = 0; rc < maxRow; rc++) {
             QVector<QString> tempValue;
-            for (int cc = 0; cc < maxCol; cc++)
-            {
+            for (int cc = 0; cc < maxCol; cc++) {
                 tempValue.push_back(QString(""));
             }
             cellValues.push_back(tempValue);
         }
 
-        for ( int ic = 0; ic < clList.size(); ++ic )
-         {
+        for (int ic = 0; ic < clList.size(); ++ic) {
             // cell location
             CellLocation cl = clList.at(ic);
 
@@ -109,12 +99,10 @@ int main(int argc, char *argv[])
         }
 
         fort::table fortTable;
-        for (int rc = 0; rc < maxRow; rc++)
-        {
-            for (int cc = 0; cc < maxCol; cc++)
-            {
+        for (int rc = 0; rc < maxRow; rc++) {
+            for (int cc = 0; cc < maxCol; cc++) {
                 QString strTemp = cellValues[rc][cc];
-                fortTable << std::string( strTemp.toLocal8Bit() ); // display value
+                fortTable << std::string(strTemp.toLocal8Bit()); // display value
             }
             fortTable << fort::endr; // change to new row
         }
@@ -124,6 +112,5 @@ int main(int argc, char *argv[])
         sheetIndexNumber++;
     }
 
-
     return 0;
 }
diff --git a/TestExcel/calendar.cpp b/TestExcel/calendar.cpp
index 4abf96c0..3a2db162 100644
--- a/TestExcel/calendar.cpp
+++ b/TestExcel/calendar.cpp
@@ -1,25 +1,24 @@
 // calendar.cpp
 
-#include <QtGlobal>
-#include <QtCore>
-
+#include "xlsxcellrange.h"
 #include "xlsxdocument.h"
 #include "xlsxformat.h"
-#include "xlsxcellrange.h"
 #include "xlsxworksheet.h"
 
+#include <QtCore>
+#include <QtGlobal>
+
 QXLSX_USE_NAMESPACE
 
 int calendar()
 {
     Document xlsx;
     QDate today(QDate::currentDate());
-    for (int month=1; month<=12; ++month)
-    {
+    for (int month = 1; month <= 12; ++month) {
         xlsx.addSheet(QLocale().monthName(month));
         xlsx.currentWorksheet()->setGridLinesVisible(false);
 
-        //the header row
+        // the header row
         Format headerStyle;
         headerStyle.setFontSize(48);
         headerStyle.setFontColor(Qt::darkBlue);
@@ -29,8 +28,8 @@ int calendar()
         xlsx.write("A1", QString("%1 %2").arg(QLocale().monthName(month)).arg(today.year()));
         xlsx.mergeCells("A1:N1", headerStyle);
 
-        //header with month titles
-        for (int day=1; day<=7; ++day) {
+        // header with month titles
+        for (int day = 1; day <= 7; ++day) {
             Format monthStyle;
             monthStyle.setFontSize(12);
             monthStyle.setFontColor(Qt::white);
@@ -40,10 +39,10 @@ int calendar()
             monthStyle.setFillPattern(Format::PatternSolid);
             monthStyle.setPatternBackgroundColor(Qt::darkBlue);
 
-            xlsx.setColumnWidth(day*2-1, day*2-1, 5);
-            xlsx.setColumnWidth(day*2, day*2, 13);
-            xlsx.write(2, day*2-1, QLocale().dayName(day));
-            xlsx.mergeCells(CellRange(2, day*2-1, 2, day*2), monthStyle);
+            xlsx.setColumnWidth(day * 2 - 1, day * 2 - 1, 5);
+            xlsx.setColumnWidth(day * 2, day * 2, 13);
+            xlsx.write(2, day * 2 - 1, QLocale().dayName(day));
+            xlsx.mergeCells(CellRange(2, day * 2 - 1, 2, day * 2), monthStyle);
         }
 
         QColor borderColor = QColor(Qt::gray);
@@ -68,25 +67,25 @@ int calendar()
         weekendRightStyle.setBottomBorderStyle(Format::BorderThin);
         weekendRightStyle.setBottomBorderColor(borderColor);
 
-		Format holidayLeftStyle;
-		holidayLeftStyle.setFontSize(14);
-		holidayLeftStyle.setFontBold(true);
-		holidayLeftStyle.setHorizontalAlignment(Format::AlignLeft);
-		holidayLeftStyle.setVerticalAlignment(Format::AlignTop);
-		holidayLeftStyle.setPatternBackgroundColor(QColor("#EACC93"));
-		holidayLeftStyle.setLeftBorderStyle(Format::BorderThin);
-		holidayLeftStyle.setLeftBorderColor(borderColor);
-		holidayLeftStyle.setBottomBorderStyle(Format::BorderThin);
-		holidayLeftStyle.setBottomBorderColor(borderColor);
-
-		Format holidayRightStyle;
-		holidayRightStyle.setHorizontalAlignment(Format::AlignHCenter);
-		holidayRightStyle.setVerticalAlignment(Format::AlignTop);
-		holidayRightStyle.setPatternBackgroundColor(QColor("#EACC93"));
-		holidayRightStyle.setRightBorderStyle(Format::BorderThin);
-		holidayRightStyle.setRightBorderColor(borderColor);
-		holidayRightStyle.setBottomBorderStyle(Format::BorderThin);
-		holidayRightStyle.setBottomBorderColor(borderColor);
+        Format holidayLeftStyle;
+        holidayLeftStyle.setFontSize(14);
+        holidayLeftStyle.setFontBold(true);
+        holidayLeftStyle.setHorizontalAlignment(Format::AlignLeft);
+        holidayLeftStyle.setVerticalAlignment(Format::AlignTop);
+        holidayLeftStyle.setPatternBackgroundColor(QColor("#EACC93"));
+        holidayLeftStyle.setLeftBorderStyle(Format::BorderThin);
+        holidayLeftStyle.setLeftBorderColor(borderColor);
+        holidayLeftStyle.setBottomBorderStyle(Format::BorderThin);
+        holidayLeftStyle.setBottomBorderColor(borderColor);
+
+        Format holidayRightStyle;
+        holidayRightStyle.setHorizontalAlignment(Format::AlignHCenter);
+        holidayRightStyle.setVerticalAlignment(Format::AlignTop);
+        holidayRightStyle.setPatternBackgroundColor(QColor("#EACC93"));
+        holidayRightStyle.setRightBorderStyle(Format::BorderThin);
+        holidayRightStyle.setRightBorderColor(borderColor);
+        holidayRightStyle.setBottomBorderStyle(Format::BorderThin);
+        holidayRightStyle.setBottomBorderColor(borderColor);
 
         Format workdayLeftStyle;
         workdayLeftStyle.setHorizontalAlignment(Format::AlignLeft);
@@ -121,46 +120,45 @@ int calendar()
         greyRightStyle.setBottomBorderColor(borderColor);
 
         int rownum = 3;
-        for (int day=1; day<=31; ++day) {
+        for (int day = 1; day <= 31; ++day) {
             QDate date(today.year(), month, day);
             if (!date.isValid())
                 break;
             xlsx.setRowHeight(rownum, 100);
-            int dow = date.dayOfWeek(); // 1 = Monday to 7 = Sunday
-            int colnum = dow*2-1;
+            int dow    = date.dayOfWeek(); // 1 = Monday to 7 = Sunday
+            int colnum = dow * 2 - 1;
 
             if (dow <= 5) { // 1,2,3,4,5
                 xlsx.write(rownum, colnum, day, workdayLeftStyle);
-                xlsx.write(rownum, colnum+1, QVariant(), workdayRightStyle);
+                xlsx.write(rownum, colnum + 1, QVariant(), workdayRightStyle);
             } else if (dow == 6) {
                 xlsx.write(rownum, colnum, day, weekendLeftStyle);
-                xlsx.write(rownum, colnum+1, QVariant(), weekendRightStyle);
-			} else {
-				xlsx.write(rownum, colnum, day, holidayLeftStyle);
-				xlsx.write(rownum, colnum + 1, QVariant(), holidayRightStyle);
-			}
-
-            if (day == 1 && dow != 1) {//First day
-                for (int i=1; i<dow; ++i) {
-                    xlsx.write(rownum, i*2-1, QVariant(), greyLeftStyle);
-                    xlsx.write(rownum, i*2, QVariant(), greyRightStyle);
+                xlsx.write(rownum, colnum + 1, QVariant(), weekendRightStyle);
+            } else {
+                xlsx.write(rownum, colnum, day, holidayLeftStyle);
+                xlsx.write(rownum, colnum + 1, QVariant(), holidayRightStyle);
+            }
+
+            if (day == 1 && dow != 1) { // First day
+                for (int i = 1; i < dow; ++i) {
+                    xlsx.write(rownum, i * 2 - 1, QVariant(), greyLeftStyle);
+                    xlsx.write(rownum, i * 2, QVariant(), greyRightStyle);
                 }
-            } else if (day == date.daysInMonth() && dow != 7) {//Last day
-                for (int i=dow+1; i<=7; ++i) {
-                    xlsx.write(rownum, i*2-1, QVariant(), greyLeftStyle);
-                    xlsx.write(rownum, i*2, QVariant(), greyRightStyle);
+            } else if (day == date.daysInMonth() && dow != 7) { // Last day
+                for (int i = dow + 1; i <= 7; ++i) {
+                    xlsx.write(rownum, i * 2 - 1, QVariant(), greyLeftStyle);
+                    xlsx.write(rownum, i * 2, QVariant(), greyRightStyle);
                 }
             }
 
             if (dow == 7)
                 rownum++;
         }
-
     }
 
     xlsx.saveAs("calendar1.xlsx");
 
-    //Make sure that read/write works well.
+    // Make sure that read/write works well.
     Document xlsx2("calendar1.xlsx");
     xlsx2.saveAs("calendar2.xlsx");
 
diff --git a/TestExcel/chart.cpp b/TestExcel/chart.cpp
index 78820136..204df625 100644
--- a/TestExcel/chart.cpp
+++ b/TestExcel/chart.cpp
@@ -1,12 +1,12 @@
 // chart.cpp
 
-#include <QtGlobal>
-#include <QtCore>
-#include <QDebug>
-
-#include "xlsxdocument.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxdocument.h"
+
+#include <QDebug>
+#include <QtCore>
+#include <QtGlobal>
 
 QXLSX_USE_NAMESPACE
 
@@ -14,11 +14,10 @@ int chart()
 {
     //![0]
     Document xlsx;
-    for (int i=1; i<10; ++i)
-    {
-        xlsx.write(i, 1, i*i*i);   //A1:A9
-        xlsx.write(i, 2, i*i); //B1:B9
-        xlsx.write(i, 3, i*i-1); //C1:C9
+    for (int i = 1; i < 10; ++i) {
+        xlsx.write(i, 1, i * i * i); // A1:A9
+        xlsx.write(i, 2, i * i);     // B1:B9
+        xlsx.write(i, 3, i * i - 1); // C1:C9
     }
     //![0]
 
@@ -62,14 +61,14 @@ int chart()
 
     Chart *scatterChart = xlsx.insertChart(83, 3, QSize(300, 300));
     scatterChart->setChartType(Chart::CT_ScatterChart);
-    //Will generate three lines.
+    // Will generate three lines.
     scatterChart->addSeries(CellRange("A1:A9"));
     scatterChart->addSeries(CellRange("B1:B9"));
     scatterChart->addSeries(CellRange("C1:C9"));
 
     Chart *scatterChart_2 = xlsx.insertChart(83, 9, QSize(300, 300));
     scatterChart_2->setChartType(Chart::CT_ScatterChart);
-    //Will generate two lines.
+    // Will generate two lines.
     scatterChart_2->addSeries(CellRange("A1:C9"));
 
     Chart *doughnutChart = xlsx.insertChart(103, 3, QSize(300, 300));
@@ -82,8 +81,7 @@ int chart()
     //![2]
 
     Document xlsx2("chart1.xlsx");
-    if ( xlsx2.load() )
-    {
+    if (xlsx2.load()) {
         xlsx2.saveAs("chart2.xlsx");
     }
 
diff --git a/TestExcel/chartextended.cpp b/TestExcel/chartextended.cpp
index cbd15818..472f2100 100644
--- a/TestExcel/chartextended.cpp
+++ b/TestExcel/chartextended.cpp
@@ -1,12 +1,12 @@
 // chartextended.cpp
 
-#include <QtGlobal>
-#include <QtCore>
-#include <QDebug>
-
-#include "xlsxdocument.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxdocument.h"
+
+#include <QDebug>
+#include <QtCore>
+#include <QtGlobal>
 
 QXLSX_USE_NAMESPACE
 
@@ -18,27 +18,24 @@ QXLSX_USE_NAMESPACE
 int chartExtended()
 {
     Document xlsx;
-    for (int i=1; i<10; ++i)
-    {
-        xlsx.write(1, i+1, "Pos " + QString::number(i));
+    for (int i = 1; i < 10; ++i) {
+        xlsx.write(1, i + 1, "Pos " + QString::number(i));
     }
 
     xlsx.write(2, 1, "Set 1");
     xlsx.write(3, 1, "Set 2");
 
-    for (int i=1; i<10; ++i)
-    {
-        xlsx.write(2, i+1, i*i*i);   //A2:A10
-        xlsx.write(3, i+1, i*i);    //B2:B10
+    for (int i = 1; i < 10; ++i) {
+        xlsx.write(2, i + 1, i * i * i); // A2:A10
+        xlsx.write(3, i + 1, i * i);     // B2:B10
     }
 
-
     Chart *barChart1 = xlsx.insertChart(4, 3, QSize(300, 300));
     barChart1->setChartType(Chart::CT_BarChart);
     barChart1->setChartLegend(Chart::Right);
     barChart1->setChartTitle("Test1");
     // Messreihen
-    barChart1->addSeries(CellRange(1,1,3,10), NULL, true, true, false);
+    barChart1->addSeries(CellRange(1, 1, 3, 10), NULL, true, true, false);
 
     Chart *barChart2 = xlsx.insertChart(4, 9, QSize(300, 300));
     barChart2->setChartType(Chart::CT_BarChart);
@@ -46,37 +43,35 @@ int chartExtended()
     barChart2->setChartTitle("Test2");
     barChart2->setGridlinesEnable(true);
     // Messreihen
-    barChart2->addSeries(CellRange(1,1,3,10), NULL, true, true, true);
+    barChart2->addSeries(CellRange(1, 1, 3, 10), NULL, true, true, true);
 
     Chart *barChart3 = xlsx.insertChart(24, 3, QSize(300, 300));
     barChart3->setChartType(Chart::CT_BarChart);
     barChart3->setChartLegend(Chart::Left);
     barChart3->setChartTitle("Test3");
     // Messreihen
-    barChart3->addSeries(CellRange(1,1,3,10));
+    barChart3->addSeries(CellRange(1, 1, 3, 10));
 
     Chart *barChart4 = xlsx.insertChart(24, 9, QSize(300, 300));
     barChart4->setChartType(Chart::CT_BarChart);
     barChart4->setChartLegend(Chart::Top);
     barChart4->setChartTitle("Test4");
     // Messreihen
-    barChart4->addSeries(CellRange(1,1,3,10));
+    barChart4->addSeries(CellRange(1, 1, 3, 10));
 
     Chart *barChart5 = xlsx.insertChart(44, 9, QSize(300, 300));
     barChart5->setChartType(Chart::CT_BarChart);
     barChart5->setChartLegend(Chart::Bottom);
     barChart5->setChartTitle("Test5");
     // Messreihen
-    barChart5->addSeries(CellRange(1,1,3,10));
-
+    barChart5->addSeries(CellRange(1, 1, 3, 10));
 
     //![2]
     xlsx.saveAs("chartExtended1.xlsx");
     //![2]
 
     Document xlsx2("chartExtended1.xlsx");
-    if ( xlsx2.load() )
-    {
+    if (xlsx2.load()) {
         xlsx2.saveAs("chartExtended2.xlsx");
     }
 
diff --git a/TestExcel/chartsheet.cpp b/TestExcel/chartsheet.cpp
index ff8cf401..ec792d14 100644
--- a/TestExcel/chartsheet.cpp
+++ b/TestExcel/chartsheet.cpp
@@ -1,11 +1,11 @@
 // chartsheet.cpp
 
-#include <QtGlobal>
-
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
+
+#include <QtGlobal>
 
 QXLSX_USE_NAMESPACE
 
@@ -13,16 +13,15 @@ int chartsheet()
 {
     //![0]
     Document xlsx;
-    for (int i=1; i<10; ++i)
-    {
-        xlsx.write(i, 1, i*i);
+    for (int i = 1; i < 10; ++i) {
+        xlsx.write(i, 1, i * i);
     }
     //![0]
 
     //![1]
     xlsx.addSheet("Chart1", AbstractSheet::ST_ChartSheet);
-    Chartsheet *sheet = static_cast<Chartsheet*>(xlsx.currentSheet());
-    Chart *barChart = sheet->chart();
+    Chartsheet *sheet = static_cast<Chartsheet *>(xlsx.currentSheet());
+    Chart *barChart   = sheet->chart();
     barChart->setChartType(Chart::CT_BarChart);
     barChart->addSeries(CellRange("A1:A9"), xlsx.sheet("Sheet1"));
     //![1]
@@ -32,8 +31,7 @@ int chartsheet()
     //![2]
 
     Document xlsx2("chartsheet1.xlsx");
-    if ( xlsx2.load() )
-    {
+    if (xlsx2.load()) {
         xlsx2.saveAs("chartsheet2.xlsx");
     }
 
diff --git a/TestExcel/datavalidation.cpp b/TestExcel/datavalidation.cpp
index bd90d322..e5f5240a 100644
--- a/TestExcel/datavalidation.cpp
+++ b/TestExcel/datavalidation.cpp
@@ -1,9 +1,9 @@
 // datavalidation.cpp
 
-#include <QtGlobal>
-
-#include "xlsxdocument.h"
 #include "xlsxdatavalidation.h"
+#include "xlsxdocument.h"
+
+#include <QtGlobal>
 
 QXLSX_USE_NAMESPACE
 
@@ -20,7 +20,7 @@ int datavalidation()
     xlsx.addDataValidation(validation);
     //![1]
 
-	xlsx.saveAs("datavalidation.xlsx"); 
+    xlsx.saveAs("datavalidation.xlsx");
 
     return 0;
 }
diff --git a/TestExcel/definename.cpp b/TestExcel/definename.cpp
index 135ccf2c..ae146d68 100644
--- a/TestExcel/definename.cpp
+++ b/TestExcel/definename.cpp
@@ -1,21 +1,21 @@
 // definename.cpp
 
-#include <QtGlobal>
-#include <QtCore>
-#include <QDebug>
-
 #include "xlsxdocument.h"
 
+#include <QDebug>
+#include <QtCore>
+#include <QtGlobal>
+
 QXLSX_USE_NAMESPACE
 
 int definename()
 {
     //![0]
     Document xlsx;
-    for (int i=1; i<=10; ++i) {
+    for (int i = 1; i <= 10; ++i) {
         xlsx.write(i, 1, i);
-        xlsx.write(i, 2, i*i);
-        xlsx.write(i, 3, i*i*i);
+        xlsx.write(i, 2, i * i);
+        xlsx.write(i, 3, i * i * i);
     }
     //![0]
 
@@ -38,8 +38,7 @@ int definename()
     xlsx.saveAs("definename1.xlsx");
 
     Document xlsx2("definename1.xlsx");
-    if ( xlsx2.load() )
-    {
+    if (xlsx2.load()) {
         xlsx2.saveAs("definename2.xlsx");
     }
 
diff --git a/TestExcel/demo.cpp b/TestExcel/demo.cpp
index 94697e34..42da19bd 100644
--- a/TestExcel/demo.cpp
+++ b/TestExcel/demo.cpp
@@ -1,67 +1,82 @@
 // demo.cpp
 
-#include <QtGlobal>
-#include <QtCore>
 #include <QDebug>
+#include <QtCore>
+#include <QtGlobal>
 
 #if QT_VERSION >= 0x060000 // Qt 6.0 or over
-#include <QRandomGenerator>
+#    include <QRandomGenerator>
 #endif
 
+#include "xlsxcellrange.h"
 #include "xlsxdocument.h"
 #include "xlsxformat.h"
-#include "xlsxcellrange.h"
 #include "xlsxworksheet.h"
 
 QXLSX_USE_NAMESPACE
 
-void writeHorizontalAlignCell(Document &xlsx, const QString &cell, const QString &text, Format::HorizontalAlignment align)
+void writeHorizontalAlignCell(Document &xlsx,
+                              const QString &cell,
+                              const QString &text,
+                              Format::HorizontalAlignment align)
 {
-   Format format;
-   format.setHorizontalAlignment(align);
-   format.setBorderStyle(Format::BorderThin);
-   xlsx.write(cell, text, format);
+    Format format;
+    format.setHorizontalAlignment(align);
+    format.setBorderStyle(Format::BorderThin);
+    xlsx.write(cell, text, format);
 }
 
-void writeVerticalAlignCell(Document &xlsx, const QString &range, const QString &text, Format::VerticalAlignment align)
+void writeVerticalAlignCell(Document &xlsx,
+                            const QString &range,
+                            const QString &text,
+                            Format::VerticalAlignment align)
 {
-   Format format;
-   format.setVerticalAlignment(align);
-   format.setBorderStyle(Format::BorderThin);
-   CellRange r(range);
-   xlsx.write(r.firstRow(), r.firstColumn(), text);
-   xlsx.mergeCells(r, format);
+    Format format;
+    format.setVerticalAlignment(align);
+    format.setBorderStyle(Format::BorderThin);
+    CellRange r(range);
+    xlsx.write(r.firstRow(), r.firstColumn(), text);
+    xlsx.mergeCells(r, format);
 }
 
-void writeBorderStyleCell(Document &xlsx, const QString &cell, const QString &text, Format::BorderStyle bs)
+void writeBorderStyleCell(Document &xlsx,
+                          const QString &cell,
+                          const QString &text,
+                          Format::BorderStyle bs)
 {
-   Format format;
-   format.setBorderStyle(bs);
-   xlsx.write(cell, text, format);
+    Format format;
+    format.setBorderStyle(bs);
+    xlsx.write(cell, text, format);
 }
 
 void writeSolidFillCell(Document &xlsx, const QString &cell, const QColor &color)
 {
-   Format format;
-   format.setPatternBackgroundColor(color);
-   xlsx.write(cell, QVariant(), format);
+    Format format;
+    format.setPatternBackgroundColor(color);
+    xlsx.write(cell, QVariant(), format);
 }
 
-void writePatternFillCell(Document &xlsx, const QString &cell, Format::FillPattern pattern, const QColor &color)
+void writePatternFillCell(Document &xlsx,
+                          const QString &cell,
+                          Format::FillPattern pattern,
+                          const QColor &color)
 {
-   Format format;
-   format.setPatternForegroundColor(color);
-   format.setFillPattern(pattern);
-   xlsx.write(cell, QVariant(), format);
+    Format format;
+    format.setPatternForegroundColor(color);
+    format.setFillPattern(pattern);
+    xlsx.write(cell, QVariant(), format);
 }
 
-void writeBorderAndFontColorCell(Document &xlsx, const QString &cell, const QString &text, const QColor &color)
+void writeBorderAndFontColorCell(Document &xlsx,
+                                 const QString &cell,
+                                 const QString &text,
+                                 const QColor &color)
 {
-   Format format;
-   format.setBorderStyle(Format::BorderThin);
-   format.setBorderColor(color);
-   format.setFontColor(color);
-   xlsx.write(cell, text, format);
+    Format format;
+    format.setBorderStyle(Format::BorderThin);
+    format.setBorderColor(color);
+    format.setFontColor(color);
+    xlsx.write(cell, text, format);
 }
 
 void writeFontNameCell(Document &xlsx, const QString &cell, const QString &text)
@@ -102,13 +117,13 @@ int demo()
     Document xlsx;
 
     //---------------------------------------------------------------
-    //Create the first sheet (Otherwise, default "Sheet1" will be created)
+    // Create the first sheet (Otherwise, default "Sheet1" will be created)
     xlsx.addSheet("Aligns & Borders");
-    xlsx.setColumnWidth(2, 20); //Column B
-    xlsx.setColumnWidth(8, 12); //Column H
+    xlsx.setColumnWidth(2, 20); // Column B
+    xlsx.setColumnWidth(8, 12); // Column H
     xlsx.currentWorksheet()->setGridLinesVisible(false);
 
-    //Alignment
+    // Alignment
     writeHorizontalAlignCell(xlsx, "B3", "AlignLeft", Format::AlignLeft);
     writeHorizontalAlignCell(xlsx, "B5", "AlignHCenter", Format::AlignHCenter);
     writeHorizontalAlignCell(xlsx, "B7", "AlignRight", Format::AlignRight);
@@ -116,7 +131,7 @@ int demo()
     writeVerticalAlignCell(xlsx, "F3:F7", "AlignVCenter", Format::AlignVCenter);
     writeVerticalAlignCell(xlsx, "H3:H7", "AlignBottom", Format::AlignBottom);
 
-    //Border
+    // Border
     writeBorderStyleCell(xlsx, "B13", "BorderMedium", Format::BorderMedium);
     writeBorderStyleCell(xlsx, "B15", "BorderDashed", Format::BorderDashed);
     writeBorderStyleCell(xlsx, "B17", "BorderDotted", Format::BorderDotted);
@@ -124,7 +139,7 @@ int demo()
     writeBorderStyleCell(xlsx, "B21", "BorderDouble", Format::BorderDouble);
     writeBorderStyleCell(xlsx, "B23", "BorderDashDot", Format::BorderDashDot);
 
-    //Fill
+    // Fill
     writeSolidFillCell(xlsx, "D13", Qt::red);
     writeSolidFillCell(xlsx, "D15", Qt::blue);
     writeSolidFillCell(xlsx, "D17", Qt::yellow);
@@ -146,7 +161,7 @@ int demo()
     writeBorderAndFontColorCell(xlsx, "H23", "Qt::gray", Qt::gray);
 
     //---------------------------------------------------------------
-    //Create the second sheet.
+    // Create the second sheet.
     xlsx.addSheet("Fonts");
 
     xlsx.write("B3", "Normal");
@@ -186,7 +201,7 @@ int demo()
     xlsx.mergeCells("J3:J9");
 
     //---------------------------------------------------------------
-    //Create the third sheet.
+    // Create the third sheet.
     xlsx.addSheet("Formulas");
     xlsx.setColumnWidth(1, 2, 40);
     Format rAlign;
@@ -249,7 +264,7 @@ int demo()
     xlsx.write("B33", "=HYPERLINK(\"http://qt-project.org\")", lAlign);
 
     //---------------------------------------------------------------
-    //Create the fourth sheet.
+    // Create the fourth sheet.
     xlsx.addSheet("NumFormats");
     xlsx.setColumnWidth(2, 40);
     writeInternalNumFormatsCell(xlsx, 4, 2.5681, 2);
@@ -267,7 +282,7 @@ int demo()
     writeCustomNumFormatsCell(xlsx, 16, 60, "[Red][<=100];[Green][>100]");
 
     //---------------------------------------------------------------
-    //Create the fifth sheet.
+    // Create the fifth sheet.
     xlsx.addSheet("Merging");
     Format centerAlign;
     centerAlign.setHorizontalAlignment(Format::AlignHCenter);
@@ -280,7 +295,7 @@ int demo()
     xlsx.mergeCells("E8:F21", centerAlign);
 
     //---------------------------------------------------------------
-    //Create the fifth sheet.
+    // Create the fifth sheet.
     xlsx.addSheet("Grouping");
 
 #if QT_VERSION >= 0x060000 // Qt 6.0 or over
@@ -288,10 +303,8 @@ int demo()
     qsrand(QDateTime::currentMSecsSinceEpoch());
 #endif
 
-    for (int row=2; row<31; ++row)
-    {
-        for (int col=1; col<=10; ++col)
-        {
+    for (int row = 2; row < 31; ++row) {
+        for (int col = 1; col <= 10; ++col) {
 #if QT_VERSION >= 0x060000 // Qt 6.0 or over
             QRandomGenerator rgen;
             xlsx.write(row, col, rgen.generate() % 100);
@@ -310,9 +323,9 @@ int demo()
 
     xlsx.saveAs("demo1.xlsx");
 
-    //Make sure that read/write works well.
+    // Make sure that read/write works well.
     Document xlsx2("demo1.xlsx");
-    xlsx2.saveAs("demo2.xlsx"); 
+    xlsx2.saveAs("demo2.xlsx");
 
     return 0;
 }
diff --git a/TestExcel/documentproperty.cpp b/TestExcel/documentproperty.cpp
index e7ba5ad8..e7e33bbf 100644
--- a/TestExcel/documentproperty.cpp
+++ b/TestExcel/documentproperty.cpp
@@ -1,11 +1,11 @@
 // documentproperty.cpp
 
-#include <QtGlobal>
-#include <QtCore>
-#include <QDebug>
-
 #include "xlsxdocument.h"
 
+#include <QDebug>
+#include <QtCore>
+#include <QtGlobal>
+
 int documentproperty()
 {
     QXlsx::Document xlsx;
diff --git a/TestExcel/extractdata.cpp b/TestExcel/extractdata.cpp
index ec5f892f..7694e718 100644
--- a/TestExcel/extractdata.cpp
+++ b/TestExcel/extractdata.cpp
@@ -1,24 +1,24 @@
 // extractdata.cpp
 
-#include <QtGlobal>
-#include <QtCore>
-#include <QDebug>
-
 #include "xlsxdocument.h"
 
+#include <QDebug>
+#include <QtCore>
+#include <QtGlobal>
+
 int extractdata()
 {
     {
-    //Create a new .xlsx file.
-    QXlsx::Document xlsx;
-    xlsx.write("A1", "Hello Qt!");
-    xlsx.write("A2", 12345);
-    xlsx.write("A3", "=44+33");
-    xlsx.write("A4", true);
-    xlsx.write("A5", "http://qt-project.org");
-    xlsx.write("A6", QDate(2013, 12, 27));
-    xlsx.write("A7", QTime(6, 30));
-    xlsx.saveAs("extractdata.xlsx");
+        // Create a new .xlsx file.
+        QXlsx::Document xlsx;
+        xlsx.write("A1", "Hello Qt!");
+        xlsx.write("A2", 12345);
+        xlsx.write("A3", "=44+33");
+        xlsx.write("A4", true);
+        xlsx.write("A5", "http://qt-project.org");
+        xlsx.write("A6", QDate(2013, 12, 27));
+        xlsx.write("A7", QTime(6, 30));
+        xlsx.saveAs("extractdata.xlsx");
     }
 
     //![0]
@@ -26,22 +26,22 @@ int extractdata()
     //![0]
 
     //![1]
-	qDebug() << "extractdata.xlsx - QXlsx::Document.read()";
-    qDebug()<<xlsx.read("A1");
-    qDebug()<<xlsx.read("A2");
-    qDebug()<<xlsx.read("A3");
-    qDebug()<<xlsx.read("A4");
-    qDebug()<<xlsx.read("A5");
-    qDebug()<<xlsx.read("A6");
-    qDebug()<<xlsx.read("A7");
+    qDebug() << "extractdata.xlsx - QXlsx::Document.read()";
+    qDebug() << xlsx.read("A1");
+    qDebug() << xlsx.read("A2");
+    qDebug() << xlsx.read("A3");
+    qDebug() << xlsx.read("A4");
+    qDebug() << xlsx.read("A5");
+    qDebug() << xlsx.read("A6");
+    qDebug() << xlsx.read("A7");
     //![1]
 
     //![2]
-	qDebug() << "extractdata.xlsx - QXlsx::Cell.value()";
-    for (int row=1; row<10; ++row) {
-		if (QXlsx::Cell *cell = xlsx.cellAt(row, 1)) {
-			qDebug() << cell->value();
-		}
+    qDebug() << "extractdata.xlsx - QXlsx::Cell.value()";
+    for (int row = 1; row < 10; ++row) {
+        if (QXlsx::Cell *cell = xlsx.cellAt(row, 1)) {
+            qDebug() << cell->value();
+        }
     }
     //![2]
 
diff --git a/TestExcel/formulas.cpp b/TestExcel/formulas.cpp
index cabbd6f2..91bef022 100644
--- a/TestExcel/formulas.cpp
+++ b/TestExcel/formulas.cpp
@@ -1,13 +1,13 @@
 // formulas.cpp
 
-#include <QtGlobal>
-#include <QtCore>
-#include <QDebug>
-
+#include "xlsxcellformula.h"
 #include "xlsxdocument.h"
 #include "xlsxformat.h"
 #include "xlsxworksheet.h"
-#include "xlsxcellformula.h"
+
+#include <QDebug>
+#include <QtCore>
+#include <QtGlobal>
 
 QXLSX_USE_NAMESPACE
 
@@ -59,36 +59,42 @@ int formula()
     xlsx.addSheet("ArrayFormula");
     Worksheet *sheet = xlsx.currentWorksheet();
 
-    for (int row=2; row<20; ++row) {
-        sheet->write(row, 2, row*2); //B2:B19
-        sheet->write(row, 3, row*3); //C2:C19
+    for (int row = 2; row < 20; ++row) {
+        sheet->write(row, 2, row * 2); // B2:B19
+        sheet->write(row, 3, row * 3); // C2:C19
     }
     sheet->writeFormula("D2", CellFormula("B2:B19+C2:C19", "D2:D19", CellFormula::ArrayType));
-    sheet->writeFormula("E2", CellFormula("=CONCATENATE(\"The total is \",D2:D19,\" units\")", "E2:E19", CellFormula::ArrayType));
+    sheet->writeFormula("E2",
+                        CellFormula("=CONCATENATE(\"The total is \",D2:D19,\" units\")",
+                                    "E2:E19",
+                                    CellFormula::ArrayType));
     //![2]
 
     //![21]
     xlsx.addSheet("SharedFormula");
     sheet = xlsx.currentWorksheet();
 
-    for (int row=2; row<20; ++row) {
-        sheet->write(row, 2, row*2); //B2:B19
-        sheet->write(row, 3, row*3); //C2:C19
+    for (int row = 2; row < 20; ++row) {
+        sheet->write(row, 2, row * 2); // B2:B19
+        sheet->write(row, 3, row * 3); // C2:C19
     }
     sheet->writeFormula("D2", CellFormula("=B2+C2", "D2:D19", CellFormula::SharedType));
-    sheet->writeFormula("E2", CellFormula("=CONCATENATE(\"The total is \",D2,\" units\")", "E2:E19", CellFormula::SharedType));
+    sheet->writeFormula("E2",
+                        CellFormula("=CONCATENATE(\"The total is \",D2,\" units\")",
+                                    "E2:E19",
+                                    CellFormula::SharedType));
 
     //![21]
 
     //![3]
-	xlsx.saveAs("formula1.xlsx");
+    xlsx.saveAs("formula1.xlsx");
     //![3]
 
-    //Make sure that read/write works well.
+    // Make sure that read/write works well.
     Document xlsx2("formula1.xlsx");
-    Worksheet *sharedFormulaSheet = dynamic_cast<Worksheet*>(xlsx2.sheet("SharedFormula"));
-    for (int row=2; row<20; ++row) {
-        qDebug()<<sharedFormulaSheet->read(row, 4);
+    Worksheet *sharedFormulaSheet = dynamic_cast<Worksheet *>(xlsx2.sheet("SharedFormula"));
+    for (int row = 2; row < 20; ++row) {
+        qDebug() << sharedFormulaSheet->read(row, 4);
     }
 
     xlsx2.saveAs("formula2.xlsx");
diff --git a/TestExcel/hello.cpp b/TestExcel/hello.cpp
index 728a300d..b73f8521 100644
--- a/TestExcel/hello.cpp
+++ b/TestExcel/hello.cpp
@@ -1,16 +1,16 @@
 // hello.cpp
 
-#include <QtGlobal>
-#include <QtCore>
-#include <QDebug>
-
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
 #include "xlsxrichstring.h"
 #include "xlsxworkbook.h"
 
+#include <QDebug>
+#include <QtCore>
+#include <QtGlobal>
+
 QXLSX_USE_NAMESPACE
 
 #include <cstdio>
@@ -31,51 +31,50 @@ int hello()
 {
     WriteExcel(true);
 
-	ReadExcel(true);
+    ReadExcel(true);
 
-	UseSheet(true);
+    UseSheet(true);
 
-	RichText(true);
+    RichText(true);
 
-	DoChart(true);
+    DoChart(true);
     Align(true);
 
-   return 0;
+    return 0;
 }
 
 int WriteExcel(bool isTest)
 {
-	if (!isTest)
-		return (-1);
-
-	Document xlsx;
-
-	xlsx.write("A1", "Hello QtXlsx!"); // current file is utf-8 character-set.
-	xlsx.write("A2", 12345);
-	xlsx.write("A3", "=44+33"); // cell value is 77.
-	xlsx.write("A4", true);
-	xlsx.write("A5", "http://qt-project.org");
-	xlsx.write("A6", QDate(2013, 12, 27));
-	xlsx.write("A7", QTime(6, 30));
-    xlsx.write("A8", QDateTime(QDate(2049,7,23), QTime(23,5,32), Qt::LocalTime));
-
-    if (!xlsx.saveAs("WriteExcel1.xlsx"))
-	{
+    if (!isTest)
+        return (-1);
+
+    Document xlsx;
+
+    xlsx.write("A1", "Hello QtXlsx!"); // current file is utf-8 character-set.
+    xlsx.write("A2", 12345);
+    xlsx.write("A3", "=44+33"); // cell value is 77.
+    xlsx.write("A4", true);
+    xlsx.write("A5", "http://qt-project.org");
+    xlsx.write("A6", QDate(2013, 12, 27));
+    xlsx.write("A7", QTime(6, 30));
+    xlsx.write("A8", QDateTime(QDate(2049, 7, 23), QTime(23, 5, 32), Qt::LocalTime));
+
+    if (!xlsx.saveAs("WriteExcel1.xlsx")) {
         qDebug() << "[WriteExcel1] failed to save excel file";
-		return (-2);
-	}
+        return (-2);
+    }
 
-	return 0; 
+    return 0;
 }
 
 int ReadExcel(bool isTest)
 {
-	if (!isTest)
-		return (-1);
+    if (!isTest)
+        return (-1);
 
-	{
-		//Create a new .xlsx file.
-		QXlsx::Document xlsx;
+    {
+        // Create a new .xlsx file.
+        QXlsx::Document xlsx;
 
         xlsx.write("A1", "Hello Qt!");
         xlsx.write("A2", 12345);
@@ -84,272 +83,257 @@ int ReadExcel(bool isTest)
         xlsx.write("A5", "http://qt-project.org");
         xlsx.write("A6", QDate(2013, 12, 27));
         xlsx.write("A7", QTime(6, 30));
-        xlsx.write("A8", QDateTime(QDate(2049,7,23), QTime(23,5,32), Qt::LocalTime));
-
-		if (!xlsx.saveAs("ReadExcel.xlsx"))
-		{
-			qDebug() << "[ReadExcel] failed to save excel file." ;
-			return (-2);
-		}
-	}
-
-	//![0]
-	QXlsx::Document xlsx("ReadExcel.xlsx");
-	if (!xlsx.isLoadPackage())
-	{
-		qDebug() << "[ReadExcel.xlsx] failed to load package";
-		return (-3);
-	}
-	//![0]
-
-	//![1]
-	qDebug() << " QXlsx::Document.read()";
-	qDebug() << xlsx.read("A1");
-	qDebug() << xlsx.read("A2");
-	qDebug() << xlsx.read("A3");
-	qDebug() << xlsx.read("A4");
-	qDebug() << xlsx.read("A5");
-	qDebug() << xlsx.read("A6");
-	qDebug() << xlsx.read("A7");
-	qDebug() << xlsx.read("A8");
-	//![1]
-
-	/* debug output
-	 QXlsx::Document.read()
-	QVariant(QString, "Hello Qt!")
-	QVariant(double, 12345)
-	QVariant(QString, "=44+33")
-	QVariant(bool, true)
-	QVariant(QString, "http://qt-project.org")
-	QVariant(QDate, QDate("2013-12-27"))
-	QVariant(QTime, QTime("06:30:00.000"))
-	QVariant(QDateTime, QDateTime(2049-07-23 23:05:32.000 KST Qt::TimeSpec(LocalTime)))
-	*/
-
-	//![2]
-	qDebug() << " QXlsx::Cell.cellAt()";
-	for ( int row = 1 ; row < 20 ; ++row )
-	{
-		Cell* cell = xlsx.cellAt(row, 1);
-		if (cell == NULL)
-			continue;
-		QVariant var = cell->readValue();
-		qint32 styleNo = cell->styleNumber();
-		if (styleNo >= 0)
-		{
-			qDebug() << row << " " << var << " , style:" << styleNo;
-		}
-		else
-		{
-			qDebug() << row << " " << var;
-		}
-	}
-	//![2]
-
-	/* debug output 
-	 QXlsx::Cell.cellAt()
-	1   QVariant(QString, "Hello Qt!")
-	2   QVariant(double, 12345)
-	3   QVariant(QString, "44+33")
-	4   QVariant(bool, true)
-	5   QVariant(QString, "http://qt-project.org")  , style: 1
-	6   QVariant(QDateTime, QDateTime(2013-12-27 00:00:00.000 KST Qt::TimeSpec(LocalTime)))  , style: 2
-	7   QVariant(QDateTime, QDateTime(1899-12-31 06:30:00.000 KST Qt::TimeSpec(LocalTime)))  , style: 3
-	8   QVariant(QDateTime, QDateTime(2049-07-23 23:05:32.000 KST Qt::TimeSpec(LocalTime)))  , style: 2
-	*/ 
-
-	return 0; 
+        xlsx.write("A8", QDateTime(QDate(2049, 7, 23), QTime(23, 5, 32), Qt::LocalTime));
+
+        if (!xlsx.saveAs("ReadExcel.xlsx")) {
+            qDebug() << "[ReadExcel] failed to save excel file.";
+            return (-2);
+        }
+    }
+
+    //![0]
+    QXlsx::Document xlsx("ReadExcel.xlsx");
+    if (!xlsx.isLoadPackage()) {
+        qDebug() << "[ReadExcel.xlsx] failed to load package";
+        return (-3);
+    }
+    //![0]
+
+    //![1]
+    qDebug() << " QXlsx::Document.read()";
+    qDebug() << xlsx.read("A1");
+    qDebug() << xlsx.read("A2");
+    qDebug() << xlsx.read("A3");
+    qDebug() << xlsx.read("A4");
+    qDebug() << xlsx.read("A5");
+    qDebug() << xlsx.read("A6");
+    qDebug() << xlsx.read("A7");
+    qDebug() << xlsx.read("A8");
+    //![1]
+
+    /* debug output
+     QXlsx::Document.read()
+    QVariant(QString, "Hello Qt!")
+    QVariant(double, 12345)
+    QVariant(QString, "=44+33")
+    QVariant(bool, true)
+    QVariant(QString, "http://qt-project.org")
+    QVariant(QDate, QDate("2013-12-27"))
+    QVariant(QTime, QTime("06:30:00.000"))
+    QVariant(QDateTime, QDateTime(2049-07-23 23:05:32.000 KST Qt::TimeSpec(LocalTime)))
+    */
+
+    //![2]
+    qDebug() << " QXlsx::Cell.cellAt()";
+    for (int row = 1; row < 20; ++row) {
+        Cell *cell = xlsx.cellAt(row, 1);
+        if (cell == NULL)
+            continue;
+        QVariant var   = cell->readValue();
+        qint32 styleNo = cell->styleNumber();
+        if (styleNo >= 0) {
+            qDebug() << row << " " << var << " , style:" << styleNo;
+        } else {
+            qDebug() << row << " " << var;
+        }
+    }
+    //![2]
+
+    /* debug output
+     QXlsx::Cell.cellAt()
+    1   QVariant(QString, "Hello Qt!")
+    2   QVariant(double, 12345)
+    3   QVariant(QString, "44+33")
+    4   QVariant(bool, true)
+    5   QVariant(QString, "http://qt-project.org")  , style: 1
+    6   QVariant(QDateTime, QDateTime(2013-12-27 00:00:00.000 KST Qt::TimeSpec(LocalTime)))  ,
+    style: 2 7   QVariant(QDateTime, QDateTime(1899-12-31 06:30:00.000 KST Qt::TimeSpec(LocalTime)))
+    , style: 3 8   QVariant(QDateTime, QDateTime(2049-07-23 23:05:32.000 KST
+    Qt::TimeSpec(LocalTime)))  , style: 2
+    */
+
+    return 0;
 }
 
 void UseSheet(bool isTest)
 {
-	if (!isTest)
-		return;
-
-	{
-		//![Create a xlsx file]
-		Document xlsx;
-
-		// current sheet is Sheet1(default sheet)
-		for (int i = 1; i < 20; ++i)
-		{
-			for (int j = 1; j < 15; ++j)
-			{
-				xlsx.write(i, j, QString("R %1 C %2").arg(i).arg(j));
-			}
-		}
-
-		xlsx.addSheet(); // current sheet is Sheet2
-		xlsx.write(2, 2, "Hello Qt Xlsx");
-
-		xlsx.addSheet(); // current sheet is Sheet3
-		xlsx.write(3, 3, "This will be deleted...");
-
-		xlsx.addSheet("HiddenSheet"); // current sheet is HiddenSheet
-		xlsx.currentSheet()->setHidden(true);
-		xlsx.write("A1", "This sheet is hidden.");
-
-		xlsx.addSheet("VeryHiddenSheet"); // current sheet is VeryHiddenSheet 
-		xlsx.sheet("VeryHiddenSheet")->setSheetState(AbstractSheet::SS_VeryHidden);
-		xlsx.write("A1", "This sheet is very hidden.");
-
-		if (!xlsx.save()) //Default name is "Book1.xlsx"
-		{
-			qDebug() << "[Book1.xlsx] failed to write excel.";
-			return; 
-		}
-	}
-
-	{
-		Document xlsx2("Book1.xlsx");
-
-		xlsx2.renameSheet("Sheet1", "TheFirstSheet"); // rename sheet 
-
-		xlsx2.copySheet("TheFirstSheet", "CopyOfTheFirst"); // copy sheet 
-
-		xlsx2.selectSheet("CopyOfTheFirst"); // current sheet is 'CopyOfTheFirst'
-		xlsx2.write(25, 2, "On the Copy Sheet"); // write cell(25,2)
-
-		xlsx2.deleteSheet("Sheet3"); // delete sheet 
-
-		xlsx2.moveSheet("Sheet2", 0); // move sheet to first position 
-
-		//![show_hidden_sheets]
-		xlsx2.sheet("HiddenSheet")->setVisible(true);
-		xlsx2.sheet("VeryHiddenSheet")->setVisible(true);
-		//![show_hidden_sheets]
-
-		xlsx2.selectSheet("TheFirstSheet"); // current sheet is 'TheFirstSheet'
-		xlsx2.write(1, 1, QDate(2099,12,31));
-
-		// list all sheets of document.
-		QStringList slSheetNames = xlsx2.sheetNames();
-		qDebug() << " Document::sheetNames()";
-		for (int i = 0; i < slSheetNames.size(); ++i)
-			qDebug() << " " << slSheetNames.at(i).toLocal8Bit().constData();
-		/* debug output 
-			Document::sheetNames()
-				Sheet2
-				TheFirstSheet
-				HiddenSheet
-				VeryHiddenSheet
-				CopyOfTheFirst
-		*/
-
-		if (!xlsx2.saveAs("UseSheet.xlsx"))
-		{
-			qDebug() << "[UseSheet.xlsx] failed to write excel.";
-			return;
-		}
-	}
+    if (!isTest)
+        return;
+
+    {
+        //![Create a xlsx file]
+        Document xlsx;
+
+        // current sheet is Sheet1(default sheet)
+        for (int i = 1; i < 20; ++i) {
+            for (int j = 1; j < 15; ++j) {
+                xlsx.write(i, j, QString("R %1 C %2").arg(i).arg(j));
+            }
+        }
+
+        xlsx.addSheet(); // current sheet is Sheet2
+        xlsx.write(2, 2, "Hello Qt Xlsx");
+
+        xlsx.addSheet(); // current sheet is Sheet3
+        xlsx.write(3, 3, "This will be deleted...");
+
+        xlsx.addSheet("HiddenSheet"); // current sheet is HiddenSheet
+        xlsx.currentSheet()->setHidden(true);
+        xlsx.write("A1", "This sheet is hidden.");
+
+        xlsx.addSheet("VeryHiddenSheet"); // current sheet is VeryHiddenSheet
+        xlsx.sheet("VeryHiddenSheet")->setSheetState(AbstractSheet::SS_VeryHidden);
+        xlsx.write("A1", "This sheet is very hidden.");
+
+        if (!xlsx.save()) // Default name is "Book1.xlsx"
+        {
+            qDebug() << "[Book1.xlsx] failed to write excel.";
+            return;
+        }
+    }
+
+    {
+        Document xlsx2("Book1.xlsx");
+
+        xlsx2.renameSheet("Sheet1", "TheFirstSheet"); // rename sheet
+
+        xlsx2.copySheet("TheFirstSheet", "CopyOfTheFirst"); // copy sheet
+
+        xlsx2.selectSheet("CopyOfTheFirst");     // current sheet is 'CopyOfTheFirst'
+        xlsx2.write(25, 2, "On the Copy Sheet"); // write cell(25,2)
+
+        xlsx2.deleteSheet("Sheet3"); // delete sheet
+
+        xlsx2.moveSheet("Sheet2", 0); // move sheet to first position
+
+        //![show_hidden_sheets]
+        xlsx2.sheet("HiddenSheet")->setVisible(true);
+        xlsx2.sheet("VeryHiddenSheet")->setVisible(true);
+        //![show_hidden_sheets]
+
+        xlsx2.selectSheet("TheFirstSheet"); // current sheet is 'TheFirstSheet'
+        xlsx2.write(1, 1, QDate(2099, 12, 31));
+
+        // list all sheets of document.
+        QStringList slSheetNames = xlsx2.sheetNames();
+        qDebug() << " Document::sheetNames()";
+        for (int i = 0; i < slSheetNames.size(); ++i)
+            qDebug() << " " << slSheetNames.at(i).toLocal8Bit().constData();
+        /* debug output
+                Document::sheetNames()
+                        Sheet2
+                        TheFirstSheet
+                        HiddenSheet
+                        VeryHiddenSheet
+                        CopyOfTheFirst
+        */
+
+        if (!xlsx2.saveAs("UseSheet.xlsx")) {
+            qDebug() << "[UseSheet.xlsx] failed to write excel.";
+            return;
+        }
+    }
 }
 
 void DoChart(bool isTest)
 {
-	if (!isTest)
-		return;
-
-	//![0]
-	Document xlsx;
-	for ( int i = 1 ; i < 10 ; ++i )
-	{
-		xlsx.write(i, 1, i*i);
-	}
-	//![0]
-	/*
-		1
-		4
-		9
-		16
-		25
-		36
-		49
-		64
-		81
-	*/
-
-	//![1]
-	xlsx.addSheet("Chart1", AbstractSheet::ST_ChartSheet);
-	Chartsheet *sheet = static_cast<Chartsheet*>(xlsx.currentSheet());
-	Chart *barChart = sheet->chart();
+    if (!isTest)
+        return;
+
+    //![0]
+    Document xlsx;
+    for (int i = 1; i < 10; ++i) {
+        xlsx.write(i, 1, i * i);
+    }
+    //![0]
+    /*
+            1
+            4
+            9
+            16
+            25
+            36
+            49
+            64
+            81
+    */
+
+    //![1]
+    xlsx.addSheet("Chart1", AbstractSheet::ST_ChartSheet);
+    Chartsheet *sheet = static_cast<Chartsheet *>(xlsx.currentSheet());
+    Chart *barChart   = sheet->chart();
     barChart->setChartType(Chart::CT_BarChart);
-	barChart->addSeries(CellRange("A1:A9"), xlsx.sheet("Sheet1"));
-	//![1]
-
-	//![2]
-	if (!xlsx.saveAs("DoChart.xlsx"))
-	{
-		qDebug() << "[DoChart] failed to create excel file";
-	}
-	//![2]
-
+    barChart->addSeries(CellRange("A1:A9"), xlsx.sheet("Sheet1"));
+    //![1]
+
+    //![2]
+    if (!xlsx.saveAs("DoChart.xlsx")) {
+        qDebug() << "[DoChart] failed to create excel file";
+    }
+    //![2]
 }
 
 void Align(bool isTest)
 {
-	if (!isTest)
-		return;
-
-	Document xlsx;
+    if (!isTest)
+        return;
 
-	//![0]
-	Format format;
-	format.setHorizontalAlignment(Format::AlignHCenter);
-	format.setVerticalAlignment(Format::AlignVCenter);
-	//![0]
+    Document xlsx;
 
-	//![1]
-	xlsx.write("B4", "Hello Qt!");
-	xlsx.mergeCells("B4:F6", format);
+    //![0]
+    Format format;
+    format.setHorizontalAlignment(Format::AlignHCenter);
+    format.setVerticalAlignment(Format::AlignVCenter);
+    //![0]
 
-	xlsx.write("B8", 1);
-	xlsx.mergeCells("B8:C21", format);
+    //![1]
+    xlsx.write("B4", "Hello Qt!");
+    xlsx.mergeCells("B4:F6", format);
 
-	xlsx.write("E8", 2);
-	xlsx.mergeCells("E8:F21", format);
-	//![1]
+    xlsx.write("B8", 1);
+    xlsx.mergeCells("B8:C21", format);
 
-	if (!xlsx.saveAs("Align.xlsx"))
-	{
-		qDebug() << "[Align] failed to create excel file";
-	}
+    xlsx.write("E8", 2);
+    xlsx.mergeCells("E8:F21", format);
+    //![1]
 
+    if (!xlsx.saveAs("Align.xlsx")) {
+        qDebug() << "[Align] failed to create excel file";
+    }
 }
 
 void RichText(bool isTest)
 {
-	if (!isTest)
-		return;
-
-	//![0]
-	QXlsx::Document xlsx;
-	//![0]
-
-	//![1]
-	QXlsx::Format blue;
-	blue.setFontColor(Qt::blue);
-	QXlsx::Format red;
-	red.setFontColor(Qt::red);
-	red.setFontSize(15);
-	QXlsx::Format bold;
-	bold.setFontBold(true);
-
-	QXlsx::RichString rich;
-	rich.addFragment("Hello ", blue);
-	rich.addFragment("Qt ", red);
-	rich.addFragment("Xlsx", bold);
-	xlsx.write("B2", rich);
-
-	xlsx.workbook()->setHtmlToRichStringEnabled(true);
-	xlsx.write("B4", "<b>Hello</b> <font color=\"red\">Qt</font> <i>Xlsx</i>");
-
-	xlsx.write("B6", "<font color=\"red\"><b><u><i>Qt Xlsx</i></u></b></font>");
-
-	//![1]
-
-	//![2]
-	xlsx.saveAs("RichText.xlsx");
-	//![2]
+    if (!isTest)
+        return;
+
+    //![0]
+    QXlsx::Document xlsx;
+    //![0]
+
+    //![1]
+    QXlsx::Format blue;
+    blue.setFontColor(Qt::blue);
+    QXlsx::Format red;
+    red.setFontColor(Qt::red);
+    red.setFontSize(15);
+    QXlsx::Format bold;
+    bold.setFontBold(true);
+
+    QXlsx::RichString rich;
+    rich.addFragment("Hello ", blue);
+    rich.addFragment("Qt ", red);
+    rich.addFragment("Xlsx", bold);
+    xlsx.write("B2", rich);
+
+    xlsx.workbook()->setHtmlToRichStringEnabled(true);
+    xlsx.write("B4", "<b>Hello</b> <font color=\"red\">Qt</font> <i>Xlsx</i>");
+
+    xlsx.write("B6", "<font color=\"red\"><b><u><i>Qt Xlsx</i></u></b></font>");
+
+    //![1]
+
+    //![2]
+    xlsx.saveAs("RichText.xlsx");
+    //![2]
 }
-
-
diff --git a/TestExcel/hyperlinks.cpp b/TestExcel/hyperlinks.cpp
index 74d0867a..421fadba 100644
--- a/TestExcel/hyperlinks.cpp
+++ b/TestExcel/hyperlinks.cpp
@@ -1,11 +1,11 @@
 // hyperlink.cpp
 
-#include <QtGlobal>
-#include <QtCore>
-#include <QDebug>
-
 #include "xlsxdocument.h"
 
+#include <QDebug>
+#include <QtCore>
+#include <QtGlobal>
+
 int hyperlink()
 {
     //![0]
diff --git a/TestExcel/image.cpp b/TestExcel/image.cpp
index be2ce126..7e1e2783 100644
--- a/TestExcel/image.cpp
+++ b/TestExcel/image.cpp
@@ -1,19 +1,18 @@
 // image.cpp
 
-#include <QtGlobal>
-#include <QtCore>
+#include <QColor>
 #include <QDebug>
-#include <QtGui>
-#include <QVector>
-#include <QVariant>
-#include <QDebug> 
 #include <QDir>
-#include <QColor>
 #include <QImage>
 #include <QRgb>
+#include <QVariant>
+#include <QVector>
+#include <QtCore>
+#include <QtGlobal>
+#include <QtGui>
 
 #if QT_VERSION >= 0x060000 // Qt 6.0 or over
-#include <QRandomGenerator>
+#    include <QRandomGenerator>
 #endif
 
 #include "xlsxdocument.h"
@@ -24,27 +23,25 @@ int image()
 
     Document xlsx;
 
-    for (int i=0; i<10; ++i)
-    {
+    for (int i = 0; i < 10; ++i) {
         QImage image(40, 30, QImage::Format_RGB32);
 
 #if QT_VERSION >= 0x060000 // Qt 6.0 or over
         QRandomGenerator rgen;
-        image.fill( uint( rgen.generate()  % 16581375 ) );
+        image.fill(uint(rgen.generate() % 16581375));
 #else
-        image.fill( uint(qrand() % 16581375) );
+        image.fill(uint(qrand() % 16581375));
 #endif
-        int index = xlsx.insertImage( 10*i, 5, image );
+        int index = xlsx.insertImage(10 * i, 5, image);
 
-       QImage img;
-       if ( xlsx.getImage( index, img ) )
-       {
-           QString filename;
-           filename = QString("image %1.png").arg( index );
-           img.save( filename );
+        QImage img;
+        if (xlsx.getImage(index, img)) {
+            QString filename;
+            filename = QString("image %1.png").arg(index);
+            img.save(filename);
 
             qDebug() << " [image index] " << index;
-       }
+        }
     }
     xlsx.saveAs("image1.xlsx");
 
diff --git a/TestExcel/main.cpp b/TestExcel/main.cpp
index 2e1ce4f8..c83bdf60 100644
--- a/TestExcel/main.cpp
+++ b/TestExcel/main.cpp
@@ -1,17 +1,17 @@
 // main.cpp
 
-#include <QtGlobal>
+#include <iostream>
+
 #include <QCoreApplication>
-#include <QtCore>
 #include <QDebug>
-
-#include <iostream>
+#include <QtCore>
+#include <QtGlobal>
 using namespace std;
 
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
 #include "xlsxrichstring.h"
 #include "xlsxworkbook.h"
 
@@ -36,46 +36,44 @@ extern int richtext();
 extern int rowcolumn();
 extern int style();
 extern int worksheetoperations();
-extern int readStyle(); 
+extern int readStyle();
 extern int pages();
 
 int main(int argc, char *argv[])
 {
-	QCoreApplication app(argc, argv);
+    QCoreApplication app(argc, argv);
 
-	if ( argc == 2 )
-	{
-		QString strArg1 = argv[1];
-		if ( strArg1 == QString("hello") )
-		{
-			hello();
-			return 0;
-		}
-	}
+    if (argc == 2) {
+        QString strArg1 = argv[1];
+        if (strArg1 == QString("hello")) {
+            hello();
+            return 0;
+        }
+    }
 
-	hello();
-	readStyle();
-	calendar();
+    hello();
+    readStyle();
+    calendar();
     chart();
     chartExtended();
     chartsheet();
-	datavalidation();
-	definename();
-	demo();
-	documentproperty();
-	extractdata();
-	formula();
-	hyperlink();
-	image();
-	mergecells();
-	numberformat();
-	richtext();
-	rowcolumn();
-	style();
-	worksheetoperations();
+    datavalidation();
+    definename();
+    demo();
+    documentproperty();
+    extractdata();
+    formula();
+    hyperlink();
+    image();
+    mergecells();
+    numberformat();
+    richtext();
+    rowcolumn();
+    style();
+    worksheetoperations();
     pages();
-	
+
     qDebug() << "**** end of main() ****";
 
-	return 0;
+    return 0;
 }
diff --git a/TestExcel/mergecells.cpp b/TestExcel/mergecells.cpp
index 691fe97b..2b9092ac 100644
--- a/TestExcel/mergecells.cpp
+++ b/TestExcel/mergecells.cpp
@@ -1,11 +1,11 @@
 // mergecells.cpp
 
-#include <QtGlobal>
-#include <QDebug>
-
 #include "xlsxdocument.h"
 #include "xlsxformat.h"
 
+#include <QDebug>
+#include <QtGlobal>
+
 QXLSX_USE_NAMESPACE
 
 int mergecells()
@@ -31,13 +31,9 @@ int mergecells()
 
     // mergedCells
 
-
-
-
     //![2]
 
-	xlsx.saveAs("mergecells.xlsx"); 
+    xlsx.saveAs("mergecells.xlsx");
 
     return 0;
 }
-
diff --git a/TestExcel/numberformat.cpp b/TestExcel/numberformat.cpp
index d4715f42..545af988 100644
--- a/TestExcel/numberformat.cpp
+++ b/TestExcel/numberformat.cpp
@@ -1,60 +1,57 @@
 // numberformat.cpp
 
-#include <QtGlobal>
-#include <QtGui>
-
 #include "xlsxdocument.h"
 #include "xlsxformat.h"
 
+#include <QtGlobal>
+#include <QtGui>
+
 QXLSX_USE_NAMESPACE
 
 int numberformat()
 {
-	QXlsx::Document xlsx;
-	xlsx.setColumnWidth(1, 4, 20.0);
-
-	QXlsx::Format header;
-	header.setFontBold(true);
-	header.setFontSize(20);
-
-	//Custom number formats
-	QStringList numFormats;
-	numFormats
-		<< "Qt #"
-		<< "yyyy-mmm-dd"
-		<< "$ #,##0.00"
-		<< "[red]0.00";
-	xlsx.write(1, 1, "Raw data", header);
-	xlsx.write(1, 2, "Format", header);
-	xlsx.write(1, 3, "Shown value", header);
-	for (int i=0; i<numFormats.size(); ++i) 
-	{
-		int row = i+2;
-		xlsx.write(row, 1, 100.0);
-		xlsx.write(row, 2, numFormats[i]);
-		QXlsx::Format format;
-		format.setNumberFormat(numFormats[i]);
-		xlsx.write(row, 3, 100.0, format);
-	}
-
-	//Builtin number formats
-	xlsx.addSheet();
-	xlsx.setColumnWidth(1, 4, 20.0);
-	xlsx.write(1, 1, "Raw data", header);
-	xlsx.write(1, 2, "Builtin Format", header);
-	xlsx.write(1, 3, "Shown value", header);
-	for (int i=0; i<50; ++i) 
-	{
-		int row = i+2;
-		int numFmt = i;
-		xlsx.write(row, 1, 100.0);
-		xlsx.write(row, 2, numFmt);
-		QXlsx::Format format;
-		format.setNumberFormatIndex(numFmt);
-		xlsx.write(row, 3, 100.0, format);
-	}
-
-	xlsx.saveAs("numberformat.xlsx");
-
-	return 0;
+    QXlsx::Document xlsx;
+    xlsx.setColumnWidth(1, 4, 20.0);
+
+    QXlsx::Format header;
+    header.setFontBold(true);
+    header.setFontSize(20);
+
+    // Custom number formats
+    QStringList numFormats;
+    numFormats << "Qt #"
+               << "yyyy-mmm-dd"
+               << "$ #,##0.00"
+               << "[red]0.00";
+    xlsx.write(1, 1, "Raw data", header);
+    xlsx.write(1, 2, "Format", header);
+    xlsx.write(1, 3, "Shown value", header);
+    for (int i = 0; i < numFormats.size(); ++i) {
+        int row = i + 2;
+        xlsx.write(row, 1, 100.0);
+        xlsx.write(row, 2, numFormats[i]);
+        QXlsx::Format format;
+        format.setNumberFormat(numFormats[i]);
+        xlsx.write(row, 3, 100.0, format);
+    }
+
+    // Builtin number formats
+    xlsx.addSheet();
+    xlsx.setColumnWidth(1, 4, 20.0);
+    xlsx.write(1, 1, "Raw data", header);
+    xlsx.write(1, 2, "Builtin Format", header);
+    xlsx.write(1, 3, "Shown value", header);
+    for (int i = 0; i < 50; ++i) {
+        int row    = i + 2;
+        int numFmt = i;
+        xlsx.write(row, 1, 100.0);
+        xlsx.write(row, 2, numFmt);
+        QXlsx::Format format;
+        format.setNumberFormatIndex(numFmt);
+        xlsx.write(row, 3, 100.0, format);
+    }
+
+    xlsx.saveAs("numberformat.xlsx");
+
+    return 0;
 }
diff --git a/TestExcel/pageMargins.cpp b/TestExcel/pageMargins.cpp
index 9b900493..30c75a87 100644
--- a/TestExcel/pageMargins.cpp
+++ b/TestExcel/pageMargins.cpp
@@ -1,17 +1,17 @@
 // pageMargins.cpp
 
-#include <QtGlobal>
-#include <QObject>
-#include <QString>
-#include <QDebug>
-
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
 #include "xlsxrichstring.h"
 #include "xlsxworkbook.h"
 
+#include <QDebug>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
 QXLSX_USE_NAMESPACE
 
 #include <cstdio>
diff --git a/TestExcel/readStyle.cpp b/TestExcel/readStyle.cpp
index a4c90103..bc9e61e7 100644
--- a/TestExcel/readStyle.cpp
+++ b/TestExcel/readStyle.cpp
@@ -1,206 +1,188 @@
 // readStyle.cpp
 
-#include <QtGlobal>
-#include <QtCore>
-
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
 #include "xlsxrichstring.h"
 #include "xlsxworkbook.h"
 
+#include <QtCore>
+#include <QtGlobal>
+
 QXLSX_USE_NAMESPACE
 
 int readGoogleSpreadsheet();
 int readMSExcel201x();
-int readMSExcel201xNumber(QXlsx::Document* pXlsx);
+int readMSExcel201xNumber(QXlsx::Document *pXlsx);
 int readLibreOffice();
 int readWPSOffice();
 
-
 int readStyle()
 {
-	int ret;
-	
+    int ret;
+
     // ret = readGoogleSpreadsheet();
-	
+
     // ret = readMSExcel201x();
 
-	return 0; 
+    return 0;
 }
 
 int readGoogleSpreadsheet()
 {
-	Document xlsx("google-spreadsheet.xlsx"); // google docs 
-
-	if (!xlsx.isLoadPackage())
-	{
-		qDebug() << "[readGoogleSpreadsheet] failed to load package"; 
-		return (-1); 
-	}
-
-	// current sheet is default sheet. (Sheet1)
-
-	for (int row = 1; row < 20; ++row)
-	{
-		Cell* cell = xlsx.cellAt(row, 1);
-		if ( cell == NULL )
-			continue;
-		QVariant var = cell->readValue();
-		qint32 styleNo = cell->styleNumber();
-
-		Format fmt = cell->format();
-		QString strFormat; 
-		if (fmt.hasNumFmtData())
-		{
-			QString strNumFormat = fmt.numberFormat();
-			if ( ! strNumFormat.isEmpty() )
-				strFormat = strFormat + QString(" number format : ") + strNumFormat;
-		}
-
-		if (fmt.hasFontData() ) 
-		{
-			Format::FontScript fs = fmt.fontScript(); 
-		}
-
-		if (fmt.hasFillData())
-		{
-			int fillIndex = fmt.fillIndex();
-			QByteArray ba = fmt.fillKey();
-		}
-
-		if (fmt.hasBorderData())
-		{
-
-		}
-
-		if (fmt.hasAlignmentData())
-		{
-
-		}
-
-		if (fmt.hasProtectionData())
-		{
-
-		}
-			
-		if ( styleNo >= 0 )
-		{
-			qDebug() << row << " " << var << " , style:" << styleNo << strFormat;
-		}
-		else
-		{
-			qDebug() << row << " " << var << strFormat;
-		}
-	}
-
-	/* Deug Output 
-	1   QVariant(double, 1)  , style: 1 ""
-	2   QVariant(QString, "2")  , style: 2 ""
-	3   QVariant(double, 3)  , style: 3 ""
-	4   QVariant(double, 4)  , style: 4 ""
-	5   QVariant(double, 5)  , style: 5 ""
-	6   QVariant(double, 6)  , style: 6 " number format : _([$\-412]* #,##0.00_);_([$\-412]* \\(#,##0.00\\);_([$\-412]* \"-\"??_);_(@_)"
-	7   QVariant(double, 7)  , style: 7 " number format : #,##0.00;(#,##0.00)"
-	8   QVariant(double, 8)  , style: 8 " number format : [$\-412]#,##0.00"
-	9   QVariant(double, 9)  , style: 9 " number format : [$\-412]#,##0"
-	10   QVariant(QString, "1900. 1. 9")  , style: 10 " number format : yyyy. M. d"
-	11   QVariant(QTime, QTime("00:00:00.000"))  , style: 11 " number format : am/pm h:mm:ss"
-	12   QVariant(QString, "1900. 1. 11 AM 12:00:00")  , style: 12 " number format : yyyy. M. d am/pm h:mm:ss"
-	13   QVariant(QString, "312:0:0")  , style: 13 ""
-	*/
-
-	/* Testing fo read google spreadsheet file (made by google docs) 
-	 https://github.com/j2doll/QXlsx/blob/master/image/LibreOffice-Google-XLSX.png
-
-	1   QVariant(double, 1) OK:it's auto style (1)
-	2   QVariant(QString, "2") OK:it's shared string. (2) see ./xl/sharedStrings.xml 
-	3   QVariant(double, 3) PENDING:it's number (3.00) (TODO: use style[3] of cell)
-	4   QVariant(double, 4) PENDING:it's percentage (400.00%) (TODO: use style[4] of cell)
-	5   QVariant(double, 5) PENDING:it's exponentiation (5.00E+00) (TODO: use style[5] of cell)
-	6   QVariant(double, 6) PENDING:it's accounting#1 ($ 6.00) (TODO: use style[6] of cell)
-	7   QVariant(double, 7) PENDING:it's accounting#2 (7.00) (TODO: use style[7] of cell)
-	8   QVariant(double, 8) PENDING:it's currency ($8.00) (TODO: use style[8] of cell)
-	9   QVariant(double, 9) PENDING:it's currency(rounds) ($9) (TODO: use style[9] of cell)
-
-	10   QVariant(QString, "1900. 1. 9") OK:it's shared string. see /xl/sharedStrings.xml
-	11   QVariant(QDateTime, QDateTime(1900-01-11 00:00:00.000 KOREA KST Qt::TimeSpec(LocalTime))) PENDING:it means '1900Y.1M.11D.00H-00m-00s'. but, style[11] uses 'AM/PM HH:mm:ss' format. (TODO: use style[11] of cell)
-	12   QVariant(QString, "1900. 1. 11 AM 12:00:00") OK:it's shared string. see /xl/sharedStrings.xml
-	13   QVariant(QDateTime, QDateTime(1900-01-13 00:00:00.000 KOREA KST Qt::TimeSpec(LocalTime))) NOK:it's period (312H:00m:00s). [it's date. but, 13 days means 312 hours!!]
-	*/
-
-	return 0; 
+    Document xlsx("google-spreadsheet.xlsx"); // google docs
+
+    if (!xlsx.isLoadPackage()) {
+        qDebug() << "[readGoogleSpreadsheet] failed to load package";
+        return (-1);
+    }
+
+    // current sheet is default sheet. (Sheet1)
+
+    for (int row = 1; row < 20; ++row) {
+        Cell *cell = xlsx.cellAt(row, 1);
+        if (cell == NULL)
+            continue;
+        QVariant var   = cell->readValue();
+        qint32 styleNo = cell->styleNumber();
+
+        Format fmt = cell->format();
+        QString strFormat;
+        if (fmt.hasNumFmtData()) {
+            QString strNumFormat = fmt.numberFormat();
+            if (!strNumFormat.isEmpty())
+                strFormat = strFormat + QString(" number format : ") + strNumFormat;
+        }
+
+        if (fmt.hasFontData()) {
+            Format::FontScript fs = fmt.fontScript();
+        }
+
+        if (fmt.hasFillData()) {
+            int fillIndex = fmt.fillIndex();
+            QByteArray ba = fmt.fillKey();
+        }
+
+        if (fmt.hasBorderData()) {
+        }
+
+        if (fmt.hasAlignmentData()) {
+        }
+
+        if (fmt.hasProtectionData()) {
+        }
+
+        if (styleNo >= 0) {
+            qDebug() << row << " " << var << " , style:" << styleNo << strFormat;
+        } else {
+            qDebug() << row << " " << var << strFormat;
+        }
+    }
+
+    /* Deug Output
+    1   QVariant(double, 1)  , style: 1 ""
+    2   QVariant(QString, "2")  , style: 2 ""
+    3   QVariant(double, 3)  , style: 3 ""
+    4   QVariant(double, 4)  , style: 4 ""
+    5   QVariant(double, 5)  , style: 5 ""
+    6   QVariant(double, 6)  , style: 6 " number format : _([$\-412]* #,##0.00_);_([$\-412]*
+    \\(#,##0.00\\);_([$\-412]* \"-\"??_);_(@_)" 7   QVariant(double, 7)  , style: 7 " number format
+    : #,##0.00;(#,##0.00)" 8   QVariant(double, 8)  , style: 8 " number format : [$\-412]#,##0.00"
+    9   QVariant(double, 9)  , style: 9 " number format : [$\-412]#,##0"
+    10   QVariant(QString, "1900. 1. 9")  , style: 10 " number format : yyyy. M. d"
+    11   QVariant(QTime, QTime("00:00:00.000"))  , style: 11 " number format : am/pm h:mm:ss"
+    12   QVariant(QString, "1900. 1. 11 AM 12:00:00")  , style: 12 " number format : yyyy. M. d
+    am/pm h:mm:ss" 13   QVariant(QString, "312:0:0")  , style: 13 ""
+    */
+
+    /* Testing fo read google spreadsheet file (made by google docs)
+     https://github.com/j2doll/QXlsx/blob/master/image/LibreOffice-Google-XLSX.png
+
+    1   QVariant(double, 1) OK:it's auto style (1)
+    2   QVariant(QString, "2") OK:it's shared string. (2) see ./xl/sharedStrings.xml
+    3   QVariant(double, 3) PENDING:it's number (3.00) (TODO: use style[3] of cell)
+    4   QVariant(double, 4) PENDING:it's percentage (400.00%) (TODO: use style[4] of cell)
+    5   QVariant(double, 5) PENDING:it's exponentiation (5.00E+00) (TODO: use style[5] of cell)
+    6   QVariant(double, 6) PENDING:it's accounting#1 ($ 6.00) (TODO: use style[6] of cell)
+    7   QVariant(double, 7) PENDING:it's accounting#2 (7.00) (TODO: use style[7] of cell)
+    8   QVariant(double, 8) PENDING:it's currency ($8.00) (TODO: use style[8] of cell)
+    9   QVariant(double, 9) PENDING:it's currency(rounds) ($9) (TODO: use style[9] of cell)
+
+    10   QVariant(QString, "1900. 1. 9") OK:it's shared string. see /xl/sharedStrings.xml
+    11   QVariant(QDateTime, QDateTime(1900-01-11 00:00:00.000 KOREA KST Qt::TimeSpec(LocalTime)))
+    PENDING:it means '1900Y.1M.11D.00H-00m-00s'. but, style[11] uses 'AM/PM HH:mm:ss' format. (TODO:
+    use style[11] of cell) 12   QVariant(QString, "1900. 1. 11 AM 12:00:00") OK:it's shared string.
+    see /xl/sharedStrings.xml 13   QVariant(QDateTime, QDateTime(1900-01-13 00:00:00.000 KOREA KST
+    Qt::TimeSpec(LocalTime))) NOK:it's period (312H:00m:00s). [it's date. but, 13 days means 312
+    hours!!]
+    */
+
+    return 0;
 }
 
 int readLibreOffice()
 {
-	// WAIT...
-	return 0; 
+    // WAIT...
+    return 0;
 }
 
 int readMSExcel201x()
 {
-	Document xlsx("ms-number.xlsx"); // ms office online
-
-	if (!xlsx.isLoadPackage())
-	{
-		qDebug() << "[ms-number] failed to load package";
-		return (-1);
-	}
-		
-	return readMSExcel201xNumber(&xlsx);
+    Document xlsx("ms-number.xlsx"); // ms office online
+
+    if (!xlsx.isLoadPackage()) {
+        qDebug() << "[ms-number] failed to load package";
+        return (-1);
+    }
+
+    return readMSExcel201xNumber(&xlsx);
 }
 
-int readMSExcel201xNumber(QXlsx::Document* pXlsx)
+int readMSExcel201xNumber(QXlsx::Document *pXlsx)
 {
-	if (NULL == pXlsx)
-		return (-1);
-
-	for (int row = 1; row < 10; ++row)
-	{
-		Cell* cell = pXlsx->cellAt(row, 1);
-		if (cell == NULL)
-			continue;
-
-		QVariant var = cell->readValue();
-		qint32 styleNo = cell->styleNumber();
-		Format fmt = cell->format();
-
-		QString strFomrat;
-		if (fmt.hasNumFmtData())
-		{
-			QString strNumFormat = fmt.numberFormat();
-			strFomrat = strFomrat + QString(" number format :") + strNumFormat;
-		}
-
-		if (styleNo >= 0)
-		{
-			qDebug() << row << " " << var << " , style:" << styleNo << strFomrat;
-		}
-		else
-		{
-			qDebug() << row << " " << var << strFomrat;
-		}
-	}
-
-	/* Debug output
-	1   QVariant(double, 1) ""
-	2   QVariant(double, 2)  , style: 1 " number format :0.00_ "
-	3   QVariant(double, 3000)  , style: 2 " number format :#,##0_ "
-	4   QVariant(double, -4)  , style: 3 " number format :0_ ;[Red]\\-0\\ "
-	
-	cell value that is printed on excel
-	[1]
-	[2.00] 
-	[3,000]  
-	[red minus four] 
-	*/
-
-	return 0;
+    if (NULL == pXlsx)
+        return (-1);
+
+    for (int row = 1; row < 10; ++row) {
+        Cell *cell = pXlsx->cellAt(row, 1);
+        if (cell == NULL)
+            continue;
+
+        QVariant var   = cell->readValue();
+        qint32 styleNo = cell->styleNumber();
+        Format fmt     = cell->format();
+
+        QString strFomrat;
+        if (fmt.hasNumFmtData()) {
+            QString strNumFormat = fmt.numberFormat();
+            strFomrat            = strFomrat + QString(" number format :") + strNumFormat;
+        }
+
+        if (styleNo >= 0) {
+            qDebug() << row << " " << var << " , style:" << styleNo << strFomrat;
+        } else {
+            qDebug() << row << " " << var << strFomrat;
+        }
+    }
+
+    /* Debug output
+    1   QVariant(double, 1) ""
+    2   QVariant(double, 2)  , style: 1 " number format :0.00_ "
+    3   QVariant(double, 3000)  , style: 2 " number format :#,##0_ "
+    4   QVariant(double, -4)  , style: 3 " number format :0_ ;[Red]\\-0\\ "
+
+    cell value that is printed on excel
+    [1]
+    [2.00]
+    [3,000]
+    [red minus four]
+    */
+
+    return 0;
 }
 
 int readWPSOffice()
 {
-	return 0;
+    return 0;
 }
diff --git a/TestExcel/richtext.cpp b/TestExcel/richtext.cpp
index 49899a21..be5fd34f 100644
--- a/TestExcel/richtext.cpp
+++ b/TestExcel/richtext.cpp
@@ -1,12 +1,12 @@
 // richtext.cpp
 
-#include <QtGlobal>
-#include <QtCore>
-
 #include "xlsxdocument.h"
+#include "xlsxformat.h"
 #include "xlsxrichstring.h"
 #include "xlsxworkbook.h"
-#include "xlsxformat.h"
+
+#include <QtCore>
+#include <QtGlobal>
 
 int richtext()
 {
diff --git a/TestExcel/rowcolumn.cpp b/TestExcel/rowcolumn.cpp
index 6b613c9a..d89d2c0a 100644
--- a/TestExcel/rowcolumn.cpp
+++ b/TestExcel/rowcolumn.cpp
@@ -1,23 +1,23 @@
 // rowcolumn.cpp
 
-#include <QtGlobal>
-#include <QtCore>
-
 #include "xlsxdocument.h"
 #include "xlsxformat.h"
 
+#include <QtCore>
+#include <QtGlobal>
+
 int rowcolumn()
 {
     QXlsx::Document xlsx;
     xlsx.write(1, 2, "Row:0, Col:2 ==> (C1)");
 
-    //Set the height of the first row to 50.0(points)
+    // Set the height of the first row to 50.0(points)
     xlsx.setRowHeight(1, 50.0);
 
-    //Set the width of the third column to 40.0(chars)
+    // Set the width of the third column to 40.0(chars)
     xlsx.setColumnWidth(3, 3, 40.0);
 
-    //Set style for the row 11th.
+    // Set style for the row 11th.
     QXlsx::Format format1;
     format1.setFontBold(true);
     format1.setFontColor(QColor(Qt::blue));
@@ -27,57 +27,49 @@ int rowcolumn()
     xlsx.setRowFormat(11, format1);
     xlsx.setRowHeight(11, 41);
 
-    //Set style for the col [9th, 16th)
+    // Set style for the col [9th, 16th)
     QXlsx::Format format2;
     format2.setFontBold(true);
     format2.setFontColor(QColor(Qt::magenta));
-    for (int row=12; row<=30; row++)
-        for (int col=9; col<=15; col++)
-            xlsx.write(row, col, row+col);
+    for (int row = 12; row <= 30; row++)
+        for (int col = 9; col <= 15; col++)
+            xlsx.write(row, col, row + col);
     xlsx.setColumnWidth(9, 16, 5.0);
     xlsx.setColumnFormat(9, 16, format2);
 
-
     // Autosize columns
     xlsx.addSheet("Autosize");
     QXlsx::Format header;
     header.setFontBold(true);
     header.setFontSize(20);
 
-    //Custom number formats
+    // Custom number formats
     int row = 2;
     xlsx.write(row, 1, "Small", header);
     xlsx.write(row, 2, "Large header", header);
-    for (int i=0; i<10; ++i)
-    {
-        xlsx.write(row+1+i, 1, i);
-        xlsx.write(row+1+i, 2, i);
+    for (int i = 0; i < 10; ++i) {
+        xlsx.write(row + 1 + i, 1, i);
+        xlsx.write(row + 1 + i, 2, i);
     }
     xlsx.autosizeColumnWidth(1, 2);
 
     xlsx.write(2, 4, "Small", header);
     xlsx.write(2, 5, "<--- Large header --->", header);
-    for (int i=0; i<10; ++i)
-    {
-        xlsx.write(row+1+i, 4, exp(i));
-        xlsx.write(row+1+i, 5, exp(i));
+    for (int i = 0; i < 10; ++i) {
+        xlsx.write(row + 1 + i, 4, exp(i));
+        xlsx.write(row + 1 + i, 5, exp(i));
     }
     xlsx.autosizeColumnWidth(4, 5);
 
-
     xlsx.write(1, 7, "<--- Very big first line --->", header);
     xlsx.write(row, 7, "Small", header);
     xlsx.write(row, 8, "<--- Large header --->", header);
-    for (int i=0; i<10; ++i)
-    {
-        xlsx.write(row+1+i, 7, exp(i));
-        xlsx.write(row+1+i, 8, exp(i));
+    for (int i = 0; i < 10; ++i) {
+        xlsx.write(row + 1 + i, 7, exp(i));
+        xlsx.write(row + 1 + i, 8, exp(i));
     }
     xlsx.autosizeColumnWidth(QXlsx::CellRange(2, 7, 1000, 8));
 
-
-
-
-	xlsx.saveAs("rowcolumn.xlsx");
+    xlsx.saveAs("rowcolumn.xlsx");
     return 0;
 }
diff --git a/TestExcel/style.cpp b/TestExcel/style.cpp
index 00ada711..eb69fea9 100644
--- a/TestExcel/style.cpp
+++ b/TestExcel/style.cpp
@@ -1,11 +1,11 @@
 // style.cpp
 
-#include <QtGlobal>
-#include <QtCore>
-
 #include "xlsxdocument.h"
 #include "xlsxformat.h"
 
+#include <QtCore>
+#include <QtGlobal>
+
 int style()
 {
     QXlsx::Document xlsx;
@@ -35,9 +35,9 @@ int style()
     QXlsx::Format format4;
     format4.setFontBold(true);
     format4.setFontColor(QColor(Qt::magenta));
-    for (int row=21; row<=40; row++)
-        for (int col=9; col<16; col++)
-            xlsx.write(row, col, row+col);
+    for (int row = 21; row <= 40; row++)
+        for (int col = 9; col < 16; col++)
+            xlsx.write(row, col, row + col);
     xlsx.setColumnFormat(9, 16, format4);
 
     xlsx.write("A5", QDate(2013, 8, 29));
diff --git a/TestExcel/worksheetoperations.cpp b/TestExcel/worksheetoperations.cpp
index 28c5028e..156093ff 100644
--- a/TestExcel/worksheetoperations.cpp
+++ b/TestExcel/worksheetoperations.cpp
@@ -1,10 +1,10 @@
 // worksheetoperations.cpp
 
-#include <QtGlobal>
-#include <QtCore>
-
-#include "xlsxdocument.h"
 #include "xlsxabstractsheet.h"
+#include "xlsxdocument.h"
+
+#include <QtCore>
+#include <QtGlobal>
 
 QXLSX_USE_NAMESPACE
 
@@ -13,8 +13,8 @@ int worksheetoperations()
     //![Create a xlsx file]
     Document xlsx;
 
-    for (int i=1; i<20; ++i) {
-        for (int j=1; j<15; ++j)
+    for (int i = 1; i < 20; ++i) {
+        for (int j = 1; j < 15; ++j)
             xlsx.write(i, j, QString("R %1 C %2").arg(i).arg(j));
     }
     xlsx.addSheet();
diff --git a/WebServer/main.cpp b/WebServer/main.cpp
index c2e54802..9e4e8967 100644
--- a/WebServer/main.cpp
+++ b/WebServer/main.cpp
@@ -1,27 +1,26 @@
 // main.cpp
 
-#include <iostream>
-
-#include <QtGlobal>
-#include <QObject>
-#include <QVector>
-#include <QList>
-
 #include "recurse.hpp"
-
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
+#include "xlsxabstractsheet.h"
+#include "xlsxcell.h"
+#include "xlsxcelllocation.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
 #include "xlsxrichstring.h"
 #include "xlsxworkbook.h"
-#include "xlsxabstractsheet.h"
-#include "xlsxcelllocation.h"
-#include "xlsxcell.h"
+
+#include <iostream>
+
+#include <QList>
+#include <QObject>
+#include <QVector>
+#include <QtGlobal>
 using namespace QXlsx;
 
 QString getHtml(QString strFilename);
-bool loadXlsx(QString fileName, QString& strHtml);
+bool loadXlsx(QString fileName, QString &strHtml);
 QString g_htmlDoc;
 
 int main(int argc, char *argv[])
@@ -30,15 +29,11 @@ int main(int argc, char *argv[])
 
     Recurse::Application app(argc, argv);
 
-    app.use([](auto &ctx)
-    {
-        ctx.response.send(g_htmlDoc);
-    });
+    app.use([](auto &ctx) { ctx.response.send(g_htmlDoc); });
 
     quint16 listenPort = 3001; // default port
-    auto result = app.listen( listenPort );
-    if ( result.error() )
-    {
+    auto result        = app.listen(listenPort);
+    if (result.error()) {
         qDebug() << "error upon listening:" << result.lastError();
         return (-1);
     }
@@ -55,17 +50,16 @@ QString getHtml(QString strFilename)
 
     ret = ret + QString("<head>\n");
     ret = ret + QString("<title>") + strFilename + QString("</title>\n");
-    ret = ret + QString("<meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>\n" );
+    ret = ret + QString("<meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>\n");
     ret = ret + QString("</head>\n");
 
     ret = ret + QString("<body>\n");
 
-    QString strTableStyle = \
-        "<style>\n"\
-        " table { border-collapse: collapse; } \n"\
-        " td, th { border: 1px solid black; } \n"\
-        "</style>\n";
-    ret = ret + strTableStyle;
+    QString strTableStyle = "<style>\n"
+                            " table { border-collapse: collapse; } \n"
+                            " td, th { border: 1px solid black; } \n"
+                            "</style>\n";
+    ret                   = ret + strTableStyle;
 
     if (!loadXlsx(strFilename, ret))
         return QString("");
@@ -74,59 +68,54 @@ QString getHtml(QString strFilename)
 
     ret = ret + QString("</html>\n");
 
-    qDebug() <<  ret << "\n";
+    qDebug() << ret << "\n";
 
     return ret;
 }
 
-bool loadXlsx(QString fileName, QString& strHtml)
+bool loadXlsx(QString fileName, QString &strHtml)
 {
     // tried to load xlsx using temporary document
-    QXlsx::Document xlsxTmp( fileName );
-    if ( !xlsxTmp.isLoadPackage() )
-    {
+    QXlsx::Document xlsxTmp(fileName);
+    if (!xlsxTmp.isLoadPackage()) {
         return false; // failed to load
     }
 
     // load new xlsx using new document
-    QXlsx::Document xlsxDoc( fileName );
+    QXlsx::Document xlsxDoc(fileName);
     xlsxDoc.isLoadPackage();
 
     int sheetIndexNumber = 0;
-    foreach( QString curretnSheetName, xlsxDoc.sheetNames() )
-    {
-        QXlsx::AbstractSheet* currentSheet = xlsxDoc.sheet( curretnSheetName );
-        if ( NULL == currentSheet )
+    foreach (QString curretnSheetName, xlsxDoc.sheetNames()) {
+        QXlsx::AbstractSheet *currentSheet = xlsxDoc.sheet(curretnSheetName);
+        if (NULL == currentSheet)
             continue;
 
         // get full cells of sheet
         int maxRow = -1;
         int maxCol = -1;
-        currentSheet->workbook()->setActiveSheet( sheetIndexNumber );
-        Worksheet* wsheet = (Worksheet*) currentSheet->workbook()->activeSheet();
-        if ( NULL == wsheet )
+        currentSheet->workbook()->setActiveSheet(sheetIndexNumber);
+        Worksheet *wsheet = (Worksheet *) currentSheet->workbook()->activeSheet();
+        if (NULL == wsheet)
             continue;
 
-        QString strSheetName = wsheet->sheetName(); // sheet name
+        QString strSheetName = wsheet->sheetName();                                // sheet name
         strHtml = strHtml + QString("<b>") + strSheetName + QString("</b><br>\n"); // UTF-8
 
         strHtml = strHtml + QString("<table>");
 
-        QVector<CellLocation> clList = wsheet->getFullCells( &maxRow, &maxCol );
+        QVector<CellLocation> clList = wsheet->getFullCells(&maxRow, &maxCol);
 
-        QVector< QVector<QString> > cellValues;
-        for (int rc = 0; rc < maxRow; rc++)
-        {
+        QVector<QVector<QString>> cellValues;
+        for (int rc = 0; rc < maxRow; rc++) {
             QVector<QString> tempValue;
-            for (int cc = 0; cc < maxCol; cc++)
-            {
+            for (int cc = 0; cc < maxCol; cc++) {
                 tempValue.push_back(QString(""));
             }
             cellValues.push_back(tempValue);
         }
 
-        for ( int ic = 0; ic < clList.size(); ++ic )
-         {
+        for (int ic = 0; ic < clList.size(); ++ic) {
             // cell location
             CellLocation cl = clList.at(ic);
 
@@ -149,15 +138,13 @@ bool loadXlsx(QString fileName, QString& strHtml)
         }
 
         QString strTableRecord;
-        for (int rc = 0; rc < maxRow; rc++)
-        {
+        for (int rc = 0; rc < maxRow; rc++) {
             strTableRecord = strTableRecord + QString("<tr>");
-            for (int cc = 0; cc < maxCol; cc++)
-            {
+            for (int cc = 0; cc < maxCol; cc++) {
                 QString strTemp = cellValues[rc][cc];
-                strTableRecord = strTableRecord + QString("<td>");
-                strTableRecord = strTableRecord + strTemp; // UTF-8
-                strTableRecord = strTableRecord + QString("</td>");
+                strTableRecord  = strTableRecord + QString("<td>");
+                strTableRecord  = strTableRecord + strTemp; // UTF-8
+                strTableRecord  = strTableRecord + QString("</td>");
             }
             strTableRecord = strTableRecord + QString("</tr>\n");
         }
diff --git a/WhatType/main.cpp b/WhatType/main.cpp
index 6227d926..e5d81c59 100644
--- a/WhatType/main.cpp
+++ b/WhatType/main.cpp
@@ -1,22 +1,22 @@
 // main.cpp
 
-#include <QtGlobal>
+#include <iostream>
+
 #include <QCoreApplication>
-#include <QtCore>
-#include <QVariant>
-#include <QDir>
-#include <QDateTime>
 #include <QDate>
-#include <QTime>
+#include <QDateTime>
 #include <QDebug>
-
-#include <iostream>
+#include <QDir>
+#include <QTime>
+#include <QVariant>
+#include <QtCore>
+#include <QtGlobal>
 using namespace std;
 
-#include "xlsxdocument.h"
-#include "xlsxchartsheet.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxchartsheet.h"
+#include "xlsxdocument.h"
 #include "xlsxrichstring.h"
 #include "xlsxworkbook.h"
 using namespace QXlsx;
@@ -29,49 +29,60 @@ int main(int argc, char *argv[])
 
     QXlsx::Document xlsxW;
 
-    xlsxW.write( 1, 1, QString("Hello Qt!") );
-    xlsxW.write( 2, 1, double(10.5) );
-    xlsxW.write( 3, 1, (int)10 );
-    xlsxW.write( 4, 1, QDateTime::currentDateTimeUtc() );
-    xlsxW.write( 5, 1, QDate( 2019, 10, 5 ) );
-    xlsxW.write( 6, 1, QTime( 4, 13, 36 ) );
+    xlsxW.write(1, 1, QString("Hello Qt!"));
+    xlsxW.write(2, 1, double(10.5));
+    xlsxW.write(3, 1, (int) 10);
+    xlsxW.write(4, 1, QDateTime::currentDateTimeUtc());
+    xlsxW.write(5, 1, QDate(2019, 10, 5));
+    xlsxW.write(6, 1, QTime(4, 13, 36));
 
-    if ( xlsxW.saveAs("Test.xlsx") ) // save the document as 'Test.xlsx'
+    if (xlsxW.saveAs("Test.xlsx")) // save the document as 'Test.xlsx'
     {
         qDebug() << "[debug] success to write xlsx file";
-    }
-    else
-    {
+    } else {
         qDebug() << "[debug][error] failed to write xlsx file";
     }
 
     qDebug() << "[debug] current directory is " << QDir::currentPath();
 
-    Document xlsxR("Test.xlsx"); 
-    if ( ! xlsxR.load() )
-    {
+    Document xlsxR("Test.xlsx");
+    if (!xlsxR.load()) {
         qDebug() << "[debug][error] failed to load xlsx file.";
     }
 
-    whatType( xlsxR.cellAt( 1, 1 )->readValue() );
-    whatType( xlsxR.cellAt( 2, 1 )->readValue() );
-    whatType( xlsxR.cellAt( 3, 1 )->readValue() );
-    whatType( xlsxR.cellAt( 4, 1 )->readValue() );
-    whatType( xlsxR.cellAt( 5, 1 )->readValue() );
-    whatType( xlsxR.cellAt( 6, 1 )->readValue() );
+    whatType(xlsxR.cellAt(1, 1)->readValue());
+    whatType(xlsxR.cellAt(2, 1)->readValue());
+    whatType(xlsxR.cellAt(3, 1)->readValue());
+    whatType(xlsxR.cellAt(4, 1)->readValue());
+    whatType(xlsxR.cellAt(5, 1)->readValue());
+    whatType(xlsxR.cellAt(6, 1)->readValue());
 
     return 0;
 }
 
 int whatType(QVariant var)
 {
-    if ( var.type() == QVariant::Invalid ) { qDebug() << "Invalid"; }
-    if ( var.type() == QVariant::String ) { qDebug() << "String"; }
-    if ( var.type() == QVariant::Double ) { qDebug() << "Double"; }
-    if ( var.type() == QVariant::Int ) { qDebug() << "Int"; }
-    if ( var.type() == QVariant::DateTime ) { qDebug() << "DateTime"; }
-    if ( var.type() == QVariant::Date ) { qDebug() << "Date"; }
-    if ( var.type() == QVariant::Time ) { qDebug() << "Time"; }
+    if (var.type() == QVariant::Invalid) {
+        qDebug() << "Invalid";
+    }
+    if (var.type() == QVariant::String) {
+        qDebug() << "String";
+    }
+    if (var.type() == QVariant::Double) {
+        qDebug() << "Double";
+    }
+    if (var.type() == QVariant::Int) {
+        qDebug() << "Int";
+    }
+    if (var.type() == QVariant::DateTime) {
+        qDebug() << "DateTime";
+    }
+    if (var.type() == QVariant::Date) {
+        qDebug() << "Date";
+    }
+    if (var.type() == QVariant::Time) {
+        qDebug() << "Time";
+    }
 
     return 0;
 }
diff --git a/chartsquestions/main.cpp b/chartsquestions/main.cpp
index db793e63..c43b016d 100644
--- a/chartsquestions/main.cpp
+++ b/chartsquestions/main.cpp
@@ -1,4 +1,5 @@
 #include "mainwindow.h"
+
 #include <QApplication>
 
 int main(int argc, char *argv[])
diff --git a/chartsquestions/mainwindow.cpp b/chartsquestions/mainwindow.cpp
index 5da3bcff..0c95131d 100644
--- a/chartsquestions/mainwindow.cpp
+++ b/chartsquestions/mainwindow.cpp
@@ -1,13 +1,13 @@
 #include "mainwindow.h"
-#include "ui_mainwindow.h"
 
+#include "ui_mainwindow.h"
 
-MainWindow::MainWindow(QWidget *parent) :
-    QMainWindow(parent),
-    ui(new Ui::MainWindow)
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+    , ui(new Ui::MainWindow)
 {
     ui->setupUi(this);
-    QObject::connect(ui->pushButton, SIGNAL(clicked()),this,SLOT(generator()));
+    QObject::connect(ui->pushButton, SIGNAL(clicked()), this, SLOT(generator()));
 }
 
 MainWindow::~MainWindow()
diff --git a/chartsquestions/mainwindow.h b/chartsquestions/mainwindow.h
index d89fbe31..8c806ba4 100644
--- a/chartsquestions/mainwindow.h
+++ b/chartsquestions/mainwindow.h
@@ -1,9 +1,10 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QMainWindow>
 #include "sat_calc.h"
 
+#include <QMainWindow>
+
 namespace Ui {
 class MainWindow;
 }
diff --git a/chartsquestions/sat_calc.cpp b/chartsquestions/sat_calc.cpp
index cf6d308e..4b21b07f 100644
--- a/chartsquestions/sat_calc.cpp
+++ b/chartsquestions/sat_calc.cpp
@@ -1,32 +1,38 @@
 
-#include <QtGlobal>
-#include <QObject>
-#include <QUrl>
-#include <QFile>
-#include <QString>
-#include <QMessageBox>
-#include <QDebug>
-
 #include "sat_calc.h"
 
-sat_calc::sat_calc(): output_line_count(5){}
-sat_calc::~sat_calc(){}
+#include <QDebug>
+#include <QFile>
+#include <QMessageBox>
+#include <QObject>
+#include <QString>
+#include <QUrl>
+#include <QtGlobal>
 
+sat_calc::sat_calc()
+    : output_line_count(5)
+{
+}
+sat_calc::~sat_calc() {}
 
-void sat_calc::get_chromatogram(const QString & chromatogram){
-    this->chromatogram=chromatogram;
+void sat_calc::get_chromatogram(const QString &chromatogram)
+{
+    this->chromatogram = chromatogram;
 }
 
-void sat_calc::get_report_file(const QString & report_file){
-    this->report_file=report_file;
+void sat_calc::get_report_file(const QString &report_file)
+{
+    this->report_file = report_file;
 }
 
-void sat_calc::get_sheet_name(const QString & sheet_name){
-    this->sheet_name=sheet_name;
+void sat_calc::get_sheet_name(const QString &sheet_name)
+{
+    this->sheet_name = sheet_name;
 }
 
-void sat_calc::get_precision(const double precision){
-    this->precision=precision;
+void sat_calc::get_precision(const double precision)
+{
+    this->precision = precision;
 }
 
 #define QUICK_GUI_DEBUG USE
@@ -36,15 +42,14 @@ void sat_calc::generate_report()
 {
     // Define test parameters
     chromatogram = ":/Chromatogram_example.txt";
-    report_file = "output.xlsx";
-    sheet_name = "hello";
-    precision = 0.1;
+    report_file  = "output.xlsx";
+    sheet_name   = "hello";
+    precision    = 0.1;
 
     double d1, d2, d3;
 
     bool isExist = QFile::exists(chromatogram);
-    if (!isExist)
-    {
+    if (!isExist) {
         qDebug() << "[debug] file is not exist. : " << chromatogram;
 
 #ifdef QUICK_GUI_DEBUG
@@ -55,10 +60,9 @@ void sat_calc::generate_report()
         return;
     }
 
-    QFile input( chromatogram );
-    if ( !input.open( QIODevice::ReadOnly | QIODevice::Text ) )
-    {
-        qDebug() << "[debug] failed to load file : " << chromatogram ;
+    QFile input(chromatogram);
+    if (!input.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        qDebug() << "[debug] failed to load file : " << chromatogram;
 
 #ifdef QUICK_GUI_DEBUG
         QMessageBox msgBox;
@@ -75,7 +79,7 @@ void sat_calc::generate_report()
     output.selectSheet(sheet_name);
     QString chrom_data_array = "A" + QString::number(output_line_count + 3);
 
-    unsigned int input_line_count=0;
+    unsigned int input_line_count = 0;
 
     int step = 1;
 
@@ -91,43 +95,35 @@ void sat_calc::generate_report()
     title_stile.setFontBold(true);
     title_stile.setHorizontalAlignment(QXlsx::Format::AlignHCenter);
     title_stile.setVerticalAlignment(QXlsx::Format::AlignVCenter);
-    title_stile.setPatternBackgroundColor(QColor(225,225,225));
+    title_stile.setPatternBackgroundColor(QColor(225, 225, 225));
     title_stile.setBorderStyle(QXlsx::Format::BorderMedium);
 
-    output.write( output_line_count+2, 1, "volume, ml", title_stile );
-    output.write( output_line_count+2, 2, "OD, mAu", title_stile );
-
-    while ( !stream_buffer.atEnd() )
-    {
-        if ( input_line_count % step == 0 )
-        {
-            for ( int j = 0 ; j < 2 ; j++ )
-            {
-                if ( input_line_count > 2 )
-                {
-                    if ( input_line_count == 2 && j == 0 )
-                    {
+    output.write(output_line_count + 2, 1, "volume, ml", title_stile);
+    output.write(output_line_count + 2, 2, "OD, mAu", title_stile);
+
+    while (!stream_buffer.atEnd()) {
+        if (input_line_count % step == 0) {
+            for (int j = 0; j < 2; j++) {
+                if (input_line_count > 2) {
+                    if (input_line_count == 2 && j == 0) {
                         stream_buffer >> string_buffer;
                     }
 
-                    if ( input_line_count == 3 && j == 0 )
-                    {
+                    if (input_line_count == 3 && j == 0) {
                         stream_buffer >> d1;
-                        output.write( output_line_count, j+1, d1, simple_green );
+                        output.write(output_line_count, j + 1, d1, simple_green);
                     }
 
-                    if ( input_line_count == 4 && j == 0 )
-                    {
+                    if (input_line_count == 4 && j == 0) {
                         stream_buffer >> d2;
-                        step = (int)(precision / (d2-d1));
+                        step = (int) (precision / (d2 - d1));
                         std::cout << "\nstep  " << step << std::endl;
-                        output.write( output_line_count, j+1, d2, simple_green );
+                        output.write(output_line_count, j + 1, d2, simple_green);
                     }
 
-                    if ( j || input_line_count > 4 )
-                    {
+                    if (j || input_line_count > 4) {
                         stream_buffer >> d3;
-                        output.write( output_line_count, j+1, d3, row_data );
+                        output.write(output_line_count, j + 1, d3, row_data);
                     }
 
                 } // if ( input_line_count > 2 ) ...
@@ -145,12 +141,12 @@ void sat_calc::generate_report()
 
     chrom_data_array += ":B" + QString::number(output_line_count - 1);
 
-    Chart * Crom = output.insertChart( 3, 5, QSize(600, 500) );
-    Crom->setChartType( Chart::CT_ScatterChart );
-    Crom->addSeries( CellRange(chrom_data_array) );
-    Crom->setAxisTitle( Chart::Left, QString("left title") );
-    Crom->setAxisTitle( Chart::Bottom, QString("bottom title") );
-    Crom->setChartTitle( QString("hello chart") );
+    Chart *Crom = output.insertChart(3, 5, QSize(600, 500));
+    Crom->setChartType(Chart::CT_ScatterChart);
+    Crom->addSeries(CellRange(chrom_data_array));
+    Crom->setAxisTitle(Chart::Left, QString("left title"));
+    Crom->setAxisTitle(Chart::Bottom, QString("bottom title"));
+    Crom->setChartTitle(QString("hello chart"));
 
     qDebug() << "[debug] chrom_data_array : " << chrom_data_array;
 
@@ -158,13 +154,11 @@ void sat_calc::generate_report()
     input.close();
 
     Document doc2(report_file);
-    if (doc2.load())
-    {
+    if (doc2.load()) {
         doc2.saveAs("doc2.xlsx");
     }
 
     QMessageBox msgBox;
     msgBox.setText("Success to write a xlsx file.");
     msgBox.exec();
-
 }
diff --git a/chartsquestions/sat_calc.h b/chartsquestions/sat_calc.h
index 3256acc4..8e42352f 100644
--- a/chartsquestions/sat_calc.h
+++ b/chartsquestions/sat_calc.h
@@ -1,14 +1,16 @@
 #ifndef SAT_CALC_H
 #define SAT_CALC_H
-#include <QtCore>
-#include <QString>
-#include <QTextStream>
-#include <iostream>
-#include <QColor>
-#include "xlsxdocument.h"
-#include "xlsxformat.h"
 #include "xlsxcellrange.h"
 #include "xlsxchart.h"
+#include "xlsxdocument.h"
+#include "xlsxformat.h"
+
+#include <iostream>
+
+#include <QColor>
+#include <QString>
+#include <QTextStream>
+#include <QtCore>
 
 using namespace QXlsx;
 
@@ -21,13 +23,12 @@ class sat_calc
     QString sheet_name;
     int output_line_count;
 
-
 public:
-    void generate_report (void);
-    void get_chromatogram(const QString & chromatogram);
-    void get_report_file (const QString & report_file) ;
-    void get_sheet_name  (const QString & sheet_name)  ;
-    void get_precision   (const double    precision)   ;
+    void generate_report(void);
+    void get_chromatogram(const QString &chromatogram);
+    void get_report_file(const QString &report_file);
+    void get_sheet_name(const QString &sheet_name);
+    void get_precision(const double precision);
 
     sat_calc();
     ~sat_calc();