[Libreoffice-commits] core.git: 3 commits - include/svl svl/source svx/source toolkit/source
Stephan Bergmann
sbergman at redhat.com
Fri Mar 28 08:15:11 PDT 2014
include/svl/cintitem.hxx | 36 ++-----
include/svl/custritm.hxx | 11 --
include/svl/flagitem.hxx | 5
include/svl/intitem.hxx | 9 -
include/svl/metitem.hxx | 7 -
include/svl/poolitem.hxx | 16 ---
include/svl/ptitem.hxx | 7 -
include/svl/rectitem.hxx | 7 -
include/svl/szitem.hxx | 6 -
include/svl/visitem.hxx | 8 -
svl/source/items/aeitem.cxx | 22 ----
svl/source/items/cintitem.cxx | 63 ------------
svl/source/items/custritm.cxx | 11 --
svl/source/items/flagitem.cxx | 12 --
svl/source/items/intitem.cxx | 26 -----
svl/source/items/itemiter.cxx | 11 --
svl/source/items/itempool.cxx | 28 -----
svl/source/items/itemset.cxx | 41 --------
svl/source/items/poolcach.cxx | 9 -
svl/source/items/poolio.cxx | 10 -
svl/source/items/poolitem.cxx | 26 -----
svl/source/items/ptitem.cxx | 11 --
svl/source/items/rectitem.cxx | 15 --
svl/source/items/sitem.cxx | 12 --
svl/source/items/szitem.cxx | 14 --
svl/source/items/visitem.cxx | 11 --
svl/source/items/whiter.cxx | 8 -
svl/source/notify/brdcst.cxx | 12 --
svl/source/notify/lstner.cxx | 14 --
svl/source/undo/undo.cxx | 12 --
svx/source/dialog/paraprev.cxx | 2
toolkit/source/awt/vclxaccessiblecomponent.cxx | 11 --
toolkit/source/awt/vclxmenu.cxx | 13 --
toolkit/source/awt/vclxspinbutton.cxx | 7 -
toolkit/source/awt/vclxwindow.cxx | 10 -
toolkit/source/controls/grid/sortablegriddatamodel.cxx | 87 -----------------
toolkit/source/controls/unocontrol.cxx | 6 -
37 files changed, 29 insertions(+), 587 deletions(-)
New commits:
commit a5a52ba164d275f0e45e42875328fe68df32cf08
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 28 16:14:35 2014 +0100
warning C4701: potentially uninitialized local variable used
Change-Id: I0ab3c52fa12d519c6afcbaf701dd42f69c728ff0
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index d31e5b9..9eaa964 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -144,7 +144,7 @@ void SvxParaPrevWindow::DrawParagraph( bool bAll )
if ( (3 <= i) && (5 >= i) )
{
- long nLW;
+ long nLW = long();
switch( i )
{
case 3: nLW = aLineSiz.Width() * 8 / 10; break;
commit 4f9b072072b263a2a663d5148f4e9f751ca17c6d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 28 16:12:33 2014 +0100
Remove remaining DBG_CTOR etc. remnants from toolkit
Change-Id: Ia6219ebd5fb2d2644135ec20a986158b68b771fc
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index 0dc0591..8264924 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -42,15 +42,10 @@
using namespace ::com::sun::star;
using namespace ::comphelper;
-
-DBG_NAME(VCLXAccessibleComponent)
-
-
VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXindow )
: AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() )
, OAccessibleImplementationAccess( )
{
- DBG_CTOR( VCLXAccessibleComponent, 0 );
mpVCLXindow = pVCLXindow;
mxWindow = pVCLXindow;
@@ -69,8 +64,6 @@ VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXindow )
VCLXAccessibleComponent::~VCLXAccessibleComponent()
{
- DBG_DTOR( VCLXAccessibleComponent, 0 );
-
ensureDisposed();
if ( mpVCLXindow && mpVCLXindow->GetWindow() )
@@ -111,8 +104,6 @@ uno::Sequence< OUString > VCLXAccessibleComponent::getSupportedServiceNames() th
IMPL_LINK( VCLXAccessibleComponent, WindowEventListener, VclSimpleEvent*, pEvent )
{
- DBG_CHKTHIS(VCLXAccessibleComponent,0);
-
DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" );
/* Ignore VCLEVENT_WINDOW_ENDPOPUPMODE, because the UNO accessibility wrapper
@@ -132,8 +123,6 @@ IMPL_LINK( VCLXAccessibleComponent, WindowEventListener, VclSimpleEvent*, pEvent
IMPL_LINK( VCLXAccessibleComponent, WindowChildEventListener, VclSimpleEvent*, pEvent )
{
- DBG_CHKTHIS(VCLXAccessibleComponent,0);
-
DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" );
if ( pEvent && pEvent->ISA( VclWindowEvent ) && mxWindow.is() /* #i68079# */ )
{
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 64c780d..ecf50e0 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -36,25 +36,20 @@
#include <com/sun/star/awt/KeyModifier.hpp>
-DBG_NAME(VCLXMenu)
-
VCLXMenu::VCLXMenu()
: maMenuListeners( *this )
{
- DBG_CTOR( VCLXMenu, 0 );
mpMenu = NULL;
}
VCLXMenu::VCLXMenu( Menu* pMenu )
: maMenuListeners( *this )
{
- DBG_CTOR( VCLXMenu, 0 );
mpMenu = pMenu;
}
VCLXMenu::~VCLXMenu()
{
- DBG_DTOR( VCLXMenu, 0 );
for ( size_t n = maPopupMenuRefs.size(); n; ) {
delete maPopupMenuRefs[ --n ];
}
@@ -892,17 +887,13 @@ throw (css::uno::RuntimeException, std::exception)
return rxGraphic;
}
-DBG_NAME(VCLXMenuBar);
-
VCLXMenuBar::VCLXMenuBar()
{
- DBG_CTOR( VCLXMenuBar, 0 );
ImplCreateMenu( false );
}
VCLXMenuBar::VCLXMenuBar( MenuBar* pMenuBar ) : VCLXMenu( (Menu *)pMenuBar )
{
- DBG_CTOR( VCLXMenuBar, 0 );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
@@ -913,17 +904,13 @@ stardiv_Toolkit_VCLXMenuBar_get_implementation(
return cppu::acquire(new VCLXMenuBar());
}
-DBG_NAME(VCLXPopupMenu);
-
VCLXPopupMenu::VCLXPopupMenu()
{
- DBG_CTOR( VCLXPopupMenu, 0 );
ImplCreateMenu( true );
}
VCLXPopupMenu::VCLXPopupMenu( PopupMenu* pPopMenu ) : VCLXMenu( (Menu *)pPopMenu )
{
- DBG_CTOR( VCLXPopupMenu, 0 );
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx
index 3b9a9d0..1357673 100644
--- a/toolkit/source/awt/vclxspinbutton.cxx
+++ b/toolkit/source/awt/vclxspinbutton.cxx
@@ -56,21 +56,14 @@ namespace toolkit
}
}
-
- //= VCLXSpinButton
-
- DBG_NAME( VCLXSpinButton )
-
VCLXSpinButton::VCLXSpinButton()
:maAdjustmentListeners( *this )
{
- DBG_CTOR( VCLXSpinButton, NULL );
}
VCLXSpinButton::~VCLXSpinButton()
{
- DBG_DTOR( VCLXSpinButton, NULL );
}
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index b472c89..8eaef89 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -334,24 +334,14 @@ void ImplInitWindowEvent( ::com::sun::star::awt::WindowEvent& rEvent, Window* pW
pWindow->GetBorder( rEvent.LeftInset, rEvent.TopInset, rEvent.RightInset, rEvent.BottomInset );
}
-
-// class VCLXWindow
-
-
-DBG_NAME(VCLXWindow);
-
VCLXWindow::VCLXWindow( bool _bWithDefaultProps )
:mpImpl( NULL )
{
- DBG_CTOR( VCLXWindow, 0 );
-
mpImpl = new VCLXWindowImpl( *this, _bWithDefaultProps );
}
VCLXWindow::~VCLXWindow()
{
- DBG_DTOR( VCLXWindow, 0 );
-
delete mpImpl;
if ( GetWindow() )
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index 512a8fa..acbe7ba 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -68,10 +68,6 @@ public:
bool isInitialized() const { return m_isInitialized; }
-#ifdef DBG_UTIL
- const char* checkInvariants() const;
-#endif
-
protected:
~SortableGridDataModel();
@@ -201,53 +197,6 @@ private:
::std::vector< ::sal_Int32 > m_privateToPublicRowIndex;
};
-#ifdef DBG_UTIL
- const char* SortableGridDataModel_checkInvariants( const void* _pInstance )
- {
- return static_cast< const SortableGridDataModel* >( _pInstance )->checkInvariants();
- }
-
-
- const char* SortableGridDataModel::checkInvariants() const
- {
- if ( m_publicToPrivateRowIndex.size() != m_privateToPublicRowIndex.size() )
- return "inconsistent index maps";
-
- if ( m_delegator.is() )
- {
- if ( m_publicToPrivateRowIndex.size() != size_t( m_delegator->getRowCount() ) )
- return "wrong cached row count";
- }
- else
- {
- if ( !m_publicToPrivateRowIndex.empty() )
- return "disposed or not initialized, but having a non-empty map";
- }
-
- for ( size_t publicIndex=0; publicIndex<m_publicToPrivateRowIndex.size(); ++publicIndex )
- {
- ::sal_Int32 const privateIndex = m_publicToPrivateRowIndex[ publicIndex ];
- if ( ( privateIndex < 0 ) || ( size_t( privateIndex ) >= m_privateToPublicRowIndex.size() ) )
- return "invalid cached private index";
-
- if ( m_privateToPublicRowIndex[ privateIndex ] != sal_Int32( publicIndex ) )
- return "index map traversal not commutavive";
- }
-
- if ( impl_isSorted_nothrow() && m_publicToPrivateRowIndex.empty() )
- return "sorted, but no row index translation tables";
-
- if ( !impl_isSorted_nothrow() && !m_publicToPrivateRowIndex.empty() )
- return "unsorted, but have index translation tables";
-
- return NULL;
- }
-#endif
-
-#define DBG_CHECK_ME() \
- DBG_CHKTHIS( SortableGridDataModel, SortableGridDataModel_checkInvariants )
-
-
namespace
{
template< class STLCONTAINER >
@@ -258,11 +207,6 @@ private:
}
}
-
- //= SortableGridDataModel
-
- DBG_NAME( SortableGridDataModel )
-
SortableGridDataModel::SortableGridDataModel( Reference< XComponentContext > const & rxContext )
:SortableGridDataModel_Base( m_aMutex )
,SortableGridDataModel_PrivateBase()
@@ -275,7 +219,6 @@ private:
,m_publicToPrivateRowIndex()
,m_privateToPublicRowIndex()
{
- DBG_CTOR( SortableGridDataModel, SortableGridDataModel_checkInvariants );
}
@@ -292,8 +235,6 @@ private:
,m_publicToPrivateRowIndex( i_copySource.m_publicToPrivateRowIndex )
,m_privateToPublicRowIndex( i_copySource.m_privateToPublicRowIndex )
{
- DBG_CTOR( SortableGridDataModel, SortableGridDataModel_checkInvariants );
-
ENSURE_OR_THROW( i_copySource.m_delegator.is(),
"not expected to be called for a disposed copy source!" );
m_delegator.set( i_copySource.m_delegator->createClone(), UNO_QUERY_THROW );
@@ -307,8 +248,6 @@ private:
acquire();
dispose();
}
-
- DBG_DTOR( SortableGridDataModel, SortableGridDataModel_checkInvariants );
}
@@ -360,7 +299,6 @@ private:
void SAL_CALL SortableGridDataModel::initialize( const Sequence< Any >& i_arguments ) throw (Exception, RuntimeException, std::exception)
{
::comphelper::ComponentGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
if ( m_delegator.is() )
throw AlreadyInitializedException( OUString(), *this );
@@ -418,7 +356,6 @@ private:
void SAL_CALL SortableGridDataModel::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
if ( impl_isSorted_nothrow() )
{
@@ -478,7 +415,6 @@ private:
void SAL_CALL SortableGridDataModel::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
// if the data is not sorted, broadcast the event unchanged
if ( !impl_isSorted_nothrow() )
@@ -539,7 +475,6 @@ private:
void SAL_CALL SortableGridDataModel::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
GridDataEvent const aEvent( impl_createPublicEvent( i_event ) );
impl_broadcast( &XGridDataListener::dataChanged, aEvent, aGuard );
@@ -549,7 +484,6 @@ private:
void SAL_CALL SortableGridDataModel::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
GridDataEvent const aEvent( impl_createPublicEvent( i_event ) );
impl_broadcast( &XGridDataListener::rowHeadingChanged, aEvent, aGuard );
@@ -653,7 +587,6 @@ private:
void SAL_CALL SortableGridDataModel::sortByColumn( ::sal_Int32 i_columnIndex, ::sal_Bool i_sortAscending ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
if ( ( i_columnIndex < 0 ) || ( i_columnIndex >= getColumnCount() ) )
throw IndexOutOfBoundsException( OUString(), *this );
@@ -696,7 +629,6 @@ private:
void SAL_CALL SortableGridDataModel::removeColumnSort( ) throw (RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
impl_removeColumnSort( aGuard );
}
@@ -704,7 +636,6 @@ private:
css::beans::Pair< ::sal_Int32, ::sal_Bool > SAL_CALL SortableGridDataModel::getCurrentSortOrder( ) throw (RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
return css::beans::Pair< ::sal_Int32, ::sal_Bool >( m_currentSortColumn, m_sortAscending );
}
@@ -713,7 +644,6 @@ private:
void SAL_CALL SortableGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
Reference< XMutableGridDataModel > const delegator( m_delegator );
aGuard.clear();
@@ -724,7 +654,6 @@ private:
void SAL_CALL SortableGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
Reference< XMutableGridDataModel > const delegator( m_delegator );
aGuard.clear();
@@ -735,7 +664,6 @@ private:
void SAL_CALL SortableGridDataModel::insertRow( ::sal_Int32 i_index, const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, IndexOutOfBoundsException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
::sal_Int32 const rowIndex = i_index == getRowCount() ? i_index : impl_getPrivateRowIndex_throw( i_index );
// note that |RowCount| is a valid index in this method, but not for impl_getPrivateRowIndex_throw
@@ -749,7 +677,6 @@ private:
void SAL_CALL SortableGridDataModel::insertRows( ::sal_Int32 i_index, const Sequence< Any>& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, IndexOutOfBoundsException, RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
::sal_Int32 const rowIndex = i_index == getRowCount() ? i_index : impl_getPrivateRowIndex_throw( i_index );
// note that |RowCount| is a valid index in this method, but not for impl_getPrivateRowIndex_throw
@@ -763,7 +690,6 @@ private:
void SAL_CALL SortableGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
@@ -776,7 +702,6 @@ private:
void SAL_CALL SortableGridDataModel::removeAllRows( ) throw (RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
Reference< XMutableGridDataModel > const delegator( m_delegator );
aGuard.clear();
@@ -787,7 +712,6 @@ private:
void SAL_CALL SortableGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
@@ -800,7 +724,6 @@ private:
void SAL_CALL SortableGridDataModel::updateRowData( const Sequence< ::sal_Int32 >& i_columnIndexes, ::sal_Int32 i_rowIndex, const Sequence< Any >& i_values ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
@@ -813,7 +736,6 @@ private:
void SAL_CALL SortableGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
@@ -826,7 +748,6 @@ private:
void SAL_CALL SortableGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
@@ -839,7 +760,6 @@ private:
void SAL_CALL SortableGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
@@ -864,7 +784,6 @@ private:
::sal_Int32 SAL_CALL SortableGridDataModel::getRowCount() throw (RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
Reference< XMutableGridDataModel > const delegator( m_delegator );
aGuard.clear();
@@ -875,7 +794,6 @@ private:
::sal_Int32 SAL_CALL SortableGridDataModel::getColumnCount() throw (RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
Reference< XMutableGridDataModel > const delegator( m_delegator );
aGuard.clear();
@@ -886,7 +804,6 @@ private:
Any SAL_CALL SortableGridDataModel::getCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
@@ -899,7 +816,6 @@ private:
Any SAL_CALL SortableGridDataModel::getCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
@@ -912,7 +828,6 @@ private:
Any SAL_CALL SortableGridDataModel::getRowHeading( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
@@ -925,7 +840,6 @@ private:
Sequence< Any > SAL_CALL SortableGridDataModel::getRowData( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
::sal_Int32 const rowIndex = impl_getPrivateRowIndex_throw( i_rowIndex );
@@ -957,7 +871,6 @@ private:
Reference< css::util::XCloneable > SAL_CALL SortableGridDataModel::createClone( ) throw (RuntimeException, std::exception)
{
MethodGuard aGuard( *this, rBHelper );
- DBG_CHECK_ME();
return new SortableGridDataModel( *this );
}
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 4724d81..86230bd 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -130,10 +130,6 @@ struct UnoControl_Data
}
};
-
-// class UnoControl
-
-DBG_NAME( UnoControl )
UnoControl::UnoControl() :
maDisposeListeners( *this )
, maWindowListeners( *this )
@@ -145,7 +141,6 @@ UnoControl::UnoControl() :
, maModeChangeListeners( GetMutex() )
, mpData( new UnoControl_Data )
{
- DBG_CTOR( UnoControl, NULL );
mbDisposePeer = true;
mbRefeshingPeer = false;
mbCreatingPeer = false;
@@ -156,7 +151,6 @@ UnoControl::UnoControl() :
UnoControl::~UnoControl()
{
DELETEZ( mpData );
- DBG_DTOR( UnoControl, NULL );
}
OUString UnoControl::GetComponentServiceName()
commit d205ff49be10159d1766c2d06182c02255497def
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 28 16:05:19 2014 +0100
Remove remaining DBG_CTOR etc. remnants from svl
Change-Id: Ib0a4bd4f3d056c39156bfcfb0bd28c62f2f530b2
diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx
index b365718..0fe1296 100644
--- a/include/svl/cintitem.hxx
+++ b/include/svl/cintitem.hxx
@@ -24,9 +24,6 @@
#include <tools/debug.hxx>
#include <svl/poolitem.hxx>
-
-DBG_NAMEEX_VISIBILITY(CntByteItem, SVL_DLLPUBLIC)
-
class SVL_DLLPUBLIC CntByteItem: public SfxPoolItem
{
sal_uInt8 m_nValue;
@@ -35,13 +32,13 @@ public:
TYPEINFO_OVERRIDE();
CntByteItem(sal_uInt16 which = 0, sal_uInt8 nTheValue = 0):
- SfxPoolItem(which), m_nValue(nTheValue) { DBG_CTOR(CntByteItem, 0); }
+ SfxPoolItem(which), m_nValue(nTheValue) {}
CntByteItem(const CntByteItem & rItem):
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
- { DBG_CTOR(CntByteItem, 0); }
+ {}
- virtual ~CntByteItem() { DBG_DTOR(CntByteItem, 0); }
+ virtual ~CntByteItem() {}
virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
@@ -83,9 +80,6 @@ inline void CntByteItem::SetValue(sal_uInt8 nTheValue)
m_nValue = nTheValue;
}
-
-DBG_NAMEEX_VISIBILITY(CntUInt16Item, SVL_DLLPUBLIC)
-
class SVL_DLLPUBLIC CntUInt16Item: public SfxPoolItem
{
sal_uInt16 m_nValue;
@@ -95,15 +89,15 @@ public:
CntUInt16Item(sal_uInt16 which = 0, sal_uInt16 nTheValue = 0):
SfxPoolItem(which), m_nValue(nTheValue)
- { DBG_CTOR(CntUInt16Item, 0); }
+ {}
CntUInt16Item(sal_uInt16 which, SvStream & rStream);
CntUInt16Item(const CntUInt16Item & rItem):
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
- { DBG_CTOR(CntUInt16Item, 0); }
+ {}
- virtual ~CntUInt16Item() { DBG_DTOR(CntUInt16Item, 0); }
+ virtual ~CntUInt16Item() {}
virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
@@ -145,9 +139,6 @@ inline void CntUInt16Item::SetValue(sal_uInt16 nTheValue)
m_nValue = nTheValue;
}
-
-DBG_NAMEEX_VISIBILITY(CntInt32Item, SVL_DLLPUBLIC)
-
class SVL_DLLPUBLIC CntInt32Item: public SfxPoolItem
{
sal_Int32 m_nValue;
@@ -157,15 +148,15 @@ public:
CntInt32Item(sal_uInt16 which = 0, sal_Int32 nTheValue = 0):
SfxPoolItem(which), m_nValue(nTheValue)
- { DBG_CTOR(CntInt32Item, 0); }
+ {}
CntInt32Item(sal_uInt16 which, SvStream & rStream);
CntInt32Item(const CntInt32Item & rItem):
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
- { DBG_CTOR(CntInt32Item, 0); }
+ {}
- virtual ~CntInt32Item() { DBG_DTOR(CntInt32Item, 0); }
+ virtual ~CntInt32Item() {}
virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
@@ -207,9 +198,6 @@ inline void CntInt32Item::SetValue(sal_Int32 nTheValue)
m_nValue = nTheValue;
}
-
-DBG_NAMEEX_VISIBILITY(CntUInt32Item, SVL_DLLPUBLIC)
-
class SVL_DLLPUBLIC CntUInt32Item: public SfxPoolItem
{
sal_uInt32 m_nValue;
@@ -219,15 +207,15 @@ public:
CntUInt32Item(sal_uInt16 which = 0, sal_uInt32 nTheValue = 0):
SfxPoolItem(which), m_nValue(nTheValue)
- { DBG_CTOR(CntUInt32Item, 0); }
+ {}
CntUInt32Item(sal_uInt16 nWhich, SvStream & rStream);
CntUInt32Item(const CntUInt32Item & rItem):
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
- { DBG_CTOR(CntUInt32Item, 0); }
+ {}
- virtual ~CntUInt32Item() { DBG_DTOR(CntUInt32Item, 0); }
+ virtual ~CntUInt32Item() {}
virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx
index da5fe7c..1cdc6d7 100644
--- a/include/svl/custritm.hxx
+++ b/include/svl/custritm.hxx
@@ -24,9 +24,6 @@
#include <tools/debug.hxx>
#include <svl/poolitem.hxx>
-
-DBG_NAMEEX_VISIBILITY(CntUnencodedStringItem, SVL_DLLPUBLIC)
-
class SVL_DLLPUBLIC CntUnencodedStringItem: public SfxPoolItem
{
OUString m_aValue;
@@ -35,17 +32,17 @@ public:
TYPEINFO_OVERRIDE();
CntUnencodedStringItem(sal_uInt16 which = 0): SfxPoolItem(which)
- { DBG_CTOR(CntUnencodedStringItem, 0); }
+ {}
CntUnencodedStringItem(sal_uInt16 which, const OUString & rTheValue):
SfxPoolItem(which), m_aValue(rTheValue)
- { DBG_CTOR(CntUnencodedStringItem, 0); }
+ {}
CntUnencodedStringItem(const CntUnencodedStringItem & rItem):
SfxPoolItem(rItem), m_aValue(rItem.m_aValue)
- { DBG_CTOR(CntUnencodedStringItem, 0); }
+ {}
- virtual ~CntUnencodedStringItem() { DBG_DTOR(CntUnencodedStringItem, 0); }
+ virtual ~CntUnencodedStringItem() {}
virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx
index 4286608..2ff5ad0 100644
--- a/include/svl/flagitem.hxx
+++ b/include/svl/flagitem.hxx
@@ -25,8 +25,6 @@
class SvStream;
-DBG_NAMEEX_VISIBILITY(SfxFlagItem, SVL_DLLPUBLIC)
-
class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem
{
sal_uInt16 nVal;
@@ -37,8 +35,7 @@ public:
explicit SfxFlagItem( sal_uInt16 nWhich = 0, sal_uInt16 nValue = 0 );
SfxFlagItem( const SfxFlagItem& );
- ~SfxFlagItem() {
- DBG_DTOR(SfxFlagItem, 0); }
+ ~SfxFlagItem() {}
virtual sal_uInt8 GetFlagCount() const;
diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx
index 0aa8760..262915d 100644
--- a/include/svl/intitem.hxx
+++ b/include/svl/intitem.hxx
@@ -38,9 +38,6 @@ public:
{ return new SfxByteItem(*this); }
};
-
-DBG_NAMEEX_VISIBILITY(SfxInt16Item, SVL_DLLPUBLIC)
-
class SVL_DLLPUBLIC SfxInt16Item: public SfxPoolItem
{
sal_Int16 m_nValue;
@@ -50,15 +47,15 @@ public:
explicit SfxInt16Item(sal_uInt16 which = 0, sal_Int16 nTheValue = 0):
SfxPoolItem(which), m_nValue(nTheValue)
- { DBG_CTOR(SfxInt16Item, 0); }
+ {}
SfxInt16Item(sal_uInt16 nWhich, SvStream & rStream);
SfxInt16Item(const SfxInt16Item & rItem):
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
- { DBG_CTOR(SfxInt16Item, 0); }
+ {}
- virtual ~SfxInt16Item() { DBG_DTOR(SfxInt16Item, 0); }
+ virtual ~SfxInt16Item() {}
virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx
index 9bd5eb1..cac661e 100644
--- a/include/svl/metitem.hxx
+++ b/include/svl/metitem.hxx
@@ -22,10 +22,6 @@
#include <svl/svldllapi.h>
#include <svl/intitem.hxx>
-DBG_NAMEEX_VISIBILITY(SfxMetricItem, SVL_DLLPUBLIC)
-
-
-
class SVL_DLLPUBLIC SfxMetricItem: public SfxInt32Item
{
public:
@@ -33,8 +29,7 @@ public:
explicit SfxMetricItem( sal_uInt16 nWhich = 0, sal_uInt32 nValue = 0 );
SfxMetricItem( sal_uInt16 nWhich, SvStream & );
SfxMetricItem( const SfxMetricItem& );
- ~SfxMetricItem() {
- DBG_DTOR(SfxMetricItem, 0); }
+ ~SfxMetricItem() {}
virtual bool ScaleMetrics( long lMult, long lDiv ) SAL_OVERRIDE;
virtual bool HasMetrics() const SAL_OVERRIDE;
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 5d74e50..de5fea4 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -148,10 +148,6 @@ typedef sal_uInt16 SfxItemState;
#define SFX_ITEM_OFF SFX_ITEM_DEFAULT
#define SFX_ITEM_ON SFX_ITEM_SET
-DBG_NAMEEX_VISIBILITY(SfxPoolItem, SVL_DLLPUBLIC)
-DBG_NAMEEX(SfxVoidItem)
-DBG_NAMEEX(SfxItemHandle)
-
class SvXMLUnitConverter;
class SfxItemPool;
class SfxItemSet;
@@ -188,12 +184,8 @@ public:
TYPEINFO();
virtual ~SfxPoolItem();
- void SetWhich( sal_uInt16 nId ) {
- DBG_CHKTHIS(SfxPoolItem, 0);
- m_nWhich = nId; }
- sal_uInt16 Which() const {
- DBG_CHKTHIS(SfxPoolItem, 0);
- return m_nWhich; }
+ void SetWhich( sal_uInt16 nId ) { m_nWhich = nId; }
+ sal_uInt16 Which() const { return m_nWhich; }
virtual bool operator==( const SfxPoolItem& ) const = 0;
bool operator!=( const SfxPoolItem& rItem ) const
{ return !(*this == rItem); }
@@ -270,21 +262,18 @@ private:
inline void SfxPoolItem::SetRefCount( sal_uLong n )
{
- DBG_CHKTHIS( SfxPoolItem, 0 );
m_nRefCount = n;
m_nKind = 0;
}
inline void SfxPoolItem::SetKind( sal_uInt16 n )
{
- DBG_CHKTHIS( SfxPoolItem, 0 );
m_nRefCount = SFX_ITEMS_SPECIAL;
m_nKind = n;
}
inline sal_uLong SfxPoolItem::AddRef( sal_uLong n ) const
{
- DBG_CHKTHIS( SfxPoolItem, 0 );
DBG_ASSERT(m_nRefCount <= SFX_ITEMS_MAXREF, "AddRef with non-Pool-Item");
DBG_ASSERT(ULONG_MAX - m_nRefCount > n, "AddRef: refcount overflow");
return (const_cast<SfxPoolItem *>(this)->m_nRefCount += n);
@@ -292,7 +281,6 @@ inline sal_uLong SfxPoolItem::AddRef( sal_uLong n ) const
inline sal_uLong SfxPoolItem::ReleaseRef( sal_uLong n ) const
{
- DBG_CHKTHIS( SfxPoolItem, 0 );
DBG_ASSERT(m_nRefCount <= SFX_ITEMS_MAXREF, "AddRef with non-Pool-Item");
DBG_ASSERT(m_nRefCount >= n, "AddRef: refcount underflow");
const_cast<SfxPoolItem *>(this)->m_nRefCount -= n;
diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx
index 22ee52b..e24912c 100644
--- a/include/svl/ptitem.hxx
+++ b/include/svl/ptitem.hxx
@@ -25,10 +25,6 @@
class SvStream;
-DBG_NAMEEX_VISIBILITY(SfxPointItem, SVL_DLLPUBLIC)
-
-
-
class SVL_DLLPUBLIC SfxPointItem: public SfxPoolItem
{
Point aVal;
@@ -38,8 +34,7 @@ public:
SfxPointItem();
SfxPointItem( sal_uInt16 nWhich, const Point& rVal );
SfxPointItem( const SfxPointItem& );
- ~SfxPointItem() {
- DBG_DTOR(SfxPointItem, 0); }
+ ~SfxPointItem() {}
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx
index 9b41539..2c05a76 100644
--- a/include/svl/rectitem.hxx
+++ b/include/svl/rectitem.hxx
@@ -26,10 +26,6 @@
class SvStream;
-DBG_NAMEEX_VISIBILITY(SfxRectangleItem, SVL_DLLPUBLIC)
-
-
-
class SVL_DLLPUBLIC SfxRectangleItem: public SfxPoolItem
{
Rectangle aVal;
@@ -39,8 +35,7 @@ public:
SfxRectangleItem();
SfxRectangleItem( sal_uInt16 nWhich, const Rectangle& rVal );
SfxRectangleItem( const SfxRectangleItem& );
- ~SfxRectangleItem() {
- DBG_DTOR(SfxRectangleItem, 0); }
+ ~SfxRectangleItem() {}
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx
index dc8266b..1ee8228 100644
--- a/include/svl/szitem.hxx
+++ b/include/svl/szitem.hxx
@@ -25,10 +25,6 @@
class SvStream;
-DBG_NAMEEX(SfxSizeItem)
-
-
-
class SfxSizeItem : public SfxPoolItem
{
private:
@@ -39,7 +35,7 @@ public:
SfxSizeItem();
SfxSizeItem( sal_uInt16 nWhich, const Size& rVal );
SfxSizeItem( const SfxSizeItem& );
- ~SfxSizeItem() { DBG_DTOR(SfxSizeItem, 0); }
+ ~SfxSizeItem() {}
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx
index 5fcc79f..8f5088e 100644
--- a/include/svl/visitem.hxx
+++ b/include/svl/visitem.hxx
@@ -25,9 +25,6 @@
#include <svl/poolitem.hxx>
#include <com/sun/star/frame/status/Visibility.hpp>
-
-DBG_NAMEEX_VISIBILITY(SfxVisibilityItem, SVL_DLLPUBLIC)
-
class SVL_DLLPUBLIC SfxVisibilityItem: public SfxPoolItem
{
::com::sun::star::frame::status::Visibility m_nValue;
@@ -39,16 +36,15 @@ public:
SfxPoolItem(which)
{
m_nValue.bVisible = bVisible;
- DBG_CTOR(SfxVisibilityItem, 0);
}
SfxVisibilityItem(sal_uInt16 which, SvStream & rStream);
SfxVisibilityItem(const SfxVisibilityItem & rItem):
SfxPoolItem(rItem), m_nValue(rItem.m_nValue)
- { DBG_CTOR(SfxVisibilityItem, 0); }
+ {}
- virtual ~SfxVisibilityItem() { DBG_DTOR(SfxVisibilityItem, 0); }
+ virtual ~SfxVisibilityItem() {}
virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE;
diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index bfc14c6..517298e 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -21,10 +21,6 @@
#include <svl/aeitem.hxx>
#include <vector>
-// STATIC DATA -----------------------------------------------------------
-
-DBG_NAME(SfxAllEnumItem)
-
TYPEINIT1_AUTOFACTORY(SfxAllEnumItem, SfxEnumItem)
@@ -61,7 +57,6 @@ SfxAllEnumItem::SfxAllEnumItem(sal_uInt16 which, sal_uInt16 nVal):
pValues( 0 ),
pDisabledValues( 0 )
{
- DBG_CTOR(SfxAllEnumItem, 0);
InsertValue( nVal );
}
@@ -72,7 +67,6 @@ SfxAllEnumItem::SfxAllEnumItem( sal_uInt16 which, SvStream &rStream ):
pValues( 0 ),
pDisabledValues( 0 )
{
- DBG_CTOR(SfxAllEnumItem, 0);
InsertValue( GetValue() );
}
@@ -84,7 +78,6 @@ SfxAllEnumItem::SfxAllEnumItem(sal_uInt16 which):
pValues( 0 ),
pDisabledValues( 0 )
{
- DBG_CTOR(SfxAllEnumItem, 0);
}
@@ -95,7 +88,6 @@ SfxAllEnumItem::SfxAllEnumItem(const SfxAllEnumItem &rCopy):
pValues(0),
pDisabledValues( 0 )
{
- DBG_CTOR(SfxAllEnumItem, 0);
if ( !rCopy.pValues )
return;
@@ -119,7 +111,6 @@ SfxAllEnumItem::SfxAllEnumItem(const SfxAllEnumItem &rCopy):
SfxAllEnumItem::~SfxAllEnumItem()
{
- DBG_DTOR(SfxAllEnumItem, 0);
delete pValues;
delete pDisabledValues;
}
@@ -128,7 +119,6 @@ SfxAllEnumItem::~SfxAllEnumItem()
sal_uInt16 SfxAllEnumItem::GetValueCount() const
{
- DBG_CHKTHIS(SfxAllEnumItem, 0);
return pValues ? pValues->size() : 0;
}
@@ -136,7 +126,6 @@ sal_uInt16 SfxAllEnumItem::GetValueCount() const
OUString SfxAllEnumItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
- DBG_CHKTHIS(SfxAllEnumItem, 0);
DBG_ASSERT( pValues && nPos < pValues->size(), "enum overflow" );
return (*pValues)[nPos]->aText;
}
@@ -145,7 +134,6 @@ OUString SfxAllEnumItem::GetValueTextByPos( sal_uInt16 nPos ) const
sal_uInt16 SfxAllEnumItem::GetValueByPos( sal_uInt16 nPos ) const
{
- DBG_CHKTHIS(SfxAllEnumItem, 0);
DBG_ASSERT( pValues && nPos < pValues->size(), "enum overflow" );
return (*pValues)[nPos]->nValue;
}
@@ -154,7 +142,6 @@ sal_uInt16 SfxAllEnumItem::GetValueByPos( sal_uInt16 nPos ) const
SfxPoolItem* SfxAllEnumItem::Clone( SfxItemPool * ) const
{
- DBG_CHKTHIS(SfxAllEnumItem, 0);
return new SfxAllEnumItem(*this);
}
@@ -162,7 +149,6 @@ SfxPoolItem* SfxAllEnumItem::Clone( SfxItemPool * ) const
SfxPoolItem* SfxAllEnumItem::Create( SvStream & rStream, sal_uInt16 ) const
{
- DBG_CHKTHIS(SfxAllEnumItem, 0);
return new SfxAllEnumItem( Which(), rStream );
}
@@ -179,8 +165,6 @@ sal_uInt16 SfxAllEnumItem::_GetPosByValue( sal_uInt16 nVal ) const
*/
{
- DBG_CHKTHIS(SfxAllEnumItem, 0);
-
if ( !pValues )
return 0;
@@ -204,8 +188,6 @@ sal_uInt16 SfxAllEnumItem::GetPosByValue( sal_uInt16 nValue ) const
*/
{
- DBG_CHKTHIS(SfxAllEnumItem, 0);
-
if ( !pValues || pValues->empty() )
return nValue;
@@ -216,7 +198,6 @@ sal_uInt16 SfxAllEnumItem::GetPosByValue( sal_uInt16 nValue ) const
void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const OUString &rValue )
{
- DBG_CHKTHIS(SfxAllEnumItem, 0);
SfxAllEnumValue_Impl *pVal = new SfxAllEnumValue_Impl;
pVal->nValue = nValue;
pVal->aText = rValue;
@@ -233,7 +214,6 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const OUString &rValue )
void SfxAllEnumItem::InsertValue( sal_uInt16 nValue )
{
- DBG_CHKTHIS(SfxAllEnumItem, 0);
SfxAllEnumValue_Impl *pVal = new SfxAllEnumValue_Impl;
pVal->nValue = nValue;
pVal->aText = OUString::number(nValue);
@@ -245,7 +225,6 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue )
void SfxAllEnumItem::DisableValue( sal_uInt16 nValue )
{
- DBG_CHKTHIS(SfxAllEnumItem, 0);
if ( !pDisabledValues )
pDisabledValues = new std::vector<sal_uInt16>;
@@ -268,7 +247,6 @@ bool SfxAllEnumItem::IsEnabled( sal_uInt16 nValue ) const
void SfxAllEnumItem::RemoveValue( sal_uInt16 nValue )
{
- DBG_CHKTHIS(SfxAllEnumItem, 0);
sal_uInt16 nPos = GetPosByValue(nValue);
DBG_ASSERT( nPos != USHRT_MAX, "removing value not in enum" );
pValues->erase( pValues->begin() + nPos );
diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
index 5c248d4..f90acae 100644
--- a/svl/source/items/cintitem.cxx
+++ b/svl/source/items/cintitem.cxx
@@ -21,18 +21,11 @@
#include <tools/stream.hxx>
#include <svl/cintitem.hxx>
-
-// class CntByteItem
-
-
-DBG_NAME(CntByteItem)
-
TYPEINIT1_AUTOFACTORY(CntByteItem, SfxPoolItem);
// virtual
bool CntByteItem::operator ==(const SfxPoolItem & rItem) const
{
- DBG_CHKTHIS(CntByteItem, 0);
DBG_ASSERT(rItem.ISA(CntByteItem),
"CntByteItem::operator ==(): Bad type");
return m_nValue == (static_cast< const CntByteItem * >(&rItem))->m_nValue;
@@ -41,7 +34,6 @@ bool CntByteItem::operator ==(const SfxPoolItem & rItem) const
// virtual
int CntByteItem::Compare(const SfxPoolItem & rWith) const
{
- DBG_CHKTHIS(CntByteItem, 0);
DBG_ASSERT(rWith.ISA(CntByteItem), "CntByteItem::Compare(): Bad type");
return (static_cast< const CntByteItem * >(&rWith))->m_nValue < m_nValue ?
-1 :
@@ -56,7 +48,6 @@ SfxItemPresentation CntByteItem::GetPresentation(SfxItemPresentation,
OUString & rText,
const IntlWrapper *) const
{
- DBG_CHKTHIS(CntByteItem, 0);
rText = OUString::number( m_nValue );
return SFX_ITEM_PRESENTATION_NAMELESS;
}
@@ -86,7 +77,6 @@ bool CntByteItem::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8)
// virtual
SfxPoolItem * CntByteItem::Create(SvStream & rStream, sal_uInt16) const
{
- DBG_CHKTHIS(CntByteItem, 0);
short nTheValue = 0;
rStream.ReadInt16( nTheValue );
return new CntByteItem(Which(), sal_uInt8(nTheValue));
@@ -95,7 +85,6 @@ SfxPoolItem * CntByteItem::Create(SvStream & rStream, sal_uInt16) const
// virtual
SvStream & CntByteItem::Store(SvStream & rStream, sal_uInt16) const
{
- DBG_CHKTHIS(CntByteItem, 0);
rStream.WriteInt16( short(m_nValue) );
return rStream;
}
@@ -103,43 +92,32 @@ SvStream & CntByteItem::Store(SvStream & rStream, sal_uInt16) const
// virtual
SfxPoolItem * CntByteItem::Clone(SfxItemPool *) const
{
- DBG_CHKTHIS(CntByteItem, 0);
return new CntByteItem(*this);
}
// virtual
sal_uInt8 CntByteItem::GetMin() const
{
- DBG_CHKTHIS(CntByteItem, 0);
return 0;
}
// virtual
sal_uInt8 CntByteItem::GetMax() const
{
- DBG_CHKTHIS(CntByteItem, 0);
return 255;
}
// virtual
SfxFieldUnit CntByteItem::GetUnit() const
{
- DBG_CHKTHIS(CntByteItem, 0);
return SFX_FUNIT_NONE;
}
-
-// class CntUInt16Item
-
-
-DBG_NAME(CntUInt16Item);
-
TYPEINIT1_AUTOFACTORY(CntUInt16Item, SfxPoolItem);
CntUInt16Item::CntUInt16Item(sal_uInt16 which, SvStream & rStream) :
SfxPoolItem(which)
{
- DBG_CTOR(CntUInt16Item, 0);
sal_uInt16 nTheValue = 0;
rStream.ReadUInt16( nTheValue );
m_nValue = nTheValue;
@@ -148,7 +126,6 @@ CntUInt16Item::CntUInt16Item(sal_uInt16 which, SvStream & rStream) :
// virtual
bool CntUInt16Item::operator ==(const SfxPoolItem & rItem) const
{
- DBG_CHKTHIS(CntUInt16Item, 0);
DBG_ASSERT(rItem.ISA(CntUInt16Item),
"CntUInt16Item::operator ==(): Bad type");
return m_nValue == (static_cast< const CntUInt16Item * >(&rItem))->
@@ -158,7 +135,6 @@ bool CntUInt16Item::operator ==(const SfxPoolItem & rItem) const
// virtual
int CntUInt16Item::Compare(const SfxPoolItem & rWith) const
{
- DBG_CHKTHIS(CntUInt16Item, 0);
DBG_ASSERT(rWith.ISA(CntUInt16Item),
"CntUInt16Item::Compare(): Bad type");
return (static_cast< const CntUInt16Item * >(&rWith))->m_nValue
@@ -176,7 +152,6 @@ SfxItemPresentation CntUInt16Item::GetPresentation(SfxItemPresentation,
const IntlWrapper *)
const
{
- DBG_CHKTHIS(CntUInt16Item, 0);
rText = OUString::number( m_nValue );
return SFX_ITEM_PRESENTATION_NAMELESS;
}
@@ -207,14 +182,12 @@ bool CntUInt16Item::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8)
// virtual
SfxPoolItem * CntUInt16Item::Create(SvStream & rStream, sal_uInt16) const
{
- DBG_CHKTHIS(CntUInt16Item, 0);
return new CntUInt16Item(Which(), rStream);
}
// virtual
SvStream & CntUInt16Item::Store(SvStream &rStream, sal_uInt16) const
{
- DBG_CHKTHIS(CntUInt16Item, 0);
rStream.WriteUInt16( sal_uInt16(m_nValue) );
return rStream;
}
@@ -222,44 +195,33 @@ SvStream & CntUInt16Item::Store(SvStream &rStream, sal_uInt16) const
// virtual
SfxPoolItem * CntUInt16Item::Clone(SfxItemPool *) const
{
- DBG_CHKTHIS(CntUInt16Item, 0);
return new CntUInt16Item(*this);
}
// virtual
sal_uInt16 CntUInt16Item::GetMin() const
{
- DBG_CHKTHIS(CntUInt16Item, 0);
return 0;
}
// virtual
sal_uInt16 CntUInt16Item::GetMax() const
{
- DBG_CHKTHIS(CntUInt16Item, 0);
return 65535;
}
// virtual
SfxFieldUnit CntUInt16Item::GetUnit() const
{
- DBG_CHKTHIS(CntUInt16Item, 0);
return SFX_FUNIT_NONE;
}
-
-// class CntInt32Item
-
-
-DBG_NAME(CntInt32Item);
-
TYPEINIT1_AUTOFACTORY(CntInt32Item, SfxPoolItem);
CntInt32Item::CntInt32Item(sal_uInt16 which, SvStream & rStream)
: SfxPoolItem(which)
, m_nValue(0)
{
- DBG_CTOR(CntInt32Item, 0);
//fdo#39428 SvStream no longer supports operator>>(long&)
rStream.ReadInt32( m_nValue );
}
@@ -267,7 +229,6 @@ CntInt32Item::CntInt32Item(sal_uInt16 which, SvStream & rStream)
// virtual
bool CntInt32Item::operator ==(const SfxPoolItem & rItem) const
{
- DBG_CHKTHIS(CntInt32Item, 0);
DBG_ASSERT(rItem.ISA(CntInt32Item),
"CntInt32Item::operator ==(): Bad type");
return m_nValue == (static_cast< const CntInt32Item * >(&rItem))->
@@ -277,7 +238,6 @@ bool CntInt32Item::operator ==(const SfxPoolItem & rItem) const
// virtual
int CntInt32Item::Compare(const SfxPoolItem & rWith) const
{
- DBG_CHKTHIS(CntInt32Item, 0);
DBG_ASSERT(rWith.ISA(CntInt32Item), "CntInt32Item::Compare(): Bad type");
return (static_cast< const CntInt32Item * >(&rWith))->m_nValue
< m_nValue ?
@@ -293,7 +253,6 @@ SfxItemPresentation CntInt32Item::GetPresentation(SfxItemPresentation,
OUString & rText,
const IntlWrapper *) const
{
- DBG_CHKTHIS(CntInt32Item, 0);
rText = OUString::number( m_nValue );
return SFX_ITEM_PRESENTATION_NAMELESS;
}
@@ -323,14 +282,12 @@ bool CntInt32Item::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8)
// virtual
SfxPoolItem * CntInt32Item::Create(SvStream & rStream, sal_uInt16) const
{
- DBG_CHKTHIS(CntInt32Item, 0);
return new CntInt32Item(Which(), rStream);
}
// virtual
SvStream & CntInt32Item::Store(SvStream &rStream, sal_uInt16) const
{
- DBG_CHKTHIS(CntInt32Item, 0);
//fdo#39428 SvStream no longer supports operator<<(long)
rStream.WriteInt32( m_nValue );
return rStream;
@@ -339,43 +296,32 @@ SvStream & CntInt32Item::Store(SvStream &rStream, sal_uInt16) const
// virtual
SfxPoolItem * CntInt32Item::Clone(SfxItemPool *) const
{
- DBG_CHKTHIS(CntInt32Item, 0);
return new CntInt32Item(*this);
}
// virtual
sal_Int32 CntInt32Item::GetMin() const
{
- DBG_CHKTHIS(CntInt32Item, 0);
return sal_Int32(0x80000000);
}
// virtual
sal_Int32 CntInt32Item::GetMax() const
{
- DBG_CHKTHIS(CntInt32Item, 0);
return 0x7FFFFFFF;
}
// virtual
SfxFieldUnit CntInt32Item::GetUnit() const
{
- DBG_CHKTHIS(CntInt32Item, 0);
return SFX_FUNIT_NONE;
}
-
-// class CntUInt32Item
-
-
-DBG_NAME(CntUInt32Item);
-
TYPEINIT1_AUTOFACTORY(CntUInt32Item, SfxPoolItem);
CntUInt32Item::CntUInt32Item(sal_uInt16 which, SvStream & rStream) :
SfxPoolItem(which)
{
- DBG_CTOR(CntUInt32Item, 0);
sal_uInt32 nTheValue = 0;
rStream.ReadUInt32( nTheValue );
m_nValue = nTheValue;
@@ -384,7 +330,6 @@ CntUInt32Item::CntUInt32Item(sal_uInt16 which, SvStream & rStream) :
// virtual
bool CntUInt32Item::operator ==(const SfxPoolItem & rItem) const
{
- DBG_CHKTHIS(CntUInt32Item, 0);
DBG_ASSERT(rItem.ISA(CntUInt32Item),
"CntUInt32Item::operator ==(): Bad type");
return m_nValue == (static_cast< const CntUInt32Item * >(&rItem))->
@@ -394,7 +339,6 @@ bool CntUInt32Item::operator ==(const SfxPoolItem & rItem) const
// virtual
int CntUInt32Item::Compare(const SfxPoolItem & rWith) const
{
- DBG_CHKTHIS(CntUInt32Item, 0);
DBG_ASSERT(rWith.ISA(CntUInt32Item),
"CntUInt32Item::operator ==(): Bad type");
return (static_cast< const CntUInt32Item * >(&rWith))->m_nValue
@@ -412,7 +356,6 @@ SfxItemPresentation CntUInt32Item::GetPresentation(SfxItemPresentation,
const IntlWrapper *)
const
{
- DBG_CHKTHIS(CntUInt32Item, 0);
rText = OUString::number(m_nValue);
return SFX_ITEM_PRESENTATION_NAMELESS;
}
@@ -444,14 +387,12 @@ bool CntUInt32Item::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8)
// virtual
SfxPoolItem * CntUInt32Item::Create(SvStream & rStream, sal_uInt16) const
{
- DBG_CHKTHIS(CntUInt32Item, 0);
return new CntUInt32Item(Which(), rStream);
}
// virtual
SvStream & CntUInt32Item::Store(SvStream &rStream, sal_uInt16) const
{
- DBG_CHKTHIS(CntUInt32Item, 0);
rStream.WriteUInt32( static_cast<sal_uInt32>(m_nValue) );
return rStream;
}
@@ -459,28 +400,24 @@ SvStream & CntUInt32Item::Store(SvStream &rStream, sal_uInt16) const
// virtual
SfxPoolItem * CntUInt32Item::Clone(SfxItemPool *) const
{
- DBG_CHKTHIS(CntUInt32Item, 0);
return new CntUInt32Item(*this);
}
// virtual
sal_uInt32 CntUInt32Item::GetMin() const
{
- DBG_CHKTHIS(CntUInt32Item, 0);
return 0;
}
// virtual
sal_uInt32 CntUInt32Item::GetMax() const
{
- DBG_CHKTHIS(CntUInt32Item, 0);
return 0xFFFFFFFF;
}
// virtual
SfxFieldUnit CntUInt32Item::GetUnit() const
{
- DBG_CHKTHIS(CntUInt32Item, 0);
return SFX_FUNIT_NONE;
}
diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx
index 856a109..a2ff0f6 100644
--- a/svl/source/items/custritm.cxx
+++ b/svl/source/items/custritm.cxx
@@ -23,18 +23,11 @@
#include <tools/stream.hxx>
#include <svl/custritm.hxx>
-
-// class CntUnencodedStringItem
-
-
-DBG_NAME(CntUnencodedStringItem)
-
TYPEINIT1_AUTOFACTORY(CntUnencodedStringItem, SfxPoolItem)
// virtual
bool CntUnencodedStringItem::operator ==(const SfxPoolItem & rItem) const
{
- DBG_CHKTHIS(CntUnencodedStringItem, 0);
DBG_ASSERT(rItem.ISA(CntUnencodedStringItem),
"CntUnencodedStringItem::operator ==(): Bad type");
return m_aValue
@@ -46,7 +39,6 @@ bool CntUnencodedStringItem::operator ==(const SfxPoolItem & rItem) const
int CntUnencodedStringItem::Compare(SfxPoolItem const & rWith) const
{
OSL_FAIL("CntUnencodedStringItem::Compare(): No international");
- DBG_CHKTHIS(CntUnencodedStringItem, 0);
DBG_ASSERT(rWith.ISA(CntUnencodedStringItem),
"CntUnencodedStringItem::Compare(): Bad type");
sal_Int32 nCmp = m_aValue.compareTo(
@@ -59,7 +51,6 @@ int CntUnencodedStringItem::Compare(SfxPoolItem const & rWith,
IntlWrapper const & rIntlWrapper)
const
{
- DBG_CHKTHIS(CntUnencodedStringItem, 0);
DBG_ASSERT(rWith.ISA(CntUnencodedStringItem),
"CntUnencodedStringItem::Compare(): Bad type");
return rIntlWrapper.getCollator()->compareString( m_aValue,
@@ -72,7 +63,6 @@ CntUnencodedStringItem::GetPresentation(SfxItemPresentation, SfxMapUnit,
SfxMapUnit, OUString & rText,
const IntlWrapper *) const
{
- DBG_CHKTHIS(CntUnencodedStringItem, 0);
rText = m_aValue;
return SFX_ITEM_PRESENTATION_NAMELESS;
}
@@ -102,7 +92,6 @@ bool CntUnencodedStringItem::PutValue(const com::sun::star::uno::Any& rVal,
// virtual
SfxPoolItem * CntUnencodedStringItem::Clone(SfxItemPool *) const
{
- DBG_CHKTHIS(CntUnencodedStringItem, 0);
return new CntUnencodedStringItem(*this);
}
diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index a99a6fa..dbd4cfe 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
@@ -22,10 +22,6 @@
#include <svl/poolitem.hxx>
#include <tools/stream.hxx>
-// STATIC DATA -----------------------------------------------------------
-
-DBG_NAME(SfxFlagItem)
-
sal_uInt16 nSfxFlagVal[16] =
{
0x0001, 0x0002, 0x0004, 0x0008,
@@ -45,7 +41,6 @@ SfxFlagItem::SfxFlagItem( sal_uInt16 nW, sal_uInt16 nV ) :
SfxPoolItem( nW ),
nVal(nV)
{
- DBG_CTOR(SfxFlagItem, 0);
}
@@ -54,14 +49,12 @@ SfxFlagItem::SfxFlagItem( const SfxFlagItem& rItem ) :
SfxPoolItem( rItem ),
nVal( rItem.nVal )
{
- DBG_CTOR(SfxFlagItem, 0);
}
SvStream& SfxFlagItem::Store(SvStream &rStream, sal_uInt16) const
{
- DBG_CHKTHIS(SfxFlagItem, 0);
rStream.WriteUInt16( nVal );
return rStream;
}
@@ -77,7 +70,6 @@ SfxItemPresentation SfxFlagItem::GetPresentation
const IntlWrapper *
) const
{
- DBG_CHKTHIS(SfxFlagItem, 0);
rText = OUString();
for ( sal_uInt8 nFlag = 0; nFlag < GetFlagCount(); ++nFlag )
rText += GetFlag(nFlag) ? OUString("true") : OUString("false");
@@ -88,7 +80,6 @@ SfxItemPresentation SfxFlagItem::GetPresentation
sal_uInt8 SfxFlagItem::GetFlagCount() const
{
- DBG_CHKTHIS(SfxFlagItem, 0);
DBG_WARNING( "calling GetValueText(sal_uInt16) on SfxFlagItem -- overload!" );
return 0;
}
@@ -97,7 +88,6 @@ sal_uInt8 SfxFlagItem::GetFlagCount() const
SfxPoolItem* SfxFlagItem::Create(SvStream &, sal_uInt16) const
{
- DBG_CHKTHIS(SfxFlagItem, 0);
DBG_WARNING( "calling Create() on SfxFlagItem -- overload!" );
return 0;
}
@@ -106,7 +96,6 @@ SfxPoolItem* SfxFlagItem::Create(SvStream &, sal_uInt16) const
bool SfxFlagItem::operator==( const SfxPoolItem& rItem ) const
{
- DBG_CHKTHIS(SfxFlagItem, 0);
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
return (((SfxFlagItem&)rItem).nVal == nVal);
}
@@ -116,7 +105,6 @@ bool SfxFlagItem::operator==( const SfxPoolItem& rItem ) const
SfxPoolItem* SfxFlagItem::Clone(SfxItemPool *) const
{
- DBG_CHKTHIS(SfxFlagItem, 0);
return new SfxFlagItem( *this );
}
diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx
index d353cbf..3fa147c 100644
--- a/svl/source/items/intitem.cxx
+++ b/svl/source/items/intitem.cxx
@@ -38,18 +38,11 @@ SfxPoolItem * SfxByteItem::Create(SvStream & rStream, sal_uInt16) const
return new SfxByteItem(Which(), sal_uInt8(nValue));
}
-
-// class SfxInt16Item
-
-
-DBG_NAME(SfxInt16Item);
-
TYPEINIT1_AUTOFACTORY(SfxInt16Item, SfxPoolItem);
SfxInt16Item::SfxInt16Item(sal_uInt16 which, SvStream & rStream):
SfxPoolItem(which)
{
- DBG_CTOR(SfxInt16Item, 0);
short nTheValue = 0;
rStream.ReadInt16( nTheValue );
m_nValue = nTheValue;
@@ -58,7 +51,6 @@ SfxInt16Item::SfxInt16Item(sal_uInt16 which, SvStream & rStream):
// virtual
bool SfxInt16Item::operator ==(const SfxPoolItem & rItem) const
{
- DBG_CHKTHIS(SfxInt16Item, 0);
DBG_ASSERT(SfxPoolItem::operator ==(rItem), "unequal type");
return m_nValue == (static_cast< const SfxInt16Item * >(&rItem))->
m_nValue;
@@ -67,7 +59,6 @@ bool SfxInt16Item::operator ==(const SfxPoolItem & rItem) const
// virtual
int SfxInt16Item::Compare(const SfxPoolItem & rWith) const
{
- DBG_CHKTHIS(SfxInt16Item, 0);
DBG_ASSERT(SfxPoolItem::operator ==(rWith), "unequal type");
return (static_cast< const SfxInt16Item * >(&rWith))->m_nValue
< m_nValue ?
@@ -83,7 +74,6 @@ SfxItemPresentation SfxInt16Item::GetPresentation(SfxItemPresentation,
OUString & rText,
const IntlWrapper *) const
{
- DBG_CHKTHIS(SfxInt16Item, 0);
rText = OUString::number(m_nValue);
return SFX_ITEM_PRESENTATION_NAMELESS;
}
@@ -114,39 +104,33 @@ bool SfxInt16Item::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 )
// virtual
SfxPoolItem * SfxInt16Item::Create(SvStream & rStream, sal_uInt16) const
{
- DBG_CHKTHIS(SfxInt16Item, 0);
return new SfxInt16Item(Which(), rStream);
}
// virtual
SvStream & SfxInt16Item::Store(SvStream & rStream, sal_uInt16) const
{
- DBG_CHKTHIS(SfxInt16Item, 0);
rStream.WriteInt16( short(m_nValue) );
return rStream;
}
SfxPoolItem * SfxInt16Item::Clone(SfxItemPool *) const
{
- DBG_CHKTHIS(SfxInt16Item, 0);
return new SfxInt16Item(*this);
}
sal_Int16 SfxInt16Item::GetMin() const
{
- DBG_CHKTHIS(SfxInt16Item, 0);
return -32768;
}
sal_Int16 SfxInt16Item::GetMax() const
{
- DBG_CHKTHIS(SfxInt16Item, 0);
return 32767;
}
SfxFieldUnit SfxInt16Item::GetUnit() const
{
- DBG_CHKTHIS(SfxInt16Item, 0);
return SFX_FUNIT_NONE;
}
@@ -170,31 +154,21 @@ TYPEINIT1_AUTOFACTORY(SfxInt32Item, CntInt32Item);
TYPEINIT1_AUTOFACTORY(SfxUInt32Item, CntUInt32Item);
-
-
-// class SfxMetricItem
-
-
-DBG_NAME(SfxMetricItem);
-
TYPEINIT1_AUTOFACTORY(SfxMetricItem, SfxInt32Item);
SfxMetricItem::SfxMetricItem(sal_uInt16 which, sal_uInt32 nValue):
SfxInt32Item(which, nValue)
{
- DBG_CTOR(SfxMetricItem, 0);
}
SfxMetricItem::SfxMetricItem(sal_uInt16 which, SvStream & rStream):
SfxInt32Item(which, rStream)
{
- DBG_CTOR(SfxMetricItem, 0);
}
SfxMetricItem::SfxMetricItem(const SfxMetricItem & rItem):
SfxInt32Item(rItem)
{
- DBG_CTOR(SfxMetricItem, 0);
}
// virtual
diff --git a/svl/source/items/itemiter.cxx b/svl/source/items/itemiter.cxx
index cf87b2f..a2cd703 100644
--- a/svl/source/items/itemiter.cxx
+++ b/svl/source/items/itemiter.cxx
@@ -22,18 +22,9 @@
#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
-// STATIC DATA -----------------------------------------------------------
-
-DBG_NAME(SfxItemIter);
-
-
-
-
-
SfxItemIter::SfxItemIter( const SfxItemSet& rItemSet )
: _rSet( rItemSet )
{
- DBG_CTOR(SfxItemIter, 0);
DBG_ASSERTWARNING( _rSet.Count(), "es gibt gar keine Attribute" );
if ( !_rSet._nCount )
@@ -63,7 +54,6 @@ SfxItemIter::SfxItemIter( const SfxItemSet& rItemSet )
SfxItemIter::~SfxItemIter()
{
- DBG_DTOR(SfxItemIter, 0);
}
@@ -71,7 +61,6 @@ SfxItemIter::~SfxItemIter()
const SfxPoolItem* SfxItemIter::NextItem()
{
- DBG_CHKTHIS(SfxItemIter, 0);
SfxItemArray ppFnd = _rSet._aItems;
if( _nAkt < _nEnd )
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 861a3fa..f8ec993 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -93,7 +93,6 @@ void SfxItemPool::RemoveSfxItemPoolUser(SfxItemPoolUser& rOldUser)
const SfxPoolItem* SfxItemPool::GetPoolDefaultItem( sal_uInt16 nWhich ) const
{
- DBG_CHKTHIS(SfxItemPool, 0);
const SfxPoolItem* pRet;
if( IsInRange( nWhich ) )
pRet = *(pImp->ppPoolDefaults + GetIndex_Impl( nWhich ));
@@ -185,8 +184,6 @@ SfxItemPool::SfxItemPool
pItemInfos(pInfos),
pImp( new SfxItemPool_Impl( this, rName, nStartWhich, nEndWhich ) )
{
- DBG_CTOR(SfxItemPool, 0);
-
pImp->eDefMetric = SFX_MAPUNIT_TWIP;
pImp->nVersion = 0;
pImp->bStreaming = false;
@@ -230,7 +227,6 @@ SfxItemPool::SfxItemPool
pItemInfos(rPool.pItemInfos),
pImp( new SfxItemPool_Impl( this, rPool.pImp->aName, rPool.pImp->mnStart, rPool.pImp->mnEnd ) )
{
- DBG_CTOR(SfxItemPool, 0);
pImp->eDefMetric = rPool.pImp->eDefMetric;
pImp->nVersion = rPool.pImp->nVersion;
pImp->bStreaming = false;
@@ -283,7 +279,6 @@ SfxItemPool::SfxItemPool
void SfxItemPool::SetDefaults( SfxPoolItem **pDefaults )
{
- DBG_CHKTHIS(SfxItemPool, 0);
DBG_ASSERT( pDefaults, "erst wollen, dann nichts geben..." );
DBG_ASSERT( !pImp->ppStaticDefaults, "habe schon defaults" );
@@ -383,8 +378,6 @@ void SfxItemPool::ReleaseDefaults
SfxItemPool::~SfxItemPool()
{
- DBG_DTOR(SfxItemPool, 0);
-
if ( !pImp->maPoolItems.empty() && pImp->ppPoolDefaults )
Delete();
@@ -494,8 +487,6 @@ void SfxItemPool::SetItemInfos(SfxItemInfo const*const pInfos)
SfxMapUnit SfxItemPool::GetMetric( sal_uInt16 ) const
{
- DBG_CHKTHIS(SfxItemPool, 0);
-
return pImp->eDefMetric;
}
@@ -503,8 +494,6 @@ SfxMapUnit SfxItemPool::GetMetric( sal_uInt16 ) const
void SfxItemPool::SetDefaultMetric( SfxMapUnit eNewMetric )
{
- DBG_CHKTHIS(SfxItemPool, 0);
-
pImp->eDefMetric = eNewMetric;
}
@@ -524,7 +513,6 @@ SfxItemPresentation SfxItemPool::GetPresentation
const IntlWrapper * pIntlWrapper
) const
{
- DBG_CHKTHIS(SfxItemPool, 0);
return rItem.GetPresentation(
ePresent, GetMetric(rItem.Which()), eMetric, rText, pIntlWrapper );
}
@@ -534,8 +522,6 @@ SfxItemPresentation SfxItemPool::GetPresentation
SfxItemPool* SfxItemPool::Clone() const
{
- DBG_CHKTHIS(SfxItemPool, 0);
-
SfxItemPool *pPool = new SfxItemPool( *this );
return pPool;
}
@@ -544,8 +530,6 @@ SfxItemPool* SfxItemPool::Clone() const
void SfxItemPool::Delete()
{
- DBG_CHKTHIS(SfxItemPool, 0);
-
// schon deleted?
if ( pImp->maPoolItems.empty() || !pImp->ppPoolDefaults )
return;
@@ -635,7 +619,6 @@ void SfxItemPool::Delete()
void SfxItemPool::SetPoolDefaultItem(const SfxPoolItem &rItem)
{
- DBG_CHKTHIS(SfxItemPool, 0);
if ( IsInRange(rItem.Which()) )
{
SfxPoolItem **ppOldDefault =
@@ -663,7 +646,6 @@ void SfxItemPool::SetPoolDefaultItem(const SfxPoolItem &rItem)
*/
void SfxItemPool::ResetPoolDefaultItem( sal_uInt16 nWhichId )
{
- DBG_CHKTHIS(SfxItemPool, 0);
if ( IsInRange(nWhichId) )
{
SfxPoolItem **ppOldDefault =
@@ -690,7 +672,6 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
0 != &((const SfxSetItem&)rItem).GetItemSet(),
"SetItem without ItemSet" );
- DBG_CHKTHIS(SfxItemPool, 0);
if ( 0 == nWhich )
nWhich = rItem.Which();
@@ -815,8 +796,6 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
void SfxItemPool::Remove( const SfxPoolItem& rItem )
{
- DBG_CHKTHIS(SfxItemPool, 0);
-
DBG_ASSERT( !rItem.ISA(SfxSetItem) ||
0 != &((const SfxSetItem&)rItem).GetItemSet(),
"SetItem without ItemSet" );
@@ -896,8 +875,6 @@ void SfxItemPool::Remove( const SfxPoolItem& rItem )
const SfxPoolItem& SfxItemPool::GetDefaultItem( sal_uInt16 nWhich ) const
{
- DBG_CHKTHIS(SfxItemPool, 0);
-
if ( !IsInRange(nWhich) )
{
if ( pImp->mpSecondary )
@@ -945,7 +922,6 @@ void SfxItemPool::FreezeIdRanges()
void SfxItemPool::FillItemIdRanges_Impl( sal_uInt16*& pWhichRanges ) const
{
- DBG_CHKTHIS(SfxItemPool, 0);
DBG_ASSERT( !pImp->mpPoolRanges, "GetFrozenRanges() would be faster!" );
const SfxItemPool *pPool;
@@ -971,8 +947,6 @@ const sal_uInt16* SfxItemPool::GetFrozenIdRanges() const
const SfxPoolItem *SfxItemPool::GetItem2(sal_uInt16 nWhich, sal_uInt32 nOfst) const
{
- DBG_CHKTHIS(SfxItemPool, 0);
-
if ( !IsInRange(nWhich) )
{
if ( pImp->mpSecondary )
@@ -996,8 +970,6 @@ const SfxPoolItem *SfxItemPool::GetItem2(sal_uInt16 nWhich, sal_uInt32 nOfst) co
sal_uInt32 SfxItemPool::GetItemCount2(sal_uInt16 nWhich) const
{
- DBG_CHKTHIS(SfxItemPool, 0);
-
if ( !IsInRange(nWhich) )
{
if ( pImp->mpSecondary )
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 2ce1935..cd48ed6 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -40,9 +40,6 @@ static const sal_uInt16 nInitCount = 10; // einzelne USHORTs => 5 Paare ohne '0'
static sal_uLong nRangesCopyCount = 0; // wie oft wurden Ranges kopiert
#endif
-DBG_NAME(SfxItemSet)
-
-
#include "nranges.cxx"
@@ -103,7 +100,6 @@ SfxItemSet::SfxItemSet
_pParent( 0 ),
_nCount( 0 )
{
- DBG_CTOR(SfxItemSet, DbgCheckItemSet);
DBG_ASSERTWARNING( _pPool == _pPool->GetMasterPool(), "kein Master-Pool" );
DBG( _pChildCountCtor; *_pChildCount(this) = 0 );
// DBG_ASSERT( bTotalRanges || abs( &bTotalRanges - this ) < 1000,
@@ -132,7 +128,6 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhic
_pParent( 0 ),
_nCount( 0 )
{
- DBG_CTOR(SfxItemSet, DbgCheckItemSet);
DBG_ASSERT( nWhich1 <= nWhich2, "Ungueltiger Bereich" );
DBG_ASSERTWARNING( _pPool == _pPool->GetMasterPool(), "kein Master-Pool" );
DBG( _pChildCountCtor; *_pChildCount(this) = 0 );
@@ -144,7 +139,6 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhic
void SfxItemSet::InitRanges_Impl(sal_uInt16 nWh1, sal_uInt16 nWh2)
{
- DBG_CHKTHIS(SfxItemSet, 0);
_pWhichRanges = new sal_uInt16[ 3 ];
*(_pWhichRanges+0) = nWh1;
*(_pWhichRanges+1) = nWh2;
@@ -158,8 +152,6 @@ void SfxItemSet::InitRanges_Impl(sal_uInt16 nWh1, sal_uInt16 nWh2)
void SfxItemSet::InitRanges_Impl(va_list pArgs, sal_uInt16 nWh1, sal_uInt16 nWh2, sal_uInt16 nNull)
{
- DBG_CHKTHIS(SfxItemSet, 0);
-
sal_uInt16 nSize = InitializeRanges_Impl( _pWhichRanges, pArgs, nWh1, nWh2, nNull );
_aItems = new const SfxPoolItem* [ nSize ];
memset( (void*) _aItems, 0, sizeof( SfxPoolItem* ) * nSize );
@@ -174,7 +166,6 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool,
_pWhichRanges( 0 ),
_nCount( 0 )
{
- DBG_CTOR(SfxItemSet, DbgCheckItemSet);
DBG_ASSERT( nWh1 <= nWh2, "Ungueltiger Bereich" );
DBG_ASSERTWARNING( _pPool == _pPool->GetMasterPool(), "kein Master-Pool" );
DBG( _pChildCountCtor; *_pChildCount(this) = 0 );
@@ -198,7 +189,6 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool,
void SfxItemSet::InitRanges_Impl(const sal_uInt16 *pWhichPairTable)
{
- DBG_CHKTHIS(SfxItemSet, 0);
#if OSL_DEBUG_LEVEL > 1
OSL_TRACE("SfxItemSet: Ranges-CopyCount==%ul", ++nRangesCopyCount);
#endif
@@ -229,7 +219,6 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool, const sal_uInt16* pWhichPairTable )
, _pWhichRanges(0)
, _nCount(0)
{
- DBG_CTOR(SfxItemSet, 0);
DBG_ASSERTWARNING( _pPool == _pPool->GetMasterPool(), "kein Master-Pool" );
DBG( _pChildCountCtor; *_pChildCount(this) = 0 );
@@ -243,7 +232,6 @@ SfxItemSet::SfxItemSet( const SfxItemSet& rASet ):
_pParent( rASet._pParent ),
_nCount( rASet._nCount )
{
- DBG_CTOR(SfxItemSet, DbgCheckItemSet);
DBG_ASSERTWARNING( _pPool == _pPool->GetMasterPool(), "kein Master-Pool" );
DBG( _pChildCountCtor; *_pChildCount(this) = 0 );
DBG( ++*_pChildCount(_pParent) );
@@ -292,7 +280,6 @@ SfxItemSet::SfxItemSet( const SfxItemSet& rASet ):
SfxItemSet::~SfxItemSet()
{
- DBG_DTOR(SfxItemSet, DbgCheckItemSet);
#ifdef DBG_UTIL
DBG( DBG_ASSERT( 0 == *_pChildCount(this), "SfxItemSet: deleting parent-itemset" ) )
#endif
@@ -336,7 +323,6 @@ sal_uInt16 SfxItemSet::ClearItem( sal_uInt16 nWhich )
// einzelnes Item oder alle Items (nWhich==0) l"oschen
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
if( !Count() )
return 0;
@@ -433,7 +419,6 @@ sal_uInt16 SfxItemSet::ClearItem( sal_uInt16 nWhich )
void SfxItemSet::ClearInvalidItems( sal_Bool bHardDefault )
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
sal_uInt16* pPtr = _pWhichRanges;
SfxItemArray ppFnd = _aItems;
if ( bHardDefault )
@@ -459,7 +444,6 @@ void SfxItemSet::ClearInvalidItems( sal_Bool bHardDefault )
void SfxItemSet::InvalidateDefaultItems()
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
sal_uInt16* pPtr = _pWhichRanges;
SfxItemArray ppFnd = _aItems;
@@ -477,7 +461,6 @@ void SfxItemSet::InvalidateDefaultItems()
void SfxItemSet::InvalidateAllItems()
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
DBG_ASSERT( !_nCount, "Es sind noch Items gesetzt" );
memset( (void*)_aItems, -1, ( _nCount = TotalCount() ) * sizeof( SfxPoolItem*) );
@@ -489,7 +472,6 @@ SfxItemState SfxItemSet::GetItemState( sal_uInt16 nWhich,
bool bSrchInParent,
const SfxPoolItem **ppItem ) const
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
// suche den Bereich in dem das Which steht:
const SfxItemSet* pAktSet = this;
SfxItemState eRet = SFX_ITEM_UNKNOWN;
@@ -552,7 +534,6 @@ bool SfxItemSet::HasItem(sal_uInt16 nWhich, const SfxPoolItem** ppItem) const
const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich )
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
DBG_ASSERT( !rItem.ISA(SfxSetItem) ||
0 != &((const SfxSetItem&)rItem).GetItemSet(),
"SetItem without ItemSet" );
@@ -632,7 +613,6 @@ const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
bool SfxItemSet::Put( const SfxItemSet& rSet, bool bInvalidAsDefault )
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
bool bRet = false;
if( rSet.Count() )
{
@@ -688,8 +668,6 @@ void SfxItemSet::PutExtended
*/
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
-
// don't "optimize" with "if( rSet.Count()" because of dont-care + defaults
SfxItemArray ppFnd = rSet._aItems;
const sal_uInt16* pPtr = rSet._pWhichRanges;
@@ -905,7 +883,6 @@ bool SfxItemSet::Set
*/
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
bool bRet = false;
if ( _nCount )
ClearItem();
@@ -975,7 +952,6 @@ const SfxPoolItem* SfxItemSet::GetItem
const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, sal_Bool bSrchInParent) const
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
// suche den Bereich in dem das Which steht:
const SfxItemSet* pAktSet = this;
do
@@ -1034,14 +1010,12 @@ const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, sal_Bool bSrchInParent) c
void SfxItemSet::Changed( const SfxPoolItem&, const SfxPoolItem& )
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
}
sal_uInt16 SfxItemSet::TotalCount() const
{
- DBG_CHKTHIS(SfxItemSet, 0); // wird im Ctor benutzt bevor vollst. init.
sal_uInt16 nRet = 0;
sal_uInt16* pPtr = _pWhichRanges;
while( *pPtr )
@@ -1057,7 +1031,6 @@ sal_uInt16 SfxItemSet::TotalCount() const
void SfxItemSet::Intersect( const SfxItemSet& rSet )
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
DBG_ASSERT(_pPool, "nicht implementiert ohne Pool");
if( !Count() ) // gar keine gesetzt ?
return;
@@ -1136,7 +1109,6 @@ void SfxItemSet::Intersect( const SfxItemSet& rSet )
void SfxItemSet::Differentiate( const SfxItemSet& rSet )
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
if( !Count() || !rSet.Count() ) // gar keine gesetzt ?
return;
@@ -1354,7 +1326,6 @@ static void MergeItem_Impl( SfxItemPool *_pPool, sal_uInt16 &rCount,
void SfxItemSet::MergeValues( const SfxItemSet& rSet, sal_Bool bIgnoreDefaults )
{
// Achtung!!! Bei Aenderungen/Bugfixes immer obenstehende Tabelle pflegen!
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
DBG_ASSERT( GetPool() == rSet.GetPool(), "MergeValues mit verschiedenen Pools" );
// teste mal, ob sich die Which-Bereiche unterscheiden.
@@ -1411,7 +1382,6 @@ void SfxItemSet::MergeValues( const SfxItemSet& rSet, sal_Bool bIgnoreDefaults )
void SfxItemSet::MergeValue( const SfxPoolItem& rAttr, sal_Bool bIgnoreDefaults )
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
SfxItemArray ppFnd = _aItems;
const sal_uInt16* pPtr = _pWhichRanges;
const sal_uInt16 nWhich = rAttr.Which();
@@ -1433,7 +1403,6 @@ void SfxItemSet::MergeValue( const SfxPoolItem& rAttr, sal_Bool bIgnoreDefaults
void SfxItemSet::InvalidateItem( sal_uInt16 nWhich )
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
SfxItemArray ppFnd = _aItems;
const sal_uInt16* pPtr = _pWhichRanges;
while( *pPtr )
@@ -1467,7 +1436,6 @@ void SfxItemSet::InvalidateItem( sal_uInt16 nWhich )
sal_uInt16 SfxItemSet::GetWhichByPos( sal_uInt16 nPos ) const
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
sal_uInt16 n = 0;
sal_uInt16* pPtr = _pWhichRanges;
while( *pPtr )
@@ -1506,7 +1474,6 @@ SvStream &SfxItemSet::Store
*/
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
DBG_ASSERT( _pPool, "Kein Pool" );
DBG_ASSERTWARNING( _pPool == _pPool->GetMasterPool(), "kein Master-Pool" );
@@ -1578,7 +1545,6 @@ SvStream &SfxItemSet::Load
*/
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
DBG_ASSERT( _pPool, "Kein Pool");
DBG_ASSERTWARNING( _pPool == _pPool->GetMasterPool(), "Kein Master-Pool");
@@ -1629,9 +1595,6 @@ SvStream &SfxItemSet::Load
bool SfxItemSet::operator==(const SfxItemSet &rCmp) const
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
- DBG_CHKOBJ(&rCmp, SfxItemSet, DbgCheckItemSet);
-
// besonders schnell zu ermittelnde Werte muessen gleich sein
if ( _pParent != rCmp._pParent ||
_pPool != rCmp._pPool ||
@@ -1699,7 +1662,6 @@ bool SfxItemSet::operator==(const SfxItemSet &rCmp) const
SfxItemSet *SfxItemSet::Clone(sal_Bool bItems, SfxItemPool *pToPool ) const
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
if ( pToPool && pToPool != _pPool )
{
SfxItemSet *pNewSet = new SfxItemSet( *pToPool, _pWhichRanges );
@@ -1727,7 +1689,6 @@ SfxItemSet *SfxItemSet::Clone(sal_Bool bItems, SfxItemPool *pToPool ) const
int SfxItemSet::PutDirect(const SfxPoolItem &rItem)
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
SfxItemArray ppFnd = _aItems;
const sal_uInt16* pPtr = _pWhichRanges;
const sal_uInt16 nWhich = rItem.Which();
@@ -2009,7 +1970,6 @@ const SfxPoolItem* SfxAllItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhi
void SfxItemSet::DisableItem(sal_uInt16 nWhich)
{
- DBG_CHKTHIS(SfxItemSet, 0);
Put( SfxVoidItem(0), nWhich );
}
@@ -2017,7 +1977,6 @@ void SfxItemSet::DisableItem(sal_uInt16 nWhich)
SfxItemSet *SfxAllItemSet::Clone(sal_Bool bItems, SfxItemPool *pToPool ) const
{
- DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
if ( pToPool && pToPool != _pPool )
{
SfxAllItemSet *pNewSet = new SfxAllItemSet( *pToPool );
diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx
index d49a431..23010ae 100644
--- a/svl/source/items/poolcach.cxx
+++ b/svl/source/items/poolcach.cxx
@@ -24,11 +24,6 @@
#include <svl/itemset.hxx>
#include <svl/poolcach.hxx>
-// STATIC DATA -----------------------------------------------------------
-
-DBG_NAME(SfxItemPoolCache)
-
-
SfxItemPoolCache::SfxItemPoolCache( SfxItemPool *pItemPool,
const SfxPoolItem *pPutItem ):
pPool(pItemPool),
@@ -36,7 +31,6 @@ SfxItemPoolCache::SfxItemPoolCache( SfxItemPool *pItemPool,
pSetToPut( 0 ),
pItemToPut( &pItemPool->Put(*pPutItem) )
{
- DBG_CTOR(SfxItemPoolCache, 0);
DBG_ASSERT(pItemPool, "kein Pool angegeben");
}
@@ -48,14 +42,12 @@ SfxItemPoolCache::SfxItemPoolCache( SfxItemPool *pItemPool,
pSetToPut( pPutSet ),
pItemToPut( 0 )
{
- DBG_CTOR(SfxItemPoolCache, 0);
DBG_ASSERT(pItemPool, "kein Pool angegeben");
}
SfxItemPoolCache::~SfxItemPoolCache()
{
- DBG_DTOR(SfxItemPoolCache, 0);
for ( size_t nPos = 0; nPos < pCache->size(); ++nPos ) {
pPool->Remove( *(*pCache)[nPos].pPoolItem );
pPool->Remove( *(*pCache)[nPos].pOrigItem );
@@ -69,7 +61,6 @@ SfxItemPoolCache::~SfxItemPoolCache()
const SfxSetItem& SfxItemPoolCache::ApplyTo( const SfxSetItem &rOrigItem, bool bNew )
{
- DBG_CHKTHIS(SfxItemPoolCache, 0);
DBG_ASSERT( pPool == rOrigItem.GetItemSet().GetPool(), "invalid Pool" );
DBG_ASSERT( IsDefaultItem( &rOrigItem ) || IsPooledItem( &rOrigItem ),
"original not in pool" );
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 7f2dc56..4b7b15e 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -30,11 +30,6 @@
#include "poolio.hxx"
#include <boost/scoped_array.hpp>
-// STATIC DATA -----------------------------------------------------------
-
-DBG_NAME(SfxItemPool);
-
-
const SfxItemPool* SfxItemPool::GetStoringPool()
/* [Beschreibung]
@@ -107,8 +102,6 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
*/
{
- DBG_CHKTHIS(SfxItemPool, 0);
-
// Store-Master finden
SfxItemPool *pStoreMaster = pImp->mpMaster != this ? pImp->mpMaster : 0;
while ( pStoreMaster && !pStoreMaster->pImp->bStreaming )
@@ -466,7 +459,6 @@ void SfxItemPool_Impl::readTheItems (
SvStream &SfxItemPool::Load(SvStream &rStream)
{
- DBG_CHKTHIS(SfxItemPool, 0);
DBG_ASSERT(pImp->ppStaticDefaults, "kein DefaultArray");
// protect items by increasing ref count
@@ -710,7 +702,6 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
sal_uInt16 SfxItemPool::GetIndex_Impl(sal_uInt16 nWhich) const
{
- DBG_CHKTHIS(SfxItemPool, 0);
DBG_ASSERT(nWhich >= pImp->mnStart && nWhich <= pImp->mnEnd, "Which-Id nicht im Pool-Bereich");
return nWhich - pImp->mnStart;
}
@@ -1160,7 +1151,6 @@ bool SfxItemPool::StoreSurrogate
sal_uInt32 SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const
{
- DBG_CHKTHIS(SfxItemPool, 0);
DBG_ASSERT( pItem, "no 0-Pointer Surrogate" );
DBG_ASSERT( !IsInvalidItem(pItem), "no Invalid-Item Surrogate" );
DBG_ASSERT( !IsPoolDefaultItem(pItem), "no Pool-Default-Item Surrogate" );
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index d2e1361..22e57f3 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -21,15 +21,6 @@
#include <svl/poolitem.hxx>
#include <tools/stream.hxx>
-// STATIC DATA -----------------------------------------------------------
-
-DBG_NAME(SfxPoolItem)
-DBG_NAME(SfxVoidItem)
-// @@@ DBG_NAME(SfxInvalidItem);
-DBG_NAME(SfxItemHandle)
-
-// RTTI ------------------------------------------------------------------
-
TYPEINIT0(SfxPoolItem);
TYPEINIT1(SfxVoidItem, SfxPoolItem);
// @@@ TYPEINIT1(SfxInvalidItem, SfxPoolItem);
@@ -55,7 +46,6 @@ SfxPoolItem::SfxPoolItem(sal_uInt16 const nWhich)
, m_nWhich(nWhich)
, m_nKind(0)
{
- DBG_CTOR(SfxPoolItem, 0);
DBG_ASSERT(nWhich <= SHRT_MAX, "invalid WhichId");
#if OSL_DEBUG_LEVEL > 1
++nItemCount;
@@ -93,7 +83,6 @@ SfxPoolItem::SfxPoolItem( const SfxPoolItem& rCpy )
, m_nWhich(rCpy.Which()) // call function because of ChkThis() (WTF does that mean?)
, m_nKind( 0 )
{
- DBG_CTOR(SfxPoolItem, 0);
#if OSL_DEBUG_LEVEL > 1
++nItemCount;
if ( pw1 && nItemCount>=10000 )
@@ -127,7 +116,6 @@ SfxPoolItem::SfxPoolItem( const SfxPoolItem& rCpy )
SfxPoolItem::~SfxPoolItem()
{
- DBG_DTOR(SfxPoolItem, 0);
DBG_ASSERT(m_nRefCount == 0 || m_nRefCount > SFX_ITEMS_MAXREF,
"destroying item in use");
#if OSL_DEBUG_LEVEL > 1
@@ -150,28 +138,24 @@ int SfxPoolItem::Compare( const SfxPoolItem& rWith, const IntlWrapper& ) const
bool SfxPoolItem::operator==( const SfxPoolItem& rCmp ) const
{
- DBG_CHKTHIS(SfxPoolItem, 0);
return rCmp.Type() == Type();
}
SfxPoolItem* SfxPoolItem::Create(SvStream &, sal_uInt16) const
{
- DBG_CHKTHIS(SfxPoolItem, 0);
return Clone(0);
}
sal_uInt16 SfxPoolItem::GetVersion( sal_uInt16 ) const
{
- DBG_CHKTHIS(SfxPoolItem, 0);
return 0;
}
SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const
{
- DBG_CHKTHIS(SfxPoolItem, 0);
return rStream;
}
@@ -263,14 +247,12 @@ SfxItemPresentation SfxPoolItem::GetPresentation
SfxVoidItem::SfxVoidItem( sal_uInt16 which ):
SfxPoolItem(which)
{
- DBG_CTOR(SfxVoidItem, 0);
}
// SfxVoidItem ------------------------------------------------------------
SfxVoidItem::SfxVoidItem( const SfxVoidItem& rCopy):
SfxPoolItem(rCopy)
{
- DBG_CTOR(SfxVoidItem, 0);
}
@@ -280,7 +262,6 @@ rCmp
#endif
) const
{
- DBG_CHKTHIS(SfxVoidItem, 0);
DBG_ASSERT( SfxPoolItem::operator==( rCmp ), "unequal type" );
return true;
}
@@ -295,7 +276,6 @@ SfxItemPresentation SfxVoidItem::GetPresentation
const IntlWrapper *
) const
{
- DBG_CHKTHIS(SfxVoidItem, 0);
rText = "Void";
return SFX_ITEM_PRESENTATION_NAMELESS;
}
@@ -303,7 +283,6 @@ SfxItemPresentation SfxVoidItem::GetPresentation
SfxPoolItem* SfxVoidItem::Clone(SfxItemPool *) const
{
- DBG_CHKTHIS(SfxVoidItem, 0);
return new SfxVoidItem(*this);
}
@@ -314,7 +293,6 @@ SfxItemHandle::SfxItemHandle(SfxPoolItem &rItem):
pRef(new sal_uInt16(1)),
pItem(rItem.Clone(0))
{
- DBG_CTOR(SfxItemHandle, 0);
}
@@ -322,14 +300,12 @@ SfxItemHandle::SfxItemHandle(const SfxItemHandle &rCopy):
pRef(rCopy.pRef),
pItem(rCopy.pItem)
{
- DBG_CTOR(SfxItemHandle, 0);
++(*pRef);
}
const SfxItemHandle &SfxItemHandle::operator=(const SfxItemHandle &rCopy)
{
- DBG_CHKTHIS(SfxItemHandle, 0);
if(&rCopy == this || pItem == rCopy.pItem)
return *this;
--(*pRef);
@@ -347,7 +323,6 @@ const SfxItemHandle &SfxItemHandle::operator=(const SfxItemHandle &rCopy)
SfxItemHandle::~SfxItemHandle()
{
- DBG_DTOR(SfxItemHandle, 0);
--(*pRef);
if(!(*pRef)) {
delete pRef; pRef = 0;
@@ -385,7 +360,6 @@ bool SfxPoolItem::PutValue( const com::sun::star::uno::Any&, sal_uInt8 )
SfxVoidItem::~SfxVoidItem()
{
- DBG_DTOR(SfxVoidItem, 0);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index b032a37..1b66c80 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -27,9 +27,6 @@
#include <svl/memberid.hrc>
using namespace ::com::sun::star;
-// STATIC DATA -----------------------------------------------------------
-
-DBG_NAME(SfxPointItem)
#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
@@ -42,7 +39,6 @@ TYPEINIT1_AUTOFACTORY(SfxPointItem, SfxPoolItem);
SfxPointItem::SfxPointItem()
{
- DBG_CTOR(SfxPointItem, 0);
}
@@ -51,7 +47,6 @@ SfxPointItem::SfxPointItem( sal_uInt16 nW, const Point& rVal ) :
SfxPoolItem( nW ),
aVal( rVal )
{
- DBG_CTOR(SfxPointItem, 0);
}
@@ -60,7 +55,6 @@ SfxPointItem::SfxPointItem( const SfxPointItem& rItem ) :
SfxPoolItem( rItem ),
aVal( rItem.aVal )
{
- DBG_CTOR(SfxPointItem, 0);
}
@@ -74,7 +68,6 @@ SfxItemPresentation SfxPointItem::GetPresentation
const IntlWrapper *
) const
{
- DBG_CHKTHIS(SfxPointItem, 0);
rText = OUString::number(aVal.X()) + ", " + OUString::number(aVal.Y()) + ", ";
return SFX_ITEM_PRESENTATION_NAMELESS;
}
@@ -83,7 +76,6 @@ SfxItemPresentation SfxPointItem::GetPresentation
bool SfxPointItem::operator==( const SfxPoolItem& rItem ) const
{
- DBG_CHKTHIS(SfxPointItem, 0);
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
return ((SfxPointItem&)rItem).aVal == aVal;
}
@@ -92,7 +84,6 @@ bool SfxPointItem::operator==( const SfxPoolItem& rItem ) const
SfxPoolItem* SfxPointItem::Clone(SfxItemPool *) const
{
- DBG_CHKTHIS(SfxPointItem, 0);
return new SfxPointItem( *this );
}
@@ -100,7 +91,6 @@ SfxPoolItem* SfxPointItem::Clone(SfxItemPool *) const
SfxPoolItem* SfxPointItem::Create(SvStream &rStream, sal_uInt16 ) const
{
- DBG_CHKTHIS(SfxPointItem, 0);
Point aStr;
ReadPair( rStream, aStr );
return new SfxPointItem(Which(), aStr);
@@ -110,7 +100,6 @@ SfxPoolItem* SfxPointItem::Create(SvStream &rStream, sal_uInt16 ) const
SvStream& SfxPointItem::Store(SvStream &rStream, sal_uInt16 ) const
{
- DBG_CHKTHIS(SfxPointItem, 0);
WritePair( rStream, aVal );
return rStream;
}
diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index 8a1da88..2b43a61 100644
--- a/svl/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.cxx
@@ -26,20 +26,12 @@
#include <svl/poolitem.hxx>
#include <svl/memberid.hrc>
-// STATIC DATA -----------------------------------------------------------
-
-DBG_NAME(SfxRectangleItem)
-
-
-
-
TYPEINIT1_AUTOFACTORY(SfxRectangleItem, SfxPoolItem);
SfxRectangleItem::SfxRectangleItem()
{
- DBG_CTOR(SfxRectangleItem, 0);
}
@@ -48,7 +40,6 @@ SfxRectangleItem::SfxRectangleItem( sal_uInt16 nW, const Rectangle& rVal ) :
SfxPoolItem( nW ),
aVal( rVal )
{
- DBG_CTOR(SfxRectangleItem, 0);
}
@@ -57,7 +48,6 @@ SfxRectangleItem::SfxRectangleItem( const SfxRectangleItem& rItem ) :
SfxPoolItem( rItem ),
aVal( rItem.aVal )
{
- DBG_CTOR(SfxRectangleItem, 0);
}
@@ -71,7 +61,6 @@ SfxItemPresentation SfxRectangleItem::GetPresentation
const IntlWrapper *
) const
{
- DBG_CHKTHIS(SfxRectangleItem, 0);
rText = OUString::number(aVal.Top()) + ", " +
OUString::number(aVal.Left()) + ", " +
OUString::number(aVal.Bottom()) + ", " +
@@ -83,7 +72,6 @@ SfxItemPresentation SfxRectangleItem::GetPresentation
bool SfxRectangleItem::operator==( const SfxPoolItem& rItem ) const
{
- DBG_CHKTHIS(SfxRectangleItem, 0);
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
return ((SfxRectangleItem&)rItem).aVal == aVal;
}
@@ -92,7 +80,6 @@ bool SfxRectangleItem::operator==( const SfxPoolItem& rItem ) const
SfxPoolItem* SfxRectangleItem::Clone(SfxItemPool *) const
{
- DBG_CHKTHIS(SfxRectangleItem, 0);
return new SfxRectangleItem( *this );
}
@@ -100,7 +87,6 @@ SfxPoolItem* SfxRectangleItem::Clone(SfxItemPool *) const
SfxPoolItem* SfxRectangleItem::Create(SvStream &rStream, sal_uInt16 ) const
{
- DBG_CHKTHIS(SfxRectangleItem, 0);
Rectangle aStr;
ReadRectangle( rStream, aStr );
return new SfxRectangleItem(Which(), aStr);
@@ -110,7 +96,6 @@ SfxPoolItem* SfxRectangleItem::Create(SvStream &rStream, sal_uInt16 ) const
SvStream& SfxRectangleItem::Store(SvStream &rStream, sal_uInt16 ) const
{
- DBG_CHKTHIS(SfxRectangleItem, 0);
WriteRectangle( rStream, aVal );
return rStream;
}
diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx
index 14467d4..dee7a63 100644
--- a/svl/source/items/sitem.cxx
+++ b/svl/source/items/sitem.cxx
@@ -22,17 +22,10 @@
#include <svl/poolitem.hxx>
#include <tools/stream.hxx>
-// STATIC DATA -----------------------------------------------------------
-
-DBG_NAME(SfxSetItem)
-
-
-
SfxSetItem::SfxSetItem( sal_uInt16 which, const SfxItemSet &rSet) :
SfxPoolItem(which),
pSet(rSet.Clone(sal_True))
{
- DBG_CTOR(SfxSetItem, 0);
}
@@ -41,7 +34,6 @@ SfxSetItem::SfxSetItem( sal_uInt16 which, SfxItemSet *pS) :
SfxPoolItem(which),
pSet(pS)
{
- DBG_CTOR(SfxSetItem, 0);
DBG_ASSERT(pS, "SfxSetItem without set constructed" );
}
@@ -51,14 +43,12 @@ SfxSetItem::SfxSetItem( const SfxSetItem& rCopy, SfxItemPool *pPool ) :
SfxPoolItem(rCopy.Which()),
pSet(rCopy.pSet->Clone(sal_True, pPool))
{
- DBG_CTOR(SfxSetItem, 0);
}
SfxSetItem::~SfxSetItem()
{
- DBG_DTOR(SfxSetItem, 0);
delete pSet; pSet = 0;
}
@@ -66,7 +56,6 @@ SfxSetItem::~SfxSetItem()
bool SfxSetItem::operator==( const SfxPoolItem& rCmp) const
{
- DBG_CHKTHIS(SfxSetItem, 0);
DBG_ASSERT( SfxPoolItem::operator==( rCmp ), "unequal type" );
return *pSet == *(((const SfxSetItem &)rCmp).pSet);
}
@@ -82,7 +71,6 @@ SfxItemPresentation SfxSetItem::GetPresentation
const IntlWrapper *
) const
{
- DBG_CHKTHIS(SfxSetItem, 0);
return SFX_ITEM_PRESENTATION_NONE;
}
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index d6fdec0..1b0203c 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
@@ -26,19 +26,12 @@
#include <svl/poolitem.hxx>
#include <svl/memberid.hrc>
-// STATIC DATA -----------------------------------------------------------
-
-DBG_NAME(SfxSizeItem)
-
-
-
TYPEINIT1_AUTOFACTORY(SfxSizeItem, SfxPoolItem);
SfxSizeItem::SfxSizeItem()
{
- DBG_CTOR(SfxSizeItem, 0);
}
@@ -47,7 +40,6 @@ SfxSizeItem::SfxSizeItem( sal_uInt16 nW, const Size& rVal ) :
SfxPoolItem( nW ),
aVal( rVal )
{
- DBG_CTOR(SfxSizeItem, 0);
}
@@ -56,7 +48,6 @@ SfxSizeItem::SfxSizeItem( const SfxSizeItem& rItem ) :
SfxPoolItem( rItem ),
aVal( rItem.aVal )
{
- DBG_CTOR(SfxSizeItem, 0);
}
@@ -70,7 +61,6 @@ SfxItemPresentation SfxSizeItem::GetPresentation
const IntlWrapper *
) const
{
- DBG_CHKTHIS(SfxSizeItem, 0);
rText = OUString::number(aVal.Width()) + ", " + OUString::number(aVal.Height()) + ", ";
return SFX_ITEM_PRESENTATION_NAMELESS;
}
@@ -79,7 +69,6 @@ SfxItemPresentation SfxSizeItem::GetPresentation
bool SfxSizeItem::operator==( const SfxPoolItem& rItem ) const
{
- DBG_CHKTHIS(SfxSizeItem, 0);
DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
return ((SfxSizeItem&)rItem).aVal == aVal;
}
@@ -88,7 +77,6 @@ bool SfxSizeItem::operator==( const SfxPoolItem& rItem ) const
SfxPoolItem* SfxSizeItem::Clone(SfxItemPool *) const
{
- DBG_CHKTHIS(SfxSizeItem, 0);
return new SfxSizeItem( *this );
}
@@ -96,7 +84,6 @@ SfxPoolItem* SfxSizeItem::Clone(SfxItemPool *) const
SfxPoolItem* SfxSizeItem::Create(SvStream &rStream, sal_uInt16 ) const
{
- DBG_CHKTHIS(SfxSizeItem, 0);
Size aStr;
ReadPair( rStream, aStr );
return new SfxSizeItem(Which(), aStr);
@@ -106,7 +93,6 @@ SfxPoolItem* SfxSizeItem::Create(SvStream &rStream, sal_uInt16 ) const
SvStream& SfxSizeItem::Store(SvStream &rStream, sal_uInt16 ) const
{
- DBG_CHKTHIS(SfxSizeItem, 0);
WritePair( rStream, aVal );
return rStream;
}
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index 2670a10..c1bf1f6 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -21,18 +21,11 @@
#include <com/sun/star/uno/Any.hxx>
#include <tools/stream.hxx>
-
-// class SfxVisibilityItem
-
-
-DBG_NAME(SfxVisibilityItem)
-
TYPEINIT1_AUTOFACTORY(SfxVisibilityItem, SfxPoolItem);
SfxVisibilityItem::SfxVisibilityItem(sal_uInt16 which, SvStream & rStream):
SfxPoolItem(which)
{
- DBG_CTOR(SfxVisibilityItem, 0);
bool bValue = false;
rStream.ReadCharAsBool( bValue );
m_nValue.bVisible = bValue;
@@ -41,7 +34,6 @@ SfxVisibilityItem::SfxVisibilityItem(sal_uInt16 which, SvStream & rStream):
// virtual
bool SfxVisibilityItem::operator ==(const SfxPoolItem & rItem) const
{
- DBG_CHKTHIS(SfxVisibilityItem, 0);
DBG_ASSERT(SfxPoolItem::operator ==(rItem), "unequal type");
return m_nValue.bVisible == (static_cast< const SfxVisibilityItem * >(&rItem))->
m_nValue.bVisible;
@@ -86,14 +78,12 @@ bool SfxVisibilityItem::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8
// virtual
SfxPoolItem * SfxVisibilityItem::Create(SvStream & rStream, sal_uInt16) const
{
- DBG_CHKTHIS(SfxVisibilityItem, 0);
return new SfxVisibilityItem(Which(), rStream);
}
// virtual
SvStream & SfxVisibilityItem::Store(SvStream & rStream, sal_uInt16) const
{
- DBG_CHKTHIS(SfxVisibilityItem, 0);
rStream.WriteUChar( m_nValue.bVisible );
return rStream;
}
@@ -101,7 +91,6 @@ SvStream & SfxVisibilityItem::Store(SvStream & rStream, sal_uInt16) const
// virtual
SfxPoolItem * SfxVisibilityItem::Clone(SfxItemPool *) const
{
- DBG_CHKTHIS(SfxVisibilityItem, 0);
return new SfxVisibilityItem(*this);
}
diff --git a/svl/source/items/whiter.cxx b/svl/source/items/whiter.cxx
index d1502c7..9a4e748 100644
--- a/svl/source/items/whiter.cxx
+++ b/svl/source/items/whiter.cxx
@@ -21,16 +21,11 @@
#include <svl/whiter.hxx>
#include <svl/itemset.hxx>
-DBG_NAME(SfxWhichIter)
-
-
-
SfxWhichIter::SfxWhichIter( const SfxItemSet& rSet, sal_uInt16 nFromWh, sal_uInt16 nToWh ):
pRanges(rSet.GetRanges()),
pStart(rSet.GetRanges()),
nOfst(0), nFrom(nFromWh), nTo(nToWh)
{
- DBG_CTOR(SfxWhichIter, 0);
if ( nFrom > 0 )
FirstWhich();
}
@@ -39,14 +34,12 @@ SfxWhichIter::SfxWhichIter( const SfxItemSet& rSet, sal_uInt16 nFromWh, sal_uInt
SfxWhichIter::~SfxWhichIter()
{
- DBG_DTOR(SfxWhichIter, 0);
}
sal_uInt16 SfxWhichIter::NextWhich()
{
- DBG_CHKTHIS(SfxWhichIter, 0);
while ( 0 != *pRanges )
{
const sal_uInt16 nLastWhich = *pRanges + nOfst;
@@ -67,7 +60,6 @@ sal_uInt16 SfxWhichIter::NextWhich()
sal_uInt16 SfxWhichIter::FirstWhich()
{
- DBG_CHKTHIS(SfxWhichIter, 0);
pRanges = pStart;
nOfst = 0;
if ( *pRanges >= nFrom && *pRanges <= nTo )
diff --git a/svl/source/notify/brdcst.cxx b/svl/source/notify/brdcst.cxx
index 1509a52..49496e1 100644
--- a/svl/source/notify/brdcst.cxx
+++ b/svl/source/notify/brdcst.cxx
@@ -28,7 +28,6 @@
#include <svl/brdcst.hxx>
#include <algorithm>
-DBG_NAME(SfxBroadcaster)
TYPEINIT0(SfxBroadcaster);
@@ -36,8 +35,6 @@ TYPEINIT0(SfxBroadcaster);
void SfxBroadcaster::Broadcast( const SfxHint &rHint )
{
- DBG_CHKTHIS(SfxBroadcaster, 0);
-
// notify all registered listeners exactly once
for (size_t n = 0; n < m_Listeners.size(); ++n)
{
@@ -52,8 +49,6 @@ void SfxBroadcaster::Broadcast( const SfxHint &rHint )
SfxBroadcaster::~SfxBroadcaster()
{
- DBG_DTOR(SfxBroadcaster, 0);
-
Broadcast( SfxSimpleHint(SFX_HINT_DYING) );
// remove all still registered listeners
@@ -71,7 +66,6 @@ SfxBroadcaster::~SfxBroadcaster()
SfxBroadcaster::SfxBroadcaster()
{
- DBG_CTOR(SfxBroadcaster, 0);
}
@@ -80,8 +74,6 @@ SfxBroadcaster::SfxBroadcaster()
SfxBroadcaster::SfxBroadcaster( const SfxBroadcaster &rBC )
{
- DBG_CTOR(SfxBroadcaster, 0);
-
for (size_t n = 0; n < rBC.m_Listeners.size(); ++n)
{
SfxListener *const pListener = rBC.m_Listeners[n];
@@ -96,8 +88,6 @@ SfxBroadcaster::SfxBroadcaster( const SfxBroadcaster &rBC )
void SfxBroadcaster::AddListener( SfxListener& rListener )
{
- DBG_CHKTHIS(SfxBroadcaster, 0);
-
for (size_t i = 0; i < m_Listeners.size(); ++i)
{
if (!m_Listeners[i]) // removed by RemoveListener?
@@ -114,7 +104,6 @@ void SfxBroadcaster::AddListener( SfxListener& rListener )
void SfxBroadcaster::ListenersGone()
{
- DBG_CHKTHIS(SfxBroadcaster,0);
}
@@ -136,7 +125,6 @@ void SfxBroadcaster::Forward(SfxBroadcaster& rBC, const SfxHint& rHint)
void SfxBroadcaster::RemoveListener( SfxListener& rListener )
{
- {DBG_CHKTHIS(SfxBroadcaster, 0);}
SfxListenerArr_Impl::iterator aIter = std::find(
m_Listeners.begin(), m_Listeners.end(), &rListener);
assert(aIter != m_Listeners.end()); // "RemoveListener: Listener unknown"
diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx
index ad004e7..606b9a6 100644
--- a/svl/source/notify/lstner.cxx
+++ b/svl/source/notify/lstner.cxx
@@ -26,22 +26,18 @@
#include <svl/lstner.hxx>
#include <algorithm>
-DBG_NAME(SfxListener)
TYPEINIT0(SfxListener);
// simple ctor of class SfxListener
SfxListener::SfxListener()
{
- DBG_CTOR(SfxListener, 0);
}
// copy ctor of class SfxListener
SfxListener::SfxListener( const SfxListener &rListener )
{
- DBG_CTOR(SfxListener, 0);
-
for ( sal_uInt16 n = 0; n < rListener.aBCs.size(); ++n )
StartListening( *rListener.aBCs[n] );
}
@@ -50,8 +46,6 @@ SfxListener::SfxListener( const SfxListener &rListener )
SfxListener::~SfxListener()
{
- DBG_DTOR(SfxListener, 0);
-
// unregister at all remaining broadcasters
for ( sal_uInt16 nPos = 0; nPos < aBCs.size(); ++nPos )
{
@@ -65,8 +59,6 @@ SfxListener::~SfxListener()
void SfxListener::RemoveBroadcaster_Impl( SfxBroadcaster& rBroadcaster )
{
- DBG_CHKTHIS(SfxListener, 0);
-
aBCs.erase( std::find( aBCs.begin(), aBCs.end(), &rBroadcaster ) );
}
@@ -75,8 +67,6 @@ void SfxListener::RemoveBroadcaster_Impl( SfxBroadcaster& rBroadcaster )
bool SfxListener::StartListening( SfxBroadcaster& rBroadcaster, bool bPreventDups )
{
- DBG_CHKTHIS(SfxListener, 0);
-
if ( !bPreventDups || !IsListening( rBroadcaster ) )
{
rBroadcaster.AddListener(*this);
@@ -94,8 +84,6 @@ bool SfxListener::StartListening( SfxBroadcaster& rBroadcaster, bool bPreventDup
bool SfxListener::EndListening( SfxBroadcaster& rBroadcaster, bool bAllDups )
{
- DBG_CHKTHIS(SfxListener, 0);
-
if ( !IsListening( rBroadcaster ) )
return false;
@@ -113,8 +101,6 @@ bool SfxListener::EndListening( SfxBroadcaster& rBroadcaster, bool bAllDups )
void SfxListener::EndListeningAll()
{
- DBG_CHKTHIS(SfxListener, 0);
-
// MI: bei Optimierung beachten: Seiteneffekte von RemoveListener beachten!
while ( !aBCs.empty() )
{
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index fd51d90..aaa7230 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -32,11 +32,6 @@
using ::com::sun::star::uno::Exception;
-// STATIC DATA -----------------------------------------------------------
-
-DBG_NAME(SfxUndoAction)
-
-
TYPEINIT0(SfxUndoAction);
TYPEINIT0(SfxListUndoAction);
TYPEINIT0(SfxLinkUndoAction);
@@ -61,8 +56,6 @@ void SfxUndoAction::SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAc
SfxUndoAction::~SfxUndoAction()
{
- DBG_DTOR(SfxUndoAction, 0);
-
if(mpSfxLinkUndoAction)
{
mpSfxLinkUndoAction->LinkedSfxUndoActionDestructed(*this);
@@ -74,20 +67,17 @@ SfxUndoAction::~SfxUndoAction()
SfxUndoAction::SfxUndoAction()
: mpSfxLinkUndoAction(0)
{
- DBG_CTOR(SfxUndoAction, 0);
}
bool SfxUndoAction::Merge( SfxUndoAction * )
{
- DBG_CHKTHIS(SfxUndoAction, 0);
return false;
}
OUString SfxUndoAction::GetComment() const
{
- DBG_CHKTHIS(SfxUndoAction, 0);
return OUString();
}
@@ -95,14 +85,12 @@ OUString SfxUndoAction::GetComment() const
sal_uInt16 SfxUndoAction::GetId() const
{
- DBG_CHKTHIS(SfxUndoAction, 0);
return 0;
}
OUString SfxUndoAction::GetRepeatComment(SfxRepeatTarget&) const
{
- DBG_CHKTHIS(SfxUndoAction, 0);
return GetComment();
}
More information about the Libreoffice-commits
mailing list