Rtf->Docx finish

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

.gitattributes

@@ -365,7 +365,9 @@ ASCOfficePPTXFile/PPTXLib/Mac/PPTXFormatLib.xcodeproj/project.xcworkspace/xcuser
 ASCOfficePPTXFile/PPTXLib/Mac/PPTXFormatLib.xcodeproj/xcuserdata svnc_tsvn_003alogminsize=5
 ASCOfficePPTXFile/PPTXLib/Mac/PPTXFormatLib.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad svnc_tsvn_003alogminsize=5
 ASCOfficePPTXFile/PPTXLib/Mac/PPTXFormatLib.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad/xcschemes svnc_tsvn_003alogminsize=5
+ASCOfficeRtfFile/Linux svnc_tsvn_003alogminsize=5
 ASCOfficeRtfFile/RtfFormatLib svnc_tsvn_003alogminsize=5
+ASCOfficeRtfFile/RtfFormatLib/Linux svnc_tsvn_003alogminsize=5
 ASCOfficeRtfFile/RtfFormatLib/Win32 svnc_tsvn_003alogminsize=5
 ASCOfficeRtfFile/RtfFormatLib/source svnc_tsvn_003alogminsize=5
 ASCOfficeRtfFile/RtfFormatLib/source/Reader svnc_tsvn_003alogminsize=5

ASCOfficeRtfFile/Resource/app.xml

-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"><TotalTime>1</TotalTime><DocSecurity>0</DocSecurity><ScaleCrop>false</ScaleCrop><Company>none</Company><LinksUpToDate>false</LinksUpToDate><SharedDoc>false</SharedDoc><HyperlinksChanged>false</HyperlinksChanged></Properties>
\ No newline at end of file

ASCOfficeRtfFile/Resource/core.xml

-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><dc:title></dc:title><dc:subject></dc:subject><cp:keywords></cp:keywords><dc:description></dc:description><cp:revision>1</cp:revision></cp:coreProperties>
\ No newline at end of file

ASCOfficeRtfFile/Resource/fontTable.xml

-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:fonts xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:font w:name="Calibri"><w:panose1 w:val="020F0502020204030204"/><w:charset w:val="CC"/><w:family w:val="swiss"/><w:pitch w:val="variable"/><w:sig w:usb0="A00002EF" w:usb1="4000207B" w:usb2="00000000" w:usb3="00000000" w:csb0="0000009F" w:csb1="00000000"/></w:font><w:font w:name="Times New Roman"><w:panose1 w:val="02020603050405020304"/><w:charset w:val="CC"/><w:family w:val="roman"/><w:pitch w:val="variable"/><w:sig w:usb0="20002A87" w:usb1="80000000" w:usb2="00000008" w:usb3="00000000" w:csb0="000001FF" w:csb1="00000000"/></w:font><w:font w:name="Cambria"><w:panose1 w:val="02040503050406030204"/><w:charset w:val="CC"/><w:family w:val="roman"/><w:pitch w:val="variable"/><w:sig w:usb0="A00002EF" w:usb1="4000004B" w:usb2="00000000" w:usb3="00000000" w:csb0="0000009F" w:csb1="00000000"/></w:font></w:fonts>
\ No newline at end of file

ASCOfficeRtfFile/Resource/settings.xml

-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:settings xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main"><w:zoom w:val="bestFit" w:percent="151"/><w:defaultTabStop w:val="708"/><w:characterSpacingControl w:val="doNotCompress"/><w:compat/><m:mathPr><m:mathFont m:val="Cambria Math"/><m:brkBin m:val="before"/><m:brkBinSub m:val="--"/><m:smallFrac m:val="off"/><m:dispDef/><m:lMargin m:val="0"/><m:rMargin m:val="0"/><m:defJc m:val="centerGroup"/><m:wrapIndent m:val="1440"/><m:intLim m:val="subSup"/><m:naryLim m:val="undOvr"/></m:mathPr><w:themeFontLang w:val="ru-RU"/><w:clrSchemeMapping w:bg1="light1" w:t1="dark1" w:bg2="light2" w:t2="dark2" w:accent1="accent1" w:accent2="accent2" w:accent3="accent3" w:accent4="accent4" w:accent5="accent5" w:accent6="accent6" w:hyperlink="hyperlink" w:followedHyperlink="followedHyperlink"/><w:shapeDefaults><o:shapedefaults v:ext="edit" spidmax="2050"/><o:shapelayout v:ext="edit"><o:idmap v:ext="edit" data="1"/></o:shapelayout></w:shapeDefaults><w:decimalSymbol w:val=","/><w:listSeparator w:val=";"/></w:settings>
\ No newline at end of file

