mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix morph control export also fix toggle button state export

Browse Source
This commit is contained in:
Noel Power
2011-10-03 18:55:08 +01:00
parent deb2d9b177
commit 7c20a8edbc
3 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oox/inc/oox/ole/axbinarywriter.hxx
View File

@@ -109,7 +109,7 @@ public:
{ if( startNextProperty() ) maOutStrm.writeAligned< StreamType >( ornValue ); }
/** Write a boolean property value to the stream, the
respective flag in the property mask is set. */
void writeBoolProperty( bool& orbValue, bool bReverse = false );
void writeBoolProperty( bool orbValue, bool bReverse = false );
/** Write a pair property the stream, the respective flag in
the property mask is set. */
void writePairProperty( AxPairData& orPairData );

2
oox/source/ole/axbinarywriter.cxx
View File

@@ -164,7 +164,7 @@ AxBinaryPropertyWriter::AxBinaryPropertyWriter( BinaryOutputStream& rOutStrm, bo
mnNextProp = 1;
}
void AxBinaryPropertyWriter::writeBoolProperty( bool& orbValue, bool bReverse )
void AxBinaryPropertyWriter::writeBoolProperty( bool orbValue, bool bReverse )
{
// orbValue ^ bReverse true then we want to set the bit, e.g. don't skip
startNextProperty( !( ( orbValue ^ bReverse ) >= 1 ) );

22
oox/source/ole/axcontrol.cxx
View File

@@ -540,26 +540,16 @@ void ControlConverter::convertAxState( PropertyMap& rPropMap,
}
void ControlConverter::convertToAxState( PropertySet& rPropSet,
OUString& rValue, sal_Int32& nMultiSelect, ApiDefaultStateMode eDefStateMode, bool bAwtModel ) const
OUString& rValue, sal_Int32& nMultiSelect, ApiDefaultStateMode eDefStateMode, bool /*bAwtModel*/ ) const
{
bool bBooleanState = eDefStateMode == API_DEFAULTSTATE_BOOLEAN;
bool bSupportsTriState = eDefStateMode == API_DEFAULTSTATE_TRISTATE;
sal_Int32 nPropId = bAwtModel ? PROP_State : PROP_DefaultState;
sal_Int16 nState = API_STATE_DONTKNOW;
sal_Bool bTmp = sal_False;
if( bBooleanState )
{
rPropSet.getProperty( bTmp, nPropId );
if ( bTmp )
nState = API_STATE_CHECKED;
else
nState = API_STATE_UNCHECKED;
}
else
rPropSet.getProperty( nState, nPropId );
// need to use State for current state ( I think this is regardless of whether
// control is awt or not )
rPropSet.getProperty( nState, PROP_State );
rValue = rtl::OUString(); // empty e.g. 'don't know'
if ( nState == API_STATE_UNCHECKED )
@@ -1475,7 +1465,7 @@ void AxMorphDataModelBase::exportBinaryModel( BinaryOutputStream& rOutStrm )
aWriter.skipProperty();
aWriter.skipProperty(); // drop down style
aWriter.writeIntProperty< sal_uInt8 >( mnMultiSelect );
aWriter.skipProperty(); // maValue;
aWriter.writeStringProperty( maValue );
aWriter.writeStringProperty( maCaption );
aWriter.skipProperty(); // mnPicturePos );
aWriter.writeIntProperty< sal_uInt32 >( mnBorderColor );
@@ -1484,7 +1474,7 @@ void AxMorphDataModelBase::exportBinaryModel( BinaryOutputStream& rOutStrm )
aWriter.skipProperty(); // maPictureData
aWriter.skipProperty(); // accelerator
aWriter.skipProperty(); // undefined
aWriter.skipProperty(); // some bool
aWriter.writeBoolProperty(true); // must be 1 for morph
aWriter.writeStringProperty( maGroupName );
aWriter.finalizeExport();
AxFontDataModel::exportBinaryModel( rOutStrm );