[Libreoffice-commits] core.git: cui/source oox/source

Noel Grandin noel.grandin at collabora.co.uk
Wed Sep 27 08:43:56 UTC 2017


 cui/source/customize/cfgutil.cxx                    |   14 --------------
 cui/source/inc/cfgutil.hxx                          |   11 -----------
 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   12 ------------
 oox/source/drawingml/diagram/diagramlayoutatoms.hxx |    1 -
 4 files changed, 38 deletions(-)

New commits:
commit 7ef34163216d575f43dfef6fa734ee06d2fe13af
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Sep 27 09:25:17 2017 +0200

    loplugin:unusedmethods
    
    Change-Id: I5d75baa2af046f377b49e967783fb06cd9e885ef
    Reviewed-on: https://gerrit.libreoffice.org/42841
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 2a8e591b82dc..02a34d9daf34 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -1265,8 +1265,6 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton, void )
     }
     else if (pButton == m_pOKButton)
     {
-        GetAddHdl().Call( *this );
-
         // If we are displaying Slot API commands then this the dialog is being
         // run from Tools/Configure and we should not close it
         if ( !m_bShowSlots )
@@ -1293,12 +1291,6 @@ SvxScriptSelectorDialog::SetRunLabel()
     m_pOKButton->SetText(CuiResId(RID_SVXSTR_SELECTOR_RUN));
 }
 
-void
-SvxScriptSelectorDialog::SetDialogDescription( const OUString& rDescription )
-{
-    m_pDialogDescription->SetText( rDescription );
-}
-
 OUString
 SvxScriptSelectorDialog::GetScriptURL() const
 {
@@ -1320,10 +1312,4 @@ SvxScriptSelectorDialog::GetScriptURL() const
     return result;
 }
 
-OUString
-SvxScriptSelectorDialog::GetSelectedDisplayName()
-{
-    return m_pCommands->GetEntryText( m_pCommands->FirstSelected() );
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 528b26f04b0e..3b2b190ed26e 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -192,7 +192,6 @@ class SvxScriptSelectorDialog : public ModalDialog
     OUString                               m_sDefaultDesc;
     SfxStylesInfo_Impl                     m_aStylesInfo;
     bool                                   m_bShowSlots;
-    Link<SvxScriptSelectorDialog&,void>    m_aAddHdl;
 
     DECL_LINK( ClickHdl, Button *, void );
     DECL_LINK( SelectHdl, SvTreeListBox*, void );
@@ -210,18 +209,8 @@ public:
     virtual ~SvxScriptSelectorDialog() override;
     virtual void dispose() override;
 
-    void        SetAddHdl( const Link<SvxScriptSelectorDialog&,void>& rLink ) { m_aAddHdl = rLink; }
-    const Link<SvxScriptSelectorDialog&,void>& GetAddHdl() const { return m_aAddHdl; }
-
-    void        SetImageProvider(SaveInData* provider)
-    {
-        m_pCategories->SetImageProvider(provider);
-    }
-
     OUString    GetScriptURL() const;
-    OUString    GetSelectedDisplayName();
     void        SetRunLabel();
-    void        SetDialogDescription(const OUString& rDescription);
 };
 
 #endif
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 147790f9f5db..dd69d19c1f5f 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -122,18 +122,6 @@ bool ConditionAtom::compareResult(sal_Int32 nOperator, sal_Int32 nFirst, sal_Int
     }
 }
 
-bool ConditionAtom::compareResult(sal_Int32 nOperator, const OUString& sFirst, const OUString& sSecond)
-{
-    switch (nOperator)
-    {
-    case XML_equ: return sFirst == sSecond;
-    case XML_neq: return sFirst != sSecond;
-    default:
-        SAL_WARN("oox.drawingml", "unsupported operator: " << nOperator);
-        return false;
-    }
-}
-
 const dgm::Point* ConditionAtom::getPresNode() const
 {
     const DiagramData::PointsNameMap& rPoints = mrLayoutNode.getDiagram().getData()->getPointsPresNameMap();
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 92ef240e6785..f4928565c048 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -184,7 +184,6 @@ public:
     virtual const std::vector<LayoutAtomPtr>& getChildren() const override;
 private:
     static bool compareResult(sal_Int32 nOperator, sal_Int32 nFirst, sal_Int32 nSecond);
-    static bool compareResult(sal_Int32 nOperator, const OUString& sFirst, const OUString& sSecond);
     const dgm::Point* getPresNode() const;
     sal_Int32 getNodeCount() const;
 


More information about the Libreoffice-commits mailing list