Kaydet (Commit) 2eaa978d authored tarafından Katarina Behrens's avatar Katarina Behrens

tdf#104658: Fix jumping bitmap-filled chart bars

Coincidentally this also resolves almost identical issues in chart wall
(tdf#114132)

Change-Id: Ib566110639d00aa46463ee592861ce3e15c64f50
Reviewed-on: https://gerrit.libreoffice.org/52624Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst 8c72e780
...@@ -430,9 +430,14 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( ...@@ -430,9 +430,14 @@ bool GraphicPropertyItemConverter::ApplySpecialItem(
bool bStretched = rItemSet.Get( XATTR_FILLBMP_STRETCH ).GetValue(); bool bStretched = rItemSet.Get( XATTR_FILLBMP_STRETCH ).GetValue();
drawing::BitmapMode aMode = drawing::BitmapMode aMode =
(bStretched ? drawing::BitmapMode_STRETCH : drawing::BitmapMode_NO_REPEAT); (bStretched ? drawing::BitmapMode_STRETCH : drawing::BitmapMode_NO_REPEAT);
drawing::BitmapMode aOtherMode = drawing::BitmapMode_NO_REPEAT;
aValue <<= aMode; aValue <<= aMode;
if( aValue != GetPropertySet()->getPropertyValue( aModePropName )) GetPropertySet()->getPropertyValue( aModePropName ) >>= aOtherMode;
// don't overwrite if it has been set to BitmapMode_REPEAT (= tiled) already
// XATTR_FILLBMP_STRETCH and XATTR_FILLBMP_TILE often come in pairs, tdf#104658
if( aMode != aOtherMode && aOtherMode != drawing::BitmapMode_REPEAT )
{ {
GetPropertySet()->setPropertyValue( aModePropName, aValue ); GetPropertySet()->setPropertyValue( aModePropName, aValue );
bChanged = true; bChanged = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment