strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools: remove DBG_ERRORFILE and replace all callers

Browse source 
Change-Id: Ic76ccc49b9291fe82c56974eb6237cd3b85d91c8
This commit is contained in:
Michael Stahl 2014-10-28 12:36:04 +01:00
parent 8efc8f6801
commit 31ca7f6d71
8 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sal/log-areas.dox
View file

@ -313,6 +313,7 @@ certain functionality.
@li @c svx.form
@li @c svx.opengl
@li @c svx.sdr
@li @c svx.sidebar
@li @c svx.stbcrtls - StatusBarControl
@li @c svx.svdraw
@li @c svx.table

6
include/tools/debug.hxx
View file

@ -33,7 +33,7 @@
Because the assertion macro (DBG_ASSERT) has been used for
true assertions as well as to log warnings, it maps to SAL_WARN instead of
standard assert. The warning and error macros (DBG_ASSERTWARNING,
DBG_WARNING, DBG_ERRORFILE) all map to
DBG_WARNING) all map to
SAL_INFO.
*/
@ -110,9 +110,6 @@ inline void DbgSetTestSolarMutex( DbgTestSolarMutexProc pProc )
#define DBG_WARNING( aWarning ) \
SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", aWarning)
#define DBG_ERRORFILE( aError ) \
SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", aError, __FILE__, __LINE__)
#define DBG_TESTSOLARMUTEX() \
do \
{ \
@ -125,7 +122,6 @@ do \
#define DBG_ASSERTWARNING( sCon, aWarning ) ((void)0)
#define DBG_ASSERT( sCon, aError ) ((void)0)
#define DBG_WARNING( aWarning ) ((void)0)
#define DBG_ERRORFILE( aError ) ((void)0)
#define DBG_TESTSOLARMUTEX() ((void)0)

10
sc/source/filter/excel/tokstack.cxx
View file

@ -526,7 +526,7 @@ bool TokenPool::GetElementRek( const sal_uInt16 nId )
if (nId >= nElementAkt)
{
DBG_ERRORFILE( "*TokenPool::GetElementRek(): nId >= nElementAkt" );
SAL_WARN("sc.filter", "*TokenPool::GetElementRek(): nId >= nElementAkt");
#ifdef DBG_UTIL
m_nRek--;
#endif
@ -535,7 +535,7 @@ bool TokenPool::GetElementRek( const sal_uInt16 nId )
if (pType[ nId ] != T_Id)
{
DBG_ERRORFILE( "-TokenPool::GetElementRek(): pType[ nId ] != T_Id" );
SAL_WARN("sc.filter", "-TokenPool::GetElementRek(): pType[ nId ] != T_Id");
#ifdef DBG_UTIL
m_nRek--;
#endif
@ -547,14 +547,14 @@ bool TokenPool::GetElementRek( const sal_uInt16 nId )
sal_uInt16 nFirstId = pElement[ nId ];
if (nFirstId >= nP_Id)
{
DBG_ERRORFILE( "TokenPool::GetElementRek: nFirstId >= nP_Id");
SAL_WARN("sc.filter", "TokenPool::GetElementRek: nFirstId >= nP_Id");
nAnz = 0;
bRet = false;
}
sal_uInt16* pAkt = nAnz ? &pP_Id[ nFirstId ] : NULL;
if (nAnz > nP_Id - nFirstId)
{
DBG_ERRORFILE( "TokenPool::GetElementRek: nAnz > nP_Id - nFirstId");
SAL_WARN("sc.filter", "TokenPool::GetElementRek: nAnz > nP_Id - nFirstId");
nAnz = nP_Id - nFirstId;
bRet = false;
}
@ -564,7 +564,7 @@ bool TokenPool::GetElementRek( const sal_uInt16 nId )
{// recursion or not?
if (*pAkt >= nElementAkt)
{
DBG_ERRORFILE( "TokenPool::GetElementRek: *pAkt >= nElementAkt");
SAL_WARN("sc.filter", "TokenPool::GetElementRek: *pAkt >= nElementAkt");
bRet = false;
}
else

2
sc/source/filter/excel/xiescher.cxx
View file

@ -1598,7 +1598,7 @@ void XclImpChartObj::ReadChartSubStream( XclImpStream& rStrm )
}
else
{
DBG_ERRORFILE( "XclImpChartObj::ReadChartSubStream - missing chart substream" );
SAL_INFO("sc.filter", "XclImpChartObj::ReadChartSubStream - missing chart substream");
return;
}
}

2
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
View file

@ -961,7 +961,7 @@ FieldUnit ParaPropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPoolI
}
else
{
DBG_ERRORFILE( "GetModuleFieldUnit(): no module found" );
SAL_WARN("svx.sidebar", "GetModuleFieldUnit(): no module found");
}
}
}

2
svx/source/sidebar/possize/PosSizePropertyPanel.cxx
View file

@ -1059,7 +1059,7 @@ FieldUnit PosSizePropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPo
}
else
{
DBG_ERRORFILE( "GetModuleFieldUnit(): no module found" );
SAL_WARN("svx.sidebar", "GetModuleFieldUnit(): no module found");
}
}
}

2
sw/source/filter/ww8/ww8par.cxx
View file

@ -350,7 +350,7 @@ void SwWW8ImplReader::ReadEmbeddedData( SvMemoryStream& rStrm, SwDocShell* pDocS
}
else
{
DBG_ERRORFILE( "WW8Hyperlink::ReadEmbeddedData - unknown content GUID" );
SAL_INFO("sw.ww8", "WW8Hyperlink::ReadEmbeddedData - unknown content GUID");
}
}

2
sw/source/uibase/sidebar/PagePropertyPanel.cxx
View file

@ -554,7 +554,7 @@ void PagePropertyPanel::MetricState( SfxItemState eState, const SfxPoolItem* pSt
}
else
{
DBG_ERRORFILE( "<PagePropertyPanel::MetricState(..)>: no module found" );
SAL_WARN("sw.ui", "<PagePropertyPanel::MetricState(..)>: no module found");
}
}
}