pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

правильное копирование OleObjectReplacement

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62974 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Elen.Subbotina
2015-06-08 16:59:38 +00:00
committed by Alexander Trofimov
parent db00cb58f8
commit 3d8d87778c
6 changed files with 86 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
ASCOfficeOdfFile/src/docx/mediaitems.cpp
View File

@ -12,6 +12,8 @@
#include "mediaitems_utils.h"
#include "../../Common/DocxFormat/Source/Base/Base.h"
#include "../../Common/DocxFormat/Source/SystemUtility/File.h"
#include "../../DesktopEditor/raster/ImageFileFormatChecker.h"
namespace cpdoccore {
namespace oox {
@ -40,6 +42,55 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, Type type, bool
return add_or_find(href, type, isInternal, ref);
}
std::wstring static get_default_file_name(mediaitems::Type type)
{
switch (type)
{
case mediaitems::typeImage:
return L"image";
case mediaitems::typeChart:
return L"chart";
default:
return L"";
}
}
std::wstring mediaitems::create_file_name(const std::wstring & uri, mediaitems::Type type, size_t Num)
{
std::wstring sExt;
int n = uri.rfind(L".");
if (n>0) sExt = uri.substr(n);
else if (n==0)
{
//<2F><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> OleReplacement
n = uri.find(L"ObjectReplacements");
if (n>=0)
{
CFile file;
CString f_name = std_string2string(odf_packet_) + std_string2string(uri.substr(1,uri.length()-1));
if (file.OpenFile(f_name) == S_OK)
{
BYTE buffer[128];
int buffer_size = 128;
file.ReadFile(buffer, buffer_size);
file.CloseFile();
CImageFileFormatChecker image_checker;
sExt = image_checker.DetectFormatByData(buffer, buffer_size);
if (sExt.length() > 0) sExt = std::wstring(L".") + sExt;
}
}
}
//todooo <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
return get_default_file_name(type) + boost::lexical_cast<std::wstring>(Num) + sExt;
}
std::wstring mediaitems::add_or_find(const std::wstring & href, Type type, bool & isInternal, std::wstring & ref)
{
const bool isMediaInternal = utils::media::is_internal(href, odf_packet_);
@ -62,7 +113,7 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, Type type, bool
else
number= items_.size()+1;
inputFileName = utils::media::create_file_name(href, type, number);
inputFileName = create_file_name(href, type, number);
std::wstring inputPath = isMediaInternal ? odf_packet_ + FILE_SEPARATOR_STR + href : href;
std::wstring outputPath = isMediaInternal ? ( sub_path + inputFileName) : href;

2
ASCOfficeOdfFile/src/docx/mediaitems.h
View File

@ -53,6 +53,8 @@ public:
items_array & items() { return items_; }
private:
std::wstring create_file_name(const std::wstring & uri, mediaitems::Type type, size_t Num);
items_array items_;
std::wstring odf_packet_;

25
ASCOfficeOdfFile/src/docx/mediaitems_utils.cpp
View File

@ -8,6 +8,7 @@
#include "../../Common/DocxFormat/Source/Base/Base.h"
#include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
namespace cpdoccore {
namespace oox {
namespace utils {
@ -39,18 +40,7 @@ std::wstring get_rel_type(mediaitems::Type type)
}
}
std::wstring get_default_file_name(mediaitems::Type type)
{
switch (type)
{
case mediaitems::typeImage:
return L"image";
case mediaitems::typeChart:
return L"chart";
default:
return L"";
}
}
std::wstring replace_extension(const std::wstring & ext)
{
@ -61,17 +51,6 @@ std::wstring replace_extension(const std::wstring & ext)
return ext;
}
std::wstring create_file_name(const std::wstring & uri, mediaitems::Type type, size_t Num)
{
std::wstring sExt;
int n = uri.rfind(L".");
if (n>=0) sExt = uri.substr(n);
//todooo <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
return get_default_file_name(type) + boost::lexical_cast<std::wstring>(Num) + sExt;
}
}
}

1
ASCOfficeOdfFile/src/docx/mediaitems_utils.h
View File

@ -11,7 +11,6 @@ namespace utils {
namespace media {
bool is_internal(const std::wstring & uri, const std::wstring & packetRoot);
std::wstring create_file_name(const std::wstring & uri, mediaitems::Type type, size_t Num);
std::wstring get_rel_type(mediaitems::Type type);
}

52
ASCOfficeOdfFile/src/odf/datatypes/custom_shape_types_convert.h
View File

@ -61,7 +61,7 @@ static const _shape_converter _OO_OOX_custom_shapes[]=
{L"line-callout-2" ,L"callout2" ,6 ,0 ,0 },
{L"line-callout-3" ,L"callout3" ,8 ,0 ,0 },
{L"rectangular-callout" ,L"wedgeRectCallout" ,2 ,0 ,842870 },
{L"round-rectangular-callout" ,L"wedgeRoundRectCallout" ,2 ,0 ,842870 },
{L"round-rectangular-callout" ,L"wedgeRoundRectCallout" ,0 ,0 ,842870 },
{L"round-callout" ,L"wedgeEllipseCallout" ,2 ,0 ,842870 },
{L"cloud-callout" ,L"cloudCallout" ,2 ,0 ,842870 },
{L"vertical-scroll" ,L"verticalScroll" ,1 ,0 ,25000 },
@ -94,16 +94,16 @@ static const _shape_converter _OO_OOX_custom_shapes[]=
{L"flowchart-delay" ,L"flowChartDelay" ,0 ,0 ,0 },
{L"flowchart-alternate-process" ,L"flowChartAlternateProcess" ,0 ,0 ,0 },
{L"flowchart-off-page-connector" ,L"flowChartOffpageConnector" ,0 ,0 ,0 },
{L"fontwork-arch-up-pour" ,L"textArchUpPour" ,0 ,0 ,0 },
{L"fontwork-arch-down-pour" ,L"textArchDownPour" ,0 ,0 ,0 },
{L"fontwork-circle-pour" ,L"textCirclePour" ,0 ,0 ,0 },
{L"fontwork-curve-up" ,L"textCurveUp" ,0 ,0 ,0 },
{L"fontwork-curve-down" ,L"textCurveDown" ,0 ,0 ,0 },
{L"fontwork-wave" ,L"textWave1" ,0 ,0 ,0 },
{L"fontwork-fade-right" ,L"textFadeRight" ,0 ,0 ,0 },
{L"fontwork-fade-left" ,L"textFadeLeft" ,0 ,0 ,0 },
{L"fontwork-fade-up" ,L"textFadeUp" ,0 ,0 ,0 },
{L"fontwork-fade-down" ,L"textFadeDown" ,0 ,0 ,0 },
{L"fontwork-arch-up-pour" ,L"rect" ,0 ,0 ,0 },//L"textArchUpPour"
{L"fontwork-arch-down-pour" ,L"rect" ,0 ,0 ,0 },//L"textArchDownPour"
{L"fontwork-circle-pour" ,L"rect" ,0 ,0 ,0 },//L"textCirclePour"
{L"fontwork-curve-up" ,L"rect" ,0 ,0 ,0 },//L"textCurveUp"
{L"fontwork-curve-down" ,L"rect" ,0 ,0 ,0 },//L"textCurveDown"
{L"fontwork-wave" ,L"rect" ,0 ,0 ,0 },//L"textWave1"
{L"fontwork-fade-right" ,L"rect" ,0 ,0 ,0 },//L"textFadeRight"
{L"fontwork-fade-left" ,L"rect" ,0 ,0 ,0 },//L"textFadeLeft"
{L"fontwork-fade-up" ,L"rect" ,0 ,0 ,0 },//L"textFadeUp"
{L"fontwork-fade-down" ,L"rect" ,0 ,0 ,0 },//L"textFadeDown"
{L"left-brace" ,L"leftBrace" ,0 ,0 ,0 },
{L"right-brace" ,L"rightBrace" ,0 ,0 ,0 },
{L"left-bracket" ,L"leftBracket" ,0 ,0 ,0 },
@ -160,25 +160,25 @@ static const _shape_converter _OO_OOX_custom_shapes[]=
{L"mso-spt107" ,L"ellipseRibbon" ,0 ,0 ,0 },
{L"mso-spt108" ,L"ellipseRibbon2" ,0 ,0 ,0 },
{L"mso-spt129" ,L"flowChartMagneticDrum" ,0 ,0 ,0 },
{L"mso-spt142" ,L"textRingInside" ,0 ,0 ,0 },
{L"mso-spt143" ,L"textRingOutside" ,0 ,0 ,0 },
{L"mso-spt157" ,L"textWave2" ,0 ,0 ,0 },
{L"mso-spt158" ,L"textDoubleWave1" ,0 ,0 ,0 },
{L"mso-spt159" ,L"textWave4" ,0 ,0 ,0 },
{L"mso-spt161" ,L"textDeflate" ,0 ,0 ,0 },
{L"mso-spt162" ,L"textInflateBottom" ,0 ,0 ,0 },
{L"mso-spt163" ,L"textDeflateBottom" ,0 ,0 ,0 },
{L"mso-spt164" ,L"textInflateTop" ,0 ,0 ,0 },
{L"mso-spt165" ,L"textDeflateTop" ,0 ,0 ,0 },
{L"mso-spt166" ,L"textDeflateInflate" ,0 ,0 ,0 },
{L"mso-spt167" ,L"textDeflateInflateDeflate" ,0 ,0 ,0 },
{L"mso-spt174" ,L"textCanUp" ,0 ,0 ,0 },
{L"mso-spt175" ,L"textCanDown" ,0 ,0 ,0 },
{L"mso-spt142" ,L"rect" ,0 ,0 ,0 },//L"textRingInside"
{L"mso-spt143" ,L"rect" ,0 ,0 ,0 },//L"textRingOutside"
{L"mso-spt157" ,L"rect" ,0 ,0 ,0 },//L"textWave2"
{L"mso-spt158" ,L"rect" ,0 ,0 ,0 },//L"textDoubleWave1"
{L"mso-spt159" ,L"rect" ,0 ,0 ,0 },//L"textWave4"
{L"mso-spt161" ,L"rect" ,0 ,0 ,0 },//L"textDeflate"
{L"mso-spt162" ,L"rect" ,0 ,0 ,0 },//L"textInflateBottom"
{L"mso-spt163" ,L"rect" ,0 ,0 ,0 },//L"textDeflateBottom"
{L"mso-spt164" ,L"rect" ,0 ,0 ,0 },//L"textInflateTop"
{L"mso-spt165" ,L"rect" ,0 ,0 ,0 },//L"textDeflateTop"
{L"mso-spt166" ,L"rect" ,0 ,0 ,0 },//L"textDeflateInflateDeflate"
{L"mso-spt167" ,L"rect" ,0 ,0 ,0 },
{L"mso-spt174" ,L"rect" ,0 ,0 ,0 },//L"textCanUp"
{L"mso-spt175" ,L"rect" ,0 ,0 ,0 }, //L"textCanDown"
{L"mso-spt178" , L"" ,0 ,0 ,0 },
{L"mso-spt179" , L"" ,0 ,0 ,0 },
{L"mso-spt180" , L"" ,0 ,0 ,0 },
{L"mso-spt182" ,L"leftRightUpArrow" ,0 ,0 ,0 },
{L"mso-spt188" ,L"textDoubleWave1" ,0 ,0 ,0 },
{L"mso-spt188" ,L"rect" ,0 ,0 ,0 }, //L"textDoubleWave1"
{L"mso-spt189" ,L"actionButtonBlank" ,0 ,0 ,0 },
{L"mso-spt190" ,L"actionButtonHome" ,0 ,0 ,0 },
{L"mso-spt191" ,L"actionButtonHelp" ,0 ,0 ,0 },

4
ASCOfficeOdfFile/win32/cpodf.vcproj
View File

@ -1504,6 +1504,10 @@
RelativePath="..\..\Common\DocxFormat\Source\SystemUtility\FileSystem\Directory.cpp"
>
</File>
<File
RelativePath="..\..\Common\DocxFormat\Source\XML\stringcommon.cpp"
>
</File>
</Files>
<Globals>
</Globals>