filter/source/msfilter/dffpropset.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 658c35878c14044029ca7f708fbde32b98cb226a Author: Michael Stahl <[email protected]> Date: Mon Feb 11 23:36:42 2013 +0100 fdo#60703: MSDraw filter: fix import of flags DffPropSet::IsHardAttribute needs to handle flag properties specially (regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70) Change-Id: If5c6b9cfac58a787527cd132f7fc80d392b8e677 diff --git a/filter/source/msfilter/dffpropset.cxx b/filter/source/msfilter/dffpropset.cxx index 495bf4ca..f8aff17 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; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
