OdfFile Reader & Writer

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62603 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficeOdfFile/ASCOfficeOdfFile/ASCOfficeOdfFile.rc

@@ -2,8 +2,8 @@
 //
 #include "resource.h"
 #define COMPONENT_NAME "OfficeOdfFile"
-#include "..\..\Common\FileInfo.h"
-#include "version.h"
+#include "../../Common/FileInfo.h"
+#include "../version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////

ASCOfficeOdfFile/include/boost_string.h

-#ifndef _CPDOCCORE_BOOST_STRING_H_
-#define _CPDOCCORE_BOOST_STRING_H_
-
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#include <boost/algorithm/string.hpp> 
-#pragma warning(pop)
-
-#endif

ASCOfficeOdfFile/include/cpdoccore/CPAssert.h

-#ifndef _CP_ASSERT_H_
-#define _CP_ASSERT_H_
-
-#define CP_ASSERT(A) _ASSERTE(A)
-
-#endif

ASCOfficeOdfFile/include/cpdoccore/xml/attributes.h

@@ -8,10 +8,10 @@
 #include "../../cpdoccore/xml/xmlchar.h"
 
 #include "../../logging.h"
-#include "../../boost_string.h"
 
 #include <boost/variant.hpp>
 #include <boost/foreach.hpp>
+#include <boost/lexical_cast.hpp>
 
 namespace cpdoccore 
 {

ASCOfficeOdfFile/include/cpdoccore/xml/nodetype.h

-#ifndef _CPDOCCORE_XML_NODETYPE_H_
-#define _CPDOCCORE_XML_NODETYPE_H_
-
-#ifdef _MSC_VER
 #pragma once
-#endif
 
 namespace cpdoccore {
 namespace xml {
@@ -27,4 +22,3 @@ enum NodeType
 }
 }
 
-#endif // #ifndef _CPDOCCORE_XML_NODETYPE_H_

ASCOfficeOdfFile/include/cpdoccore/xml/utils.h

-#ifndef _CPDOCCORE_XML_UTILS_H_
-#define _CPDOCCORE_XML_UTILS_H_
+#pragma once
 
 #include <string>
 
@@ -8,38 +7,33 @@ namespace xml {
 
 namespace utils {
 
-namespace details {
+	namespace details {
+		std::wstring replace_text_to_xml_ImplRegEx(const std::wstring & Text);
+		std::string replace_text_to_xml_ImplRegEx(const std::string & Text);
 
-std::wstring replace_text_to_xml_ImplRegEx(const std::wstring & Text);
-std::string replace_text_to_xml_ImplRegEx(const std::string & Text);
+		std::wstring replace_xml_to_text_ImplRegEx(const std::wstring & Text);
+		std::string replace_xml_to_text_ImplRegEx(const std::string & Text);
 
-std::wstring replace_xml_to_text_ImplRegEx(const std::wstring & Text);
-std::string replace_xml_to_text_ImplRegEx(const std::string & Text);
+		std::wstring replace_text_to_xml_ImplReplace(const std::wstring & Text);
+		std::string replace_text_to_xml_ImplReplace(const std::string & Text);
 
-std::wstring replace_text_to_xml_ImplReplace(const std::wstring & Text);
-std::string replace_text_to_xml_ImplReplace(const std::string & Text);
+		std::wstring replace_amp_text_to_xml_ImplReplace(const std::wstring & Text);
+		std::string replace_amp_text_to_xml_ImplReplace(const std::string & Text);
 
-std::wstring replace_amp_text_to_xml_ImplReplace(const std::wstring & Text);
-std::string replace_amp_text_to_xml_ImplReplace(const std::string & Text);
+		std::wstring replace_xml_to_text_ImplReplace(const std::wstring & Text);
+		std::string replace_xml_to_text_ImplReplace(const std::string & Text);
+	}
 
-std::wstring replace_xml_to_text_ImplReplace(const std::wstring & Text);
-std::string replace_xml_to_text_ImplReplace(const std::string & Text);
+	std::wstring replace_text_to_xml(const std::wstring & Text);
+	std::string replace_text_to_xml(const std::string & Text);
 
-}
-
-std::wstring replace_text_to_xml(const std::wstring & Text);
-std::string replace_text_to_xml(const std::string & Text);
-
-std::wstring replace_amp_text_to_xml(const std::wstring & Text);
+	std::wstring replace_amp_text_to_xml(const std::wstring & Text);
 
-std::wstring replace_lt_gt(const std::wstring & Text);
-
-std::wstring replace_xml_to_text(const std::wstring & Text);
-std::string replace_xml_to_text(const std::string & Text);
+	std::wstring replace_lt_gt(const std::wstring & Text);
 
+	std::wstring replace_xml_to_text(const std::wstring & Text);
+	std::string replace_xml_to_text(const std::string & Text);
 }
 
 }
 }
