Application - OnlyOffice, AppVersion - 3.0000 в app.xml, одинаковые core.xml

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

ASCOfficeDocxFile2/Resources/app.xml

-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?><Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"><Template>Normal.dotm</Template><TotalTime>1</TotalTime><Pages>1</Pages><Words>0</Words><Characters>0</Characters><Application>Teamlab Office Word</Application><DocSecurity>0</DocSecurity><Lines>1</Lines><Paragraphs>1</Paragraphs><ScaleCrop>false</ScaleCrop><Company>Ascensio System</Company><LinksUpToDate>false</LinksUpToDate><CharactersWithSpaces>0</CharactersWithSpaces><SharedDoc>false</SharedDoc><HyperlinksChanged>false</HyperlinksChanged><AppVersion>2.0000</AppVersion></Properties>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?><Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"><Template>Normal.dotm</Template><TotalTime>1</TotalTime><Pages>1</Pages><Words>0</Words><Characters>0</Characters><Application>OnlyOffice</Application><DocSecurity>0</DocSecurity><Lines>1</Lines><Paragraphs>1</Paragraphs><ScaleCrop>false</ScaleCrop><LinksUpToDate>false</LinksUpToDate><CharactersWithSpaces>0</CharactersWithSpaces><SharedDoc>false</SharedDoc><HyperlinksChanged>false</HyperlinksChanged><AppVersion>3.0000</AppVersion></Properties>

ASCOfficeDocxFile2/Resources/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/"><dc:title/><dc:subject/><dc:creator/><cp:keywords/><dc:description/><cp:lastModifiedBy/><cp:revision>1</cp:revision></cp:coreProperties>
\ No newline at end of file
+<?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/"><dc:creator/><cp:lastModifiedBy/></cp:coreProperties>
\ No newline at end of file

ASCOfficePPTXFile/Editor/PPTXWriter.h

@@ -834,7 +834,7 @@ namespace NSBinPptxRW
 		{
 			m_oApp.TotalTime = 0;
 			m_oApp.Words = 0;
-			m_oApp.Application = _T("Teamlab Office");
+			m_oApp.Application = _T("OnlyOffice");
 			m_oApp.PresentationFormat = _T("On-screen Show (4:3)");
 			m_oApp.Paragraphs = 0;
 			m_oApp.Slides = (int)m_arSlides.size();
@@ -875,18 +875,15 @@ namespace NSBinPptxRW
 				m_oApp.TitlesOfParts[nCountThemes + i].m_title = s;
 			}
 			
-			m_oApp.Company = _T("Teamlab Office");
 			m_oApp.LinksUpToDate = false;
 			m_oApp.SharedDoc = false;
 			m_oApp.HyperlinksChanged = false;
-			m_oApp.AppVersion = _T("1.0000");			
+			m_oApp.AppVersion = _T("3.0000");			
 		}
 		void CreateDefaultCore()
 		{
-			m_oCore.title = _T("Slide 1");
-			m_oCore.creator  = _T("Teamlab Office");
-			m_oCore.lastModifiedBy = _T("Teamlab Office");
-			m_oCore.revision = _T("1");
+			m_oCore.creator  = _T("");
+			m_oCore.lastModifiedBy = _T("");
 		}
 		void CreateDefaultViewProps()
 		{

Common/DocxFormat/Source/DocxFormat/App.h

@@ -375,7 +375,14 @@ namespace OOX
 		{
 			return type().DefaultFileName();
 		}
-
+		void SetApplication(const CString& sVal)
+		{
+			m_sApplication = sVal;
+		}
+		void SetAppVersion(const CString& sVal)
+		{
+			m_sAppVersion = sVal;
+		}
 		void SetDocSecurity(int nVal)
 		{
 			m_nDocSecurity = nVal;

Common/DocxFormat/Source/XlsxFormat/Xlsx.h

@@ -133,9 +133,10 @@ namespace OOX
 				//docProps
 				//CApp
 				OOX::CApp* pApp = new OOX::CApp();
+				pApp->SetApplication(_T("OnlyOffice"));
+				pApp->SetAppVersion(_T("3.0000"));
 				pApp->SetDocSecurity(0);
 				pApp->SetScaleCrop(false);
-				pApp->SetCompany(_T("Ascensio System"));
 				pApp->SetLinksUpToDate(false);
 				pApp->SetSharedDoc(false);
 				pApp->SetHyperlinksChanged(false);