Kaydet (Commit) 110f2588 authored tarafından Rüdiger Timm's avatar Rüdiger Timm

INTEGRATION: CWS jl103 (1.6.16); FILE MERGED

2008/06/13 07:28:39 jl 1.6.16.1: #i86233# uri encoding the URI attribute of the reference elements
üst ae7b8049
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: saxeventkeeperimpl.cxx,v $ * $RCSfile: saxeventkeeperimpl.cxx,v $
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
...@@ -1318,12 +1318,12 @@ void SAL_CALL SAXEventKeeperImpl::endElement( const rtl::OUString& aName ) ...@@ -1318,12 +1318,12 @@ void SAL_CALL SAXEventKeeperImpl::endElement( const rtl::OUString& aName )
#endif #endif
} }
/* /*
* If the current buffer node has not notified yet, and * If the current buffer node has not notified yet, and
* the current buffer node is waiting for the current element, * the current buffer node is waiting for the current element,
* then let it notify. * then let it notify.
*/ */
if (bIsCurrent && (m_pCurrentBufferNode != m_pRootBufferNode)) if (bIsCurrent && (m_pCurrentBufferNode != m_pRootBufferNode))
{ {
BufferNode* pOldCurrentBufferNode = m_pCurrentBufferNode; BufferNode* pOldCurrentBufferNode = m_pCurrentBufferNode;
m_pCurrentBufferNode = (BufferNode*)m_pCurrentBufferNode->getParent(); m_pCurrentBufferNode = (BufferNode*)m_pCurrentBufferNode->getParent();
...@@ -1336,14 +1336,14 @@ void SAL_CALL SAXEventKeeperImpl::endElement( const rtl::OUString& aName ) ...@@ -1336,14 +1336,14 @@ void SAL_CALL SAXEventKeeperImpl::endElement( const rtl::OUString& aName )
m_xSAXEventKeeperStatusChangeListener->collectionStatusChanged(sal_False); m_xSAXEventKeeperStatusChangeListener->collectionStatusChanged(sal_False);
} }
} }
} }
else else
{ {
if (!m_bIsForwarding) if (!m_bIsForwarding)
{ {
m_xXMLDocument->removeCurrentElement(); m_xXMLDocument->removeCurrentElement();
} }
} }
} }
void SAL_CALL SAXEventKeeperImpl::characters( const rtl::OUString& aChars ) void SAL_CALL SAXEventKeeperImpl::characters( const rtl::OUString& aChars )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment