loplugin:unusedfields

make it a little smarter in dealing with fields that are smart pointers

Change-Id: I44072105170882dc29fb19558f1065cffc7e5f11
Reviewed-on: https://gerrit.libreoffice.org/37751Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

canvas/source/cairo/cairo_canvas.cxx

@@ -43,9 +43,8 @@ using namespace ::com::sun::star;
 namespace cairocanvas
 {
     Canvas::Canvas( const uno::Sequence< uno::Any >&                aArguments,
-                    const uno::Reference< uno::XComponentContext >& rxContext ) :
-        maArguments(aArguments),
-        mxComponentContext( rxContext )
+                    const uno::Reference< uno::XComponentContext >& /*rxContext*/ ) :
+        maArguments(aArguments)
     {
     }
 
@@ -115,8 +114,6 @@ namespace cairocanvas
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        mxComponentContext.clear();
-
         // forward to parent
         CanvasBaseT::disposeThis();
     }

canvas/source/cairo/cairo_canvas.hxx

@@ -140,7 +140,6 @@ namespace cairocanvas
 
      private:
         css::uno::Sequence< css::uno::Any >                maArguments;
-        css::uno::Reference< css::uno::XComponentContext > mxComponentContext;
     };
 
     typedef ::rtl::Reference< Canvas > CanvasRef;

canvas/source/cairo/cairo_spritecanvas.cxx

@@ -41,9 +41,8 @@ using namespace ::com::sun::star;
 namespace cairocanvas
 {
     SpriteCanvas::SpriteCanvas( const uno::Sequence< uno::Any >&                aArguments,
-                                const uno::Reference< uno::XComponentContext >& rxContext ) :
-        maArguments(aArguments),
-        mxComponentContext( rxContext )
+                                const uno::Reference< uno::XComponentContext >& /*rxContext*/ ) :
+        maArguments(aArguments)
     {
     }
 
@@ -109,8 +108,6 @@ namespace cairocanvas
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        mxComponentContext.clear();
-
         // forward to parent
         SpriteCanvasBaseT::disposeThis();
     }

canvas/source/cairo/cairo_spritecanvas.hxx

@@ -151,7 +151,6 @@ namespace cairocanvas
 
      private:
         css::uno::Sequence< css::uno::Any >                maArguments;
-        css::uno::Reference< css::uno::XComponentContext > mxComponentContext;
     };
 
     typedef ::rtl::Reference< SpriteCanvas > SpriteCanvasRef;

canvas/source/opengl/ogl_spritecanvas.cxx

@@ -34,9 +34,8 @@ namespace sdecl = comphelper::service_decl;
 namespace oglcanvas
 {
     SpriteCanvas::SpriteCanvas( const uno::Sequence< uno::Any >&                aArguments,
-                                const uno::Reference< uno::XComponentContext >& rxContext ) :
-        maArguments(aArguments),
-        mxComponentContext( rxContext )
+                                const uno::Reference< uno::XComponentContext >& /*rxContext*/ ) :
+        maArguments(aArguments)
     {
     }
 
@@ -82,8 +81,6 @@ namespace oglcanvas
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        mxComponentContext.clear();
-
         // forward to parent
         SpriteCanvasBaseT::disposeThis();
     }

canvas/source/opengl/ogl_spritecanvas.hxx

@@ -107,7 +107,6 @@ namespace oglcanvas
 
     private:
         css::uno::Sequence< css::uno::Any >                maArguments;
-        css::uno::Reference< css::uno::XComponentContext > mxComponentContext;
     };
 
     typedef ::rtl::Reference< SpriteCanvas > SpriteCanvasRef;

canvas/source/vcl/canvas.cxx

@@ -65,9 +65,8 @@ namespace vclcanvas
     }
 
     Canvas::Canvas( const uno::Sequence< uno::Any >&                aArguments,
-                    const uno::Reference< uno::XComponentContext >& rxContext ) :
-        maArguments(aArguments),
-        mxComponentContext( rxContext )
+                    const uno::Reference< uno::XComponentContext >& /*rxContext*/ ) :
+        maArguments(aArguments)
     {
     }
 
