diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-06-01 17:19:58 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-06-01 17:40:03 +0100 |
| commit | ff43ad1a77a89d1d1ebc0c20807bb9ec508fc9fd (patch) | |
| tree | daca69d3fceb0a7ec682360418033cf0126a6e95 /unoxml/source/dom/element.cxx | |
| parent | fcc31f1749e01e4184c4347929a9e1d7e782dee1 (diff) | |
targetted string cleanup
Change-Id: Iaf77bb427d62d7f3be00a96cba4dfb25a01934ac
Diffstat (limited to 'unoxml/source/dom/element.cxx')
| -rw-r--r-- | unoxml/source/dom/element.cxx | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx index 09f3ec3a0a1b..5cf877235fed 100644 --- a/unoxml/source/dom/element.cxx +++ b/unoxml/source/dom/element.cxx @@ -61,7 +61,7 @@ namespace DOM if (!i_xHandler.is()) throw RuntimeException(); comphelper::AttributeList *pAttrs = new comphelper::AttributeList(); - OUString type = OUString(); + OUString type = ""; // add namespace definitions to attributes for (xmlNsPtr pNs = m_aNodePtr->nsDef; pNs != 0; pNs = pNs->next) { const xmlChar *pPrefix = pNs->prefix; @@ -69,8 +69,7 @@ namespace DOM strlen(reinterpret_cast<const char*>(pPrefix)), RTL_TEXTENCODING_UTF8); OUString name = (prefix.isEmpty()) - ? OUString(RTL_CONSTASCII_USTRINGPARAM("xmlns")) - : OUString(RTL_CONSTASCII_USTRINGPARAM("xmlns:")) + prefix; + ? OUString( "xmlns" ) : OUString( "xmlns:" ) + prefix; const xmlChar *pHref = pNs->href; OUString val(reinterpret_cast<const sal_Char*>(pHref), strlen(reinterpret_cast<const char*>(pHref)), @@ -583,8 +582,8 @@ namespace DOM // dispatch DOMAttrModified event Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY); Reference< XMutationEvent > event(docevent->createEvent( - OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified"))), UNO_QUERY); - event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified")), + "DOMAttrModified"), UNO_QUERY); + event->initMutationEvent("DOMAttrModified", sal_True, sal_False, Reference< XNode >(xAttr, UNO_QUERY), OUString(), xAttr->getValue(), xAttr->getName(), AttrChangeType_ADDITION); @@ -648,8 +647,8 @@ namespace DOM // dispatch DOMAttrModified event Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY); Reference< XMutationEvent > event(docevent->createEvent( - OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified"))), UNO_QUERY); - event->initMutationEvent(OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified")), + "DOMAttrModified"), UNO_QUERY); + event->initMutationEvent("DOMAttrModified", sal_True, sal_False, Reference< XNode >(getAttributeNode(name), UNO_QUERY), oldValue, value, name, aChangeType); @@ -730,10 +729,9 @@ namespace DOM // dispatch DOMAttrModified event Reference< XDocumentEvent > docevent(getOwnerDocument(), UNO_QUERY); Reference< XMutationEvent > event(docevent->createEvent( - OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified"))), UNO_QUERY); + "DOMAttrModified"), UNO_QUERY); event->initMutationEvent( - OUString(RTL_CONSTASCII_USTRINGPARAM("DOMAttrModified")), - sal_True, sal_False, + "DOMAttrModified", sal_True, sal_False, Reference< XNode >(getAttributeNodeNS(namespaceURI, OUString((char*)xLName, strlen((char*)xLName), RTL_TEXTENCODING_UTF8)), UNO_QUERY), oldValue, value, qualifiedName, aChangeType); @@ -778,8 +776,7 @@ namespace DOM void SAL_CALL CElement::setElementName(const OUString& aName) throw (RuntimeException, DOMException) { - if (aName.isEmpty() || - (0 <= aName.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM(":"))))) + if (aName.isEmpty() || (0 <= aName.indexOf(':'))) { DOMException e; e.Code = DOMExceptionType_INVALID_CHARACTER_ERR; |