XML: complete merge from 1.4.2

This commit is contained in:
Marian Krivos
2011-09-14 14:34:31 +00:00
parent 189695f9c3
commit 16ff8caf6b
59 changed files with 5219 additions and 474 deletions

View File

@@ -106,9 +106,9 @@ int AttributesImpl::getIndex(const XMLString& namespaceURI, const XMLString& loc
void AttributesImpl::setValue(int i, const XMLString& value)
{
poco_assert (i < _attributes.size());
_attributes[i].value = value;
_attributes[i].specified = true;
poco_assert (0 <= i && i < static_cast<int>(_attributes.size()));
_attributes[i].value = value;
_attributes[i].specified = true;
}
@@ -151,10 +151,10 @@ void AttributesImpl::setAttributes(const Attributes& attributes)
void AttributesImpl::setAttribute(int i, const XMLString& namespaceURI, const XMLString& localName, const XMLString& qname, const XMLString& type, const XMLString& value)
{
poco_assert (i < _attributes.size());
_attributes[i].namespaceURI = namespaceURI;
_attributes[i].localName = localName;
_attributes[i].qname = qname;
poco_assert (0 <= i && i < static_cast<int>(_attributes.size()));
_attributes[i].namespaceURI = namespaceURI;
_attributes[i].localName = localName;
_attributes[i].qname = qname;
_attributes[i].type = type;
_attributes[i].value = value;
_attributes[i].specified = true;
@@ -251,29 +251,29 @@ void AttributesImpl::reserve(std::size_t capacity)
void AttributesImpl::setLocalName(int i, const XMLString& localName)
{
poco_assert (i < _attributes.size());
_attributes[i].localName = localName;
poco_assert (0 <= i && i < static_cast<int>(_attributes.size()));
_attributes[i].localName = localName;
}
void AttributesImpl::setQName(int i, const XMLString& qname)
{
poco_assert (i < _attributes.size());
_attributes[i].qname = qname;
poco_assert (0 <= i && i < static_cast<int>(_attributes.size()));
_attributes[i].qname = qname;
}
void AttributesImpl::setType(int i, const XMLString& type)
{
poco_assert (i < _attributes.size());
_attributes[i].type = type;
poco_assert (0 <= i && i < static_cast<int>(_attributes.size()));
_attributes[i].type = type;
}
void AttributesImpl::setURI(int i, const XMLString& namespaceURI)
{
poco_assert (i < _attributes.size());
_attributes[i].namespaceURI = namespaceURI;
poco_assert (0 <= i && i < static_cast<int>(_attributes.size()));
_attributes[i].namespaceURI = namespaceURI;
}