@@ -121,8 +120,6 @@ namespace vclcanvas
     {
         SolarMutexGuard aGuard;
 
-        mxComponentContext.clear();
-
         // forward to parent
         CanvasBaseT::disposeThis();
     }

canvas/source/vcl/canvas.hxx

@@ -112,7 +112,6 @@ namespace vclcanvas
 
     private:
         css::uno::Sequence< css::uno::Any >                maArguments;
-        css::uno::Reference< css::uno::XComponentContext > mxComponentContext;
     };
 
     typedef ::rtl::Reference< Canvas > CanvasRef;

canvas/source/vcl/spritecanvas.cxx

@@ -42,9 +42,8 @@ using namespace ::com::sun::star;
 namespace vclcanvas
 {
     SpriteCanvas::SpriteCanvas( const uno::Sequence< uno::Any >&                aArguments,
-                                const uno::Reference< uno::XComponentContext >& rxContext ) :
-        maArguments(aArguments),
-        mxComponentContext( rxContext )
+                                const uno::Reference< uno::XComponentContext >& /*rxContext*/ ) :
+        maArguments(aArguments)
     {
     }
 
@@ -113,8 +112,6 @@ namespace vclcanvas
     {
         SolarMutexGuard aGuard;
 
-        mxComponentContext.clear();
-
         // forward to parent
         SpriteCanvasBaseT::disposeThis();
     }

canvas/source/vcl/spritecanvas.hxx

@@ -149,7 +149,6 @@ namespace vclcanvas
 
     private:
         css::uno::Sequence< css::uno::Any >                maArguments;
-        css::uno::Reference< css::uno::XComponentContext > mxComponentContext;
     };
 
     typedef ::rtl::Reference< SpriteCanvas > SpriteCanvasRef;

compilerplugins/clang/unusedfields.cxx

@@ -259,6 +259,11 @@ bool UnusedFields::VisitMemberExpr( const MemberExpr* memberExpr )
                 if (startswith(name, "read") || name.find(">>=") != std::string::npos)
                     // this is a write-only call
                     ;
+                else if (name == "clear" || name == "dispose" || name == "clearAndDispose" || name == "swap")
+                    // we're abusing the write-only analysis here to look for fields which don't have anything useful
+                    // being done to them, so we're ignoreing things like std::vector::clear, vector::swap,
+                    // and VclPtr::clearAndDispose
+                    ;
                 else
                     bPotentiallyReadFrom = true;
             }

compilerplugins/clang/unusedfields.untouched.results

@@ -38,6 +38,36 @@ compilerplugins/clang/test/unnecessaryoverride-dtor.hxx:42
     IncludedDerived3 m rtl::Reference<Incomplete>
 connectivity/source/drivers/mork/MDatabaseMetaData.hxx:29
     connectivity::mork::ODatabaseMetaData m_pMetaDataHelper std::unique_ptr<MDatabaseMetaDataHelper>
+connectivity/source/inc/OTypeInfo.hxx:31
+    connectivity::OTypeInfo aTypeName class rtl::OUString
+connectivity/source/inc/OTypeInfo.hxx:32
+    connectivity::OTypeInfo aLiteralPrefix class rtl::OUString
+connectivity/source/inc/OTypeInfo.hxx:33
+    connectivity::OTypeInfo aLiteralSuffix class rtl::OUString
+connectivity/source/inc/OTypeInfo.hxx:34
+    connectivity::OTypeInfo aCreateParams class rtl::OUString
+connectivity/source/inc/OTypeInfo.hxx:35
+    connectivity::OTypeInfo aLocalTypeName class rtl::OUString
+connectivity/source/inc/OTypeInfo.hxx:37
+    connectivity::OTypeInfo nPrecision sal_Int32
+connectivity/source/inc/OTypeInfo.hxx:39
+    connectivity::OTypeInfo nMaximumScale sal_Int16
+connectivity/source/inc/OTypeInfo.hxx:40
+    connectivity::OTypeInfo nMinimumScale sal_Int16
+connectivity/source/inc/OTypeInfo.hxx:43
+    connectivity::OTypeInfo nSearchType sal_Int16
+connectivity/source/inc/OTypeInfo.hxx:44
+    connectivity::OTypeInfo nNumPrecRadix sal_Int16
+connectivity/source/inc/OTypeInfo.hxx:46
+    connectivity::OTypeInfo bCurrency _Bool
+connectivity/source/inc/OTypeInfo.hxx:47
+    connectivity::OTypeInfo bAutoIncrement _Bool
+connectivity/source/inc/OTypeInfo.hxx:48
+    connectivity::OTypeInfo bNullable _Bool
+connectivity/source/inc/OTypeInfo.hxx:49
+    connectivity::OTypeInfo bCaseSensitive _Bool
+connectivity/source/inc/OTypeInfo.hxx:50
+    connectivity::OTypeInfo bUnsigned _Bool
 cppu/source/threadpool/threadpool.cxx:377
     _uno_ThreadPool dummy sal_Int32
 cppu/source/typelib/typelib.cxx:61
