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

[Tor Lillqvist]

 offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl |   13 ---
 xmlsecurity/source/framework/saxeventkeeperimpl.cxx            |   34 ----------
 xmlsecurity/source/framework/saxeventkeeperimpl.hxx            |    4 -
 3 files changed, 51 deletions(-)

New commits:
commit 38dc4ea8992f74e15951cc0bc7e378fe1857c604
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Nov 3 10:46:24 2016 +0200

    Bin unused XSecuritySAXEventKeeper::cloneElementCollector
    
    Change-Id: Icc0ead769fa0a052f7d4dfbc825c96dbb513b33f

diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
index c408907..94d2e9e 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
@@ -53,19 +53,6 @@ interface XSecuritySAXEventKeeper : XSAXEventKeeper
         [in] boolean modifyElement);
 
     /**
-     * Clones an element collector.
-     *
-     * @param referenceId                    the keeper id of the element collector to
-     *                                       be cloned
-     * @param priority                       the priority of new element collector. See
-     *                                       ConstOfPriority
-     * @return                               the keeper id of the new element collector
-     */
-    long cloneElementCollector(
-        [in] long referenceId,
-        [in] ElementMarkPriority priority);
-
-    /**
      * Sets security id for an element mark.
      *
      * @param id           the keeper id of the element collector to be set
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index 2c616c9..ebe6823 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -983,40 +983,6 @@ sal_Int32 SAL_CALL SAXEventKeeperImpl::addSecurityElementCollector(
         nullptr);
 }
 
-sal_Int32 SAL_CALL SAXEventKeeperImpl::cloneElementCollector(
-    sal_Int32 referenceId,
-    cssxc::sax::ElementMarkPriority priority )
-    throw (cssu::RuntimeException, std::exception)
-{
-    sal_Int32 nId = -1;
-
-    ElementCollector* pElementCollector = static_cast<ElementCollector*>(findElementMarkBuffer(referenceId));
-    if (pElementCollector != nullptr)
-    {
-        nId = m_nNextElementMarkId;
-        m_nNextElementMarkId ++;
-
-        ElementCollector* pClonedOne
-            = pElementCollector->clone(nId, priority);
-
-            /*
-             * add this EC into the security data buffer array.
-             */
-        m_vElementMarkBuffers.push_back(pClonedOne);
-
-            /*
-             * If the reference EC is still in initial EC array, add
-             * this cloned one into the initial EC array too.
-             */
-            if (pElementCollector->getBufferNode() == nullptr)
-        {
-            m_vNewElementCollectors.push_back(pClonedOne);
-        }
-    }
-
-    return nId;
-}
-
 void SAL_CALL SAXEventKeeperImpl::setSecurityId( sal_Int32 id, sal_Int32 securityId )
     throw (cssu::RuntimeException, std::exception)
 {
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
index f70e5ca..214575d 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.hxx
@@ -247,10 +247,6 @@ public:
         css::xml::crypto::sax::ElementMarkPriority priority,
         sal_Bool modifyElement )
         throw (css::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL cloneElementCollector(
-        sal_Int32 referenceId,
-        css::xml::crypto::sax::ElementMarkPriority priority )
-        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setSecurityId( sal_Int32 id, sal_Int32 securityId )
         throw (css::uno::RuntimeException, std::exception) override;