UnoControls/source/controls/framecontrol.cxx | 1 UnoControls/source/inc/framecontrol.hxx | 1 sw/inc/unostyle.hxx | 1 sw/inc/unotxdoc.hxx | 10 +--- sw/inc/view.hxx | 4 - sw/source/core/inc/unoport.hxx | 3 - sw/source/core/unocore/unoport.cxx | 20 +------- sw/source/filter/xml/xmlexp.hxx | 1 sw/source/filter/xml/xmlimp.hxx | 1 sw/source/ui/table/tabledlg.cxx | 1 sw/source/ui/vba/vbaautotextentry.cxx | 2 sw/source/ui/vba/vbaautotextentry.hxx | 3 - sw/source/ui/vba/vbabookmarks.hxx | 1 sw/source/ui/vba/vbaborders.cxx | 5 -- sw/source/ui/vba/vbacolumns.cxx | 4 - sw/source/ui/vba/vbacolumns.hxx | 1 sw/source/ui/vba/vbadocument.cxx | 2 sw/source/ui/vba/vbadocumentproperties.cxx | 6 -- sw/source/ui/vba/vbadocumentproperties.hxx | 2 sw/source/ui/vba/vbafield.cxx | 6 +- sw/source/ui/vba/vbafield.hxx | 3 - sw/source/ui/vba/vbapanes.cxx | 2 sw/source/ui/vba/vbapanes.hxx | 3 - sw/source/ui/vba/vbaparagraphformat.cxx | 2 sw/source/ui/vba/vbaparagraphformat.hxx | 3 - sw/source/ui/vba/vbarange.cxx | 2 sw/source/ui/vba/vbaselection.hxx | 1 sw/source/ui/vba/vbastyle.cxx | 2 sw/source/ui/vba/vbastyles.cxx | 3 - sw/source/ui/vba/vbatabstop.cxx | 2 sw/source/ui/vba/vbatabstop.hxx | 5 -- sw/source/ui/vba/vbatabstops.cxx | 4 - sw/source/ui/vba/vbatemplate.cxx | 4 - sw/source/ui/vba/vbatemplate.hxx | 3 - sw/source/uibase/dbui/dbtree.cxx | 5 -- sw/source/uibase/dbui/mmconfigitem.cxx | 3 - sw/source/uibase/inc/cption.hxx | 1 sw/source/uibase/inc/dbtree.hxx | 3 - sw/source/uibase/inc/fldmgr.hxx | 1 sw/source/uibase/inc/hyp.hxx | 1 sw/source/uibase/inc/pview.hxx | 2 sw/source/uibase/inc/redlndlg.hxx | 1 sw/source/uibase/inc/swdtflvr.hxx | 1 sw/source/uibase/lingu/hyp.cxx | 1 sw/source/uibase/misc/redlndlg.cxx | 3 - sw/source/uibase/ribbar/workctrl.cxx | 24 +++------- sw/source/uibase/table/tablepg.hxx | 3 - sw/source/uibase/uno/SwXDocumentSettings.cxx | 1 sw/source/uibase/uno/SwXDocumentSettings.hxx | 1 sw/source/uibase/uno/unomodule.cxx | 4 - sw/source/uibase/uno/unomodule.hxx | 6 -- sw/source/uibase/uno/unotxdoc.cxx | 1 ucb/source/core/ucbstore.cxx | 10 +--- ucb/source/ucp/file/bc.cxx | 2 ucb/source/ucp/file/filcmd.cxx | 3 - ucb/source/ucp/file/filcmd.hxx | 1 ucb/source/ucp/file/filinpstr.cxx | 5 -- ucb/source/ucp/file/filinpstr.hxx | 3 - ucb/source/ucp/file/filnot.cxx | 4 - ucb/source/ucp/file/filnot.hxx | 4 - ucb/source/ucp/file/filprp.cxx | 1 ucb/source/ucp/file/filprp.hxx | 5 -- ucb/source/ucp/file/filrow.cxx | 1 ucb/source/ucp/file/filrow.hxx | 7 +- ucb/source/ucp/file/filrset.cxx | 1 ucb/source/ucp/file/filrset.hxx | 11 +--- ucb/source/ucp/file/filstr.cxx | 4 - ucb/source/ucp/file/filstr.hxx | 7 -- ucb/source/ucp/file/shell.cxx | 4 - ucb/source/ucp/ftp/ftpcontent.cxx | 2 ucb/source/ucp/ftp/ftpdynresultset.cxx | 4 - ucb/source/ucp/ftp/ftpdynresultset.hxx | 4 - ucb/source/ucp/ftp/ftpstrcont.hxx | 3 - unotools/source/ucbhelper/ucblockbytes.cxx | 9 +-- unotools/source/ucbhelper/ucblockbytes.hxx | 3 - unoxml/source/dom/documentbuilder.cxx | 10 +--- unoxml/source/dom/documentbuilder.hxx | 6 -- unoxml/source/dom/documenttype.cxx | 4 - unoxml/source/dom/entitiesmap.cxx | 3 - unoxml/source/dom/entitiesmap.hxx | 5 -- unoxml/source/dom/notationsmap.cxx | 4 - unoxml/source/dom/notationsmap.hxx | 5 -- unoxml/source/rdf/CBlankNode.cxx | 12 ++--- unoxml/source/rdf/CLiteral.cxx | 12 ++--- unoxml/source/rdf/CURI.cxx | 12 ++--- vbahelper/source/msforms/vbacontrols.cxx | 5 -- vbahelper/source/vbahelper/vbacolorformat.cxx | 2 vbahelper/source/vbahelper/vbacolorformat.hxx | 2 writerfilter/source/dmapper/DomainMapper_Impl.hxx | 2 writerfilter/source/dmapper/SettingsTable.cxx | 11 +--- writerfilter/source/dmapper/SettingsTable.hxx | 2 writerfilter/source/dmapper/StyleSheetTable.cxx | 1 writerfilter/source/dmapper/TableData.hxx | 5 -- writerfilter/source/dmapper/TableManager.hxx | 5 -- writerfilter/source/filter/WriterFilterDetection.cxx | 11 +--- writerperfect/inc/ImportFilter.hxx | 1 writerperfect/qa/unit/WpftImportTestBase.hxx | 1 writerperfect/source/writer/WordPerfectImportFilter.cxx | 8 +-- writerperfect/source/writer/WordPerfectImportFilter.hxx | 4 - xmlhelp/source/cxxhelp/provider/content.cxx | 4 - xmlhelp/source/cxxhelp/provider/resultset.cxx | 4 - xmlhelp/source/cxxhelp/provider/resultset.hxx | 4 - xmloff/inc/txtfldi.hxx | 2 xmloff/source/chart/SchXMLPropertyMappingContext.hxx | 1 xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx | 5 -- xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx | 2 xmloff/source/draw/sdxmlimp_impl.hxx | 3 - xmloff/source/draw/shapeimport.cxx | 3 - xmloff/source/table/XMLTableImport.cxx | 2 xmloff/source/text/XMLSectionImportContext.hxx | 6 -- xmloff/source/text/txtimp.cxx | 1 xmloff/source/text/txtprhdl.cxx | 23 +-------- xmloff/source/text/txtprhdl.hxx | 2 xmlscript/source/xmldlg_imexp/imp_share.hxx | 1 xmlscript/source/xmlflat_imexp/xmlbas_export.cxx | 21 ++++---- xmlscript/source/xmlflat_imexp/xmlbas_export.hxx | 10 +--- xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx | 7 +- xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx | 9 +-- xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx | 7 +- xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx | 7 +- xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx | 1 xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx | 6 +- xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx | 5 -- xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 6 +- xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx | 5 -- 125 files changed, 152 insertions(+), 402 deletions(-)
New commits: commit f7e4cf3c27100dbaf292dfacf0964bdade0a866a Author: Noel Grandin <[email protected]> Date: Mon Dec 21 12:45:29 2015 +0200 loplugin:unusedfields in sw Change-Id: I4d987718bf27766c8cd7f3654db6645e5a7f554a diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 90807ba..df697fe 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -276,7 +276,6 @@ class SwXAutoStyles : css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoCharStyles; css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoRubyStyles; css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoParaStyles; - css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoNotxtStyles; virtual ~SwXAutoStyles(); public: diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 87386bb..cd6135a 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -171,7 +171,6 @@ private: css::uno::Reference< css::beans::XPropertySet > mxXLineNumberingProperties; css::uno::Reference< css::container::XNameAccess > mxLinkTargetSupplier; css::uno::Reference< css::container::XEnumerationAccess > mxXRedlines; - css::uno::Reference< css::container::XNameContainer> xXFormsContainer; //temporary frame to enable PDF export if no valid view is available SfxViewFrame* m_pHiddenViewFrame; @@ -506,11 +505,10 @@ class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper > { css::uno::Reference< css::container::XNameAccess > xRealAccess; - const SfxItemPropertySet* pPropSet; - const OUString sLinkSuffix; - const OUString sLinkDisplayName; - css::uno::Reference< css::text::XTextDocument > xDoc; - SwXTextDocument* pxDoc; + const SfxItemPropertySet* pPropSet; + const OUString sLinkSuffix; + const OUString sLinkDisplayName; + SwXTextDocument* pxDoc; public: SwXLinkNameAccessWrapper(css::uno::Reference< css::container::XNameAccess > xAccess, diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index bfb7b3d..e9dcca0 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -166,7 +166,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell static SearchAttrItemList* m_pSrchList; static SearchAttrItemList* m_pReplList; - SvxHtmlOptions m_aHTMLOpt; Timer m_aTimer; // for delayed ChgLnks during an action OUString m_sSwViewData, //and the new cursor position if the user double click in the PagePreview @@ -204,9 +203,6 @@ class SW_DLLPUBLIC SwView: public SfxViewShell m_pVRuler; VclPtr<ImageButton> m_pTogglePageBtn; - VclPtr<SwHlpImageButton> m_pPageUpBtn, - m_pPageDownBtn; - SwGlossaryHdl *m_pGlosHdl; // handle text block SwDrawBase *m_pDrawActual; diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index 8b9e724..3931230 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -92,9 +92,6 @@ class SwXTextPortion : public cppu::WeakImplHelper { private: - class Impl; - ::sw::UnoImplPtr<Impl> m_pImpl; - const SfxItemPropertySet * m_pPropSet; const css::uno::Reference< css::text::XText > m_xParentText; diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index 0c176c7..5823d6e 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -51,17 +51,6 @@ using namespace ::com::sun::star; -class SwXTextPortion::Impl -{ -private: - ::osl::Mutex m_Mutex; // just for OInterfaceContainerHelper - -public: - ::cppu::OInterfaceContainerHelper m_EventListeners; - - Impl() : m_EventListeners(m_Mutex) { } -}; - void SwXTextPortion::init(const SwUnoCursor* pPortionCursor) { m_pUnoCursor = pPortionCursor->GetDoc()->CreateUnoCursor(*pPortionCursor->GetPoint()); @@ -76,8 +65,7 @@ SwXTextPortion::SwXTextPortion( const SwUnoCursor* pPortionCursor, uno::Reference< text::XText > const& rParent, SwTextPortionType eType) - : m_pImpl(new Impl) - , m_pPropSet(aSwMapProvider.GetPropertySet( + : m_pPropSet(aSwMapProvider.GetPropertySet( (PORTION_REDLINE_START == eType || PORTION_REDLINE_END == eType) ? PROPERTY_MAP_REDLINE_PORTION @@ -95,8 +83,7 @@ SwXTextPortion::SwXTextPortion( const SwUnoCursor* pPortionCursor, uno::Reference< text::XText > const& rParent, SwFrameFormat& rFormat ) - : m_pImpl(new Impl) - , m_pPropSet(aSwMapProvider.GetPropertySet( + : m_pPropSet(aSwMapProvider.GetPropertySet( PROPERTY_MAP_TEXTPORTION_EXTENSIONS)) , m_xParentText(rParent) , m_FrameDepend(this, &rFormat) @@ -112,8 +99,7 @@ SwXTextPortion::SwXTextPortion( SwTextRuby const& rAttr, uno::Reference< text::XText > const& xParent, bool bIsEnd ) - : m_pImpl(new Impl) - , m_pPropSet(aSwMapProvider.GetPropertySet( + : m_pPropSet(aSwMapProvider.GetPropertySet( PROPERTY_MAP_TEXTPORTION_EXTENSIONS)) , m_xParentText(xParent) , m_pRubyText ( bIsEnd ? nullptr : new uno::Any ) diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index 1319bdc..2f8a1e6 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -54,7 +54,6 @@ class SwXMLExport : public SvXMLExport SvXMLItemMapEntriesRef xTableItemMap; SvXMLItemMapEntriesRef xTableRowItemMap; SvXMLItemMapEntriesRef xTableCellItemMap; - rtl::Reference < XMLPropertySetMapper > xParaPropMapper; bool bBlock : 1; // export text block? bool bShowProgress : 1; diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx index fd8caf4..c64af05 100644 --- a/sw/source/filter/xml/xmlimp.hxx +++ b/sw/source/filter/xml/xmlimp.hxx @@ -67,7 +67,6 @@ class SwXMLImport: public SvXMLImport SvXMLItemMapEntriesRef m_xTableColItemMap; SvXMLItemMapEntriesRef m_xTableRowItemMap; SvXMLItemMapEntriesRef m_xTableCellItemMap; - tools::SvRef<SotStorage> m_xPackage; css::uno::Reference< css::container::XNameContainer > m_xLateInitSettings; diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 14f74b8..61a1d8d 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -65,7 +65,6 @@ using namespace ::com::sun::star; SwFormatTablePage::SwFormatTablePage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "FormatTablePage", "modules/swriter/ui/formattablepage.ui", &rSet) - , m_aTextFilter(" .<>") , pTableData(nullptr) , nSaveWidth(0) , nMinTableWidth(MINLAY) diff --git a/sw/source/ui/vba/vbaautotextentry.cxx b/sw/source/ui/vba/vbaautotextentry.cxx index 5384921..31e110b 100644 --- a/sw/source/ui/vba/vbaautotextentry.cxx +++ b/sw/source/ui/vba/vbaautotextentry.cxx @@ -93,7 +93,7 @@ SwVbaAutoTextEntry::getServiceNames() return aServiceNames; } -SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : SwVbaAutoTextEntries_BASE( xParent, xContext, xIndexAccess ), mxAutoTextEntryAccess( xIndexAccess ) +SwVbaAutoTextEntries::SwVbaAutoTextEntries( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess ) throw (uno::RuntimeException) : SwVbaAutoTextEntries_BASE( xParent, xContext, xIndexAccess ) { } diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx index abffe43..d715114 100644 --- a/sw/source/ui/vba/vbaautotextentry.hxx +++ b/sw/source/ui/vba/vbaautotextentry.hxx @@ -49,9 +49,6 @@ typedef CollTestImplHelper< ooo::vba::word::XAutoTextEntries > SwVbaAutoTextEntr class SwVbaAutoTextEntries : public SwVbaAutoTextEntries_BASE { -private: - css::uno::Reference< css::container::XIndexAccess > mxAutoTextEntryAccess; - public: SwVbaAutoTextEntries( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ) throw (css::uno::RuntimeException); virtual ~SwVbaAutoTextEntries() {} diff --git a/sw/source/ui/vba/vbabookmarks.hxx b/sw/source/ui/vba/vbabookmarks.hxx index 7f21783..abf85dc 100644 --- a/sw/source/ui/vba/vbabookmarks.hxx +++ b/sw/source/ui/vba/vbabookmarks.hxx @@ -35,7 +35,6 @@ class SwVbaBookmarks : public SwVbaBookmarks_BASE private: css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::text::XBookmarksSupplier > mxBookmarksSupplier; - css::uno::Reference< css::text::XText > mxText; private: void removeBookmarkByName( const OUString& rName ) throw (css::uno::RuntimeException); diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index e1c8ed1..85f3793 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -46,7 +46,6 @@ class SwVbaBorder : public SwVbaBorder_Base private: uno::Reference< beans::XPropertySet > m_xProps; sal_Int32 m_LineType; - VbaPalette m_Palette; bool setBorderLine( table::BorderLine& rBorderLine ) { table::TableBorder aTableBorder; @@ -150,7 +149,7 @@ protected: return aServiceNames; } public: - SwVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, VbaPalette& rPalette) : SwVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {} + SwVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType ) : SwVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ) {} uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) override { @@ -264,7 +263,7 @@ public: if ( nIndex >= 0 && nIndex < getCount() ) { uno::Reference< beans::XPropertySet > xProps( m_xRange, uno::UNO_QUERY_THROW ); - return uno::makeAny( uno::Reference< word::XBorder >( new SwVbaBorder( xProps, m_xContext, supportedIndexTable[ nIndex ], m_Palette )) ); + return uno::makeAny( uno::Reference< word::XBorder >( new SwVbaBorder( xProps, m_xContext, supportedIndexTable[ nIndex ] )) ); } throw lang::IndexOutOfBoundsException(); } diff --git a/sw/source/ui/vba/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx index ca2369e..2143921 100644 --- a/sw/source/ui/vba/vbacolumns.cxx +++ b/sw/source/ui/vba/vbacolumns.cxx @@ -56,14 +56,14 @@ public: } }; -SwVbaColumns::SwVbaColumns( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableColumns >& xTableColumns ) throw (uno::RuntimeException) : SwVbaColumns_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableColumns, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mxTableColumns( xTableColumns ) +SwVbaColumns::SwVbaColumns( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableColumns >& xTableColumns ) throw (uno::RuntimeException) : SwVbaColumns_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableColumns, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ) { mnStartColumnIndex = 0; SwVbaTableHelper aTableHelper( mxTextTable ); mnEndColumnIndex = aTableHelper.getTabColumnsMaxCount( ) - 1; } -SwVbaColumns::SwVbaColumns( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableColumns >& xTableColumns, sal_Int32 nStartCol, sal_Int32 nEndCol ) throw (uno::RuntimeException) : SwVbaColumns_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableColumns, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mxTableColumns( xTableColumns ), mnStartColumnIndex( nStartCol ), mnEndColumnIndex( nEndCol ) +SwVbaColumns::SwVbaColumns( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< text::XTextTable >& xTextTable, const uno::Reference< table::XTableColumns >& xTableColumns, sal_Int32 nStartCol, sal_Int32 nEndCol ) throw (uno::RuntimeException) : SwVbaColumns_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( xTableColumns, uno::UNO_QUERY_THROW ) ), mxTextTable( xTextTable ), mnStartColumnIndex( nStartCol ), mnEndColumnIndex( nEndCol ) { if( mnEndColumnIndex < mnStartColumnIndex ) throw uno::RuntimeException(); diff --git a/sw/source/ui/vba/vbacolumns.hxx b/sw/source/ui/vba/vbacolumns.hxx index 1b236ed..60297dc 100644 --- a/sw/source/ui/vba/vbacolumns.hxx +++ b/sw/source/ui/vba/vbacolumns.hxx @@ -32,7 +32,6 @@ class SwVbaColumns : public SwVbaColumns_BASE { private: css::uno::Reference< css::text::XTextTable > mxTextTable; - css::uno::Reference< css::table::XTableColumns > mxTableColumns; sal_Int32 mnStartColumnIndex; sal_Int32 mnEndColumnIndex; diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx index c1990a7..f61b82c 100644 --- a/sw/source/ui/vba/vbadocument.cxx +++ b/sw/source/ui/vba/vbadocument.cxx @@ -255,7 +255,7 @@ SwVbaDocument::getAttachedTemplate() throw (uno::RuntimeException, std::exceptio uno::Reference< document::XDocumentProperties > xDocProps( xDocPropSupp->getDocumentProperties(), uno::UNO_QUERY_THROW ); OUString sTemplateUrl = xDocProps->getTemplateURL(); - xTemplate = new SwVbaTemplate( this, mxContext, getModel(), sTemplateUrl ); + xTemplate = new SwVbaTemplate( this, mxContext, sTemplateUrl ); return uno::makeAny( xTemplate ); } diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index c7fe27b..9ccf945 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -663,15 +663,13 @@ class BuiltInPropertiesImpl : public PropertiesImpl_BASE { protected: - uno::Reference< XHelperInterface > m_xParent; - uno::Reference< uno::XComponentContext > m_xContext; uno::Reference< frame::XModel > m_xModel; DocProps mDocProps; DocPropsByName mNamedDocProps; public: - BuiltInPropertiesImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : m_xParent( xParent ), m_xContext( xContext ), m_xModel( xModel ) + BuiltInPropertiesImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : m_xModel( xModel ) { BuiltInIndexHelper builtIns( m_xModel ); for ( sal_Int32 index = word::WdBuiltInProperty::wdPropertyTitle; index <= word::WdBuiltInProperty::wdPropertyCharsWSpaces; ++index ) @@ -733,7 +731,7 @@ protected: } }; -SwVbaBuiltinDocumentProperties::SwVbaBuiltinDocumentProperties( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaDocumentproperties_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BuiltInPropertiesImpl( xParent, xContext, xModel ) ) ), m_xModel( xModel ) +SwVbaBuiltinDocumentProperties::SwVbaBuiltinDocumentProperties( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : SwVbaDocumentproperties_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( new BuiltInPropertiesImpl( xParent, xContext, xModel ) ) ) { } diff --git a/sw/source/ui/vba/vbadocumentproperties.hxx b/sw/source/ui/vba/vbadocumentproperties.hxx index a16bedd..78322b0 100644 --- a/sw/source/ui/vba/vbadocumentproperties.hxx +++ b/sw/source/ui/vba/vbadocumentproperties.hxx @@ -27,8 +27,6 @@ typedef CollTestImplHelper< ov::XDocumentProperties > SwVbaDocumentproperties_BA class SwVbaBuiltinDocumentProperties : public SwVbaDocumentproperties_BASE { -protected: - css::uno::Reference< css::frame::XModel > m_xModel; public: SwVbaBuiltinDocumentProperties( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xDocument ); diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 38243c4..c1bd01a 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -33,7 +33,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaField::SwVbaField( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const uno::Reference< css::text::XTextField >& xTextField) throw ( uno::RuntimeException ) : SwVbaField_BASE( rParent, rContext ), mxTextDocument( rDocument ) +SwVbaField::SwVbaField( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< css::text::XTextField >& xTextField) throw ( uno::RuntimeException ) : SwVbaField_BASE( rParent, rContext ) { mxTextField.set( xTextField, uno::UNO_QUERY_THROW ); } @@ -223,7 +223,7 @@ static uno::Any lcl_createField( const uno::Reference< XHelperInterface >& xPare { uno::Reference< text::XTextField > xTextField( aSource, uno::UNO_QUERY_THROW ); uno::Reference< text::XTextDocument > xTextDocument( xModel, uno::UNO_QUERY_THROW ); - uno::Reference< word::XField > xField( new SwVbaField( xParent, xContext, xTextDocument, xTextField ) ); + uno::Reference< word::XField > xField( new SwVbaField( xParent, xContext, xTextField ) ); return uno::makeAny( xField ); } @@ -341,7 +341,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range, uno::Reference< text::XTextRange > xTextRange = rVbaRange.getXTextRange(); uno::Reference< text::XText > xText = xTextRange->getText(); xText->insertTextContent( xTextRange, xTextField, true ); - return uno::Reference< word::XField >( new SwVbaField( mxParent, mxContext, uno::Reference< text::XTextDocument >( mxModel, uno::UNO_QUERY_THROW ), uno::Reference< text::XTextField >( xTextField, uno::UNO_QUERY_THROW ) ) ); + return uno::Reference< word::XField >( new SwVbaField( mxParent, mxContext, uno::Reference< text::XTextField >( xTextField, uno::UNO_QUERY_THROW ) ) ); } uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const OUString& _text ) diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx index 5e9abd0..2d44744 100644 --- a/sw/source/ui/vba/vbafield.hxx +++ b/sw/source/ui/vba/vbafield.hxx @@ -29,10 +29,9 @@ typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XField > SwVbaField_BA class SwVbaField : public SwVbaField_BASE { - css::uno::Reference< css::text::XTextDocument > mxTextDocument; css::uno::Reference< css::text::XTextField > mxTextField; public: - SwVbaField( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rDocument, const css::uno::Reference< css::text::XTextField >& xTextField) throw ( css::uno::RuntimeException); + SwVbaField( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextField >& xTextField) throw ( css::uno::RuntimeException); virtual sal_Bool SAL_CALL Update() throw ( css::uno::RuntimeException, std::exception) override; // XHelperInterface diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index 3045646..8198f48 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -75,7 +75,7 @@ public: } }; -SwVbaPanes::SwVbaPanes( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ): SwVbaPanes_BASE( xParent, xContext, new PanesIndexAccess( xParent, xContext, xModel ) ), mxModel( xModel ) +SwVbaPanes::SwVbaPanes( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ): SwVbaPanes_BASE( xParent, xContext, new PanesIndexAccess( xParent, xContext, xModel ) ) { } // XEnumerationAccess diff --git a/sw/source/ui/vba/vbapanes.hxx b/sw/source/ui/vba/vbapanes.hxx index 79c05f5..bbdc9bd 100644 --- a/sw/source/ui/vba/vbapanes.hxx +++ b/sw/source/ui/vba/vbapanes.hxx @@ -29,9 +29,6 @@ typedef CollTestImplHelper< ooo::vba::word::XPanes > SwVbaPanes_BASE; class SwVbaPanes : public SwVbaPanes_BASE { -private: - css::uno::Reference< css::frame::XModel > mxModel; - public: SwVbaPanes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::frame::XModel >& xModel ); virtual ~SwVbaPanes() {} diff --git a/sw/source/ui/vba/vbaparagraphformat.cxx b/sw/source/ui/vba/vbaparagraphformat.cxx index 1a02736..eb53c2c 100644 --- a/sw/source/ui/vba/vbaparagraphformat.cxx +++ b/sw/source/ui/vba/vbaparagraphformat.cxx @@ -36,7 +36,7 @@ static const sal_Int16 PERCENT100 = 100; static const sal_Int16 PERCENT150 = 150; static const sal_Int16 PERCENT200 = 200; -SwVbaParagraphFormat::SwVbaParagraphFormat( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument >& rTextDocument, const uno::Reference< beans::XPropertySet >& rParaProps ) : SwVbaParagraphFormat_BASE( rParent, rContext ), mxTextDocument( rTextDocument ), mxParaProps( rParaProps ) +SwVbaParagraphFormat::SwVbaParagraphFormat( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< beans::XPropertySet >& rParaProps ) : SwVbaParagraphFormat_BASE( rParent, rContext ), mxParaProps( rParaProps ) { } diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx index 75a5665..f0d4c54 100644 --- a/sw/source/ui/vba/vbaparagraphformat.hxx +++ b/sw/source/ui/vba/vbaparagraphformat.hxx @@ -29,7 +29,6 @@ typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XParagraphFormat > SwV class SwVbaParagraphFormat : public SwVbaParagraphFormat_BASE { private: - css::uno::Reference< css::text::XTextDocument > mxTextDocument; css::uno::Reference< css::beans::XPropertySet > mxParaProps; private: @@ -42,7 +41,7 @@ private: static sal_Int32 getMSWordAlignment( sal_Int32 _alignment ); public: - SwVbaParagraphFormat( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::text::XTextDocument >& rTextDocument, const css::uno::Reference< css::beans::XPropertySet >& rParaProps ); + SwVbaParagraphFormat( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::beans::XPropertySet >& rParaProps ); virtual ~SwVbaParagraphFormat(); // Attributes diff --git a/sw/source/ui/vba/vbarange.cxx b/sw/source/ui/vba/vbarange.cxx index ae76f18..88ea787 100644 --- a/sw/source/ui/vba/vbarange.cxx +++ b/sw/source/ui/vba/vbarange.cxx @@ -247,7 +247,7 @@ uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaRange::getParagraphFormat() throw ( uno::RuntimeException, std::exception ) { uno::Reference< beans::XPropertySet > xParaProps( mxTextCursor, uno::UNO_QUERY_THROW ); - return uno::Reference< word::XParagraphFormat >( new SwVbaParagraphFormat( this, mxContext, mxTextDocument, xParaProps ) ); + return uno::Reference< word::XParagraphFormat >( new SwVbaParagraphFormat( this, mxContext, xParaProps ) ); } void SAL_CALL diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx index 0c41aa3..ef79f13 100644 --- a/sw/source/ui/vba/vbaselection.hxx +++ b/sw/source/ui/vba/vbaselection.hxx @@ -38,7 +38,6 @@ class SwVbaSelection : public SwVbaSelection_BASE private: css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::text::XTextViewCursor > mxTextViewCursor; - css::uno::Reference< ooo::vba::word::XRange > mxRange; private: void Move( const css::uno::Any& _unit, const css::uno::Any& _count, const css::uno::Any& _extend, ooo::vba::word::E_DIRECTION eDirection ) throw (css::script::BasicErrorException, css::uno::RuntimeException); diff --git a/sw/source/ui/vba/vbastyle.cxx b/sw/source/ui/vba/vbastyle.cxx index 329aaf6..a9718a4 100644 --- a/sw/source/ui/vba/vbastyle.cxx +++ b/sw/source/ui/vba/vbastyle.cxx @@ -129,7 +129,7 @@ uno::Reference< word::XParagraphFormat > SAL_CALL SwVbaStyle::getParagraphFormat if( word::WdStyleType::wdStyleTypeParagraph == getType() ) { uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW ); - return uno::Reference< word::XParagraphFormat >( new SwVbaParagraphFormat( this, mxContext, xTextDocument, mxStyleProps ) ); + return uno::Reference< word::XParagraphFormat >( new SwVbaParagraphFormat( this, mxContext, mxStyleProps ) ); } else { diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx index d460358..a5340e3 100644 --- a/sw/source/ui/vba/vbastyles.cxx +++ b/sw/source/ui/vba/vbastyles.cxx @@ -161,11 +161,10 @@ class StyleCollectionHelper : public ::cppu::WeakImplHelper< container::XNameAcc container::XEnumerationAccess > { private: - uno::Reference< frame::XModel > mxModel; uno::Reference< container::XNameAccess > mxParaStyles; uno::Any cachePos; public: - explicit StyleCollectionHelper( const uno::Reference< frame::XModel >& _xModel ) : mxModel( _xModel ) + explicit StyleCollectionHelper( const uno::Reference< frame::XModel >& _xModel ) { // we only concern about the Paragraph styles uno::Reference< style::XStyleFamiliesSupplier > xStyleSupplier( _xModel, uno::UNO_QUERY_THROW); diff --git a/sw/source/ui/vba/vbatabstop.cxx b/sw/source/ui/vba/vbatabstop.cxx index 8979ebc..c0c57af 100644 --- a/sw/source/ui/vba/vbatabstop.cxx +++ b/sw/source/ui/vba/vbatabstop.cxx @@ -23,7 +23,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -SwVbaTabStop::SwVbaTabStop( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< beans::XPropertySet >& xParaProps ) throw ( uno::RuntimeException ) : SwVbaTabStop_BASE( rParent, rContext ), mxParaProps( xParaProps ) +SwVbaTabStop::SwVbaTabStop( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext ) throw ( uno::RuntimeException ) : SwVbaTabStop_BASE( rParent, rContext ) { } diff --git a/sw/source/ui/vba/vbatabstop.hxx b/sw/source/ui/vba/vbatabstop.hxx index 9c5f5c4..aaad749 100644 --- a/sw/source/ui/vba/vbatabstop.hxx +++ b/sw/source/ui/vba/vbatabstop.hxx @@ -26,11 +26,8 @@ typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XTabStop > SwVbaTabSto class SwVbaTabStop : public SwVbaTabStop_BASE { -private: - css::uno::Reference< css::beans::XPropertySet > mxParaProps; - public: - SwVbaTabStop( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, const css::uno::Reference< css::beans::XPropertySet >& xParaProps ) throw ( css::uno::RuntimeException ); + SwVbaTabStop( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext ) throw ( css::uno::RuntimeException ); virtual ~SwVbaTabStop(); // XHelperInterface diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index 6a90074..c7bcf25 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -89,7 +89,7 @@ public: if ( Index < 0 || Index >= getCount() ) throw css::lang::IndexOutOfBoundsException(); - return uno::makeAny( uno::Reference< word::XTabStop >( new SwVbaTabStop( mxParent, mxContext, mxParaProps ) ) ); + return uno::makeAny( uno::Reference< word::XTabStop >( new SwVbaTabStop( mxParent, mxContext ) ) ); } virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) override { @@ -222,7 +222,7 @@ uno::Reference< word::XTabStop > SAL_CALL SwVbaTabStops::Add( float Position, co else lcl_setTabStops( mxParaProps, aNewTabs ); - return uno::Reference< word::XTabStop >( new SwVbaTabStop( this, mxContext, mxParaProps ) ); + return uno::Reference< word::XTabStop >( new SwVbaTabStop( this, mxContext ) ); } void SAL_CALL SwVbaTabStops::ClearAll() throw (uno::RuntimeException, std::exception) diff --git a/sw/source/ui/vba/vbatemplate.cxx b/sw/source/ui/vba/vbatemplate.cxx index e428a3a..a663db5 100644 --- a/sw/source/ui/vba/vbatemplate.cxx +++ b/sw/source/ui/vba/vbatemplate.cxx @@ -45,8 +45,8 @@ static OUString lcl_CheckGroupName( const OUString& rGroupName ) return comphelper::string::strip(sRet, ' '); } -SwVbaTemplate::SwVbaTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< css::frame::XModel >& rModel, const OUString& rFullUrl ) - : SwVbaTemplate_BASE( rParent, rContext ), mxModel( rModel ), msFullUrl( rFullUrl ) +SwVbaTemplate::SwVbaTemplate( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const OUString& rFullUrl ) + : SwVbaTemplate_BASE( rParent, rContext ), msFullUrl( rFullUrl ) { } diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx index f563767..e2b7fc0 100644 --- a/sw/source/ui/vba/vbatemplate.hxx +++ b/sw/source/ui/vba/vbatemplate.hxx @@ -27,11 +27,10 @@ typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XTemplate > SwVbaTempl class SwVbaTemplate : public SwVbaTemplate_BASE { private: - css::uno::Reference< css::frame::XModel > mxModel; OUString msFullUrl; public: SwVbaTemplate( const css::uno::Reference< ooo::vba::XHelperInterface >& rParent, const css::uno::Reference< css::uno::XComponentContext >& rContext, - const css::uno::Reference< css::frame::XModel >& rModel, const OUString& ); + const OUString& ); virtual ~SwVbaTemplate(); // XTemplate diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index a4eca98..45d704d 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -61,11 +61,6 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::task; using namespace ::com::sun::star::beans; -struct SwConnectionData -{ - Reference<XConnection> xConnection; -}; - class SwDBTreeList_Impl : public cppu::WeakImplHelper < XContainerListener > { Reference< XDatabaseContext > m_xDatabaseContext; diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index b576da3..6e2d1fd 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -87,10 +87,9 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem Reference< XDataSource> m_xSource; SharedConnection m_xConnection; Reference< XColumnsSupplier> m_xColumnsSupplier; - Reference< XStatement> m_xStatement; Reference< XResultSet> m_xResultSet; SwDBData m_aDBData; - OUString m_sFilter; + OUString m_sFilter; sal_Int32 m_nResultSetCursorPos; ::std::vector<DBAddressDataAssignment> m_aAddressDataAssignments; diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index 7e9617c..407d12a 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -92,7 +92,6 @@ class SwCaptionDialog : public SvxStandardDialog bool bOrderNumberingFirst; //#i61007# order of captions css::uno::Reference< css::container::XNameAccess > xNameAccess; - css::uno::Reference< css::container::XNamed > xNamed; DECL_LINK_TYPED(SelectHdl, ComboBox&, void); DECL_LINK_TYPED(SelectListBoxHdl, ListBox&, void); diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx index c2d3b62..2fc8aad 100644 --- a/sw/source/uibase/inc/dbtree.hxx +++ b/sw/source/uibase/inc/dbtree.hxx @@ -31,9 +31,6 @@ class SwWrtShell; class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox { ImageList aImageList; - Image aDBBMP; - Image aTableBMP; - Image aQueryBMP; OUString sDefDBName; bool bInitialized; diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index 832dfd36..71ed088 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -114,7 +114,6 @@ private: SAL_DLLPRIVATE sal_uInt16 GetCurrLanguage() const; - css::uno::Reference<css::container::XNameAccess> xDBContext; css::uno::Reference<css::text::XNumberingTypeInfo> xNumberingInfo; SAL_DLLPRIVATE css::uno::Reference<css::text::XNumberingTypeInfo> GetNumberingInfo()const; diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx index 258c396..8d4e167 100644 --- a/sw/source/uibase/inc/hyp.hxx +++ b/sw/source/uibase/inc/hyp.hxx @@ -29,7 +29,6 @@ class SwView; class SwHyphWrapper : public SvxSpellWrapper { private: SwView* pView; - css::uno::Reference< css::linguistic2::XHyphenator > xHyph; sal_uInt16 nPageCount; // page count for progress view sal_uInt16 nPageStart; // 1st checked page bool bInSelection : 1; // separating selected text diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 35cb5ef..df7045b 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -179,8 +179,6 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell VclPtr<SwScrollbar> pVScrollbar; bool mbHScrollbarEnabled : 1; bool mbVScrollbarEnabled : 1; - VclPtr<ImageButton> pPageUpBtn; - VclPtr<ImageButton> pPageDownBtn; // dummy window for filling the lower right edge when both scrollbars are active VclPtr<vcl::Window> pScrollFill; diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 5044e07..3055d5b 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -94,7 +94,6 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg Image m_aFormated; Image m_aTableChgd; Image m_aFormatCollSet; - Image m_aAutoFormat; DECL_DLLPRIVATE_LINK_TYPED( AcceptHdl, SvxTPView*, void ); DECL_DLLPRIVATE_LINK_TYPED( AcceptAllHdl, SvxTPView*, void ); diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx index 4b8b238..b5f5c46 100644 --- a/sw/source/uibase/inc/swdtflvr.hxx +++ b/sw/source/uibase/inc/swdtflvr.hxx @@ -57,7 +57,6 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper { friend class SwView_Impl; SfxObjectShellLock m_aDocShellRef; - TransferableDataHelper m_aOleData; TransferableObjectDescriptor m_aObjDesc; tools::SvRef<sfx2::SvBaseLink> m_xDdeLink; diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx index aee0bcf..1959cff 100644 --- a/sw/source/uibase/lingu/hyp.cxx +++ b/sw/source/uibase/lingu/hyp.cxx @@ -47,7 +47,6 @@ SwHyphWrapper::SwHyphWrapper( SwView* pVw, bool bStart, bool bOther, bool bSelect ) : SvxSpellWrapper( &pVw->GetEditWin(), rxHyph, bStart, bOther ), pView( pVw ), - xHyph( rxHyph ), nPageCount( 0 ), nPageStart( 0 ), bInSelection( bSelect ), diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 556be6d..66ff7a5 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -165,8 +165,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer m_aDeleted (SW_RES(IMG_REDLINE_DELETED)), m_aFormated (SW_RES(IMG_REDLINE_FORMATED)), m_aTableChgd (SW_RES(IMG_REDLINE_TABLECHG)), - m_aFormatCollSet (SW_RES(IMG_REDLINE_FMTCOLLSET)), - m_aAutoFormat (SW_RES(IMG_REDLINE_AUTOFMT)) + m_aFormatCollSet (SW_RES(IMG_REDLINE_FMTCOLLSET)) { m_aTabPagesCTRL->SetHelpId(HID_REDLINE_CTRL); diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index e420a5e..1a17634 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -446,13 +446,11 @@ class SwZoomBox_Impl : public ComboBox { sal_uInt16 nSlotId; bool bRelease; - uno::Reference< frame::XDispatchProvider > m_xDispatchProvider; public: SwZoomBox_Impl( vcl::Window* pParent, - sal_uInt16 nSlot, - const Reference< XDispatchProvider >& rDispatchProvider ); + sal_uInt16 nSlot ); virtual ~SwZoomBox_Impl(); protected: @@ -465,12 +463,10 @@ protected: SwZoomBox_Impl::SwZoomBox_Impl( vcl::Window* pParent, - sal_uInt16 nSlot, - const Reference< XDispatchProvider >& rDispatchProvider ): + sal_uInt16 nSlot ): ComboBox( pParent, SW_RES(RID_PVIEW_ZOOM_LB)), nSlotId(nSlot), - bRelease(true), - m_xDispatchProvider( rDispatchProvider ) + bRelease(true) { EnableAutocomplete( false ); sal_uInt16 aZoomValues[] = @@ -608,20 +604,18 @@ void SwPreviewZoomControl::StateChanged( sal_uInt16 /*nSID*/, VclPtr<vcl::Window> SwPreviewZoomControl::CreateItemWindow( vcl::Window *pParent ) { - VclPtrInstance<SwZoomBox_Impl> pRet( pParent, GetSlotId(), Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY )); + VclPtrInstance<SwZoomBox_Impl> pRet( pParent, GetSlotId() ); return pRet.get(); } class SwJumpToSpecificBox_Impl : public NumericField { sal_uInt16 nSlotId; - uno::Reference< frame::XDispatchProvider > m_xDispatchProvider; public: SwJumpToSpecificBox_Impl( vcl::Window* pParent, - sal_uInt16 nSlot, - const Reference< XDispatchProvider >& rDispatchProvider ); + sal_uInt16 nSlot ); virtual ~SwJumpToSpecificBox_Impl(); protected: @@ -631,11 +625,9 @@ protected: SwJumpToSpecificBox_Impl::SwJumpToSpecificBox_Impl( vcl::Window* pParent, - sal_uInt16 nSlot, - const Reference< XDispatchProvider >& rDispatchProvider ): + sal_uInt16 nSlot ): NumericField( pParent, SW_RES(RID_JUMP_TO_SPEC_PAGE)), - nSlotId(nSlot), - m_xDispatchProvider( rDispatchProvider ) + nSlotId(nSlot) {} SwJumpToSpecificBox_Impl::~SwJumpToSpecificBox_Impl() @@ -671,7 +663,7 @@ SwJumpToSpecificPageControl::~SwJumpToSpecificPageControl() VclPtr<vcl::Window> SwJumpToSpecificPageControl::CreateItemWindow( vcl::Window *pParent ) { - VclPtrInstance<SwJumpToSpecificBox_Impl> pRet( pParent, GetSlotId(), Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY )); + VclPtrInstance<SwJumpToSpecificBox_Impl> pRet( pParent, GetSlotId() ); return pRet.get(); } diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index d832099..75d1e76 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -38,9 +38,8 @@ struct TColumn class SwFormatTablePage : public SfxTabPage { VclPtr<Edit> m_pNameED; - TextFilter m_aTextFilter; VclPtr<FixedText> m_pWidthFT; - PercentField m_aWidthMF; + PercentField m_aWidthMF; VclPtr<CheckBox> m_pRelWidthCB; VclPtr<RadioButton> m_pFullBtn; diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx index df09645..09bdde2 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.cxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx @@ -235,7 +235,6 @@ static MasterPropertySetInfo * lcl_createSettingsInfo() SwXDocumentSettings::SwXDocumentSettings ( SwXTextDocument * pModel ) : MasterPropertySet ( lcl_createSettingsInfo (), &Application::GetSolarMutex () ) -, mxModel ( pModel ) , mpModel ( pModel ) , mpDocSh ( nullptr ) , mpDoc ( nullptr ) diff --git a/sw/source/uibase/uno/SwXDocumentSettings.hxx b/sw/source/uibase/uno/SwXDocumentSettings.hxx index 1319913..8887141 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.hxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.hxx @@ -38,7 +38,6 @@ class SwXDocumentSettings : public cppu::OWeakObject { protected: - css::uno::Reference< css::text::XTextDocument > mxModel; SwXTextDocument* mpModel; SwDocShell* mpDocSh; SwDoc* mpDoc; diff --git a/sw/source/uibase/uno/unomodule.cxx b/sw/source/uibase/uno/unomodule.cxx index 5cb62a9..da6f74c 100644 --- a/sw/source/uibase/uno/unomodule.cxx +++ b/sw/source/uibase/uno/unomodule.cxx @@ -45,11 +45,11 @@ uno::Sequence< OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() throw( } uno::Reference< uno::XInterface > SAL_CALL SwUnoModule_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) + const uno::Reference< lang::XMultiServiceFactory > & ) throw (css::uno::Exception) { SolarMutexGuard aGuard; - return uno::Reference< uno::XInterface >( dynamic_cast< frame::XDispatch * >(new SwUnoModule( rSMgr )), uno::UNO_QUERY ); + return uno::Reference< uno::XInterface >( dynamic_cast< frame::XDispatch * >(new SwUnoModule), uno::UNO_QUERY ); } // XNotifyingDispatch diff --git a/sw/source/uibase/uno/unomodule.hxx b/sw/source/uibase/uno/unomodule.hxx index 5d11b28..58316b1 100644 --- a/sw/source/uibase/uno/unomodule.hxx +++ b/sw/source/uibase/uno/unomodule.hxx @@ -50,12 +50,8 @@ namespace com class SwUnoModule : public ::cppu::WeakImplHelper< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo > { - css::uno::Reference < css::lang::XMultiServiceFactory > m_xFactory; - public: - explicit SwUnoModule( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory ) - : m_xFactory( xFactory ) - {} + SwUnoModule() {} // XNotifyingDispatch virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 83f7dc1..1aea893 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3807,7 +3807,6 @@ SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc, pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_LINK_TARGET)), sLinkSuffix(sSuffix), sLinkDisplayName(rLinkDisplayName), - xDoc(&rxDoc), pxDoc(&rxDoc) { } commit dff9873c270f653ebd073dac90bdacd2a40207c1 Author: Noel Grandin <[email protected]> Date: Mon Dec 21 11:21:49 2015 +0200 loplugin:unusedfields UnoControls,ucb Change-Id: I2ff2db21d79d80785f3b6849c879537d5111a960 diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx index dc9195a..658974f 100644 --- a/UnoControls/source/controls/framecontrol.cxx +++ b/UnoControls/source/controls/framecontrol.cxx @@ -50,7 +50,6 @@ FrameControl::FrameControl( const Reference< XComponentContext >& rxContext) : BaseControl ( rxContext ) , OBroadcastHelper ( m_aMutex ) , OPropertySetHelper ( *(static_cast< OBroadcastHelper * >(this)) ) - , m_aInterfaceContainer ( m_aMutex ) , m_aConnectionPointContainer ( new OConnectionPointContainerHelper(m_aMutex) ) { } diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx index e17fea7..00c16a5 100644 --- a/UnoControls/source/inc/framecontrol.hxx +++ b/UnoControls/source/inc/framecontrol.hxx @@ -213,7 +213,6 @@ private: css::uno::Reference< css::frame::XFrame2 > m_xFrame; OUString m_sComponentURL; css::uno::Sequence< css::beans::PropertyValue > m_seqLoaderArguments; - ::cppu::OMultiTypeInterfaceContainerHelper m_aInterfaceContainer; css::uno::Reference<OConnectionPointContainerHelper> m_aConnectionPointContainer; }; // class FrameControl diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 8d285b8..80d39fe 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -111,13 +111,11 @@ PropertySetMap_Impl; // class PropertySetInfo_Impl class PropertySetInfo_Impl : public cppu::WeakImplHelper < XPropertySetInfo > { - Reference< XComponentContext > m_xContext; Sequence< Property >* m_pProps; PersistentPropertySet* m_pOwner; public: - PropertySetInfo_Impl( const Reference< XComponentContext >& xContext, - PersistentPropertySet* pOwner ); + PropertySetInfo_Impl( PersistentPropertySet* pOwner ); virtual ~PropertySetInfo_Impl(); // XPropertySetInfo @@ -1238,7 +1236,7 @@ Reference< XPropertySetInfo > SAL_CALL PersistentPropertySet::getPropertySetInfo PropertySetInfo_Impl*& rpInfo = m_pImpl->m_pInfo; if ( !rpInfo ) { - rpInfo = new PropertySetInfo_Impl( m_xContext, this ); + rpInfo = new PropertySetInfo_Impl( this ); rpInfo->acquire(); } return Reference< XPropertySetInfo >( rpInfo ); @@ -2197,10 +2195,8 @@ PropertySetRegistry& PersistentPropertySet::getPropertySetRegistry() PropertySetInfo_Impl::PropertySetInfo_Impl( - const Reference< XComponentContext >& xContext, PersistentPropertySet* pOwner ) -: m_xContext( xContext ), - m_pProps( nullptr ), +: m_pProps( nullptr ), m_pOwner( pOwner ) { } diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 8b41184..030c487 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -1316,7 +1316,6 @@ BaseContent::cPSL() PropertySetInfoChangeNotifier* p = nullptr; if( m_pPropertySetInfoChangeListeners ) p = new PropertySetInfoChangeNotifier( this, - m_xContentIdentifier, m_pPropertySetInfoChangeListeners->getElements() ); return p; @@ -1350,7 +1349,6 @@ BaseContent::cPCL() } p = new PropertyChangeNotifier( this, - m_xContentIdentifier, listener ); } diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx index 95be18a..ed62244 100644 --- a/ucb/source/ucp/file/filcmd.cxx +++ b/ucb/source/ucp/file/filcmd.cxx @@ -32,8 +32,7 @@ using namespace com::sun::star::ucb; #endif XCommandInfo_impl::XCommandInfo_impl( shell* pMyShell ) - : m_pMyShell( pMyShell ), - m_xProvider( pMyShell->m_pProvider ) + : m_pMyShell( pMyShell ) { } diff --git a/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx index c0d22df..bb3c498 100644 --- a/ucb/source/ucp/file/filcmd.hxx +++ b/ucb/source/ucp/file/filcmd.hxx @@ -92,7 +92,6 @@ namespace fileaccess { private: shell* m_pMyShell; - css::uno::Reference< css::ucb::XContentProvider > m_xProvider; }; } diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 89f7f56..5d314e9 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -32,9 +32,8 @@ using namespace com::sun::star::ucb; #define THROW_WHERE "" #endif -XInputStream_impl::XInputStream_impl( shell* pMyShell,const OUString& aUncPath, bool bLock ) - : m_xProvider( pMyShell->m_pProvider ), - m_aFile( aUncPath ), +XInputStream_impl::XInputStream_impl( const OUString& aUncPath, bool bLock ) + : m_aFile( aUncPath ), m_nErrorCode( TASKHANDLER_NO_ERROR ), m_nMinorErrorCode( TASKHANDLER_NO_ERROR ) { diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx index 3fcc4b5..d070e52 100644 --- a/ucb/source/ucp/file/filinpstr.hxx +++ b/ucb/source/ucp/file/filinpstr.hxx @@ -42,7 +42,7 @@ namespace fileaccess { { public: - XInputStream_impl( shell* pMyShell,const OUString& aUncPath, bool bLock ); + XInputStream_impl( const OUString& aUncPath, bool bLock ); virtual ~XInputStream_impl(); @@ -137,7 +137,6 @@ namespace fileaccess { private: - css::uno::Reference< css::ucb::XContentProvider > m_xProvider; bool m_nIsOpen; ReconnectingFile m_aFile; diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx index aba54e3..f8b4962 100644 --- a/ucb/source/ucp/file/filnot.cxx +++ b/ucb/source/ucp/file/filnot.cxx @@ -149,10 +149,8 @@ void ContentEventNotifier::notifyExchanged() PropertySetInfoChangeNotifier::PropertySetInfoChangeNotifier( const uno::Reference< XContent >& xCreatorContent, - const uno::Reference< XContentIdentifier >& xCreatorId, const uno::Sequence< uno::Reference< uno::XInterface > >& sListeners ) : m_xCreatorContent( xCreatorContent ), - m_xCreatorId( xCreatorId ), m_sListeners( sListeners ) { @@ -202,10 +200,8 @@ PropertySetInfoChangeNotifier::notifyPropertyRemoved( const OUString & aProperty PropertyChangeNotifier::PropertyChangeNotifier( const css::uno::Reference< XContent >& xCreatorContent, - const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, ListenerMap* pListeners ) : m_xCreatorContent( xCreatorContent ), - m_xCreatorId( xCreatorId ), m_pListeners( pListeners ) { } diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx index b65af7a..be304b8 100644 --- a/ucb/source/ucp/file/filnot.hxx +++ b/ucb/source/ucp/file/filnot.hxx @@ -64,12 +64,10 @@ namespace fileaccess { { private: css::uno::Reference< css::ucb::XContent > m_xCreatorContent; - css::uno::Reference< css::ucb::XContentIdentifier > m_xCreatorId; css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > m_sListeners; public: PropertySetInfoChangeNotifier( const css::uno::Reference< css::ucb::XContent >& xCreatorContent, - const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& sListeners ); void SAL_CALL notifyPropertyAdded( const OUString & aPropertyName ); @@ -85,12 +83,10 @@ namespace fileaccess { { private: css::uno::Reference< css::ucb::XContent > m_xCreatorContent; - css::uno::Reference< css::ucb::XContentIdentifier > m_xCreatorId; ListenerMap* m_pListeners; public: PropertyChangeNotifier( const css::uno::Reference< css::ucb::XContent >& xCreatorContent, - const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId, ListenerMap* pListeners ); ~PropertyChangeNotifier(); diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx index 9bf2157..2b0cf40 100644 --- a/ucb/source/ucp/file/filprp.cxx +++ b/ucb/source/ucp/file/filprp.cxx @@ -36,7 +36,6 @@ using namespace com::sun::star::ucb; XPropertySetInfo_impl::XPropertySetInfo_impl( shell* pMyShell,const OUString& aUnqPath ) : m_pMyShell( pMyShell ), - m_xProvider( pMyShell->m_pProvider ), m_count( 0 ), m_seq( 0 ) { diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx index ecb92c8..a4800bf 100644 --- a/ucb/source/ucp/file/filprp.hxx +++ b/ucb/source/ucp/file/filprp.hxx @@ -53,9 +53,8 @@ class XPropertySetInfo_impl : public cppu::WeakImplHelper< throw( css::uno::RuntimeException, std::exception ) override; private: - shell* m_pMyShell; - css::uno::Reference< css::ucb::XContentProvider > m_xProvider; - sal_Int32 m_count; + shell* m_pMyShell; + sal_Int32 m_count; css::uno::Sequence< css::beans::Property > m_seq; }; } diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx index 9782632..5028cdc 100644 --- a/ucb/source/ucp/file/filrow.cxx +++ b/ucb/source/ucp/file/filrow.cxx @@ -79,7 +79,6 @@ XRow_impl::XRow_impl( shell* pMyShell,const uno::Sequence< uno::Any >& seq ) : m_aValueMap( seq ), m_nWasNull(false), m_pMyShell( pMyShell ), - m_xProvider( pMyShell->m_pProvider ), m_xTypeConverter( nullptr ) { } diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx index 5be0822..bf09f2f 100644 --- a/ucb/source/ucp/file/filrow.hxx +++ b/ucb/source/ucp/file/filrow.hxx @@ -158,11 +158,10 @@ namespace fileaccess { css::uno::RuntimeException, std::exception) override; private: - osl::Mutex m_aMutex; + osl::Mutex m_aMutex; css::uno::Sequence< css::uno::Any > m_aValueMap; - bool m_nWasNull; - shell* m_pMyShell; - css::uno::Reference< css::ucb::XContentProvider > m_xProvider; + bool m_nWasNull; + shell* m_pMyShell; css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter; }; diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 3f973de..1210817 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -47,7 +47,6 @@ XResultSet_impl::XResultSet_impl( shell* pMyShell, const uno::Sequence< beans::Property >& seq, const uno::Sequence< ucb::NumberedSortingInfo >& seqSort ) : m_pMyShell( pMyShell ) - , m_xProvider( pMyShell->m_pProvider ) , m_nRow( -1 ) , m_nWasNull ( false ) , m_nOpenMode( OpenMode ) diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index daa5de3..505994b 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -582,17 +582,12 @@ class XResultSet_impl : public Notifier, private: - // Members - // const uno::Reference< lang::XMultiServiceFactory > m_xMSF; - // const uno::Reference< ucb::XContentProvider > m_xProvider; - shell* m_pMyShell; - css::uno::Reference< css::ucb::XContentProvider > m_xProvider; - bool m_nIsOpen; + bool m_nIsOpen; sal_Int32 m_nRow; - bool m_nWasNull; + bool m_nWasNull; sal_Int32 m_nOpenMode; - bool m_bRowCountFinal; + bool m_bRowCountFinal; typedef std::vector< css::uno::Reference< css::ucb::XContentIdentifier > > IdentSet; typedef std::vector< css::uno::Reference< css::sdbc::XRow > > ItemSet; diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index ca85980..1eaa8c5 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -41,11 +41,9 @@ using namespace css::ucb; /* */ /******************************************************************************/ -XStream_impl::XStream_impl( shell* pMyShell,const OUString& aUncPath, bool bLock ) +XStream_impl::XStream_impl( const OUString& aUncPath, bool bLock ) : m_bInputStreamCalled( false ), m_bOutputStreamCalled( false ), - m_pMyShell( pMyShell ), - m_xProvider( m_pMyShell->m_pProvider ), m_aFile( aUncPath ), m_nErrorCode( TASKHANDLER_NO_ERROR ), m_nMinorErrorCode( TASKHANDLER_NO_ERROR ) diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx index f031fc8..adc5bde 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -49,7 +49,7 @@ class XStream_impl : public cppu::WeakImplHelper< public: - XStream_impl( shell* pMyShell,const OUString& aUncPath, bool bLock ); + XStream_impl( const OUString& aUncPath, bool bLock ); /** * Returns an error code as given by filerror.hxx @@ -178,10 +178,7 @@ class XStream_impl : public cppu::WeakImplHelper< osl::Mutex m_aMutex; bool m_bInputStreamCalled,m_bOutputStreamCalled; - - shell* m_pMyShell; - css::uno::Reference< css::ucb::XContentProvider > m_xProvider; - bool m_nIsOpen; + bool m_nIsOpen; ReconnectingFile m_aFile; diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index cb27c76..a10d202 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -661,7 +661,7 @@ shell::open( sal_Int32 CommandId, const OUString& aUnqPath, bool bLock ) { - XInputStream_impl* xInputStream = new XInputStream_impl( this, aUnqPath, bLock ); // from filinpstr.hxx + XInputStream_impl* xInputStream = new XInputStream_impl( aUnqPath, bLock ); // from filinpstr.hxx sal_Int32 ErrorCode = xInputStream->CtorSuccess(); @@ -697,7 +697,7 @@ shell::open_rw( sal_Int32 CommandId, const OUString& aUnqPath, bool bLock ) { - XStream_impl* xStream = new XStream_impl( this, aUnqPath, bLock ); // from filstr.hxx + XStream_impl* xStream = new XStream_impl( aUnqPath, bLock ); // from filstr.hxx sal_Int32 ErrorCode = xStream->CtorSuccess(); diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 17e366f..e1c0cdb 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -551,9 +551,7 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand, Reference< XDynamicResultSet > xSet = new DynamicResultSet( m_xContext, - this, aOpenCommand, - Environment, new ResultSetFactoryI(m_xContext, m_xProvider.get(), aOpenCommand.Properties, diff --git a/ucb/source/ucp/ftp/ftpdynresultset.cxx b/ucb/source/ucp/ftp/ftpdynresultset.cxx index 2e764f6..c3c1fbf 100644 --- a/ucb/source/ucp/ftp/ftpdynresultset.cxx +++ b/ucb/source/ucp/ftp/ftpdynresultset.cxx @@ -39,13 +39,9 @@ using namespace ftp; DynamicResultSet::DynamicResultSet( const Reference< XComponentContext >& rxContext, - const rtl::Reference< FTPContent >& rxContent, const OpenCommandArgument2& rCommand, - const Reference< XCommandEnvironment >& rxEnv, ResultSetFactory* pFactory ) : ResultSetImplHelper( rxContext, rCommand ), - m_xContent( rxContent ), - m_xEnv( rxEnv ), m_pFactory( pFactory ) { } diff --git a/ucb/source/ucp/ftp/ftpdynresultset.hxx b/ucb/source/ucp/ftp/ftpdynresultset.hxx index 757bc68..b39a3d9 100644 --- a/ucb/source/ucp/ftp/ftpdynresultset.hxx +++ b/ucb/source/ucp/ftp/ftpdynresultset.hxx @@ -31,8 +31,6 @@ namespace ftp { class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper { - rtl::Reference< FTPContent > m_xContent; - css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; ResultSetFactory* m_pFactory; private: @@ -42,9 +40,7 @@ namespace ftp { public: DynamicResultSet( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const rtl::Reference< FTPContent >& rxContent, const css::ucb::OpenCommandArgument2& rCommand, - const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv, ResultSetFactory* pFactory ); virtual ~DynamicResultSet(); diff --git a/ucb/source/ucp/ftp/ftpstrcont.hxx b/ucb/source/ucp/ftp/ftpstrcont.hxx index 45f84fe..fe766ab 100644 --- a/ucb/source/ucp/ftp/ftpstrcont.hxx +++ b/ucb/source/ucp/ftp/ftpstrcont.hxx @@ -42,9 +42,6 @@ namespace ftp { css::io::XOutputStream>& out); virtual ~FTPOutputStreamContainer() {} - - private: - css::uno::Reference< css::io::XOutputStream> m_out; }; commit 85ae903734ed39fc072e90346953039965b04864 Author: Noel Grandin <[email protected]> Date: Mon Dec 21 11:09:16 2015 +0200 loplugin:unusedfields unotools,unoxml Change-Id: I824193a9f4b0196ce1127c5cbf16b0064dbb3446 diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 87827e7..e9f6259 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -1041,10 +1041,9 @@ static bool _UCBOpenContentSync( return ( bAborted || bException ); } -UcbLockBytes::UcbLockBytes( UcbLockBytesHandler* pHandler ) +UcbLockBytes::UcbLockBytes() : m_aExpireDate( DateTime::EMPTY ) , m_xInputStream (nullptr) - , m_xHandler( pHandler ) , m_nError( ERRCODE_NONE ) , m_bTerminated (false) , m_bDontClose( false ) @@ -1375,7 +1374,7 @@ UcbLockBytesRef UcbLockBytes::CreateInputLockBytes( const Reference< XInputStrea if( !xInputStream.is() ) return nullptr; - UcbLockBytesRef xLockBytes = new UcbLockBytes(nullptr); + UcbLockBytesRef xLockBytes = new UcbLockBytes; xLockBytes->setDontClose_Impl(); xLockBytes->setInputStream_Impl( xInputStream ); xLockBytes->terminate_Impl(); @@ -1387,7 +1386,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference< XStream >& xStre if( !xStream.is() ) return nullptr; - UcbLockBytesRef xLockBytes = new UcbLockBytes(nullptr); + UcbLockBytesRef xLockBytes = new UcbLockBytes; xLockBytes->setDontClose_Impl(); xLockBytes->setStream_Impl( xStream ); xLockBytes->terminate_Impl(); @@ -1400,7 +1399,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo if( !xContent.is() ) return nullptr; - UcbLockBytesRef xLockBytes = new UcbLockBytes( pHandler ); + UcbLockBytesRef xLockBytes = new UcbLockBytes; xLockBytes->SetSynchronMode( !pHandler ); Reference< XActiveDataControl > xSink; if ( eOpenMode & StreamMode::WRITE ) diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx index b16a512..b97151f 100644 --- a/unotools/source/ucbhelper/ucblockbytes.hxx +++ b/unotools/source/ucbhelper/ucblockbytes.hxx @@ -87,7 +87,6 @@ class UcbLockBytes : public virtual SvLockBytes css::uno::Reference < css::io::XInputStream > m_xInputStream; css::uno::Reference < css::io::XOutputStream > m_xOutputStream; css::uno::Reference < css::io::XSeekable > m_xSeekable; - tools::SvRef<UcbLockBytesHandler> m_xHandler; ErrCode m_nError; @@ -95,7 +94,7 @@ class UcbLockBytes : public virtual SvLockBytes bool m_bDontClose; bool m_bStreamValid; - UcbLockBytes( UcbLockBytesHandler* pHandler ); + UcbLockBytes(); protected: virtual ~UcbLockBytes(); diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx index b48344c..eafab7e 100644 --- a/unoxml/source/dom/documentbuilder.cxx +++ b/unoxml/source/dom/documentbuilder.cxx @@ -87,10 +87,8 @@ namespace DOM }; - CDocumentBuilder::CDocumentBuilder( - Reference< XMultiServiceFactory > const& xFactory) - : m_xFactory(xFactory) - , m_xEntityResolver(new CDefaultEntityResolver()) + CDocumentBuilder::CDocumentBuilder() + : m_xEntityResolver(new CDefaultEntityResolver()) { // init libxml. libxml will protect itself against multiple // initializations so there is no problem here if this gets @@ -98,9 +96,9 @@ namespace DOM xmlInitParser(); } - Reference< XInterface > CDocumentBuilder::_getInstance(const Reference< XMultiServiceFactory >& rSMgr) + Reference< XInterface > CDocumentBuilder::_getInstance(const Reference< XMultiServiceFactory >& ) { - return static_cast< XDocumentBuilder* >(new CDocumentBuilder(rSMgr)); + return static_cast< XDocumentBuilder* >(new CDocumentBuilder); } const char* CDocumentBuilder::aImplementationName = "com.sun.star.comp.xml.dom.DocumentBuilder"; diff --git a/unoxml/source/dom/documentbuilder.hxx b/unoxml/source/dom/documentbuilder.hxx index 441b5dd..045a19e 100644 --- a/unoxml/source/dom/documentbuilder.hxx +++ b/unoxml/source/dom/documentbuilder.hxx @@ -51,17 +51,13 @@ namespace DOM { private: ::osl::Mutex m_Mutex; - css::uno::Reference< css::lang::XMultiServiceFactory > const - m_xFactory; css::uno::Reference< css::xml::sax::XEntityResolver > m_xEntityResolver; css::uno::Reference< css::xml::sax::XErrorHandler > m_xErrorHandler; public: // ctor - explicit CDocumentBuilder( - css::uno::Reference< css::lang::XMultiServiceFactory > const& - xFactory); + explicit CDocumentBuilder(); // static helpers for service info and component management static const char* aImplementationName; diff --git a/unoxml/source/dom/documenttype.cxx b/unoxml/source/dom/documenttype.cxx index af63d89..ddc3201 100644 --- a/unoxml/source/dom/documenttype.cxx +++ b/unoxml/source/dom/documenttype.cxx @@ -52,7 +52,7 @@ namespace DOM css::uno::Reference< XNamedNodeMap > aMap; if (m_aDtdPtr != nullptr) { - aMap.set(new CEntitiesMap(this)); + aMap.set(new CEntitiesMap); } return aMap; } @@ -93,7 +93,7 @@ namespace DOM css::uno::Reference< XNamedNodeMap > aMap; if (m_aDtdPtr != nullptr) { - aMap.set(new CNotationsMap(this)); + aMap.set(new CNotationsMap); } return aMap; } diff --git a/unoxml/source/dom/entitiesmap.cxx b/unoxml/source/dom/entitiesmap.cxx index 08dfb35..a281fa1 100644 --- a/unoxml/source/dom/entitiesmap.cxx +++ b/unoxml/source/dom/entitiesmap.cxx @@ -28,8 +28,7 @@ using namespace css::xml::dom; namespace DOM { - CEntitiesMap::CEntitiesMap(::rtl::Reference<CDocumentType> const& pDocType) - : m_pDocType(pDocType) + CEntitiesMap::CEntitiesMap() { } diff --git a/unoxml/source/dom/entitiesmap.hxx b/unoxml/source/dom/entitiesmap.hxx index 1a3f1e3..b358ae6 100644 --- a/unoxml/source/dom/entitiesmap.hxx +++ b/unoxml/source/dom/entitiesmap.hxx @@ -36,11 +36,8 @@ namespace DOM class CEntitiesMap : public cppu::WeakImplHelper< css::xml::dom::XNamedNodeMap > { - private: - ::rtl::Reference<CDocumentType> const m_pDocType; - public: - CEntitiesMap(::rtl::Reference<CDocumentType> const& pDocType); + CEntitiesMap(); /** The number of nodes in this map. diff --git a/unoxml/source/dom/notationsmap.cxx b/unoxml/source/dom/notationsmap.cxx index 6e84d07..d2fc182 100644 --- a/unoxml/source/dom/notationsmap.cxx +++ b/unoxml/source/dom/notationsmap.cxx @@ -28,9 +28,7 @@ using namespace css::xml::dom; namespace DOM { - CNotationsMap::CNotationsMap( - ::rtl::Reference<CDocumentType> const& pDocType) - : m_pDocType(pDocType) + CNotationsMap::CNotationsMap() { } diff --git a/unoxml/source/dom/notationsmap.hxx b/unoxml/source/dom/notationsmap.hxx index d07277e..a68452e 100644 --- a/unoxml/source/dom/notationsmap.hxx +++ b/unoxml/source/dom/notationsmap.hxx @@ -36,11 +36,8 @@ namespace DOM class CNotationsMap : public cppu::WeakImplHelper< css::xml::dom::XNamedNodeMap > { - private: - ::rtl::Reference<CDocumentType> const m_pDocType; - public: - CNotationsMap(::rtl::Reference<CDocumentType> const& pDocType); + CNotationsMap(); /** The number of nodes in this map. diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx index 84b35ce..a299be2 100644 --- a/unoxml/source/rdf/CBlankNode.cxx +++ b/unoxml/source/rdf/CBlankNode.cxx @@ -40,7 +40,7 @@ class CBlankNode: private boost::noncopyable { public: - explicit CBlankNode(css::uno::Reference< css::uno::XComponentContext > const & context); + CBlankNode(); virtual ~CBlankNode() {} // css::lang::XServiceInfo: @@ -55,13 +55,11 @@ public: virtual OUString SAL_CALL getStringValue() throw (css::uno::RuntimeException, std::exception) override; private: - css::uno::Reference< css::uno::XComponentContext > m_xContext; - OUString m_NodeID; }; -CBlankNode::CBlankNode(css::uno::Reference< css::uno::XComponentContext > const & context) : - m_xContext(context), m_NodeID() +CBlankNode::CBlankNode() : + m_NodeID() {} // com.sun.star.uno.XServiceInfo: @@ -130,9 +128,9 @@ css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() } css::uno::Reference< css::uno::XInterface > SAL_CALL _create( - const css::uno::Reference< css::uno::XComponentContext > & context) + const css::uno::Reference< css::uno::XComponentContext > & ) { - return static_cast< ::cppu::OWeakObject * >(new CBlankNode(context)); + return static_cast< ::cppu::OWeakObject * >(new CBlankNode); } } // closing component helper namespace diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx index 04dd021..fa85876 100644 --- a/unoxml/source/rdf/CLiteral.cxx +++ b/unoxml/source/rdf/CLiteral.cxx @@ -42,7 +42,7 @@ class CLiteral: private boost::noncopyable { public: - explicit CLiteral(css::uno::Reference< css::uno::XComponentContext > const & context); + explicit CLiteral(); virtual ~CLiteral() {} // css::lang::XServiceInfo: @@ -62,15 +62,13 @@ public: virtual css::uno::Reference< css::rdf::XURI > SAL_CALL getDatatype() throw (css::uno::RuntimeException, std::exception) override; private: - css::uno::Reference< css::uno::XComponentContext > m_xContext; - OUString m_Value; OUString m_Language; css::uno::Reference< css::rdf::XURI > m_xDatatype; }; -CLiteral::CLiteral(css::uno::Reference< css::uno::XComponentContext > const & context) : - m_xContext(context), m_Value(), m_Language(), m_xDatatype() +CLiteral::CLiteral() : + m_Value(), m_Language(), m_xDatatype() {} // com.sun.star.uno.XServiceInfo: @@ -193,9 +191,9 @@ css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() } css::uno::Reference< css::uno::XInterface > SAL_CALL _create( - const css::uno::Reference< css::uno::XComponentContext > & context) + const css::uno::Reference< css::uno::XComponentContext > & ) { - return static_cast< ::cppu::OWeakObject * >(new CLiteral(context)); + return static_cast< ::cppu::OWeakObject * >(new CLiteral); } } // closing component helper namespace diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx index c9b7f76..caf54d1 100644 --- a/unoxml/source/rdf/CURI.cxx +++ b/unoxml/source/rdf/CURI.cxx @@ -41,7 +41,7 @@ class CURI: private boost::noncopyable { public: - explicit CURI(css::uno::Reference< css::uno::XComponentContext > const & context); + explicit CURI(); virtual ~CURI() {} // css::lang::XServiceInfo: @@ -63,14 +63,12 @@ private: /// handle css.rdf.URIs void SAL_CALL initFromConstant(const sal_Int16 i_Constant); - css::uno::Reference< css::uno::XComponentContext > m_xContext; - OUString m_Namespace; OUString m_LocalName; }; -CURI::CURI(css::uno::Reference< css::uno::XComponentContext > const & context) : - m_xContext(context), m_Namespace(), m_LocalName() +CURI::CURI() : + m_Namespace(), m_LocalName() {} // com.sun.star.uno.XServiceInfo: @@ -820,9 +818,9 @@ css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames() } css::uno::Reference< css::uno::XInterface > SAL_CALL _create( - const css::uno::Reference< css::uno::XComponentContext > & context) + const css::uno::Reference< css::uno::XComponentContext > & ) { - return static_cast< ::cppu::OWeakObject * >(new CURI(context)); + return static_cast< ::cppu::OWeakObject * >(new CURI); } } // closing component helper namespace commit 3faf5fd9eeb6a2f8532f8ebf13bfd772bb80ef69 Author: Noel Grandin <[email protected]> Date: Mon Dec 21 11:02:30 2015 +0200 loplugin:unusedfields vbahelper Change-Id: I5fbe892077697111514767552ef0b4bc88d1a701 diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx index 7946ace..c481249 100644 --- a/vbahelper/source/msforms/vbacontrols.cxx +++ b/vbahelper/source/msforms/vbacontrols.cxx @@ -157,7 +157,6 @@ public: class ControlsEnumWrapper : public EnumerationHelper_BASE { - uno::Reference<XHelperInterface > m_xParent; uno::Reference<uno::XComponentContext > m_xContext; uno::Reference<container::XIndexAccess > m_xIndexAccess; uno::Reference<awt::XControl > m_xDlg; @@ -169,13 +168,11 @@ class ControlsEnumWrapper : public EnumerationHelper_BASE public: ControlsEnumWrapper( - const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference< awt::XControl >& xDlg, const uno::Reference< frame::XModel >& xModel, double fOffsetX, double fOffsetY ) : - m_xParent( xParent ), m_xContext( xContext), m_xIndexAccess( xIndexAccess ), m_xDlg( xDlg ), @@ -230,7 +227,7 @@ ScVbaControls::ScVbaControls( uno::Reference< container::XEnumeration > ScVbaControls::createEnumeration() throw (uno::RuntimeException) { - uno::Reference< container::XEnumeration > xEnum( new ControlsEnumWrapper( mxParent, mxContext, m_xIndexAccess, mxDialog, mxModel, mfOffsetX, mfOffsetY ) ); + uno::Reference< container::XEnumeration > xEnum( new ControlsEnumWrapper( mxContext, m_xIndexAccess, mxDialog, mxModel, mfOffsetX, mfOffsetY ) ); if ( !xEnum.is() ) throw uno::RuntimeException(); return xEnum; diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx b/vbahelper/source/vbahelper/vbacolorformat.cxx index 8c71b81..dffe771 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.cxx +++ b/vbahelper/source/vbahelper/vbacolorformat.cxx @@ -40,7 +40,7 @@ MsoColorIndices::getColorIndex( sal_Int32 nIndex ) }; return COLORINDICES[nIndex]; } -ScVbaColorFormat::ScVbaColorFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XHelperInterface >& xInternalParent, const uno::Reference< drawing::XShape >& xShape, const sal_Int16 nColorFormatType ) : ScVbaColorFormat_BASE( xParent, xContext ), m_xInternalParent( xInternalParent ), m_xShape( xShape ), m_nColorFormatType( nColorFormatType ) +ScVbaColorFormat::ScVbaColorFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XHelperInterface >& xInternalParent, const uno::Reference< drawing::XShape >& xShape, const sal_Int16 nColorFormatType ) : ScVbaColorFormat_BASE( xParent, xContext ), m_nColorFormatType( nColorFormatType ) { m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW ); m_nFillFormatBackColor = 0; diff --git a/vbahelper/source/vbahelper/vbacolorformat.hxx b/vbahelper/source/vbahelper/vbacolorformat.hxx index df9e190..1e6248e 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.hxx +++ b/vbahelper/source/vbahelper/vbacolorformat.hxx @@ -93,8 +93,6 @@ struct MsoColorIndices class ScVbaColorFormat : public ScVbaColorFormat_BASE { private: - css::uno::Reference< ov::XHelperInterface > m_xInternalParent; - css::uno::Reference< css::drawing::XShape > m_xShape; css::uno::Reference< css::beans::XPropertySet > m_xPropertySet; ScVbaFillFormat *m_pFillFormat; sal_Int16 m_nColorFormatType; commit 8ee52d72f57f70f791c79372a43ad6e5efd88c19 Author: Noel Grandin <[email protected]> Date: Mon Dec 21 10:59:06 2015 +0200 loplugin:unusedfields writerfilter,writerperfect Change-Id: I8863fcdb0751d2f1becea5b2487d4070e4fd4195 diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 14199bb..7aace41 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -593,7 +593,7 @@ public: SettingsTablePtr GetSettingsTable() { if( !m_pSettingsTable ) - m_pSettingsTable.reset( new SettingsTable( m_xTextFactory ) ); + m_pSettingsTable.reset( new SettingsTable ); return m_pSettingsTable; } diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx index 6aae48d..7dbda36 100644 --- a/writerfilter/source/dmapper/SettingsTable.cxx +++ b/writerfilter/source/dmapper/SettingsTable.cxx @@ -41,8 +41,6 @@ namespace dmapper struct SettingsTable_Impl { - const uno::Reference< lang::XMultiServiceFactory > m_xTextFactory; - OUString m_sCharacterSpacing; OUString m_sDecimalSymbol; OUString m_sListSeparatorForFields; //2.15.1.56 listSeparator (List Separator for Field Code Evaluation) @@ -71,9 +69,8 @@ struct SettingsTable_Impl std::vector<beans::PropertyValue> m_aCompatSettings; uno::Sequence<beans::PropertyValue> m_pCurrentCompatSetting; - SettingsTable_Impl( const uno::Reference< lang::XMultiServiceFactory > & xTextFactory ) : - m_xTextFactory( xTextFactory ) - , m_nDefaultTabStop( 720 ) //default is 1/2 in + SettingsTable_Impl() : + m_nDefaultTabStop( 720 ) //default is 1/2 in , m_nHyphenationZone(0) , m_bNoPunctuationKerning(false) , m_doNotIncludeSubdocsInStats(false) @@ -97,10 +94,10 @@ struct SettingsTable_Impl }; -SettingsTable::SettingsTable(const uno::Reference< lang::XMultiServiceFactory > & xTextFactory) +SettingsTable::SettingsTable() : LoggedProperties("SettingsTable") , LoggedTable("SettingsTable") -, m_pImpl( new SettingsTable_Impl(xTextFactory) ) +, m_pImpl( new SettingsTable_Impl ) { } diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx index 5a0d688..813f8dd 100644 --- a/writerfilter/source/dmapper/SettingsTable.hxx +++ b/writerfilter/source/dmapper/SettingsTable.hxx @@ -45,7 +45,7 @@ class SettingsTable : public LoggedProperties, public LoggedTable std::unique_ptr<SettingsTable_Impl> m_pImpl; public: - SettingsTable(const css::uno::Reference<css::lang::XMultiServiceFactory>& xTextFactory); + SettingsTable(); virtual ~SettingsTable(); //returns default TabStop in 1/100th mm diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index a0e5922..e9b2218 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -285,7 +285,6 @@ struct StyleSheetTable_Impl std::vector< StyleSheetEntryPtr > m_aStyleSheetEntries; StyleSheetEntryPtr m_pCurrentEntry; PropertyMapPtr m_pDefaultParaProps, m_pDefaultCharProps; - PropertyMapPtr m_pCurrentProps; StringPairMap_t m_aStyleNameMap; /// Style names which should not be used without a " (user)" suffix. std::set<OUString> m_aReservedStyleNames; diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx index b1b5c18..ff5f6aa 100644 --- a/writerfilter/source/dmapper/TableData.hxx +++ b/writerfilter/source/dmapper/TableData.hxx @@ -245,11 +245,6 @@ class TableData typedef ::std::vector<RowPointer_t> Rows; /** - the table properties - */ - TablePropertyMapPtr mpTableProps; - - /** the data of the rows of the table */ Rows mRows; diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx index 2429f4d..8f907cc 100644 --- a/writerfilter/source/dmapper/TableManager.hxx +++ b/writerfilter/source/dmapper/TableManager.hxx @@ -52,11 +52,6 @@ class TableManager class TableManagerState { /** - properties at the current point in document - */ - TablePropertyMapPtr mpProps; - - /** properties of the current cell */ TablePropertyMapPtr mpCellProps; diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx index 2624c06..bf77004 100644 --- a/writerfilter/source/filter/WriterFilterDetection.cxx +++ b/writerfilter/source/filter/WriterFilterDetection.cxx @@ -33,10 +33,8 @@ class WriterFilterDetection : public cppu::WeakImplHelper lang::XServiceInfo > { - uno::Reference<uno::XComponentContext> m_xContext; - public: - explicit WriterFilterDetection(const uno::Reference<uno::XComponentContext>& rxContext); + explicit WriterFilterDetection(); virtual ~WriterFilterDetection(); //XExtendedFilterDetection @@ -50,8 +48,7 @@ public: uno::Sequence<OUString> SAL_CALL WriterFilterDetection_getSupportedServiceNames() throw (uno::RuntimeException); -WriterFilterDetection::WriterFilterDetection(const uno::Reference<uno::XComponentContext>& rxContext) - : m_xContext(rxContext) +WriterFilterDetection::WriterFilterDetection() { } @@ -135,9 +132,9 @@ uno::Sequence<OUString> WriterFilterDetection::getSupportedServiceNames() throw return WriterFilterDetection_getSupportedServiceNames(); } -extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL com_sun_star_comp_Writer_WriterFilterDetector_get_implementation(uno::XComponentContext* pComp, uno::Sequence<css::uno::Any> const&) +extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface* SAL_CALL com_sun_star_comp_Writer_WriterFilterDetector_get_implementation(uno::XComponentContext* /*pComp*/, uno::Sequence<css::uno::Any> const&) { - return cppu::acquire(new WriterFilterDetection(pComp)); + return cppu::acquire(new WriterFilterDetection); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx index da4badf..9833edb 100644 --- a/writerperfect/inc/ImportFilter.hxx +++ b/writerperfect/inc/ImportFilter.hxx @@ -180,7 +180,6 @@ private: css::uno::Reference< css::uno::XComponentContext > mxContext; css::uno::Reference< css::lang::XComponent > mxDoc; OUString msFilterName; - css::uno::Reference< css::xml::sax::XDocumentHandler > mxHandler; }; } diff --git a/writerperfect/qa/unit/WpftImportTestBase.hxx b/writerperfect/qa/unit/WpftImportTestBase.hxx index 7e20987..ce70172 100644 --- a/writerperfect/qa/unit/WpftImportTestBase.hxx +++ b/writerperfect/qa/unit/WpftImportTestBase.hxx @@ -101,7 +101,6 @@ private: private: const rtl::OUString m_aFactoryURL; css::uno::Reference<css::frame::XDesktop2> m_xDesktop; - css::uno::Reference<css::ucb::XSimpleFileAccess> m_xFileAccess; css::uno::Reference<css::document::XFilter> m_xFilter; css::uno::Reference<css::container::XNameAccess> m_xTypeMap; const WpftOptionalMap_t *m_pOptionalMap; diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx index 585128a..d7edfd6 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.cxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx @@ -280,8 +280,8 @@ throw (RuntimeException, std::exception) } -WordPerfectImportFilterDialog::WordPerfectImportFilterDialog(const Reference< XComponentContext > &rContext) : - mxContext(rContext) {} +WordPerfectImportFilterDialog::WordPerfectImportFilterDialog() +{} WordPerfectImportFilterDialog::~WordPerfectImportFilterDialog() { @@ -385,10 +385,10 @@ throw (RuntimeException) return aRet; } -Reference< XInterface > SAL_CALL WordPerfectImportFilterDialog_createInstance(const Reference< XComponentContext > &rContext) +Reference< XInterface > SAL_CALL WordPerfectImportFilterDialog_createInstance(const Reference< XComponentContext > &) throw(Exception) { - return static_cast<cppu::OWeakObject *>(new WordPerfectImportFilterDialog(rContext)); + return static_cast<cppu::OWeakObject *>(new WordPerfectImportFilterDialog); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx b/writerperfect/source/writer/WordPerfectImportFilter.hxx index f9fa2a6..749aaf5 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.hxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx @@ -38,7 +38,6 @@ protected: css::uno::Reference< css::uno::XComponentContext > mxContext; css::uno::Reference< css::lang::XComponent > mxDoc; OUString msFilterName; - css::uno::Reference< css::xml::sax::XDocumentHandler > mxHandler; bool SAL_CALL importImpl(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor) throw (css::uno::RuntimeException, std::exception); @@ -96,7 +95,6 @@ class WordPerfectImportFilterDialog : public cppu::WeakImplHelper < css::beans::XPropertyAccess > { - css::uno::Reference< css::uno::XComponentContext > mxContext; OUString msPassword; css::uno::Reference< css::io::XInputStream > mxInputStream; @@ -128,7 +126,7 @@ class WordPerfectImportFilterDialog : public cppu::WeakImplHelper < css::uno::RuntimeException, std::exception) override; public: - explicit WordPerfectImportFilterDialog(const css::uno::Reference< css::uno::XComponentContext > &rContext); + explicit WordPerfectImportFilterDialog(); }; commit 4c7ce41582b85375df385a05770a0a79fa742bbc Author: Noel Grandin <[email protected]> Date: Mon Dec 21 10:50:20 2015 +0200 loplugin:unusedfields in xmlhelp,xmloff Change-Id: I4d2f0ff95da5abaa3d0a0a5223616e09e0c476fc diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx index c035546..0826f43 100644 --- a/xmlhelp/source/cxxhelp/provider/content.cxx +++ b/xmlhelp/source/cxxhelp/provider/content.cxx @@ -330,9 +330,7 @@ uno::Any SAL_CALL Content::execute( uno::Reference< ucb::XDynamicResultSet > xSet = new DynamicResultSet( m_xContext, - this, aOpenCommand, - Environment, new ResultSetForRootFactory( m_xContext, m_xProvider.get(), @@ -346,9 +344,7 @@ uno::Any SAL_CALL Content::execute( uno::Reference< ucb::XDynamicResultSet > xSet = new DynamicResultSet( m_xContext, - this, aOpenCommand, - Environment, new ResultSetForQueryFactory( m_xContext, m_xProvider.get(), diff --git a/xmlhelp/source/cxxhelp/provider/resultset.cxx b/xmlhelp/source/cxxhelp/provider/resultset.cxx index 64b7d5f..67ad5df 100644 --- a/xmlhelp/source/cxxhelp/provider/resultset.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultset.cxx @@ -33,13 +33,9 @@ using namespace chelp; DynamicResultSet::DynamicResultSet( const Reference< XComponentContext >& rxContext, - const rtl::Reference< Content >& rxContent, const OpenCommandArgument2& rCommand, - const Reference< XCommandEnvironment >& rxEnv, ResultSetFactory* pFactory ) : ResultSetImplHelper( rxContext, rCommand ), - m_xContent( rxContent ), - m_xEnv( rxEnv ), m_pFactory( pFactory ) { } diff --git a/xmlhelp/source/cxxhelp/provider/resultset.hxx b/xmlhelp/source/cxxhelp/provider/resultset.hxx index 53432d7..0017366 100644 --- a/xmlhelp/source/cxxhelp/provider/resultset.hxx +++ b/xmlhelp/source/cxxhelp/provider/resultset.hxx @@ -31,8 +31,6 @@ namespace chelp { class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper { - rtl::Reference< Content > m_xContent; - css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; ResultSetFactory* m_pFactory; private: @@ -42,9 +40,7 @@ namespace chelp { public: DynamicResultSet( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const rtl::Reference< Content >& rxContent, const css::ucb::OpenCommandArgument2& rCommand, - const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv, ResultSetFactory* pFactory ); virtual ~DynamicResultSet(); diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index c3c986d..4b35541 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -1341,8 +1341,6 @@ public: class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext { - css::uno::Any aValue; - public: XMLCustomPropertyFieldImportContext (SvXMLImport& rImport, diff --git a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx index afa6a7c..2a0ba1c 100644 --- a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx +++ b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx @@ -37,7 +37,6 @@ public: virtual void StartElement( const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: - css::uno::Reference< css::chart2::XChartDocument > mxChartDocument; SchXMLImportHelper& mrImportHelper; css::uno::Reference< css::chart2::XDataSeries > mxDataSeries; diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx index d8a765f..6ac0d5b 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx @@ -94,7 +94,7 @@ SvXMLImportContext* SchXMLRegressionCurveObjectContext::CreateChildContext( if( nPrefix == XML_NAMESPACE_CHART && IsXMLToken( rLocalName, XML_EQUATION ) ) { pContext = new SchXMLEquationContext( - mrImportHelper, GetImport(), nPrefix, rLocalName, mxSeries, maChartSize, mrRegressionStyleList.back()); + mrImportHelper, GetImport(), nPrefix, rLocalName, maChartSize, mrRegressionStyleList.back()); } else { @@ -109,15 +109,12 @@ SchXMLEquationContext::SchXMLEquationContext( SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const css::uno::Reference< - css::chart2::XDataSeries >& xSeries, const awt::Size& rChartSize, RegressionStyle& rRegressionStyle ) : SvXMLImportContext( rImport, nPrefix, rLocalName ), mrImportHelper( rImpHelper ), mrRegressionStyle( rRegressionStyle ), - mxSeries( xSeries ), maChartSize( rChartSize ) {} diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx index 49274b5..f111ab2 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx @@ -63,7 +63,6 @@ public: SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName, - const css::uno::Reference< css::chart2::XDataSeries >& xSeries, const css::awt::Size & rChartSize, RegressionStyle & rRegressionStyle ); @@ -74,7 +73,6 @@ public: private: SchXMLImportHelper& mrImportHelper; RegressionStyle& mrRegressionStyle; - css::uno::Reference< css::chart2::XDataSeries > mxSeries; css::awt::Size maChartSize; }; diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx index 3d251d5..4a585e7 100644 --- a/xmloff/source/draw/sdxmlimp_impl.hxx +++ b/xmloff/source/draw/sdxmlimp_impl.hxx @@ -196,9 +196,6 @@ class SdXMLImport: public SvXMLImport bool mbLoadDoc; bool mbPreview; - std::map< sal_Int32, css::uno::Reference< css::drawing::XDrawPage >, SdXMLltXDrawPageId > - maDrawPageIds; - OUString msPageLayouts; OUString msPreview; diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 4bd6fe6..8ff67a3 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -95,9 +95,6 @@ struct XMLShapeImportHelperImpl // context for sorting shapes ShapeSortContext* mpSortContext; - std::map<sal_Int32, css::uno::Reference< css::drawing::XShape >, ltint32> - maShapeIds; - std::vector<ConnectionHint> maConnections; // #88546# possibility to switch progress bar handling on/off diff --git a/xmloff/source/table/XMLTableImport.cxx b/xmloff/source/table/XMLTableImport.cxx index c621e19..f1f1c4b 100644 --- a/xmloff/source/table/XMLTableImport.cxx +++ b/xmloff/source/table/XMLTableImport.cxx @@ -108,7 +108,6 @@ public: OUString GetDefaultCellStyleName() const; - rtl::Reference< XMLTableImport > mxTableImporter; css::uno::Reference< css::table::XTable > mxTable; Reference< XTableColumns > mxColumns; Reference< XTableRows > mxRows; @@ -275,7 +274,6 @@ void XMLTableImport::finishStyles() XMLTableImportContext::XMLTableImportContext( const rtl::Reference< XMLTableImport >& xImporter, sal_uInt16 nPrfx, const OUString& rLName, Reference< XColumnRowRange >& xColumnRowRange ) : SvXMLImportContext( xImporter->mrImport, nPrfx, rLName ) -, mxTableImporter( xImporter ) , mxTable( xColumnRowRange, UNO_QUERY ) , mxColumns( xColumnRowRange->getColumns() ) , mxRows( xColumnRowRange->getRows() ) diff --git a/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx index 0a1a2de..952eeb5 100644 --- a/xmloff/source/text/XMLSectionImportContext.hxx +++ b/xmloff/source/text/XMLSectionImportContext.hxx @@ -39,12 +39,6 @@ namespace com { namespace sun { namespace star { */ class XMLSectionImportContext : public SvXMLImportContext { - /// start position; ranges acquired via getStart(),getEnd() don't move - css::uno::Reference<css::text::XTextRange> xStartRange; - - /// end position - css::uno::Reference<css::text::XTextRange> xEndRange; - /// TextSection (as XPropertySet) for passing down to data source elements css::uno::Reference<css::beans::XPropertySet> xSectionPropertySet; diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 9000846..2ece1f4 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -507,7 +507,6 @@ struct XMLTextImportHelper::Impl std::unique_ptr<XMLTextListsHelper> m_xTextListsHelper; SvXMLImportContextRef m_xAutoStyles; - SvXMLImportContextRef m_xFontDecls; rtl::Reference< SvXMLImportPropertyMapper > m_xParaImpPrMap; rtl::Reference< SvXMLImportPropertyMapper > m_xTextImpPrMap; diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index 8856205..51a2ebd 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -1219,16 +1219,8 @@ bool XMLNumber8OneBasedHdl::exportXML( } return bRet; } -class XMLTextPropertyHandlerFactory_Impl -{ -public: - static const XMLPropertyHandler *GetPropertyHandler( sal_Int32 nType ); - XMLTextPropertyHandlerFactory_Impl(); - ~XMLTextPropertyHandlerFactory_Impl(); -}; - ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