@@ -54,6 +84,10 @@ extensions/source/propctrlr/propertyhandler.hxx:80
     pcr::PropertyHandler m_aEnsureResAccess class pcr::PcrClient
 extensions/source/scanner/scanner.hxx:46
     ScannerManager maProtector osl::Mutex
+filter/source/xsltdialog/xmlfiltersettingsdialog.hxx:71
+    XMLFilterListBox m_aEnsureResMgr class EnsureResMgr
+filter/source/xsltdialog/xmlfiltersettingsdialog.hxx:130
+    XMLFilterSettingsDialog maEnsureResMgr class EnsureResMgr
 framework/inc/dispatch/oxt_handler.hxx:95
     framework::Oxt_Handler m_xSelfHold css::uno::Reference<css::uno::XInterface>
 include/comphelper/MasterPropertySet.hxx:38
@@ -131,7 +165,7 @@ sfx2/source/doc/doctempl.cxx:119
 starmath/inc/view.hxx:224
     SmViewShell maGraphicController class SmGraphicController
 svtools/source/svhtml/htmlkywd.cxx:558
-    HTML_OptionEntry  union HTML_OptionEntry::(anonymous at /home/noel/libo/svtools/source/svhtml/htmlkywd.cxx:558:5)
+    HTML_OptionEntry  union HTML_OptionEntry::(anonymous at /home/noel/libo2/svtools/source/svhtml/htmlkywd.cxx:558:5)
 svtools/source/svhtml/htmlkywd.cxx:560
     HTML_OptionEntry::(anonymous) sToken const sal_Char *
 svtools/source/svhtml/htmlkywd.cxx:561

connectivity/source/drivers/file/FTables.cxx

@@ -45,12 +45,6 @@ void OTables::impl_refresh(  )
     static_cast<OFileCatalog&>(m_rParent).refreshTables();
 }
 
