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

fix rotWithShape

Browse Source
This commit is contained in:
Elena Subbotina
2025-12-16 16:08:23 +03:00
parent c52cfd0886
commit 8144f98bb8
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,10 +213,10 @@ namespace PPTX
switch (_at) switch (_at)
{ {
case 0: case 0:
pReader->Skip(4); // dpi pFill->dpi = pReader->GetLong();
break; break;
case 1: case 1:
pReader->Skip(1); // rotWithShape pFill->rotWithShape = pReader->GetBool();
break; break;
default: default:
break; break;
@ -448,9 +448,8 @@ namespace PPTX
} }
m_type = blipFill; m_type = blipFill;
Fill = pFill; Fill = pFill;
break; }break;
}
case FILL_TYPE_GRAD: case FILL_TYPE_GRAD:
{ {
pReader->Skip(1); pReader->Skip(1);
@ -535,9 +534,8 @@ namespace PPTX
} }
m_type = gradFill; m_type = gradFill;
Fill = pFill; Fill = pFill;
break; }break;
}
case FILL_TYPE_PATT: case FILL_TYPE_PATT:
{ {
pReader->Skip(1); pReader->Skip(1);
@ -587,8 +585,8 @@ namespace PPTX
m_type = pattFill; m_type = pattFill;
Fill = pFill; Fill = pFill;
break;
} }break;
case FILL_TYPE_SOLID: case FILL_TYPE_SOLID:
{ {
pReader->Skip(1); // type + len pReader->Skip(1); // type + len
@ -599,24 +597,20 @@ namespace PPTX
pFill->Color.fromPPTY(pReader); pFill->Color.fromPPTY(pReader);
m_type = solidFill; m_type = solidFill;
Fill = pFill; Fill = pFill;
break; }break;
}
case FILL_TYPE_NOFILL: case FILL_TYPE_NOFILL:
{ {
m_type = noFill; m_type = noFill;
Fill = new PPTX::Logic::NoFill(); Fill = new PPTX::Logic::NoFill();
break; }break;
}
case FILL_TYPE_GRP: case FILL_TYPE_GRP:
{ {
m_type = grpFill; m_type = grpFill;
Fill = new PPTX::Logic::GrpFill(); Fill = new PPTX::Logic::GrpFill();
break; }break;
}
} }
} }
pReader->Seek(read_end); pReader->Seek(read_end);
} }
std::wstring UniFill::toXML() const std::wstring UniFill::toXML() const