Merge pull request 'fix rotWithShape' (#572) from fix/fix-bugs into hotfix/v9.2.1

This commit is contained in:
Elena Subbotina
2025-12-16 13:09:35 +00:00

View File

@ -213,10 +213,10 @@ namespace PPTX
switch (_at)
{
case 0:
pReader->Skip(4); // dpi
pFill->dpi = pReader->GetLong();
break;
case 1:
pReader->Skip(1); // rotWithShape
pFill->rotWithShape = pReader->GetBool();
break;
default:
break;
@ -449,8 +449,7 @@ namespace PPTX
m_type = blipFill;
Fill = pFill;
break;
}
}break;
case FILL_TYPE_GRAD:
{
pReader->Skip(1);
@ -536,8 +535,7 @@ namespace PPTX
m_type = gradFill;
Fill = pFill;
break;
}
}break;
case FILL_TYPE_PATT:
{
pReader->Skip(1);
@ -587,8 +585,8 @@ namespace PPTX
m_type = pattFill;
Fill = pFill;
break;
}
}break;
case FILL_TYPE_SOLID:
{
pReader->Skip(1); // type + len
@ -600,23 +598,19 @@ namespace PPTX
m_type = solidFill;
Fill = pFill;
break;
}
}break;
case FILL_TYPE_NOFILL:
{
m_type = noFill;
Fill = new PPTX::Logic::NoFill();
break;
}
}break;
case FILL_TYPE_GRP:
{
m_type = grpFill;
Fill = new PPTX::Logic::GrpFill();
break;
}
}break;
}
}
pReader->Seek(read_end);
}
std::wstring UniFill::toXML() const