-void OTables::disposing()
-{
-m_xMetaData.clear();
-    OCollection::disposing();
-}
-
 Any SAL_CALL OTables::queryInterface( const Type & rType )
 {
     if( rType == cppu::UnoType<XColumnLocate>::get()||

connectivity/source/drivers/jdbc/ResultSet.cxx

@@ -101,7 +101,6 @@ void java_sql_ResultSet::disposing()
     OPropertySetHelper::disposing();
 
     ::osl::MutexGuard aGuard(m_aMutex);
-m_xMetaData.clear();
     if( object )
     {
         SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!");

connectivity/source/inc/file/FTables.hxx

@@ -32,20 +32,14 @@ namespace connectivity
             public sdbcx::OCollection
         {
         protected:
-            css::uno::Reference< css::sdbc::XDatabaseMetaData >   m_xMetaData;
-
             virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
             virtual void impl_refresh() override;
         public:
             OTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
                 const TStringVector &_rVector) : sdbcx::OCollection(_rParent,_rMetaData->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
-                ,m_xMetaData(_rMetaData)
             {}
 
             virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-
-            // only the name is identical to ::cppu::OComponentHelper
-            virtual void SAL_CALL disposing() override;
         };
     }
 }

connectivity/source/inc/java/sql/ResultSet.hxx

@@ -61,7 +61,6 @@ namespace connectivity
                                 public  ::comphelper::OPropertyArrayUsageHelper<java_sql_ResultSet>
     {
         css::uno::Reference< css::uno::XInterface>            m_xStatement;
-        css::uno::Reference< css::sdbc::XResultSetMetaData>   m_xMetaData;
         java::sql::ConnectionLog                              m_aLogger;
         java_sql_Connection*                                  m_pConnection;
 

cui/source/dialogs/iconcdlg.cxx

@@ -45,8 +45,7 @@ IconChoicePage::IconChoicePage( vcl::Window *pParent, const OString& rID,
                                 const SfxItemSet* pItemSet )
 :   TabPage                   ( pParent, rID, rUIXMLDescription ),
     pSet                      ( pItemSet ),
-    bHasExchangeSupport       ( false ),
-    pDialog                   ( nullptr )
+    bHasExchangeSupport       ( false )
 {
     SetStyle ( GetStyle()  | WB_DIALOGCONTROL | WB_HIDE );
 }
@@ -57,12 +56,6 @@ IconChoicePage::~IconChoicePage()
     disposeOnce();
 }
 
-void IconChoicePage::dispose()
-{
-    pDialog.clear();
-    TabPage::dispose();
-}
-
 /**********************************************************************
 |
 | Activate / Deaktivate

cui/source/inc/cuitabarea.hxx

@@ -606,7 +606,6 @@ class SvxPatternTabPage : public SvxTabPage
     using TabPage::DeactivatePage;
 
 private:
-    VclPtr<VclBox>             m_pBxPixelEditor;
     VclPtr<SvxPixelCtl>        m_pCtlPixel;
     VclPtr<SvxColorListBox>    m_pLbColor;
     VclPtr<SvxColorListBox>    m_pLbBackgroundColor;
@@ -614,7 +613,6 @@ private:
     VclPtr<SvxXRectPreview>    m_pCtlPreview;
     VclPtr<PushButton>         m_pBtnAdd;
     VclPtr<PushButton>         m_pBtnModify;
-    VclPtr<PushButton>         m_pBtnDelete;
 
     SvxBitmapCtl*       m_pBitmapCtl;
 

cui/source/inc/iconcdlg.hxx

@@ -63,7 +63,6 @@ private:
     const SfxItemSet*   pSet;
     OUString            aUserString;
     bool                bHasExchangeSupport;
-    VclPtr<IconChoiceDialog>   pDialog;
 
     void                ImplInitSettings();
 
@@ -75,7 +74,6 @@ protected:
 
 public:
     virtual ~IconChoicePage() override;
-    virtual void        dispose() override;
 
     const SfxItemSet&   GetItemSet() const { return *pSet; }
 

cui/source/tabpages/tppattern.cxx

@@ -151,9 +151,7 @@ void SvxPatternTabPage::dispose()
     m_pCtlPreview.clear();
     m_pBtnAdd.clear();
     m_pBtnModify.clear();
-    m_pBxPixelEditor.clear();
     m_pPatternLB.clear();
-    m_pBtnDelete.clear();
     SvxTabPage::dispose();
 }
 

dbaccess/source/ui/inc/WCPage.hxx

@@ -45,9 +45,6 @@ namespace dbaui
         VclPtr<Edit>              m_pEdKeyName;
         sal_Int16          m_nOldOperation;
 
-        VclPtr<OWizColumnSelect>  m_pPage2;
-        VclPtr<OWizNormalExtend>  m_pPage3;
-
         bool               m_bPKeyAllowed;
         bool               m_bUseHeaderAllowed;
 

dbaccess/source/ui/misc/WCPage.cxx

@@ -54,8 +54,6 @@ namespace CopyTableOperation = css::sdb::application::CopyTableOperation;
 OCopyTable::OCopyTable(vcl::Window * pParent)
     : OWizardPage(pParent, "CopyTablePage", "dbaccess/ui/copytablepage.ui")
     , m_nOldOperation(0)
-    , m_pPage2(nullptr)
-    , m_pPage3(nullptr)
     , m_bPKeyAllowed(false)
     , m_bUseHeaderAllowed(true)
 {
@@ -116,8 +114,6 @@ void OCopyTable::dispose()
     m_pCB_PrimaryColumn.clear();
     m_pFT_KeyName.clear();
     m_pEdKeyName.clear();
-    m_pPage2.clear();
-    m_pPage3.clear();
     OWizardPage::dispose();
 }
 

dbaccess/source/ui/querydesign/querydlg.cxx

@@ -49,7 +49,6 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,
     : ModalDialog( pParent, "JoinDialog", "dbaccess/ui/joindialog.ui" )
     , m_pTableControl( nullptr )
     , m_pTableMap(_pTableMap)
-    , m_pTableView(pParent)
     , eJoinType(static_cast<OQueryTableConnectionData*>(_pData.get())->GetJoinType())
     , m_pOrigConnData(_pData)
     , m_xConnection(_xConnection)
@@ -150,7 +149,6 @@ void DlgQryJoin::dispose()
     m_pPB_OK.clear();
     m_pLB_JoinType.clear();
     m_pCBNatural.clear();
-    m_pTableView.clear();
     ModalDialog::dispose();
 }
 

dbaccess/source/ui/querydesign/querydlg.hxx

@@ -46,7 +46,6 @@ namespace dbaui
 
         OTableListBoxControl*               m_pTableControl;
         OJoinTableView::OTableWindowMap*    m_pTableMap;
-        VclPtr<OQueryTableView>             m_pTableView;
 
         EJoinType                           eJoinType;
         TTableConnectionData::value_type    m_pConnData; // contains left and right table

filter/source/msfilter/msdffimp.cxx

@@ -5594,7 +5594,6 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_,
      nGroupShapeFlags(0),                   // ensure initialization here, as some corrupted
                                             // files may yield to this being uninitialized
      maBaseURL( rBaseURL ),
-     mnCurMaxShapeId(0),
      mnIdClusters(0),
      rStCtrl(  rStCtrl_  ),
      pStData(  pStData_  ),
@@ -5638,7 +5637,6 @@ SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, const OUString& rBaseURL )
      nBLIPCount(  USHRT_MAX ),              // initialize with error, since we first have to check
      nGroupShapeFlags(0),
      maBaseURL( rBaseURL ),
-     mnCurMaxShapeId(0),
      mnIdClusters(0),
      rStCtrl(  rStCtrl_  ),
      pStData( nullptr ),
@@ -5716,7 +5714,8 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL )
         if (bOk && SeekToRec(rStCtrl, DFF_msofbtDgg, aRecHd.GetRecEndFilePos(), &aDggAtomHd))
         {
             aDggAtomHd.SeekToContent( rStCtrl );
-            rStCtrl.ReadUInt32( mnCurMaxShapeId )
+            sal_uInt32 nCurMaxShapeId;
+            rStCtrl.ReadUInt32( nCurMaxShapeId )
                    .ReadUInt32( mnIdClusters )
                    .ReadUInt32( nDummy )
                    .ReadUInt32( nDummy ); // nDrawingsSaved

framework/inc/uielement/menubarmanager.hxx

@@ -198,7 +198,6 @@ class MenuBarManager:
         OUString                                                     m_aModuleIdentifier;
         VclPtr<Menu>                                                 m_pVCLMenu;
         css::uno::Reference< css::frame::XFrame >                    m_xFrame;
-        css::uno::Reference< css::container::XNameAccess >           m_xUICommandLabels;
         css::uno::Reference< css::frame::XUIControllerFactory >      m_xPopupMenuControllerFactory;
         ::std::vector< MenuItemHandler* >                            m_aMenuItemHandlerVector;
         css::uno::Reference< css::frame::XDispatchProvider >         m_xDispatchProvider;

framework/source/dispatch/loaddispatcher.cxx

@@ -27,8 +27,7 @@ LoadDispatcher::LoadDispatcher(const css::uno::Reference< css::uno::XComponentCo
                                const css::uno::Reference< css::frame::XFrame >&          xOwnerFrame ,
                                const OUString&                                           sTargetName ,
                                      sal_Int32                                           nSearchFlags)
-    : m_xContext    (xContext    )
-    , m_xOwnerFrame (xOwnerFrame )
+    : m_xOwnerFrame (xOwnerFrame )
     , m_sTarget     (sTargetName )
     , m_nSearchFlags(nSearchFlags)
     , m_aLoader     (xContext    )
@@ -37,7 +36,6 @@ LoadDispatcher::LoadDispatcher(const css::uno::Reference< css::uno::XComponentCo
 
 LoadDispatcher::~LoadDispatcher()
 {
-    m_xContext.clear();
 }
 
 void SAL_CALL LoadDispatcher::dispatchWithNotification(const css::util::URL&                                             aURL      ,

framework/source/inc/dispatch/loaddispatcher.hxx

@@ -44,9 +44,6 @@ class LoadDispatcher : public  ::cppu::WeakImplHelper< css::frame::XNotifyingDis
     private:
         osl::Mutex m_mutex;
 
-        /** @short  can be used to create own needed services on demand. */
-        css::uno::Reference< css::uno::XComponentContext > m_xContext;
-
         /** @short  TODO document me */
         css::uno::WeakReference< css::frame::XFrame > m_xOwnerFrame;
 

framework/source/uielement/menubarmanager.cxx

@@ -249,7 +249,6 @@ void SAL_CALL MenuBarManager::disposing()
     m_xGlobalAcceleratorManager.clear();
     m_xModuleAcceleratorManager.clear();
     m_xDocAcceleratorManager.clear();
-    m_xUICommandLabels.clear();
     m_xPopupMenuControllerFactory.clear();
     m_xContext.clear();
 }

