diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-11 23:36:42 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-02-12 08:30:24 +0000 |
| commit | 8ca739d7b9acbc2fc9eff401ca850027f6e52b66 (patch) | |
| tree | 9a13bd30d33f99343962693b4b200186c6ef10fb | |
| parent | 571b1ac318c446e9a09ca69cf585171f9b7dece4 (diff) | |
fdo#60703: MSDraw filter: fix import of flags
DffPropSet::IsHardAttribute needs to handle flag properties specially
(regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70)
Change-Id: If5c6b9cfac58a787527cd132f7fc80d392b8e677
(cherry picked from commit 658c35878c14044029ca7f708fbde32b98cb226a)
Reviewed-on: https://gerrit.libreoffice.org/2114
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
| -rw-r--r-- | filter/source/msfilter/dffpropset.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/filter/source/msfilter/dffpropset.cxx b/filter/source/msfilter/dffpropset.cxx index 495bf4caa968..f8aff171998e 100644 --- a/filter/source/msfilter/dffpropset.cxx +++ b/filter/source/msfilter/dffpropset.cxx @@ -1269,7 +1269,8 @@ sal_Bool DffPropSet::IsHardAttribute( sal_uInt32 nId ) const sal_Bool bRetValue = sal_True; nId &= 0x3ff; if ( ( nId & 0x3f ) >= 48 ) // is this a flag id - bRetValue = ( mpPropSetEntries[ nId ].nComplexIndexOrFlagsHAttr & ( 1 << ( 0xf - ( nId & 0xf ) ) ) ) != 0; + bRetValue = (mpPropSetEntries[nId | 0x3f].nComplexIndexOrFlagsHAttr + & (1 << (0xf - (nId & 0xf)))) != 0; else bRetValue = ( mpPropSetEntries[ nId ].aFlags.bSoftAttr == 0 ); return bRetValue; |