-
-#endif

ASCOfficeOdfFile/include/lexical_cast.h

-#ifndef _CPDOCCORE_LEXICALCAST_
-#define _CPDOCCORE_LEXICALCAST_
-
-#pragma warning(push)
-#pragma warning(disable : 4267) 
-#include <boost/lexical_cast.hpp>
-#pragma warning(pop)
-
-#endif
\ No newline at end of file

ASCOfficeOdfFile/include/logging.h

-#ifndef _CPDOCCORE_LOGGING_H_INCLUDED_
-#define _CPDOCCORE_LOGGING_H_INCLUDED_
+#pragma once
 
 #include <iosfwd>
 
@@ -49,10 +48,8 @@ extern logging< std::wostream > logging_cout;
 
 }
 
-#define _CP_LOG_error ::cpdoccore::logging_err
-#define _CP_LOG_info ::cpdoccore::logging_err
+#define _CP_LOG_error	::cpdoccore::logging_err
+#define _CP_LOG_info	::cpdoccore::logging_err
 #define _CP_LOG_warning ::cpdoccore::logging_err
 
 #define _CP_LOG(A) _CP_LOG_##A
-
-#endif
\ No newline at end of file

ASCOfficeOdfFile/include/regex.h

-#ifndef _CPDOCCORE_BOOST_REGEX_H_
-#define _CPDOCCORE_BOOST_REGEX_H_
-
-#pragma warning(push)
-#pragma warning(disable : 4267 )
-#pragma warning(disable : 4244 )
-#include <boost/regex.hpp>
-#pragma warning(pop)
-
-#endif

ASCOfficeOdfFile/src/common/CPColorUtils.cpp

-#include "precompiled_cpcommon.h"
-#include <cmath>
+
 #include <string>
 #include <boost/foreach.hpp>
+#include <cmath>
 
+#include <boost/optional.hpp>
+#include <boost/lexical_cast.hpp>
 
 namespace cpdoccore { 
 

ASCOfficeOdfFile/src/common/CPString.cpp

-#include "precompiled_cpcommon.h"
 
 #include "../../include/cpdoccore/CPString.h"
-#include <cstdlib>
 #include "../../../DesktopEditor/common/File.h"
 
 namespace cpdoccore {
 
 std::string ansi_to_utf8(const std::string & _AnsiString)
 {
-    //char * currentLocale = ::setlocale(LC_ALL, NULL);
-    //std::string currentLocaleStr = currentLocale;
-    //::setlocale(LC_ALL, "");
-    //size_t size = mbstowcs(NULL, _AnsiString.c_str(), 0);
-    //std::wstring utf16;
-    //utf16.resize(size);
-    //size = mbstowcs(&utf16[0], _AnsiString.c_str(), utf16.length());
-    //::setlocale(LC_ALL, currentLocaleStr.c_str());
-
-    //return boost::to_utf8(utf16);
-	return "";
+	std::wstring unicodeString(_AnsiString.begin(), _AnsiString.end());
+	return utf16_to_utf8(unicodeString);
 }
 
 std::wstring utf8_to_utf16(const std::string & _Utf8String)
 {
 	return NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)_Utf8String.c_str(), _Utf8String.length());
-    //return boost::from_utf8(_Utf8String);
 }
 
 std::string utf16_to_utf8(const std::wstring & _Utf16String)
 {
 	return NSFile::CUtf8Converter::GetUtf8StringFromUnicode(_Utf16String);
-    //return boost::to_utf8(_Utf16String);
 }
 
 }

ASCOfficeOdfFile/src/common/precompiled_cpcommon.cpp

-#include "precompiled_cpcommon.h"
\ No newline at end of file

ASCOfficeOdfFile/src/common/precompiled_cpcommon.h

-#pragma once
-#include <string>
-#include <map>
-
-#include <boost/optional.hpp>
-#include "../../include/lexical_cast.h"
-
-static float getDefaultDpi(){return 96;}

ASCOfficeOdfFile/src/common/readdocelement.cpp