framework/source/uielement/objectmenucontroller.cxx

@@ -82,8 +82,6 @@ public:
 
 private:
     void fillPopupMenu( const css::uno::Sequence< css::embed::VerbDescriptor >& rVerbCommandSeq, css::uno::Reference< css::awt::XPopupMenu >& rPopupMenu );
-
-    css::uno::Reference< css::frame::XDispatch >  m_xObjectUpdateDispatch;
 };
 
 ObjectMenuController::ObjectMenuController( const css::uno::Reference< css::uno::XComponentContext >& xContext ) :
@@ -131,7 +129,6 @@ void SAL_CALL ObjectMenuController::disposing( const EventObject& )
     osl::MutexGuard aLock( m_aMutex );
     m_xFrame.clear();
     m_xDispatch.clear();
-    m_xObjectUpdateDispatch.clear();
 
     if ( m_xPopupMenu.is() )
         m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(static_cast<OWeakObject *>(this), UNO_QUERY ));

include/filter/msfilter/msdffimp.hxx

@@ -410,7 +410,6 @@ protected:
     typedef std::map<sal_uInt32, sal_uInt32> OffsetMap;
 
     OUString        maBaseURL;
-    sal_uInt32      mnCurMaxShapeId;    // we need this information to
     sal_uInt32      mnIdClusters;       // while only knowing the shapeid
     std::vector<FIDCL> maFidcls;
     OffsetMap       maDgOffsetTable;    ///< array of fileoffsets

