[Libreoffice-commits] core.git: avmedia/source include/sfx2 l10ntools/inc l10ntools/source scripting/source sfx2/source sw/source vcl/unx

Noel Grandin noel at peralex.com
Mon Jan 18 00:37:39 PST 2016


 avmedia/source/gstreamer/gstmanager.cxx            |    3 +--
 avmedia/source/gstreamer/gstmanager.hxx            |    5 +----
 avmedia/source/gstreamer/gstuno.cxx                |    4 ++--
 include/sfx2/fcontnr.hxx                           |   11 -----------
 l10ntools/inc/export.hxx                           |    3 +--
 l10ntools/source/merge.cxx                         |    8 +++-----
 scripting/source/stringresource/stringresource.hxx |    1 -
 sfx2/source/dialog/templdlg.cxx                    |    1 -
 sfx2/source/inc/templdgi.hxx                       |    1 -
 sw/source/core/crsr/crbm.cxx                       |    4 +---
 vcl/unx/gtk/a11y/atkhypertext.cxx                  |    2 --
 vcl/unx/gtk/a11y/atkwrapper.hxx                    |    2 --
 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx           |    4 ++--
 vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx         |    2 +-
 vcl/unx/gtk/fpicker/SalGtkPicker.cxx               |    5 ++---
 vcl/unx/gtk/fpicker/SalGtkPicker.hxx               |    4 +---
 16 files changed, 15 insertions(+), 45 deletions(-)

New commits:
commit aa6c54f337a616c9ca6a39cfc8708657018d8613
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Jan 18 09:01:15 2016 +0200

    loplugin:unusedfields
    
    Change-Id: I321b594f1190cdd997b4769161e1c02d31f46213
    Reviewed-on: https://gerrit.libreoffice.org/21566
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx
index b2fe6ea..2837556 100644
--- a/avmedia/source/gstreamer/gstmanager.cxx
+++ b/avmedia/source/gstreamer/gstmanager.cxx
@@ -31,8 +31,7 @@ using namespace ::com::sun::star;
 
 namespace avmedia { namespace gstreamer {
 
-Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
-    mxMgr( rxMgr )
+Manager::Manager()
 {
 }
 
diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx
index 04389fb..8dc1a95 100644
--- a/avmedia/source/gstreamer/gstmanager.hxx
+++ b/avmedia/source/gstreamer/gstmanager.hxx
@@ -35,7 +35,7 @@ class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
 {
 public:
 
-    explicit Manager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr );
+    explicit Manager();
     virtual ~Manager();
 
     // XManager
@@ -45,9 +45,6 @@ public:
     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 css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
-private:
-
-    css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr;
 };
 
 } // namespace gstreamer
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
index ba3ecc8..100a634 100644
--- a/avmedia/source/gstreamer/gstuno.cxx
+++ b/avmedia/source/gstreamer/gstuno.cxx
@@ -34,9 +34,9 @@ using namespace ::com::sun::star;
 #  define SERVICE_NAME AVMEDIA_MANAGER_SERVICE_NAME // "com.sun.star.comp.avmedia.Manager_GStreamer"
 #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*/ )
diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index 7b665ef..3bfa5e0 100644
--- a/include/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.hxx
@@ -53,17 +53,6 @@ public:
     {   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 );
 
 class SFX2_DLLPUBLIC SfxFilterContainer
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 7afc931..3718810 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -287,14 +287,13 @@ class MergeData
     friend class MergeDataHashMap;
 
 public:
-    OString sTyp;
     OString sGID;
     OString sLID;
     MergeEntrys* pMergeEntrys;
 private:
     MergeDataHashMap::iterator m_aNextData;
 public:
-    MergeData( const OString &rTyp, const OString &rGID, const OString &rLID );
+    MergeData( const OString &rGID, const OString &rLID );
     ~MergeData();
     MergeEntrys* GetMergeEntries() { return pMergeEntrys;}
 
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 6346216..8be78d0 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -190,11 +190,9 @@ MergeDataHashMap::iterator MergeDataHashMap::find(const OString& rKey)
 // class MergeData
 
 
