From 98f4f2bb0f873d6cae8e9646d8eecc857c1cdd0f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 21 Dec 2015 15:31:32 +0200 Subject: loplugin:unusedfields in oox,package Change-Id: I8f8c3ff9ded455a09f3df81c501da17cca0b2310 --- oox/inc/drawingml/textbodycontext.hxx | 1 - oox/source/core/filterbase.cxx | 2 -- oox/source/docprop/docprophandler.cxx | 3 +-- oox/source/docprop/docprophandler.hxx | 1 - oox/source/drawingml/chart/objectformatter.cxx | 16 ---------------- oox/source/drawingml/diagram/diagram.hxx | 1 - oox/source/drawingml/effectproperties.hxx | 1 - oox/source/ppt/commontimenodecontext.hxx | 1 - oox/source/ppt/extdrawingfragmenthandler.cxx | 2 -- oox/source/ppt/extdrawingfragmenthandler.hxx | 2 -- oox/source/ppt/pptshapegroupcontext.cxx | 1 - oox/source/shape/ShapeContextHandler.cxx | 5 ++--- oox/source/shape/ShapeContextHandler.hxx | 1 - package/source/xstor/switchpersistencestream.cxx | 9 +++------ package/source/zipapi/XUnbufferedStream.cxx | 2 -- package/source/zipapi/XUnbufferedStream.hxx | 1 - 16 files changed, 6 insertions(+), 43 deletions(-) diff --git a/oox/inc/drawingml/textbodycontext.hxx b/oox/inc/drawingml/textbodycontext.hxx index dc026d067488..55c9cb0480f1 100644 --- a/oox/inc/drawingml/textbodycontext.hxx +++ b/oox/inc/drawingml/textbodycontext.hxx @@ -37,7 +37,6 @@ public: protected: TextBody& mrTextBody; - css::uno::Reference< css::text::XText > mxText; }; // CT_RegularTextRun diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index 3fefcc082639..35009012cd9d 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -138,7 +138,6 @@ struct FilterBaseImpl VbaProjectRef mxVbaProject; /// VBA project manager. Reference< XComponentContext > mxComponentContext; - Reference< XMultiComponentFactory > mxComponentFactory; Reference< XModel > mxModel; Reference< XMultiServiceFactory > mxModelFactory; Reference< XFrame > mxTargetFrame; @@ -161,7 +160,6 @@ FilterBaseImpl::FilterBaseImpl( const Reference< XComponentContext >& rxContext meDirection( FILTERDIRECTION_UNKNOWN ), meVersion( ECMA_DIALECT ), mxComponentContext( rxContext, UNO_SET_THROW ), - mxComponentFactory( rxContext->getServiceManager(), UNO_SET_THROW ), mbExportVBA(false) { } diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx index 420d783b77e0..b71c5ec0d22a 100644 --- a/oox/source/docprop/docprophandler.cxx +++ b/oox/source/docprop/docprophandler.cxx @@ -39,8 +39,7 @@ namespace docprop { OOXMLDocPropHandler::OOXMLDocPropHandler( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< document::XDocumentProperties >& rDocProp ) - : m_xContext( xContext ) - , m_xDocProp( rDocProp ) + : m_xDocProp( rDocProp ) , m_nState( 0 ) , m_nBlock( 0 ) , m_nType( 0 ) diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx index e4dc28f4ca36..4dd42614bf01 100644 --- a/oox/source/docprop/docprophandler.hxx +++ b/oox/source/docprop/docprophandler.hxx @@ -41,7 +41,6 @@ namespace docprop { class OOXMLDocPropHandler : public ::cppu::WeakImplHelper< css::xml::sax::XFastDocumentHandler > { - css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::document::XDocumentProperties > m_xDocProp; sal_Int32 m_nState; diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index 6661ea2e177b..af44ed5be42a 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -649,15 +649,6 @@ private: FillPropertiesPtr mxAutoFill; /// Automatic fill properties. }; -class EffectFormatter : public DetailFormatterBase -{ -public: - explicit EffectFormatter( - ObjectFormatterData& rData, - const AutoFormatEntry* pAutoFormatEntry ); - -}; - class TextFormatter : public DetailFormatterBase { public: @@ -720,7 +711,6 @@ public: private: LineFormatter maLineFormatter; /// Converter for line formatting. FillFormatter maFillFormatter; /// Converter for fill formatting. - EffectFormatter maEffectFormatter; /// Converter for effect formatting. TextFormatter maTextFormatter; /// Converter for text formatting. ModelObjectHelper& mrModelObjHelper; /// Helper for named drawing formatting. const ObjectTypeFormatEntry& mrEntry; /// Additional settings. @@ -894,11 +884,6 @@ void FillFormatter::convertFormatting( ShapePropertyMap& rPropMap, const ModelRe aFillProps.pushToPropMap( rPropMap, mrData.mrFilter.getGraphicHelper(), 0, getPhColor( nSeriesIdx ) ); } -EffectFormatter::EffectFormatter( ObjectFormatterData& rData, const AutoFormatEntry* pAutoFormatEntry ) : - DetailFormatterBase( rData, pAutoFormatEntry ) -{ -} - namespace { const TextCharacterProperties* lclGetTextProperties( const ModelRef< TextBody >& rxTextProp ) @@ -951,7 +936,6 @@ void TextFormatter::convertFormatting( PropertySet& rPropSet, const ModelRef< Te ObjectTypeFormatter::ObjectTypeFormatter( ObjectFormatterData& rData, const ObjectTypeFormatEntry& rEntry, const ChartSpaceModel& rChartSpace, const ObjectType eObjType ) : maLineFormatter( rData, lclGetAutoFormatEntry( rEntry.mpAutoLines, rChartSpace.mnStyle ) ), maFillFormatter( rData, lclGetAutoFormatEntry( rEntry.mpAutoFills, rChartSpace.mnStyle ), eObjType ), - maEffectFormatter( rData, lclGetAutoFormatEntry( rEntry.mpAutoEffects, rChartSpace.mnStyle ) ), maTextFormatter( rData, lclGetAutoTextEntry( rEntry.mpAutoTexts, rChartSpace.mnStyle ), rChartSpace.mxTextProp ), mrModelObjHelper( rData.maModelObjHelper ), mrEntry( rEntry ) diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx index f889abd190e7..3c88772f0c04 100644 --- a/oox/source/drawingml/diagram/diagram.hxx +++ b/oox/source/drawingml/diagram/diagram.hxx @@ -283,7 +283,6 @@ private: DiagramLayoutPtr mpLayout; DiagramQStyleMap maStyles; DiagramColorMap maColors; - std::map< OUString, ShapePtr > maShapeMap; DiagramDomMap maMainDomMap; css::uno::Sequence< css::uno::Sequence< css::uno::Any > > maDataRelsMap; }; diff --git a/oox/source/drawingml/effectproperties.hxx b/oox/source/drawingml/effectproperties.hxx index 9089e1dc0679..146214cc9191 100644 --- a/oox/source/drawingml/effectproperties.hxx +++ b/oox/source/drawingml/effectproperties.hxx @@ -24,7 +24,6 @@ struct EffectShadowProperties { OptValue< sal_Int64 > moShadowDist; OptValue< sal_Int64 > moShadowDir; - OptValue< sal_Int64 > moShadowAlpha; Color moShadowColor; /** Overwrites all members that are explicitly set in rSourceProps. */ diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx index 535348013f36..f5109efe2ce4 100644 --- a/oox/source/ppt/commontimenodecontext.hxx +++ b/oox/source/ppt/commontimenodecontext.hxx @@ -41,7 +41,6 @@ namespace oox { namespace ppt { private: bool mbIterate; - css::uno::Reference< css::animations::XIterateContainer > mxIter; }; } } diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx b/oox/source/ppt/extdrawingfragmenthandler.cxx index d7a77acaad68..fadfec2f90ac 100644 --- a/oox/source/ppt/extdrawingfragmenthandler.cxx +++ b/oox/source/ppt/extdrawingfragmenthandler.cxx @@ -19,14 +19,12 @@ ExtDrawingFragmentHandler::ExtDrawingFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, const oox::ppt::SlidePersistPtr& rSlidePersistPtr, const oox::ppt::ShapeLocation eShapeLocation, - oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pGroupShapePtr, oox::drawingml::ShapePtr pShapePtr) throw( ) : FragmentHandler2( rFilter, rFragmentPath ), mpSlidePersistPtr (rSlidePersistPtr ), meShapeLocation( eShapeLocation ), - mpMasterShapePtr( pMasterShapePtr ), mpGroupShapePtr( pGroupShapePtr ), mpOrgShapePtr( pShapePtr ) { diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx index 17c84a76a50e..8aaf4d02172c 100644 --- a/oox/source/ppt/extdrawingfragmenthandler.hxx +++ b/oox/source/ppt/extdrawingfragmenthandler.hxx @@ -24,7 +24,6 @@ public: ExtDrawingFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, const oox::ppt::SlidePersistPtr& rSlidePersistPtr, const oox::ppt::ShapeLocation eShapeLocation, - oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pGroupShapePtr, oox::drawingml::ShapePtr pShapePtr ) throw(); virtual ~ExtDrawingFragmentHandler() throw(); @@ -34,7 +33,6 @@ public: private: const oox::ppt::SlidePersistPtr mpSlidePersistPtr; const oox::ppt::ShapeLocation meShapeLocation; - oox::drawingml::ShapePtr mpMasterShapePtr; oox::drawingml::ShapePtr mpGroupShapePtr; oox::drawingml::ShapePtr mpOrgShapePtr; // Original Shape data, if any oox::drawingml::ShapePtr mpShapePtr; diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx index 3b3d20cfc649..d5c3dc65198b 100644 --- a/oox/source/ppt/pptshapegroupcontext.cxx +++ b/oox/source/ppt/pptshapegroupcontext.cxx @@ -129,7 +129,6 @@ void PPTShapeGroupContext::importExtDrawings( ) getFilter().importFragment( new ExtDrawingFragmentHandler( getFilter(), getFragmentPathFromRelId( *aIt ), mpSlidePersistPtr, meShapeLocation, - mpMasterShapePtr, mpGroupShapePtr, pGraphicShape ) ); // Apply font color imported from color fragment diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index 0a707d8883f9..ae14d4474efe 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -56,9 +56,8 @@ ShapeContextHandler_createInstance( const uno::Reference< uno::XComponentContext return static_cast< ::cppu::OWeakObject* >( new ShapeContextHandler(context) ); } -ShapeContextHandler::ShapeContextHandler -(uno::Reference< uno::XComponentContext > const & context) : -mnStartToken(0), m_xContext(context) +ShapeContextHandler::ShapeContextHandler(uno::Reference< uno::XComponentContext > const & context) : + mnStartToken(0) { try { diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx index ea6b1a138fae..c336129b51e5 100644 --- a/oox/source/shape/ShapeContextHandler.hxx +++ b/oox/source/shape/ShapeContextHandler.hxx @@ -151,7 +151,6 @@ private: ::sal_uInt32 mnStartToken; css::awt::Point maPosition; - css::uno::Reference< css::uno::XComponentContext > m_xContext; drawingml::ShapePtr mpShape; std::shared_ptr< vml::Drawing > mpDrawing; diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx index 88a5ab0988f7..fbada20a77f5 100644 --- a/package/source/xstor/switchpersistencestream.cxx +++ b/package/source/xstor/switchpersistencestream.cxx @@ -33,7 +33,6 @@ struct SPStreamData_Impl // the streams below are not visible from outside so there is no need to remember position // original stream related members - uno::Reference< io::XStream > m_xOrigStream; uno::Reference< io::XTruncate > m_xOrigTruncate; uno::Reference< io::XSeekable > m_xOrigSeekable; uno::Reference< io::XInputStream > m_xOrigInStream; @@ -44,7 +43,6 @@ struct SPStreamData_Impl SPStreamData_Impl( bool bInStreamBased, - const uno::Reference< io::XStream >& xOrigStream, const uno::Reference< io::XTruncate >& xOrigTruncate, const uno::Reference< io::XSeekable >& xOrigSeekable, const uno::Reference< io::XInputStream >& xOrigInStream, @@ -52,7 +50,6 @@ struct SPStreamData_Impl bool bInOpen, bool bOutOpen ) : m_bInStreamBased( bInStreamBased ) - , m_xOrigStream( xOrigStream ) , m_xOrigTruncate( xOrigTruncate ) , m_xOrigSeekable( xOrigSeekable ) , m_xOrigInStream( xOrigInStream ) @@ -116,7 +113,7 @@ void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io: CloseAll_Impl(); m_pStreamData = new SPStreamData_Impl( false, - xStream, xNewTruncate, xNewSeekable, xNewInStream, xNewOutStream, + xNewTruncate, xNewSeekable, xNewInStream, xNewOutStream, bInOpen, bOutOpen ); } @@ -150,7 +147,7 @@ void SwitchablePersistenceStream::SwitchPersistenceTo( const uno::Reference< io: CloseAll_Impl(); m_pStreamData = new SPStreamData_Impl( true, - xNewStream, xNewTruncate, xNewSeekable, xInputStream, xNewOutStream, + xNewTruncate, xNewSeekable, xInputStream, xNewOutStream, bInOpen, bOutOpen ); } @@ -194,7 +191,7 @@ void SwitchablePersistenceStream::CopyAndSwitchPersistenceTo( const uno::Referen CloseAll_Impl(); m_pStreamData = new SPStreamData_Impl( false, - xTargetStream, xTargetTruncate, xTargetSeek, xTargetInStream, xTargetOutStream, + xTargetTruncate, xTargetSeek, xTargetInStream, xTargetOutStream, bInOpen, bOutOpen ); } diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx index 3af35f9e8246..c005fc13e59e 100644 --- a/package/source/zipapi/XUnbufferedStream.cxx +++ b/package/source/zipapi/XUnbufferedStream.cxx @@ -53,7 +53,6 @@ XUnbufferedStream::XUnbufferedStream( , mxZipStream ( xNewZipStream ) , mxZipSeek ( xNewZipStream, UNO_QUERY ) , maEntry ( rEntry ) -, mxData ( rData ) , mnBlockSize( 1 ) , maInflater ( true ) , mbRawStream ( nStreamMode == UNBUFF_STREAM_RAW || nStreamMode == UNBUFF_STREAM_WRAPPEDRAW ) @@ -116,7 +115,6 @@ XUnbufferedStream::XUnbufferedStream( : maMutexHolder( new SotMutexHolder ) , mxZipStream ( xRawStream ) , mxZipSeek ( xRawStream, UNO_QUERY ) -, mxData ( rData ) , mnBlockSize( 1 ) , maInflater ( true ) , mbRawStream ( false ) diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx index 98674ebc3d0e..26167e2e9b90 100644 --- a/package/source/zipapi/XUnbufferedStream.hxx +++ b/package/source/zipapi/XUnbufferedStream.hxx @@ -53,7 +53,6 @@ protected: css::uno::Reference < css::io::XSeekable > mxZipSeek; css::uno::Sequence < sal_Int8 > maCompBuffer, maHeader; ZipEntry maEntry; - ::rtl::Reference< EncryptionData > mxData; sal_Int32 mnBlockSize; css::uno::Reference< css::xml::crypto::XCipherContext > m_xCipherContext; ZipUtils::Inflater maInflater; -- cgit