[Libreoffice-commits] core.git: extensions/source include/sfx2 sfx2/source svx/source unusedcode.easy

Caolán McNamara caolanm at redhat.com
Wed Apr 22 01:24:28 PDT 2015


 extensions/source/plugin/inc/plugin/unx/sysplug.hxx |    1 -
 extensions/source/plugin/unx/nppapi.cxx             |   16 ----------------
 include/sfx2/mnuitem.hxx                            |    1 -
 sfx2/source/menu/mnuitem.cxx                        |    5 -----
 svx/source/dialog/_contdlg.cxx                      |    7 -------
 svx/source/dialog/contimp.hxx                       |    2 --
 unusedcode.easy                                     |    1 -
 7 files changed, 33 deletions(-)

New commits:
commit 11c834698466aea8004ff4b716afa26ae82aa615
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 22 09:18:12 2015 +0100

    callcatcher: update unused code
    
    Change-Id: I8a596153fe6ab34c56a956731d7f9909e71044aa

diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
index 59979da..aac6e97 100644
--- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
@@ -71,7 +71,6 @@ public:
     virtual int32_t NPP_Write( NPP instance, NPStream* stream, int32_t offset,
                                int32_t len, void* buffer ) SAL_OVERRIDE;
     virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream ) SAL_OVERRIDE;
-    char* NPP_GetMIMEDescription();
     virtual NPError NPP_GetValue( NPP instance, NPPVariable variable, void* value ) SAL_OVERRIDE;
     virtual NPError NPP_SetValue( NPP instance, NPNVariable variable,
                                  void *value) SAL_OVERRIDE;
diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx
index d755df1..f0707e6 100644
--- a/extensions/source/plugin/unx/nppapi.cxx
+++ b/extensions/source/plugin/unx/nppapi.cxx
@@ -601,22 +601,6 @@ int32_t UnxPluginComm::NPP_WriteReady( NPP instance, NPStream* stream )
     return aRet;
 }
 
-char* UnxPluginComm::NPP_GetMIMEDescription()
-{
-    static char* pDesc = NULL;
-    MediatorMessage* pMes =
-        Transact( eNPP_GetMIMEDescription,
-                  NULL );
-    if( ! pMes )
-        return const_cast<char*>("");
-
-    if( pDesc )
-        delete [] pDesc;
-    pDesc = pMes->GetString();
-    delete pMes;
-    return pDesc;
-}
-
 NPError UnxPluginComm::NPP_GetValue( NPP /*instance*/, NPPVariable /*variable*/, void* /*value*/ )
 {
     return 0;
diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx
index 065b6c9..98f0cc1 100644
--- a/include/sfx2/mnuitem.hxx
+++ b/include/sfx2/mnuitem.hxx
@@ -130,7 +130,6 @@ protected:
     DECL_LINK( Activate, Menu * ); // Needed to support high contrast images
 
 public:
-    static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings );
     SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings );
     virtual ~SfxAppMenuControl_Impl();
 
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index cb7fd05..b6785b9 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -301,11 +301,6 @@ PopupMenu* SfxMenuControl::GetPopup () const
 
 sal_IntPtr Select_Impl( void* pHdl, void* pVoid );
 
-SfxMenuControl* SfxAppMenuControl_Impl::CreateImpl(sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings)
-{
-    return new SfxAppMenuControl_Impl(nId, rMenu, rBindings);
-}
-
 SfxAppMenuControl_Impl::SfxAppMenuControl_Impl(
     sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings )
     : SfxMenuControl( nPos, rBindings ), pMenu(0)
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 6888e79..157c88d 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -291,13 +291,6 @@ bool SvxSuperContourDlg::Close()
     return( bRet ? SfxFloatingWindow::Close() : sal_False );
 }
 
-// Enabled or disabled all Controls
-
-void SvxSuperContourDlg::SetExecState( bool bEnable )
-{
-    bExecState = bEnable;
-}
-
 void SvxSuperContourDlg::SetGraphic( const Graphic& rGraphic )
 {
     aUndoGraphic = aRedoGraphic = Graphic();
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 45722b2..899998f 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -84,8 +84,6 @@ public:
                                            vcl::Window* pParent);
                         virtual ~SvxSuperContourDlg();
 
-    void                SetExecState( bool bEnable );
-
     void                SetGraphic( const Graphic& rGraphic );
     void                SetGraphicLinked( bool bLinked ) { bGraphicLinked = bLinked; }
     const Graphic&      GetGraphic() const { return aGraphic; }
diff --git a/unusedcode.easy b/unusedcode.easy
index 2d475ea..cd8cb1a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -52,7 +52,6 @@ SvxOpenGLObject::setRenderer(IOpenGLRenderer*)
 Test::testCopyPasteSkipEmptyConditionalFormatting()
 Test::testPerf()
 Test::testSharedFormulaMoveBlock()
-UnxPluginComm::NPP_GetMIMEDescription()
 XclXmlUtils::ToOString(XclRange const&)
 XmlTestTools::parseXml(utl::TempFile&)
 apitest::XCellRangesQuery::testQueryFormulaCells()


More information about the Libreoffice-commits mailing list