include/svx/fontwork.hxx

@@ -96,9 +96,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
     VclPtr<ToolBox>         m_pTbxStyle;
     VclPtr<ToolBox>         m_pTbxAdjust;
 
-    VclPtr<FixedImage>      m_pFbDistance;
     VclPtr<MetricField>     m_pMtrFldDistance;
-    VclPtr<FixedImage>      m_pFbTextStart;
     VclPtr<MetricField>     m_pMtrFldTextStart;
 
     VclPtr<ToolBox>         m_pTbxShadow;

reportdesign/source/core/api/FormattedField.cxx

@@ -97,7 +97,6 @@ void SAL_CALL OFormattedField::dispose()
     FormattedFieldPropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
     m_xFormatsSupplier.clear();
-    m_xFunction.clear();
 }
 
 OUString OFormattedField::getImplementationName_Static(  )

reportdesign/source/core/api/Section.cxx

@@ -110,7 +110,6 @@ OSection::OSection(const uno::Reference< report::XReportDefinition >& xParentDef
 :SectionBase(m_aMutex)
 ,SectionPropertySet(context,SectionPropertySet::IMPLEMENTS_PROPERTY_SET,rStrings)
 ,m_aContainerListeners(m_aMutex)
-,m_xContext(context)
 ,m_xGroup(xParentGroup)
 ,m_xReportDefinition(xParentDef)
 ,m_nHeight(3000)
@@ -168,7 +167,6 @@ void SAL_CALL OSection::disposing()
 {
     lang::EventObject aDisposeEvent( static_cast< ::cppu::OWeakObject* >( this ) );
     m_aContainerListeners.disposeAndClear( aDisposeEvent );
-    m_xContext.clear();
 }
 
 OUString SAL_CALL OSection::getImplementationName(  )

reportdesign/source/core/inc/FormattedField.hxx

@@ -48,7 +48,6 @@ namespace reportdesign
         OReportControlModel                             m_aProps;
         css::uno::Reference< css::util::XNumberFormatsSupplier >
                                                         m_xFormatsSupplier;
-        css::uno::Reference< css::report::XFunction> m_xFunction;
         ::sal_Int32                                     m_nFormatKey;
 
     private:

reportdesign/source/core/inc/Section.hxx

@@ -53,8 +53,7 @@ namespace reportdesign
                     public SectionBase,
                     public SectionPropertySet
     {
-        ::comphelper::OInterfaceContainerHelper2                                                  m_aContainerListeners;
-        css::uno::Reference< css::uno::XComponentContext >                                  m_xContext;
+        ::comphelper::OInterfaceContainerHelper2                                            m_aContainerListeners;
         css::uno::Reference< css::drawing::XDrawPage >                                      m_xDrawPage;
         css::uno::Reference< css::drawing::XShapeGrouper >                                  m_xDrawPage_ShapeGrouper;
         css::uno::Reference< css::form::XFormsSupplier2 >                                   m_xDrawPage_FormSupplier;

rsc/inc/rscdb.hxx

@@ -46,23 +46,12 @@ struct WriteRcContext
     RscCmdLine*    pCmdLine;
 };
 
-// table for system dependent resources
-struct RscSysEntry
-{
-    sal_uInt32      nKey;
-    RESOURCE_TYPE   nRscTyp;
-    OString         aFileName;
-    sal_uInt32      nTyp;
-    sal_uInt32      nRefId;
-};
-
 class RscTypCont
 {
     rtl_TextEncoding    nSourceCharSet;
     RSCBYTEORDER_TYPE   nByteOrder;         // Intel or
     OString             aLanguage;          // output language
     std::vector< sal_uInt32 > aLangFallbacks;   // language fallback list (entry 0 is language itself)
-    sal_uInt32          nUniqueId;          // unique id for system resources
     sal_uLong           nFilePos;           // position in file (MTF)
     sal_uInt32          nPMId;              // unique id for PR-resource file
                                             // must be greater that RSC_VERSIONCONTROL_ID
@@ -71,8 +60,6 @@ class RscTypCont
 
     ::std::vector< RscTop* >
                         aBaseLst;           // list of simple resource class
-    ::std::vector< RscSysEntry* >
-                        aSysLst;            // list of system resources
 
     void        Init();         // initializes classes and tables
     void        SETCONST( RscEnum *, const char *, sal_uInt32 );
@@ -114,7 +101,6 @@ public:
                           }
                       // deletes all resource objects of this file
     void              Delete( RscFileTab::Index lFileKey );
-    void              ClearSysNames();
     ERRTYPE           WriteRc( WriteRcContext& rContext );
     void              WriteSrc( FILE * fOutput, RscFileTab::Index nFileIndex );
     void              PutTranslatorKey( sal_uInt64 nKey );

rsc/source/parser/rscdb.cxx

@@ -39,7 +39,6 @@ RscTypCont::RscTypCont( RscError * pErrHdl,
                           CommandFlags nFlagsP )
     : nSourceCharSet( RTL_TEXTENCODING_UTF8 )
     , nByteOrder( nOrder )
-    , nUniqueId(256)
     , nFilePos( 0 )
     , nPMId(RSC_VERSIONCONTROL + RESOURCE_TYPE(1)) // at least one more
     , aEnumLong( pHS->getID( "enum_long" ), RSC_NOTYPE )
@@ -175,17 +174,6 @@ RscTypCont::~RscTypCont()
 
     for (RscTop* pItem : aBaseLst)
         delete pItem;
-
-    for (RscSysEntry* pItem: aSysLst)
-        delete pItem;
-}
-
-void RscTypCont::ClearSysNames()
-{
-    for (RscSysEntry* pItem: aSysLst)
-        delete pItem;
-
-    aSysLst.clear();
 }
 
 class RscEnumerateObj

