diff options
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/drawingml/chart/datasourcecontext.cxx | 3 | ||||
-rw-r--r-- | oox/source/drawingml/textbodypropertiescontext.cxx | 1 | ||||
-rw-r--r-- | oox/source/drawingml/texteffectscontext.cxx | 1 | ||||
-rw-r--r-- | oox/source/drawingml/textparagraph.cxx | 2 | ||||
-rw-r--r-- | oox/source/ole/olehelper.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/pptshapegroupcontext.cxx | 1 |
6 files changed, 3 insertions, 7 deletions
diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx index 527ee336f172..e50723b378d0 100644 --- a/oox/source/drawingml/chart/datasourcecontext.cxx +++ b/oox/source/drawingml/chart/datasourcecontext.cxx @@ -40,8 +40,7 @@ using namespace ::com::sun::star; DoubleSequenceContext::DoubleSequenceContext( ContextHandler2Helper& rParent, DataSequenceModel& rModel ) : DataSequenceContextBase( rParent, rModel ), - mnPtIndex( -1 ), - mpNumberFormatter( nullptr ) + mnPtIndex( -1 ) { } diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx b/oox/source/drawingml/textbodypropertiescontext.cxx index 9f1549c87126..02432c8771d4 100644 --- a/oox/source/drawingml/textbodypropertiescontext.cxx +++ b/oox/source/drawingml/textbodypropertiescontext.cxx @@ -61,7 +61,6 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( ContextHandler2Helper cons const AttributeList& rAttribs, TextBodyProperties& rTextBodyProp ) : ContextHandler2( rParent ) , mrTextBodyProp( rTextBodyProp ) -, mpShapePtr( nullptr ) { // ST_TextWrappingType sal_Int32 nWrappingType = rAttribs.getToken( XML_wrap, XML_square ); diff --git a/oox/source/drawingml/texteffectscontext.cxx b/oox/source/drawingml/texteffectscontext.cxx index 6d113b854c4e..9046ba5fadf9 100644 --- a/oox/source/drawingml/texteffectscontext.cxx +++ b/oox/source/drawingml/texteffectscontext.cxx @@ -110,7 +110,6 @@ TextEffectsContext::TextEffectsContext( std::vector<PropertyValue>& rTextEffectsProperties) : ContextHandler2(rParent) , mrTextEffectsProperties(rTextEffectsProperties) - , mpGrabBagStack(nullptr) , mnCurrentElement(aElementToken) { } diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index a4348d8ce13f..5c8143dbd673 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -69,7 +69,7 @@ TextParagraphPropertiesPtr TextParagraph::getParagraphStyle( const TextParagraphPropertiesVector& rListStyle = rTextListStyle.getListStyle(); if (nLevel >= static_cast< sal_Int16 >(rListStyle.size())) nLevel = 0; - TextParagraphPropertiesPtr pTextParagraphStyle = nullptr; + TextParagraphPropertiesPtr pTextParagraphStyle; if (rListStyle.size()) pTextParagraphStyle = rListStyle[nLevel]; diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 135086113245..640787cdada6 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -326,7 +326,7 @@ Reference< css::frame::XFrame > lcl_getFrame( const Reference< css::frame::XMod return xFrame; } -OleFormCtrlExportHelper::OleFormCtrlExportHelper( const Reference< XComponentContext >& rxCtx, const Reference< XModel >& rxDocModel, const Reference< XControlModel >& xCntrlModel ) : mpControl(nullptr), mpModel( nullptr ), maGrfHelper( rxCtx, lcl_getFrame( rxDocModel ), StorageRef() ), mxDocModel( rxDocModel ), mxControlModel( xCntrlModel ) +OleFormCtrlExportHelper::OleFormCtrlExportHelper( const Reference< XComponentContext >& rxCtx, const Reference< XModel >& rxDocModel, const Reference< XControlModel >& xCntrlModel ) : mpModel( nullptr ), maGrfHelper( rxCtx, lcl_getFrame( rxDocModel ), StorageRef() ), mxDocModel( rxDocModel ), mxControlModel( xCntrlModel ) { // try to get the guid Reference< css::beans::XPropertySet > xProps( xCntrlModel, UNO_QUERY ); diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx index 1d639f3316b3..de8db9b237cd 100644 --- a/oox/source/ppt/pptshapegroupcontext.cxx +++ b/oox/source/ppt/pptshapegroupcontext.cxx @@ -59,7 +59,6 @@ PPTShapeGroupContext::PPTShapeGroupContext( : ShapeGroupContext( rParent, pMasterShapePtr, pGroupShapePtr ) , mpSlidePersistPtr( rSlidePersistPtr ) , meShapeLocation( eShapeLocation ) -, pGraphicShape( nullptr ) { } |