-#include "precompiled_cpcommon.h"
 
 #include "../../include/cpdoccore/common/readdocelement.h"
 #include "../../include/cpdoccore/xml/attributes.h"
 #include "../../include/cpdoccore/xml/sax.h"
 
-#include <iostream>
-
 namespace cpdoccore { 
 namespace common {
 

ASCOfficeOdfFile/src/conversionelement.cpp

-#include "odf/precompiled_cpodf.h"
+#include <typeinfo>
+#include <iostream>
+
 #include "conversionelement.h"
 #include "logging.h"
 
@@ -7,7 +9,7 @@ namespace oox {
 
 void conversion_element::docx_convert(docx_conversion_context & Context) 
 {
-    _CP_LOG(info) << L"[warning] empty conversion_element::docx_convert: \"" << typeid(*this).name() << L"\"\n";
+	_CP_LOG(info) << L"[warning] empty conversion_element::docx_convert: \"" << typeid(*this).name() << L"\"\n";
 }
 
 void conversion_element::xlsx_convert(xlsx_conversion_context & Context)

ASCOfficeOdfFile/src/docx/docx_content_type.cpp

-#include "../odf/precompiled_cpodf.h"
-#include "docx_content_type.h"
-#include <cpdoccore/xml/attributes.h>
+
+
 #include <cpdoccore/xml/attributes.h>
+#include <cpdoccore/xml/simple_xml_writer.h>
+
 #include <boost/foreach.hpp>
+
+#include "docx_content_type.h"
 #include "namespaces.h"
-#include <cpdoccore/xml/simple_xml_writer.h>
 
 namespace cpdoccore { 
 namespace oox {

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

-#include "../odf/precompiled_cpodf.h"
-#include "docx_conversion_context.h"
+
+
 #include <boost/foreach.hpp>
+
 #include <iostream>
+
 #include <cpdoccore/xml/utils.h>
 #include <cpdoccore/odf/odf_document.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 
+#include "docx_conversion_context.h"
+
 #include "../odf/odfcontext.h"
 #include "../odf/style_text_properties.h"
 #include "../odf/style_graphic_properties.h"
@@ -132,7 +136,6 @@ oox_chart_context & docx_conversion_context::current_chart()
     }
     else
     {
-        CP_ASSERT(false);
         throw std::runtime_error("internal error");
     }
 }

ASCOfficeOdfFile/src/docx/docx_drawing.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "docx_drawing.h"
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include "../odf/datatypes/custom_shape_types_convert.h"

ASCOfficeOdfFile/src/docx/docx_package.cpp

-#include "../odf/precompiled_cpodf.h"
+
 
 #include "docx_package.h"
 #include "docx_conversion_context.h"

ASCOfficeOdfFile/src/docx/docx_rels.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "docx_rels.h"
 #include <cpdoccore/xml/attributes.h>
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/docx_rels.h

 #pragma once
 
 #include <string>
+#include <vector>
 #include <iosfwd>
 #include <cpdoccore/xml/xmlelement.h>
 #include <cpdoccore/CPSharedPtr.h>

ASCOfficeOdfFile/src/docx/docx_table_context.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "docx_conversion_context.h"
 #include "logging.h"
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/headers_footers.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "headers_footers.h"
 #include <boost/foreach.hpp>
+#include <boost/lexical_cast.hpp>
 
 namespace cpdoccore { 
 namespace oox {

ASCOfficeOdfFile/src/docx/hyperlinks.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "hyperlinks.h"
 #include "docx_rels.h"
 
 #include <boost/foreach.hpp>
+#include <boost/lexical_cast.hpp>
+
 #include <cpdoccore/xml/utils.h>
 
 namespace cpdoccore { 

ASCOfficeOdfFile/src/docx/measuredigits.cpp

-#include "../odf/precompiled_cpodf.h"
+
 
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501

ASCOfficeOdfFile/src/docx/mediaitems.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "mediaitems.h"
 
-#include <regex.h>
+#include <boost/regex.hpp>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
+#include <boost/lexical_cast.hpp>
 
 #include <cpdoccore/xml/utils.h>
 

ASCOfficeOdfFile/src/docx/mediaitems_utils.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "mediaitems_utils.h"
 
 #include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
+#include <boost/regex.hpp>
 
 #include "../../Common/DocxFormat/Source/Base/Base.h"
 #include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"

ASCOfficeOdfFile/src/docx/namespaces.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "namespaces.h"
 
 namespace cpdoccore { 

ASCOfficeOdfFile/src/docx/namespaces.h

-#ifndef _CPDOCCORE_DOCX_NAMESPACES_H_
-#define _CPDOCCORE_DOCX_NAMESPACES_H_
+#pragma once
+
+#include <string>
 
 namespace cpdoccore { 
 namespace oox {
 namespace xmlns {
 
-struct office_xmlns
-{
-    std::wstring ns;
-    std::wstring value;
-};
+	struct office_xmlns
+	{
+		std::wstring ns;
+		std::wstring value;
+	};
 
-extern const office_xmlns rels;
-extern const office_xmlns types;
+	extern const office_xmlns rels;
+	extern const office_xmlns types;
 
-extern const office_xmlns ve;
-extern const office_xmlns o;
-extern const office_xmlns r;
-extern const office_xmlns m;
-extern const office_xmlns v;
-extern const office_xmlns wp;
-extern const office_xmlns w10;
-extern const office_xmlns w;
-extern const office_xmlns wne;
+	extern const office_xmlns ve;
+	extern const office_xmlns o;
+	extern const office_xmlns r;
+	extern const office_xmlns m;
+	extern const office_xmlns v;
+	extern const office_xmlns wp;
+	extern const office_xmlns w10;
+	extern const office_xmlns w;
+	extern const office_xmlns wne;
 
 }
 }
 }
-
-#endif

ASCOfficeOdfFile/src/docx/oox_chart_axis.cpp

-#include "../odf/precompiled_cpodf.h"
+
 
 
 #include "oox_chart_axis.h"

ASCOfficeOdfFile/src/docx/oox_chart_context.cpp

-#include "../odf/precompiled_cpodf.h"
+
 
 #include <boost/foreach.hpp>
 #include <vector>

ASCOfficeOdfFile/src/docx/oox_chart_legend.cpp

-#include "../odf/precompiled_cpodf.h"
+
 
 #include <boost/foreach.hpp>
 #include <boost/functional.hpp>

ASCOfficeOdfFile/src/docx/oox_chart_series.cpp

-#include "../odf/precompiled_cpodf.h"
+
 
 #include <boost/foreach.hpp>
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/oox_chart_shape.cpp

-#include "../odf/precompiled_cpodf.h"
+
 
 #include <boost/foreach.hpp>
 #include <boost/functional.hpp>

ASCOfficeOdfFile/src/docx/oox_chart_shape.h

@@ -4,7 +4,7 @@
 #include <cpdoccore/CPOptional.h>
 #include <cpdoccore/CPScopedPtr.h>
 
-#include "..\odf\chart_objects.h"
+#include "../odf/chart_objects.h"
 #include "oox_drawing_fills.h"
             
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/oox_conversion_context.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "oox_conversion_context.h"
 
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/oox_conversion_context.h

 #pragma once
 
+#include <sstream>
 #include <iosfwd>
+
+#include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
 
@@ -34,15 +37,15 @@ public:
     void end_process_style();
 
 private:
-	const odf::style_instance *current_processed_style_;
-	std::wstring extern_node_;
-	std::wstring hlinkClick_;
-
-    std::wstringstream list_style_;
-    std::wstringstream text_style_;
-    std::wstringstream paragraph_nodes_;
-    std::wstringstream paragraph_attr_;
-    std::wstringstream table_style_;
+	const odf::style_instance *	current_processed_style_;
+	std::wstring				extern_node_;
+	std::wstring				hlinkClick_;
+
+    std::wstringstream			list_style_;
+    std::wstringstream			text_style_;
+    std::wstringstream			paragraph_nodes_;
+    std::wstringstream			paragraph_attr_;
+    std::wstringstream			table_style_;
 };
 
 

ASCOfficeOdfFile/src/docx/oox_data_labels.cpp

-#include "../odf/precompiled_cpodf.h"
+
 
 #include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/oox_data_labels.h

 #pragma once 
 
 #include <iosfwd>
+#include <boost/noncopyable.hpp>
+
 #include <cpdoccore/CPOptional.h>
 #include <cpdoccore/CPScopedPtr.h>
 

ASCOfficeOdfFile/src/docx/oox_drawing.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "oox_drawing.h"
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include "../odf/svg_parser.h"

ASCOfficeOdfFile/src/docx/oox_drawing_fills.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "oox_drawing_fills.h"
 
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/oox_layout.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "oox_layout.h"
 #include <boost/foreach.hpp>
 #include <boost/functional.hpp>
 #include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
-#include "..\odf\style_text_properties.h"
+#include "../odf/style_text_properties.h"
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/oox_package.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "oox_package.h"
 
 #include <boost/foreach.hpp>
+#include <boost/ref.hpp>
+
 #include <cpdoccore/utf8cpp/utf8.h>
 
 #include "mediaitems.h"

ASCOfficeOdfFile/src/docx/oox_plot_area.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "oox_plot_area.h"
 #include <boost/foreach.hpp>
 #include <boost/functional.hpp>

ASCOfficeOdfFile/src/docx/oox_title.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "oox_title.h"
 #include <boost/foreach.hpp>
 #include <boost/functional.hpp>

ASCOfficeOdfFile/src/docx/oox_types_chart.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "oox_types_chart.h"
 
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/pptx_comments.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "pptx_comments.h"
 #include <boost/foreach.hpp>
 #include <vector>

ASCOfficeOdfFile/src/docx/pptx_comments_context.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "pptx_comments_context.h"
 #include <boost/foreach.hpp>
 #include <iostream>

ASCOfficeOdfFile/src/docx/pptx_conversion_context.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "pptx_conversion_context.h"
 
 #include "pptx_package.h"
 
 #include <cpdoccore/odf/odf_document.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
-#include <cpdoccore/CPAssert.h>
 
 #include <iostream>
 
@@ -285,7 +284,6 @@ pptx_xml_slide & pptx_conversion_context::current_slide()
     }
     else
     {
-        CP_ASSERT(false);
         throw std::runtime_error("internal error");
     }
 }
@@ -297,7 +295,6 @@ pptx_xml_slideLayout & pptx_conversion_context::current_layout()
     }
     else
     {
-        CP_ASSERT(false);
         throw std::runtime_error("internal error");
     }
 }
@@ -309,7 +306,6 @@ pptx_xml_theme & pptx_conversion_context::current_theme()
     }
     else
     {
-        CP_ASSERT(false);
         throw std::runtime_error("internal error");
     }
 }