rsc/source/rsc/rsc.cxx

@@ -610,7 +610,6 @@ ERRTYPE RscCompiler::Link()
             // write file
             pTC->ChangeLanguage( it->aLangName );
             pTC->SetSourceCharSet( RTL_TEXTENCODING_UTF8 );
-            pTC->ClearSysNames();
 
             WriteRcContext  aContext;
 

sd/source/ui/dlg/animobjs.cxx

@@ -130,7 +130,6 @@ const size_t AnimationWindow::EMPTY_FRAMELIST = std::numeric_limits<size_t>::max
 AnimationWindow::AnimationWindow(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* pParent)
     : SfxDockingWindow(pInBindings, pCW, pParent,
         "DockingAnimation", "modules/simpress/ui/dockinganimation.ui")
-    , pWin(pParent)
     , m_nCurrentFrame(EMPTY_FRAMELIST)
     , bMovie(false)
     , bAllObjects(false)
@@ -240,7 +239,6 @@ void AnimationWindow::dispose()
     m_pFtAdjustment.clear();
     m_pLbAdjustment.clear();
     m_pBtnCreateGroup.clear();
-    pWin.clear();
     SfxDockingWindow::dispose();
 }
 

sd/source/ui/inc/Ruler.hxx

@@ -49,7 +49,6 @@ public:
 
     using ::Ruler::SetNullOffset;
 protected:
