strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xmlsecurity: remove unused chainOn() argument

Browse source 
Change-Id: Id4d4ae41eb6d667a96ce5d294dd5bf3fcf4cb686
Reviewed-on: https://gerrit.libreoffice.org/43801
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Miklos Vajna 2017-10-25 09:14:24 +02:00
parent 4d65adb2fa
commit 4216d6f590
4 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xmlsecurity/inc/xsecctl.hxx
View file

@ -228,7 +228,7 @@ private:
*/
void createXSecComponent( );
int findSignatureInfor( sal_Int32 nSecurityId ) const;
bool chainOn( bool bRetrievingLastEvent );
bool chainOn();
void chainOff();
void checkChainingStatus();
void initializeSAXChain();

10
xmlsecurity/source/helper/xsecctl.cxx
View file

@ -198,14 +198,14 @@ void XSecController::createXSecComponent( )
}
}
bool XSecController::chainOn( bool /*bRetrievingLastEvent*/ )
bool XSecController::chainOn()
/****** XSecController/chainOn ************************************************
*
* NAME
* chainOn -- tries to connect the SAXEventKeeper with the SAX chain.
*
* SYNOPSIS
* bJustChainingOn = chainOn( bRetrievingLastEvent );
* bJustChainingOn = chainOn();
*
* FUNCTION
* First, checks whether the SAXEventKeeper is on the SAX chain. If not,
@ -215,10 +215,6 @@ bool XSecController::chainOn( bool /*bRetrievingLastEvent*/ )
* missed key SAX events, which can promise the DOM tree bufferred by the
* SAXEventKeeper has the same structure with the original document.
*
* INPUTS
* bRetrievingLastEvent - whether to retrieve the last key SAX event from
* the ElementStackKeeper.
*
* RESULT
* bJustChainingOn - whether the SAXEventKeeper is just chained into the
* SAX chain.
@ -349,7 +345,7 @@ void XSecController::checkChainingStatus()
{
if ( m_bIsCollectingElement || m_bIsBlocking )
{
chainOn(true);
chainOn();
}
else
{

4
xmlsecurity/source/helper/xsecsign.cxx
View file

@ -299,7 +299,7 @@ bool XSecController::WriteSignature(
/*
* chain the SAXEventKeeper to the SAX chain
*/
chainOn(true);
chainOn();
if ( m_eStatusOfSecurityComponents == InitializationState::INITIALIZED )
/*
@ -354,7 +354,7 @@ bool XSecController::WriteOOXMLSignature(const uno::Reference<embed::XStorage>&
SAL_WARN_IF(!xDocumentHandler.is(), "xmlsecurity.helper", "empty xDocumentHandler reference");
// Chain the SAXEventKeeper to the SAX chain.
chainOn(/*bRetrievingLastEvent=*/true);
chainOn();
if (m_eStatusOfSecurityComponents == InitializationState::INITIALIZED)
{

4
xmlsecurity/source/helper/xsecverify.cxx
View file

@ -98,7 +98,7 @@ void XSecController::addSignature()
if (m_bVerifyCurrentSignature)
{
chainOn(true);
chainOn();
xReferenceResolvedListener = prepareSignatureToRead( m_nReservedSignatureId );
m_bVerifyCurrentSignature = false;
nSignatureId = m_nReservedSignatureId;
@ -416,7 +416,7 @@ void XSecController::collectToVerify( const OUString& referenceId )
if (refInfor.ouURI == referenceId)
{
if (chainOn(false))
if (chainOn())
{
bJustChainingOn = true;
xHandler = m_xSAXEventKeeper->setNextHandler(nullptr);