restore conflicts files after rebase

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.cpp

@@ -289,7 +289,7 @@ int Font::serialize_properties(std::wostream & stream, bool isRPr)
             }            
         }
 
-        if (bCharSet.value())
+        if (bCharSet)
         {
             CP_XML_NODE(L"charset")
             {
@@ -341,7 +341,7 @@ int Font::serialize_properties(std::wostream & stream, bool isRPr)
             }
         }
 
-        if (bFamily.value())
+        if (bFamily)
         {
             CP_XML_NODE(L"family")
             {
@@ -415,7 +415,7 @@ int Font::serialize_properties(std::wostream & stream, bool isRPr)
             }
         }
 
-        if ((uls.value()) && (*uls.value() > 0))
+        if (uls > 0)
         {
             CP_XML_NODE(L"u")
             {

X2tConverter/src/main.cpp

@@ -4,6 +4,7 @@
 
 #include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
 #include "../../DesktopEditor/common/Directory.h"
+#include "../../DesktopEditor/doctrenderer/docbuilder.h"
 
 //#include <iostream>
 
@@ -415,5 +416,8 @@ int main(int argc, char *argv[])
 	// delete temp dir
     NSDirectory::DeleteDirectory(sTempDir);
 
+	//clean up v8
+	NSDoctRenderer::CDocBuilder::Dispose();
+
     return getReturnErrorCode(result);
 }