-MergeData::MergeData(
-    const OString &rTyp, const OString &rGID,
+MergeData::MergeData(const OString &rGID,
     const OString &rLID )
-    : sTyp( rTyp ),
-    sGID( rGID ),
+    : sGID( rGID ),
     sLID( rLID ) ,
     pMergeEntrys( new MergeEntrys() )
 {
@@ -403,7 +401,7 @@ void MergeDataFile::InsertEntry(
 
     if( !pData )
     {
-        pData = new MergeData( rTYP, rGID, rLID );
+        pData = new MergeData( rGID, rLID );
         aMap.insert( sKey, pData );
     }
 
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx
index 5d57ea4..fc130b8 100644
--- a/scripting/source/stringresource/stringresource.hxx
+++ b/scripting/source/stringresource/stringresource.hxx
@@ -98,7 +98,6 @@ class StringResourceImpl : public StringResourceImpl_BASE
 {
 protected:
     css::uno::Reference< css::uno::XComponentContext >        m_xContext;
-    css::uno::Reference< css::lang::XMultiComponentFactory >  m_xMCF;
 
     LocaleItem*                                               m_pCurrentLocaleItem;
     LocaleItem*                                               m_pDefaultLocaleItem;
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 2aa03aa..ad0797c 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2215,7 +2215,6 @@ static OUString lcl_GetLabel(uno::Any& rAny)
 SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(SfxBindings* pB, SfxTemplatePanelControl* pDlgWindow)
     : SfxCommonTemplateDialog_Impl(pB, pDlgWindow, true)
     , m_pFloat(pDlgWindow)
-    , m_bZoomIn(false)
     , m_aActionTbL(VclPtrInstance<DropToolBox_Impl>(pDlgWindow, this))
     , m_aActionTbR(VclPtrInstance<ToolBox>(pDlgWindow))
 {
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index e153356..ab0d4d1 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -350,7 +350,6 @@ private:
     friend class SfxTemplatePanelControl;
 
     VclPtr<vcl::Window>         m_pFloat;
-    bool                        m_bZoomIn;
     VclPtr<DropToolBox_Impl>    m_aActionTbL;
     VclPtr<ToolBox>             m_aActionTbR;
 
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index 91b6f3f..89afac3 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -33,8 +33,7 @@ namespace
     struct CursorStateHelper
     {
         explicit CursorStateHelper(SwCursorShell& rShell)
-            : m_aLink(rShell)
-            , m_pCursor(rShell.GetSwCursor())
+            : m_pCursor(rShell.GetSwCursor())
             , m_aSaveState(*m_pCursor)
         { }
 
@@ -61,7 +60,6 @@ namespace
             return false;
         }
 
-        SwCallLink m_aLink;
         SwCursor* m_pCursor;
         SwCursorSaveState m_aSaveState;
     };
diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx
index 25f4116..1b65290 100644
--- a/vcl/unx/gtk/a11y/atkhypertext.cxx
+++ b/vcl/unx/gtk/a11y/atkhypertext.cxx
@@ -26,8 +26,6 @@ using namespace ::com::sun::star;
 // ---------------------- AtkHyperlink ----------------------
 
 typedef struct {
-    AtkHyperlink atk_hyper_link;
-
     uno::Reference< accessibility::XAccessibleHyperlink > xLink;
 } HyperLink;
 
diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx
index 4a023fa..f0f8189 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.hxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.hxx
@@ -45,8 +45,6 @@ namespace com { namespace sun { namespace star { namespace accessibility {
 
 struct _AtkObjectWrapper
 {
-    AtkObject aParent;
-
     css::uno::Reference<css::accessibility::XAccessible> mpAccessible;
     css::uno::Reference<css::accessibility::XAccessibleContext> mpContext;
     css::uno::Reference<css::accessibility::XAccessibleAction> mpAction;
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 7221d92..cee8543 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -925,7 +925,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std
     GtkWindow *pParent = RunDialog::GetTransientFor();
     if (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);
     while( GTK_RESPONSE_NO == btn )
     {
@@ -1014,7 +1014,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std
                                 RTL_TEXTENCODING_UTF8 ).getStr() );
                             if (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);
                             btn = pAnotherDialog->run();
 
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 49ab71d..4aebe6a 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -148,7 +148,7 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException, s
     GtkWindow *pParent = RunDialog::GetTransientFor();
     if (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);
     gint nStatus = pRunDialog->run();
     switch( nStatus )
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index 26b2740..c836b0c 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -120,10 +120,9 @@ GtkWindow* RunDialog::GetTransientFor()
     return pParent;
 }
 
-RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference< awt::XExtendedToolkit >& rToolkit,
-    uno::Reference< frame::XDesktop >& rDesktop ) :
+RunDialog::RunDialog( GtkWidget *pDialog, uno::Reference< awt::XExtendedToolkit >& rToolkit ) :
     cppu::WeakComponentImplHelper< awt::XTopWindowListener, frame::XTerminateListener >( maLock ),
-    mpDialog(pDialog), mxToolkit(rToolkit), mxDesktop(rDesktop)
+    mpDialog(pDialog), mxToolkit(rToolkit)
 {
 }
 
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
index be74e66..1282c37 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
@@ -80,7 +80,6 @@ private:
     osl::Mutex maLock;
     GtkWidget *mpDialog;
     css::uno::Reference< css::awt::XExtendedToolkit>  mxToolkit;
-    css::uno::Reference< css::frame::XDesktop >  mxDesktop;
 public:
 
     // XTopWindowListener
@@ -109,8 +108,7 @@ public:
         throw(css::uno::RuntimeException, std::exception) override;
 public:
     RunDialog(GtkWidget *pDialog,
-        css::uno::Reference< css::awt::XExtendedToolkit > &rToolkit,
-        css::uno::Reference< css::frame::XDesktop > &rDesktop
+        css::uno::Reference< css::awt::XExtendedToolkit > &rToolkit
         );
     virtual ~RunDialog();
     gint run();


More information about the Libreoffice-commits mailing list