.....

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

ASCOfficeOdfFile/src/docx/oox_chart_series.cpp

@@ -5,7 +5,7 @@
 #include "../odf/style_text_properties.h"
 
 #include "oox_chart_series.h"
-#include "../formulasconvert/include/cpdoccore/formulasconvert.h"
+#include "../formulasconvert/formulasconvert.h"
 
 #include "oox_chart_shape.h"
 

ASCOfficeOdfFile/src/docx/xlsx_defined_names.cpp

@@ -7,7 +7,7 @@
 #include <boost/unordered_set.hpp>
 #include <cpdoccore/xml/simple_xml_writer.h>
 
-#include "../formulasconvert/include/cpdoccore/formulasconvert.h"
+#include "../formulasconvert/formulasconvert.h"
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.cpp

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

ASCOfficeOdfFile/src/docx/xlsx_hyperlinks.cpp

@@ -7,7 +7,7 @@
 
 #include "xlsx_hyperlinks.h"
 #include "docx_rels.h"
-#include "../formulasconvert/include/cpdoccore/formulasconvert.h"
+#include "../formulasconvert/formulasconvert.h"
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/odf/table_xlsx.cpp

@@ -5,22 +5,20 @@
 #include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/utils.h>
-
-#include "../formulasconvert/include/cpdoccore/formulasconvert.h"
+#include <cpdoccore/odf/odf_document.h>
+#include <cpdoccore/xml/simple_xml_writer.h>
 
 #include <boost/lexical_cast.hpp>
 
 #include "serialize_elements.h"
 #include "odfcontext.h"
-#include <cpdoccore/odf/odf_document.h>
 #include "calcs_styles.h"
+#include "search_table_cell.h"
+
 #include "../docx/xlsx_utils.h"
 #include "../docx/xlsx_cell_format.h"
+#include "../formulasconvert/formulasconvert.h"
 
-#include "../formulasconvert/include/cpdoccore/formulasconvert.h"
-#include "search_table_cell.h"
-
-#include <cpdoccore/xml/simple_xml_writer.h>
 
 namespace cpdoccore { 
 namespace odf {