mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS xmlsec10 (1.1.1.1.38); FILE MERGED

Browse Source 
2005/03/23 09:52:46 mmi 1.1.1.1.38.1: idl review
Issue number:
Submitted by:
Reviewed by:
This commit is contained in:
Rüdiger Timm 2005-03-29 12:21:17 +00:00
parent ee21191bde
commit e79f3ad0fe
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xmlsecurity/source/framework/elementcollector.cxx
View File

@ -2,9 +2,9 @@
* *
* $RCSfile: elementcollector.cxx,v $ * $RCSfile: elementcollector.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: mt $ $Date: 2004-07-12 13:15:23 $ * last change: $Author: rt $ $Date: 2005-03-29 13:20:18 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -124,7 +124,7 @@ ElementCollector::ElementCollector(
* Email: michael.mi@sun.com * Email: michael.mi@sun.com
******************************************************************************/ ******************************************************************************/
{ {
m_type = cssxc::sax::ElementMarkType_TYPEOFELEMENTCOLLECTOR; m_type = cssxc::sax::ElementMarkType_ELEMENTCOLLECTOR;
} }
/* /*

6
xmlsecurity/source/framework/elementmark.cxx
View File

@ -2,9 +2,9 @@
* *
* $RCSfile: elementmark.cxx,v $ * $RCSfile: elementmark.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: mt $ $Date: 2004-07-12 13:15:23 $ * last change: $Author: rt $ $Date: 2005-03-29 13:20:59 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -68,7 +68,7 @@ ElementMark::ElementMark(sal_Int32 nSecurityId, sal_Int32 nBufferId)
:m_nSecurityId(nSecurityId), :m_nSecurityId(nSecurityId),
m_nBufferId(nBufferId), m_nBufferId(nBufferId),
m_pBufferNode(NULL), m_pBufferNode(NULL),
m_type(cssxc::sax::ElementMarkType_TYPEOFELEMENTMARK) m_type(cssxc::sax::ElementMarkType_ELEMENTMARK)
/****** ElementMark/ElementMark *********************************************** /****** ElementMark/ElementMark ***********************************************
* *
* NAME * NAME

14
xmlsecurity/source/framework/saxeventkeeperimpl.cxx
View File

@ -2,9 +2,9 @@
* *
* $RCSfile: saxeventkeeperimpl.cxx,v $ * $RCSfile: saxeventkeeperimpl.cxx,v $
* *
* $Revision: 1.1.1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: mt $ $Date: 2004-07-12 13:15:22 $ * last change: $Author: rt $ $Date: 2005-03-29 13:21:17 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -792,7 +792,7 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer()
if (pElementMark != NULL) if (pElementMark != NULL)
{ {
if (cssxc::sax::ElementMarkType_TYPEOFELEMENTCOLLECTOR if (cssxc::sax::ElementMarkType_ELEMENTCOLLECTOR
== pElementMark->getType()) == pElementMark->getType())
/* /*
* it is a EC * it is a EC
@ -809,7 +809,7 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer()
BufferNode* pBufferNode = pElementCollector->getBufferNode(); BufferNode* pBufferNode = pElementCollector->getBufferNode();
pBufferNode->removeElementCollector(pElementCollector); pBufferNode->removeElementCollector(pElementCollector);
if ( nPriority == cssxc::sax::ElementMarkPriority_PRI_BEFOREMODIFY) if ( nPriority == cssxc::sax::ElementMarkPriority_BEFOREMODIFY)
{ {
pBufferNode->notifyBranch(); pBufferNode->notifyBranch();
} }
@ -1053,7 +1053,7 @@ sal_Int32 SAL_CALL SAXEventKeeperImpl::addElementCollector( )
{ {
return createElementCollector( return createElementCollector(
cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID, cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID,
cssxc::sax::ElementMarkPriority_PRI_AFTERMODIFY, cssxc::sax::ElementMarkPriority_AFTERMODIFY,
false, false,
NULL); NULL);
} }
@ -1246,14 +1246,14 @@ void SAL_CALL SAXEventKeeperImpl::removeReferenceResolvedListener(
} }
/* XSAXEventKeeperStatusChangeBroadcaster */ /* XSAXEventKeeperStatusChangeBroadcaster */
void SAL_CALL SAXEventKeeperImpl::addXSAXEventKeeperStatusChangeListener( void SAL_CALL SAXEventKeeperImpl::addSAXEventKeeperStatusChangeListener(
const cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >& listener ) const cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >& listener )
throw (cssu::RuntimeException) throw (cssu::RuntimeException)
{ {
m_xSAXEventKeeperStatusChangeListener = listener; m_xSAXEventKeeperStatusChangeListener = listener;
} }
void SAL_CALL SAXEventKeeperImpl::removeXSAXEventKeeperStatusChangeListener( void SAL_CALL SAXEventKeeperImpl::removeSAXEventKeeperStatusChangeListener(
const cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >& listener ) const cssu::Reference< cssxc::sax::XSAXEventKeeperStatusChangeListener >& listener )
throw (cssu::RuntimeException) throw (cssu::RuntimeException)
{ {