diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-14 20:46:30 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-14 21:28:08 +0100 |
| commit | 54a6b3d7b24bb041f137015feb4e6a9a11891005 (patch) | |
| tree | bb1e4b3383baede71a748c4efabd91889f7959f6 /oox | |
| parent | e8ba3d51609238c365ab471ee622513e8b30d721 (diff) | |
bool improvements
Change-Id: I89c35503d22797c5d5117e298f04e953de03044a
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/chart/titleconverter.cxx | 6 | ||||
| -rw-r--r-- | oox/source/ole/axbinarywriter.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index c6d082469439..5f4f5eabc40f 100644 --- a/oox/source/drawingml/chart/titleconverter.cxx +++ b/oox/source/drawingml/chart/titleconverter.cxx @@ -209,7 +209,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram ) cssc2::LegendPosition eLegendPos = cssc2::LegendPosition_CUSTOM; cssc::ChartLegendExpansion eLegendExpand = cssc::ChartLegendExpansion_CUSTOM; RelativePosition eRelPos; - bool bTopRight=0; + bool bTopRight=false; switch( mrModel.mnPosition ) { case XML_l: @@ -225,7 +225,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram ) eRelPos.Primary = 1; eRelPos.Secondary =0; eRelPos.Anchor = Alignment_TOP_RIGHT; - bTopRight=1; + bTopRight=true; break; case XML_t: @@ -252,7 +252,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram ) aPropSet.setProperty( PROP_AnchorPosition, eLegendPos ); aPropSet.setProperty( PROP_Expansion, eLegendExpand ); - if(eLegendPos == LegendPosition_CUSTOM && 1 == bTopRight && bManualLayout==false) + if(eLegendPos == LegendPosition_CUSTOM && bTopRight && bManualLayout==false) aPropSet.setProperty( PROP_RelativePosition , makeAny(eRelPos)); } catch( Exception& ) diff --git a/oox/source/ole/axbinarywriter.cxx b/oox/source/ole/axbinarywriter.cxx index 3f71dc263387..a6408b279bb9 100644 --- a/oox/source/ole/axbinarywriter.cxx +++ b/oox/source/ole/axbinarywriter.cxx @@ -142,8 +142,8 @@ AxBinaryPropertyWriter::AxBinaryPropertyWriter( BinaryOutputStream& rOutStrm, bo 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 ) ); + // orbValue == bReverse false then we want to set the bit, e.g. don't skip + startNextProperty( orbValue == bReverse ); } void AxBinaryPropertyWriter::writePairProperty( AxPairData& orPairData ) |