diff options
author | Noel Grandin <noel@peralex.com> | 2015-12-21 12:45:29 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-12-21 12:45:50 +0200 |
commit | f7e4cf3c27100dbaf292dfacf0964bdade0a866a (patch) | |
tree | 129dac640a84f67e9e997c3b4f877c831b57a0ff /sw/source/uibase | |
parent | dff9873c270f653ebd073dac90bdacd2a40207c1 (diff) |
loplugin:unusedfields in sw
Change-Id: I4d987718bf27766c8cd7f3654db6645e5a7f554a
Diffstat (limited to 'sw/source/uibase')
-rw-r--r-- | sw/source/uibase/dbui/dbtree.cxx | 5 | ||||
-rw-r--r-- | sw/source/uibase/dbui/mmconfigitem.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/inc/cption.hxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/inc/dbtree.hxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/inc/fldmgr.hxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/inc/hyp.hxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/inc/pview.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/redlndlg.hxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/inc/swdtflvr.hxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/lingu/hyp.cxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/misc/redlndlg.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/ribbar/workctrl.cxx | 24 | ||||
-rw-r--r-- | sw/source/uibase/table/tablepg.hxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/uno/SwXDocumentSettings.cxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/uno/SwXDocumentSettings.hxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/uno/unomodule.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/uno/unomodule.hxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/uno/unotxdoc.cxx | 1 |
18 files changed, 14 insertions, 48 deletions
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index a4eca985305c..45d704d8d801 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 b576da35dde1..6e2d1fd3d4ed 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 7e9617c574c3..407d12a4406e 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 c2d3b6236fac..2fc8aadf5286 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 832dfd360adf..71ed0882e44c 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 258c39693237..8d4e167260d3 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 35cb5ef488fe..df7045b9aec5 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 5044e077f049..3055d5b2188d 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 4b8b238a7a02..b5f5c46743d2 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 aee0bcfd5ff9..1959cff900d3 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 556be6dcff23..66ff7a538359 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 e420a5e4192a..1a1763419917 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 d832099a4b45..75d1e76a5a38 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 df09645674c5..09bdde21294e 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 131991312fec..888714148fa9 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 5cb62a9db2aa..da6f74cf3a8c 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 5d11b2892d1d..58316b1835d7 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 83f7dc1fd8a4..1aea89385902 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) { } |