ASCOfficeRtfFile/Resource/theme1.xml

-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme"><a:themeElements><a:clrScheme name="Office"><a:dk1><a:sysClr val="windowText" lastClr="000000"/></a:dk1><a:lt1><a:sysClr val="window" lastClr="FFFFFF"/></a:lt1><a:dk2><a:srgbClr val="1F497D" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="" xmlns:a14="http://schemas.microsoft.com/office/drawing/2007/7/7/main"/></a:dk2><a:lt2><a:srgbClr val="EEECE1" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="" xmlns:a14="http://schemas.microsoft.com/office/drawing/2007/7/7/main"/></a:lt2><a:accent1><a:srgbClr val="4F81BD" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="" xmlns:a14="http://schemas.microsoft.com/office/drawing/2007/7/7/main"/></a:accent1><a:accent2><a:srgbClr val="C0504D" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="" xmlns:a14="http://schemas.microsoft.com/office/drawing/2007/7/7/main"/></a:accent2><a:accent3><a:srgbClr val="9BBB59" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="" xmlns:a14="http://schemas.microsoft.com/office/drawing/2007/7/7/main"/></a:accent3><a:accent4><a:srgbClr val="8064A2" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="" xmlns:a14="http://schemas.microsoft.com/office/drawing/2007/7/7/main"/></a:accent4><a:accent5><a:srgbClr val="4BACC6" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="" xmlns:a14="http://schemas.microsoft.com/office/drawing/2007/7/7/main"/></a:accent5><a:accent6><a:srgbClr val="F79646" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="" xmlns:a14="http://schemas.microsoft.com/office/drawing/2007/7/7/main"/></a:accent6><a:hlink><a:srgbClr val="0000FF" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="" xmlns:a14="http://schemas.microsoft.com/office/drawing/2007/7/7/main"/></a:hlink><a:folHlink><a:srgbClr val="800080" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="" xmlns:a14="http://schemas.microsoft.com/office/drawing/2007/7/7/main"/></a:folHlink></a:clrScheme><a:fontScheme name="Office"><a:majorFont><a:latin typeface="Cambria"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="ＭＳ ゴシック"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="宋体"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Times New Roman"/><a:font script="Hebr" typeface="Times New Roman"/><a:font script="Thai" typeface="Angsana New"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="MoolBoran"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Times New Roman"/><a:font script="Uigh" typeface="Microsoft Uighur"/></a:majorFont><a:minorFont><a:latin typeface="Calibri"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="ＭＳ 明朝"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="宋体"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Arial"/><a:font script="Hebr" typeface="Arial"/><a:font script="Thai" typeface="Cordia New"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="DaunPenh"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Arial"/><a:font script="Uigh" typeface="Microsoft Uighur"/></a:minorFont></a:fontScheme><a:fmtScheme name="Office"><a:fillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="50000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="35000"><a:schemeClr val="phClr"><a:tint val="37000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:tint val="15000"/><a:satMod val="350000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="16200000" scaled="1"/></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:shade val="51000"/><a:satMod val="130000"/></a:schemeClr></a:gs><a:gs pos="80000"><a:schemeClr val="phClr"><a:shade val="93000"/><a:satMod val="130000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="94000"/><a:satMod val="135000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="16200000" scaled="0"/></a:gradFill></a:fillStyleLst><a:lnStyleLst><a:ln w="9525" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"><a:shade val="95000"/><a:satMod val="105000"/></a:schemeClr></a:solidFill><a:prstDash val="solid"/></a:ln><a:ln w="25400" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln><a:ln w="38100" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="20000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="" xmlns:a14="http://schemas.microsoft.com/office/drawing/2007/7/7/main"><a:alpha val="38000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="" xmlns:a14="http://schemas.microsoft.com/office/drawing/2007/7/7/main"><a:alpha val="35000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="" xmlns:a14="http://schemas.microsoft.com/office/drawing/2007/7/7/main"><a:alpha val="35000"/></a:srgbClr></a:outerShdw></a:effectLst><a:scene3d><a:camera prst="orthographicFront"><a:rot lat="0" lon="0" rev="0"/></a:camera><a:lightRig rig="threePt" dir="t"><a:rot lat="0" lon="0" rev="1200000"/></a:lightRig></a:scene3d><a:sp3d><a:bevelT w="63500" h="25400"/></a:sp3d></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="40000"/><a:satMod val="350000"/></a:schemeClr></a:gs><a:gs pos="40000"><a:schemeClr val="phClr"><a:tint val="45000"/><a:shade val="99000"/><a:satMod val="350000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="20000"/><a:satMod val="255000"/></a:schemeClr></a:gs></a:gsLst><a:path path="circle"><a:fillToRect l="50000" t="-80000" r="50000" b="180000"/></a:path></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="80000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="30000"/><a:satMod val="200000"/></a:schemeClr></a:gs></a:gsLst><a:path path="circle"><a:fillToRect l="50000" t="50000" r="50000" b="50000"/></a:path></a:gradFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults/><a:extraClrSchemeLst/></a:theme>
\ No newline at end of file

