Skip to content

O
onlyoffice_core
Commit 6b7d88fe authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov
Browse files
Options

OdfFile вытерто старый вариант использования SvmFile - сейчас полоноценное... 

OdfFile вытерто старый вариант использования SvmFile - сейчас полоноценное использование как MetaFile

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62853 954022d7-b5bf-4e40-9824-e11837661b57
parent 4dd84f2c
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 64 deletions
ASCOfficeOdfFile/ASCOfficeOdfFile/OfficeOdfFile.cpp
View file @ 6b7d88fe
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h" #include "../../ASCOfficeUtils/ASCOfficeUtilsLib/OfficeUtils.h"
#include <boost/algorithm/string/case_conv.hpp> #include <boost/algorithm/string/case_conv.hpp>
#include <lexical_cast.h> #include <boost/lexical_cast.hpp>
#include "../../Common/DocxFormat/Source/Base/Base.h" #include "../../Common/DocxFormat/Source/Base/Base.h"
#include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h" #include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
......
ASCOfficeOdfFile/src/docx/mediaitems.cpp
View file @ 6b7d88fe
...@@ -88,11 +88,6 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, Type type, bool ...@@ -88,11 +88,6 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, Type type, bool
} }
else if ( type == typeImage) else if ( type == typeImage)
{ {
int n_svm = inputPath.rfind (L".svm");
if ( n_svm >= 0 )
{
outputPath = outputPath.substr(0, n_svm) + L".png";
}
id = std::wstring(L"picId") + boost::lexical_cast<std::wstring>(count_image+1); id = std::wstring(L"picId") + boost::lexical_cast<std::wstring>(count_image+1);
count_image++; count_image++;
} }
......
ASCOfficeOdfFile/src/docx/oox_package.cpp
View file @ 6b7d88fe
...@@ -7,9 +7,6 @@ ...@@ -7,9 +7,6 @@
#include <cpdoccore/utf8cpp/utf8.h> #include <cpdoccore/utf8cpp/utf8.h>
#include "mediaitems.h" #include "mediaitems.h"
#include "../../../ASCImageStudio3/ASCGraphics/OfficeSvmFile/SvmConverter.h"
#include "../../DesktopEditor/common/File.h" #include "../../DesktopEditor/common/File.h"
namespace cpdoccore { namespace cpdoccore {
...@@ -183,46 +180,6 @@ void media::write(const std::wstring & RootPath) ...@@ -183,46 +180,6 @@ void media::write(const std::wstring & RootPath)
std::wstring & file_name = item.href; std::wstring & file_name = item.href;
std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + item.outputName; std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + item.outputName;
int pos_svm = file_name.rfind(L".svm");
if ( pos_svm >= 0)
{
ConvertSvmToImage(file_name, file_name_out);
}
//else if(file_name.extension().empty())
//{
// // .. svm, emf, wmf, vclmtf ( )
// //???
// ImageFile::IImageFile3Ptr piImageFile = NULL;
// piImageFile.CreateInstance( __uuidof(ImageFile::ImageFile3) );
// if( NULL != piImageFile )
// {
// VARIANT_BOOL vbSuccess = VARIANT_FALSE;
// IUnknown* pImage = NULL;
//
// BSTR bstrFilename = SysAllocString(item.href.data());
// try
// {
// piImageFile->LoadImage2(bstrFilename, &pImage, &vbSuccess);
// }
// catch(...)
// {
// }
// SysFreeString( bstrFilename );
// if (vbSuccess && pImage)
// {
// bstrFilename = SysAllocString(file_name_out.string().data());
// piImageFile->SaveImage2( &pImage, 4, bstrFilename, &vbSuccess );//to png
// SysFreeString( bstrFilename );
// pImage->Release();
// }
// if (vbSuccess == FALSE)
// {
// FileSystem::Directory::CopyFile(item.href, file_name_out);// png ... ? :-)
// }
// }
//}
else
NSFile::CFileBinary::Copy(item.href, file_name_out); NSFile::CFileBinary::Copy(item.href, file_name_out);
} }
} }
......
ASCOfficeOdfFile/win32/ASCOfficeOdfFile.sln
View file @ 6b7d88fe
...@@ -24,7 +24,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFile", "..\ASCO ...@@ -24,7 +24,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFile", "..\ASCO
{41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1} {41BED424-4EAF-4053-8A5F-1E2A387D53D1} = {41BED424-4EAF-4053-8A5F-1E2A387D53D1}
{609ED938-3CA8-4BED-B363-25096D4C4812} = {609ED938-3CA8-4BED-B363-25096D4C4812} {609ED938-3CA8-4BED-B363-25096D4C4812} = {609ED938-3CA8-4BED-B363-25096D4C4812}
{94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A} {94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A}
{918D1327-C6ED-43E6-AE22-84A3736F0E87} = {918D1327-C6ED-43E6-AE22-84A3736F0E87}
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
EndProjectSection EndProjectSection
EndProject EndProject
...@@ -33,11 +32,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFileTest", "..\ ...@@ -33,11 +32,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFileTest", "..\
{64B09C98-22DC-494E-A882-9E2D7D18557C} = {64B09C98-22DC-494E-A882-9E2D7D18557C} {64B09C98-22DC-494E-A882-9E2D7D18557C} = {64B09C98-22DC-494E-A882-9E2D7D18557C}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeSvmFile", "..\..\ASCImageStudio3\ASCGraphics\OfficeSvmFile\OfficeSvmFile2005.vcproj", "{918D1327-C6ED-43E6-AE22-84A3736F0E87}"
ProjectSection(ProjectDependencies) = postProject
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\Common\DocxFormat\Source\XML\libxml2\win_build\libxml2.vcproj", "{21663823-DE45-479B-91D0-B4FEF4916EF0}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\Common\DocxFormat\Source\XML\libxml2\win_build\libxml2.vcproj", "{21663823-DE45-479B-91D0-B4FEF4916EF0}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeUtilsLib", "..\..\ASCOfficeUtils\ASCOfficeUtilsLib\Win\ASCOfficeUtilsLib.vcproj", "{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeUtilsLib", "..\..\ASCOfficeUtils\ASCOfficeUtilsLib\Win\ASCOfficeUtilsLib.vcproj", "{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}"
...@@ -100,14 +94,6 @@ Global ...@@ -100,14 +94,6 @@ Global
{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.Build.0 = Release|Win32 {C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.Build.0 = Release|Win32
{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|x64.ActiveCfg = Release|x64 {C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|x64.ActiveCfg = Release|x64
{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|x64.Build.0 = Release|x64 {C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|x64.Build.0 = Release|x64
{918D1327-C6ED-43E6-AE22-84A3736F0E87}.Debug|Win32.ActiveCfg = Debug|Win32
{918D1327-C6ED-43E6-AE22-84A3736F0E87}.Debug|Win32.Build.0 = Debug|Win32
{918D1327-C6ED-43E6-AE22-84A3736F0E87}.Debug|x64.ActiveCfg = Debug|x64
{918D1327-C6ED-43E6-AE22-84A3736F0E87}.Debug|x64.Build.0 = Debug|x64
{918D1327-C6ED-43E6-AE22-84A3736F0E87}.Release|Win32.ActiveCfg = Release|Win32
{918D1327-C6ED-43E6-AE22-84A3736F0E87}.Release|Win32.Build.0 = Release|Win32
{918D1327-C6ED-43E6-AE22-84A3736F0E87}.Release|x64.ActiveCfg = Release|x64
{918D1327-C6ED-43E6-AE22-84A3736F0E87}.Release|x64.Build.0 = Release|x64
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.ActiveCfg = Debug|Win32 {21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.ActiveCfg = Debug|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.Build.0 = Debug|Win32 {21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.Build.0 = Debug|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.ActiveCfg = Debug|x64 {21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.ActiveCfg = Debug|x64
......
ASCOfficeOdfFile/win32/cpcommon.vcproj
View file @ 6b7d88fe
...@@ -305,6 +305,15 @@ ...@@ -305,6 +305,15 @@
<File <File
RelativePath="..\src\common\CPColorUtils.cpp" RelativePath="..\src\common\CPColorUtils.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\include\cpdoccore\CPColorUtils.h" RelativePath="..\include\cpdoccore\CPColorUtils.h"
...@@ -333,6 +342,15 @@ ...@@ -333,6 +342,15 @@
<File <File
RelativePath="..\src\common\CPString.cpp" RelativePath="..\src\common\CPString.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\include\cpdoccore\CPString.h" RelativePath="..\include\cpdoccore\CPString.h"
...@@ -345,6 +363,15 @@ ...@@ -345,6 +363,15 @@
<File <File
RelativePath="..\src\common\readdocelement.cpp" RelativePath="..\src\common\readdocelement.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
/>
</FileConfiguration>
</File> </File>
</Files> </Files>
<Globals> <Globals>
......
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