summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-09-09 13:36:33 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-09-09 19:40:02 +0200
commitfada813d5db2be370638d182e9f3b0dcd89fa081 (patch)
tree887340ded163c8e9f44a36806aced543d219647a /oox
parentf6de30f44311e6125e65e990af1bb87ef2e4b979 (diff)
loplugin:simplifyconstruct in l10ntools..package
Change-Id: I8dba8ef1e7455af1e55bbd6086b49c0606bf4927 Reviewed-on: https://gerrit.libreoffice.org/60212 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/chart/datasourcecontext.cxx3
-rw-r--r--oox/source/drawingml/textbodypropertiescontext.cxx1
-rw-r--r--oox/source/drawingml/texteffectscontext.cxx1
-rw-r--r--oox/source/drawingml/textparagraph.cxx2
-rw-r--r--oox/source/ole/olehelper.cxx2
-rw-r--r--oox/source/ppt/pptshapegroupcontext.cxx1
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 )
{
}