[Libreoffice-commits] .: svtools/inc svtools/source unusedcode.easy xmlsecurity/source

Jesús Corrius jcorrius at kemper.freedesktop.org
Wed Apr 25 08:17:13 PDT 2012


 svtools/inc/svtools/framestatuslistener.hxx                   |    1 
 svtools/source/uno/framestatuslistener.cxx                    |   28 ----------
 unusedcode.easy                                               |    2 
 xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx |    8 --
 xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx |    3 -
 5 files changed, 1 insertion(+), 41 deletions(-)

New commits:
commit f33ed937b675540a0fec71822c3e55568065a433
Author: José Santiago Jiménez Sarmiento <jimenezsarmiento at gmail.com>
Date:   Wed Apr 25 17:12:01 2012 +0200

    Remove unused methods

diff --git a/svtools/inc/svtools/framestatuslistener.hxx b/svtools/inc/svtools/framestatuslistener.hxx
index 3e5b871..8c3fbd1 100644
--- a/svtools/inc/svtools/framestatuslistener.hxx
+++ b/svtools/inc/svtools/framestatuslistener.hxx
@@ -58,7 +58,6 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu
 
         // methods to support status forwarder, known by the old sfx2 toolbox controller implementation
         void addStatusListener( const rtl::OUString& aCommandURL );
-        void removeStatusListener( const rtl::OUString& aCommandURL );
         void bindListener();
         void unbindListener();
         sal_Bool isBound() const;
diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx
index 502211d..6579c26 100644
--- a/svtools/source/uno/framestatuslistener.cxx
+++ b/svtools/source/uno/framestatuslistener.cxx
@@ -233,34 +233,6 @@ void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL )
     }
 }
 
-void FrameStatusListener::removeStatusListener( const rtl::OUString& aCommandURL )
-{
-    SolarMutexGuard aSolarMutexGuard;
-
-    URLToDispatchMap::iterator pIter = m_aListenerMap.find( aCommandURL );
-    if ( pIter != m_aListenerMap.end() )
-    {
-        Reference< XDispatch > xDispatch( pIter->second );
-        Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
-        m_aListenerMap.erase( pIter );
-
-        try
-        {
-            Reference< XURLTransformer > xURLTransformer( m_xServiceManager->createInstance(
-                                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ))),
-                                                        UNO_QUERY );
-            com::sun::star::util::URL aTargetURL;
-            aTargetURL.Complete = aCommandURL;
-            xURLTransformer->parseStrict( aTargetURL );
-
-            if ( xDispatch.is() && xStatusListener.is() )
-                xDispatch->removeStatusListener( xStatusListener, aTargetURL );
-        }
-        catch (const Exception&)
-        {
-        }
-    }
-}
 
 void FrameStatusListener::bindListener()
 {
diff --git a/unusedcode.easy b/unusedcode.easy
index fb71361..5e0fc8c 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,4 +1,3 @@
-CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
 EditEngine::GetNextVisPortion(ParaPortion const*) const
 FmFieldWinMgr::GetChildWindowId()
 FmPropBrwMgr::GetChildWindowId()
@@ -719,7 +718,6 @@ std::__cxx1998::multimap<_xmlNode*, com::sun::star::uno::Reference<com::sun::sta
 std::__cxx1998::vector<OrderedEntry*, std::allocator<OrderedEntry*> >::~vector()
 std::__cxx1998::vector<ServiceInfo*, std::allocator<ServiceInfo*> >::~vector()
 std::__cxx1998::vector<SfxFilter*, std::allocator<SfxFilter*> >::~vector()
-svt::FrameStatusListener::removeStatusListener(rtl::OUString const&)
 svxform::DataNavigatorManager::GetChildWindowId()
 svxform::FmFilterNavigatorWinMgr::GetChildWindowId()
 svxform::NavigatorFrameManager::GetChildWindowId()
diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx
index 63589b3..fd43387 100644
--- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.cxx
@@ -62,13 +62,6 @@ sal_Bool SAL_CALL CertificateExtension_XmlSecImpl :: isCritical() throw( ::com::
     return m_xExtnValue ;
 }
 
-//Helper method
-void CertificateExtension_XmlSecImpl :: setCertExtn( ::com::sun::star::uno::Sequence< sal_Int8 > extnId, ::com::sun::star::uno::Sequence< sal_Int8 > extnValue, sal_Bool critical ) {
-    m_critical = critical ;
-    m_xExtnId = extnId ;
-    m_xExtnValue = extnValue ;
-}
-
 void CertificateExtension_XmlSecImpl :: setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) {
     unsigned int i ;
     if( value != NULL && vlen != 0 ) {
@@ -94,4 +87,5 @@ void CertificateExtension_XmlSecImpl :: setCertExtn( unsigned char* value, unsig
     m_critical = critical ;
 }
 
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
index bbfecbb..d26666c 100644
--- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx
@@ -56,9 +56,6 @@ class CertificateExtension_XmlSecImpl : public ::cppu::WeakImplHelper1<
 
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getExtensionValue() throw( ::com::sun::star::uno::RuntimeException ) ;
 
-        //Helper method
-        void setCertExtn( ::com::sun::star::uno::Sequence< sal_Int8 > extnId, ::com::sun::star::uno::Sequence< sal_Int8 > extnValue, sal_Bool critical ) ;
-
         void setCertExtn( unsigned char* value, unsigned int vlen, unsigned char* id, unsigned int idlen, sal_Bool critical ) ;
 } ;
 


More information about the Libreoffice-commits mailing list