@@ -326,7 +322,6 @@ oox_chart_context & pptx_conversion_context::current_chart()
     }
     else
     {
-        CP_ASSERT(false);
         throw std::runtime_error("internal error");
     }
 }
@@ -338,7 +333,6 @@ pptx_xml_slideMaster & pptx_conversion_context::current_master()
     }
     else
     {
-        CP_ASSERT(false);
         throw std::runtime_error("internal error");
     }
 }

ASCOfficeOdfFile/src/docx/pptx_drawing.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "pptx_drawing.h"
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include "../odf/datatypes/custom_shape_types_convert.h"

ASCOfficeOdfFile/src/docx/pptx_drawings.cpp

-#include "../odf/precompiled_cpodf.h"
+
 
 #include <boost/foreach.hpp>
 #include <vector>

ASCOfficeOdfFile/src/docx/pptx_output_xml.cpp

-#include "../odf/precompiled_cpodf.h"
-
-#include "pptx_output_xml.h"
 #include <boost/make_shared.hpp>
 #include <boost/foreach.hpp>
+#include <boost/lexical_cast.hpp>
 
 #include <cpdoccore/xml/simple_xml_writer.h>
 
+#include "pptx_output_xml.h"
+
+
 namespace cpdoccore {
 namespace oox {
 

ASCOfficeOdfFile/src/docx/pptx_package.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "pptx_package.h"
 #include "pptx_output_xml.h"
 
 #include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
+#include <boost/ref.hpp>
 
 #include <cpdoccore/utf8cpp/utf8.h>
 

ASCOfficeOdfFile/src/docx/pptx_slide_context.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include <boost/foreach.hpp>
 #include <iostream>
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/pptx_table_context.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include <boost/foreach.hpp>
 #include <iostream>
 

ASCOfficeOdfFile/src/docx/pptx_text_context.cpp

-#include "../odf/precompiled_cpodf.h"
+
 
 #include "pptx_conversion_context.h"
 #include "pptx_text_context.h"

ASCOfficeOdfFile/src/docx/xlsx_alignment.cpp

 #pragma once
-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_alignment.h"
 #include <ostream>
 #include <boost/functional.hpp>

ASCOfficeOdfFile/src/docx/xlsx_border.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_border.h"
 #include <boost/foreach.hpp>
 #include <boost/functional.hpp>

ASCOfficeOdfFile/src/docx/xlsx_borders.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_borders.h"
 
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/xlsx_cell_format.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_cell_format.h"
 
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/xlsx_cell_format.h

-#ifndef _CPDOCCORE_XLSX_CELL_FORMAT_H_INCLUDED_
-#define _CPDOCCORE_XLSX_CELL_FORMAT_H_INCLUDED_
+#pragma once
 
 namespace cpdoccore {
 namespace oox {
@@ -31,4 +30,3 @@ private:
 }
 }
 
-#endif

ASCOfficeOdfFile/src/docx/xlsx_cell_style.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_cell_style.h"
 
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/xlsx_cell_styles.cpp

-#include "../odf/precompiled_cpodf.h"
+#include <vector>
+
+#include <boost/foreach.hpp>
+
+#include <cpdoccore/xml/simple_xml_writer.h>
+
 #include "xlsx_cell_styles.h"
 #include "xlsx_cell_style.h"
-#include <cpdoccore/xml/simple_xml_writer.h>
-#include <boost/foreach.hpp>
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/xlsx_color.cpp

-#include "../odf/precompiled_cpodf.h"
-#include "xlsx_font.h"
+
+#include <sstream>
+
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/functional.hpp>
-#include <sstream>
+#include <boost/functional/hash/hash.hpp>
+
+#include "xlsx_font.h"
+
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/xlsx_comments.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_comments.h"
 #include <boost/foreach.hpp>
 #include <vector>

ASCOfficeOdfFile/src/docx/xlsx_comments_context.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_comments_context.h"
 #include "xlsx_table_metrics.h"
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/xlsx_comments_context.h

 #pragma once
 
-
 #include <string>
 #include <boost/noncopyable.hpp>
 #include <cpdoccore/CPScopedPtr.h>

ASCOfficeOdfFile/src/docx/xlsx_complex_number_format.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_complex_number_format.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/xlsx_defined_names.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_defined_names.h"
 
 #include <vector>

ASCOfficeOdfFile/src/docx/xlsx_drawing.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_drawing.h"
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include <cpdoccore/xml/utils.h>

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include <boost/foreach.hpp>
 #include <iostream>
 #include "../formulasconvert/include/cpdoccore/formulasconvert.h"

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.h

 #pragma once
 
 #include <string>
-#include <boost/noncopyable.hpp>
+//#include <boost/noncopyable.hpp>
 #include <cpdoccore/CPScopedPtr.h>
 #include <cpdoccore/CPSharedPtr.h>
 

ASCOfficeOdfFile/src/docx/xlsx_drawings.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_drawings.h"
 #include "xlsx_drawing.h"
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/xlsx_drawings.h

 #pragma once
 
-#include <iosfwd>
+//#include <iosfwd>
 #include <cpdoccore/CPScopedPtr.h>
 #include <cpdoccore/CPSharedPtr.h>
 #include <cpdoccore/xml/attributes.h>

ASCOfficeOdfFile/src/docx/xlsx_fill.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_fill.h"
 
 #include <cpdoccore/xml/simple_xml_writer.h>
 
 #include <boost/foreach.hpp>
-#include <boost/functional.hpp>
+#include <boost/functional/hash/hash.hpp>
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/xlsx_fills.cpp

-#include "../odf/precompiled_cpodf.h"
+
 
 #include "xlsx_fill.h"
 #include "xlsx_fills.h"

ASCOfficeOdfFile/src/docx/xlsx_font.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_font.h"
 #include <boost/foreach.hpp>
 #include <boost/functional.hpp>

ASCOfficeOdfFile/src/docx/xlsx_fonts.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_font.h"
 #include "xlsx_fonts.h"
 #include <boost/foreach.hpp>
 #include <boost/functional.hpp>
 #include <boost/unordered_set.hpp>
 
-#include "..\odf\style_text_properties.h"
+#include "../odf/style_text_properties.h"
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/xlsx_fonts.h

-#ifndef _CPDOCCORE_XLSX_FONTS_H_30b72711
-#define _CPDOCCORE_XLSX_FONTS_H_30b72711
-
-#ifdef _MSC_VER
 #pragma once
-#endif
 
 #include <iosfwd>
 #include <cpdoccore/CPScopedPtr.h>
@@ -50,5 +45,3 @@ private:
 
 }
 }
