.

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp

@@ -1747,8 +1747,8 @@ void odf_drawing_context::set_group_position(_CP_OPT(double) x, _CP_OPT(double)
 	impl_->current_group_->x = *change_x ;
 	impl_->current_group_->y = *change_y ; 
 
-	impl_->current_group_->shift_x = (*x - *change_x) ;
-	impl_->current_group_->shift_y = (*y - *change_y) ;
+	impl_->current_group_->shift_x = (*x /impl_->current_group_->scale_cx - *change_x) ;
+	impl_->current_group_->shift_y = (*y /impl_->current_group_->scale_cy - *change_y) ;
 }
 
 void odf_drawing_context::set_group_size( _CP_OPT(double) cx, _CP_OPT(double) cy, _CP_OPT(double) change_cx, _CP_OPT(double) change_cy)

ASCOfficeOdfFileW/source/OdfFormat/odf_text_context.cpp

@@ -154,13 +154,35 @@ void odf_text_context::add_text_content(const std::wstring & text)
 	std::wstring last = text.substr(pos);
 	if (last.length() > 0)current_level_.back().elm->add_text(last);
 }
+void odf_text_context::add_text_date(const std::wstring & text)
+{
+	office_element_ptr s_elm;
+	create_element(L"text", L"date", s_elm, odf_context_);
+	
+	text_date* s = dynamic_cast<text_date*>(s_elm.get());
+	if (s) s->add_text(text);
+
+	if (current_level_.size()>0)
+		current_level_.back().elm->add_child_element(s_elm);
+}
+void odf_text_context::add_text_page_number(const std::wstring & text)
+{
+	office_element_ptr s_elm;
+	create_element(L"text", L"page-number", s_elm, odf_context_);
+	
+	text_page_number* s = dynamic_cast<text_page_number*>(s_elm.get());
+	if (s) s->add_text(text);
+
+	if (current_level_.size()>0)
+		current_level_.back().elm->add_child_element(s_elm);
+}
 void odf_text_context::add_text_space(int count)
 {
 	office_element_ptr s_elm;
 	create_element(L"text", L"s", s_elm, odf_context_);
 
 	text_s* s = dynamic_cast<text_s*>(s_elm.get());
-	if (s)s->text_c_ = count;
+	if (s) s->text_c_ = count;
 
 	//необязательно хранить..
 	//int level = current_level_.size();

ASCOfficeOdfFileW/source/OdfFormat/odf_text_context.h

@@ -67,8 +67,10 @@ public:
 	
     void add_text_content	(const std::wstring & text);
 	void add_text_space		(int count);
-
-    void set_symbol_font	(const std::wstring & font);
+	void add_text_date		(const std::wstring & text);
+	void add_text_page_number(const std::wstring & text);
+    
+	void set_symbol_font	(const std::wstring & font);
  	void set_symbol_text	(int sym);
    
 	void start_paragraph	(bool styled = false);

ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp

@@ -1147,8 +1147,6 @@ void OoxConverter::convert_list_level(PPTX::Logic::TextParagraphPr	*oox_para_pro
 	}
 	if (bullet.is<PPTX::Logic::BuBlip>())
 	{
-		odf_list_type = 1000;
-
 		const PPTX::Logic::BuBlip & buBlip = bullet.as<PPTX::Logic::BuBlip>();
 		
 		std::wstring odf_ref;
@@ -1158,6 +1156,9 @@ void OoxConverter::convert_list_level(PPTX::Logic::TextParagraphPr	*oox_para_pro
 		{
 			std::wstring sID = buBlip.blip.embed->get();
 			std::wstring pathImage = find_link_by_id(sID, 1);
+
+			if (pathImage.empty())
+				pathImage = buBlip.blip.GetFullPicName(); // only for presentation merge shapes !!
 			
 			odf_ref = odf_context()->add_image(pathImage);
 		}
@@ -1167,8 +1168,18 @@ void OoxConverter::convert_list_level(PPTX::Logic::TextParagraphPr	*oox_para_pro
 			bEmbedded = false;
 		}
 		
-		odf_context()->styles_context()->lists_styles().start_style_level(level, odf_list_type );
-		odf_context()->styles_context()->lists_styles().set_bullet_image(odf_ref);
+		if (!odf_ref.empty())
+		{
+			odf_list_type = 1000;
+			odf_context()->styles_context()->lists_styles().start_style_level(level, odf_list_type );
+			odf_context()->styles_context()->lists_styles().set_bullet_image(odf_ref);
+		}
+		else
+		{
+			odf_list_type = 5;
+			odf_context()->styles_context()->lists_styles().start_style_level(level, odf_list_type );
+			odf_context()->styles_context()->lists_styles().set_bullet_char(L"\x2022");
+		}
 	}
 
 	//odf_writer::style_list_level_label_alignment	* aligment_props	= odf_context()->styles_context()->lists_styles().get_list_level_alignment_properties();
@@ -1177,7 +1188,7 @@ void OoxConverter::convert_list_level(PPTX::Logic::TextParagraphPr	*oox_para_pro
 	
 	convert(oox_para_props->defRPr.GetPointer(), text_properties);
 
-	if (oox_para_props->indent.IsInit())
+	if (oox_para_props->indent.IsInit() && level_props)
 	{
 		level_props->text_min_label_width_	= odf_types::length(- oox_para_props->indent.get() / 12700., odf_types::length::pt);
 		level_props->text_space_before_		= odf_types::length(1, odf_types::length::pt);
@@ -1204,7 +1215,7 @@ void OoxConverter::convert_list_level(PPTX::Logic::TextParagraphPr	*oox_para_pro
 		{		
 			int res = 0;
 			if ((res = hexColor.find(L"#")) < 0) hexColor = std::wstring(L"#") + hexColor;
-			text_properties->content_.fo_color_ = odf_types::color(hexColor);
+			if (text_properties) text_properties->content_.fo_color_ = odf_types::color(hexColor);
 		}
 	}
 //-----------------------------------
@@ -1295,7 +1306,7 @@ void OoxConverter::convert(PPTX::Logic::Paragraph *oox_paragraph, PPTX::Logic::T
 	bool		 list_present	= false;
 	std::wstring list_style_name;
 
-	int			 list_level		= -1;
+	int			 list_level		= 0;//-1;
 	
 	NSCommon::nullable<PPTX::Logic::TextParagraphPr> paraPr;
 
@@ -1346,7 +1357,6 @@ void OoxConverter::convert(PPTX::Logic::Paragraph *oox_paragraph, PPTX::Logic::T
 		if (odf_context()->drawing_context()->is_wordart())
 			odf_context()->drawing_context()->set_paragraph_properties(paragraph_properties);
 	}	
-	list_level++;
 
 	if (oox_paragraph->RunElems.empty() && list_present) list_present = false; // ms не обозначает присутствие списка, libra - показывает значек
 	
@@ -1363,21 +1373,18 @@ void OoxConverter::convert(PPTX::Logic::Paragraph *oox_paragraph, PPTX::Logic::T
 			odf_context()->text_context()->list_state_.style_name	= L"";
 		}
 
-		if (odf_context()->text_context()->list_state_.started_list == false)
+		if (list_local)
 		{
-			if (list_local)
-			{
-				_CP_OPT(bool) inStyles = odf_context()->drawing_context()->get_presentation();
+			_CP_OPT(bool) inStyles = odf_context()->drawing_context()->get_presentation();
 
-				odf_context()->styles_context()->lists_styles().start_style(inStyles && *inStyles);
-					convert_list_level(oox_paragraph->pPr.GetPointer(), list_level - 1);
-				odf_context()->styles_context()->lists_styles().end_style();
-		
-			}
-			list_style_name = odf_context()->styles_context()->lists_styles().get_style_name(); //last added
-			
-			//odf_context()->text_context()->start_list(list_style_name);
-		}
+			odf_context()->styles_context()->lists_styles().start_style(inStyles && *inStyles);
+				convert_list_level(oox_paragraph->pPr.GetPointer(), list_level /*- 1*/);
+			odf_context()->styles_context()->lists_styles().end_style();
+	
+		}		
+		list_style_name = odf_context()->styles_context()->lists_styles().get_style_name(); //last added
+
+		list_level++;
 
 		if (odf_context()->text_context()->list_state_.levels.size() < list_level)
 		{
@@ -1720,6 +1727,45 @@ void OoxConverter::convert(PPTX::Logic::Run *oox_run)
 void OoxConverter::convert(PPTX::Logic::Fld *oox_fld)
 {
 	if (!oox_fld) return;
+
+	bool styled = false;
+
+	if (oox_fld->rPr.IsInit())
+	{
+		odf_writer::style_text_properties * text_properties = odf_context()->text_context()->get_text_properties();
+		
+		if (!text_properties)
+		{
+			odf_context()->styles_context()->create_style(L"", odf_types::style_family::Text, true, false, -1);	
+			text_properties = odf_context()->styles_context()->last_state()->get_text_properties();
+			styled = true;
+		}
+		convert(oox_fld->rPr.GetPointer(), text_properties);
+	}
+	
+	odf_context()->text_context()->start_span(styled);	
+
+	std::wstring fld_type = oox_fld->type.get_value_or(L"");
+
+	if ((oox_fld->rPr.IsInit()) && (oox_fld->rPr->hlinkClick.IsInit()) && (oox_fld->rPr->hlinkClick->id.IsInit()))
+	{
+		std::wstring hlink = find_link_by_id(oox_fld->rPr->hlinkClick->id.get(), 2);
+		odf_context()->text_context()->add_hyperlink(hlink, oox_fld->GetText());
+
+	}
+	else if (fld_type == L"slidenum")
+	{
+		odf_context()->text_context()->add_text_page_number( oox_fld->GetText());
+	}
+	else if (fld_type == L"datetime1")
+	{
+		odf_context()->text_context()->add_text_date( oox_fld->GetText());
+	}
+	else
+	{
+		odf_context()->text_context()->add_text_content( oox_fld->GetText());
+	}
+	odf_context()->text_context()->end_span();
 }
 void OoxConverter::convert(PPTX::Logic::Br *oox_br)
 {
@@ -1756,7 +1802,7 @@ void OoxConverter::convert(PPTX::Logic::TextListStyle *oox_list_style)
 	odf_context()->styles_context()->lists_styles().start_style(inStyles && *inStyles);
 	for (int i = 0; i < 9; i++)
 	{
-		OoxConverter::convert_list_level(oox_list_style->levels[0].GetPointer(), i);
+		OoxConverter::convert_list_level(oox_list_style->levels[i].GetPointer(), i);
 	}
 	odf_context()->styles_context()->lists_styles().end_style();
 }

ASCOfficeOdfFileW/source/Oox2OdfConverter/PptxConverter.cpp

@@ -319,12 +319,15 @@ void PptxConverter::convert_slides()
 			if (pFind == m_mapMasters.end())
 			{
 				master_style_name = L"MasterPage";
-				if (bShowMasterSp)
-				{
-					if (slide->Master->cSld.attrName.IsInit())	master_style_name = slide->Master->cSld.attrName.get();
-					else if (current_theme->name.IsInit())		master_style_name = current_theme->name.get();
-				}	
+				
+				bool bShowLayoutMasterAnim	= slide->Layout->showMasterPhAnim.get_value_or(true);
+				bool bShowLayoutMasterSp	= slide->Layout->showMasterSp.get_value_or(true);
+				
+				if (slide->Master->cSld.attrName.IsInit())	master_style_name = slide->Master->cSld.attrName.get();
+				else if (current_theme->name.IsInit())		master_style_name = current_theme->name.get();
+
 				master_style_name += L"_" ;
+				
 				if (slide->Layout->cSld.attrName.IsInit())	master_style_name += slide->Layout->cSld.attrName.get();
 				else if (slide->Layout->attrType.IsInit())	master_style_name += slide->Layout->attrType->get();
 				else
@@ -334,14 +337,16 @@ void PptxConverter::convert_slides()
 					convert_common();
 
 					current_slide = slide->Master.operator->();
-					if (bShowMasterSp)
+					
+					if (bShowLayoutMasterSp && bShowMasterSp)
 						convert_slide(&slide->Master->cSld, current_txStyles, false);
 					else
 						convert(slide->Master->cSld.bg.GetPointer());
 
 					if (slide->Layout->clrMapOvr.IsInit() && slide->Layout->clrMapOvr->overrideClrMapping.IsInit())
 						current_clrMap	= slide->Layout->clrMapOvr->overrideClrMapping.GetPointer();
-					//current_slide = slide->Layout.operator->();
+					current_slide = slide->Layout.operator->();
+					
 					convert_slide(&slide->Layout->cSld, current_txStyles, true);		
 					//add note master
 				odp_context->end_master_slide();
@@ -949,58 +954,81 @@ void PptxConverter::convert_slide(PPTX::Logic::CSld *oox_slide, PPTX::Logic::TxS
 		odp_context->current_slide().set_page_name(oox_slide->attrName.get());
 
 	convert(oox_slide->bg.GetPointer());
+		
+	bool bMaster = *odf_context()->drawing_context()->get_presentation();
 
 	for (size_t i = 0 ; i < oox_slide->spTree.SpTreeElems.size(); i++)
 	{
 		smart_ptr<PPTX::WrapperWritingElement>	pElem = oox_slide->spTree.SpTreeElems[i].GetElem();
 		smart_ptr<PPTX::Logic::Shape>			pShape = pElem.smart_dynamic_cast<PPTX::Logic::Shape>();
 		
-		if (pShape.IsInit() && pShape->nvSpPr.nvPr.ph.is_init())
+		if (pShape.IsInit())
 		{
-			pShape->FillLevelUp();
-			
-			if (pShape->nvSpPr.nvPr.ph->type.IsInit())
-				odf_context()->drawing_context()->set_placeholder_type(pShape->nvSpPr.nvPr.ph->type->GetBYTECode());
-			else
-				odf_context()->drawing_context()->set_placeholder_type(0);
-
-			if (pShape->nvSpPr.nvPr.ph->idx.IsInit())
-				odf_context()->drawing_context()->set_placeholder_id(pShape->nvSpPr.nvPr.ph->idx.get());
-
-			if (!bPlaceholders)
-				continue;
-
-			PPTX::Logic::TextListStyle * listMasterStyle = NULL;
-			
-			if (txStyles)
+			if (pShape->nvSpPr.nvPr.ph.is_init())
 			{
-				std::wstring type = pShape->nvSpPr.nvPr.ph->type.get_value_or(_T("body"));
-				if ((type == L"title") || (type == L"ctrTitle"))
-					listMasterStyle = txStyles->titleStyle.GetPointer();
-				else if ((type == L"body") || (type == L"subTitle") || (type == L"obj"))
-					listMasterStyle = txStyles->bodyStyle.GetPointer();
-				else if (type != L"")
-					listMasterStyle = txStyles->otherStyle.GetPointer();
-			}
-			PPTX::Logic::Shape update_shape;
-			
-			if (listMasterStyle)
-			{
-				update_shape.txBody = new PPTX::Logic::TxBody();
+				pShape->FillLevelUp();
 				
-				PPTX::Logic::TextListStyle *newListStyle = new PPTX::Logic::TextListStyle();
-
-				for (int i = 0; i < 10; i++)
+				if (pShape->nvSpPr.nvPr.ph->type.IsInit())
 				{
-					if(listMasterStyle->levels[i].is_init())
-						listMasterStyle->levels[i]->Merge(newListStyle->levels[i]);
-				}
-				update_shape.txBody->lstStyle.reset(newListStyle);
-			}
-			
-			pShape->Merge(update_shape);
+					int ph_type = pShape->nvSpPr.nvPr.ph->type->GetBYTECode();
 
-			OoxConverter::convert(&update_shape);
+					if (!bMaster && (ph_type == 5 || ph_type == 6 || ph_type == 7 || ph_type == 12))
+						continue;
+
+					odf_context()->drawing_context()->set_placeholder_type(ph_type);
+				}
+				else
+					odf_context()->drawing_context()->set_placeholder_type(0);
+
+				if (pShape->nvSpPr.nvPr.ph->idx.IsInit())
+					odf_context()->drawing_context()->set_placeholder_id(pShape->nvSpPr.nvPr.ph->idx.get());
+
+				if (!bPlaceholders)
+					continue;
+
+				PPTX::Logic::TextListStyle * listMasterStyle = NULL;
+				
+				if (txStyles)
+				{
+					std::wstring type = pShape->nvSpPr.nvPr.ph->type.get_value_or(_T("body"));
+					if ((type == L"title") || (type == L"ctrTitle"))
+						listMasterStyle = txStyles->titleStyle.GetPointer();
+					else if ((type == L"body") || (type == L"subTitle") || (type == L"obj"))
+						listMasterStyle = txStyles->bodyStyle.GetPointer();
+					else if (type != L"")
+						listMasterStyle = txStyles->otherStyle.GetPointer();
+				}
+				PPTX::Logic::Shape update_shape;
+				
+				if (listMasterStyle)
+				{
+					update_shape.txBody = new PPTX::Logic::TxBody();
+					
+					PPTX::Logic::TextListStyle *newListStyle = new PPTX::Logic::TextListStyle();
+
+					for (int i = 0; i < 10; i++)
+					{
+						if(listMasterStyle->levels[i].is_init())
+							listMasterStyle->levels[i]->Merge(newListStyle->levels[i]);
+					}
+					update_shape.txBody->lstStyle.reset(newListStyle);
+				}
+				pShape->Merge(update_shape);
+				OoxConverter::convert(&update_shape);
+			}
+			else if (pShape->txBody.IsInit() && presentation->defaultTextStyle.IsInit())
+			{//default text style with master clrScheme
+				PPTX::Logic::Shape update_shape;
+				
+				update_shape.txBody = new PPTX::Logic::TxBody();
+
+				presentation->defaultTextStyle->Merge(update_shape.txBody->lstStyle);
+
+				pShape->Merge(update_shape);
+				OoxConverter::convert(&update_shape);
+			}
+			else
+				OoxConverter::convert(pShape.operator->());
 		}
 		else 
 		{