diff options
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmlerror.cxx | 5 | ||||
| -rw-r--r-- | xmloff/source/forms/elementimport.cxx | 8 | ||||
| -rw-r--r-- | xmloff/source/forms/propertyimport.cxx | 10 | ||||
| -rw-r--r-- | xmloff/source/script/XMLEventExport.cxx | 12 | ||||
| -rw-r--r-- | xmloff/source/transform/StyleOOoTContext.cxx | 23 |
5 files changed, 14 insertions, 44 deletions
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx index cf5f9642aa0c..7bc45c540a90 100644 --- a/xmloff/source/core/xmlerror.cxx +++ b/xmloff/source/core/xmlerror.cxx @@ -166,10 +166,7 @@ void XMLErrors::AddRecord( sMessage.append( "\n" ); } - // convert to byte string and signal the error - OString aError(OUStringToOString(sMessage.makeStringAndClear(), - RTL_TEXTENCODING_ASCII_US)); - OSL_FAIL( aError.getStr() ); + SAL_WARN( "xmloff", sMessage.makeStringAndClear() ); #endif } 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; diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx index 2e9c538ae46a..0bc2297e05db 100644 --- a/xmloff/source/script/XMLEventExport.cxx +++ b/xmloff/source/script/XMLEventExport.cxx @@ -138,15 +138,11 @@ void XMLEventExport::Export( Reference<XNameAccess> & rAccess, // now export the current event ExportEvent( aValues, rXmlName, bWhitespace, bStarted ); } -#ifdef DBG_UTIL else { // don't proceed further - OString aStr("Unknown event name:" ); - aStr += OUStringToOString( aNames[i], RTL_TEXTENCODING_UTF8 ); - OSL_FAIL( aStr.getStr() ); + SAL_WARN("xmloff", "Unknown event name:" << aNames[i] ); } -#endif } // close <script:events> element (if it was opened before) @@ -187,15 +183,11 @@ void XMLEventExport::ExportSingleEvent( EndElement(bUseWhitespace); } } -#ifdef DBG_UTIL else { // don't proceed further - OString aStr("Unknown event name:" ); - aStr += OUStringToOString( rApiEventName, RTL_TEXTENCODING_UTF8 ); - OSL_FAIL( aStr.getStr() ); + SAL_WARN("xmloff", "Unknown event name:" << rApiEventName ); } -#endif } diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index 82941b446753..29512be6af94 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -317,22 +317,13 @@ XMLTypedPropertiesOOoTContext_Impl XML_PROP_TYPE_END==m_aPropTypes[1] || (i<MAX_PROP_TYPES && XML_PROP_TYPE_END!=m_aPropTypes[i]) ) ) { - OString aTmp("Didn't find property: "); - const OUString& rPrefix = - GetTransformer().GetNamespaceMap().GetPrefixByKey( nPrefix ); - aTmp += OString( rPrefix.getStr(), rPrefix.getLength(), - RTL_TEXTENCODING_ASCII_US ); - aTmp += OString( ':' ); - aTmp += OString( rLocalName.getStr(), rLocalName.getLength(), - RTL_TEXTENCODING_ASCII_US ); - aTmp += OString(", assuming <style:"); - const OUString& rName = - ::xmloff::token::GetXMLToken( aPropTokens[m_aPropTypes[0]] ); - aTmp += OString( rName.getStr(), rName.getLength(), - RTL_TEXTENCODING_ASCII_US ); - aTmp += OString( '>' ); - - OSL_FAIL(aTmp.getStr()); + SAL_WARN("xmloff", "Didn't find property: " + << GetTransformer().GetNamespaceMap().GetPrefixByKey( nPrefix ) + << ":" + << rLocalName + << ", assuming <style:" + << ::xmloff::token::GetXMLToken( aPropTokens[m_aPropTypes[0]] ) + << ">" ); } #endif |