[Libreoffice-commits] core.git: 5 commits - basctl/source cui/source include/sfx2 include/svl include/svx include/tools sfx2/source svl/source sw/source tools/source unotools/source vcl/source xmloff/source
Stephan Bergmann
sbergman at redhat.com
Fri Mar 28 09:33:02 PDT 2014
basctl/source/basicide/baside2.hxx | 2
cui/source/dialogs/showcols.cxx | 5
include/sfx2/viewfrm.hxx | 2
include/svl/cenumitm.hxx | 3
include/svl/itempool.hxx | 2
include/svl/macitem.hxx | 6
include/svx/galleryitem.hxx | 2
include/tools/debug.hxx | 111 ------
sfx2/source/appl/appmain.cxx | 8
sfx2/source/appl/childwin.cxx | 2
sfx2/source/appl/workwin.cxx | 2
sfx2/source/control/ctrlitem.cxx | 5
sfx2/source/control/objface.cxx | 4
sfx2/source/control/shell.cxx | 6
sfx2/source/doc/docfac.cxx | 6
sfx2/source/doc/docfilt.cxx | 4
sfx2/source/doc/frmdescr.cxx | 2
sfx2/source/doc/objxtor.cxx | 4
sfx2/source/doc/sfxbasemodel.cxx | 6
sfx2/source/inc/objshimp.hxx | 4
sfx2/source/menu/virtmenu.cxx | 2
sfx2/source/view/sfxbasecontroller.cxx | 4
sfx2/source/view/viewfac.cxx | 4
sfx2/source/view/viewfrm.cxx | 3
sfx2/source/view/viewsh.cxx | 3
svl/source/items/cenumitm.cxx | 18
svl/source/items/grabbagitem.cxx | 2
svl/source/items/macitem.cxx | 6
svl/source/items/slstitm.cxx | 6
sw/source/ui/misc/outline.cxx | 2
tools/source/debug/debug.cxx | 511 ----------------------------
tools/source/generic/poly2.cxx | 2
tools/source/stream/stream.cxx | 2
unotools/source/misc/sharedunocomponent.cxx | 13
unotools/source/streaming/streamwrap.cxx | 11
vcl/source/app/dbggui.cxx | 243 ++-----------
xmloff/source/core/xmlictxt.cxx | 5
37 files changed, 54 insertions(+), 969 deletions(-)
New commits:
commit 52595d98bfdd19df16031f024b8a0be79c0ca3f6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 28 17:10:57 2014 +0100
DbgOutTypef -> SAL_WARN
Change-Id: I837643b2c12bf70585dce128dad114cc65f7f0a1
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 50b74c5..ca41286 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -959,7 +959,8 @@ void DbgDialogTest( Window* pWindow )
if ( pChild->IsVisible() )
{
if ( aAccelBuf[cAccel] )
- DbgOutTypef( "Double mnemonic char: %c", cAccel );
+ SAL_WARN(
+ "vcl.app", "Double mnemonic char: " << cAccel);
else
aAccelBuf[cAccel] = true;
}
@@ -984,11 +985,10 @@ void DbgDialogTest( Window* pWindow )
pClass = "PushButton";
else
pClass = "Dontknow";
- if( !cAccel )
- DbgOutTypef(
- "%s should have a mnemonic char (~): %s",
- pClass,
- OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
+ SAL_WARN_IF(
+ !cAccel, "vcl.app",
+ pClass << " should have a mnemonic char (~): "
+ << aErrorText);
// check text width
int aWidth=0;
@@ -1006,29 +1006,25 @@ void DbgDialogTest( Window* pWindow )
break;
default: break;
}
- if( pChild->IsVisible() && pChild->GetSizePixel().Width() < aWidth )
- DbgOutTypef(
- "%s exceeds window width: %s",
- pClass,
- OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
+ SAL_WARN_IF(
+ pChild->IsVisible() && pChild->GetSizePixel().Width() < aWidth,
+ "vcl.app",
+ pClass << " exceeds window width: " << aErrorText);
}
}
- if ( pChild->GetType() == WINDOW_FIXEDLINE )
- {
- if ( pChild->GetSizePixel().Width() < pChild->GetTextWidth( aText ) )
- DbgOutTypef( "FixedLine exceeds window width: %s",
- OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
- }
+ SAL_WARN_IF(
+ (pChild->GetType() == WINDOW_FIXEDLINE
+ && pChild->GetSizePixel().Width() < pChild->GetTextWidth( aText )),
+ "vcl.app", "FixedLine exceeds window width: " << aErrorText);
if ( pChild->GetType() == WINDOW_FIXEDTEXT )
{
- if ( (pChild->GetSizePixel().Height() >= pChild->GetTextHeight()*2) &&
- !(pChild->GetStyle() & WB_WORDBREAK) )
- {
- DbgOutTypef( "FixedText greater than one line, but WordBreak is not set: %s",
- OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
- }
+ SAL_WARN_IF(
+ (pChild->GetSizePixel().Height() >= pChild->GetTextHeight()*2) && !(pChild->GetStyle() & WB_WORDBREAK),
+ "vcl.app",
+ "FixedText greater than one line, but WordBreak is not set: "
+ << aErrorText);
if ( pChild->IsVisible() )
{
@@ -1041,11 +1037,10 @@ void DbgDialogTest( Window* pWindow )
else
aWidth = pChild->GetTextWidth( aText );
- if ( pChild->GetSizePixel().Width() < aWidth && !(pChild->GetStyle() & WB_WORDBREAK) )
- {
- DbgOutTypef( "FixedText exceeds window width: %s",
- OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
- }
+ SAL_WARN_IF(
+ pChild->GetSizePixel().Width() < aWidth && !(pChild->GetStyle() & WB_WORDBREAK),
+ "vcl.app",
+ "FixedText exceeds window width: " << aErrorText);
}
if ( (i+1 < nChildCount) && !aText.isEmpty() )
@@ -1070,16 +1065,15 @@ void DbgDialogTest( Window* pWindow )
(pTempChild->GetType() == WINDOW_DATEBOX) ||
(pTempChild->GetType() == WINDOW_TIMEBOX) )
{
- if ( !cAccel )
- {
- DbgOutTypef( "Labels befor Fields (Edit,ListBox,...) should have a mnemonic char (~): %s",
- OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
- }
- if ( !pTempChild->IsEnabled() && pChild->IsEnabled() )
- {
- DbgOutTypef( "Labels befor Fields (Edit,ListBox,...) should be disabled, when the field is disabled: %s",
- OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
- }
+ SAL_WARN_IF(
+ !cAccel, "vcl.app",
+ "Labels befor Fields (Edit,ListBox,...) should have a mnemonic char (~): "
+ << aErrorText);
+ SAL_WARN_IF(
+ !pTempChild->IsEnabled() && pChild->IsEnabled(),
+ "vcl.app",
+ "Labels befor Fields (Edit,ListBox,...) should be disabled, when the field is disabled: "
+ << aErrorText);
}
}
}
@@ -1162,11 +1156,9 @@ void DbgDialogTest( Window* pWindow )
if ( pBox->GetMax() == Date( 31, 12, 9999 ) )
bMaxWarning = true;
}
- if ( bMaxWarning )
- {
- DbgOutTypef( "No Max-Value is set: %s",
- OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
- }
+ SAL_WARN_IF(
+ bMaxWarning, "vcl.app",
+ "No Max-Value is set: " << aErrorText);
if ( (pChild->GetType() == WINDOW_RADIOBUTTON) ||
(pChild->GetType() == WINDOW_CHECKBOX) ||
@@ -1202,22 +1194,21 @@ void DbgDialogTest( Window* pWindow )
if ( cAccel || (pChild->GetStyle() & WB_TABSTOP) ||
(pChild->GetType() == WINDOW_RADIOBUTTON) )
{
- if ( (aNewPos.X() <= aTabPos.X()) && (aNewPos.Y() <= aTabPos.Y()) )
- {
- DbgOutTypef( "Possible wrong childorder for dialogcontrol: %s",
- OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
- }
+ SAL_WARN_IF(
+ (aNewPos.X() <= aTabPos.X()) && (aNewPos.Y() <= aTabPos.Y()),
+ "vcl.app",
+ "Possible wrong childorder for dialogcontrol: "
+ << aErrorText);
aTabPos = aNewPos;
}
for ( sal_uInt16 j = 0; j < i; j++ )
{
- if ( ((pRectAry[j].Right() != 0) || (pRectAry[j].Bottom() != 0)) &&
- aChildRect.IsOver( pRectAry[j] ) )
- {
- DbgOutTypef( "Window overlaps with sibling window: %s",
- OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
- }
+ SAL_WARN_IF(
+ ((pRectAry[j].Right() != 0) || (pRectAry[j].Bottom() != 0)) && aChildRect.IsOver( pRectAry[j] ),
+ "vcl.app",
+ "Window overlaps with sibling window: "
+ << aErrorText);
}
pRectAry[i] = aChildRect;
}
commit f26b981aa29d80d9bc7530b4a0c777c0a869fa7c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 28 16:32:23 2014 +0100
Remove now unused DBG_CTOR etc. feature
Change-Id: Id5e3191ea1a505bd7d46af355edb99e184b5fcb1
diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx
index de606a1..2583d7f3 100644
--- a/include/tools/debug.hxx
+++ b/include/tools/debug.hxx
@@ -28,8 +28,7 @@
/** The facilities provided by this header are deprecated. True assertions
(that detect broken program logic) should use standard assert (which aborts
if an assertion fails, and is controlled by the standard NDEBUG macro).
- Logging of warnings (e.g., about malformed input) and traces (e.g., about
- steps taken while executing some protocol) should use the facilities
+ Logging of warnings (e.g., about malformed input) should use the facilities
provided by sal/log.hxx.
Because the assertion macro (DBG_ASSERT) has been used for
@@ -47,13 +46,6 @@ typedef void (*DbgTestSolarMutexProc)();
#define DBG_BUF_MAXLEN 16384
-#define DBG_TEST_XTOR (0x00000FFF)
-#define DBG_TEST_XTOR_THIS (0x00000001)
-#define DBG_TEST_XTOR_FUNC (0x00000002)
-#define DBG_TEST_XTOR_EXIT (0x00000004)
-#define DBG_TEST_XTOR_REPORT (0x00000008)
-#define DBG_TEST_XTOR_TRACE (0x00000010)
-
#define DBG_TEST_RESOURCE (0x02000000)
#define DBG_TEST_DIALOG (0x04000000)
#define DBG_TEST_BOLDAPPFONT (0x08000000)
@@ -76,7 +68,6 @@ struct DbgData
{
sal_uIntPtr nTestFlags;
bool bOverwrite;
- sal_uIntPtr nTraceOut;
sal_uIntPtr nErrorOut;
sal_Char aDebugName[260];
sal_Char aInclFilter[512];
@@ -99,7 +90,6 @@ struct DbgDataType
#define DBG_FUNC_SAVEDATA 5
#define DBG_FUNC_SETPRINTMSGBOX 6
#define DBG_FUNC_SETPRINTWINDOW 7
-#define DBG_FUNC_XTORINFO 10
#define DBG_FUNC_COREDUMP 12
#define DBG_FUNC_ALLERROROUT 13
#define DBG_FUNC_SETTESTSOLARMUTEX 14
@@ -146,7 +136,6 @@ typedef sal_uInt16 DbgChannelId;
the function for emitting the diagnostic messages
@return
a unique number for this channel, which can be used for ->DbgData::nErrorOut
- and ->DbgData::nTraceOut
@see DBG_OUT_USER_CHANNEL_0
(In theory, this function could replace the other hard-coded channels. Well, at least
@@ -205,11 +194,6 @@ inline sal_uIntPtr DbgIsBoldAppFont()
return sal_False;
}
-inline void DbgXtorInfo( sal_Char* pBuf )
-{
- DbgFunc( DBG_FUNC_XTORINFO, (void*)pBuf );
-}
-
inline void DbgCoreDump()
{
DbgFunc( DBG_FUNC_COREDUMP );
@@ -230,85 +214,12 @@ inline void DbgPrintFile( const sal_Char* pLine )
DbgFunc( DBG_FUNC_PRINTFILE, (void*)(sal_Char*)pLine );
}
-// Dbg output
-#define DBG_OUT_TRACE 1
-#define DBG_OUT_ERROR 2
-
TOOLS_DLLPUBLIC void DbgPrintShell(char const * message);
-TOOLS_DLLPUBLIC void DbgOutTypef( sal_uInt16 nOutType, const sal_Char* pFStr, ... );
-
-// Dbg test functions
-
-#define DBG_XTOR_CTOR 1
-#define DBG_XTOR_DTOR 2
-#define DBG_XTOR_CHKTHIS 3
-#define DBG_XTOR_CHKOBJ 4
-#define DBG_XTOR_DTOROBJ 0x8000
-
-TOOLS_DLLPUBLIC void DbgXtor( DbgDataType* pDbgData,
- sal_uInt16 nAction, const void* pThis, DbgUsr fDbgUsr );
-
-class DbgXtorObj
-{
-private:
- DbgDataType* pDbgData;
- const void* pThis;
- DbgUsr fDbgUsr;
- sal_uInt16 nAction;
-
-public:
- DbgXtorObj( DbgDataType* pData,
- sal_uInt16 nAct, const void* pThs, DbgUsr fUsr )
- {
- DbgXtor( pData, nAct, pThs, fUsr );
- pDbgData = pData;
- nAction = nAct;
- pThis = pThs;
- fDbgUsr = fUsr;
- }
-
- ~DbgXtorObj()
- {
- DbgXtor( pDbgData, nAction | DBG_XTOR_DTOROBJ,
- pThis, fDbgUsr );
- }
-};
-
-// (internally used) defines
-
-#define DBG_FUNC( aName ) DbgName_##aName()
-#define DBG_NAME( aName ) static DbgDataType aImpDbgData_##aName = { 0, #aName }; \
- DbgDataType* DBG_FUNC( aName ) { return &aImpDbgData_##aName; }
-#define DBG_NAMEEX_VISIBILITY( aName, vis ) vis DbgDataType* DBG_FUNC( aName );
-#define DBG_NAMEEX( aName ) DBG_NAMEEX_VISIBILITY( aName, )
-
-// (externally used) defines
+TOOLS_DLLPUBLIC void DbgOutTypef( const sal_Char* pFStr, ... );
#define DBG_DEBUGSTART() DbgDebugStart()
#define DBG_DEBUGEND() DbgDebugEnd()
-#define DBG_CTOR( aName, fTest ) \
- DbgXtorObj aDbgXtorObj( DBG_FUNC( aName ), \
- DBG_XTOR_CTOR, \
- (const void*)this, \
- fTest )
-
-#define DBG_DTOR( aName, fTest ) \
- DbgXtorObj aDbgXtorObj( DBG_FUNC( aName ), \
- DBG_XTOR_DTOR, \
- (const void*)this, \
- fTest )
-
-#define DBG_CHKTHIS( aName, fTest ) \
- DbgXtorObj aDbgXtorObj( DBG_FUNC( aName ), \
- DBG_XTOR_CHKTHIS, \
- (const void*)this, \
- fTest )
-
-#define DBG_CHKOBJ( pObj, aName, fTest ) \
- DbgXtor( DBG_FUNC( aName ), DBG_XTOR_CHKOBJ, \
- (const void*)pObj, (DbgUsr)fTest )
-
#define DBG_ASSERTWARNING( sCon, aWarning ) \
SAL_DETAIL_INFO_IF_FORMAT(!(sCon), "legacy.tools", aWarning)
@@ -327,14 +238,6 @@ do \
DbgTestSolarMutex(); \
} while(false)
-// en-/disable debug defines
-
-#define DBG_INSTOUTTRACE( nOut ) \
-do \
-{ \
- DbgGetData()->nTraceOut = nOut; \
-} while(false)
-
#define DBG_INSTOUTERROR( nOut ) \
do \
{ \
@@ -353,15 +256,6 @@ typedef const sal_Char* (*DbgUsr)(const void* pThis );
#define DBG_DEBUGSTART() ((void)0)
#define DBG_DEBUGEND() ((void)0)
-#define DBG_NAME( aName )
-#define DBG_NAMEEX( aName )
-#define DBG_NAMEEX_VISIBILITY( aName, vis )
-
-#define DBG_CTOR( aName, fTest ) ((void)0)
-#define DBG_DTOR( aName, fTest ) ((void)0)
-#define DBG_CHKTHIS( aName, fTest ) ((void)0)
-#define DBG_CHKOBJ( pObj, aName, fTest ) ((void)0)
-
#define DBG_ASSERTWARNING( sCon, aWarning ) ((void)0)
#define DBG_ASSERT( sCon, aError ) ((void)0)
#define DBG_WARNING( aWarning ) ((void)0)
@@ -369,7 +263,6 @@ typedef const sal_Char* (*DbgUsr)(const void* pThis );
#define DBG_TESTSOLARMUTEX() ((void)0)
-#define DBG_INSTOUTTRACE( nOut ) ((void)0)
#define DBG_INSTOUTERROR( nOut ) ((void)0)
#endif
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 0836459..6ef827f 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -47,54 +47,6 @@
#ifdef DBG_UTIL
-void DbgOutf( const sal_Char* pFStr, ... );
-
-// PointerList
-
-#define PBLOCKCOUNT 1024
-
-struct PBlock
-{
- void* aData[PBLOCKCOUNT];
- sal_uInt16 nCount;
- PBlock* pPrev;
- PBlock* pNext;
-};
-
-class PointerList
-{
-private:
- PBlock* pFirst;
- PBlock* pLast;
- sal_uIntPtr nCount;
-
-public:
- PointerList() { pFirst = NULL; pLast = NULL; nCount = 0; }
- ~PointerList();
-
- void Add( const void* p );
- bool Remove( const void* p );
-
- const void* Get( sal_uIntPtr nPos ) const;
- bool IsIn( const void* p ) const;
- sal_uIntPtr Count() const { return nCount; }
-};
-
-// data types
-
-#define DBG_MAXNAME 28
-
-struct XtorType
-{
- sal_uIntPtr nCtorCalls;
- sal_uIntPtr nDtorCalls;
- sal_uIntPtr nMaxCount;
- sal_uIntPtr nStatics;
- sal_Char aName[DBG_MAXNAME+1];
- bool bTest;
- PointerList aThisList;
-};
-
struct DebugData
{
DbgData aDbgData;
@@ -104,7 +56,6 @@ struct DebugData
DbgPrintLine pDbgAbort;
::std::vector< DbgPrintLine >
aDbgPrintUserChannels;
- PointerList* pXtorList;
DbgTestSolarMutexProc pDbgTestSolarMutex;
DebugData()
@@ -112,12 +63,10 @@ struct DebugData
,pDbgPrintMsgBox( NULL )
,pDbgPrintWindow( NULL )
,pDbgAbort( NULL )
- ,pXtorList( NULL )
,pDbgTestSolarMutex( NULL )
{
aDbgData.nTestFlags = DBG_TEST_RESOURCE;
aDbgData.bOverwrite = true;
- aDbgData.nTraceOut = DBG_OUT_NULL;
#ifdef UNX
aDbgData.nErrorOut = DBG_OUT_SHELL;
#else
@@ -132,11 +81,6 @@ struct DebugData
}
};
-#define DBG_TEST_XTOR_EXTRA (DBG_TEST_XTOR_THIS | DBG_TEST_XTOR_FUNC | \
- DBG_TEST_XTOR_EXIT | DBG_TEST_XTOR_REPORT )
-
-// static maintenance variables
-
static DebugData aDebugData;
static sal_Char aCurPath[260];
static bool bDbgImplInMain = false;
@@ -224,7 +168,6 @@ namespace
eOutput,
eMemory,
eGUI,
- eObjects,
eTest,
eUnknown
@@ -243,7 +186,6 @@ namespace
case eOutput : pSectionName = "output"; break;
case eMemory : pSectionName = "memory"; break;
case eGUI : pSectionName = "gui"; break;
- case eObjects : pSectionName = "objects"; break;
case eTest : pSectionName = "test"; break;
case eUnknown:
OSL_ASSERT(false);
@@ -260,8 +202,6 @@ namespace
return eMemory;
if ( strncmp( _pSectionName, "gui", _nSectionNameLength < 3 ? _nSectionNameLength : 3 ) == 0 )
return eGUI;
- if ( strncmp( _pSectionName, "objects", _nSectionNameLength < 7 ? _nSectionNameLength : 7 ) == 0 )
- return eObjects;
if ( strncmp( _pSectionName, "test", _nSectionNameLength < 4 ? _nSectionNameLength : 4 ) == 0 )
return eTest;
return eUnknown;
@@ -377,144 +317,6 @@ namespace
}
}
-PointerList::~PointerList()
-{
- PBlock* pBlock = pFirst;
- while ( pBlock )
- {
- PBlock* pNextBlock = pBlock->pNext;
- delete pBlock;
- pBlock = pNextBlock;
- }
-}
-
-void PointerList::Add( const void* p )
-{
- if ( !pFirst )
- {
- pFirst = new PBlock;
- memset( pFirst->aData, 0, PBLOCKCOUNT * sizeof( void* ) );
- pFirst->nCount = 0;
- pFirst->pPrev = NULL;
- pFirst->pNext = NULL;
- pLast = pFirst;
- }
-
- PBlock* pBlock = pFirst;
- while ( pBlock && (pBlock->nCount == PBLOCKCOUNT) )
- pBlock = pBlock->pNext;
-
- if ( !pBlock )
- {
- pBlock = new PBlock;
- memset( pBlock->aData, 0, PBLOCKCOUNT * sizeof( void* ) );
- pBlock->nCount = 0;
- pBlock->pPrev = pLast;
- pBlock->pNext = NULL;
- pLast->pNext = pBlock;
- pLast = pBlock;
- }
-
- sal_uInt16 i = 0;
- while ( pBlock->aData[i] )
- i++;
-
- pBlock->aData[i] = (void*)p;
- pBlock->nCount++;
- nCount++;
-}
-
-bool PointerList::Remove( const void* p )
-{
- if ( !p )
- return false;
-
- PBlock* pBlock = pFirst;
- while ( pBlock )
- {
- sal_uInt16 i = 0;
- while ( i < PBLOCKCOUNT )
- {
- if ( ((sal_uIntPtr)p) == ((sal_uIntPtr)pBlock->aData[i]) )
- {
- pBlock->aData[i] = NULL;
- pBlock->nCount--;
- nCount--;
-
- if ( !pBlock->nCount )
- {
- if ( pBlock->pPrev )
- pBlock->pPrev->pNext = pBlock->pNext;
- if ( pBlock->pNext )
- pBlock->pNext->pPrev = pBlock->pPrev;
- if ( pBlock == pFirst )
- pFirst = pBlock->pNext;
- if ( pBlock == pLast )
- pLast = pBlock->pPrev;
- delete pBlock;
- }
-
- return true;
- }
- i++;
- }
-
- pBlock = pBlock->pNext;
- }
-
- return false;
-}
-
-const void* PointerList::Get( sal_uIntPtr nPos ) const
-{
- if ( nCount <= nPos )
- return NULL;
-
- PBlock* pBlock = pFirst;
- sal_uIntPtr nStart = 0;
- while ( pBlock )
- {
- sal_uInt16 i = 0;
- while ( i < PBLOCKCOUNT )
- {
- if ( pBlock->aData[i] )
- {
- nStart++;
- if ( (nStart-1) == nPos )
- return pBlock->aData[i];
- }
-
- i++;
- }
-
- pBlock = pBlock->pNext;
- }
-
- return NULL;
-}
-
-bool PointerList::IsIn( const void* p ) const
-{
- if ( !p )
- return false;
-
- PBlock* pBlock = pFirst;
- while ( pBlock )
- {
- sal_uInt16 i = 0;
- while ( i < PBLOCKCOUNT )
- {
- if ( ((sal_uIntPtr)p) == ((sal_uIntPtr)pBlock->aData[i]) )
- return true;
- i++;
- }
-
- pBlock = pBlock->pNext;
- }
-
- return false;
-}
-
static void DbgGetDbgFileName( sal_Char* pStr, sal_Int32 nMaxLen )
{
#if defined( UNX )
@@ -589,7 +391,6 @@ static DebugData* GetDebugData()
lcl_tryReadConfigString( pLine, nLineLength, "exclude", aDebugData.aDbgData.aExclFilter, sizeof( aDebugData.aDbgData.aExclFilter ) );
lcl_tryReadConfigString( pLine, nLineLength, "include_class", aDebugData.aDbgData.aInclClassFilter, sizeof( aDebugData.aDbgData.aInclClassFilter ) );
lcl_tryReadConfigString( pLine, nLineLength, "exclude_class", aDebugData.aDbgData.aExclClassFilter, sizeof( aDebugData.aDbgData.aExclClassFilter ) );
- lcl_tryReadOutputChannel( pLine, nLineLength, "trace", &aDebugData.aDbgData.nTraceOut );
lcl_tryReadOutputChannel( pLine, nLineLength, "error", &aDebugData.aDbgData.nErrorOut );
}
@@ -599,16 +400,6 @@ static DebugData* GetDebugData()
lcl_tryReadConfigString( pLine, nLineLength, "debug_window_state", aDebugData.aDbgData.aDbgWinState, sizeof( aDebugData.aDbgData.aDbgWinState ) );
}
- // elements of the [objects] section
- if ( eCurrentSection == eObjects )
- {
- lcl_tryReadConfigFlag( pLine, nLineLength, "check_this", &aDebugData.aDbgData.nTestFlags, DBG_TEST_XTOR_THIS );
- lcl_tryReadConfigFlag( pLine, nLineLength, "check_function", &aDebugData.aDbgData.nTestFlags, DBG_TEST_XTOR_FUNC );
- lcl_tryReadConfigFlag( pLine, nLineLength, "check_exit", &aDebugData.aDbgData.nTestFlags, DBG_TEST_XTOR_EXIT );
- lcl_tryReadConfigFlag( pLine, nLineLength, "generate_report", &aDebugData.aDbgData.nTestFlags, DBG_TEST_XTOR_REPORT );
- lcl_tryReadConfigFlag( pLine, nLineLength, "trace", &aDebugData.aDbgData.nTestFlags, DBG_TEST_XTOR_TRACE );
- }
-
// elements of the [test] section
if ( eCurrentSection == eTest )
{
@@ -624,7 +415,6 @@ static DebugData* GetDebugData()
}
else
{
- lcl_matchOutputChannel( getenv( "DBGSV_TRACE_OUT" ), &aDebugData.aDbgData.nTraceOut );
lcl_matchOutputChannel( getenv( "DBGSV_ERROR_OUT" ), &aDebugData.aDbgData.nErrorOut );
}
@@ -634,10 +424,6 @@ static DebugData* GetDebugData()
{
OSL_TRACE( "getcwd failed with error %s", strerror(errno) );
}
-
- // initialize debug data
- if ( aDebugData.aDbgData.nTestFlags & DBG_TEST_XTOR )
- aDebugData.pXtorList = new PointerList;
}
return &aDebugData;
@@ -773,113 +559,18 @@ static void DebugInit()
static void DebugDeInit()
{
- DebugData* pData = GetDebugData();
- sal_uIntPtr i;
- sal_uIntPtr nCount;
- sal_uIntPtr nOldOut;
-
- // Output statistics trace data to file
- nOldOut = pData->aDbgData.nTraceOut;
- pData->aDbgData.nTraceOut = DBG_OUT_FILE;
-
- // output Xtor list
- if ( pData->pXtorList && pData->pXtorList->Count() &&
- (pData->aDbgData.nTestFlags & DBG_TEST_XTOR_REPORT) )
- {
- DbgOutf( "------------------------------------------------------------------------------" );
- DbgOutf( "Object Report" );
- DbgOutf( "------------------------------------------------------------------------------" );
- DbgOutf( "%-27s : %-9s : %-9s : %-7s : %-3s : %-6s :",
- "XTor-List", "Ctor", "Dtor", "MaxInst", "St.", "Diff." );
- DbgOutf( "----------------------------:-----------:-----------:---------:----:---------:" );
- for( i = 0, nCount = pData->pXtorList->Count(); i < nCount; i++ )
- {
- XtorType* pXtorData = (XtorType*)pData->pXtorList->Get( i );
- if ( pXtorData->bTest )
- {
- // Add static objects
- pXtorData->nDtorCalls += pXtorData->nStatics;
- if ( pXtorData->nStatics && (pXtorData->nDtorCalls > pXtorData->nCtorCalls) )
- pXtorData->nDtorCalls = pXtorData->nCtorCalls;
- DbgOutf( "%-27s : %9lu : %9lu : %7lu : %3lu : %4lu %-1s :",
- pXtorData->aName, pXtorData->nCtorCalls, pXtorData->nDtorCalls,
- pXtorData->nMaxCount, pXtorData->nStatics,
- pXtorData->nCtorCalls - pXtorData->nDtorCalls,
- (pXtorData->nCtorCalls - pXtorData->nDtorCalls) ? "!" : " " );
- }
- }
- DbgOutf( "==============================================================================" );
- }
-
- // free XtorList
- if ( pData->pXtorList )
- {
- for( i = 0, nCount = pData->pXtorList->Count(); i < nCount; i++ )
- {
- XtorType* pXtorData = (XtorType*)pData->pXtorList->Get( i );
- delete pXtorData;
- }
- delete pData->pXtorList;
- pData->pXtorList = NULL;
- }
-
// Set everything to false, as global variables
// may cause a system crash otherwise.
// Maintain memory flags, as otherwise new/delete calls
// for global variables will crash,
// as pointer alignment won't work then.
- pData->aDbgData.nTraceOut = nOldOut;
+ DebugData* pData = GetDebugData();
pData->aDbgData.nTestFlags = 0;
pData->aDbgPrintUserChannels.clear();
pData->pDbgPrintWindow = NULL;
ImplDbgDeInitLock();
}
-void ImpDbgOutfBuf( sal_Char* pBuf, const sal_Char* pFStr, ... )
-{
- va_list pList;
-
- va_start( pList, pFStr );
- sal_Char aBuf[DBG_BUF_MAXLEN];
- vsprintf( aBuf, pFStr, pList );
- va_end( pList );
-
- strcat( pBuf, aBuf );
- strcat( pBuf, "\n" );
-}
-
-static void DebugXTorInfo( sal_Char* pBuf )
-{
- DebugData* pData = GetDebugData();
- sal_uIntPtr i;
- sal_uIntPtr nCount;
-
- // output Xtor list
- if ( pData->pXtorList && pData->pXtorList->Count() &&
- (pData->aDbgData.nTestFlags & DBG_TEST_XTOR_REPORT) )
- {
- ImpDbgOutfBuf( pBuf, "------------------------------------------------------------------------------" );
- ImpDbgOutfBuf( pBuf, "Object Report" );
- ImpDbgOutfBuf( pBuf, "------------------------------------------------------------------------------" );
- ImpDbgOutfBuf( pBuf, "%-27s : %-9s : %-9s : %-7s : %-3s : %-6s :",
- "XTor-List", "Ctor", "Dtor", "MaxInst", "St.", "Diff." );
- ImpDbgOutfBuf( pBuf, "----------------------------:-----------:-----------:---------:----:---------:" );
- for( i = 0, nCount = pData->pXtorList->Count(); i < nCount; i++ )
- {
- XtorType* pXtorData = (XtorType*)pData->pXtorList->Get( i );
- if ( pXtorData->bTest )
- {
- ImpDbgOutfBuf( pBuf, "%-27s : %9lu : %9lu : %7lu : %3lu : %6lu :",
- pXtorData->aName, pXtorData->nCtorCalls, pXtorData->nDtorCalls,
- pXtorData->nMaxCount, pXtorData->nStatics,
- pXtorData->nCtorCalls - pXtorData->nDtorCalls );
- }
- }
- ImpDbgOutfBuf( pBuf, "==============================================================================" );
- ImpDbgOutfBuf( pBuf, "" );
- }
-}
-
bool ImplDbgFilterMessage( const sal_Char* pMsg )
{
DebugData* pData = GetDebugData();
@@ -937,7 +628,6 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam )
lcl_writeConfigString( pIniFile, "exclude", pData->aExclFilter );
lcl_writeConfigString( pIniFile, "include_class", pData->aInclClassFilter );
lcl_writeConfigString( pIniFile, "exclude_class", pData->aExclClassFilter );
- lcl_writeConfigOutChannel( pIniFile, "trace", pData->nTraceOut );
lcl_writeConfigOutChannel( pIniFile, "error", pData->nErrorOut );
lcl_lineFeed( pIniFile );
@@ -945,14 +635,6 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam )
lcl_writeConfigString( pIniFile, "debug_window_state", pData->aDbgWinState );
lcl_lineFeed( pIniFile );
- lcl_startSection( pIniFile, eObjects );
- lcl_writeConfigFlag( pIniFile, "check_this", pData->nTestFlags, DBG_TEST_XTOR_THIS );
- lcl_writeConfigFlag( pIniFile, "check_function", pData->nTestFlags, DBG_TEST_XTOR_FUNC );
- lcl_writeConfigFlag( pIniFile, "check_exit", pData->nTestFlags, DBG_TEST_XTOR_EXIT );
- lcl_writeConfigFlag( pIniFile, "generate_report", pData->nTestFlags, DBG_TEST_XTOR_REPORT );
- lcl_writeConfigFlag( pIniFile, "trace", pData->nTestFlags, DBG_TEST_XTOR_TRACE );
-
- lcl_lineFeed( pIniFile );
lcl_startSection( pIniFile, eTest );
lcl_writeConfigFlag( pIniFile, "resources", pData->nTestFlags, DBG_TEST_RESOURCE );
lcl_writeConfigFlag( pIniFile, "dialog", pData->nTestFlags, DBG_TEST_DIALOG );
@@ -962,10 +644,6 @@ void* DbgFunc( sal_uInt16 nAction, void* pParam )
}
break;
- case DBG_FUNC_XTORINFO:
- DebugXTorInfo( (sal_Char*)pParam );
- break;
-
case DBG_FUNC_COREDUMP:
ImplCoreDump();
break;
@@ -1001,160 +679,7 @@ DbgChannelId DbgRegisterUserChannel( DbgPrintLine pProc )
return (DbgChannelId)( pData->aDbgPrintUserChannels.size() - 1 + DBG_OUT_USER_CHANNEL_0 );
}
-void DbgXtor( DbgDataType* pDbgData, sal_uInt16 nAction, const void* pThis,
- DbgUsr fDbgUsr )
-{
- DebugData* pData = ImplGetDebugData();
-
- // quick test
- if ( !(pData->aDbgData.nTestFlags & DBG_TEST_XTOR) )
- return;
-
- XtorType* pXtorData = (XtorType*)pDbgData->pData;
- if ( !pXtorData )
- {
- pDbgData->pData = (void*)new XtorType;
- pXtorData = (XtorType*)pDbgData->pData;
- strncpy( pXtorData->aName, pDbgData->pName, DBG_MAXNAME );
- pXtorData->aName[DBG_MAXNAME] = '\0';
- pXtorData->nCtorCalls = 0;
- pXtorData->nDtorCalls = 0;
- pXtorData->nMaxCount = 0;
- pXtorData->nStatics = 0;
- pXtorData->bTest = true;
- pData->pXtorList->Add( (void*)pXtorData );
-
- if ( !ImplDbgFilter( pData->aDbgData.aInclClassFilter, pXtorData->aName, true ) )
- pXtorData->bTest = false;
- if ( ImplDbgFilter( pData->aDbgData.aExclClassFilter, pXtorData->aName, false ) )
- pXtorData->bTest = false;
- }
- if ( !pXtorData->bTest )
- return;
-
- sal_uInt16 nAct = nAction & ~DBG_XTOR_DTOROBJ;
-
- SAL_INFO_IF(
- ((pData->aDbgData.nTestFlags & DBG_TEST_XTOR_TRACE)
- && !(nAction & DBG_XTOR_DTOROBJ) && nAct != DBG_XTOR_CHKOBJ),
- "tools.debug",
- (nAct == DBG_XTOR_CTOR ? "Enter Ctor from class "
- : nAct == DBG_XTOR_DTOR ? "Enter Dtor from class "
- : "Enter method from class ") << pDbgData->pName);
-
- // If some Xtor-tests are still tracing
- if ( pData->aDbgData.nTestFlags & DBG_TEST_XTOR_EXTRA )
- {
- // call DBG_CTOR before all other DBG_XTOR calls
- if ( ((nAction & ~DBG_XTOR_DTOROBJ) != DBG_XTOR_CTOR) && !pDbgData->pData )
- {
- SAL_WARN(
- "tools.debug",
- "DBG_DTOR() or DBG_CHKTHIS() without DBG_CTOR(): "
- << pDbgData->pName);
- return;
- }
-
- // Test if the pointer is still valid
- if ( pData->aDbgData.nTestFlags & DBG_TEST_XTOR_THIS )
- {
- if ( (pData->aDbgData.nTestFlags & DBG_TEST_XTOR_EXIT) ||
- !(nAction & DBG_XTOR_DTOROBJ) )
- {
- // This-Pointer == NULL
- if ( !pThis )
- {
- SAL_WARN(
- "tools.debug",
- "this == NULL in class " << pDbgData->pName);
- return;
- }
-
- if ( (nAction & ~DBG_XTOR_DTOROBJ) != DBG_XTOR_CTOR )
- {
- SAL_WARN_IF(
- !pXtorData->aThisList.IsIn(pThis), "tools.debug",
- "invalid this-Pointer %p in class " << pDbgData->pName);
- }
- }
- }
-
- // execute function test and update maintenance data
- const sal_Char* pMsg = NULL;
- switch ( nAction & ~DBG_XTOR_DTOROBJ )
- {
- case DBG_XTOR_CTOR:
- if ( nAction & DBG_XTOR_DTOROBJ )
- {
- if ( fDbgUsr &&
- (pData->aDbgData.nTestFlags & DBG_TEST_XTOR_EXIT) &&
- (pData->aDbgData.nTestFlags & DBG_TEST_XTOR_FUNC) )
- pMsg = fDbgUsr( pThis );
- }
- else
- {
- pXtorData->nCtorCalls++;
- if ( !bDbgImplInMain )
- pXtorData->nStatics++;
- if ( (pXtorData->nCtorCalls-pXtorData->nDtorCalls) > pXtorData->nMaxCount )
- pXtorData->nMaxCount = pXtorData->nCtorCalls - pXtorData->nDtorCalls;
-
- if ( pData->aDbgData.nTestFlags & DBG_TEST_XTOR_THIS )
- pXtorData->aThisList.Add( pThis );
- }
- break;
-
- case DBG_XTOR_DTOR:
- if ( nAction & DBG_XTOR_DTOROBJ )
- {
- pXtorData->nDtorCalls++;
- if ( pData->aDbgData.nTestFlags & DBG_TEST_XTOR_THIS )
- pXtorData->aThisList.Remove( pThis );
- }
- else
- {
- if ( fDbgUsr &&
- (pData->aDbgData.nTestFlags & DBG_TEST_XTOR_FUNC) )
- pMsg = fDbgUsr( pThis );
- }
- break;
-
- case DBG_XTOR_CHKTHIS:
- case DBG_XTOR_CHKOBJ:
- if ( nAction & DBG_XTOR_DTOROBJ )
- {
- if ( fDbgUsr &&
- (pData->aDbgData.nTestFlags & DBG_TEST_XTOR_EXIT) &&
- (pData->aDbgData.nTestFlags & DBG_TEST_XTOR_FUNC) )
- pMsg = fDbgUsr( pThis );
- }
- else
- {
- if ( fDbgUsr &&
- (pData->aDbgData.nTestFlags & DBG_TEST_XTOR_FUNC) )
- pMsg = fDbgUsr( pThis );
- }
- break;
- }
-
- SAL_WARN_IF(
- pMsg, "tools.debug",
- "Error-Msg from Object " << pThis << " in class "
- << pDbgData->pName << ": " << pMsg);
- }
-
- SAL_INFO_IF(
- ((pData->aDbgData.nTestFlags & DBG_TEST_XTOR_TRACE)
- && (nAction & DBG_XTOR_DTOROBJ) && nAct != DBG_XTOR_CHKOBJ),
- "tools.debug",
- (nAct == DBG_XTOR_CTOR
- ? "Leave Ctor from class "
- : nAct == DBG_XTOR_DTOR
- ? "Leave Dtor from class "
- : "Leave method from class ") << pDbgData->pName);
-}
-
-void DbgOut( const sal_Char* pMsg, sal_uInt16 nDbgOut )
+void DbgOut( const sal_Char* pMsg )
{
static bool bIn = false;
if ( bIn )
@@ -1166,16 +691,8 @@ void DbgOut( const sal_Char* pMsg, sal_uInt16 nDbgOut )
sal_uIntPtr nOut;
int nBufLen = 0;
- if ( nDbgOut == DBG_OUT_ERROR )
- {
- nOut = pData->aDbgData.nErrorOut;
- pStr = "Error: ";
- }
- else
- {
- nOut = pData->aDbgData.nTraceOut;
- pStr = NULL;
- }
+ nOut = pData->aDbgData.nErrorOut;
+ pStr = "Error: ";
if ( nOut == DBG_OUT_NULL )
{
@@ -1275,7 +792,7 @@ void DbgPrintShell(char const * message) {
#endif
}
-void DbgOutTypef( sal_uInt16 nDbgOut, const sal_Char* pFStr, ... )
+void DbgOutTypef( const sal_Char* pFStr, ... )
{
va_list pList;
@@ -1284,28 +801,14 @@ void DbgOutTypef( sal_uInt16 nDbgOut, const sal_Char* pFStr, ... )
vsprintf( aBuf, pFStr, pList );
va_end( pList );
- DbgOut( aBuf, nDbgOut );
-}
-
-void DbgOutf( const sal_Char* pFStr, ... )
-{
- va_list pList;
-
- va_start( pList, pFStr );
- sal_Char aBuf[DBG_BUF_MAXLEN];
- vsprintf( aBuf, pFStr, pList );
- va_end( pList );
-
- DbgOut( aBuf, DBG_OUT_TRACE );
+ DbgOut( aBuf );
}
#else
void* DbgFunc( sal_uInt16, void* ) { return NULL; }
-void DbgXtor( DbgDataType*, sal_uInt16, const void*, DbgUsr ) {}
-
-void DbgOutTypef( sal_uInt16, const sal_Char*, ... ) {}
+void DbgOutTypef( const sal_Char*, ... ) {}
#endif
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 88489ef..50b74c5 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -100,13 +100,6 @@ static const sal_Char* pDbgHelpText[] =
"sufficient for other systems or other system settings. With very narrow "
"fonts the dialogs are made wider because they otherwise appear too narrow.\n",
"\n",
-"Trace output\n",
-"DBG_TRACE() can be use to produce TRACE output. DBG_TRACEFILE() also outputs "
-"the file and line number where the macro is located. DBG_TRACE1() to "
-"DBG_TRACE5() can be used to produce formatted output (printf format string) "
-"Trace output is enabled when the corresponding option is selected in the "
-"dropdown list.\n"
-"\n",
"Warnings\n",
"DBG_WARNING() can be used to output warnings. DBG_WARNING1() to "
"DBG_WARNING3() can be used to produce formatted output (printf format string). "
@@ -356,13 +349,6 @@ public:
class DbgDialog : public ModalDialog
{
private:
- CheckBox maXtorThis;
- CheckBox maXtorFunc;
- CheckBox maXtorExit;
- CheckBox maXtorReport;
- CheckBox maXtorTrace;
- GroupBox maBox1;
-
CheckBox maRes;
CheckBox maDialog;
CheckBox maBoldAppFont;
@@ -378,15 +364,12 @@ private:
Edit maInclFilter;
FixedText maExclText;
Edit maExclFilter;
- FixedText maTraceText;
- ListBox maTraceBox;
FixedText maErrorText;
ListBox maErrorBox;
GroupBox maBox4;
OKButton maOKButton;
CancelButton maCancelButton;
- PushButton maInfoButton;
HelpButton maHelpButton;
sal_uInt16 mnErrorOff;
@@ -397,7 +380,6 @@ public:
void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
};
-static sal_Char aDbgInfoBuf[12288];
static sal_Char aDbgOutBuf[DBG_BUF_MAXLEN];
DbgWindow::DbgWindow() :
@@ -540,12 +522,6 @@ void DbgWindow::InsertLine( const OUString& rLine )
DbgDialog::DbgDialog() :
ModalDialog( NULL, WB_STDMODAL | WB_SYSTEMWINDOW ),
- maXtorThis( this ),
- maXtorFunc( this ),
- maXtorExit( this ),
- maXtorReport( this ),
- maXtorTrace( this ),
- maBox1( this ),
maRes( this ),
maDialog( this ),
maBoldAppFont( this ),
@@ -560,14 +536,11 @@ DbgDialog::DbgDialog() :
maInclFilter( this ),
maExclText( this ),
maExclFilter( this ),
- maTraceText( this ),
- maTraceBox( this, WB_DROPDOWN ),
maErrorText( this ),
maErrorBox( this, WB_DROPDOWN ),
maBox4( this ),
maOKButton( this, WB_DEFBUTTON ),
maCancelButton( this ),
- maInfoButton( this ),
maHelpButton( this )
{
DbgData* pData = DbgGetData();
@@ -575,58 +548,6 @@ DbgDialog::DbgDialog() :
Size aButtonSize = LogicToPixel( Size( 60, 12 ), aAppMap );
{
- maXtorThis.Show();
- maXtorThis.SetText("T~his");
- if ( pData->nTestFlags & DBG_TEST_XTOR_THIS )
- maXtorThis.Check( true );
- maXtorThis.SetPosSizePixel( LogicToPixel( Point( 10, 15 ), aAppMap ),
- aButtonSize );
- }
-
- {
- maXtorFunc.Show();
- maXtorFunc.SetText("~Function");
- if ( pData->nTestFlags & DBG_TEST_XTOR_FUNC )
- maXtorFunc.Check( true );
- maXtorFunc.SetPosSizePixel( LogicToPixel( Point( 75, 15 ), aAppMap ),
- aButtonSize );
- }
-
- {
- maXtorExit.Show();
- maXtorExit.SetText("E~xit");
- if ( pData->nTestFlags & DBG_TEST_XTOR_EXIT )
- maXtorExit.Check( true );
- maXtorExit.SetPosSizePixel( LogicToPixel( Point( 140, 15 ), aAppMap ),
- aButtonSize );
- }
-
- {
- maXtorReport.Show();
- maXtorReport.SetText("~Report");
- if ( pData->nTestFlags & DBG_TEST_XTOR_REPORT )
- maXtorReport.Check( true );
- maXtorReport.SetPosSizePixel( LogicToPixel( Point( 205, 15 ), aAppMap ),
- aButtonSize );
- }
-
- {
- maXtorTrace.Show();
- maXtorTrace.SetText("~Trace");
- if ( pData->nTestFlags & DBG_TEST_XTOR_TRACE )
- maXtorTrace.Check( true );
- maXtorTrace.SetPosSizePixel( LogicToPixel( Point( 270, 15 ), aAppMap ),
- aButtonSize );
- }
-
- {
- maBox1.Show();
- maBox1.SetText("Object Tests");
- maBox1.SetPosSizePixel( LogicToPixel( Point( 5, 5 ), aAppMap ),
- LogicToPixel( Size( 330, 30 ), aAppMap ) );
- }
-
- {
maRes.Show();
maRes.SetText("~Resourcen");
if ( pData->nTestFlags & DBG_TEST_RESOURCE )
@@ -739,29 +660,6 @@ DbgDialog::DbgDialog() :
}
{
- maTraceText.Show();
- maTraceText.SetText("~Trace");
- maTraceText.SetPosSizePixel( LogicToPixel( Point( 10, 210 ), aAppMap ),
- LogicToPixel( Size( 95, 9 ), aAppMap ) );
- }
-
- {
- maTraceBox.InsertEntry(OUString("None"));
- maTraceBox.InsertEntry(OUString("File"));
- maTraceBox.InsertEntry(OUString("Window"));
- maTraceBox.InsertEntry(OUString("Shell"));
- maTraceBox.InsertEntry(OUString("MessageBox"));
- maTraceBox.InsertEntry(OUString("TestTool"));
- maTraceBox.InsertEntry(OUString("Debugger"));
- maTraceBox.InsertEntry(OUString("Abort"));
- ImplAppendUserDefinedChannels( maTraceBox );
- ImplSelectChannel( maTraceBox, pData->nTraceOut, 0 );
- maTraceBox.Show();
- maTraceBox.SetPosSizePixel( LogicToPixel( Point( 10, 220 ), aAppMap ),
- LogicToPixel( Size( 95, 80 ), aAppMap ) );
- }
-
- {
maErrorText.Show();
maErrorText.SetText("~Error");
maErrorText.SetPosSizePixel( LogicToPixel( Point( 220, 210 ), aAppMap ),
@@ -809,13 +707,6 @@ DbgDialog::DbgDialog() :
LogicToPixel( Size( 50, 15 ), aAppMap ) );
}
{
- maInfoButton.Show();
- maInfoButton.SetClickHdl( LINK( this, DbgDialog, ClickHdl ) );
- maInfoButton.SetText("~Info...");
- maInfoButton.SetPosSizePixel( LogicToPixel( Point( 130, 260 ), aAppMap ),
- LogicToPixel( Size( 50, 15 ), aAppMap ) );
- }
- {
maHelpButton.Show();
maHelpButton.SetPosSizePixel( LogicToPixel( Point( 190, 260 ), aAppMap ),
LogicToPixel( Size( 50, 15 ), aAppMap ) );
@@ -836,7 +727,6 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
memcpy( &aData, DbgGetData(), sizeof( DbgData ) );
aData.nTestFlags = 0;
- aData.nTraceOut = ImplGetChannelId( maTraceBox, 0 );
aData.nErrorOut = ImplGetChannelId( maErrorBox, mnErrorOff );
strncpy( aData.aDebugName, OUStringToOString(maDebugName.GetText(), RTL_TEXTENCODING_UTF8).getStr(), sizeof( aData.aDebugName ) );
@@ -852,21 +742,6 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
aData.bOverwrite = maOverwrite.IsChecked() ? true : false;
- if ( maXtorThis.IsChecked() )
- aData.nTestFlags |= DBG_TEST_XTOR_THIS;
-
- if ( maXtorFunc.IsChecked() )
- aData.nTestFlags |= DBG_TEST_XTOR_FUNC;
-
- if ( maXtorExit.IsChecked() )
- aData.nTestFlags |= DBG_TEST_XTOR_EXIT;
-
- if ( maXtorReport.IsChecked() )
- aData.nTestFlags |= DBG_TEST_XTOR_REPORT;
-
- if ( maXtorTrace.IsChecked() )
- aData.nTestFlags |= DBG_TEST_XTOR_TRACE;
-
if ( maRes.IsChecked() )
aData.nTestFlags |= DBG_TEST_RESOURCE;
@@ -880,7 +755,6 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
DbgSaveData( aData );
// Umschalten der Laufzeitwerte
- DBG_INSTOUTTRACE( aData.nTraceOut );
DBG_INSTOUTERROR( aData.nErrorOut );
DbgData* pData = DbgGetData();
@@ -914,16 +788,6 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
}
EndDialog( RET_OK );
}
- else if ( pButton == &maInfoButton )
- {
- DbgInfoDialog aInfoDialog( this );
- aDbgInfoBuf[0] = '\0';
- DbgXtorInfo( aDbgInfoBuf );
- OUString aInfoText( aDbgInfoBuf, strlen(aDbgInfoBuf), RTL_TEXTENCODING_UTF8 );
- aInfoDialog.SetText( "Debug InfoReport" );
- aInfoDialog.SetInfoText( aInfoText );
- aInfoDialog.Execute();
- }
return 0;
}
@@ -1095,7 +959,7 @@ void DbgDialogTest( Window* pWindow )
if ( pChild->IsVisible() )
{
if ( aAccelBuf[cAccel] )
- DbgOutTypef( DBG_OUT_ERROR, "Double mnemonic char: %c", cAccel );
+ DbgOutTypef( "Double mnemonic char: %c", cAccel );
else
aAccelBuf[cAccel] = true;
}
@@ -1121,7 +985,7 @@ void DbgDialogTest( Window* pWindow )
else
pClass = "Dontknow";
if( !cAccel )
- DbgOutTypef( DBG_OUT_ERROR,
+ DbgOutTypef(
"%s should have a mnemonic char (~): %s",
pClass,
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
@@ -1143,7 +1007,7 @@ void DbgDialogTest( Window* pWindow )
default: break;
}
if( pChild->IsVisible() && pChild->GetSizePixel().Width() < aWidth )
- DbgOutTypef( DBG_OUT_ERROR,
+ DbgOutTypef(
"%s exceeds window width: %s",
pClass,
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
@@ -1153,8 +1017,7 @@ void DbgDialogTest( Window* pWindow )
if ( pChild->GetType() == WINDOW_FIXEDLINE )
{
if ( pChild->GetSizePixel().Width() < pChild->GetTextWidth( aText ) )
- DbgOutTypef( DBG_OUT_ERROR,
- "FixedLine exceeds window width: %s",
+ DbgOutTypef( "FixedLine exceeds window width: %s",
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
@@ -1163,8 +1026,7 @@ void DbgDialogTest( Window* pWindow )
if ( (pChild->GetSizePixel().Height() >= pChild->GetTextHeight()*2) &&
!(pChild->GetStyle() & WB_WORDBREAK) )
{
- DbgOutTypef( DBG_OUT_ERROR,
- "FixedText greater than one line, but WordBreak is not set: %s",
+ DbgOutTypef( "FixedText greater than one line, but WordBreak is not set: %s",
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
@@ -1181,8 +1043,7 @@ void DbgDialogTest( Window* pWindow )
if ( pChild->GetSizePixel().Width() < aWidth && !(pChild->GetStyle() & WB_WORDBREAK) )
{
- DbgOutTypef( DBG_OUT_ERROR,
- "FixedText exceeds window width: %s",
+ DbgOutTypef( "FixedText exceeds window width: %s",
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
}
@@ -1211,14 +1072,12 @@ void DbgDialogTest( Window* pWindow )
{
if ( !cAccel )
{
- DbgOutTypef( DBG_OUT_ERROR,
- "Labels befor Fields (Edit,ListBox,...) should have a mnemonic char (~): %s",
+ DbgOutTypef( "Labels befor Fields (Edit,ListBox,...) should have a mnemonic char (~): %s",
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
if ( !pTempChild->IsEnabled() && pChild->IsEnabled() )
{
- DbgOutTypef( DBG_OUT_ERROR,
- "Labels befor Fields (Edit,ListBox,...) should be disabled, when the field is disabled: %s",
+ DbgOutTypef( "Labels befor Fields (Edit,ListBox,...) should be disabled, when the field is disabled: %s",
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
}
@@ -1305,8 +1164,7 @@ void DbgDialogTest( Window* pWindow )
}
if ( bMaxWarning )
{
- DbgOutTypef( DBG_OUT_ERROR,
- "No Max-Value is set: %s",
+ DbgOutTypef( "No Max-Value is set: %s",
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
@@ -1346,8 +1204,7 @@ void DbgDialogTest( Window* pWindow )
{
if ( (aNewPos.X() <= aTabPos.X()) && (aNewPos.Y() <= aTabPos.Y()) )
{
- DbgOutTypef( DBG_OUT_ERROR,
- "Possible wrong childorder for dialogcontrol: %s",
+ DbgOutTypef( "Possible wrong childorder for dialogcontrol: %s",
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
aTabPos = aNewPos;
@@ -1358,8 +1215,7 @@ void DbgDialogTest( Window* pWindow )
if ( ((pRectAry[j].Right() != 0) || (pRectAry[j].Bottom() != 0)) &&
aChildRect.IsOver( pRectAry[j] ) )
{
- DbgOutTypef( DBG_OUT_ERROR,
- "Window overlaps with sibling window: %s",
+ DbgOutTypef( "Window overlaps with sibling window: %s",
OUStringToOString(aErrorText, RTL_TEXTENCODING_UTF8).getStr() );
}
}
commit 6ef2df7b9b415eef034c6e5c42e8ac63d1e0a0bd
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 28 16:26:58 2014 +0100
Remove remaining DBG_NAME* uses
...that had been used for DBG_CTOR, DBG_PROF, etc.
Change-Id: I8eac38e24b7110511feb7813aaf5a20ab82bdbe0
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index eba6ded..f4cf468 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -71,8 +71,6 @@ class ObjectCatalog;
class CodeCompleteListBox;
class CodeCompleteWindow;
-DBG_NAMEEX( ModulWindow )
-
// #108672 Helper functions to get/set text in TextEngine
// using the stream interface (get/setText() only supports
// tools Strings limited to 64K).
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 6e39fef..73b781b 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -29,11 +29,6 @@
#define CUIFM_PROP_HIDDEN "Hidden"
#define CUIFM_PROP_LABEL "Label"
-
-// FmShowColsDialog
-
-DBG_NAME(FmShowColsDialog)
-
FmShowColsDialog::FmShowColsDialog(Window* pParent)
: ModalDialog(pParent, "ShowColDialog", "cui/ui/showcoldialog.ui")
{
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 9c678f4..289d11b 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -62,8 +62,6 @@ namespace svtools
SV_DECL_REF(SfxObjectShell)
#endif
-
-DBG_NAMEEX(SfxViewFrame)
class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener
{
struct SfxViewFrame_Impl* pImp;
diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index 6d41420..9c22491 100644
--- a/include/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
@@ -24,9 +24,6 @@
#include <tools/debug.hxx>
#include <svl/poolitem.hxx>
-
-DBG_NAMEEX(SfxEnumItemInterface)
-
class SVL_DLLPUBLIC SfxEnumItemInterface: public SfxPoolItem
{
protected:
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 9a44d5a..0f7e08d 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -33,8 +33,6 @@ struct SfxItemPool_Impl;
#define SFX_WHICH_MAX 4999
-DBG_NAMEEX(SfxItemPool)
-
#define SFX_ITEM_POOLABLE 0x0001
#define SFX_ITEM_NOT_POOLABLE 0x0002
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index 9b3d7ee..c0a4dda 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -34,12 +34,6 @@ class SvStream;
#define SVX_MACRO_LANGUAGE_STARBASIC "StarBasic"
#define SVX_MACRO_LANGUAGE_SF "Script"
-DBG_NAMEEX(SvxMacroItem)
-
-
-
-//Ein Macro
-
enum ScriptType
{
STARBASIC,
diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx
index 684b5dd..1a252b1 100644
--- a/include/svx/galleryitem.hxx
+++ b/include/svx/galleryitem.hxx
@@ -36,8 +36,6 @@
#define SVXGALLERYITEM_PARAMS 5
#define SVXGALLERYITEM_ARGNAME "GalleryItem"
-DBG_NAMEEX_VISIBILITY( SvxGalleryItem, SVX_DLLPUBLIC )
-
class SVX_DLLPUBLIC SvxGalleryItem : public SfxPoolItem
{
sal_Int8 m_nType;
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index e1ee677..209b119 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -43,14 +43,6 @@
#include <sfx2/docfile.hxx>
#include "workwin.hxx"
-DBG_NAME(SfxAppMainNewMenu)
-DBG_NAME(SfxAppMainBmkMenu)
-DBG_NAME(SfxAppMainWizMenu)
-DBG_NAME(SfxAppMainOLEReg)
-DBG_NAME(SfxAppMainCHAOSReg)
-
-
-
TYPEINIT2(SfxApplication,SfxShell,SfxBroadcaster);
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 88907de..b6f5c01 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -41,8 +41,6 @@
static const sal_uInt16 nVersion = 2;
-DBG_NAME(SfxChildWindow)
-
struct SfxChildWindow_Impl
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame;
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index d9ebe58..8eec8bcb 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -142,8 +142,6 @@ static const ResIdToResName pToolBarResToName[] =
{ 0, "" }
};
-DBG_NAME(SfxWorkWindow)
-
//SV_IMPL_OBJARR( SfxObjectBarArr_Impl, SfxObjectBar_Impl );
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 762724f..53167f6 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -26,11 +26,6 @@
#include "statcach.hxx"
#include <sfx2/viewfrm.hxx>
-
-
-DBG_NAME(SfxControllerItem);
-
-
#ifdef DBG_UTIL
void SfxControllerItem::CheckConfigure_Impl( sal_uIntPtr nType )
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index a0308ca..a8ba337 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -35,10 +35,6 @@
#include <sfx2/objsh.hxx>
#include <rtl/strbuf.hxx>
-DBG_NAME(SfxInterface)
-
-
-
extern "C"
#ifdef WNT
int _cdecl
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 4f8248d..4ad22f3 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -58,12 +58,6 @@ public:
}
};
-
-
-DBG_NAME(SfxShell)
-
-
-
TYPEINIT0(SfxShell);
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 6a275dd..bdbd9ed 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -59,12 +59,6 @@ using namespace ::com::sun::star;
typedef std::vector<SfxViewFactory*> SfxViewFactoryArr_Impl;
-
-
-DBG_NAME(SfxObjectFactory)
-
-
-
struct SfxObjectFactory_Impl
{
SfxViewFactoryArr_Impl aViewFactoryArr;// List of <SfxViewFactory>s
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index f62ae7d..d1b4ae0 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -36,10 +36,6 @@
using namespace ::com::sun::star;
-// STATIC DATA -----------------------------------------------------------
-
-DBG_NAME(SfxFilter)
-
SfxFilter::SfxFilter( const OUString& rProvider, const OUString &rFilterName ) :
maFilterName(rFilterName),
maProvider(rProvider),
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 8f97af4..e1fc9b4 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -26,8 +26,6 @@
#include <sfx2/frmdescr.hxx>
#include <sfx2/app.hxx>
-DBG_NAME(SfxFrameDescriptor);
-
struct SfxFrameDescriptor_Impl
{
Wallpaper* pWallpaper;
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index ebeeb6a..a8fae9e 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -108,10 +108,6 @@ using namespace ::com::sun::star::document;
using ::basic::BasicManagerRepository;
#include <uno/mapping.hxx>
-
-
-DBG_NAME(SfxObjectShell)
-
#include "sfxslots.hxx"
namespace {
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index ee58298..94e3424 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -511,12 +511,6 @@ SfxSaveGuard::~SfxSaveGuard()
}
}
-
-
-
-// constructor
-
-DBG_NAME(sfx2_SfxBaseModel)
SfxBaseModel::SfxBaseModel( SfxObjectShell *pObjectShell )
: BaseMutex()
, m_pData( new IMPL_SfxBaseModel_DataContainer( m_aMutex, pObjectShell ) )
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index da44481..9af9084 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -33,10 +33,6 @@
namespace svtools { class AsynchronLink; }
-
-
-DBG_NAMEEX(SfxObjectShell)
-
class SfxViewFrame;
struct MarkData_Impl
{
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 1c20ad2..9c07bc3 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -58,8 +58,6 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::uno;
-DBG_NAME(SfxVirtualMenu)
-
class SfxMenuImageControl_Impl : public SfxControllerItem
{
SfxVirtualMenu* pMenu;
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index f29093d..281637b 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -468,10 +468,6 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::disposing( const lang::Even
m_pController->getFrame()->removeFrameActionListener( this ) ;
}
-
-// SfxBaseController -> constructor
-
-DBG_NAME(sfx2_SfxBaseController)
SfxBaseController::SfxBaseController( SfxViewShell* pViewShell )
: m_pData ( new IMPL_SfxBaseController_DataContainer( m_aMutex, pViewShell, this ))
{
diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx
index 04118da..cae47b6 100644
--- a/sfx2/source/view/viewfac.cxx
+++ b/sfx2/source/view/viewfac.cxx
@@ -21,10 +21,6 @@
#include <sfx2/viewfac.hxx>
#include <rtl/ustrbuf.hxx>
-// STATIC DATA -----------------------------------------------------------
-
-DBG_NAME(SfxViewFactory)
-
SfxViewShell *SfxViewFactory::CreateInstance(SfxViewFrame *pFrame, SfxViewShell *pOldSh )
{
return (*fnCreate)(pFrame, pOldSh);
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index a271a92..de27a59 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -140,9 +140,6 @@ using ::com::sun::star::container::XIndexContainer;
#include "../appl/app.hrc"
#include "impviewframe.hxx"
-
-DBG_NAME(SfxViewFrame)
-
#define SfxViewFrame
#include "sfxslots.hxx"
#undef SfxViewFrame
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 5c063a5..f204d34 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -84,9 +84,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::util;
using namespace ::cppu;
-
-DBG_NAME(SfxViewShell)
-
#define SfxViewShell
#include "sfxslots.hxx"
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index d1b0ccd..180d54e 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -25,12 +25,6 @@
#include <comphelper/extract.hxx>
-
-// class SfxEnumItemInterface
-
-
-DBG_NAME(SfxEnumItemInterface)
-
TYPEINIT1(SfxEnumItemInterface, SfxPoolItem)
// virtual
@@ -118,12 +112,6 @@ bool SfxEnumItemInterface::GetBoolValue() const
void SfxEnumItemInterface::SetBoolValue(sal_Bool)
{}
-
-// class SfxEnumItem
-
-
-DBG_NAME(SfxEnumItem)
-
SfxEnumItem::SfxEnumItem(sal_uInt16 const nWhich, SvStream & rStream)
: SfxEnumItemInterface(nWhich)
{
@@ -158,12 +146,6 @@ void SfxEnumItem::SetValue(sal_uInt16 const nTheValue)
m_nValue = nTheValue;
}
-
-// class SfxBoolItem
-
-
-DBG_NAME(SfxBoolItem)
-
TYPEINIT1_AUTOFACTORY(SfxBoolItem, SfxPoolItem);
SfxBoolItem::SfxBoolItem(sal_uInt16 const nWhich, SvStream & rStream)
diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx
index cf4c13a..49ff02b 100644
--- a/svl/source/items/grabbagitem.cxx
+++ b/svl/source/items/grabbagitem.cxx
@@ -15,8 +15,6 @@
#include <com/sun/star/beans/PropertyValue.hpp>
-DBG_NAME(SfxGrabBagItem)
-
TYPEINIT1_AUTOFACTORY(SfxGrabBagItem, SfxPoolItem);
using namespace com::sun::star;
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index bf7df9b..b37a185 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -21,12 +21,6 @@
#include <svl/macitem.hxx>
-// STATIC DATA -----------------------------------------------------------
-
-DBG_NAME(SvxMacroItem);
-
-
-
TYPEINIT1_FACTORY(SvxMacroItem, SfxPoolItem, new SvxMacroItem(0));
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index b8ef8f4..c4ed1d9 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -24,12 +24,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <tools/stream.hxx>
-// STATIC DATA -----------------------------------------------------------
-
-DBG_NAME(SfxStringListItem)
-
-
-
TYPEINIT1_AUTOFACTORY(SfxStringListItem, SfxPoolItem);
class SfxImpStringList
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 71e7635..f72267c 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -59,8 +59,6 @@
using namespace ::com::sun::star;
-DBG_NAME(outlinehdl)
-
class SwNumNamesDlg : public ModalDialog
{
Edit* m_pFormEdit;
diff --git a/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index 24a5f85..3804cdb 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.cxx
@@ -33,8 +33,6 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
-DBG_NAME( PolyPolygon )
-
ImplPolyPolygon::ImplPolyPolygon( sal_uInt16 nInitSize )
{
mnRefCount = 1;
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 1c8ac21..71a06de 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -43,8 +43,6 @@ c |= nSwapTmp;
#include <osl/thread.h>
#include <algorithm>
-DBG_NAME( Stream )
-
// !!! Do not inline if already the operators <<,>> are inline
inline static void SwapUShort( sal_uInt16& r )
{ r = OSL_SWAPWORD(r); }
commit f31964b0282c95d8762a77df158ce71ca3fbfd80
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 28 16:18:14 2014 +0100
Remove remaining DBG_CTOR etc. remnants from xmloff
Change-Id: I1358b5388195240c3357e4be851a48ccbe33df9e
diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx
index e1303fe..14f8ae9 100644
--- a/xmloff/source/core/xmlictxt.cxx
+++ b/xmloff/source/core/xmlictxt.cxx
@@ -31,7 +31,6 @@
using namespace ::com::sun::star;
-DBG_NAME(SvXMLImportContext)
TYPEINIT0( SvXMLImportContext );
SvXMLImportContext::SvXMLImportContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
const OUString& rLName ) :
@@ -40,14 +39,10 @@ SvXMLImportContext::SvXMLImportContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
maLocalName( rLName ),
mpRewindMap( 0 )
{
- DBG_CTOR(SvXMLImportContext,NULL);
-
}
SvXMLImportContext::~SvXMLImportContext()
{
-
- DBG_DTOR(SvXMLImportContext,NULL);
}
SvXMLImportContext *SvXMLImportContext::CreateChildContext( sal_uInt16 nPrefix,
commit a6c9d0046ae802629f5b5a13575605dac018aaa7
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 28 16:17:06 2014 +0100
Remove remaining DBG_CTOR etc. remnants from unotools
Change-Id: Ife6cecde4a9e89146493737d06cd9f0d8a041610
diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx
index 1bf431d..b697196 100644
--- a/unotools/source/misc/sharedunocomponent.cxx
+++ b/unotools/source/misc/sharedunocomponent.cxx
@@ -66,10 +66,6 @@ namespace utl
}
}
-
- //= CloseableComponentImpl
-
- DBG_NAME( CloseableComponentImpl )
typedef ::cppu::WeakImplHelper1 < XCloseListener
> CloseableComponentImpl_Base;
class CloseableComponentImpl : public CloseableComponentImpl_Base
@@ -117,7 +113,6 @@ namespace utl
CloseableComponentImpl::CloseableComponentImpl( const Reference< XInterface >& _rxComponent )
:m_xCloseable( _rxComponent, UNO_QUERY )
{
- DBG_CTOR( CloseableComponentImpl, NULL );
DBG_ASSERT( m_xCloseable.is() || !_rxComponent.is(), "CloseableComponentImpl::CloseableComponentImpl: component is not an XCloseable!" );
impl_nf_switchListening( true );
}
@@ -125,7 +120,6 @@ namespace utl
CloseableComponentImpl::~CloseableComponentImpl()
{
nf_closeComponent();
- DBG_DTOR( CloseableComponentImpl, NULL );
}
@@ -212,15 +206,9 @@ namespace utl
// same reasoning for this assertion as in ->notifyClosing
}
-
- //= CloseableComponentImpl
-
- DBG_NAME( CloseableComponent )
-
CloseableComponent::CloseableComponent( const Reference< XInterface >& _rxComponent )
:m_pImpl( new CloseableComponentImpl( _rxComponent ) )
{
- DBG_CTOR( CloseableComponent, NULL );
}
@@ -228,7 +216,6 @@ namespace utl
{
// close the component, deliver ownership to anybody who wants to veto the close
m_pImpl->nf_closeComponent();
- DBG_DTOR( CloseableComponent, NULL );
}
diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx
index 822f1a6..51868c4 100644
--- a/unotools/source/streaming/streamwrap.cxx
+++ b/unotools/source/streaming/streamwrap.cxx
@@ -28,17 +28,10 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::lang;
-
-//= OInputStreamWrapper
-
-DBG_NAME(OInputStreamWrapper)
-
OInputStreamWrapper::OInputStreamWrapper( SvStream& _rStream )
:m_pSvStream(&_rStream)
,m_bSvStreamOwner(false)
{
- DBG_CTOR(OInputStreamWrapper,NULL);
-
}
@@ -46,8 +39,6 @@ OInputStreamWrapper::OInputStreamWrapper( SvStream* pStream, bool bOwner )
:m_pSvStream( pStream )
,m_bSvStreamOwner( bOwner )
{
- DBG_CTOR(OInputStreamWrapper,NULL);
-
}
@@ -55,8 +46,6 @@ OInputStreamWrapper::~OInputStreamWrapper()
{
if( m_bSvStreamOwner )
delete m_pSvStream;
-
- DBG_DTOR(OInputStreamWrapper,NULL);
}
More information about the Libreoffice-commits
mailing list