Kaydet (Commit) e0840f70 authored tarafından Caolán McNamara's avatar Caolán McNamara

Related: rhbz#1014990 valgrind reports yet another uninitialized variable

Change-Id: Idf15ee825a34aa7788c422475aa6cea8ff802581
üst 91e15fc6
...@@ -286,8 +286,8 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co ...@@ -286,8 +286,8 @@ void PPTExParaSheet::SetStyleSheet( const ::com::sun::star::uno::Reference< ::co
if ( !nLevel ) if ( !nLevel )
{ {
if ( ( aParagraphObj.meBullet == ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) if (aParagraphObj.bExtendedParameters &&
&& aParagraphObj.bExtendedParameters ) aParagraphObj.meBullet == ::com::sun::star::beans::PropertyState_DIRECT_VALUE)
{ {
for ( sal_Int16 i = 0; i < 5; i++ ) for ( sal_Int16 i = 0; i < 5; i++ )
{ {
......
...@@ -627,10 +627,21 @@ PortionObj& PortionObj::operator=( const PortionObj& rPortionObj ) ...@@ -627,10 +627,21 @@ PortionObj& PortionObj::operator=( const PortionObj& rPortionObj )
return *this; return *this;
} }
ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, ParagraphObj::ParagraphObj(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
PPTExBulletProvider& rProv ) : PPTExBulletProvider& rProv)
maMapModeSrc ( MAP_100TH_MM ), : maMapModeSrc(MAP_100TH_MM)
maMapModeDest ( MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 576 ) ) , maMapModeDest(MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 576 ))
, mnTextSize(0)
, mbFirstParagraph(false)
, mbLastParagraph(false)
, mnTextAdjust(0)
, mnLineSpacing(0)
, mbFixedLineSpacing(false)
, mnLineSpacingTop(0)
, mnLineSpacingBottom(0)
, mbForbiddenRules(false)
, mbParagraphPunctation(false)
, mnBiDi(0)
{ {
mXPropSet = rXPropSet; mXPropSet = rXPropSet;
...@@ -643,12 +654,22 @@ ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun:: ...@@ -643,12 +654,22 @@ ParagraphObj::ParagraphObj( const ::com::sun::star::uno::Reference< ::com::sun::
ImplGetParagraphValues( rProv, sal_False ); ImplGetParagraphValues( rProv, sal_False );
} }
ParagraphObj::ParagraphObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContent, ParagraphObj::ParagraphObj(::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & rXTextContent,
ParaFlags aParaFlags, FontCollection& rFontCollection, PPTExBulletProvider& rProv ) : ParaFlags aParaFlags, FontCollection& rFontCollection, PPTExBulletProvider& rProv )
maMapModeSrc ( MAP_100TH_MM ), : maMapModeSrc(MAP_100TH_MM)
maMapModeDest ( MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 576 ) ), , maMapModeDest(MAP_INCH, Point(), Fraction( 1, 576 ), Fraction( 1, 576 ))
mbFirstParagraph ( aParaFlags.bFirstParagraph ), , mnTextSize(0)
mbLastParagraph ( aParaFlags.bLastParagraph ) , mbIsBullet(false)
, mbFirstParagraph( aParaFlags.bFirstParagraph )
, mbLastParagraph( aParaFlags.bLastParagraph )
, mnTextAdjust(0)
, mnLineSpacing(0)
, mbFixedLineSpacing(false)
, mnLineSpacingTop(0)
, mnLineSpacingBottom(0)
, mbForbiddenRules(false)
, mbParagraphPunctation(false)
, mnBiDi(0)
{ {
bExtendedParameters = sal_False; bExtendedParameters = sal_False;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment