[Libreoffice-commits] core.git: xmlsecurity/source

[Stephan Bergmann]

 xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx |    6 ------
 xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx |   11 ++---------
 2 files changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 287bc2bb767eeb7c942282d36564ba42ea2723b4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 5 18:15:28 2013 +0200

    Drop unused XInitialization from implementation
    
    ...now that it has been dropped from the service declaration with
    75a87d9bc25c9c74810591bbfa560b0f7184e940 "fdo#46808, Convert
    xml::crypto::XMLEncryptionTemplate to new style"---appears to be nonsense that
    had been in there "since the beginning."
    
    Change-Id: I75826b7eb0a4d5538204394a8f0e9c9e9f1393da

diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
index 6fde83a..540f6d5 100644
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx
@@ -78,12 +78,6 @@ void SAL_CALL XMLEncryptionTemplateImpl::setStatus(
     return m_nStatus;
 }
 
-/* XInitialization */
-void SAL_CALL XMLEncryptionTemplateImpl :: initialize( const Sequence< Any >& /*aArguments*/ )
-    throw( Exception, RuntimeException ) {
-    // TBD
-} ;
-
 /* XServiceInfo */
 OUString SAL_CALL XMLEncryptionTemplateImpl :: getImplementationName() throw( RuntimeException ) {
     return impl_getImplementationName() ;
diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
index 6084c1f..fb3f6cb 100644
--- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
+++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx
@@ -23,21 +23,19 @@
 #include <sal/config.h>
 #include <rtl/ustring.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.hpp>
 #include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
 
-class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper3<
+class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper2<
     ::com::sun::star::xml::crypto::XXMLEncryptionTemplate ,
-    ::com::sun::star::lang::XInitialization ,
     ::com::sun::star::lang::XServiceInfo >
 {
     private :
@@ -73,11 +71,6 @@ class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper3<
             SAL_CALL getStatus(  )
             throw (::com::sun::star::uno::RuntimeException);
 
-        //Methods from XInitialization
-        virtual void SAL_CALL initialize(
-            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments
-        ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
-
         //Methods from XServiceInfo
         virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) ;