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 /xmloff/source/forms | |
| 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 'xmloff/source/forms')
| -rw-r--r-- | xmloff/source/forms/elementimport.cxx | 8 | ||||
| -rw-r--r-- | xmloff/source/forms/propertyimport.cxx | 10 |
2 files changed, 4 insertions, 14 deletions
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 1bf17017d9c7..00f4f05b63a0 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -329,12 +329,8 @@ namespace xmloff { if ( !xDynamicProperties.is() ) { - #if OSL_DEBUG_LEVEL > 0 - OString aMessage( "OElementImport::implApplyGenericProperties: encountered an unknown property (" ); - aMessage += OUStringToOString( aPropValues->Name, RTL_TEXTENCODING_ASCII_US ); - aMessage += "), but component is no PropertyBag!"; - OSL_FAIL( aMessage.getStr() ); - #endif + SAL_WARN( "xmloff", "OElementImport::implApplyGenericProperties: encountered an unknown property (" + << aPropValues->Name << "), but component is no PropertyBag!"); continue; } diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index c8a2161a9828..5871a19a1e0a 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -338,14 +338,8 @@ bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const OUStr } if (!token::IsXMLToken(_rLocalName, token::XML_TYPE)) // xlink:type is valid but ignored for <form:form> { -#if OSL_DEBUG_LEVEL > 0 - OString sMessage( "OPropertyImport::handleAttribute: Can't handle the following:\n" ); - sMessage += OString( " Attribute name: " ); - sMessage += OString( _rLocalName.getStr(), _rLocalName.getLength(), osl_getThreadTextEncoding() ); - sMessage += OString( "\n value: " ); - sMessage += OString( _rValue.getStr(), _rValue.getLength(), osl_getThreadTextEncoding() ); - OSL_FAIL( sMessage.getStr() ); -#endif + SAL_WARN( "xmloff", "OPropertyImport::handleAttribute: Can't handle the following:\n" + " Attribute name: " << _rLocalName << "\n value: " << _rValue ); return false; } return true; |