ASCOfficeRtfFile/Resource/webSettings.xml

-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:webSettings xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"><w:optimizeForBrowser/></w:webSettings>
\ No newline at end of file

ASCOfficeRtfFile/RtfFormatLib/source/RtfOle.cpp

@@ -59,7 +59,9 @@ CString RtfOle::RenderToOOXOnlyOle(RenderParameter oRenderParameter)
 	CString sFilenameFull = poOOXWriter->m_sTargetFolder + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR + _T("embeddings");
 	
 	FileSystem::Directory::CreateDirectory( sFilenameFull );
+	
 	sFilenameFull += FILE_SEPARATOR_STR + sFilenameRels;
+	sFilenameRels = _T("embeddings/") + sFilenameRels;
 
 	Utils::CopyDirOrFile( m_sOleFilename, sFilenameFull );
 

ASCOfficeRtfFile/RtfFormatLib/source/RtfPicture.cpp

@@ -111,7 +111,9 @@ CString RtfPicture::RenderToOOX(RenderParameter oRenderParameter)
 	CString sFilenameFull = poOOXWriter->m_sTargetFolder + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR +_T("media");
 	
 	FileSystem::Directory::CreateDirectory( sFilenameFull );
+	
 	sFilenameFull += FILE_SEPARATOR_STR + sFilenameRels;
+	sFilenameRels = _T("media/") + sFilenameRels;
 
 	if( m_sPicFilename != sFilenameFull )
 		Utils::CopyDirOrFile( m_sPicFilename, sFilenameFull );

ASCOfficeRtfFile/RtfFormatLib/source/Writer/OOXDocumentWriter.h

@@ -54,10 +54,10 @@ public:
 		else
 		{
 			RenderParameter oNewParam;
-			oNewParam.poDocument = &m_oDocument;
-			oNewParam.poWriter = &m_oWriter;
-			oNewParam.poRels = &m_oWriter.m_oDocRels;
-			oNewParam.nType = RENDER_TO_OOX_PARAM_UNKNOWN;
+			oNewParam.poDocument	= &m_oDocument;
+			oNewParam.poWriter		= &m_oWriter;
+			oNewParam.poRels		= &m_oWriter.m_oDocRels;
+			oNewParam.nType			= RENDER_TO_OOX_PARAM_UNKNOWN;
 
 			if( m_oDocument.GetCount() > 1 && m_oDocument[1]->GetCount() > 0 )// -       
 			{
@@ -101,10 +101,10 @@ public:
 	bool SaveByItemEnd()
 	{
 		RenderParameter oNewParam;
-		oNewParam.poDocument = &m_oDocument;
-		oNewParam.poWriter = &m_oWriter;
-		oNewParam.poRels = &m_oWriter.m_oDocRels;
-		oNewParam.nType = RENDER_TO_OOX_PARAM_UNKNOWN;
+		oNewParam.poDocument	= &m_oDocument;
+		oNewParam.poWriter		= &m_oWriter;
+		oNewParam.poRels		= &m_oWriter.m_oDocRels;
+		oNewParam.nType			= RENDER_TO_OOX_PARAM_UNKNOWN;
 
 		if( m_oDocument.GetCount() > 0 && m_oDocument[0]->GetCount() > 0 )//  
 		{

ASCOfficeRtfFile/RtfFormatLib/source/Writer/OOXRelsWriter.h

@@ -55,7 +55,7 @@ public:
 		FileSystem::Directory::CreateDirectoryW(pathRels) ;
 
 		CFile file;
-		if (file.CreateFileW(pathRels + FILE_SEPARATOR_STR + _T(".rels"))) return false;
+		if (file.CreateFileW(pathRels + FILE_SEPARATOR_STR + m_sFileName + _T(".rels"))) return false;
 
 		DWORD dwBytesWritten;
 		CString sXml = CreateXml();