-
-#endif

ASCOfficeOdfFile/src/docx/xlsx_hyperlinks.cpp

-#include "../odf/precompiled_cpodf.h"
-#include "xlsx_hyperlinks.h"
-#include <cpdoccore/xml/simple_xml_writer.h>
+
+#include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
-#include "docx_rels.h"
 
+#include <cpdoccore/xml/simple_xml_writer.h>
+
+#include "xlsx_hyperlinks.h"
+#include "docx_rels.h"
 #include "../formulasconvert/include/cpdoccore/formulasconvert.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/xlsx_hyperlinks.h

-#ifndef CPDOCCORE_XLSX_HYPERLINKS_H_
-#define CPDOCCORE_XLSX_HYPERLINKS_H_
+#pragma once
 
-#include <iosfwd>
 #include <cpdoccore/CPOptional.h>
 #include <cpdoccore/CPSharedPtr.h>
 #include <cpdoccore/CPNoncopyable.h>
@@ -31,5 +29,3 @@ private:
 
 }
 }
-
-#endif

ASCOfficeOdfFile/src/docx/xlsx_merge_cells.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_merge_cells.h"
 #include "xlsx_utils.h"
 #include <ostream>

ASCOfficeOdfFile/src/docx/xlsx_merge_cells.h

-#ifndef _CPDOCCORE_XLSX_MERGE_CELLS_H_b330fc6e
-#define _CPDOCCORE_XLSX_MERGE_CELLS_H_b330fc6e
-
-#ifdef _MSC_VER
 #pragma once
