pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

add area format conversion

Browse Source
This commit is contained in:
Viktor Andreev
2025-12-24 17:38:27 +06:00
parent dd17cb7243
commit 50ae7db2f0
4 changed files with 75 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MsBinaryFile/XlsFile/Format/Logic/Biff_records/AreaFormat.h
View File

@ -62,11 +62,11 @@ public:
_UINT16 fls = 0;
bool fAuto = false;
bool fAuto = true;
bool fInvertNeg = false;
IcvChart icvFore = 0;
IcvChart icvBack = 0;
IcvChart icvBack = 0x0009;
};
} // namespace XLS

2
OOXML/PPTXFormat/Logic/SpPr.cpp
View File

@ -284,6 +284,8 @@ namespace PPTX
auto Frame = new XLS::FRAME;
if(ln.IsInit())
Frame->m_LineFormat = ln->toXLS();
if(Fill.is_init())
Frame->m_AreaFormat = Fill.toXLS();
return XLS::BaseObjectPtr(Frame);
}
OOX::EElementType SpPr::getType () const

70
OOXML/PPTXFormat/Logic/UniFill.cpp
View File

@ -34,6 +34,8 @@
#include "../../../DesktopEditor/common/File.h"
#include "../../../DesktopEditor/raster/ImageFileFormatChecker.h"
#include "../../../MsBinaryFile/XlsFile/Format/Logic/Biff_records/AreaFormat.h"
namespace PPTX
{
namespace Logic
@ -646,6 +648,74 @@ namespace PPTX
Fill->toXmlWriter(pWriter);
}
}
XLS::BaseObjectPtr UniFill::toXLS() const
{
auto ptr = new XLS::AreaFormat;
if (Fill.is_init())
{
if(m_type == UniFill::Type::noFill)
ptr->fls = 0;
else
{
if(m_type == UniFill::Type::solidFill)
{
ptr->fls = 1;
auto solid = dynamic_cast<PPTX::Logic::SolidFill*>(Fill.GetPointer());
auto rgba = solid->Color.Color->GetRGBA(0);
ptr->rgbFore.red = GETBITS(rgba, 0, 1);
ptr->rgbFore.green = GETBITS(rgba, 2, 3);
ptr->rgbFore.blue = GETBITS(rgba, 4, 5);
}
else if(m_type == UniFill::Type::pattFill)
{
auto patt = dynamic_cast<PPTX::Logic::PattFill*>(Fill.GetPointer());
auto rgba = patt->fgClr.Color->GetRGBA(0);
ptr->rgbFore.red = GETBITS(rgba, 0, 1);
ptr->rgbFore.green = GETBITS(rgba, 2, 3);
ptr->rgbFore.blue = GETBITS(rgba, 4, 5);
rgba = patt->bgClr.Color->GetRGBA(0);
ptr->rgbBack.red = GETBITS(rgba, 0, 1);
ptr->rgbBack.green = GETBITS(rgba, 2, 3);
ptr->rgbBack.blue = GETBITS(rgba, 4, 5);
if(patt->prst->get() == L"pct50")
ptr->fls = 2;
else if(patt->prst->get() == L"pct25")
ptr->fls = 4;
else if(patt->prst->get() == L"dkHorz")
ptr->fls = 5;
else if(patt->prst->get() == L"dkVert")
ptr->fls = 6;
else if(patt->prst->get() == L"dnDiag")
ptr->fls = 7;
else if(patt->prst->get() == L"upDiag")
ptr->fls = 8;
else if(patt->prst->get() == L"smGrid")
ptr->fls = 9;
else if(patt->prst->get() == L"trellis")
ptr->fls = 0xA;
else if(patt->prst->get() == L"narHorz")
ptr->fls = 0xB;
else if(patt->prst->get() == L"ltVert")
ptr->fls = 0xC;
else if(patt->prst->get() == L"dashDnDiag")
ptr->fls = 0xD;
else if(patt->prst->get() == L"dashUpDiag")
ptr->fls = 0xE;
else if(patt->prst->get() == L"horzBrick")
ptr->fls = 0xF;
else if(patt->prst->get() == L"pct30")
ptr->fls = 0x10;
else if(patt->prst->get() == L"dotDmnd")
ptr->fls = 0x11;
else if(patt->prst->get() == L"pct5")
ptr->fls = 0x12;
}
}
}
return XLS::BaseObjectPtr(ptr);
}
bool UniFill::is_init() const
{
return (Fill.IsInit());

1
OOXML/PPTXFormat/Logic/UniFill.h
View File

@ -58,6 +58,7 @@ namespace PPTX
virtual void toPPTY(NSBinPptxRW::CBinaryFileWriter* pWriter) const;
virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader);
virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const;
XLS::BaseObjectPtr toXLS() const;
virtual bool is_init() const;