рефакторинг кода

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

ASCOfficeOdfFile/ASCOfficeOdfFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//187
-#define INTVER 1,0,1,187
-#define STRVER "1,0,1,187\0"
+//188
+#define INTVER 1,0,1,188
+#define STRVER "1,0,1,188\0"

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -9,7 +9,7 @@
 #include "../odf/odfcontext.h"
 #include "../odf/style_text_properties.h"
 #include "../odf/style_graphic_properties.h"
-#include "../odf/style_ref.h"
+#include "../odf/datatypes/style_ref.h"
 
 #include "docx_package.h"
 #include "docx_rels.h"

ASCOfficeOdfFile/src/docx/docx_conversion_context.h

 #pragma once
 
-#include "../odf/stylefamily.h"
-#include "../odf/length.h"
+#include "../odf/datatypes/stylefamily.h"
+#include "../odf/datatypes/length.h"
 #include <boost/unordered_map.hpp>
 #include <boost/shared_ptr.hpp>
 #include <list>
@@ -10,7 +10,7 @@
 #include "mediaitems.h"
 #include "headers_footers.h"
 #include "docx_table_context.h"
-#include "../odf/noteclass.h"
+#include "../odf/datatypes/noteclass.h"
 
 #include "oox_conversion_context.h"
 #include "oox_chart_context.h"

ASCOfficeOdfFile/src/docx/oox_drawing_fills.h

@@ -4,7 +4,7 @@
 #include <cpdoccore/CPOptional.h>
 #include <cpdoccore/CPSharedPtr.h>
 
-#include "../odf/lengthorpercent.h"
+#include "../odf/datatypes/lengthorpercent.h"
 
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/pptx_comments_context.cpp

@@ -2,7 +2,7 @@
 #include "pptx_comments_context.h"
 #include <boost/foreach.hpp>
 #include <iostream>
-#include "../odf/length.h"
+#include "../odf/datatypes/length.h"
 #include "xlsx_utils.h"
 
 //#include <cpdoccore/formulasconvert.h>

ASCOfficeOdfFile/src/docx/pptx_table_context.cpp

@@ -8,7 +8,7 @@
 #include "../odf/odfcontext.h"
 #include "../odf/draw_common.h"
 #include "../odf/calcs_styles.h"
-#include "../odf/borderstyle.h"
+#include "../odf/datatypes/borderstyle.h"
 
 #include "logging.h"
 

ASCOfficeOdfFile/src/docx/pptx_text_context.h

@@ -8,7 +8,7 @@
 #include <cpdoccore/xml/attributes.h>
 
 #include "oox_conversion_context.h"
-#include "../odf/stylefamily.h"
+#include "../odf/datatypes/stylefamily.h"
 
 namespace cpdoccore {
 namespace odf

ASCOfficeOdfFile/src/docx/xlsx_borders.cpp

@@ -7,8 +7,8 @@
 #include <cpdoccore/xml/simple_xml_writer.h>
 
 #include "xlsx_border.h"
-#include "../odf/length.h"
-#include "../odf/borderstyle.h"
+#include "../odf/datatypes/length.h"
+#include "../odf/datatypes/borderstyle.h"
 #include "../odf/style_table_properties.h"
 
 

ASCOfficeOdfFile/src/docx/xlsx_comments_context.cpp

@@ -3,7 +3,7 @@
 #include "xlsx_table_metrics.h"
 #include <boost/foreach.hpp>
 #include <iostream>
-#include "../odf/length.h"
+#include "../odf/datatypes/length.h"
 #include "xlsx_utils.h"
 
 //#include <cpdoccore/formulasconvert.h>

ASCOfficeOdfFile/src/docx/xlsxconversioncontext.cpp

@@ -2,7 +2,6 @@
 
 #include "xlsxconversioncontext.h"
 
-//#include "docx_package.h"
 #include "measuredigits.h"
 #include "xlsx_package.h"