-#endif
 
-#include <iosfwd>
 #include <boost/noncopyable.hpp>
 #include <cpdoccore/CPScopedPtr.h>
 
@@ -29,5 +23,3 @@ private:
 
 }
 }
-
-#endif

ASCOfficeOdfFile/src/docx/xlsx_numFmts.cpp

-#include "../odf/precompiled_cpodf.h"
+#include <vector>
+
 #include "xlsx_numFmts.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/xlsx_numFmts.h

-#ifndef _CPDOCCORE_XLSX_NUM_FMTS_H_INCLUDED_
-#define _CPDOCCORE_XLSX_NUM_FMTS_H_INCLUDED_
+#pragma once
 
+#include <string>
 #include <iosfwd>
+
 #include <boost/noncopyable.hpp>
 #include <cpdoccore/CPScopedPtr.h>
 
@@ -26,4 +27,3 @@ private:
 }
 }
 
-#endif

ASCOfficeOdfFile/src/docx/xlsx_num_format_context.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_num_format_context.h"
 #include "xlsx_complex_number_format.h"
 #include <sstream>

ASCOfficeOdfFile/src/docx/xlsx_output_xml.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_output_xml.h"
 #include <boost/make_shared.hpp>
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/xlsx_package.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_package.h"
 
 #include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
