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

Fix for fdo43460 Part XLIII getLength() to isEmpty()

Browse Source 
Part XLIII
Modules
unoxml
This commit is contained in:
Olivier Hallot 2012-01-19 16:25:16 -02:00
parent 6a1390eaf6
commit 5738e07a78
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
unoxml/source/dom/document.cxx
View File

@ -553,7 +553,7 @@ namespace DOM
::osl::MutexGuard const g(m_Mutex);
sal_Int32 i = qname.indexOf(':');
if (ns.getLength() == 0) throw RuntimeException();
if (ns.isEmpty()) throw RuntimeException();
xmlChar *xPrefix;
xmlChar *xName;
OString o1, o2, o3;
@ -805,9 +805,9 @@ namespace DOM
OUString const aNsPrefix = xImportedNode->getPrefix();
OUString aQName = xElement->getTagName();
Reference< XElement > xNewElement;
if (aNsUri.getLength() > 0)
if (!aNsUri.isEmpty())
{
if (aNsPrefix.getLength() > 0) {
if (!aNsPrefix.isEmpty()) {
aQName = aNsPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM(":"))
+ aQName;
}
@ -828,9 +828,9 @@ namespace DOM
OUString const aAttrPrefix = curAttr->getPrefix();
OUString aAttrName = curAttr->getName();
OUString const sValue = curAttr->getValue();
if (aAttrUri.getLength() > 0)
if (!aAttrUri.isEmpty())
{
if (aAttrPrefix.getLength() > 0) {
if (!aAttrPrefix.isEmpty()) {
aAttrName = aAttrPrefix +
OUString(RTL_CONSTASCII_USTRINGPARAM(":")) + aAttrName;
}

12
unoxml/source/dom/element.cxx
View File

@ -68,7 +68,7 @@ namespace DOM
OUString prefix(reinterpret_cast<const sal_Char*>(pPrefix),
strlen(reinterpret_cast<const char*>(pPrefix)),
RTL_TEXTENCODING_UTF8);
OUString name = (prefix.getLength() == 0)
OUString name = (prefix.isEmpty())
? OUString(RTL_CONSTASCII_USTRINGPARAM("xmlns"))
: OUString(RTL_CONSTASCII_USTRINGPARAM("xmlns:")) + prefix;
const xmlChar *pHref = pNs->href;
@ -84,14 +84,14 @@ namespace DOM
reinterpret_cast<xmlNodePtr>(pAttr));
OSL_ENSURE(pNode != 0, "CNode::get returned 0");
OUString prefix = pNode->getPrefix();
OUString name = (prefix.getLength() == 0)
OUString name = (prefix.isEmpty())
? pNode->getLocalName()
: prefix + OUString(static_cast<sal_Unicode>(':')) + pNode->getLocalName();
OUString val = pNode->getNodeValue();
pAttrs->AddAttribute(name, type, val);
}
OUString prefix = getPrefix();
OUString name = (prefix.getLength() == 0)
OUString name = (prefix.isEmpty())
? getLocalName()
: prefix + OUString(static_cast<sal_Unicode>(':')) + getLocalName();
Reference< XAttributeList > xAttrList(pAttrs);
@ -510,7 +510,7 @@ namespace DOM
}
Reference< XAttr > aAttr;
if (oldAttr->getNamespaceURI().getLength() > 0) {
if (!oldAttr->getNamespaceURI().isEmpty()) {
::rtl::OUStringBuffer qname(oldAttr->getPrefix());
if (0 != qname.getLength()) {
qname.append(sal_Unicode(':'));
@ -667,7 +667,7 @@ namespace DOM
OUString const& qualifiedName, OUString const& value)
throw (RuntimeException, DOMException)
{
if (namespaceURI.getLength() == 0) throw RuntimeException();
if (namespaceURI.isEmpty()) throw RuntimeException();
::osl::ClearableMutexGuard guard(m_rMutex);
@ -778,7 +778,7 @@ namespace DOM
void SAL_CALL CElement::setElementName(const OUString& aName)
throw (RuntimeException, DOMException)
{
if ((aName.getLength() <= 0) ||
if (aName.isEmpty() ||
(0 <= aName.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM(":")))))
{
DOMException e;

2
unoxml/source/dom/saxbuilder.cxx
View File

@ -318,7 +318,7 @@ namespace DOM
Reference< XElement > aElement(aNode, UNO_QUERY);
OUString aRefName;
OUString aPrefix = aElement->getPrefix();
if (aPrefix.getLength() > 0)
if (!aPrefix.isEmpty())
aRefName = aPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM(":")) + aElement->getTagName();
else
aRefName = aElement->getTagName();

2
unoxml/source/rdf/CBlankNode.cxx
View File

@ -113,7 +113,7 @@ void SAL_CALL CBlankNode::initialize(const css::uno::Sequence< ::com::sun::star:
}
//FIXME: what is legal?
if (arg.getLength() > 0) {
if (!arg.isEmpty()) {
m_NodeID = arg;
} else {
throw css::lang::IllegalArgumentException(

4
unoxml/source/rdf/CLiteral.cxx
View File

@ -134,7 +134,7 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u
::rtl::OUString arg1;
css::uno::Reference< css::rdf::XURI > xURI;
if ((aArguments[1] >>= arg1)) {
if (arg1.getLength() > 0) {
if (!arg1.isEmpty()) {
m_Language = arg1;
} else {
throw css::lang::IllegalArgumentException(
@ -160,7 +160,7 @@ void SAL_CALL CLiteral::initialize(const css::uno::Sequence< ::com::sun::star::u
// ::com::sun::star::rdf::XNode:
::rtl::OUString SAL_CALL CLiteral::getStringValue() throw (css::uno::RuntimeException)
{
if (m_Language.getLength()) {
if (!m_Language.isEmpty()) {
::rtl::OUStringBuffer buf(m_Value);
buf.appendAscii("@");
buf.append(m_Language);

2
unoxml/source/rdf/CURI.cxx
View File

@ -803,7 +803,7 @@ void SAL_CALL CURI::initialize(const css::uno::Sequence< ::com::sun::star::uno::
}
//FIXME: what is legal?
if (arg0.getLength() > 0) {
if (!arg0.isEmpty()) {
m_Namespace = arg0;
} else {
throw css::lang::IllegalArgumentException(

14
unoxml/source/rdf/librdf_repository.cxx
View File

@ -1265,7 +1265,7 @@ static bool isMetadatableWithoutMetadata(
uno::Reference<uno::XInterface> const & i_xNode)
{
const uno::Reference<rdf::XMetadatable> xMeta( i_xNode, uno::UNO_QUERY );
return (xMeta.is() && !xMeta->getMetadataReference().Second.getLength());
return (xMeta.is() && xMeta->getMetadataReference().Second.isEmpty());
}
uno::Reference< container::XEnumeration > SAL_CALL
@ -1483,7 +1483,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
// ensure that the metadatable has an XML ID
i_xObject->ensureMetadataReference();
const beans::StringPair mdref( i_xObject->getMetadataReference() );
if ((mdref.First.getLength() == 0) || (mdref.Second.getLength() == 0)) {
if ((mdref.First.isEmpty()) || (mdref.Second.isEmpty())) {
throw uno::RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"librdf_Repository::setStatementRDFa: "
"ensureMetadataReference did not")), *this);
@ -1503,7 +1503,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
}
::osl::MutexGuard g(m_aMutex);
::rtl::OUString const content( (i_rRDFaContent.getLength() == 0)
::rtl::OUString const content( (i_rRDFaContent.isEmpty())
? xTextRange->getString()
: i_rRDFaContent );
uno::Reference<rdf::XNode> xContent;
@ -1523,7 +1523,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
"cannot create literal")), *this, uno::makeAny(iae));
}
removeStatementRDFa(i_xObject);
if (i_rRDFaContent.getLength() == 0) {
if (i_rRDFaContent.isEmpty()) {
m_RDFaXHTMLContentSet.erase(sXmlId);
} else {
m_RDFaXHTMLContentSet.insert(sXmlId);
@ -1546,7 +1546,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
}
const beans::StringPair mdref( i_xElement->getMetadataReference() );
if ((mdref.First.getLength() == 0) || (mdref.Second.getLength() == 0)) {
if ((mdref.First.isEmpty()) || (mdref.Second.isEmpty())) {
return; // nothing to do...
}
uno::Reference<rdf::XURI> xXmlId;
@ -1577,7 +1577,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
"librdf_Repository::getStatementRDFa: Element is null")), *this, 0);
}
const beans::StringPair mdref( i_xElement->getMetadataReference() );
if ((mdref.First.getLength() == 0) || (mdref.Second.getLength() == 0)) {
if ((mdref.First.isEmpty()) || (mdref.Second.isEmpty())) {
return beans::Pair< uno::Sequence<rdf::Statement>, sal_Bool >();
}
::rtl::OUString const sXmlId(mdref.First +
@ -2065,7 +2065,7 @@ librdf_node* librdf_TypeConverter::mkNode( librdf_world* i_pWorld,
RTL_TEXTENCODING_UTF8) );
const uno::Reference< rdf::XURI > xType(xLiteral->getDatatype());
librdf_node * ret(0);
if (lang.getLength() == 0) {
if (lang.isEmpty()) {
if (!xType.is()) {
ret = librdf_new_node_from_literal(i_pWorld,
reinterpret_cast<const unsigned char*> (val.getStr()),