Kaydet (Commit) aa6c54f3 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

loplugin:unusedfields

Change-Id: I321b594f1190cdd997b4769161e1c02d31f46213
Reviewed-on: https://gerrit.libreoffice.org/21566Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 0533b155
...@@ -31,8 +31,7 @@ using namespace ::com::sun::star; ...@@ -31,8 +31,7 @@ using namespace ::com::sun::star;
namespace avmedia { namespace gstreamer { namespace avmedia { namespace gstreamer {
Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : Manager::Manager()
mxMgr( rxMgr )
{ {
} }
......
...@@ -35,7 +35,7 @@ class Manager : public ::cppu::WeakImplHelper< css::media::XManager, ...@@ -35,7 +35,7 @@ class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
{ {
public: public:
explicit Manager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr ); explicit Manager();
virtual ~Manager(); virtual ~Manager();
// XManager // XManager
...@@ -45,9 +45,6 @@ public: ...@@ -45,9 +45,6 @@ public:
virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
private:
css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
}; };
} // namespace gstreamer } // namespace gstreamer
......
...@@ -34,9 +34,9 @@ using namespace ::com::sun::star; ...@@ -34,9 +34,9 @@ using namespace ::com::sun::star;
# define SERVICE_NAME AVMEDIA_MANAGER_SERVICE_NAME // "com.sun.star.comp.avmedia.Manager_GStreamer" # define SERVICE_NAME AVMEDIA_MANAGER_SERVICE_NAME // "com.sun.star.comp.avmedia.Manager_GStreamer"
#endif #endif
static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact ) static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& )
{ {
return uno::Reference< uno::XInterface >( *new ::avmedia::gstreamer::Manager( rxFact ) ); return uno::Reference< uno::XInterface >( *new ::avmedia::gstreamer::Manager );
} }
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediagst_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediagst_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
......
...@@ -53,17 +53,6 @@ public: ...@@ -53,17 +53,6 @@ public:
{ return static_cast<const SfxRefItem&>(rL).maRef == maRef; } { return static_cast<const SfxRefItem&>(rL).maRef == maRef; }
}; };
class SfxFrameWindow
{
ScopedVclPtr<vcl::Window> pWindow;
public:
SfxFrameWindow( vcl::Window *pWin )
: pWindow( pWin )
{}
virtual ~SfxFrameWindow() {}
};
typedef sal_uIntPtr (*SfxDetectFilter)( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust, SfxFilterFlags nDont ); typedef sal_uIntPtr (*SfxDetectFilter)( SfxMedium& rMedium, const SfxFilter **, SfxFilterFlags nMust, SfxFilterFlags nDont );
class SFX2_DLLPUBLIC SfxFilterContainer class SFX2_DLLPUBLIC SfxFilterContainer
......
...@@ -287,14 +287,13 @@ class MergeData ...@@ -287,14 +287,13 @@ class MergeData
friend class MergeDataHashMap; friend class MergeDataHashMap;
public: public:
OString sTyp;
OString sGID; OString sGID;
OString sLID; OString sLID;
MergeEntrys* pMergeEntrys; MergeEntrys* pMergeEntrys;
private: private:
MergeDataHashMap::iterator m_aNextData; MergeDataHashMap::iterator m_aNextData;
public: public:
MergeData( const OString &rTyp, const OString &rGID, const OString &rLID ); MergeData( const OString &rGID, const OString &rLID );
~MergeData(); ~MergeData();
MergeEntrys* GetMergeEntries() { return pMergeEntrys;} MergeEntrys* GetMergeEntries() { return pMergeEntrys;}
......
...@@ -190,11 +190,9 @@ MergeDataHashMap::iterator MergeDataHashMap::find(const OString& rKey) ...@@ -190,11 +190,9 @@ MergeDataHashMap::iterator MergeDataHashMap::find(const OString& rKey)
// class MergeData // class MergeData
MergeData::MergeData( MergeData::MergeData(const OString &rGID,
const OString &rTyp, const OString &rGID,
const OString &rLID ) const OString &rLID )
: sTyp( rTyp ), : sGID( rGID ),
sGID( rGID ),
sLID( rLID ) , sLID( rLID ) ,
pMergeEntrys( new MergeEntrys() ) pMergeEntrys( new MergeEntrys() )
{ {
...@@ -403,7 +401,7 @@ void MergeDataFile::InsertEntry( ...@@ -403,7 +401,7 @@ void MergeDataFile::InsertEntry(
if( !pData ) if( !pData )
{ {
pData = new MergeData( rTYP, rGID, rLID ); pData = new MergeData( rGID, rLID );
aMap.insert( sKey, pData ); aMap.insert( sKey, pData );
} }
......
...@@ -98,7 +98,6 @@ class StringResourceImpl : public StringResourceImpl_BASE ...@@ -98,7 +98,6 @@ class StringResourceImpl : public StringResourceImpl_BASE
{ {
protected: protected:
css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::lang::XMultiComponentFactory > m_xMCF;
LocaleItem* m_pCurrentLocaleItem; LocaleItem* m_pCurrentLocaleItem;
LocaleItem* m_pDefaultLocaleItem; LocaleItem* m_pDefaultLocaleItem;
......
...@@ -2215,7 +2215,6 @@ static OUString lcl_GetLabel(uno::Any& rAny) ...@@ -2215,7 +2215,6 @@ static OUString lcl_GetLabel(uno::Any& rAny)
SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(SfxBindings* pB, SfxTemplatePanelControl* pDlgWindow) SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(SfxBindings* pB, SfxTemplatePanelControl* pDlgWindow)
: SfxCommonTemplateDialog_Impl(pB, pDlgWindow, true) : SfxCommonTemplateDialog_Impl(pB, pDlgWindow, true)
, m_pFloat(pDlgWindow) , m_pFloat(pDlgWindow)
, m_bZoomIn(false)
, m_aActionTbL(VclPtrInstance<DropToolBox_Impl>(pDlgWindow, this)) , m_aActionTbL(VclPtrInstance<DropToolBox_Impl>(pDlgWindow, this))
, m_aActionTbR(VclPtrInstance<ToolBox>(pDlgWindow)) , m_aActionTbR(VclPtrInstance<ToolBox>(pDlgWindow))
{ {
......
...@@ -350,7 +350,6 @@ private: ...@@ -350,7 +350,6 @@ private:
friend class SfxTemplatePanelControl; friend class SfxTemplatePanelControl;
VclPtr<vcl::Window> m_pFloat; VclPtr<vcl::Window> m_pFloat;
bool m_bZoomIn;
VclPtr<DropToolBox_Impl> m_aActionTbL; VclPtr<DropToolBox_Impl> m_aActionTbL;
VclPtr<ToolBox> m_aActionTbR; VclPtr<ToolBox> m_aActionTbR;
......
...@@ -33,8 +33,7 @@ namespace ...@@ -33,8 +33,7 @@ namespace
struct CursorStateHelper struct CursorStateHelper
{ {
explicit CursorStateHelper(SwCursorShell& rShell) explicit CursorStateHelper(SwCursorShell& rShell)
: m_aLink(rShell) : m_pCursor(rShell.GetSwCursor())
, m_pCursor(rShell.GetSwCursor())
, m_aSaveState(*m_pCursor) , m_aSaveState(*m_pCursor)
{ } { }
...@@ -61,7 +60,6 @@ namespace ...@@ -61,7 +60,6 @@ namespace
return false; return false;
} }
SwCallLink m_aLink;
SwCursor* m_pCursor; SwCursor* m_pCursor;
SwCursorSaveState m_aSaveState; SwCursorSaveState m_aSaveState;
}; };
......
...@@ -26,8 +26,6 @@ using namespace ::com::sun::star; ...@@ -26,8 +26,6 @@ using namespace ::com::sun::star;
// ---------------------- AtkHyperlink ---------------------- // ---------------------- AtkHyperlink ----------------------
typedef struct { typedef struct {
AtkHyperlink atk_hyper_link;
uno::Reference< accessibility::XAccessibleHyperlink > xLink; uno::Reference< accessibility::XAccessibleHyperlink > xLink;
} HyperLink; } HyperLink;
......
...@@ -45,8 +45,6 @@ namespace com { namespace sun { namespace star { namespace accessibility { ...@@ -45,8 +45,6 @@ namespace com { namespace sun { namespace star { namespace accessibility {
struct _AtkObjectWrapper struct _AtkObjectWrapper
{ {
AtkObject aParent;
css::uno::Reference<css::accessibility::XAccessible> mpAccessible; css::uno::Reference<css::accessibility::XAccessible> mpAccessible;
css::uno::Reference<css::accessibility::XAccessibleContext> mpContext; css::uno::Reference<css::accessibility::XAccessibleContext> mpContext;
css::uno::Reference<css::accessibility::XAccessibleAction> mpAction; css::uno::Reference<css::accessibility::XAccessibleAction> mpAction;
......
...@@ -925,7 +925,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std ...@@ -925,7 +925,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std
GtkWindow *pParent = RunDialog::GetTransientFor(); GtkWindow *pParent = RunDialog::GetTransientFor();
if (pParent) if (pParent)
gtk_window_set_transient_for(GTK_WINDOW(m_pDialog), pParent); gtk_window_set_transient_for(GTK_WINDOW(m_pDialog), pParent);
RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit, xDesktop); RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit);
uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog); uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
while( GTK_RESPONSE_NO == btn ) while( GTK_RESPONSE_NO == btn )
{ {
...@@ -1014,7 +1014,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std ...@@ -1014,7 +1014,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std
RTL_TEXTENCODING_UTF8 ).getStr() ); RTL_TEXTENCODING_UTF8 ).getStr() );
if (pParent) if (pParent)
gtk_window_set_transient_for(GTK_WINDOW(dlg), pParent); gtk_window_set_transient_for(GTK_WINDOW(dlg), pParent);
RunDialog* pAnotherDialog = new RunDialog(dlg, xToolkit, xDesktop); RunDialog* pAnotherDialog = new RunDialog(dlg, xToolkit);
uno::Reference < awt::XTopWindowListener > xAnotherLifeCycle(pAnotherDialog); uno::Reference < awt::XTopWindowListener > xAnotherLifeCycle(pAnotherDialog);
btn = pAnotherDialog->run(); btn = pAnotherDialog->run();
......
...@@ -148,7 +148,7 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException, s ...@@ -148,7 +148,7 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException, s
GtkWindow *pParent = RunDialog::GetTransientFor(); GtkWindow *pParent = RunDialog::GetTransientFor();
if (pParent) if (pParent)
gtk_window_set_transient_for(GTK_WINDOW(m_pDialog), pParent); gtk_window_set_transient_for(GTK_WINDOW(m_pDialog), pParent);
RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit, xDesktop); RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit);
uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog); uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog);
gint nStatus = pRunDialog->run(); gint nStatus = pRunDialog->run();
switch( nStatus ) switch( nStatus )
......
...@@ -120,10 +120,9 @@ GtkWindow* RunDialog::GetTransientFor() ...@@ -120,10 +120,9 @@ GtkWindow* RunDialog::GetTransientFor()
return pParent; return pParent;
} }
RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference< awt::XExtendedToolkit >& rToolkit, RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference< awt::XExtendedToolkit >& rToolkit ) :
uno::Reference< frame::XDesktop >& rDesktop ) :
cppu::WeakComponentImplHelper< awt::XTopWindowListener, frame::XTerminateListener >( maLock ), cppu::WeakComponentImplHelper< awt::XTopWindowListener, frame::XTerminateListener >( maLock ),
mpDialog(pDialog), mxToolkit(rToolkit), mxDesktop(rDesktop) mpDialog(pDialog), mxToolkit(rToolkit)
{ {
} }
......
...@@ -80,7 +80,6 @@ private: ...@@ -80,7 +80,6 @@ private:
osl::Mutex maLock; osl::Mutex maLock;
GtkWidget *mpDialog; GtkWidget *mpDialog;
css::uno::Reference< css::awt::XExtendedToolkit> mxToolkit; css::uno::Reference< css::awt::XExtendedToolkit> mxToolkit;
css::uno::Reference< css::frame::XDesktop > mxDesktop;
public: public:
// XTopWindowListener // XTopWindowListener
...@@ -109,8 +108,7 @@ public: ...@@ -109,8 +108,7 @@ public:
throw(css::uno::RuntimeException, std::exception) override; throw(css::uno::RuntimeException, std::exception) override;
public: public:
RunDialog(GtkWidget *pDialog, RunDialog(GtkWidget *pDialog,
css::uno::Reference< css::awt::XExtendedToolkit > &rToolkit, css::uno::Reference< css::awt::XExtendedToolkit > &rToolkit
css::uno::Reference< css::frame::XDesktop > &rDesktop
); );
virtual ~RunDialog(); virtual ~RunDialog();
gint run(); gint run();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment