Skip to content

O
onlyoffice_core
Commit f48990d1 authored by Sergey.Konovalov's avatar Sergey.Konovalov Committed by Alexander Trofimov
Browse files
Options

(1.0.0.112): AVSOfficeEWSEditor 

ASC версии

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52779 954022d7-b5bf-4e40-9824-e11837661b57
parent 6991b70c
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 37 deletions
.gitattributes
View file @ f48990d1
......@@ -361,6 +361,7 @@ Redist/ASCOfficeXPSFile.dll svn_mime_002dtype=application%2Foctet-stream
Redist/ASCOfficeXlsFile.dll svn_mime_002dtype=application%2Foctet-stream
Redist/ASCPresentationEditor.dll svn_mime_002dtype=application%2Foctet-stream
Redist/ASCVectorImage.dll svn_mime_002dtype=application%2Foctet-stream
Redist/AVSOfficeEWSEditor.dll svn_mime_002dtype=application%2Foctet-stream
Redist/OfficeCore.dll svn_mime_002dtype=application%2Foctet-stream
Redist/Repairing.exe svn_mime_002dtype=application%2Foctet-stream
Redist/VersionControl.exe svn_mime_002dtype=application%2Foctet-stream
......
ASCOfficeEWSEditor/ASCOfficeEWSEditor.sln
View file @ f48990d1

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVSOfficeEWSEditor", "AVSOfficeEWSEditor\AVSOfficeEWSEditor.csproj", "{D4C6EAD0-5A97-439C-AC74-E1B89E07CCBE}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASCOfficeEWSEditor", "ASCOfficeEWSEditor\ASCOfficeEWSEditor.csproj", "{D4C6EAD0-5A97-439C-AC74-E1B89E07CCBE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
ASCOfficeEWSEditor/ASCOfficeEWSEditor/ASCOfficeEWSEditor.csproj
View file @ f48990d1
......@@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D4C6EAD0-5A97-439C-AC74-E1B89E07CCBE}</ProjectGuid>
<OutputType>Library</OutputType>
......@@ -38,9 +38,9 @@
<DocumentationFile>bin\Release\AVSOfficeEWSEditor.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="FileConverterUtils2, Version=1.0.0.29, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="FileConverterUtils2, Version=1.0.0.39, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\TeamlabOffice\trunk\wwwroot\Bin\FileConverterUtils2.dll</HintPath>
<HintPath>..\..\..\wwwroot\Bin\FileConverterUtils2.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="System" />
......@@ -628,7 +628,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<COMReference Include="AVSImageFile3">
<COMReference Include="ASCImageFile3">
<Guid>{E3305D24-A207-4431-BC43-2C09A53CB9B6}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>0</VersionMinor>
......@@ -636,7 +636,7 @@
<WrapperTool>tlbimp</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
<COMReference Include="AVSImageStudio3">
<COMReference Include="ASCImageStudio3">
<Guid>{69DBBABC-8D59-40B8-9906-DAFD4F3EC346}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>0</VersionMinor>
......@@ -644,7 +644,7 @@
<WrapperTool>tlbimp</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
<COMReference Include="AVSMediaCore3">
<COMReference Include="ASCMediaCore3">
<Guid>{F0A0AAE5-06FE-4ABC-A9F1-26BFFEE2A11F}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>0</VersionMinor>
......@@ -652,7 +652,7 @@
<WrapperTool>tlbimp</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
<COMReference Include="AVSOfficeFile">
<COMReference Include="ASCOfficeFile">
<Guid>{74CBF220-BF08-11DE-8A39-0800200C9A66}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>0</VersionMinor>
......@@ -660,7 +660,7 @@
<WrapperTool>tlbimp</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
<COMReference Include="AVSOfficeUtils">
<COMReference Include="ASCOfficeUtils">
<Guid>{92F87FA9-D3C2-4820-82F6-DEAEC0A3539D}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>0</VersionMinor>
......@@ -668,7 +668,7 @@
<WrapperTool>tlbimp</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
<COMReference Include="AVSOfficeWSHtmlFile">
<COMReference Include="ASCOfficeWSHtmlFile">
<Guid>{25B7D44B-94A1-4C94-9718-102CFA8F00D5}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>0</VersionMinor>
......@@ -676,7 +676,7 @@
<WrapperTool>tlbimp</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
<COMReference Include="AVSOfficeXlsFile">
<COMReference Include="ASCOfficeXlsFile">
<Guid>{D9F21C35-D46C-42F3-996D-D4912435F7E7}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>0</VersionMinor>
......@@ -694,9 +694,8 @@
</Target>
-->
<PropertyGroup>
<PostBuildEvent>copy $(ProjectDir)bin\$(ConfigurationName)\$(TargetFileName) $(ProjectDir)..\..\..\..\Redist\AVSOfficeStudio\
copy $(ProjectDir)bin\$(ConfigurationName)\$(TargetName).xml $(ProjectDir)..\..\..\..\Redist\AVSOfficeStudio\
copy $(ProjectDir)bin\$(ConfigurationName)\$(TargetFileName) $(ProjectDir)..\..\..\TeamlabOffice\trunk\wwwroot\Bin\</PostBuildEvent>
<PostBuildEvent>copy $(ProjectDir)bin\$(ConfigurationName)\$(TargetFileName) $(ProjectDir)..\..\Redist\
copy $(ProjectDir)bin\$(ConfigurationName)\$(TargetName).xml $(ProjectDir)..\..\Redist\</PostBuildEvent>
<PreBuildEvent>
</PreBuildEvent>
</PropertyGroup>
......
ASCOfficeEWSEditor/ASCOfficeEWSEditor/Editor/FileFormats/Serializer.cs
View file @ f48990d1
......@@ -35,7 +35,7 @@ namespace AVSOfficeEWSEditor.Editor.FileFormats
case Format.XLSX:
{
XlsxSaver saver = new XlsxSaver(wb.GetXmlDocument(), wb.BinaryDataStorage);
AVSOfficeUtils.COfficeUtilsClass ooxArchiver = new AVSOfficeUtils.COfficeUtilsClass();
ASCOfficeUtils.COfficeUtilsClass ooxArchiver = new ASCOfficeUtils.COfficeUtilsClass();
if (!ooxArchiver.CompressFilesFromMemory(path, saver, -1))
{
throw new Events.ReportableException(new Events.InternalError("Compression to \"" + path + "\" failed for unknown reason"));
......@@ -45,7 +45,7 @@ namespace AVSOfficeEWSEditor.Editor.FileFormats
case Format.XLS:
{
XlsxSaver.Save(wb.GetXmlDocument(), temp_dir_path, wb.BinaryDataStorage);
AVSOfficeXlsFile.CXlsFileClass converter = new AVSOfficeXlsFile.CXlsFileClass();
ASCOfficeXlsFile.CXlsFileClass converter = new ASCOfficeXlsFile.CXlsFileClass();
converter.SaveToFile(path, temp_dir_path, "");
break;
}
......@@ -53,14 +53,14 @@ namespace AVSOfficeEWSEditor.Editor.FileFormats
{
XlsxSaver.Save(wb.GetXmlDocument(), temp_dir_path, wb.BinaryDataStorage);
AVSOfficeWSHtmlFile.CWSHtmlFileClass converter = new AVSOfficeWSHtmlFile.CWSHtmlFileClass();
ASCOfficeWSHtmlFile.CWSHtmlFileClass converter = new ASCOfficeWSHtmlFile.CWSHtmlFileClass();
converter.SaveToFile(path, temp_dir_path, "");
break;
}
case Format.ODS:
{
XlsxSaver saver = new XlsxSaver(wb.GetXmlDocument(), wb.BinaryDataStorage);
AVSOfficeUtils.COfficeUtilsClass ooxArchiver = new AVSOfficeUtils.COfficeUtilsClass();
ASCOfficeUtils.COfficeUtilsClass ooxArchiver = new ASCOfficeUtils.COfficeUtilsClass();
if (!ooxArchiver.CompressFilesFromMemory(temp_dir_path + ".xlsx", saver, -1))
{
throw new Events.ReportableException(new Events.InternalError("Compression to \"" + path + "\" failed for unknown reason"));
......@@ -88,7 +88,7 @@ namespace AVSOfficeEWSEditor.Editor.FileFormats
string sIndex = index.ToString();//формируем трехзначную индексную строку
string temp_dir_path = Path.GetDirectoryName(path) + '/' + Path.GetFileNameWithoutExtension(path);
XlsxSaver.Save(wb.GetXmlDocument(), temp_dir_path, wb.BinaryDataStorage);
AVSOfficeWSHtmlFile.CWSHtmlFileClass converter = new AVSOfficeWSHtmlFile.CWSHtmlFileClass();
ASCOfficeWSHtmlFile.CWSHtmlFileClass converter = new ASCOfficeWSHtmlFile.CWSHtmlFileClass();
converter.SaveToFile(path, temp_dir_path, "<Options><HTML><Print val = \"true\" ind=\"" + index.ToString() + "\"/></HTML></Options>");
Trace.TraceInformation("Saving to Print file successfully finished");
}
......@@ -97,7 +97,7 @@ namespace AVSOfficeEWSEditor.Editor.FileFormats
{
if (format == Format.AUTO)
{
AVSOfficeFile.CAVSOfficeFormatCheckerClass oFormatChecker = new AVSOfficeFile.CAVSOfficeFormatCheckerClass();
ASCOfficeFile.CAVSOfficeFormatCheckerClass oFormatChecker = new ASCOfficeFile.CAVSOfficeFormatCheckerClass();
int nCheckerFormat = oFormatChecker.GetFileFormat(path);
switch (nCheckerFormat)
{
......@@ -123,7 +123,7 @@ namespace AVSOfficeEWSEditor.Editor.FileFormats
XmlDocument xml_doc = new XmlDocument();
xml_doc.LoadXml("<?xml version=\"1.0\" encoding=\"utf-8\" ?> <root/>");
AVSOfficeUtils.COfficeUtilsClass ooxArchiver = new AVSOfficeUtils.COfficeUtilsClass();
ASCOfficeUtils.COfficeUtilsClass ooxArchiver = new ASCOfficeUtils.COfficeUtilsClass();
List<byte[]> binary_data_storage = new List<byte[]>();
XlsxLoader data_receiver = new XlsxLoader(xml_doc, binary_data_storage);
if (!ooxArchiver.ExtractFilesToMemory(path, data_receiver))
......@@ -143,7 +143,7 @@ namespace AVSOfficeEWSEditor.Editor.FileFormats
XmlDocument xml_doc = new XmlDocument();
xml_doc.LoadXml("<?xml version=\"1.0\" encoding=\"utf-8\" ?> <root/>");
AVSOfficeXlsFile.CXlsFileClass converter = new AVSOfficeXlsFile.CXlsFileClass();
ASCOfficeXlsFile.CXlsFileClass converter = new ASCOfficeXlsFile.CXlsFileClass();
converter.LoadFromFile(path, temp_dir_path, "");
List<byte[]> binary_data_storage = new List<byte[]>();
XlsxLoader.LoadXML(xml_doc, temp_dir_path, binary_data_storage);
......
ASCOfficeEWSEditor/ASCOfficeEWSEditor/Editor/FileFormats/XlsxLoader.cs
View file @ f48990d1
......@@ -6,7 +6,7 @@ using System.IO;
namespace AVSOfficeEWSEditor.Editor.FileFormats
{
internal class XlsxLoader : AVSOfficeUtils.IExtractedFileEvent
internal class XlsxLoader : ASCOfficeUtils.IExtractedFileEvent
{
internal XlsxLoader(XmlDocument xml_recv_document, List<byte[]> binary_data_storage)
{
......
ASCOfficeEWSEditor/ASCOfficeEWSEditor/Editor/FileFormats/XlsxSaver.cs
View file @ f48990d1
......@@ -7,7 +7,7 @@ using AVSOfficeEWSEditor.XMLDataSpecific;
namespace AVSOfficeEWSEditor.Editor.FileFormats
{
internal class XlsxSaver : AVSOfficeUtils.IRequestFileEvent
internal class XlsxSaver : ASCOfficeUtils.IRequestFileEvent
{
internal XlsxSaver(XmlDocument xml_source_document, List<byte[]> binary_data_storage)
{
......
ASCOfficeEWSEditor/ASCOfficeEWSEditor/Editor/Worksheet.cs
View file @ f48990d1
......@@ -7,14 +7,14 @@ using System.IO;
using AVSOfficeEWSEditor.Editor.Charts;
using AVSOfficeEWSEditor.Editor.Images;
using FileConverterUtils2;
using AVSOfficeFile;
using AVSImageFile3;
using AVSMediaCore3;
using ASCOfficeFile;
using ASCImageFile3;
using ASCMediaCore3;
using System.Net;
using System.Text.RegularExpressions;
using AVSOfficeEWSEditor.Editor.Cells;
using AVSOfficeEWSEditor.Editor.Walkers;
using AVSImageStudio3;
using ASCImageStudio3;
namespace AVSOfficeEWSEditor.Editor
{
......@@ -614,8 +614,8 @@ namespace AVSOfficeEWSEditor.Editor
{
string toFile = imageUrl.Replace(imageExt, ".jpg");
AVSOfficeFile.CAVSOfficeFileConverterClass converter = new AVSOfficeFile.CAVSOfficeFileConverterClass();
AVSImageStudio3.ImageTransformsClass imageConverter = new AVSImageStudio3.ImageTransformsClass();
ASCOfficeFile.CAVSOfficeFileConverterClass converter = new ASCOfficeFile.CAVSOfficeFileConverterClass();
ASCImageStudio3.ImageTransformsClass imageConverter = new ASCImageStudio3.ImageTransformsClass();
string strLoadXml = "<transforms>" +
"<ImageFile-LoadImage sourcepath=\"" + imageUrl + "\"/>" +
......@@ -655,7 +655,7 @@ namespace AVSOfficeEWSEditor.Editor
{
if (!string.IsNullOrEmpty(what))
{
FileStream log = new FileStream(@"d:\Work\AVSDocuments\AVSOfficeWeb\wwwroot\process\log.txt", newFile ? FileMode.Create : FileMode.Open);
FileStream log = new FileStream(@"d:\Work\AVSDocuments\ASCOfficeWeb\wwwroot\process\log.txt", newFile ? FileMode.Create : FileMode.Open);
log.Seek(log.Length, SeekOrigin.Begin);
System.Text.UTF8Encoding encoding = new System.Text.UTF8Encoding();
string str = what + "\n";
......@@ -1182,7 +1182,7 @@ namespace AVSOfficeEWSEditor.Editor
}
// init registration
AVSOfficeFile.CAVSOfficeFormatChecker imageChecker = new CAVSOfficeFormatChecker();
ASCOfficeFile.CAVSOfficeFormatChecker imageChecker = new CAVSOfficeFormatChecker();
AVSOfficeEWSEditor.Editor.OOX.ContentTypes.FileType contentType;
int type = imageChecker.GetFileFormat(fileName);
int reff = System.Runtime.InteropServices.Marshal.ReleaseComObject(imageChecker);
......@@ -1216,8 +1216,8 @@ namespace AVSOfficeEWSEditor.Editor
ext = ".jpeg";
string toFile = fileName + "_jpeg";
AVSOfficeFile.CAVSOfficeFileConverterClass converter = new AVSOfficeFile.CAVSOfficeFileConverterClass();
AVSImageStudio3.ImageTransformsClass imageConverter = new AVSImageStudio3.ImageTransformsClass();
ASCOfficeFile.CAVSOfficeFileConverterClass converter = new ASCOfficeFile.CAVSOfficeFileConverterClass();
ASCImageStudio3.ImageTransformsClass imageConverter = new ASCImageStudio3.ImageTransformsClass();
string strLoadXml = "<transforms>" +
"<ImageFile-LoadImage sourcepath=\"" + fileName + "\"/>" +
......@@ -1246,15 +1246,15 @@ namespace AVSOfficeEWSEditor.Editor
try
{
AVSOfficeFile.CAVSOfficeFileConverterClass converter = new AVSOfficeFile.CAVSOfficeFileConverterClass();
AVSImageFile3.ImageFile3Class imageFileObj = new AVSImageFile3.ImageFile3Class();
ASCOfficeFile.CAVSOfficeFileConverterClass converter = new ASCOfficeFile.CAVSOfficeFileConverterClass();
ASCImageFile3.ImageFile3Class imageFileObj = new ASCImageFile3.ImageFile3Class();
Object itf = new Object();
bool bRes = imageFileObj.LoadImage2(fileName, out itf);
if (itf != null)
{
AVSMediaCore3.IAVSUncompressedVideoFrame metrics = (AVSMediaCore3.IAVSUncompressedVideoFrame)itf;
ASCMediaCore3.IAVSUncompressedVideoFrame metrics = (ASCMediaCore3.IAVSUncompressedVideoFrame)itf;
newObject.object_width = metrics.Width;
newObject.object_height = metrics.Height;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7