+#include <boost/ref.hpp>
 
 #include <cpdoccore/utf8cpp/utf8.h>
 

ASCOfficeOdfFile/src/docx/xlsx_protection.cpp

-#include "../odf/precompiled_cpodf.h"
-#include "xlsx_protection.h"
+
 #include <ostream>
-#include <boost/functional.hpp>
+#include <boost/functional/hash/hash.hpp>
+
+#include "xlsx_protection.h"
 
 #pragma once
 

ASCOfficeOdfFile/src/docx/xlsx_protection.h

-#ifndef _CPDOCCORE_XLSX_PROTECTION_H_INCLUDED_
-#define _CPDOCCORE_XLSX_PROTECTION_H_INCLUDED_
 #pragma once
 
 #include <cpdoccore/CPOptional.h>
@@ -27,4 +25,3 @@ struct xlsx_protection
 }
 }
 
-#endif

ASCOfficeOdfFile/src/docx/xlsx_row_spanned.h

-#ifndef _CPDOCCORE_XLSX_ROW_SPANNED_H_INCLUDED_4e93cd8f
-#define _CPDOCCORE_XLSX_ROW_SPANNED_H_INCLUDED_4e93cd8f
-
-#ifdef _MSC_VER
 #pragma once
-#endif
 
 namespace cpdoccore {
 namespace oox {
@@ -40,5 +35,3 @@ private:
 
 }
 }
-
-#endif

ASCOfficeOdfFile/src/docx/xlsx_sharedstrings.cpp

-#include "../odf/precompiled_cpodf.h"
-#include "xlsx_sharedstrings.h"
+#include <vector>
+
 #include <boost/foreach.hpp>
+
 #include <cpdoccore/xml/utils.h>
 
+#include "xlsx_sharedstrings.h"
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/xlsx_sharedstrings.h

-#ifndef _CPDOCCORE_XLSX_SHARED_STRINGS_H_INCLUDED_
-#define _CPDOCCORE_XLSX_SHARED_STRINGS_H_INCLUDED_
+#pragma once
 
 #include <string>
 #include <iosfwd>
