diff options
author | Noel Grandin <noel@peralex.com> | 2015-12-22 15:38:00 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-12-23 08:13:53 +0200 |
commit | 03ef7e11d8d93061eb6b99897aac67c2ce8a5951 (patch) | |
tree | 1dd92f11ebc543929020b5709968f1d0596a2350 /fpicker | |
parent | 278f58c68b31faedb800a72aa0b44a7332f04a61 (diff) |
loplugin:unusedfields in fpicker
Change-Id: Ia5d9211a668c25c9891ed69902fe1a4fbb2d8483
Diffstat (limited to 'fpicker')
-rw-r--r-- | fpicker/source/office/OfficeFilePicker.cxx | 18 | ||||
-rw-r--r-- | fpicker/source/office/OfficeFilePicker.hxx | 4 | ||||
-rw-r--r-- | fpicker/source/office/OfficeFolderPicker.cxx | 8 | ||||
-rw-r--r-- | fpicker/source/office/OfficeFolderPicker.hxx | 2 | ||||
-rw-r--r-- | fpicker/source/office/commonpicker.cxx | 3 | ||||
-rw-r--r-- | fpicker/source/office/commonpicker.hxx | 4 | ||||
-rw-r--r-- | fpicker/source/office/iodlg.hxx | 2 |
7 files changed, 15 insertions, 26 deletions
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 938e2a800d96..9bd9724cf187 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -415,9 +415,8 @@ void SvtFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter ) // class SvtFilePicker -SvtFilePicker::SvtFilePicker( const Reference < XMultiServiceFactory >& xFactory ) - :OCommonPicker( xFactory ) - ,m_pFilterList ( nullptr ) +SvtFilePicker::SvtFilePicker() + :m_pFilterList ( nullptr ) ,m_pElemList ( nullptr ) ,m_bMultiSelection ( false ) ,m_nServiceType ( TemplateDescription::FILEOPEN_SIMPLE ) @@ -1147,16 +1146,14 @@ OUString SvtFilePicker::impl_getStaticImplementationName() /* Helper for registry */ Reference< XInterface > SAL_CALL SvtFilePicker::impl_createInstance( - const Reference< XComponentContext >& rxContext) throw( Exception ) + const Reference< XComponentContext >& ) throw( Exception ) { - Reference< XMultiServiceFactory > xServiceManager (rxContext->getServiceManager(), UNO_QUERY_THROW); - return Reference< XInterface >( *new SvtFilePicker( xServiceManager ) ); + return Reference< XInterface >( *new SvtFilePicker ); } // SvtRemoteFilePicker -SvtRemoteFilePicker::SvtRemoteFilePicker( const Reference < XMultiServiceFactory >& xFactory ) - :SvtFilePicker( xFactory ) +SvtRemoteFilePicker::SvtRemoteFilePicker() { } @@ -1214,10 +1211,9 @@ OUString SvtRemoteFilePicker::impl_getStaticImplementationName() /* Helper for registry */ Reference< XInterface > SAL_CALL SvtRemoteFilePicker::impl_createInstance( - const Reference< XComponentContext >& rxContext) throw( Exception ) + const Reference< XComponentContext >& ) throw( Exception ) { - Reference< XMultiServiceFactory > xServiceManager (rxContext->getServiceManager(), UNO_QUERY_THROW); - return Reference< XInterface >( *new SvtRemoteFilePicker( xServiceManager ) ); + return Reference< XInterface >( *new SvtRemoteFilePicker ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index 25fad322970d..da1d91e1b87e 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -82,7 +82,7 @@ protected: m_xDlgClosedListener; public: - SvtFilePicker( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory ); + SvtFilePicker(); virtual ~SvtFilePicker(); @@ -231,7 +231,7 @@ protected: class SvtRemoteFilePicker : public SvtFilePicker { public: - SvtRemoteFilePicker( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory ); + SvtRemoteFilePicker(); virtual VclPtr<SvtFileDialog_Base> implCreateDialog( vcl::Window* _pParent ) override; diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index ecb48a4fff4e..9238632111ec 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -36,8 +36,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -SvtFolderPicker::SvtFolderPicker( const Reference < XMultiServiceFactory >& _rxFactory ) - :SvtFolderPicker_Base( _rxFactory ) +SvtFolderPicker::SvtFolderPicker() { } @@ -184,11 +183,10 @@ OUString SvtFolderPicker::impl_getStaticImplementationName() } /* Helper for registry */ -Reference< XInterface > SAL_CALL SvtFolderPicker::impl_createInstance( const Reference< XComponentContext >& rxContext ) +Reference< XInterface > SAL_CALL SvtFolderPicker::impl_createInstance( const Reference< XComponentContext >& ) throw( Exception ) { - Reference< XMultiServiceFactory > xServiceManager (rxContext->getServiceManager(), UNO_QUERY_THROW); - return Reference< XInterface >( *new SvtFolderPicker( xServiceManager ) ); + return Reference< XInterface >( *new SvtFolderPicker ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx index 2452aa6024bc..155f5a31bd60 100644 --- a/fpicker/source/office/OfficeFolderPicker.hxx +++ b/fpicker/source/office/OfficeFolderPicker.hxx @@ -49,7 +49,7 @@ private: DECL_LINK_TYPED( DialogClosedHdl, Dialog&, void ); public: - SvtFolderPicker( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory ); + SvtFolderPicker(); virtual ~SvtFolderPicker(); diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index e560f58fc1dc..f47c956e5ba1 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -46,10 +46,9 @@ namespace svt using namespace ::comphelper; - OCommonPicker::OCommonPicker( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory ) + OCommonPicker::OCommonPicker() :OCommonPicker_Base( m_aMutex ) ,OPropertyContainer( GetBroadcastHelper() ) - ,m_xORB( _rxFactory ) ,m_pDlg( nullptr ) ,m_nCancelEvent( nullptr ) ,m_bExecuting( false ) diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx index f8e50a4a9c7a..6e61216a4fd2 100644 --- a/fpicker/source/office/commonpicker.hxx +++ b/fpicker/source/office/commonpicker.hxx @@ -58,8 +58,6 @@ namespace svt ,public ::comphelper::OPropertyArrayUsageHelper< OCommonPicker > { private: - css::uno::Reference< css::lang::XMultiServiceFactory > m_xORB; - // <properties> OUString m_sHelpURL; css::uno::Reference< css::awt::XWindow > m_xWindow; @@ -85,7 +83,7 @@ namespace svt inline ::cppu::OBroadcastHelper& GetBroadcastHelper() { return OCommonPicker_Base::rBHelper; } public: - OCommonPicker( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory ); + OCommonPicker(); protected: virtual ~OCommonPicker(); diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 9469078c93f9..75aab4de3ee0 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -78,8 +78,6 @@ private: ::utl::OConfigurationNode m_aConfiguration; ::rtl::Reference< ::svt::AsyncPickerAction > m_pCurrentAsyncAction; - css::uno::Reference< css::ui::dialogs::XDialogClosedListener > - m_xListener; bool m_bInExecuteAsync; bool m_bHasFilename; css::uno::Reference < css::uno::XComponentContext > |