diff options
Diffstat (limited to 'oox/source/ole/axcontrol.cxx')
| -rw-r--r-- | oox/source/ole/axcontrol.cxx | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 563cf06e5a54..de849f9019e2 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -653,9 +653,7 @@ ComCtlModelBase::ComCtlModelBase( sal_uInt32 nDataPartId5, sal_uInt32 nDataPartI mnFlags( 0 ), mnVersion( nVersion ), mnDataPartId5( nDataPartId5 ), - mnDataPartId6( nDataPartId6 ), - mbCommonPart( true ), - mbComplexPart( true ) + mnDataPartId6( nDataPartId6 ) { } @@ -665,15 +663,13 @@ bool ComCtlModelBase::importBinaryModel( BinaryInputStream& rInStrm ) if( importSizePart( rInStrm ) && readPartHeader( rInStrm, getDataPartId(), mnVersion ) ) { // if flags part exists, the first int32 of the data part contains its size - sal_uInt32 nCommonPartSize = 0; - if (mbCommonPart) - nCommonPartSize = rInStrm.readuInt32(); + sal_uInt32 nCommonPartSize = rInStrm.readuInt32(); // implementations must read the exact amount of data, stream must point to its end afterwards importControlData( rInStrm ); // read following parts if( !rInStrm.isEof() && - (!mbCommonPart || importCommonPart( rInStrm, nCommonPartSize )) && - (!mbComplexPart || importComplexPart( rInStrm )) ) + importCommonPart( rInStrm, nCommonPartSize ) && + importComplexPart( rInStrm ) ) { return !rInStrm.isEof(); } @@ -683,8 +679,7 @@ bool ComCtlModelBase::importBinaryModel( BinaryInputStream& rInStrm ) void ComCtlModelBase::convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const { - if( mbCommonPart ) - rPropMap.setProperty( PROP_Enabled, getFlag( mnFlags, COMCTL_COMMON_ENABLED ) ); + rPropMap.setProperty( PROP_Enabled, getFlag( mnFlags, COMCTL_COMMON_ENABLED ) ); ControlModelBase::convertProperties( rPropMap, rConv ); } |