@@ -25,5 +24,3 @@ private:
 
 }
 }
-
-#endif

ASCOfficeOdfFile/src/docx/xlsx_styles.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include <boost/foreach.hpp>
-#include "..\odf\style_text_properties.h"
-#include "..\odf\style_paragraph_properties.h"
+#include "../odf/style_text_properties.h"
+#include "../odf/style_paragraph_properties.h"
 
 #include "xlsx_styles.h"
 #include "xlsx_fonts.h"

ASCOfficeOdfFile/src/docx/xlsx_table_metrics.cpp

-#include "../odf/precompiled_cpodf.h"
 #include "xlsx_table_metrics.h"
+
 #include <vector>
 #include <boost/foreach.hpp>
 

ASCOfficeOdfFile/src/docx/xlsx_table_metrics.h

-#ifndef CPDOCCORE_XLSX_TABLE_METRICS_H_
-#define CPDOCCORE_XLSX_TABLE_METRICS_H_
+#pragma once
 
 #include <boost/noncopyable.hpp>
 #include <cpdoccore/CPSharedPtr.h>
@@ -35,5 +34,3 @@ private:
 
 }
 }
-
-#endif

ASCOfficeOdfFile/src/docx/xlsx_table_position.h

-#ifndef CPDOCCORE_XLSX_TABLE_POSITION_
-#define CPDOCCORE_XLSX_TABLE_POSITION_
+#pragma once
 
 namespace cpdoccore {
 namespace oox {
@@ -15,5 +14,3 @@ struct xlsx_table_position
 
 }
 }
-
-#endif

ASCOfficeOdfFile/src/docx/xlsx_table_state.cpp

-#include "../odf/precompiled_cpodf.h"
 #include "xlsx_table_state.h"
+
 #include "logging.h"
 #include "xlsxconversioncontext.h"
 
@@ -8,10 +8,8 @@
 namespace cpdoccore {
 namespace oox {
 
-xlsx_table_state::xlsx_table_state(xlsx_conversion_context & Context,
-    const std::wstring & StyleName,
-    const std::wstring & tableName)
-     : context_(Context),
+xlsx_table_state::xlsx_table_state(xlsx_conversion_context & Context, const std::wstring & StyleName, const std::wstring & tableName)
+  : context_(Context),
     table_style_(StyleName),
     tableName_(tableName),
     current_table_column_(-1),
@@ -145,7 +143,9 @@ void xlsx_table_state::start_cell(size_t columnsSpanned, size_t rowsSpanned)
 }
 
 void xlsx_table_state::end_cell()
-{}
+{
+}
+
 
 void xlsx_table_state::set_current_cell_style_id(unsigned int xfId)
 {
@@ -240,8 +240,7 @@ void xlsx_table_state::serialize_table_format(std::wostream & _Wostream)
 		} 
 		CP_XML_NODE(L"sheetFormatPr")
 		{
-			double default_height=int (context_.getMaxDigitSize().second * 72. / getDefaultDpi() * 100.) /100.;//in point size.
-
+			double default_height = (context_.getMaxDigitSize().second * 72. / 96. * 100.) /100.;//in point size.
 			
 			//odf::style_instance * rowStyle = odfContext.styleContainer().style_by_name(styleName, odf::style_family::TableRow,false/*false*/);
 			//if (!rowStyle)
@@ -263,6 +262,7 @@ void xlsx_table_state::serialize_table_format(std::wostream & _Wostream)
 			//}
 
 			//CP_XML_ATTR(L"defaultColWidth", merges_.size());
+			
 			CP_XML_ATTR(L"defaultRowHeight",default_height);
 		}  
 	}

ASCOfficeOdfFile/src/docx/xlsx_table_state.h

-#ifndef _CPDOCCORE_XLSX_TABLE_STATE_d25a2929
-#define _CPDOCCORE_XLSX_TABLE_STATE_d25a2929
-
-#ifdef _MSC_VER
 #pragma once
-#endif
 
-#include <string>
 #include <vector>
+
 #include "xlsx_row_spanned.h"
 #include "xlsx_merge_cells.h"
 #include "xlsx_table_metrics.h"
@@ -105,4 +100,3 @@ private:
 }
 }
 
-#endif

ASCOfficeOdfFile/src/docx/xlsx_tablecontext.cpp

-#include "../odf/precompiled_cpodf.h"
+
 #include "xlsx_tablecontext.h"
 #include "xlsx_textcontext.h"
 #include "xlsxconversioncontext.h"