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

Improved conversion of shapes properties в hwp format

Browse Source
This commit is contained in:
Green
2025-01-10 00:50:11 +03:00
parent c0debdfe39
commit 4d15b5c19d
8 changed files with 215 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
HwpFile/HwpDoc/Conversion/Converter2OOXML.cpp
View File

@ -733,15 +733,15 @@ void CConverter2OOXML::WriteCellProperties(short shBorderFillID, NSStringUtils::
oBuilder.WriteString(L"<w:tcBorders>");
WriteBorder(pBorderFill->GetTopBorder(), L"top", oBuilder);
WriteBorder(pBorderFill->GetLeftBorder(), L"left", oBuilder);
WriteBorder(pBorderFill->GetBottomBorder(), L"bottom", oBuilder);
WriteBorder(pBorderFill->GetRightBorder(), L"right", oBuilder);
WriteCellBorder(pBorderFill->GetTopBorder(), L"top", oBuilder);
WriteCellBorder(pBorderFill->GetLeftBorder(), L"left", oBuilder);
WriteCellBorder(pBorderFill->GetBottomBorder(), L"bottom", oBuilder);
WriteCellBorder(pBorderFill->GetRightBorder(), L"right", oBuilder);
oBuilder.WriteString(L"</w:tcBorders>");
}
void CConverter2OOXML::WriteBorder(const TBorder& oBorder, const HWP_STRING& sBorderName, NSStringUtils::CStringBuilder& oBuilder)
void CConverter2OOXML::WriteCellBorder(const TBorder& oBorder, const HWP_STRING& sBorderName, NSStringUtils::CStringBuilder& oBuilder)
{
if (0x00 == oBorder.m_chWidth || sBorderName.empty())
return;
@ -848,26 +848,7 @@ void CConverter2OOXML::WriteGeometryShape(const CCtrlGeneralShape* pGeneralShape
oBuilder.WriteString(L"<a:noFill/>");
}
oBuilder.WriteString(L"<a:ln" + ((ELineStyle2::NONE != pGeneralShape->GetLineStyle()) ? (L" w=\"" + std::to_wstring(Transform::LineWidth2Pt(pGeneralShape->GetLineThick())) + L'\"') : std::wstring()) + L">");
switch (pGeneralShape->GetLineStyle())
{
case ELineStyle2::NONE: oBuilder.WriteString(L"<a:noFill/>"); break;
case ELineStyle2::SOLID: oBuilder.WriteString(L"<a:solidFill><a:srgbClr val=\"" + Transform::IntColorToHEX(pGeneralShape->GetLineColor()) + L"\"/></a:solidFill>"); break;
case ELineStyle2::DASH:
case ELineStyle2::DOT:
case ELineStyle2::DASH_DOT:
case ELineStyle2::DASH_DOT_DOT:
case ELineStyle2::LONG_DASH:
case ELineStyle2::CIRCLE:
case ELineStyle2::DOUBLE_SLIM:
case ELineStyle2::SLIM_THICK:
case ELineStyle2::THICK_SLIM:
case ELineStyle2::SLIM_THICK_SLIM:
oBuilder.WriteString(L"<a:noFill/>"); break; //TODO:: добавить реализацию
break;
}
oBuilder.WriteString(L"</a:ln>");
WriteLineSettings(pGeneralShape, oBuilder);
oBuilder.WriteString(L"</wps:spPr>");
@ -1037,7 +1018,9 @@ void CConverter2OOXML::WritePicture(const CCtrlShapePic* pCtrlPic, NSStringUtils
oBuilder.WriteString(L"<pic:cNvPicPr/></pic:nvPicPr>");
oBuilder.WriteString(L"<pic:blipFill><a:blip r:embed=\"" + sPictureID + L"\"><a:extLst><a:ext uri=\"{28A0092B-C50C-407E-A947-70E740481C1C}\"><a14:useLocalDpi xmlns:a14=\"http://schemas.microsoft.com/office/drawing/2010/main\" val=\"0\"/></a:ext></a:extLst></a:blip><a:srcRect/><a:stretch><a:fillRect/></a:stretch></pic:blipFill>");
oBuilder.WriteString(L"<pic:spPr bwMode=\"auto\"><a:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlPic->GetCurWidth())) + L"\" cy=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlPic->GetCurHeight())) + L"\"/></a:xfrm>");
oBuilder.WriteString(L"<a:prstGeom prst=\"rect\"><a:avLst/></a:prstGeom><a:noFill/><a:ln><a:noFill/></a:ln></pic:spPr></pic:pic></a:graphicData></a:graphic>");
oBuilder.WriteString(L"<a:prstGeom prst=\"rect\"><a:avLst/></a:prstGeom><a:noFill/>");
WriteBorderSettings(pCtrlPic, oBuilder);
oBuilder.WriteString(L"</pic:spPr></pic:pic></a:graphicData></a:graphic>");
oBuilder.WriteString(L"<wp14:sizeRelH relativeFrom=\"page\"><wp14:pctWidth>0</wp14:pctWidth></wp14:sizeRelH><wp14:sizeRelV relativeFrom=\"page\"><wp14:pctHeight>0</wp14:pctHeight></wp14:sizeRelV>");
CloseAnchorNode(oBuilder);
oBuilder.WriteString(L"</w:drawing></w:r>");
@ -1314,7 +1297,11 @@ void CConverter2OOXML::OpenAnchorNode(const CCtrlCommon* pCtrlShape, NSStringUti
oBuilder.WriteString(L"<wp:anchor behindDoc=\"" + std::wstring((ETextWrap::BEHIND_TEXT == pCtrlShape->GetTextWrap() ? L"1" : L"0")) +
L"\" relativeHeight=\"" + std::to_wstring(pCtrlShape->GetZOrder()) +
L"\" distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\" simplePos=\"0\" locked=\"0\" layoutInCell=\"1\" allowOverlap=\"1\">");
L"\" distT=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetTopMargin() / 10)) +
L"\" distB=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetBottomMargin() / 10)) +
L"\" distL=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetLeftMargin() / 10)) +
L"\" distR=\"" + std::to_wstring(Transform::HWPUINT2OOXML(pCtrlShape->GetRightMargin() / 10)) +
L"\" simplePos=\"0\" locked=\"0\" layoutInCell=\"1\" allowOverlap=\"1\">");
WriteShapeProperty(pCtrlShape, oBuilder);
}
@ -1367,7 +1354,15 @@ void CConverter2OOXML::WriteShapeProperty(const CCtrlCommon* pCtrlShape, NSStrin
{
case ETextWrap::SQUARE:
{
oBuilder.WriteString(L"<wp:wrapSquare wrapText=\"bothSides\"/>");
oBuilder.WriteString(L"<wp:wrapSquare wrapText=\"");
switch (pCtrlShape->GetTextFlow())
{
case 0x0: default: oBuilder.WriteString(L"bothSides"); break;
case 0x1: oBuilder.WriteString(L"left"); break;
case 0x2: oBuilder.WriteString(L"right"); break;
case 0x3: oBuilder.WriteString(L"largest"); break;
}
oBuilder.WriteString(L"\"/>");
break;
}
case ETextWrap::TOP_AND_BOTTOM:
@ -1413,6 +1408,117 @@ void CConverter2OOXML::WriteText(const std::wstring& wsText, short shParaShapeID
oBuilder.WriteString(L"</w:t></w:r>");
}
void CConverter2OOXML::WriteLineSettings(const CCtrlGeneralShape* pCtrlGeneralShape, NSStringUtils::CStringBuilder& oBuilder)
{
if (nullptr == pCtrlGeneralShape)
return;
WriteLineSettings(pCtrlGeneralShape->GetLineStyle(), pCtrlGeneralShape->GetLineColor(), pCtrlGeneralShape->GetLineThick(), 1, oBuilder);
}
void CConverter2OOXML::WriteLineSettings(ELineStyle2 eLineStyle, int nColor, int nThick, HWP_BYTE nCompoundLineType, NSStringUtils::CStringBuilder& oBuilder)
{
if (ELineStyle2::NONE == eLineStyle || 0 >= nThick)
{
oBuilder.WriteString(L"<a:ln><a:noFill/></a:ln>");
return;
}
oBuilder.WriteString(L"<a:ln");
oBuilder.WriteString(L" w=\"" + std::to_wstring(Transform::HWPUINT2OOXML(nThick)) + L"\" cap=\"sq\"");
switch (eLineStyle)
{
case ELineStyle2::DOUBLE_SLIM:
{
oBuilder.WriteString(L" cmpd=\"dbl\"");
break;
}
case ELineStyle2::SLIM_THICK:
{
oBuilder.WriteString(L" cmpd=\"thickThin\"");
break;
}
case ELineStyle2::THICK_SLIM:
{
oBuilder.WriteString(L" cmpd=\"thinThick\"");
break;
}
case ELineStyle2::SLIM_THICK_SLIM:
{
oBuilder.WriteString(L" cmpd=\"tri\"");
break;
}
default:
break;
}
oBuilder.WriteString(L">");
oBuilder.WriteString(L"<a:solidFill><a:srgbClr val=\"" + Transform::IntColorToHEX(nColor) + L"\"/></a:solidFill>");
switch (eLineStyle)
{
case ELineStyle2::DASH:
{
oBuilder.WriteString(L"<a:prstDash val=\"dash\"/>");
break;
}
case ELineStyle2::DOT:
{
oBuilder.WriteString(L"<a:prstDash val=\"dot\"/>");
break;
}
case ELineStyle2::DASH_DOT:
{
oBuilder.WriteString(L"<a:prstDash val=\"dashDot\"/>");
break;
}
case ELineStyle2::DASH_DOT_DOT:
{
oBuilder.WriteString(L"<a:prstDash val=\"sysDashDot\"/>");
break;
}
case ELineStyle2::LONG_DASH:
{
oBuilder.WriteString(L"<a:prstDash val=\"lgDash\"/>");
break;
}
case ELineStyle2::CIRCLE:
{
oBuilder.WriteString(L"<a:prstDash val=\"dot\"/>");
break;
}
default:
break;
}
switch (nCompoundLineType)
{
case 0x00:
{
oBuilder.WriteString(L"<a:round/>");
break;
}
case 0x01:
{
oBuilder.WriteString(L"<a:miter lim=\"800000\"/>");
break;
}
}
oBuilder.WriteString(L"</a:ln>");
}
void CConverter2OOXML::WriteBorderSettings(const CCtrlShapePic* pCtrlPic, NSStringUtils::CStringBuilder& oBuilder)
{
if (nullptr == pCtrlPic)
return;
WriteLineSettings(pCtrlPic->GetBorderLineStyle(), pCtrlPic->GetBorderColor(), pCtrlPic->GetBorderThick(), pCtrlPic->GetBorderCompoundLineType(), oBuilder);
}
bool CConverter2OOXML::GetBinBytes(const HWP_STRING& sID, CHWPStream& oBuffer, HWP_STRING& sFormat)
{
const CHWPDocInfo* pDocInfo = nullptr;

5
HwpFile/HwpDoc/Conversion/Converter2OOXML.h
View File

@ -80,7 +80,7 @@ class CConverter2OOXML
void WriteTableProperties(const CCtrlTable* pTable, short shParaShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
void WriteCell(const CTblCell* pCell, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState, ECellCreator eCellCreator);
void WriteCellProperties(short shBorderFillID, NSStringUtils::CStringBuilder& oBuilder);
void WriteBorder(const TBorder& oBorder, const HWP_STRING& sBorderName, NSStringUtils::CStringBuilder& oBuilder);
void WriteCellBorder(const TBorder& oBorder, const HWP_STRING& sBorderName, NSStringUtils::CStringBuilder& oBuilder);
void WriteGeometryShape(const CCtrlGeneralShape* pGeneralShape, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
void WriteEqEditShape(const CCtrlEqEdit* pEqEditShape, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
@ -100,6 +100,9 @@ class CConverter2OOXML
void WriteShapeProperty(const CCtrlCommon* pCtrlShape, NSStringUtils::CStringBuilder& oBuilder);
void WriteText(const std::wstring& wsText, short shParaShapeID, short shCharShapeID, NSStringUtils::CStringBuilder& oBuilder, TConversionState& oState);
void WriteLineSettings(const CCtrlGeneralShape* pCtrlGeneralShape, NSStringUtils::CStringBuilder& oBuilder);
void WriteLineSettings(ELineStyle2 eLineStyle, int nColor, int nThick, HWP_BYTE nCompoundLineType, NSStringUtils::CStringBuilder& oBuilder);
void WriteBorderSettings(const CCtrlShapePic* pCtrlPic, NSStringUtils::CStringBuilder& oBuilder);
bool GetBinBytes(const HWP_STRING& sID, CHWPStream& oBuffer, HWP_STRING& sFormat);

25
HwpFile/HwpDoc/Paragraph/CtrlCommon.cpp
View File

@ -241,6 +241,26 @@ namespace HWP
return m_arParas[unIndex];
}
short CCtrlCommon::GetLeftMargin() const
{
return m_arOutMargin[0];
}
short CCtrlCommon::GetTopMargin() const
{
return m_arOutMargin[2];
}
short CCtrlCommon::GetRightMargin() const
{
return m_arOutMargin[1];
}
short CCtrlCommon::GetBottomMargin() const
{
return m_arOutMargin[3];
}
int CCtrlCommon::GetHorzOffset() const
{
return m_nHorzOffset;
@ -301,6 +321,11 @@ namespace HWP
return m_eTextWrap;
}
HWP_BYTE CCtrlCommon::GetTextFlow() const
{
return m_chTextFlow;
}
int CCtrlCommon::GetZOrder() const
{
return m_nZOrder;

6
HwpFile/HwpDoc/Paragraph/CtrlCommon.h
View File

@ -151,6 +151,11 @@ public:
unsigned int GetCountParagraphs() const;
const CHWPPargraph* GetParagraphs(unsigned int unIndex) const;
short GetLeftMargin() const;
short GetTopMargin() const;
short GetRightMargin() const;
short GetBottomMargin() const;
int GetHorzOffset() const;
int GetVertOffset() const;
EVRelTo GetVertRelTo() const;
@ -163,6 +168,7 @@ public:
int GetWidth() const;
int GetHeight() const;
ETextWrap GetTextWrap() const;
HWP_BYTE GetTextFlow() const;
int GetZOrder() const;
static int ParseCtrl(CCtrlCommon& oObj, int nSize, CHWPStream& oBuffer, int nOff, int nVersion);

25
HwpFile/HwpDoc/Paragraph/CtrlGeneralShape.cpp
View File

@ -16,16 +16,21 @@
namespace HWP
{
CCtrlGeneralShape::CCtrlGeneralShape()
: m_pFill(nullptr)
{}
{
InitData();
}
CCtrlGeneralShape::CCtrlGeneralShape(const HWP_STRING& sCtrlID)
: CCtrlObjElement(sCtrlID), m_pFill(nullptr)
{}
: CCtrlObjElement(sCtrlID)
{
InitData();
}
CCtrlGeneralShape::CCtrlGeneralShape(const CCtrlGeneralShape& oGeneralShape)
: CCtrlObjElement((CCtrlObjElement)oGeneralShape)
{
InitData();
m_pParent = oGeneralShape.m_pParent;
m_nLineColor = oGeneralShape.m_nLineColor;
@ -51,8 +56,10 @@ CCtrlGeneralShape::CCtrlGeneralShape(const CCtrlGeneralShape& oGeneralShape)
}
CCtrlGeneralShape::CCtrlGeneralShape(const HWP_STRING& sCtrlID, int nSize, CHWPStream& oBuffer, int nOff, int nVersion)
: CCtrlObjElement(sCtrlID, nSize, oBuffer, nOff, nVersion), m_pFill(nullptr)
{}
: CCtrlObjElement(sCtrlID, nSize, oBuffer, nOff, nVersion)
{
InitData();
}
CCtrlGeneralShape::~CCtrlGeneralShape()
{
@ -60,6 +67,12 @@ CCtrlGeneralShape::~CCtrlGeneralShape()
m_pFill = nullptr;
}
void CCtrlGeneralShape::InitData()
{
m_eLineStyle = ELineStyle2::NONE;
m_pFill = nullptr;
}
void CCtrlGeneralShape::SetParent(CHWPPargraph* pParent)
{
m_pParent = pParent;

2
HwpFile/HwpDoc/Paragraph/CtrlGeneralShape.h
View File

@ -30,6 +30,8 @@ class CCtrlGeneralShape : public CCtrlObjElement
short m_shBottomSpace;
int m_nMaxTxtWidth;
void InitData();
friend class CCtrlShapeEllipse;
friend class CCtrlShapePolygon;
friend class CCtrlShapeRect;

20
HwpFile/HwpDoc/Paragraph/CtrlShapePic.cpp
View File

@ -154,6 +154,26 @@ int CCtrlShapePic::GetPicHeight() const
return m_nIniPicHeight;
}
ELineStyle2 CCtrlShapePic::GetBorderLineStyle() const
{
return ::HWP::GetLineStyle2((m_nBorderAttr & ((1 << 5) - 1)));
}
HWP_BYTE CCtrlShapePic::GetBorderCompoundLineType() const
{
return (HWP_BYTE)((m_nBorderAttr >> 6) & ((1 << 3) - 1));
}
int CCtrlShapePic::GetBorderColor() const
{
return m_nBorderColor;
}
int CCtrlShapePic::GetBorderThick() const
{
return m_nBorderThick;
}
int CCtrlShapePic::ParseElement(CCtrlShapePic& oObj, int nSize, CHWPStream& oBuffer, int nOff, int nVersion)
{
oBuffer.SavePosition();

5
HwpFile/HwpDoc/Paragraph/CtrlShapePic.h
View File

@ -135,6 +135,11 @@ public:
int GetPicWidth() const;
int GetPicHeight() const;
ELineStyle2 GetBorderLineStyle() const;
HWP_BYTE GetBorderCompoundLineType() const;
int GetBorderColor() const;
int GetBorderThick() const;
static int ParseElement(CCtrlShapePic& oObj, int nSize, CHWPStream& oBuffer, int nOff, int nVersion);
static int ParseCtrl(CCtrlShapePic& oObj, int nSize, CHWPStream& oBuffer, int nOff, int nVersion);
};