diff --git a/ASCOfficeOdfFile/src/odf/datatypes/stylefamily.h b/ASCOfficeOdfFile/src/odf/datatypes/stylefamily.h
index 08b6010a98..b2ed6449ea 100644
--- a/ASCOfficeOdfFile/src/odf/datatypes/stylefamily.h
+++ b/ASCOfficeOdfFile/src/odf/datatypes/stylefamily.h
@@ -69,8 +69,9 @@ public:
MasterPage,
HandoutMaster,
LayerSet,
- PresentationPageLayout
- };
+ PresentationPageLayout,
+ LineNumbering
+ };
style_family() : type_(Default) {}
diff --git a/ASCOfficeOdfFile/win32/cpcommon.vcxproj b/ASCOfficeOdfFile/win32/cpcommon.vcxproj
index 653c19049e..857c809a91 100644
--- a/ASCOfficeOdfFile/win32/cpcommon.vcxproj
+++ b/ASCOfficeOdfFile/win32/cpcommon.vcxproj
@@ -75,6 +75,8 @@
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
+ $(VC_IncludePath);$(WindowsSDK_IncludePath);D:\_Work\core\Common\3dParty\boost\build\win_64\include;
+ $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;D:\_Work\core\Common\3dParty\boost\build\win_64\lib;
$(Configuration)\
diff --git a/ASCOfficeOdfFile/win32/formulasconvert.vcxproj b/ASCOfficeOdfFile/win32/formulasconvert.vcxproj
index 83f11e01a1..b79cbb3340 100644
--- a/ASCOfficeOdfFile/win32/formulasconvert.vcxproj
+++ b/ASCOfficeOdfFile/win32/formulasconvert.vcxproj
@@ -74,6 +74,8 @@
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
+ $(VC_IncludePath);$(WindowsSDK_IncludePath);D:\_Work\core\Common\3dParty\boost\build\win_64\include;
+ $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;D:\_Work\core\Common\3dParty\boost\build\win_64\lib;
$(Configuration)\
diff --git a/ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp b/ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp
index 5256e3b053..2c13a2fd14 100644
--- a/ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp
+++ b/ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp
@@ -2263,7 +2263,7 @@ std::wstring odf_drawing_context::add_marker_style(int type)
odf_writer::office_element_ptr marker_element;
odf_writer::create_element(L"draw",L"marker", marker_element, impl_->odf_context_);
- impl_->styles_context_->add_style(marker_element,false,true, style_family::Marker);
+ impl_->styles_context_->add_style(marker_element, false, true, style_family::Marker);
impl_->styles_context_->last_state()->set_name(str_types[type]);
draw_marker * marker = dynamic_cast(marker_element.get());
@@ -3161,7 +3161,6 @@ void odf_drawing_context::start_gradient_style()
odf_writer::office_element_ptr gradient_element;
odf_writer::create_element(L"draw",L"gradient", gradient_element, impl_->odf_context_);
- impl_->styles_context_->add_style(gradient_element,false,true, style_family::Gradient);
draw_gradient * gradient = dynamic_cast(gradient_element.get());
if (!gradient) return;
@@ -3187,6 +3186,7 @@ void odf_drawing_context::start_gradient_style()
impl_->current_graphic_properties->svg_stroke_width_ = length(length(1, length::pt).get_value_unit(length::cm), length::cm);//default
break;
}
+ impl_->styles_context_->add_style(gradient_element, false, true, style_family::Gradient);
}
void odf_drawing_context::set_gradient_type(gradient_style::type style)
{
@@ -3262,7 +3262,6 @@ void odf_drawing_context::start_opacity_style()
odf_writer::office_element_ptr opacity_element;
odf_writer::create_element(L"draw",L"opacity", opacity_element, impl_->odf_context_);
- impl_->styles_context_->add_style(opacity_element,false,true, style_family::Opacity);
draw_opacity * opacity = dynamic_cast(opacity_element.get());
if (!opacity) return;
@@ -3271,6 +3270,8 @@ void odf_drawing_context::start_opacity_style()
opacity->draw_display_name_ = std::wstring(L"User") + opacity->draw_name_.get() ;
impl_->current_graphic_properties->common_draw_fill_attlist_.draw_opacity_name_ = opacity->draw_name_;
+
+ impl_->styles_context_->add_style(opacity_element, false, true, style_family::Opacity);
}
void odf_drawing_context::set_opacity_start(double val)
{
@@ -3319,7 +3320,6 @@ void odf_drawing_context::start_hatch_style()
odf_writer::office_element_ptr hatch_element;
odf_writer::create_element(L"draw",L"hatch", hatch_element, impl_->odf_context_);
- impl_->styles_context_->add_style(hatch_element,false,true, style_family::Hatch);
draw_hatch * hatch = dynamic_cast(hatch_element.get());
if (!hatch) return;
@@ -3329,6 +3329,8 @@ void odf_drawing_context::start_hatch_style()
impl_->current_graphic_properties->common_draw_fill_attlist_.draw_fill_hatch_name_ = hatch->draw_name_;
impl_->current_graphic_properties->common_draw_fill_attlist_.draw_fill_ = draw_fill(draw_fill::hatch);
+
+ impl_->styles_context_->add_style(hatch_element, false, true, style_family::Hatch);
}
void odf_drawing_context::set_hatch_line_color(std::wstring hexColor)
{
@@ -3647,7 +3649,6 @@ void odf_drawing_context::start_bitmap_style()
odf_writer::office_element_ptr fill_image_element;
odf_writer::create_element(L"draw", L"fill-image", fill_image_element, impl_->odf_context_);
- impl_->styles_context_->add_style(fill_image_element, false, true, style_family::FillImage);
draw_fill_image * fill_image = dynamic_cast(fill_image_element.get());
if (!fill_image) return;
@@ -3661,6 +3662,8 @@ void odf_drawing_context::start_bitmap_style()
impl_->current_graphic_properties->common_draw_fill_attlist_.draw_fill_image_name_ = fill_image->draw_name_;
impl_->current_graphic_properties->common_draw_fill_attlist_.draw_fill_ = draw_fill(draw_fill::bitmap);
+ impl_->styles_context_->add_style(fill_image_element, false, true, style_family::FillImage);
+
set_image_style_repeat(0);
}
diff --git a/ASCOfficeOdfFileW/source/OdfFormat/odf_style_context.cpp b/ASCOfficeOdfFileW/source/OdfFormat/odf_style_context.cpp
index 41acbb7686..101a03ef85 100644
--- a/ASCOfficeOdfFileW/source/OdfFormat/odf_style_context.cpp
+++ b/ASCOfficeOdfFileW/source/OdfFormat/odf_style_context.cpp
@@ -391,6 +391,7 @@ std::wstring odf_style_context::get_name_family(style_family::type family)
case style_family::HandoutMaster: return L"Handout";
case style_family::LayerSet: return L"";//нету
case style_family::PresentationPageLayout: return L"AL";
+ case style_family::LineNumbering: return L"Line_20_numbering";
}
return L"UnknownStyle";
diff --git a/ASCOfficeOdfFileW/source/OdfFormat/styles.cpp b/ASCOfficeOdfFileW/source/OdfFormat/styles.cpp
index a893811870..6fb6deb710 100644
--- a/ASCOfficeOdfFileW/source/OdfFormat/styles.cpp
+++ b/ASCOfficeOdfFileW/source/OdfFormat/styles.cpp
@@ -860,6 +860,15 @@ void office_styles::add_child_element( const office_element_ptr & child)
case typeTableTemplate:
templates_.add_child_element(child);
break;
+ case typeTextOutlineStyle:
+ text_outline_style_ = child;
+ break;
+ case typeTextNotesConfiguration:
+ text_notes_configuration_.push_back(child);
+ break;
+ case typeTextLinenumberingConfiguration:
+ text_linenumbering_configuration_.push_back(child);
+ break;
//....
}
}
@@ -868,22 +877,34 @@ void office_styles::serialize(std::wostream & strm)
CP_XML_WRITER(strm)
{
CP_XML_NODE_SIMPLE()
- {
- for (size_t i = 0 ; i < style_default_style_.size(); i++)
+ {
+ for (size_t i = 0; i < style_default_style_.size(); i++)
{
style_default_style_[i]->serialize(CP_XML_STREAM());
}
-
+
draw_styles_.serialize(CP_XML_STREAM());
- for (size_t i = 0 ; i < style_presentation_page_layout_.size(); i++)
+ for (size_t i = 0; i < style_presentation_page_layout_.size(); i++)
{
style_presentation_page_layout_[i]->serialize(CP_XML_STREAM());
}
templates_.serialize(CP_XML_STREAM());
-
+
styles_.serialize(CP_XML_STREAM());
+
+ if (text_outline_style_)
+ text_outline_style_->serialize(CP_XML_STREAM());
+
+ for (size_t i = 0; i < text_notes_configuration_.size(); i++)
+ {
+ text_notes_configuration_[i]->serialize(CP_XML_STREAM());
+ }
+ for (size_t i = 0; i < text_linenumbering_configuration_.size(); i++)
+ {
+ text_linenumbering_configuration_[i]->serialize(CP_XML_STREAM());
+ }
}
}
}
@@ -1333,7 +1354,62 @@ void text_notes_configuration::create_child_element(const std::wstring & Ns, con
else
CP_NOT_APPLICABLE_ELM();
}
+// text:linenumbering-configuration
+//-------------------------------------------------------------------------------------------------------
+const wchar_t * text_linenumbering_configuration::ns = L"text";
+const wchar_t * text_linenumbering_configuration::name = L"linenumbering-configuration";
+void text_linenumbering_configuration::serialize(std::wostream & strm)
+{
+ CP_XML_WRITER(strm)
+ {
+ CP_XML_NODE_SIMPLE()
+ {
+ CP_XML_ATTR_OPT(L"text:style-name", text_style_name_);
+ if (false == text_number_lines_)
+ {
+ CP_XML_ATTR(L"text:number-lines", text_number_lines_);
+ }
+ CP_XML_ATTR_OPT(L"style:num-format", style_num_format_);
+ CP_XML_ATTR_OPT(L"style:num-letter-sync", style_num_letter_sync_);
+ CP_XML_ATTR_OPT(L"text:count-empty-lines", text_count_empty_lines_);
+ CP_XML_ATTR_OPT(L"text:count-in-text-boxes", text_count_in_text_boxes_);
+ CP_XML_ATTR_OPT(L"text:increment", text_increment_);
+ CP_XML_ATTR_OPT(L"text:number-position", text_number_position_); //inner, left, outer, right
+ CP_XML_ATTR_OPT(L"text:offset", text_offset_);
+ CP_XML_ATTR_OPT(L"text:restart-on-page", text_restart_on_page_);
+
+ if (text_linenumbering_separator_)
+ text_linenumbering_separator_->serialize(CP_XML_STREAM());
+ }
+ }
+}
+void text_linenumbering_configuration::create_child_element(const std::wstring & Ns, const std::wstring & Name)
+{
+ if CP_CHECK_NAME(L"text", L"linenumbering-separator")
+ CP_CREATE_ELEMENT(text_linenumbering_separator_);
+}
+
+// text:linenumbering-separator
+//-------------------------------------------------------------------------------------------------------
+const wchar_t * text_linenumbering_separator::ns = L"text";
+const wchar_t * text_linenumbering_separator::name = L"linenumbering-separator";
+
+void text_linenumbering_separator::serialize(std::wostream & strm)
+{
+ CP_XML_WRITER(strm)
+ {
+ CP_XML_NODE_SIMPLE()
+ {
+ CP_XML_ATTR_OPT(L"text:increment", text_increment_);
+
+ if (text_)
+ {
+ CP_XML_STREAM() << *text_;
+ }
+ }
+ }
+}
/// style:presentation-page-layout
//////////////////////////////////////////////////////////////////////////////////////////////////
const wchar_t * style_presentation_page_layout::ns = L"style";
diff --git a/ASCOfficeOdfFileW/source/OdfFormat/styles.h b/ASCOfficeOdfFileW/source/OdfFormat/styles.h
index 1f9b58c1c9..15d9bbe6a4 100644
--- a/ASCOfficeOdfFileW/source/OdfFormat/styles.h
+++ b/ASCOfficeOdfFileW/source/OdfFormat/styles.h
@@ -552,13 +552,12 @@ public:
office_element_ptr_array style_default_style_;
office_element_ptr_array style_presentation_page_layout_;
- office_element_ptr text_outline_style_; // < TODO
- office_element_ptr_array text_notes_configuration_; // < TODO
+ office_element_ptr text_outline_style_;
+ office_element_ptr_array text_notes_configuration_;
office_element_ptr text_bibliography_configuration_; // < TODO
- office_element_ptr text_linenumbering_configuration_; // < TODO
+ office_element_ptr_array text_linenumbering_configuration_;
};
-
CP_REGISTER_OFFICE_ELEMENT2(office_styles)
//----------------------------------------------------------------------------------------------------
@@ -841,9 +840,51 @@ public:
office_element_ptr text_note_continuation_notice_backward_;
};
-
CP_REGISTER_OFFICE_ELEMENT2(text_notes_configuration)
+//-------------------------------------------------------------------------------------------------------------------------
+class text_linenumbering_configuration : public office_element_impl
+{
+public:
+ static const wchar_t * ns;
+ static const wchar_t * name;
+ static const xml::NodeType xml_type = xml::typeElement;
+ static const ElementType type = typeTextLinenumberingConfiguration;
+ CPDOCCORE_DEFINE_VISITABLE();
+ virtual void create_child_element(const std::wstring & Ns, const std::wstring & Name);
+ virtual void serialize(std::wostream & strm);
+
+ bool text_number_lines_;
+ _CP_OPT(std::wstring) text_style_name_;
+ _CP_OPT(odf_types::style_numformat) style_num_format_;
+ _CP_OPT(std::wstring) style_num_letter_sync_;
+ _CP_OPT(odf_types::Bool) text_count_empty_lines_;
+ _CP_OPT(odf_types::Bool) text_count_in_text_boxes_;
+ _CP_OPT(unsigned int) text_increment_;
+ _CP_OPT(std::wstring) text_number_position_; //inner, left, outer, right
+ _CP_OPT(odf_types::length) text_offset_;
+ _CP_OPT(odf_types::Bool) text_restart_on_page_;
+
+ office_element_ptr text_linenumbering_separator_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(text_linenumbering_configuration);
+//-------------------------------------------------------------------------------------------------------------------------
+class text_linenumbering_separator : public office_element_impl
+{
+public:
+ static const wchar_t * ns;
+ static const wchar_t * name;
+ static const xml::NodeType xml_type = xml::typeElement;
+ static const ElementType type = typeTextLinenumberingSeparator;
+ CPDOCCORE_DEFINE_VISITABLE();
+
+ virtual void create_child_element(const std::wstring & Ns, const std::wstring & Name) {}
+ virtual void serialize(std::wostream & strm);
+
+ _CP_OPT(unsigned int) text_increment_;
+ _CP_OPT(std::wstring) text_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(text_linenumbering_separator);
//----------------------------------------------------------------------------------------------------
class style_presentation_page_layout;
typedef boost::shared_ptr style_presentation_page_layout_ptr;
diff --git a/ASCOfficeOdfFileW/source/OdfFormat/styles_list.cpp b/ASCOfficeOdfFileW/source/OdfFormat/styles_list.cpp
index 8683b1c50c..2cd874c2ce 100644
--- a/ASCOfficeOdfFileW/source/OdfFormat/styles_list.cpp
+++ b/ASCOfficeOdfFileW/source/OdfFormat/styles_list.cpp
@@ -324,5 +324,92 @@ void text_list_level_style_image::serialize(std::wostream & strm)
}
}
}
+// text:outline-style
+//////////////////////////////////////////////////////////////////////////////////////////////////
+const wchar_t * text_outline_style::ns = L"text";
+const wchar_t * text_outline_style::name = L"outline-style";
+
+void text_outline_style::serialize(std::wostream & strm)
+{
+ CP_XML_WRITER(strm)
+ {
+ CP_XML_NODE_SIMPLE()
+ {
+ CP_XML_ATTR(L"style:name", style_name_);
+
+ for (size_t i = 0; i < content_.size(); i++)
+ {
+ if (content_[i])
+ content_[i]->serialize(CP_XML_STREAM());
+ }
+ }
+ }
+}
+void text_outline_style::add_child_element(const office_element_ptr & child)
+{
+ ElementType type_ = child->get_type();
+
+ content_.push_back(child);
+}
+void text_outline_style::create_child_element(const std::wstring & Ns, const std::wstring & Name)
+{
+ if (L"text" == Ns && L"outline-level-style" == Name)
+ CP_CREATE_ELEMENT(content_);
+ else
+ {
+ CP_NOT_APPLICABLE_ELM();
+ }
+}
+// text:outline-level-style
+//////////////////////////////////////////////////////////////////////////////////////////////////
+const wchar_t * text_outline_level_style::ns = L"text";
+const wchar_t * text_outline_level_style::name = L"outline-level-style";
+
+void text_outline_level_style::serialize(std::wostream & strm)
+{
+ CP_XML_WRITER(strm)
+ {
+ CP_XML_NODE_SIMPLE()
+ {
+ common_num_format_attlist_.serialize(CP_GET_XML_NODE());
+ common_num_format_prefix_suffix_attlist_.serialize(CP_GET_XML_NODE());
+
+ CP_XML_ATTR(L"text:style-name", text_style_name_);
+ CP_XML_ATTR(L"text:display-levels", text_display_levels_);
+ CP_XML_ATTR(L"text:start-value", text_start_value_);
+ CP_XML_ATTR(L"text:level", text_level_);
+
+ if (list_level_properties_)
+ list_level_properties_->serialize(CP_XML_STREAM());
+
+ if (text_properties_)
+ text_properties_->serialize(CP_XML_STREAM());
+ }
+ }
+}
+
+void text_outline_level_style::create_child_element(const std::wstring & Ns, const std::wstring & Name)
+{
+ if (L"style" == Ns && L"list-level-properties" == Name)
+ CP_CREATE_ELEMENT(list_level_properties_);
+ else if (L"style" == Ns && L"text-properties" == Name)
+ CP_CREATE_ELEMENT(text_properties_);
+ else
+ {
+ CP_NOT_APPLICABLE_ELM();
+ }
+}
+void text_outline_level_style::add_child_element(const office_element_ptr & child)
+{
+ ElementType type_ = child->get_type();
+
+ if (type_ == typeStyleListLevelProperties)
+ list_level_properties_ = child;
+ else if (type_ == typeStyleTextProperties)
+ text_properties_ = child;
+ else
+ {
+ }
+}
}
}
diff --git a/ASCOfficeOdfFileW/source/OdfFormat/styles_list.h b/ASCOfficeOdfFileW/source/OdfFormat/styles_list.h
index f0c30b055c..ff16695672 100644
--- a/ASCOfficeOdfFileW/source/OdfFormat/styles_list.h
+++ b/ASCOfficeOdfFileW/source/OdfFormat/styles_list.h
@@ -269,7 +269,54 @@ public:
office_element_ptr style_text_properties_;
office_element_ptr style_list_level_properties_;
};
-
CP_REGISTER_OFFICE_ELEMENT2(text_list_level_style_image);
+// text:outline-style
+class text_outline_style : public office_element_impl
+{
+public:
+ static const wchar_t * ns;
+ static const wchar_t * name;
+ static const xml::NodeType xml_type = xml::typeElement;
+ static const ElementType type = typeTextOutlineStyle;
+ CPDOCCORE_DEFINE_VISITABLE();
+
+ virtual void create_child_element(const std::wstring & Ns, const std::wstring & Name);
+ virtual void add_child_element(const office_element_ptr & child);
+
+ virtual void serialize(std::wostream & strm);
+
+ std::wstring style_name_;
+ office_element_ptr_array content_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(text_outline_style);
+
+// text:outline-level-style
+class text_outline_level_style : public office_element_impl
+{
+public:
+ static const wchar_t * ns;
+ static const wchar_t * name;
+ static const xml::NodeType xml_type = xml::typeElement;
+ static const ElementType type = typeTextOutlineLevelStyle;
+ CPDOCCORE_DEFINE_VISITABLE();
+
+ virtual void create_child_element(const std::wstring & Ns, const std::wstring & Name);
+ virtual void add_child_element(const office_element_ptr & child);
+
+ virtual void serialize(std::wostream & strm);
+
+ std::wstring text_style_name_;
+ odf_types::common_num_format_attlist common_num_format_attlist_;
+ odf_types::common_num_format_prefix_suffix_attlist common_num_format_prefix_suffix_attlist_;
+
+ unsigned int text_level_;
+ unsigned int text_display_levels_;
+ unsigned int text_start_value_;
+
+ office_element_ptr list_level_properties_;
+ office_element_ptr text_properties_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(text_outline_level_style);
+
}
}
diff --git a/ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp b/ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp
index 06748ce3e7..355cedd660 100644
--- a/ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp
+++ b/ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp
@@ -63,7 +63,6 @@
#include "../OdfFormat/style_graphic_properties.h"
#include "../OdfFormat/styles_list.h"
-
using namespace cpdoccore;
std::vector current_font_size;
@@ -2052,8 +2051,43 @@ void DocxConverter::convert(OOX::Logic::CSectionProperty *oox_section_pr, bool b
//odt_context->set_master_page_name(odt_context->page_layout_context()->last_master() ?
// odt_context->page_layout_context()->last_master()->get_name() : L"");
}
+ if (oox_section_pr->m_oLnNumType.IsInit())
+ {//linenumbering-configuration один для всех секций и всех разметок страниц ((( - хуевый OpenOffice (также не начала нумерации)
+ //Ms Office тоже фуфло - нет нумерации алфавитами и римскими, нет разделителей
+ odf_writer::office_element_ptr lnNum_elm;
+ odf_writer::create_element(L"text", L"linenumbering-configuration", lnNum_elm, odf_context());
-//--------------------------------------------------------------------------------------------------------------------------------------------
+ odf_writer::text_linenumbering_configuration *linenumbering = dynamic_cast(lnNum_elm.get());
+ if (!linenumbering) return;
+
+ linenumbering->text_style_name_ = odt_context->styles_context()->find_free_name(style_family::LineNumbering);
+ linenumbering->text_number_lines_ = true;
+
+ if (oox_section_pr->m_oLnNumType->m_oCountBy.IsInit())
+ {
+ linenumbering->text_increment_ = oox_section_pr->m_oLnNumType->m_oCountBy->GetValue();
+ }
+ if (oox_section_pr->m_oLnNumType->m_oDistance.IsInit())
+ {
+ linenumbering->text_offset_ = odf_types::length(oox_section_pr->m_oLnNumType->m_oDistance->ToPoints(), odf_types::length::pt);
+ }
+ if (oox_section_pr->m_oLnNumType->m_oRestart.IsInit())
+ {
+ if (oox_section_pr->m_oLnNumType->m_oRestart->GetValue() == SimpleTypes::linenumberrestartNewPage)
+ {
+ linenumbering->text_restart_on_page_ = true;
+ }
+ else
+ {
+ }
+ }
+ if (oox_section_pr->m_oLnNumType->m_oStart.IsInit())
+ {
+ }
+ odt_context->styles_context()->add_style(lnNum_elm, false, true, style_family::LineNumbering);
+
+ }
+//------------------------------------------------------------------------------------------------------------------------------------------
// то что относится собственно к секциям-разделам
//nullable > m_oBidi;
@@ -2062,7 +2096,6 @@ void DocxConverter::convert(OOX::Logic::CSectionProperty *oox_section_pr, bool b
//nullable m_oFootnotePr;
//nullable > m_oFormProt;
- //nullable m_oLnNumType;
//nullable > m_oNoEndnote;
//nullable m_oPaperSrc;
diff --git a/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj b/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj
index bc07ce3a20..537bebf2f3 100644
--- a/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj
+++ b/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcxproj
@@ -78,6 +78,8 @@
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
+ $(VC_IncludePath);$(WindowsSDK_IncludePath);D:\_Work\core\Common\3dParty\boost\build\win_64\include;
+ $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;D:\_Work\core\Common\3dParty\boost\build\win_64\lib;
$(Configuration)\
@@ -113,7 +115,7 @@
Disabled
..\..\DesktopEditor\freetype-2.5.2\include;%(AdditionalIncludeDirectories)
- _DEBUG;_LIB;_USE_MATH_DEFINES;NODOCX;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;_AVS_PPT_SHAPE_INCLUDE_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;BUILD_CONFIG_FULL_VERSION;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions)
+ _DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions)
true
EnableFastChecks
MultiThreadedDebugDLL
@@ -169,6 +171,7 @@
Disabled
/bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
/bigobj %(AdditionalOptions)
diff --git a/Common/3dParty/cryptopp/cryptlib.vcxproj b/Common/3dParty/cryptopp/cryptlib.vcxproj
index f9abab33fe..550b86904f 100644
--- a/Common/3dParty/cryptopp/cryptlib.vcxproj
+++ b/Common/3dParty/cryptopp/cryptlib.vcxproj
@@ -287,7 +287,8 @@
true
_DEBUG;_WINDOWS;USE_PRECOMPILED_HEADERS;WIN32;%(PreprocessorDefinitions)
MultiThreadedDebugDLL
- Use
+
+
pch.h
$(OutDir)vc80.pdb
Level4
diff --git a/Common/DocxFormat/Projects/DocxFormatLib.vcxproj b/Common/DocxFormat/Projects/DocxFormatLib.vcxproj
index df8a3ae7e1..0740c2e43d 100644
--- a/Common/DocxFormat/Projects/DocxFormatLib.vcxproj
+++ b/Common/DocxFormat/Projects/DocxFormatLib.vcxproj
@@ -102,6 +102,8 @@
$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
+ $(VC_IncludePath);$(WindowsSDK_IncludePath);D:\_Work\core\Common\3dParty\boost\build\win_64\include;
+ $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;D:\_Work\core\Common\3dParty\boost\build\win_64\lib;
$(Configuration)\
@@ -145,7 +147,7 @@
Disabled
- _USE_LIBXML2_READER_;LIBXML_READER_ENABLED;%(PreprocessorDefinitions)
+ _USE_LIBXML2_READER_;LIBXML_READER_ENABLED;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions)
true
EnableFastChecks
MultiThreadedDebugDLL
@@ -439,7 +441,9 @@
/bigobj %(AdditionalOptions)
-
+
+ /bigbj %(AdditionalOptions)
+
/bigobj %(AdditionalOptions)
@@ -581,6 +585,7 @@
/bigobj %(AdditionalOptions)
+ /bigobj %(AdditionalOptions)
diff --git a/OfficeCryptReader/win32/ECMACryptReader.vcxproj b/OfficeCryptReader/win32/ECMACryptReader.vcxproj
index 497a03b5ec..80a00823b3 100644
--- a/OfficeCryptReader/win32/ECMACryptReader.vcxproj
+++ b/OfficeCryptReader/win32/ECMACryptReader.vcxproj
@@ -75,6 +75,8 @@
$(SolutionDir)$(Platform)\$(Configuration)\
$(Platform)\$(Configuration)\
+ $(VC_IncludePath);$(WindowsSDK_IncludePath);D:\_Work\core\Common\3dParty\boost\build\win_64\include;
+ $(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;D:\_Work\core\Common\3dParty\boost\build\win_64\lib;
$(SolutionDir)$(Configuration)\
@@ -105,7 +107,7 @@
Disabled
- WIN32;_DEBUG;_LIB;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;DONT_WRITE_EMBEDDED_FONTS;%(PreprocessorDefinitions)
true
EnableFastChecks
MultiThreadedDebugDLL