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

Used ClrMap in docx settings

Browse Source
This commit is contained in:
ElenaSubbotina
2017-04-27 15:57:44 +03:00
parent 39e4140524
commit 9e1773df65
6 changed files with 58 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
View File

@ -4309,7 +4309,7 @@ HRESULT CDrawingConverter::LoadClrMap(const std::wstring& bsXml)
if (oNode.IsValid())
{
pClrMap->fromXMLW(oNode.ReadNode(L"w:clrSchemeMapping"));
pClrMap->fromXML(oNode.ReadNode(L"w:clrSchemeMapping"));
}
*m_pClrMap = pClrMap;

2
ASCOfficePPTXFile/PPTXFormat/Logic/ClrMap.h
View File

@ -245,7 +245,7 @@ namespace PPTX
std::map<std::wstring, Limit::ColorSchemeIndex> ColorMap;
std::wstring m_name;
std::wstring m_name;
protected:
virtual void FillParentPointersForChilds(){};
};

14
ASCOfficePPTXFile/PPTXFormat/Logic/Colors/ColorBase.h
View File

@ -496,13 +496,13 @@ namespace PPTX
static void HSL2RGB(unsigned char* HSL, unsigned char* RGB)
{
if ( HSL[1] == 0 )
{
RGB[0] = HSL[2];
RGB[1] = HSL[2];
RGB[2] = HSL[2];
}
else
//if ( HSL[1] == 0 )
//{
// RGB[0] = HSL[2];
// RGB[1] = HSL[2];
// RGB[2] = HSL[2];
//}
//else
{
double H = double(HSL[0])/240.0;
double S = double(HSL[1])/240.0;