[PATCH libreoffice-4-0] fdo#60703: MSDraw filter: fix import of flags

[Michael Stahl (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2114

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/2114/1

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)
---
M filter/source/msfilter/dffpropset.cxx
1 file changed, 2 insertions(+), 1 deletion(-)



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 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;

-- 
To view, visit https://gerrit.libreoffice.org/2114
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5c6b9cfac58a787527cd132f7fc80d392b8e677
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl <mstahl at redhat.com>