[Libreoffice-commits] core.git: 4 commits - canvas/source connectivity/source filter/source framework/source include/tools oox/source reportdesign/source sc/source sd/source sfx2/source slideshow/source stoc/source svl/source svx/source sw/source
Stephan Bergmann
sbergman at redhat.com
Fri Mar 13 02:53:51 PDT 2015
canvas/source/cairo/cairo_textlayout.cxx | 36 ++++++++--------
canvas/source/cairo/cairo_xlib_cairo.cxx | 7 ++-
canvas/source/vcl/spritehelper.cxx | 5 +-
connectivity/source/drivers/evoab2/NStatement.cxx | 4 +
connectivity/source/drivers/mork/MResultSet.cxx | 8 ++-
connectivity/source/drivers/mork/MStatement.cxx | 8 ++-
filter/source/msfilter/mstoolbar.cxx | 20 ++++----
filter/source/msfilter/msvbahelper.cxx | 14 +++---
framework/source/uielement/generictoolbarcontroller.cxx | 4 -
include/tools/debug.hxx | 6 +-
oox/source/drawingml/customshapeproperties.cxx | 5 +-
oox/source/drawingml/diagram/diagram.cxx | 9 +---
oox/source/ppt/timetargetelementcontext.cxx | 5 +-
reportdesign/source/ui/report/ViewsWindow.cxx | 21 +++++++--
sc/source/core/data/dpsave.cxx | 2
sc/source/filter/excel/xicontent.cxx | 5 +-
sc/source/filter/excel/xltoolbar.cxx | 10 ++--
sc/source/ui/pagedlg/scuitphfedit.cxx | 2
sd/source/ui/framework/factories/ViewShellWrapper.cxx | 7 ++-
sd/source/ui/sidebar/LayoutMenu.cxx | 6 +-
sd/source/ui/tools/SdGlobalResourceContainer.cxx | 3 -
sd/source/ui/view/ViewShellBase.cxx | 4 -
sd/source/ui/view/viewshel.cxx | 13 +++--
sfx2/source/appl/appuno.cxx | 4 -
sfx2/source/appl/sfxhelp.cxx | 7 ---
sfx2/source/control/dispatch.cxx | 4 -
sfx2/source/sidebar/Deck.cxx | 16 +++----
slideshow/source/engine/eventqueue.cxx | 10 ++--
slideshow/source/engine/shapes/drawshapesubsetting.cxx | 22 +++++----
stoc/source/inspect/introspection.cxx | 24 ----------
svl/source/items/style.cxx | 5 +-
svx/source/customshapes/EnhancedCustomShape2d.cxx | 24 ++++++++--
svx/source/form/fmsrccfg.cxx | 3 -
svx/source/svdraw/svdview.cxx | 4 +
sw/source/filter/ww8/ww8par.cxx | 2
35 files changed, 179 insertions(+), 150 deletions(-)
New commits:
commit ee11e221d2108212619e1bbe7f029e7d9afdba32
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 13 10:50:28 2015 +0100
tdf#43157: Fix format string violations in OSL_TRACE etc.
...in preparation of enabling the __attribute__((format(...))) in
sal_detail_logFormat (include/sal/detail/log.h)
Change-Id: I8a859199fa11ca0f9f4f4b4b23a8ebddec955a86
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 892830e..5eef3e2 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -528,26 +528,26 @@ namespace cairocanvas
cairo_set_font_matrix(pSCairo.get(), &m);
#if (defined CAIRO_HAS_WIN32_SURFACE) && (OSL_DEBUG_LEVEL > 1)
-# define TEMP_TRACE_FONT OUStringToOString( reinterpret_cast<const sal_Unicode*> (logfont.lfFaceName), RTL_TEXTENCODING_UTF8 ).getStr()
+# define TEMP_TRACE_FONT OUString(reinterpret_cast<const sal_Unicode*> (logfont.lfFaceName))
#else
-# define TEMP_TRACE_FONT OUStringToOString( aFont.GetName(), RTL_TEXTENCODING_UTF8 ).getStr()
+# define TEMP_TRACE_FONT aFont.GetName()
#endif
- OSL_TRACE("\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r): Size:(%d,%d), Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s",
- aFont.GetWidth(),
- aFont.GetHeight(),
- (int) rOutpos.X(),
- (int) rOutpos.Y(),
- cairo_glyphs.size() > 0 ? cairo_glyphs[0].index : -1,
- cairo_glyphs.size() > 1 ? cairo_glyphs[1].index : -1,
- cairo_glyphs.size() > 2 ? cairo_glyphs[2].index : -1,
- maLogicalAdvancements.getLength() ? "ADV " : "",
- rSysFontData.bAntialias ? "AA " : "",
- rSysFontData.bFakeBold ? "FB " : "",
- rSysFontData.bFakeItalic ? "FI " : "",
- TEMP_TRACE_FONT,
- OUStringToOString( maText.Text.copy( maText.StartPosition, maText.Length ),
- RTL_TEXTENCODING_UTF8 ).getStr()
- );
+ SAL_INFO(
+ "canvas.cairo",
+ "Size:(" << aFont.GetWidth() << "," << aFont.GetHeight()
+ << "), Pos (" << rOutpos.X() << "," << rOutpos.Y()
+ << "), G("
+ << (cairo_glyphs.size() > 0 ? cairo_glyphs[0].index : -1)
+ << ","
+ << (cairo_glyphs.size() > 1 ? cairo_glyphs[1].index : -1)
+ << ","
+ << (cairo_glyphs.size() > 2 ? cairo_glyphs[2].index : -1)
+ << ") " << (maLogicalAdvancements.getLength() ? "ADV " : "")
+ << (rSysFontData.bAntialias ? "AA " : "")
+ << (rSysFontData.bFakeBold ? "FB " : "")
+ << (rSysFontData.bFakeItalic ? "FI " : "") << " || Name:"
+ << TEMP_TRACE_FONT << " - "
+ << maText.Text.copy(maText.StartPosition, maText.Length));
#undef TEMP_TRACE_FONT
cairo_show_glyphs(pSCairo.get(), &cairo_glyphs[0], cairo_glyphs.size());
diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx
index ae9cecb..171d105 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.cxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.cxx
@@ -356,8 +356,11 @@ namespace cairo
const BitmapSystemData& rData,
const Size& rSize )
{
- OSL_TRACE( "requested size: %d x %d available size: %d x %d",
- rSize.Width(), rSize.Height(), rData.mnWidth, rData.mnHeight );
+ SAL_INFO(
+ "canvas.cairo",
+ "requested size: " << rSize.Width() << " x " << rSize.Height()
+ << " available size: " << rData.mnWidth << " x "
+ << rData.mnHeight);
if ( rData.mnWidth == rSize.Width() && rData.mnHeight == rSize.Height() )
{
if( rRefDevice.GetOutDevType() == OUTDEV_WINDOW )
diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx
index 8e7d783..675ea92 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -332,8 +332,9 @@ namespace vclcanvas
2,'.',NULL,' ') );
rTargetSurface.DrawText( aOutPos+Point(2,2), text );
- VERBOSE_TRACE( "SpriteHelper::redraw(): sprite %X has prio %f\n",
- this, getPriority() );
+ SAL_INFO(
+ "canvas.level2",
+ "sprite " << this << " has prio " << getPriority());
}
}
}
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 546384a..bb852c4 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -357,7 +357,9 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
( pAtom->getChild( 0 ) && pAtom->getChild( 0 )->getNodeType() == SQL_NODE_NAME ) ||
( pAtom->getChild( 0 ) && pAtom->getChild( 0 )->getNodeType() == SQL_NODE_STRING ) ) )
{
- OSL_TRACE( "analyseSQL : pAtom->count() = %d", pAtom->count() );
+ SAL_INFO(
+ "connectivity.evoab2",
+ "analyseSQL : pAtom->count() = " << pAtom->count());
m_pConnection->throwGenericSQLException(STR_QUERY_INVALID_LIKE_STRING,*this);
}
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 1b355cb..02d0895 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -1269,7 +1269,9 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep
OSL_TRACE("OrderbyColumnNumber->size() = %zu",m_aOrderbyColumnNumber.size());
#if OSL_DEBUG_LEVEL > 0
for ( ::std::vector<sal_Int32>::size_type i = 0; i < m_aColMapping.size(); i++ )
- OSL_TRACE("Mapped: %d -> %d", i, m_aColMapping[i] );
+ SAL_INFO(
+ "connectivity.mork",
+ "Mapped: " << i << " -> " << m_aColMapping[i]);
#endif
for ( sal_Int32 nRow = 1; nRow <= m_aQueryHelper.getResultCount(); nRow++ ) {
@@ -1292,7 +1294,9 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep
m_CurrentRowCount = static_cast<sal_Int32>(m_pKeySet->get().size());
#if OSL_DEBUG_LEVEL > 0
for( OKeySet::Vector::size_type i = 0; i < m_pKeySet->get().size(); i++ )
- OSL_TRACE("Sorted: %d -> %d", i, (m_pKeySet->get())[i] );
+ SAL_INFO(
+ "connectivity.mork",
+ "Sorted: " << i << " -> " << (m_pKeySet->get())[i]);
#endif
beforeFirst(); // Go back to start
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index a56c844..e0766ce 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -502,12 +502,16 @@ void OCommonStatement::createColumnMapping()
// now check which columns are bound
#if OSL_DEBUG_LEVEL > 0
for ( i = 0; i < m_aColMapping.size(); i++ )
- OSL_TRACE("BEFORE Mapped: %d -> %d", i, m_aColMapping[i] );
+ SAL_INFO(
+ "connectivity.mork",
+ "BEFORE Mapped: " << i << " -> " << m_aColMapping[i]);
#endif
OResultSet::setBoundedColumns(m_aRow,xColumns,xNames,true,m_xDBMetaData,m_aColMapping);
#if OSL_DEBUG_LEVEL > 0
for ( i = 0; i < m_aColMapping.size(); i++ )
- OSL_TRACE("AFTER Mapped: %d -> %d", i, m_aColMapping[i] );
+ SAL_INFO(
+ "connectivity.mork",
+ "AFTER Mapped: " << i << " -> " << m_aColMapping[i]);
#endif
}
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index 6f2f042..10a2cb6 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -192,7 +192,7 @@ TBCHeader::~TBCHeader()
bool TBCHeader::Read( SvStream &rS )
{
- OSL_TRACE("TBCHeader::Read() stream pos 0x%x", rS.Tell() );
+ SAL_INFO("filter.ms", "stream pos " << rS.Tell());
nOffSet = rS.Tell();
rS.ReadSChar( bSignature ).ReadSChar( bVersion ).ReadUChar( bFlagsTCR ).ReadUChar( tct ).ReadUInt16( tcid ).ReadUInt32( tbct ).ReadUChar( bPriority );
// bit 4 ( from lsb )
@@ -230,7 +230,7 @@ TBCData::TBCData( const TBCHeader& Header ) : rHeader( Header )
bool TBCData::Read(SvStream &rS)
{
- OSL_TRACE("TBCData::Read() stream pos 0x%x", rS.Tell() );
+ SAL_INFO("filter.ms", "stream pos " << rS.Tell());
nOffSet = rS.Tell();
if ( !controlGeneralInfo.Read(rS) /*|| !controlSpecificInfo.Read(rS)*/ )
return false;
@@ -375,7 +375,7 @@ void TBCData::Print( FILE* fp )
bool
WString::Read( SvStream &rS )
{
- OSL_TRACE("WString::Read() stream pos 0x%x", rS.Tell() );
+ SAL_INFO("filter.ms", "stream pos " << rS.Tell());
nOffSet = rS.Tell();
sal_uInt8 nChars = 0;
rS.ReadUChar( nChars );
@@ -393,7 +393,7 @@ TBCExtraInfo::TBCExtraInfo()
bool
TBCExtraInfo::Read( SvStream &rS )
{
- OSL_TRACE("TBCExtraInfo::Read() stream pos 0x%x", rS.Tell() );
+ SAL_INFO("filter.ms", "stream pos " << rS.Tell());
nOffSet = rS.Tell();
if( !wstrHelpFile.Read( rS ) )
return false;
@@ -439,7 +439,7 @@ TBCGeneralInfo::TBCGeneralInfo() : bFlags( 0 )
bool TBCGeneralInfo::Read( SvStream &rS )
{
- OSL_TRACE("TBCGeneralInfo::Read() stream pos 0x%x", rS.Tell() );
+ SAL_INFO("filter.ms", "stream pos " << rS.Tell());
nOffSet = rS.Tell();
rS.ReadUChar( bFlags );
@@ -521,7 +521,7 @@ TBCMenuSpecific::TBCMenuSpecific() : tbid( 0 )
bool
TBCMenuSpecific::Read( SvStream &rS)
{
- OSL_TRACE("TBCMenuSpecific::Read() stream pos 0x%x", rS.Tell() );
+ SAL_INFO("filter.ms", "stream pos " << rS.Tell());
nOffSet = rS.Tell();
rS.ReadInt32( tbid );
if ( tbid == 1 )
@@ -557,7 +557,7 @@ TBCBSpecific::TBCBSpecific() : bFlags( 0 )
bool TBCBSpecific::Read( SvStream &rS)
{
- OSL_TRACE("TBCBSpecific::Read() stream pos 0x%x", rS.Tell() );
+ SAL_INFO("filter.ms", "stream pos " << rS.Tell());
nOffSet = rS.Tell();
rS.ReadUChar( bFlags );
@@ -720,7 +720,7 @@ TBCBitMap::~TBCBitMap()
bool TBCBitMap::Read( SvStream& rS)
{
- OSL_TRACE("TBCBitMap::Read() stream pos 0x%x", rS.Tell() );
+ SAL_INFO("filter.ms", "stream pos " << rS.Tell());
nOffSet = rS.Tell();
rS.ReadInt32( cbDIB );
// cbDIB = sizeOf(biHeader) + sizeOf(colors) + sizeOf(bitmapData) + 10
@@ -748,7 +748,7 @@ bFlags( 0 )
bool TB::Read(SvStream &rS)
{
- OSL_TRACE("TB::Read() stream pos 0x%x", rS.Tell() );
+ SAL_INFO("filter.ms", "stream pos " << rS.Tell());
nOffSet = rS.Tell();
rS.ReadUChar( bSignature ).ReadUChar( bVersion ).ReadInt16( cCL ).ReadInt32( ltbid ).ReadUInt32( ltbtr ).ReadUInt16( cRowsDefault ).ReadUInt16( bFlags );
name.Read( rS );
@@ -783,7 +783,7 @@ TBVisualData::TBVisualData() : tbds(0), tbv(0), tbdsDock(0), iRow(0)
bool TBVisualData::Read( SvStream& rS )
{
- OSL_TRACE("TBVisualData::Read() stream pos 0x%x", rS.Tell() );
+ SAL_INFO("filter.ms", "stream pos " << rS.Tell());
nOffSet = rS.Tell();
rS.ReadSChar( tbds ).ReadSChar( tbv ).ReadSChar( tbdsDock ).ReadSChar( iRow );
rcDock.Read( rS );
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index a02a028..e7662ca 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -99,10 +99,10 @@ SfxObjectShell* findShellForUrl( const OUString& sMacroURLOrPath )
// a new document :/
if ( xModel.is() )
{
- OSL_TRACE("shell 0x%x has model with url %s and we look for %s", pShell
- , OUStringToOString( xModel->getURL(), RTL_TEXTENCODING_UTF8 ).getStr()
- , OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ).getStr()
- );
+ SAL_INFO(
+ "filter.ms",
+ "shell " << pShell << " has model with url " << xModel->getURL()
+ << " and we look for " << aURL);
OUString aName = xModel->getURL() ;
if (aName.isEmpty())
{
@@ -309,7 +309,7 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& Macro
// assume for now that the document name is *this* document
OUString sDocUrlOrPath = aMacroName.copy( 0, nDocSepIndex );
aMacroName = aMacroName.copy( nDocSepIndex + 1 );
- OSL_TRACE("doc search, current shell is 0x%x", pShell );
+ SAL_INFO("filter.ms", "doc search, current shell is " << pShell);
SfxObjectShell* pFoundShell = 0;
if( bSearchGlobalTemplates )
{
@@ -320,7 +320,9 @@ MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& Macro
}
if( !pFoundShell )
pFoundShell = findShellForUrl( sDocUrlOrPath );
- OSL_TRACE("doc search, after find, found shell is 0x%x", pFoundShell );
+ SAL_INFO(
+ "filter.ms",
+ "doc search, after find, found shell is " << pFoundShell);
return resolveVBAMacro( pFoundShell, aMacroName );
}
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index c7a5a86..f72ae03 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -327,12 +327,12 @@ class Toolbarmenu : public ::PopupMenu
Toolbarmenu::Toolbarmenu()
{
- OSL_TRACE("**** contstructing Toolbarmenu 0x%x", this );
+ SAL_INFO("fwk.uielement", "contstructing Toolbarmenu " << this);
}
Toolbarmenu::~Toolbarmenu()
{
- OSL_TRACE("**** destructing Toolbarmenu 0x%x", this );
+ SAL_INFO("fwk.uielement", "destructing Toolbarmenu " << this);
}
void SAL_CALL MenuToolbarController::click() throw (RuntimeException, std::exception)
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 7a1b171..6c1ce13 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -304,7 +304,10 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
{
aSubViewSize[i].Width = static_cast< sal_Int32 >( maPath2DList[i].w );
aSubViewSize[i].Height = static_cast< sal_Int32 >( maPath2DList[i].h );
- OSL_TRACE("set subpath %d size: %d x %d", i, maPath2DList[i].w, maPath2DList[i].h);
+ SAL_INFO(
+ "oox.cscode",
+ "set subpath " << i << " size: " << maPath2DList[i].w
+ << " x " << maPath2DList[i].h);
}
aPath.setProperty( PROP_SubViewSize, aSubViewSize);
}
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index 1209f00..3fcd3fe 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -62,11 +62,10 @@ void Connection::dump()
void Point::dump()
{
- OSL_TRACE( "dgm: pt text %x, cnxId %s, modelId %s, type %d",
- mpShape.get(),
- OUSTRING_TO_CSTR( msCnxId ),
- OUSTRING_TO_CSTR( msModelId ),
- mnType );
+ SAL_INFO(
+ "oox.drawingml",
+ "pt text " << mpShape.get() << ", cnxId " << msCnxId << ", modelId "
+ << msModelId << ", type " << mnType);
}
} // dgm namespace
diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx
index 225ca38..b565a1b 100644
--- a/oox/source/ppt/timetargetelementcontext.cxx
+++ b/oox/source/ppt/timetargetelementcontext.cxx
@@ -134,7 +134,10 @@ namespace oox { namespace ppt {
return new ShapeTargetElementContext( *this, mpTarget->maShapeTarget );
}
default:
- OSL_TRACE( "OOX: unhandled tag %ld in TL_TimeTargetElement.", getBaseToken( aElementToken ) );
+ SAL_INFO(
+ "oox.ppt",
+ "unhandled tag " << getBaseToken(aElementToken)
+ << " in TL_TimeTargetElement");
break;
}
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 730b372..d4ebe21 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -1034,7 +1034,8 @@ bool OViewsWindow::isObjectInMyTempList(SdrObject *_pObj)
void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionView* _pSection)
{
- OSL_TRACE("BegDragObj Clickpoint X:%d Y:%d", _aPnt.X(), _aPnt.Y() );
+ SAL_INFO(
+ "reportdesign", "Clickpoint X:" << _aPnt.X() << " Y:" << _aPnt.Y());
m_aBegDragTempList.clear();
@@ -1052,7 +1053,9 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
aAbsolutePnt.Y() += nSectionHeight;
}
m_aDragDelta = Point(SAL_MAX_INT32, SAL_MAX_INT32);
- OSL_TRACE("BegDragObj Absolute X:%d Y:%d", aAbsolutePnt.X(), aAbsolutePnt.Y() );
+ SAL_INFO(
+ "reportdesign",
+ "Absolute X:" << aAbsolutePnt.X() << " Y:" << aAbsolutePnt.Y());
// Create drag lines over all viewable Views
// Therefore we need to identify the marked objects
@@ -1084,7 +1087,10 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
aLeftTop.X() = ::std::min( aRect.Left(), aLeftTop.X() );
aLeftTop.Y() = ::std::min( aRect.Top(), aLeftTop.Y() );
- OSL_TRACE("BegDragObj createInvisible X:%d Y:%d on View #%d", aRect.Left(), aRect.Top(), nViewCount );
+ SAL_INFO(
+ "reportdesign",
+ "createInvisible X:" << aRect.Left() << " Y:"
+ << aRect.Top() << " on View #" << nViewCount);
BegDragObj_createInvisibleObjectAtPosition(aRect, rView);
}
@@ -1121,7 +1127,10 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
pHdl = rHdlList.GetHdl(_pHdl->GetKind());
}
}
- OSL_TRACE("BegDragObj X:%d Y:%d on View#%d", aNewPos.X(), aNewPos.Y(), nViewCount++ );
+ SAL_INFO(
+ "reportdesign",
+ "X:" << aNewPos.X() << " Y:" << aNewPos.Y() << " on View#"
+ << nViewCount++);
rReportSection.getSectionView().BegDragObj(aNewPos, (OutputDevice*)NULL, pHdl, nDrgLog, NULL);
const long nSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
@@ -1342,7 +1351,9 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo
Point aRealMousePos = _aPnt;
Point aCurrentSectionPos;
- OSL_TRACE("MovAction X:%d Y:%d", aRealMousePos.X(), aRealMousePos.Y() );
+ SAL_INFO(
+ "reportdesign",
+ "X:" << aRealMousePos.X() << " Y:" << aRealMousePos.Y());
Point aHdlPos;
SdrHdl* pHdl = _pSection->GetDragHdl();
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 7819edd..5d9bd80 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -1203,7 +1203,7 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie
OUString aName = iter->GetName();
OUString aCoreName = ScDPUtil::getSourceDimensionName(aName);
- OSL_TRACE( "%s", aName.getStr() );
+ SAL_INFO("sc.core", aName);
bool bData = iter->IsDataLayout();
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index c248e9d..ef683fe 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -532,7 +532,8 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
case EXC_CF_CMP_GREATER_EQUAL: eMode = SC_COND_EQGREATER; break;
case EXC_CF_CMP_LESS_EQUAL: eMode = SC_COND_EQLESS; break;
default:
- OSL_TRACE( "XclImpCondFormat::ReadCF - unknown CF comparison 0x%02hX", nOperator );
+ SAL_INFO(
+ "sc.filter", "unknown CF comparison " << nOperator);
}
}
break;
@@ -542,7 +543,7 @@ void XclImpCondFormat::ReadCF( XclImpStream& rStrm )
break;
default:
- OSL_TRACE( "XclImpCondFormat::ReadCF - unknown CF mode 0x%02hX", nType );
+ SAL_INFO("sc.filter", "unknown CF mode " << nType);
return;
}
diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx
index 0276a0d..f3631be 100644
--- a/sc/source/filter/excel/xltoolbar.cxx
+++ b/sc/source/filter/excel/xltoolbar.cxx
@@ -77,7 +77,7 @@ ScCTB::ScCTB(sal_uInt16 nNum ) : nViews( nNum ), ectbid(0)
bool ScCTB::Read( SvStream &rS )
{
- OSL_TRACE("ScCTB::Read() stream pos 0x%x", rS.Tell() );
+ SAL_INFO("sc.filter", "stream pos " << rS.Tell());
nOffSet = rS.Tell();
tb.Read( rS );
for ( sal_uInt16 index = 0; index < nViews; ++index )
@@ -188,7 +188,7 @@ bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelp
}
bool CTBS::Read( SvStream &rS )
{
- OSL_TRACE("CTBS::Read() stream pos 0x%x", rS.Tell() );
+ SAL_INFO("sc.filter", "stream pos " << rS.Tell());
nOffSet = rS.Tell();
rS.ReadUChar( bSignature ).ReadUChar( bVersion ).ReadUInt16( reserved1 ).ReadUInt16( reserved2 ).ReadUInt16( reserved3 ).ReadUInt16( ctb ).ReadUInt16( ctbViews ).ReadUInt16( ictbView );
return true;
@@ -220,7 +220,7 @@ ScTBC::ScTBC()
bool
ScTBC::Read(SvStream &rS)
{
- OSL_TRACE("ScTBC::Read() stream pos 0x%x", rS.Tell() );
+ SAL_INFO("sc.filter", "stream pos " << rS.Tell());
nOffSet = rS.Tell();
if ( !tbch.Read( rS ) )
return false;
@@ -329,7 +329,7 @@ TBCCmd::Print(FILE* fp)
bool TBCCmd::Read( SvStream &rS )
{
- OSL_TRACE("TBCCmd::Read() stream pos 0x%x", rS.Tell() );
+ SAL_INFO("sc.filter", "stream pos " << rS.Tell());
nOffSet = rS.Tell();
rS.ReadUInt16( cmdID );
sal_uInt16 temp;
@@ -354,7 +354,7 @@ ScCTBWrapper::~ScCTBWrapper()
bool
ScCTBWrapper::Read( SvStream &rS)
{
- OSL_TRACE("ScCTBWrapper::Read() stream pos 0x%x", rS.Tell() );
+ SAL_INFO("sc.filter", "stream pos " << rS.Tell());
nOffSet = rS.Tell();
if (!ctbSet.Read(rS))
return false;
diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
index 656bbcc..8d1181d 100644
--- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx
+++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
@@ -75,11 +75,14 @@ void SAL_CALL ViewShellWrapper::disposing (void)
{
::osl::MutexGuard aGuard( maMutex );
- OSL_TRACE("disposing ViewShellWrapper %x", this);
+ SAL_INFO("sd.ui", "disposing ViewShellWrapper " << this);
Reference<awt::XWindow> xWindow (mxWindow);
if (xWindow.is())
{
- OSL_TRACE("removing ViewShellWrapper %x from window listener at %x", this, mxWindow.get());
+ SAL_INFO(
+ "sd.ui",
+ "removing ViewShellWrapper " << this << " from window listener at "
+ << mxWindow.get());
xWindow->removeWindowListener(this);
}
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 283724b..b421ac0 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -137,7 +137,7 @@ LayoutMenu::LayoutMenu (
mbIsDisposed(false)
{
implConstruct( *mrBase.GetDocument()->GetDocSh() );
- OSL_TRACE("created LayoutMenu at %x", this);
+ SAL_INFO("sd.ui", "created LayoutMenu at " << this);
SetStyle(GetStyle() | WB_ITEMBORDER | WB_FLATVALUESET | WB_TABSTOP);
@@ -194,7 +194,7 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell )
LayoutMenu::~LayoutMenu (void)
{
- OSL_TRACE("destroying LayoutMenu at %x", this);
+ SAL_INFO("sd.ui", "destroying LayoutMenu at " << this);
Dispose();
}
@@ -203,7 +203,7 @@ void LayoutMenu::Dispose (void)
if (mbIsDisposed)
return;
- OSL_TRACE("disposing LayoutMenu at %x", this);
+ SAL_INFO("sd.ui", "disposing LayoutMenu at " << this);
mbIsDisposed = true;
diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
index 6b310dd..7bc3178 100644
--- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx
+++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
@@ -157,7 +157,8 @@ SdGlobalResourceContainer::~SdGlobalResourceContainer (void)
if ( ! iSharedResource->unique())
{
SdGlobalResource* pResource = iSharedResource->get();
- OSL_TRACE(" %p %d", pResource, iSharedResource->use_count());
+ SAL_INFO(
+ "sd.tools", pResource << " " << iSharedResource->use_count());
DBG_ASSERT(iSharedResource->unique(),
"SdGlobalResource still held in ~SdGlobalResourceContainer");
}
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index d79b256..92832d2 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1380,12 +1380,12 @@ FocusForwardingWindow::FocusForwardingWindow (
: vcl::Window(&rParentWindow, WinBits(WB_CLIPCHILDREN | WB_DIALOGCONTROL)),
mrBase(rBase)
{
- OSL_TRACE("created FocusForwardingWindow at %x", this);
+ SAL_INFO("sd.view", "created FocusForwardingWindow at " << this);
}
FocusForwardingWindow::~FocusForwardingWindow (void)
{
- OSL_TRACE("destroyed FocusForwardingWindow at %x", this);
+ SAL_INFO("sd.view", "destroyed FocusForwardingWindow at " << this);
}
void FocusForwardingWindow::KeyInput (const KeyEvent& rKEvt)
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 1bc8ac9..1fe42c7 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -158,8 +158,10 @@ ViewShell::~ViewShell()
if (mpContentWindow)
{
- OSL_TRACE("destroying mpContentWindow at %x with parent %x", mpContentWindow.get(),
- mpContentWindow->GetParent());
+ SAL_INFO(
+ "sd.ui",
+ "destroying mpContentWindow at " << mpContentWindow.get()
+ << " with parent " << mpContentWindow->GetParent());
mpContentWindow.reset();
}
}
@@ -238,9 +240,10 @@ void ViewShell::doShow(void)
{
mpContentWindow->Show();
static_cast< vcl::Window*>(mpContentWindow.get())->Resize();
- OSL_TRACE("content window has size %d %d",
- mpContentWindow->GetSizePixel().Width(),
- mpContentWindow->GetSizePixel().Height());
+ SAL_INFO(
+ "sd.view",
+ "content window has size " << mpContentWindow->GetSizePixel().Width()
+ << " " << mpContentWindow->GetSizePixel().Height());
if ( ! GetDocSh()->IsPreview())
{
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 2109158..29e0892 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -231,9 +231,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
else if ( nSubCount == 0 )
{
// for a simple property there can be only one parameter and its name *must* match
- OUStringBuffer aStr("Property name does not match: ");
- aStr.append(aName);
- OSL_FAIL( aStr.getStr() );
+ SAL_WARN("sfx.appl", "Property name does not match: " << aName);
}
#endif
else
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 5cd81b4..7db1a76 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -66,7 +66,6 @@
#include <sfx2/sfxuno.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/frame.hxx>
-#include <rtl/strbuf.hxx>
#include <rtl/string.hxx>
using namespace ::com::sun::star::beans;
@@ -631,11 +630,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const
if (!xHelp.is() || !xHelpContent.is() || !pHelpWindow)
return false;
-#ifdef DBG_UTIL
- OStringBuffer aTmp("SfxHelp: HelpId = ");
- aTmp.append(OUStringToOString(aHelpURL, RTL_TEXTENCODING_UTF8));
- OSL_TRACE( aTmp.getStr() );
-#endif
+ SAL_INFO("sfx.appl", "HelpId = " << aHelpURL);
pHelpWindow->SetHelpURL( aHelpURL );
pHelpWindow->loadHelpContent(aHelpURL);
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index cf6c373..16cca9d 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -715,7 +715,7 @@ void SfxDispatcher::DoDeactivate_Impl(bool bMDI, SfxViewFrame* pNew)
if ( bMDI )
{
- OSL_TRACE(OStringBuffer("Deactivate Dispatcher").append(reinterpret_cast<sal_Int64>(this)).getStr());
+ SAL_INFO("sfx.control", "Deactivate Dispatcher " << this);
DBG_ASSERT( xImp->bActive, "Deactivate error" );
xImp->bActive = false;
@@ -736,7 +736,7 @@ void SfxDispatcher::DoDeactivate_Impl(bool bMDI, SfxViewFrame* pNew)
}
}
else {
- OSL_TRACE(OStringBuffer("Non-MDI-DeActivate Dispatcher").append(reinterpret_cast<sal_Int64>(this)).getStr());
+ SAL_INFO("sfx.control", "Non-MDI-DeActivate Dispatcher " << this);
}
if ( IsAppDispatcher() && !pSfxApp->IsDowning() )
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index c114a93..ed4ad3c 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -284,15 +284,13 @@ void Deck::PrintWindowSubTree (vcl::Window* pRoot, int nIndentation)
static const char* sIndentation = " ";
const Point aLocation (pRoot->GetPosPixel());
const Size aSize (pRoot->GetSizePixel());
- OUString sClassification = GetWindowClassification(pRoot);
- const char* sVisible = pRoot->IsVisible() ? "visible" : "hidden";
- OSL_TRACE("%s%x %s %s +%d+%d x%dx%d",
- sIndentation+strlen(sIndentation)-nIndentation*4,
- pRoot,
- OUStringToOString(sClassification, RTL_TEXTENCODING_ASCII_US).getStr(),
- sVisible,
- aLocation.X(),aLocation.Y(),
- aSize.Width(),aSize.Height());
+ SAL_INFO(
+ "sfx.sidebar",
+ sIndentation+strlen(sIndentation)-nIndentation*4 << pRoot << " "
+ << GetWindowClassification(pRoot) << " "
+ << (pRoot->IsVisible() ? "visible" : "hidden") << " +"
+ << aLocation.X() << "+" << aLocation.Y() << " x" << aSize.Width()
+ << "x" << aSize.Height());
const sal_uInt16 nChildCount (pRoot->GetChildCount());
for (sal_uInt16 nIndex=0; nIndex<nChildCount; ++nIndex)
diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx
index 59efda2..6e5d2b4 100644
--- a/slideshow/source/engine/eventqueue.cxx
+++ b/slideshow/source/engine/eventqueue.cxx
@@ -265,11 +265,11 @@ namespace slideshow
}
else
{
-#if OSL_DEBUG_LEVEL > 0
- VERBOSE_TRACE( "Ignoring discharged event: unknown (0x%X), timeout was: %f",
- event.pEvent.get(),
- event.pEvent->getActivationTime(0.0) );
-#endif
+ SAL_INFO(
+ "slideshow.eventqueue",
+ "Ignoring discharged event: unknown ("
+ << event.pEvent.get() << "), timeout was: "
+ << event.pEvent->getActivationTime(0.0));
}
}
}
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 13d47d6..95a0247 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -371,19 +371,23 @@ namespace slideshow
// safe cast, since order does not depend on mnSubsetQueriedCount
const_cast<SubsetEntry&>(*aIter).mnSubsetQueriedCount--;
- VERBOSE_TRACE( "Subset summary: shape 0x%X, %d open subsets, revoked subset has refcount %d",
- this,
- maSubsetShapes.size(),
- aIter->mnSubsetQueriedCount );
+ SAL_INFO(
+ "slideshow",
+ "Subset summary: shape " << this << ", "
+ << maSubsetShapes.size()
+ << " open subsets, revoked subset has refcount "
+ << aIter->mnSubsetQueriedCount);
return false; // not the last client
}
- VERBOSE_TRACE( "Subset summary: shape 0x%X, %d open subsets, cleared subset has range [%d,%d]",
- this,
- maSubsetShapes.size(),
- aEntry.mnStartActionIndex,
- aEntry.mnEndActionIndex );
+ SAL_INFO(
+ "slideshow",
+ "Subset summary: shape " << this << ", "
+ << maSubsetShapes.size()
+ << " open subsets, cleared subset has range ["
+ << aEntry.mnStartActionIndex << ","
+ << aEntry.mnEndActionIndex << "]");
// yes, remove from set
maSubsetShapes.erase( aIter );
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 9fc5cbc..f336920 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -44,7 +44,10 @@ public:
DbgStyleSheetReferences() : mnStyles(0), mnPools(0) {}
~DbgStyleSheetReferences()
{
- OSL_TRACE("DbgStyleSheetReferences\nSfxStyleSheetBase left %ld\nSfxStyleSheetBasePool left %ld", mnStyles, mnPools );
+ SAL_WARN_IF(
+ mnStyles != 0 || mnPools != 0, "svl.items",
+ "SfxStyleSheetBase left " << mnStyles
+ << "; SfxStyleSheetBasePool left " << mnPools);
}
sal_uInt32 mnStyles;
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 38478bb..642d434 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1123,7 +1123,7 @@ Rectangle EnhancedCustomShape2d::GetTextRect() const
aBottomRight.Y() = aLogicRect.GetHeight() - aBottomRight.Y();
}
Rectangle aRect( aTopLeft, aBottomRight );
- OSL_TRACE("EnhancedCustomShape2d::GetTextRect: %d x %d", aRect.GetWidth(), aRect.GetHeight());
+ SAL_INFO("svx", aRect.GetWidth() << " x " << aRect.GetHeight());
if( aRect.GetWidth() <= 1 || aRect.GetHeight() <= 1 )
return aLogicRect;
aRect.Move( aLogicRect.Left(), aLogicRect.Top() );
@@ -1481,7 +1481,10 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
if ( rSrcPt < nCoordSize )
{
const Point aTempPoint(GetPoint( seqCoordinates[ rSrcPt++ ], true, true ));
- OSL_TRACE("moveTo: %d,%d", aTempPoint.X(), aTempPoint.Y());
+ SAL_INFO(
+ "svx",
+ "moveTo: " << aTempPoint.X() << ","
+ << aTempPoint.Y());
aNewB2DPolygon.append(basegfx::B2DPoint(aTempPoint.X(), aTempPoint.Y()));
}
}
@@ -1717,7 +1720,10 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
for ( sal_Int32 i(0L); ( i < nPntCount ) && ( rSrcPt < nCoordSize ); i++ )
{
const Point aTempPoint(GetPoint( seqCoordinates[ rSrcPt++ ], true, true ));
- OSL_TRACE("lineTo: %d,%d", aTempPoint.X(), aTempPoint.Y());
+ SAL_INFO(
+ "svx",
+ "lineTo: " << aTempPoint.X() << ","
+ << aTempPoint.Y());
aNewB2DPolygon.append(basegfx::B2DPoint(aTempPoint.X(), aTempPoint.Y()));
}
}
@@ -1798,9 +1804,15 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
Point aEndPoint ( aStartPoint.getX() - fWR*(cos(fT) - cos(fTE)), aStartPoint.getY() - fHR*(sin(fT) - sin(fTE)) );
- OSL_TRACE("ARCANGLETO rect: %d, %d x %d, %d start: %d, %d end: %d, %d clockwise: %d",
- aRect.Left(), aRect.Top(), aRect.Right(), aRect.Bottom(),
- aStartPoint.X(), aStartPoint.Y(), aEndPoint.X(), aEndPoint.Y(), bClockwise);
+ SAL_INFO(
+ "svx",
+ "ARCANGLETO rect: " << aRect.Left() << ", "
+ << aRect.Top() << " x " << aRect.Right()
+ << ", " << aRect.Bottom() << " start: "
+ << aStartPoint.X() << ", "
+ << aStartPoint.Y() << " end: "
+ << aEndPoint.X() << ", " << aEndPoint.Y()
+ << " clockwise: " << int(bClockwise));
basegfx::B2DPolygon aArc = CreateArc( aRect, bClockwise ? aEndPoint : aStartPoint, bClockwise ? aStartPoint : aEndPoint, bClockwise, aStartPoint == aEndPoint && fSwingAngle > F_PI);
// Now that we have the arc, move it to aStartPointB2D.
basegfx::B2DHomMatrix aMatrix = basegfx::tools::createTranslateB2DHomMatrix(aStartPointB2D.getX(), aStartPointB2D.getY());
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index baef84a2..023dbcf 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -117,7 +117,8 @@ namespace svxform
++pSearch;
}
- OSL_FAIL("lcl_implMapAsciiValue: could not convert the ascii value " + _rAsciiValue + " !");
+ SAL_WARN(
+ "svx.form", "could not convert the ascii value " << _rAsciiValue);
return -1;
}
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 7cdbc20..5823a25 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1195,7 +1195,9 @@ OUString SdrView::GetStatusText()
{
if (aDragStat.IsMinMoved())
{
- OSL_TRACE("SdrView::GetStatusText(%lx) %lx", this, mpCurrentSdrDragMethod);
+ SAL_INFO(
+ "svx.svdraw",
+ "(" << this << ") " << mpCurrentSdrDragMethod);
mpCurrentSdrDragMethod->TakeSdrDragComment(aStr);
}
}
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index a166a7c..497e19c 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -473,7 +473,7 @@ Sttb::~Sttb()
bool Sttb::Read( SvStream& rS )
{
- OSL_TRACE("Sttb::Read() stream pos 0x%x", rS.Tell() );
+ SAL_INFO("sw.ww8", "stream pos " << rS.Tell());
nOffSet = rS.Tell();
rS.ReadUInt16( fExtend ).ReadUInt16( cData ).ReadUInt16( cbExtra );
if ( cData )
commit e37388c7de15242b7af0bf9fdc48c6d194d8cd94
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 13 10:48:44 2015 +0100
Remove unused debug code
Change-Id: I40d7e0670539a86f01a539cf8acb10fa7bd27079
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 9869b4c..20b6826 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -1326,30 +1326,6 @@ Sequence< Reference<XIdlMethod> > ImplIntrospectionAccess::getMethods(sal_Int32
sal_Int32 nConcept = pConcepts[ i ];
if( nConcept & MethodConcepts )
pDestMethods[ iDest++ ] = pSourceMethods[ i ];
-
- #if OSL_DEBUG_LEVEL > 0
- static bool debug = false;
- if ( debug )
- {
- // Methode mit Concepts ausgeben
- const Reference< XIdlMethod >& rxMethod = pSourceMethods[ i ];
- OString aNameStr = OUStringToOString( rxMethod->getName(), osl_getThreadTextEncoding() );
- OString ConceptStr;
- if( nConcept & MethodConcept::DANGEROUS )
- ConceptStr += "DANGEROUS |";
- if( nConcept & MethodConcept::PROPERTY )
- ConceptStr += "PROPERTY |";
- if( nConcept & MethodConcept::LISTENER )
- ConceptStr += "LISTENER |";
- if( nConcept & MethodConcept::ENUMERATION )
- ConceptStr += "ENUMERATION |";
- if( nConcept & MethodConcept::NAMECONTAINER )
- ConceptStr += "NAMECONTAINER |";
- if( nConcept & MethodConcept::INDEXCONTAINER )
- ConceptStr += "INDEXCONTAINER |";
- OSL_TRACE( "Method %ld: %s, Concepts = %s", i, aNameStr.getStr(), ConceptStr.getStr() );
- }
- #endif
}
// Auf die richtige Laenge bringen
commit fd8ee703c8322252ed2a4769efce6bfa067d2652
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 13 10:47:52 2015 +0100
Do not use arbitrary strings as format strings
Change-Id: I4fb4e7e6a5779801e135864781204a54250ce092
diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx
index cdbe081..c8ce86f 100644
--- a/include/tools/debug.hxx
+++ b/include/tools/debug.hxx
@@ -102,13 +102,13 @@ inline void DbgSetTestSolarMutex( DbgTestSolarMutexProc pProc )
}
#define DBG_ASSERTWARNING( sCon, aWarning ) \
- SAL_DETAIL_INFO_IF_FORMAT(!(sCon), "legacy.tools", aWarning)
+ SAL_DETAIL_INFO_IF_FORMAT(!(sCon), "legacy.tools", "%s", aWarning)
#define DBG_ASSERT( sCon, aError ) \
- SAL_DETAIL_WARN_IF_FORMAT(!(sCon), "legacy.tools", aError)
+ SAL_DETAIL_WARN_IF_FORMAT(!(sCon), "legacy.tools", "%s", aError)
#define DBG_WARNING( aWarning ) \
- SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", aWarning)
+ SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", "%s", aWarning)
#define DBG_TESTSOLARMUTEX() \
do \
commit abbe7d8219b48405f48d7cec22e5c4dcb4515451
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 13 10:43:39 2015 +0100
Presumably this is what was intended
...in 70af05cf740d3b4639f110489dc0e9e1e7571931 "Convert Calc page header/footer
content to Widget UI"
Change-Id: I327318b6fc45a2e63c6398d657e766ac9b471324
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index d01f01c..8ab4821 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -804,7 +804,7 @@ IMPL_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn )
if(pBtn!=NULL)
{
- OSL_ENSURE( true, pBtn->GetSelected());
+ SAL_WARN_IF(pBtn->GetSelected() == 0, "sc.ui", "nothing selected");
OString sSelectedId = pBtn->GetSelectedIdent();
if (sSelectedId == "title")
More information about the Libreoffice-commits
mailing list