diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-26 10:58:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-28 19:44:08 +0200 |
| commit | ef513fd4b049b214a03fbe6e62a5ea43680a7a9b (patch) | |
| tree | 82f2ce93bc8e5fde6dce8685b633c3d643c9f069 /unoxml | |
| parent | 826f1bca40a01f0a249d5b6cbb7c39c11638a060 (diff) | |
remove unnecessary use of OString::getStr
Change-Id: I0490efedf459190521f4339854b3394d57765fdb
Reviewed-on: https://gerrit.libreoffice.org/38058
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'unoxml')
| -rw-r--r-- | unoxml/source/dom/document.cxx | 2 | ||||
| -rw-r--r-- | unoxml/source/dom/documentbuilder.cxx | 4 | ||||
| -rw-r--r-- | unoxml/source/dom/elementlist.cxx | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx index b9c167ee2486..9cba7eec823d 100644 --- a/unoxml/source/dom/document.cxx +++ b/unoxml/source/dom/document.cxx @@ -487,7 +487,7 @@ namespace DOM xmlChar const*const pData = reinterpret_cast<xmlChar const*>(oData.getStr()); xmlNodePtr const pText = - xmlNewCDataBlock(m_aDocPtr, pData, strlen(oData.getStr())); + xmlNewCDataBlock(m_aDocPtr, pData, oData.getLength()); Reference< XCDATASection > const xRet( static_cast< XNode* >(GetCNode(pText).get()), UNO_QUERY_THROW); diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx index 71a6dc6f1785..2a1e3826bd98 100644 --- a/unoxml/source/dom/documentbuilder.cxx +++ b/unoxml/source/dom/documentbuilder.cxx @@ -202,7 +202,7 @@ namespace DOM return nread; } catch (const css::uno::Exception& ex) { (void) ex; - OSL_FAIL(OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); + SAL_WARN( "unoxml", ex.Message); return -1; } } @@ -222,7 +222,7 @@ namespace DOM return 0; } catch (const css::uno::Exception& ex) { (void) ex; - OSL_FAIL(OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); + SAL_WARN( "unoxml", ex.Message); return -1; } } diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx index fad086a3b604..21e282904074 100644 --- a/unoxml/source/dom/elementlist.cxx +++ b/unoxml/source/dom/elementlist.cxx @@ -110,9 +110,8 @@ namespace DOM xTarget->addEventListener("DOMSubtreeModified", m_xEventListener, capture); } catch (const Exception &e){ - OString aMsg("Exception caught while registering NodeList as listener:\n"); - aMsg += OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US); - OSL_FAIL(aMsg.getStr()); + SAL_WARN( "unoxml", "Exception caught while registering NodeList as listener: " + << e.Message); } } |