Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3121
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/3121/1
OSL_FAIL -> SAL_WARN
Change-Id: I1871e5e3a319b2d5177ae4bd470046c022c14eb7
---
M connectivity/source/commontools/parameters.cxx
M connectivity/source/cpool/ZPoolCollection.cxx
M dbaccess/source/ui/browser/exsrcbrw.cxx
M dbaccess/source/ui/inc/directsql.hxx
M dbaccess/source/ui/misc/UITools.cxx
M extensions/source/dbpilots/gridwizard.cxx
M oox/source/helper/propertyset.cxx
M oox/source/ppt/timenode.cxx
M sal/inc/sal/log-areas.dox
M sc/source/filter/excel/xlroot.cxx
M sdext/source/pdfimport/pdfparse/pdfparse.cxx
M stoc/source/inspect/introspection.cxx
M sw/source/core/access/accmap.cxx
13 files changed, 63 insertions(+), 69 deletions(-)
diff --git a/connectivity/source/commontools/parameters.cxx
b/connectivity/source/commontools/parameters.cxx
index 972e683..5f2a707 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -214,7 +214,7 @@
}
catch( const Exception& )
{
- OSL_FAIL( "ParameterManager::collectInnerParameters: caught an
exception!" );
+ SAL_WARN( "connectivity.commontools",
"ParameterManager::collectInnerParameters: caught an exception!" );
}
}
}
@@ -404,7 +404,7 @@
}
catch( const Exception& )
{
- OSL_FAIL( "ParameterManager::analyzeFieldLinks: caught an
exception!" );
+ SAL_WARN( "connectivity.commontools",
"ParameterManager::analyzeFieldLinks: caught an exception!" );
}
}
@@ -560,7 +560,7 @@
// does the name denote a valid column in the parent?
if ( !_rxParentColumns->hasByName( *pMasterFields ) )
{
- OSL_FAIL( "ParameterManager::fillLinkedParameters: invalid
master names should have been stripped long before!" );
+ SAL_WARN( "connectivity.commontools",
"ParameterManager::fillLinkedParameters: invalid master names should have been
stripped long before!" );
continue;
}
@@ -570,7 +570,7 @@
|| ( aParamInfo->second.aInnerIndexes.empty() )
)
{
- OSL_FAIL( "ParameterManager::fillLinkedParameters: nothing
known about this detail field!" );
+ SAL_WARN( "connectivity.commontools",
"ParameterManager::fillLinkedParameters: nothing known about this detail
field!" );
continue;
}
@@ -609,9 +609,8 @@
}
catch( const Exception& )
{
- OSL_FAIL( ( ::rtl::OString(
"ParameterManager::fillLinkedParameters: master-detail parameter number " )
- += ::rtl::OString::valueOf( sal_Int32(
*aPosition + 1 ) )
- += ::rtl::OString( " could not be
filled!" ) ).getStr() );
+ SAL_WARN( "connectivity.commontools",
"ParameterManager::fillLinkedParameters: master-detail parameter number " <<
+ sal_Int32( *aPosition + 1 ) << " could not
be filled!" );
}
}
}
@@ -650,7 +649,7 @@
}
catch( const Exception& )
{
- OSL_FAIL( "ParameterManager::completeParameters: caught an
exception while calling the handler!" );
+ SAL_WARN( "connectivity.commontools",
"ParameterManager::completeParameters: caught an exception while calling the
handler!" );
}
if ( !pParams->wasSelected() )
@@ -680,7 +679,7 @@
}
catch( const Exception& )
{
- OSL_FAIL( "ParameterManager::completeParameters: caught an
exception while propagating the values!" );
+ SAL_WARN( "connectivity.commontools",
"ParameterManager::completeParameters: caught an exception while propagating
the values!" );
}
return true;
}
@@ -751,7 +750,7 @@
}
catch( const Exception& )
{
- OSL_FAIL( "ParameterManager::getConnection: could not retrieve the
connection of the !" );
+ SAL_WARN( "connectivity.commontools",
"ParameterManager::getConnection: could not retrieve the connection of the !" );
}
return _rxConnection.is();
}
@@ -774,7 +773,7 @@
}
catch( const Exception& )
{
- OSL_FAIL( "ParameterManager::cacheConnectionInfo: caught an
exception!" );
+ SAL_WARN( "connectivity.commontools",
"ParameterManager::cacheConnectionInfo: caught an exception!" );
}
}
@@ -830,7 +829,7 @@
}
catch( const Exception& )
{
- OSL_FAIL( "ParameterManager::getParentColumns: caught an
exception!" );
+ SAL_WARN( "connectivity.commontools",
"ParameterManager::getParentColumns: caught an exception!" );
}
return _out_rxParentColumns.is();
}
@@ -885,7 +884,7 @@
{
// if this name is unknown in the parent columns, then we
don't have a source
// for copying the value to the detail columns
- OSL_FAIL( "ParameterManager::resetParameterValues: this
should have been stripped long before!" );
+ SAL_WARN( "connectivity.commontools",
"ParameterManager::resetParameterValues: this should have been stripped long
before!" );
continue;
}
@@ -897,7 +896,7 @@
|| ( aParamInfo->second.aInnerIndexes.empty() )
)
{
- OSL_FAIL( "ParameterManager::resetParameterValues: nothing
known about this detail field!" );
+ SAL_WARN( "connectivity.commontools",
"ParameterManager::resetParameterValues: nothing known about this detail
field!" );
continue;
}
@@ -929,7 +928,7 @@
}
catch( const Exception& )
{
- OSL_FAIL( "ParameterManager::resetParameterValues: caught an
exception!" );
+ SAL_WARN( "connectivity.commontools",
"ParameterManager::resetParameterValues: caught an exception!" );
}
}
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx
b/connectivity/source/cpool/ZPoolCollection.cxx
index 3ab3f75..3eec8ed 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -366,24 +366,23 @@
if (xDirectAccess.is() && xDirectAccess->hasByName(_rPath))
{
if (!::cppu::extractInterface(xNode,
xDirectAccess->getByName(_rPath)))
- OSL_FAIL("OConfigurationNode::openNode: could not open the
node!");
+ SAL_WARN("connectivity.cpool", "OConfigurationNode::openNode:
could not open the node!");
}
else if (xHierarchyAccess.is())
{
if (!::cppu::extractInterface(xNode,
xHierarchyAccess->getByHierarchicalName(_rPath)))
- OSL_FAIL("OConfigurationNode::openNode: could not open the
node!");
+ SAL_WARN("connectivity.cpool", "OConfigurationNode::openNode:
could not open the node!");
}
}
catch(const NoSuchElementException&)
{
- OSL_FAIL((::rtl::OString("::openNode: there is no element named ")
- += ::rtl::OString(_rPath.getStr(), _rPath.getLength(),
RTL_TEXTENCODING_ASCII_US)
- += ::rtl::OString("!")).getStr());
+ SAL_WARN("connectivity.cpool", "::openNode: there is no element named
" <<
+ _rPath << "!");
}
catch(Exception&)
{
- OSL_FAIL("OConfigurationNode::openNode: caught an exception while
retrieving the node!");
+ SAL_WARN("connectivity.cpool", "OConfigurationNode::openNode: caught
an exception while retrieving the node!");
}
return xNode;
}
@@ -407,9 +406,9 @@
catch(NoSuchElementException& e)
{
OSL_UNUSED( e ); // make compiler happy
- OSL_FAIL((::rtl::OString("::getNodeValue: caught a
NoSuchElementException while trying to open ")
- += ::rtl::OString(e.Message.getStr(),
e.Message.getLength(), RTL_TEXTENCODING_ASCII_US)
- += ::rtl::OString("!")).getStr());
+ SAL_WARN("connectivity.cpool", "::getNodeValue: caught a " <<
+ "NoSuchElementException while trying to open " <<
+ e.Message << "!" );
}
return aReturn;
}
@@ -446,7 +445,7 @@
}
catch(const Exception&)
{
- OSL_FAIL("Exception caught");
+ SAL_WARN("connectivity.cpool", "Exception caught");
}
}
}
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx
b/dbaccess/source/ui/browser/exsrcbrw.cxx
index 9d85be1..7ae47ed 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -175,11 +175,11 @@
aControlProps = *(Sequence<
::com::sun::star::beans::PropertyValue>*)pArguments->Value.getValue();
}
else
-
OSL_FAIL(rtl::OStringBuffer("SbaExternalSourceBrowser::dispatch(AddGridColumn)
: unknown argument (").append(OUStringToOString(pArguments->Name,
osl_getThreadTextEncoding())).append(") !").getStr());
+ SAL_WARN("dbaccess.ui",
"SbaExternalSourceBrowser::dispatch(AddGridColumn) : unknown argument (" <<
pArguments->Name << ") !");
}
if (sControlType.isEmpty())
{
- OSL_FAIL("SbaExternalSourceBrowser::dispatch(AddGridColumn) :
missing argument (ColumnType) !");
+ SAL_WARN("dbaccess.ui",
"SbaExternalSourceBrowser::dispatch(AddGridColumn) : missing argument
(ColumnType) !");
sControlType = OUString("TextField");
}
OSL_ENSURE(aControlProps.getLength(),
"SbaExternalSourceBrowser::dispatch(AddGridColumn) : missing argument
(ColumnProperties) !");
@@ -203,7 +203,7 @@
}
catch (const Exception&)
{
-
OSL_FAIL(rtl::OStringBuffer("SbaExternalSourceBrowser::dispatch : could not set
a column property (").append(OUStringToOString(pControlProps->Name,
RTL_TEXTENCODING_ASCII_US)).append(")!").getStr());
+ SAL_WARN("dbaccess.ui",
"SbaExternalSourceBrowser::dispatch : could not set a column property (" <<
pControlProps->Name << ")!");
}
}
}
@@ -240,7 +240,7 @@
}
if (!xMasterForm.is())
{
-
OSL_FAIL("SbaExternalSourceBrowser::dispatch(FormSlots/AttachToForm) : please
specify a form to attach to as argument !");
+ SAL_WARN("dbaccess.ui",
"SbaExternalSourceBrowser::dispatch(FormSlots/AttachToForm) : please specify a
form to attach to as argument !");
return;
}
@@ -409,7 +409,7 @@
}
catch(Exception&)
{
- OSL_FAIL("SbaExternalSourceBrowser::Attach : couldn't restore the
cursor position !");
+ SAL_WARN("dbaccess.ui", "SbaExternalSourceBrowser::Attach :
couldn't restore the cursor position !");
}
}
diff --git a/dbaccess/source/ui/inc/directsql.hxx
b/dbaccess/source/ui/inc/directsql.hxx
index 7325841..0c10fc9 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -125,7 +125,7 @@
{ \
const sal_Char* pError = impl_CheckInvariants(); \
if (pError) \
- OSL_FAIL(rtl::OStringBuffer(methodname).append(":
").append(pError).makeStringAndClear().getStr()); \
+ SAL_WARN("dbaccess.ui", methodname << ": " << pError); \
}
#else
#define CHECK_INVARIANTS(methodname)
diff --git a/dbaccess/source/ui/misc/UITools.cxx
b/dbaccess/source/ui/misc/UITools.cxx
index 58668ca..fac61dc 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -162,7 +162,7 @@
SQLExceptionInfo aInfo;
if ( !_xDataSource.is() )
{
- OSL_FAIL("createConnection: coult not retrieve the data source!");
+ SAL_WARN("dbaccess.ui", "createConnection: coult not retrieve the data
source!");
return aInfo;
}
@@ -176,7 +176,7 @@
}
catch(const Exception&)
{
- OSL_FAIL("createConnection: error while retrieving data source
properties!");
+ SAL_WARN("dbaccess.ui", "createConnection: error while retrieving data
source properties!");
}
@@ -187,7 +187,7 @@
Reference<XCompletedConnection>
xConnectionCompletion(_xDataSource, UNO_QUERY);
if (!xConnectionCompletion.is())
{
- OSL_FAIL("createConnection: missing an interface ... need an
error message here!");
+ SAL_WARN("dbaccess.ui", "createConnection: missing an
interface ... need an error message here!");
}
else
{ // instantiate the default SDB interaction handler
@@ -208,7 +208,7 @@
catch(const SQLContext& e) { aInfo = SQLExceptionInfo(e); }
catch(const SQLWarning& e) { aInfo = SQLExceptionInfo(e); }
catch(const SQLException& e) { aInfo = SQLExceptionInfo(e); }
- catch(const Exception&) { OSL_FAIL("SbaTableQueryBrowser::OnExpandEntry:
could not connect - unknown exception!"); }
+ catch(const Exception&) { SAL_WARN("dbaccess.ui",
"SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!");
}
return aInfo;
}
@@ -351,11 +351,9 @@
&& ( (_bAutoIncrement && aIter->second->bAutoIncrement)
|| !_bAutoIncrement )
)
{
- OSL_FAIL(( ::rtl::OString("getTypeInfoFromType: assuming
column type ")
- += ::rtl::OString(aIter->second->aTypeName.getStr(),
aIter->second->aTypeName.getLength(), osl_getThreadTextEncoding())
- += ::rtl::OString("\" (expected type name ")
- += ::rtl::OString(_sTypeName.getStr(),
_sTypeName.getLength(), osl_getThreadTextEncoding())
- += ::rtl::OString(" matches the type's local
name).")).getStr());
+ SAL_WARN("dbaccess.ui", "getTypeInfoFromType: assuming
column type " <<
+ aIter->second->aTypeName << "\" (expected type
name " <<
+ _sTypeName << " matches the type's local name).");
break;
}
}
@@ -736,7 +734,7 @@
case SVX_HOR_JUSTIFY_CENTER: nAlignment =
::com::sun::star::awt::TextAlign::CENTER; break;
case SVX_HOR_JUSTIFY_RIGHT: nAlignment =
::com::sun::star::awt::TextAlign::RIGHT; break;
default:
- OSL_FAIL("Invalid TextAlign!");
+ SAL_WARN("dbaccess.ui", "Invalid TextAlign!");
}
return nAlignment;
}
@@ -750,7 +748,7 @@
case ::com::sun::star::awt::TextAlign::CENTER : eJustify =
SVX_HOR_JUSTIFY_CENTER; break;
case ::com::sun::star::awt::TextAlign::RIGHT : eJustify =
SVX_HOR_JUSTIFY_RIGHT; break;
default:
- OSL_FAIL("Invalid TextAlign!");
+ SAL_WARN("dbaccess.ui", "Invalid TextAlign!");
}
return eJustify;
}
@@ -778,7 +776,7 @@
else if( eWeight == WEIGHT_BLACK )
return ::com::sun::star::awt::FontWeight::BLACK;
- OSL_FAIL("Unknown FontWeigth" );
+ SAL_WARN("dbaccess.ui", "Unknown FontWeigth" );
return ::com::sun::star::awt::FontWeight::DONTKNOW;
}
//
-----------------------------------------------------------------------------
@@ -805,7 +803,7 @@
else if( eWidth == WIDTH_ULTRA_EXPANDED )
return ::com::sun::star::awt::FontWidth::ULTRAEXPANDED;
- OSL_FAIL("Unknown FontWidth" );
+ SAL_WARN("dbaccess.ui", "Unknown FontWidth" );
return ::com::sun::star::awt::FontWidth::DONTKNOW;
}
//
-----------------------------------------------------------------------------
diff --git a/extensions/source/dbpilots/gridwizard.cxx
b/extensions/source/dbpilots/gridwizard.cxx
index 1309f1e..6feabb6 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -218,9 +218,9 @@
}
catch(const Exception&)
{
- OSL_FAIL( (
::rtl::OString("OGridWizard::implApplySettings: unexpected exception while
creating the grid column for field ")
- += ::rtl::OString(pFormFieldName->getStr(),
pFormFieldName->getLength(), osl_getThreadTextEncoding())
- += ::rtl::OString("!") ).getStr() );
+ SAL_WARN( "extensions.dbpilots",
"OGridWizard::implApplySettings: " <<
+ "unexpected exception while creating the grid
column for field " <<
+ pFormFieldName->getStr() << "!" );
}
}
}
diff --git a/oox/source/helper/propertyset.cxx
b/oox/source/helper/propertyset.cxx
index 706c43d..d3e8bb3 100644
--- a/oox/source/helper/propertyset.cxx
+++ b/oox/source/helper/propertyset.cxx
@@ -85,7 +85,7 @@
}
catch( Exception& )
{
- OSL_FAIL( "PropertySet::setProperties - cannot set all property
values, fallback to single mode" );
+ SAL_WARN( "oox", "PropertySet::setProperties - cannot set all property
values, fallback to single mode" );
}
if( mxPropSet.is() )
@@ -120,8 +120,8 @@
}
catch( Exception& )
{
- OSL_FAIL( OStringBuffer( "PropertySet::implGetPropertyValue - cannot
get property \"" ).
- append( OUStringToOString( rPropName, RTL_TEXTENCODING_ASCII_US )
).append( '"' ).getStr() );
+ SAL_WARN( "oox", "PropertySet::implGetPropertyValue - cannot get
property \"" <<
+ rPropName << '"' );
}
return false;
}
@@ -135,8 +135,8 @@
}
catch( Exception& )
{
- OSL_FAIL( OStringBuffer( "PropertySet::implSetPropertyValue - cannot
set property \"" ).
- append( OUStringToOString( rPropName, RTL_TEXTENCODING_ASCII_US )
).append( '"' ).getStr() );
+ SAL_WARN( "oox", "PropertySet::implSetPropertyValue - cannot set
property \"" <<
+ rPropName << '"' );
}
return false;
}
diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index b08600f..3248e41 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -567,7 +567,7 @@
}
catch( const Exception& e )
{
- SAL_INFO("oox.ppt","OOX: exception raised in TimeNode::setNode() -
" << OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ).getStr() );
+ SAL_INFO("oox.ppt","OOX: exception raised in TimeNode::setNode() -
" << e.Message );
}
}
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 6b22fd3..49c274a 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -50,6 +50,8 @@
@section connectivity
+@li @c connectivity.cpool
+@li @c connectivity.commontools
@li @c connectivity.mork
@li @c connectivity.parse
@@ -97,9 +99,10 @@
@section extensions
+@li @c extensions.dbpilots
@li @c extensions.plugin
-@li @c extensions.update
@li @c extensions.scanner
+@li @c extensions.update
@section Filter
@@ -158,11 +161,11 @@
@li @c sfx2.appl
@li @c sfx2.bastyp
@li @c sfx2.config
+@li @c sfx2.control
@li @c sfx2.dialog
@li @c sfx2.doc
@li @c sfx2.notify
@li @c sfx2.view
-@li @c sfx2.control
@section slideshow
diff --git a/sc/source/filter/excel/xlroot.cxx
b/sc/source/filter/excel/xlroot.cxx
index dbc4703..0e6dc67 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -110,7 +110,7 @@
case SCRIPTTYPE_LATIN: mnDefApiScript = ApiScriptType::LATIN;
break;
case SCRIPTTYPE_ASIAN: mnDefApiScript = ApiScriptType::ASIAN;
break;
case SCRIPTTYPE_COMPLEX: mnDefApiScript = ApiScriptType::COMPLEX;
break;
- default: OSL_FAIL( "XclRootData::XclRootData - unknown script type"
);
+ default: SAL_WARN( "sc", "XclRootData::XclRootData - unknown script
type" );
}
// maximum cell position
@@ -152,7 +152,7 @@
catch( const Exception& e)
{
#if OSL_DEBUG_LEVEL > 0
- OSL_FAIL( rtl::OStringBuffer("XclRootData::XclRootData - cannot get
output device info:
").append(rtl::OUStringToOString(e.Message,osl_getThreadTextEncoding())).getStr()
);
+ SAL_WARN( "sc", "XclRootData::XclRootData - cannot get output device
info: " << e.Message );
#else
(void)e;
#endif
@@ -220,7 +220,7 @@
if( mrData.mnCharWidth <= 0 )
{
// #i48717# Win98 with HP LaserJet returns 0
- OSL_FAIL( "XclRoot::SetCharWidth - invalid character width (no
printer?)" );
+ SAL_WARN( "sc", "XclRoot::SetCharWidth - invalid character width (no
printer?)" );
mrData.mnCharWidth = 11 * rFontData.mnHeight / 20;
}
}
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 1e8a97e..9d68e43 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -572,7 +572,7 @@
for( unsigned int i = 0; i < nElem; i++ )
aTmp += " " + OUString(typeid( *(aGrammar.m_aObjectStack[i])
).name());
- SAL_WARN("sdext.pdfimport.pdfparse", "parse error: " <<
rError.descriptor << " at buffer pos " << rError.where - pBuffer << ", object
stack: " << OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_WARN("sdext.pdfimport.pdfparse", "parse error: " <<
rError.descriptor << " at buffer pos " << rError.where - pBuffer << ", object
stack: " << aTmp);
#endif
}
@@ -652,7 +652,7 @@
strlen(typeid( *(aGrammar.m_aObjectStack[i])
).name()),
RTL_TEXTENCODING_ASCII_US);
}
- SAL_WARN("sdext.pdfimport.pdfparse", "parse error: " <<
rError.descriptor << " at buffer pos " << rError.where - file_start << ",
object stack: " << OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8).getStr());
+ SAL_WARN("sdext.pdfimport.pdfparse", "parse error: " <<
rError.descriptor << " at buffer pos " << rError.where - file_start << ",
object stack: " << aTmp);
#endif
}
diff --git a/stoc/source/inspect/introspection.cxx
b/stoc/source/inspect/introspection.cxx
index 24cd0cc..a7cea62 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -2148,10 +2148,8 @@
}
else
{
- OSL_FAIL(
- OString( ::rtl::OString( "Introspection: Property \""
) +
- ::rtl::OUStringToOString( aPropName,
RTL_TEXTENCODING_UTF8 ) +
- ::rtl::OString( "\" found more than once in
PropertySet" ) ).getStr() );
+ SAL_WARN( "stoc", "Introspection: Property \"" <<
+ aPropName << "\" found more than once in PropertySet"
);
}
// Count pflegen
@@ -2798,7 +2796,7 @@
Reference<XIdlClass> xClassRef = TypeToIdlClass(
aToInspectObj.getValueType(), m_xSMgr );
if( !xClassRef.is() )
{
- OSL_FAIL( "Can't get XIdlClass from Reflection" );
+ SAL_WARN( "stoc", "Can't get XIdlClass from Reflection" );
return pAccess;
}
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 9193396..997a5d8 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -172,10 +172,7 @@
}
catch( uno::RuntimeException const & r )
{
- (void)r;
-#if OSL_DEBUG_LEVEL > 0
- OSL_FAIL( OString("Runtime exception caught while notifying
shape.:\n" + OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US)).getStr());
-#endif
+ SAL_WARN( "sw.core", "Runtime exception caught while notifying
shape.: " << r.Message );
}
}
}
--
To view, visit https://gerrit.libreoffice.org/3121
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1871e5e3a319b2d5177ae4bd470046c022c14eb7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold <[email protected]>
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
