x2t - fix bugs after testing

ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp

@@ -1457,12 +1457,12 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
 			Context.set_run_state(false);	
 			Context.set_paragraph_state(false);	
 			
-			if (!Context.get_drawing_context().in_group())
+			if (!Context.get_drawing_context().in_group() && !runState)
 				Context.add_new_run(_T(""));
 			
 			docx_serialize(Context.output_stream(), drawing, Context.get_drawing_state_content());
 			
-			if (!Context.get_drawing_context().in_group())
+			if (!Context.get_drawing_context().in_group() && !runState)
 				Context.finish_run();
 			
 			Context.set_run_state(runState);

ASCOfficeRtfFile/RtfFormatLib/source/RtfParagraph.h

@@ -169,6 +169,8 @@ public:
 
 			sResult += _T("<w:p>");
 			sResult += _T("<w:pPr>");
+			
+			m_oProperty.m_bOldList = (NULL != m_oOldList);
 			sResult += m_oProperty.RenderToOOX(oRenderParameter);
 
 			if( NULL != m_oOldList )

ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.cpp

@@ -1666,8 +1666,11 @@ CString RtfFrame::RenderToOOX(RenderParameter oRenderParameter)
 	else if( PROP_DEF != m_nAllSpace )	sFrame.AppendFormat( _T(" w:vSpace=\"%d\""), m_nAllSpace );
 
 	if( !sFrame.IsEmpty() )
+	{
 		sResult = _T("<w:framePr ") + sFrame + _T("/>");
 
+		sResult += _T("<w:widowControl w:val=\"0\"/>");
+	}
 	return sResult;
 }
 CString RtfParagraphProperty::RenderToRtf(RenderParameter oRenderParameter)
@@ -1922,10 +1925,13 @@ CString RtfParagraphProperty::RenderToOOX(RenderParameter oRenderParameter)
 		if( m_nIndFirstLine >= 0 )	sIndent.AppendFormat( _T(" w:firstLine=\"%d\""), m_nIndFirstLine );
 		else						sIndent.AppendFormat( _T(" w:hanging=\"%d\""), -m_nIndFirstLine );
 	}
-	RENDER_OOX_INT_ATTRIBUTE( m_nIndLeft, sIndent, _T("w:left") );
-	RENDER_OOX_INT_ATTRIBUTE( m_nIndRight, sIndent, _T("w:right") );
-	//RENDER_OOX_INT_ATTRIBUTE( m_nIndStart, sIndent, _T("w:start") );
-	//RENDER_OOX_INT_ATTRIBUTE( m_nIndEnd, sIndent, _T("w:end") );
+	else if (m_bOldList && PROP_DEF != m_nIndLeft)
+		sIndent.AppendFormat( _T(" w:firstLine=\"%d\""), 0 );
+
+	RENDER_OOX_INT_ATTRIBUTE	( m_nIndLeft,	sIndent, _T("w:left") );
+	RENDER_OOX_INT_ATTRIBUTE	( m_nIndRight,	sIndent, _T("w:right") );
+	//RENDER_OOX_INT_ATTRIBUTE	( m_nIndStart,	sIndent, _T("w:start") );
+	//RENDER_OOX_INT_ATTRIBUTE	( m_nIndEnd,	sIndent, _T("w:end") );
 	
 	if( !sIndent.IsEmpty() )
 	{

DesktopEditor/common/Directory.h

@@ -220,7 +220,11 @@ namespace NSDirectory
     static CArray<std::wstring> GetFiles(std::wstring strDirectory, bool bIsRecursion = false)
 	{
 		CArray<std::wstring> oArray;
-        GetFiles2(strDirectory, oArray, bIsRecursion);
+		
+		if (!strDirectory.empty())
+		{     
+			GetFiles2(strDirectory, oArray, bIsRecursion);
+		}
 		return oArray;
 	}