-    VclPtr< ::sd::Window> pSdWin;
     DrawViewShell* pDrViewShell;
     RulerCtrlItem* pCtrlItem;
     bool bHorz;

sd/source/ui/inc/animobjs.hxx

@@ -117,7 +117,6 @@ private:
     VclPtr<ListBox>        m_pLbAdjustment;
     VclPtr<PushButton>     m_pBtnCreateGroup;
 
-    VclPtr<vcl::Window>    pWin;
     ::std::vector< ::std::pair<BitmapEx*, ::tools::Time*> > m_FrameList;
     static const size_t EMPTY_FRAMELIST;
     size_t          m_nCurrentFrame;

sd/source/ui/view/sdruler.cxx

@@ -70,7 +70,6 @@ void RulerCtrlItem::StateChanged( sal_uInt16 nSId, SfxItemState, const SfxPoolIt
 
 Ruler::Ruler( DrawViewShell& rViewSh, vcl::Window* pParent, ::sd::Window* pWin, SvxRulerSupportFlags nRulerFlags,  SfxBindings& rBindings, WinBits nWinStyle)
     : SvxRuler(pParent, pWin, nRulerFlags, rBindings, nWinStyle)
-    , pSdWin(pWin)
     , pDrViewShell(&rViewSh)
 {
     rBindings.EnterRegistrations();
@@ -100,7 +99,6 @@ void Ruler::dispose()
     rBindings.EnterRegistrations();
     DELETEZ( pCtrlItem );
     rBindings.LeaveRegistrations();
-    pSdWin.clear();
     SvxRuler::dispose();
 }
 

sfx2/source/dialog/backingcomp.cxx

@@ -84,10 +84,6 @@ class BackingComp : public  css::lang::XTypeProvider
                   , public  ::cppu::OWeakObject
 {
 private:
-    /** the global uno service manager.
-        Must be used to create own needed services. */
-    css::uno::Reference< css::uno::XComponentContext > m_xContext;
-
     /** reference to the component window. */
     css::uno::Reference< css::awt::XWindow > m_xWindow;
 
@@ -96,7 +92,7 @@ private:
 
 public:
 
-    explicit BackingComp(const css::uno::Reference< css::uno::XComponentContext >& xContext);
+    explicit BackingComp();
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
@@ -146,8 +142,7 @@ public:
     virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) override;
 };
 
-BackingComp::BackingComp( const css::uno::Reference< css::uno::XComponentContext >& xContext )
-    : m_xContext(xContext)