[Libreoffice-commits] core.git: forms/source
Arnaud Versini
arnaud.versini at gmail.com
Tue Jan 21 08:27:15 PST 2014
forms/source/component/Button.cxx | 4 ----
forms/source/component/CheckBox.cxx | 4 ----
forms/source/component/Columns.cxx | 4 ----
forms/source/component/ComboBox.cxx | 5 -----
forms/source/component/Currency.cxx | 4 ----
forms/source/component/DatabaseForm.cxx | 4 ----
forms/source/component/Date.cxx | 7 -------
forms/source/component/Edit.cxx | 7 -------
forms/source/component/EditBase.cxx | 4 ----
forms/source/component/EventThread.cxx | 3 ---
forms/source/component/File.cxx | 4 ----
forms/source/component/FixedText.cxx | 4 ----
forms/source/component/FormComponent.cxx | 14 --------------
forms/source/component/FormattedField.cxx | 7 -------
forms/source/component/FormattedFieldWrapper.cxx | 3 ---
forms/source/component/FormsCollection.cxx | 4 ----
forms/source/component/Grid.cxx | 4 ----
forms/source/component/GroupBox.cxx | 4 ----
forms/source/component/GroupManager.cxx | 15 ---------------
forms/source/component/GroupManager.hxx | 3 ---
forms/source/component/Hidden.cxx | 4 ----
forms/source/component/ImageButton.cxx | 4 ----
forms/source/component/ImageControl.cxx | 4 ----
forms/source/component/ListBox.cxx | 7 -------
forms/source/component/Numeric.cxx | 4 ----
forms/source/component/Pattern.cxx | 4 ----
forms/source/component/RadioButton.cxx | 4 ----
forms/source/component/Time.cxx | 4 ----
forms/source/component/clickableimage.cxx | 4 ----
forms/source/component/navigationbar.cxx | 4 ----
forms/source/component/scrollbar.cxx | 4 ----
forms/source/component/spinbutton.cxx | 4 ----
forms/source/helper/formnavigation.cxx | 3 ---
forms/source/richtext/richtextcontrol.cxx | 6 ------
forms/source/richtext/richtextengine.cxx | 3 ---
forms/source/richtext/richtextmodel.cxx | 4 ----
forms/source/solar/component/navbarcontrol.cxx | 6 ------
forms/source/solar/control/navtoolbar.cxx | 3 ---
forms/source/xforms/datatyperepository.cxx | 3 ---
39 files changed, 187 deletions(-)
New commits:
commit 5a73cceee597b56c568d061ead3a0b3269f2977b
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date: Sun Jan 19 17:15:51 2014 +0100
FORMS : Remove usage of DBG_CTOR and DBG_DTOR.
Valgrind is capable of detecting such bugs. No need for extra macros.
Change-Id: Ida618d6ac383c65f1c09212a7b6aa5ee228677db
Reviewed-on: https://gerrit.libreoffice.org/7534
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 0866a23..f270295 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -52,7 +52,6 @@ using ::com::sun::star::frame::XDispatchProviderInterceptor;
//==================================================================
//= OButtonModel
//==================================================================
-DBG_NAME(OButtonModel)
//------------------------------------------------------------------
InterfaceRef SAL_CALL OButtonModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
{
@@ -66,7 +65,6 @@ OButtonModel::OButtonModel(const Reference<XComponentContext>& _rxFactory)
,m_aResetHelper( *this, m_aMutex )
,m_eDefaultState( STATE_NOCHECK )
{
- DBG_CTOR( OButtonModel, NULL );
m_nClassId = FormComponentType::COMMANDBUTTON;
}
@@ -94,7 +92,6 @@ OButtonModel::OButtonModel( const OButtonModel* _pOriginal, const Reference<XCom
,m_aResetHelper( *this, m_aMutex )
,m_eDefaultState( _pOriginal->m_eDefaultState )
{
- DBG_CTOR( OButtonModel, NULL );
m_nClassId = FormComponentType::COMMANDBUTTON;
implInitializeImageURL();
@@ -103,7 +100,6 @@ OButtonModel::OButtonModel( const OButtonModel* _pOriginal, const Reference<XCom
//------------------------------------------------------------------------------
OButtonModel::~OButtonModel()
{
- DBG_DTOR(OButtonModel, NULL);
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx
index 04a5399..a6316d9 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -79,13 +79,11 @@ InterfaceRef SAL_CALL OCheckBoxModel_CreateInstance(const Reference<XMultiServic
}
//------------------------------------------------------------------
-DBG_NAME( OCheckBoxModel )
//------------------------------------------------------------------
OCheckBoxModel::OCheckBoxModel(const Reference<XComponentContext>& _rxFactory)
:OReferenceValueComponent( _rxFactory, VCL_CONTROLMODEL_CHECKBOX, FRM_SUN_CONTROL_CHECKBOX, sal_True )
// use the old control name for compytibility reasons
{
- DBG_CTOR( OCheckBoxModel, NULL );
m_nClassId = FormComponentType::CHECKBOX;
initValueProperty( PROPERTY_STATE, PROPERTY_ID_STATE );
@@ -95,13 +93,11 @@ OCheckBoxModel::OCheckBoxModel(const Reference<XComponentContext>& _rxFactory)
OCheckBoxModel::OCheckBoxModel( const OCheckBoxModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
:OReferenceValueComponent( _pOriginal, _rxFactory )
{
- DBG_CTOR( OCheckBoxModel, NULL );
}
//------------------------------------------------------------------------------
OCheckBoxModel::~OCheckBoxModel()
{
- DBG_DTOR( OCheckBoxModel, NULL );
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 3ee43c5..c4cceb9 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -198,7 +198,6 @@ Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType ) throw (RuntimeE
return aReturn;
}
-DBG_NAME(OGridColumn);
//------------------------------------------------------------------------------
OGridColumn::OGridColumn( const Reference<XComponentContext>& _rContext, const OUString& _sModelName )
:OGridColumn_BASE(m_aMutex)
@@ -206,7 +205,6 @@ OGridColumn::OGridColumn( const Reference<XComponentContext>& _rContext, const O
,m_aHidden( makeAny( sal_False ) )
,m_aModelName(_sModelName)
{
- DBG_CTOR(OGridColumn,NULL);
// Create the UnoControlModel
if ( !m_aModelName.isEmpty() ) // is there a to-be-aggregated model?
@@ -233,7 +231,6 @@ OGridColumn::OGridColumn( const OGridColumn* _pOriginal )
:OGridColumn_BASE( m_aMutex )
,OPropertySetAggregationHelper( OGridColumn_BASE::rBHelper )
{
- DBG_CTOR(OGridColumn,NULL);
m_aWidth = _pOriginal->m_aWidth;
m_aAlign = _pOriginal->m_aAlign;
@@ -272,7 +269,6 @@ OGridColumn::~OGridColumn()
m_xAggregate->setDelegator(xIface);
}
- DBG_DTOR(OGridColumn,NULL);
}
// XEventListener
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 6e5bb13..406433c 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -124,7 +124,6 @@ Any SAL_CALL OComboBoxModel::queryAggregation(const Type& _rType) throw (Runtime
}
//------------------------------------------------------------------
-DBG_NAME( OComboBoxModel )
//------------------------------------------------------------------
OComboBoxModel::OComboBoxModel(const Reference<XComponentContext>& _rxFactory)
:OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_COMBOBOX, FRM_SUN_CONTROL_COMBOBOX, sal_True, sal_True, sal_True )
@@ -135,8 +134,6 @@ OComboBoxModel::OComboBoxModel(const Reference<XComponentContext>& _rxFactory)
,m_eListSourceType(ListSourceType_TABLE)
,m_bEmptyIsNull(sal_True)
{
- DBG_CTOR( OComboBoxModel, NULL );
-
m_nClassId = FormComponentType::COMBOBOX;
initValueProperty( PROPERTY_TEXT, PROPERTY_ID_TEXT );
}
@@ -152,7 +149,6 @@ OComboBoxModel::OComboBoxModel( const OComboBoxModel* _pOriginal, const Referenc
,m_eListSourceType( _pOriginal->m_eListSourceType )
,m_bEmptyIsNull( _pOriginal->m_bEmptyIsNull )
{
- DBG_CTOR( OComboBoxModel, NULL );
}
//------------------------------------------------------------------
@@ -164,7 +160,6 @@ OComboBoxModel::~OComboBoxModel()
dispose();
}
- DBG_DTOR( OComboBoxModel, NULL );
}
// XCloneable
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index 53bdc1f..e9d0e54 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -133,13 +133,11 @@ void OCurrencyModel::implConstruct()
}
//------------------------------------------------------------------
-DBG_NAME( OCurrencyModel )
//------------------------------------------------------------------
OCurrencyModel::OCurrencyModel(const Reference<XComponentContext>& _rxFactory)
:OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_CURRENCYFIELD, FRM_SUN_CONTROL_CURRENCYFIELD, sal_False, sal_True )
// use the old control name for compytibility reasons
{
- DBG_CTOR( OCurrencyModel, NULL );
m_nClassId = FormComponentType::CURRENCYFIELD;
initValueProperty( PROPERTY_VALUE, PROPERTY_ID_VALUE );
@@ -151,14 +149,12 @@ OCurrencyModel::OCurrencyModel(const Reference<XComponentContext>& _rxFactory)
OCurrencyModel::OCurrencyModel( const OCurrencyModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
:OEditBaseModel( _pOriginal, _rxFactory )
{
- DBG_CTOR( OCurrencyModel, NULL );
implConstruct();
}
//------------------------------------------------------------------
OCurrencyModel::~OCurrencyModel()
{
- DBG_DTOR( OCurrencyModel, NULL );
}
// XCloneable
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index c031472..ab7f608 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -276,7 +276,6 @@ Any SAL_CALL ODatabaseForm::queryAggregation(const Type& _rType) throw(RuntimeEx
return aReturn;
}
-DBG_NAME(ODatabaseForm);
//------------------------------------------------------------------
ODatabaseForm::ODatabaseForm(const Reference<XComponentContext>& _rxContext)
:OFormComponents(_rxContext)
@@ -309,7 +308,6 @@ ODatabaseForm::ODatabaseForm(const Reference<XComponentContext>& _rxContext)
,m_bForwardingConnection(sal_False)
,m_bSharingConnection( sal_False )
{
- DBG_CTOR( ODatabaseForm, NULL );
impl_construct();
}
@@ -356,7 +354,6 @@ ODatabaseForm::ODatabaseForm( const ODatabaseForm& _cloneSource )
,m_bForwardingConnection( sal_False )
,m_bSharingConnection( sal_False )
{
- DBG_CTOR( ODatabaseForm, NULL );
impl_construct();
@@ -457,7 +454,6 @@ void ODatabaseForm::impl_construct()
//------------------------------------------------------------------
ODatabaseForm::~ODatabaseForm()
{
- DBG_DTOR(ODatabaseForm,NULL);
m_pGroupManager->release();
m_pGroupManager = NULL;
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index b5edf23..bc71c5d 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -87,15 +87,11 @@ Sequence<Type> ODateModel::_getTypes()
}
//------------------------------------------------------------------
-DBG_NAME( ODateModel )
-//------------------------------------------------------------------
ODateModel::ODateModel(const Reference<XComponentContext>& _rxFactory)
:OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_DATEFIELD, FRM_SUN_CONTROL_DATEFIELD, sal_True, sal_True )
// use the old control name for compytibility reasons
,OLimitedFormats( _rxFactory, FormComponentType::DATEFIELD )
{
- DBG_CTOR( ODateModel, NULL );
-
m_nClassId = FormComponentType::DATEFIELD;
initValueProperty( PROPERTY_DATE, PROPERTY_ID_DATE );
@@ -119,8 +115,6 @@ ODateModel::ODateModel( const ODateModel* _pOriginal, const Reference<XComponent
:OEditBaseModel( _pOriginal, _rxFactory )
,OLimitedFormats( _rxFactory, FormComponentType::DATEFIELD )
{
- DBG_CTOR( ODateModel, NULL );
-
setAggregateSet( m_xAggregateFastSet, getOriginalHandle( PROPERTY_ID_DATEFORMAT ) );
}
@@ -128,7 +122,6 @@ ODateModel::ODateModel( const ODateModel* _pOriginal, const Reference<XComponent
ODateModel::~ODateModel( )
{
setAggregateSet(Reference< XFastPropertySet >(), -1);
- DBG_DTOR( ODateModel, NULL );
}
// XCloneable
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 2f183b5..899df45 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -88,14 +88,12 @@ Any SAL_CALL OEditControl::queryAggregation(const Type& _rType) throw (RuntimeEx
return aReturn;
}
-DBG_NAME(OEditControl);
//------------------------------------------------------------------------------
OEditControl::OEditControl(const Reference<XComponentContext>& _rxFactory)
:OBoundControl( _rxFactory, FRM_SUN_CONTROL_RICHTEXTCONTROL )
,m_aChangeListeners(m_aMutex)
,m_nKeyEvent( 0 )
{
- DBG_CTOR(OEditControl,NULL);
increment(m_refCount);
{
@@ -121,7 +119,6 @@ OEditControl::~OEditControl()
dispose();
}
- DBG_DTOR(OEditControl,NULL);
}
// XChangeBroadcaster
@@ -287,14 +284,12 @@ Sequence<Type> OEditModel::_getTypes()
}
-DBG_NAME(OEditModel);
//------------------------------------------------------------------
OEditModel::OEditModel(const Reference<XComponentContext>& _rxFactory)
:OEditBaseModel( _rxFactory, FRM_SUN_COMPONENT_RICHTEXTCONTROL, FRM_SUN_CONTROL_TEXTFIELD, sal_True, sal_True )
,m_bMaxTextLenModified(sal_False)
,m_bWritingFormattedFake(sal_False)
{
- DBG_CTOR(OEditModel,NULL);
m_nClassId = FormComponentType::TEXTFIELD;
initValueProperty( PROPERTY_TEXT, PROPERTY_ID_TEXT );
@@ -306,7 +301,6 @@ OEditModel::OEditModel( const OEditModel* _pOriginal, const Reference<XComponent
,m_bMaxTextLenModified(sal_False)
,m_bWritingFormattedFake(sal_False)
{
- DBG_CTOR( OEditModel, NULL );
// Note that most of the properties are not clone from the original object:
// Things as the format key, it's type, and such, depend on the field being part of a loaded form
@@ -324,7 +318,6 @@ OEditModel::~OEditModel()
dispose();
}
- DBG_DTOR(OEditModel,NULL);
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx
index 73de846..5d4aa31 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.cxx
@@ -46,7 +46,6 @@ const sal_uInt16 DEFAULT_LONG = 0x0001;
const sal_uInt16 DEFAULT_DOUBLE = 0x0002;
const sal_uInt16 FILTERPROPOSAL = 0x0004;
-DBG_NAME( OEditBaseModel )
//------------------------------------------------------------------
OEditBaseModel::OEditBaseModel( const Reference< XComponentContext >& _rxFactory, const OUString& rUnoControlModelName,
const OUString& rDefault, const sal_Bool _bSupportExternalBinding, const sal_Bool _bSupportsValidation )
@@ -55,7 +54,6 @@ OEditBaseModel::OEditBaseModel( const Reference< XComponentContext >& _rxFactory
,m_bEmptyIsNull(sal_True)
,m_bFilterProposal(sal_False)
{
- DBG_CTOR( OEditBaseModel, NULL );
}
//------------------------------------------------------------------
@@ -63,7 +61,6 @@ OEditBaseModel::OEditBaseModel( const OEditBaseModel* _pOriginal, const Referenc
:OBoundControlModel( _pOriginal, _rxFactory )
,m_nLastReadVersion(0)
{
- DBG_CTOR( OEditBaseModel, NULL );
m_bFilterProposal = _pOriginal->m_bFilterProposal;
m_bEmptyIsNull = _pOriginal->m_bEmptyIsNull;
@@ -74,7 +71,6 @@ OEditBaseModel::OEditBaseModel( const OEditBaseModel* _pOriginal, const Referenc
//------------------------------------------------------------------
OEditBaseModel::~OEditBaseModel( )
{
- DBG_DTOR( OEditBaseModel, NULL );
}
// XPersist
diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx
index 4ee8700..bdc0fd0 100644
--- a/forms/source/component/EventThread.cxx
+++ b/forms/source/component/EventThread.cxx
@@ -29,11 +29,9 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::lang;
-DBG_NAME( OComponentEventThread )
OComponentEventThread::OComponentEventThread( ::cppu::OComponentHelper* pCompImpl ) :
m_pCompImpl( pCompImpl )
{
- DBG_CTOR( OComponentEventThread, NULL );
increment(m_refCount);
@@ -54,7 +52,6 @@ OComponentEventThread::OComponentEventThread( ::cppu::OComponentHelper* pCompImp
OComponentEventThread::~OComponentEventThread()
{
- DBG_DTOR( OComponentEventThread, NULL );
DBG_ASSERT( m_aEvents.empty(),
"OComponentEventThread::~OComponentEventThread: Didn't call dispose?" );
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 45445af..d8444ee 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -83,13 +83,11 @@ StringSequence OFileControlModel::getSupportedServiceNames() throw(RuntimeExcep
}
//------------------------------------------------------------------
-DBG_NAME( OFileControlModel )
//------------------------------------------------------------------
OFileControlModel::OFileControlModel(const Reference<XComponentContext>& _rxFactory)
:OControlModel(_rxFactory, VCL_CONTROLMODEL_FILECONTROL)
,m_aResetListeners(m_aMutex)
{
- DBG_CTOR( OFileControlModel, NULL );
m_nClassId = FormComponentType::FILECONTROL;
}
@@ -98,7 +96,6 @@ OFileControlModel::OFileControlModel( const OFileControlModel* _pOriginal, const
:OControlModel( _pOriginal, _rxFactory )
,m_aResetListeners( m_aMutex )
{
- DBG_CTOR( OFileControlModel, NULL );
m_sDefaultValue = _pOriginal->m_sDefaultValue;
}
@@ -111,7 +108,6 @@ OFileControlModel::~OFileControlModel()
acquire();
dispose();
}
- DBG_DTOR( OFileControlModel, NULL );
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx
index 9ca2004..896c7a5 100644
--- a/forms/source/component/FixedText.cxx
+++ b/forms/source/component/FixedText.cxx
@@ -46,13 +46,11 @@ InterfaceRef SAL_CALL OFixedTextModel_CreateInstance(const Reference<XMultiServi
}
//------------------------------------------------------------------
-DBG_NAME( OFixedTextModel )
//------------------------------------------------------------------
OFixedTextModel::OFixedTextModel( const Reference<XComponentContext>& _rxFactory )
:OControlModel(_rxFactory, VCL_CONTROLMODEL_FIXEDTEXT)
{
- DBG_CTOR( OFixedTextModel, NULL );
m_nClassId = FormComponentType::FIXEDTEXT;
}
@@ -61,13 +59,11 @@ OFixedTextModel::OFixedTextModel( const OFixedTextModel* _pOriginal, const Refer
:OControlModel( _pOriginal, _rxFactory )
{
- DBG_CTOR( OFixedTextModel, NULL );
}
//------------------------------------------------------------------
OFixedTextModel::~OFixedTextModel( )
{
- DBG_DTOR( OFixedTextModel, NULL );
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 44adab4..1dc2937 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -130,13 +130,11 @@ namespace frm
//=============================================================================
//= base class for form layer controls
//=============================================================================
-DBG_NAME(frm_OControl)
//------------------------------------------------------------------------------
OControl::OControl( const Reference< XComponentContext >& _rxContext, const OUString& _rAggregateService, const sal_Bool _bSetDelegator )
:OComponentHelper(m_aMutex)
,m_xContext( _rxContext )
{
- DBG_CTOR(frm_OControl, NULL);
// VCL-Control aggregieren
// bei Aggregation den Refcount um eins erhoehen da im setDelegator
// das Aggregat selbst den Refcount erhoeht
@@ -154,7 +152,6 @@ OControl::OControl( const Reference< XComponentContext >& _rxContext, const OUSt
//------------------------------------------------------------------------------
OControl::~OControl()
{
- DBG_DTOR(frm_OControl, NULL);
doResetDelegator();
}
@@ -379,7 +376,6 @@ sal_Bool SAL_CALL OControl::isTransparent() throw ( RuntimeException)
//==================================================================
//= OBoundControl
//==================================================================
-DBG_NAME(frm_OBoundControl);
//------------------------------------------------------------------
OBoundControl::OBoundControl( const Reference< XComponentContext >& _rxContext,
const OUString& _rAggregateService, const sal_Bool _bSetDelegator )
@@ -388,13 +384,11 @@ OBoundControl::OBoundControl( const Reference< XComponentContext >& _rxContext,
,m_aOriginalFont( EmptyFontDescriptor() )
,m_nOriginalTextLineColor( 0 )
{
- DBG_CTOR(frm_OBoundControl, NULL);
}
//------------------------------------------------------------------
OBoundControl::~OBoundControl()
{
- DBG_DTOR(frm_OBoundControl, NULL);
}
// -----------------------------------------------------------------------------
Sequence< Type> OBoundControl::_getTypes()
@@ -479,7 +473,6 @@ void OBoundControl::disposing()
//==================================================================
//= OControlModel
//==================================================================
-DBG_NAME(OControlModel)
//------------------------------------------------------------------
Sequence<sal_Int8> SAL_CALL OControlModel::getImplementationId() throw(RuntimeException)
{
@@ -584,7 +577,6 @@ OControlModel::OControlModel(
// the native look is ugly ....
// #i37342#
{
- DBG_CTOR(OControlModel, NULL);
if (!_rUnoControlModelTypeName.isEmpty()) // the is a model we have to aggregate
{
increment(m_refCount);
@@ -627,7 +619,6 @@ OControlModel::OControlModel( const OControlModel* _pOriginal, const Reference<
,m_nTabIndex( FRM_DEFAULT_TABINDEX )
,m_nClassId( FormComponentType::CONTROL )
{
- DBG_CTOR( OControlModel, NULL );
DBG_ASSERT( _pOriginal, "OControlModel::OControlModel: invalid original!" );
// copy members
@@ -669,7 +660,6 @@ OControlModel::~OControlModel()
// release the aggregate
doResetDelegator( );
- DBG_DTOR(OControlModel, NULL);
}
//------------------------------------------------------------------
@@ -1218,7 +1208,6 @@ void OControlModel::firePropertyChanges( const Sequence< sal_Int32 >& _rHandles,
//==================================================================
//= OBoundControlModel
//==================================================================
-DBG_NAME(frm_OBoundControlModel);
//------------------------------------------------------------------
Any SAL_CALL OBoundControlModel::queryAggregation( const Type& _rType ) throw (RuntimeException)
{
@@ -1271,7 +1260,6 @@ OBoundControlModel::OBoundControlModel(
,m_eControlValueChangeInstigator( eOther )
,m_aLabelServiceName(FRM_SUN_COMPONENT_FIXEDTEXT)
{
- DBG_CTOR(frm_OBoundControlModel, NULL);
// start property listening at the aggregate
implInitAggMultiplexer( );
@@ -1306,7 +1294,6 @@ OBoundControlModel::OBoundControlModel(
,m_bBindingControlsEnable( sal_False )
,m_eControlValueChangeInstigator( eOther )
{
- DBG_CTOR(frm_OBoundControlModel, NULL);
// start property listening at the aggregate
implInitAggMultiplexer( );
@@ -1346,7 +1333,6 @@ OBoundControlModel::~OBoundControlModel()
m_pAggPropMultiplexer = NULL;
}
- DBG_DTOR(frm_OBoundControlModel, NULL);
}
//------------------------------------------------------------------
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 8e74136..937f46f 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -204,13 +204,11 @@ Any SAL_CALL OFormattedControl::queryAggregation(const Type& _rType) throw (Runt
}
-DBG_NAME(OFormattedControl);
//------------------------------------------------------------------------------
OFormattedControl::OFormattedControl(const Reference<XComponentContext>& _rxFactory)
:OBoundControl(_rxFactory, VCL_CONTROL_FORMATTEDFIELD)
,m_nKeyEvent(0)
{
- DBG_CTOR(OFormattedControl,NULL);
increment(m_refCount);
{
@@ -235,7 +233,6 @@ OFormattedControl::~OFormattedControl()
dispose();
}
- DBG_DTOR(OFormattedControl,NULL);
}
// XKeyListener
@@ -334,7 +331,6 @@ void OFormattedControl::setDesignMode(sal_Bool bOn) throw ( ::com::sun::star::un
}
/*************************************************************************/
-DBG_NAME(OFormattedModel)
//------------------------------------------------------------------
void OFormattedModel::implConstruct()
{
@@ -361,7 +357,6 @@ OFormattedModel::OFormattedModel(const Reference<XComponentContext>& _rxFactory)
// use the old control name for compytibility reasons
,OErrorBroadcaster( OComponentHelper::rBHelper )
{
- DBG_CTOR(OFormattedModel, NULL);
implConstruct();
@@ -374,7 +369,6 @@ OFormattedModel::OFormattedModel( const OFormattedModel* _pOriginal, const Refer
:OEditBaseModel( _pOriginal, _rxFactory )
,OErrorBroadcaster( OComponentHelper::rBHelper )
{
- DBG_CTOR(OFormattedModel, NULL);
implConstruct();
}
@@ -382,7 +376,6 @@ OFormattedModel::OFormattedModel( const OFormattedModel* _pOriginal, const Refer
//------------------------------------------------------------------------------
OFormattedModel::~OFormattedModel()
{
- DBG_DTOR(OFormattedModel, NULL);
}
// XCloneable
diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx
index 0e76c8c..abcbf50 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -45,7 +45,6 @@ using namespace ::com::sun::star::util;
//==================================================================
// OFormattedFieldWrapper
//==================================================================
-DBG_NAME(OFormattedFieldWrapper)
Reference<XInterface> SAL_CALL OFormattedFieldWrapper_CreateInstance_ForceFormatted(const Reference<XMultiServiceFactory>& _rxFactory)
{
@@ -60,7 +59,6 @@ InterfaceRef SAL_CALL OFormattedFieldWrapper_CreateInstance(const Reference<XMul
OFormattedFieldWrapper::OFormattedFieldWrapper(const Reference<XComponentContext>& _rxFactory)
:m_xContext(_rxFactory)
{
- DBG_CTOR(OFormattedFieldWrapper, NULL);
}
InterfaceRef OFormattedFieldWrapper::createFormattedFieldWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, bool bActAsFormatted)
@@ -138,7 +136,6 @@ OFormattedFieldWrapper::~OFormattedFieldWrapper()
if (m_xAggregate.is())
m_xAggregate->setDelegator(InterfaceRef ());
- DBG_DTOR(OFormattedFieldWrapper, NULL);
}
//------------------------------------------------------------------
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index 396e747..624d362 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::util;
//------------------------------------------------------------------
-DBG_NAME(OFormsCollection)
//------------------------------------------------------------------
InterfaceRef SAL_CALL OFormsCollection_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
{
@@ -68,7 +67,6 @@ OFormsCollection::OFormsCollection(const Reference<XComponentContext>& _rxFactor
,OInterfaceContainer( _rxFactory, m_aMutex, cppu::UnoType<XForm>::get() )
,OFormsCollection_BASE()
{
- DBG_CTOR(OFormsCollection, NULL);
}
//------------------------------------------------------------------------------
@@ -77,13 +75,11 @@ OFormsCollection::OFormsCollection( const OFormsCollection& _cloneSource )
,OInterfaceContainer( m_aMutex, _cloneSource )
,OFormsCollection_BASE()
{
- DBG_CTOR( OFormsCollection, NULL );
}
//------------------------------------------------------------------------------
OFormsCollection::~OFormsCollection()
{
- DBG_DTOR(OFormsCollection, NULL);
if (!FormsCollectionComponentBase::rBHelper.bDisposed)
{
acquire();
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index bb52635..aa0caf5 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -76,7 +76,6 @@ InterfaceRef SAL_CALL OGridControlModel_CreateInstance(const Reference<XMultiSer
return *(new OGridControlModel( comphelper::getComponentContext(_rxFactory) ));
}
-DBG_NAME(OGridControlModel);
//------------------------------------------------------------------
OGridControlModel::OGridControlModel(const Reference<XComponentContext>& _rxFactory)
:OControlModel(_rxFactory, OUString())
@@ -98,7 +97,6 @@ OGridControlModel::OGridControlModel(const Reference<XComponentContext>& _rxFact
,m_bAlwaysShowCursor(sal_False)
,m_bDisplaySynchron(sal_True)
{
- DBG_CTOR(OGridControlModel,NULL);
m_nClassId = FormComponentType::GRIDCONTROL;
}
@@ -113,7 +111,6 @@ OGridControlModel::OGridControlModel( const OGridControlModel* _pOriginal, const
,m_aResetListeners( m_aMutex )
,m_aRowSetChangeListeners( m_aMutex )
{
- DBG_CTOR(OGridControlModel,NULL);
m_aDefaultControl = _pOriginal->m_aDefaultControl;
m_bEnable = _pOriginal->m_bEnable;
@@ -142,7 +139,6 @@ OGridControlModel::~OGridControlModel()
dispose();
}
- DBG_DTOR(OGridControlModel,NULL);
}
// XCloneable
diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index e8fa191..1386de8 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.cxx
@@ -50,12 +50,10 @@ InterfaceRef SAL_CALL OGroupBoxModel_CreateInstance(const Reference<starlang::XM
}
//------------------------------------------------------------------
-DBG_NAME( OGroupBoxModel )
//------------------------------------------------------------------
OGroupBoxModel::OGroupBoxModel(const Reference<XComponentContext>& _rxFactory)
:OControlModel(_rxFactory, VCL_CONTROLMODEL_GROUPBOX, VCL_CONTROL_GROUPBOX)
{
- DBG_CTOR( OGroupBoxModel, NULL );
m_nClassId = FormComponentType::GROUPBOX;
}
@@ -63,7 +61,6 @@ OGroupBoxModel::OGroupBoxModel(const Reference<XComponentContext>& _rxFactory)
OGroupBoxModel::OGroupBoxModel( const OGroupBoxModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
:OControlModel( _pOriginal, _rxFactory )
{
- DBG_CTOR( OGroupBoxModel, NULL );
}
// XServiceInfo
@@ -81,7 +78,6 @@ StringSequence SAL_CALL OGroupBoxModel::getSupportedServiceNames() throw(Runtime
//------------------------------------------------------------------
OGroupBoxModel::~OGroupBoxModel()
{
- DBG_DTOR( OGroupBoxModel, NULL );
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index 19b6abb..af6b3c8 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -151,31 +151,16 @@ public:
// class OGroup
//========================================================================
-DBG_NAME(OGroup)
//------------------------------------------------------------------
OGroup::OGroup( const OUString& rGroupName )
:m_aGroupName( rGroupName )
,m_nInsertPos(0)
{
- DBG_CTOR(OGroup,NULL);
}
-#ifdef DBG_UTIL
-//------------------------------------------------------------------
-OGroup::OGroup( const OGroup& _rSource )
-:m_aCompArray(_rSource.m_aCompArray)
- ,m_aCompAccArray(_rSource.m_aCompAccArray)
- ,m_aGroupName(_rSource.m_aGroupName)
- ,m_nInsertPos(_rSource.m_nInsertPos)
-{
- DBG_CTOR(OGroup,NULL);
-}
-#endif
-
//------------------------------------------------------------------
OGroup::~OGroup()
{
- DBG_DTOR(OGroup,NULL);
}
//------------------------------------------------------------------
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index c0b4009..e682194 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -156,9 +156,6 @@ class OGroup
public:
OGroup( const OUString& rGroupName );
-#ifdef DBG_UTIL
- OGroup( const OGroup& _rSource ); // just to ensure the DBG_CTOR call
-#endif
virtual ~OGroup();
sal_Bool operator==( const OGroup& rGroup ) const;
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index 9c0dd5e..b084030 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -47,12 +47,10 @@ InterfaceRef SAL_CALL OHiddenModel_CreateInstance(const Reference<XMultiServiceF
}
//------------------------------------------------------------------
-DBG_NAME( OHiddenModel )
//------------------------------------------------------------------
OHiddenModel::OHiddenModel(const Reference<XComponentContext>& _rxFactory)
:OControlModel(_rxFactory, OUString())
{
- DBG_CTOR( OHiddenModel, NULL );
m_nClassId = FormComponentType::HIDDENCONTROL;
}
@@ -60,14 +58,12 @@ OHiddenModel::OHiddenModel(const Reference<XComponentContext>& _rxFactory)
OHiddenModel::OHiddenModel( const OHiddenModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
:OControlModel( _pOriginal, _rxFactory )
{
- DBG_CTOR( OHiddenModel, NULL );
m_sHiddenValue = _pOriginal->m_sHiddenValue;
}
//------------------------------------------------------------------------------
OHiddenModel::~OHiddenModel( )
{
- DBG_CTOR( OHiddenModel, NULL );
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index 9507ebe..944df88 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -45,7 +45,6 @@ using namespace ::com::sun::star::util;
//==================================================================
//= OImageButtonModel
//==================================================================
-DBG_NAME(OImageButtonModel)
//------------------------------------------------------------------
InterfaceRef SAL_CALL OImageButtonModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
{
@@ -57,7 +56,6 @@ OImageButtonModel::OImageButtonModel(const Reference<XComponentContext>& _rxFact
:OClickableImageBaseModel( _rxFactory, VCL_CONTROLMODEL_IMAGEBUTTON, FRM_SUN_CONTROL_IMAGEBUTTON )
// use the old control name for compytibility reasons
{
- DBG_CTOR(OImageButtonModel, NULL);
m_nClassId = FormComponentType::IMAGEBUTTON;
}
@@ -65,7 +63,6 @@ OImageButtonModel::OImageButtonModel(const Reference<XComponentContext>& _rxFact
OImageButtonModel::OImageButtonModel( const OImageButtonModel* _pOriginal, const Reference<XComponentContext>& _rxFactory)
:OClickableImageBaseModel( _pOriginal, _rxFactory )
{
- DBG_CTOR(OImageButtonModel, NULL);
implInitializeImageURL();
}
@@ -75,7 +72,6 @@ IMPLEMENT_DEFAULT_CLONING( OImageButtonModel )
//------------------------------------------------------------------------------
OImageButtonModel::~OImageButtonModel()
{
- DBG_DTOR(OImageButtonModel, NULL);
}
// XServiceInfo
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 4e37fc2..61af3cb 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -137,7 +137,6 @@ Sequence<Type> OImageControlModel::_getTypes()
);
}
-DBG_NAME(OImageControlModel)
//------------------------------------------------------------------
OImageControlModel::OImageControlModel(const Reference<XComponentContext>& _rxFactory)
:OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_IMAGECONTROL, FRM_SUN_CONTROL_IMAGECONTROL, sal_False, sal_False, sal_False )
@@ -148,7 +147,6 @@ OImageControlModel::OImageControlModel(const Reference<XComponentContext>& _rxFa
,m_sImageURL()
,m_xGraphicObject()
{
- DBG_CTOR( OImageControlModel, NULL );
m_nClassId = FormComponentType::IMAGECONTROL;
initOwnValueProperty( PROPERTY_IMAGE_URL );
@@ -165,7 +163,6 @@ OImageControlModel::OImageControlModel( const OImageControlModel* _pOriginal, co
,m_sImageURL( _pOriginal->m_sImageURL )
,m_xGraphicObject( _pOriginal->m_xGraphicObject )
{
- DBG_CTOR( OImageControlModel, NULL );
implConstruct();
osl_atomic_increment( &m_refCount );
@@ -194,7 +191,6 @@ OImageControlModel::~OImageControlModel()
dispose();
}
- DBG_DTOR(OImageControlModel,NULL);
}
// XCloneable
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index a39b59e..8945b99 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -153,7 +153,6 @@ namespace frm
startAggregatePropertyListening( PROPERTY_STRINGITEMLIST );
}
- DBG_NAME(OListBoxModel);
//------------------------------------------------------------------
OListBoxModel::OListBoxModel(const Reference<XComponentContext>& _rxFactory)
:OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_LISTBOX, FRM_SUN_CONTROL_LISTBOX, sal_True, sal_True, sal_True )
@@ -164,7 +163,6 @@ namespace frm
,m_nNULLPos(-1)
,m_nBoundColumnType( DataType::SQLNULL )
{
- DBG_CTOR(OListBoxModel,NULL);
m_nClassId = FormComponentType::LISTBOX;
m_eListSourceType = ListSourceType_VALUELIST;
@@ -188,7 +186,6 @@ namespace frm
,m_nNULLPos(-1)
,m_nBoundColumnType( DataType::SQLNULL )
{
- DBG_CTOR(OListBoxModel,NULL);
init();
}
@@ -202,7 +199,6 @@ namespace frm
dispose();
}
- DBG_DTOR(OListBoxModel,NULL);
}
// XCloneable
@@ -1756,14 +1752,12 @@ namespace frm
return aReturn;
}
- DBG_NAME(OListBoxControl);
//------------------------------------------------------------------------------
OListBoxControl::OListBoxControl(const Reference<XComponentContext>& _rxFactory)
:OBoundControl( _rxFactory, VCL_CONTROL_LISTBOX, sal_False )
,m_aChangeListeners( m_aMutex )
,m_aItemListeners( m_aMutex )
{
- DBG_CTOR(OListBoxControl,NULL);
increment(m_refCount);
{
@@ -1797,7 +1791,6 @@ namespace frm
doResetDelegator();
m_xAggregateListBox.clear();
- DBG_DTOR(OListBoxControl,NULL);
}
//------------------------------------------------------------------------------
diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx
index d567b35..fc97732 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -88,13 +88,11 @@ Sequence<Type> ONumericModel::_getTypes()
}
//------------------------------------------------------------------
-DBG_NAME( ONumericModel )
//------------------------------------------------------------------
ONumericModel::ONumericModel(const Reference<XComponentContext>& _rxFactory)
:OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_NUMERICFIELD, FRM_SUN_CONTROL_NUMERICFIELD, sal_True, sal_True )
// use the old control name for compytibility reasons
{
- DBG_CTOR( ONumericModel, NULL );
m_nClassId = FormComponentType::NUMERICFIELD;
initValueProperty( PROPERTY_VALUE, PROPERTY_ID_VALUE );
@@ -104,13 +102,11 @@ ONumericModel::ONumericModel(const Reference<XComponentContext>& _rxFactory)
ONumericModel::ONumericModel( const ONumericModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
:OEditBaseModel( _pOriginal, _rxFactory )
{
- DBG_CTOR( ONumericModel, NULL );
}
//------------------------------------------------------------------
ONumericModel::~ONumericModel()
{
- DBG_DTOR( ONumericModel, NULL );
}
// XCloneable
diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx
index 0dd42ff..e09e069 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -88,13 +88,11 @@ Sequence<Type> OPatternModel::_getTypes()
}
//------------------------------------------------------------------
-DBG_NAME( OPatternModel )
//------------------------------------------------------------------
OPatternModel::OPatternModel(const Reference<XComponentContext>& _rxFactory)
:OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_PATTERNFIELD, FRM_SUN_CONTROL_PATTERNFIELD, sal_False, sal_False )
// use the old control name for compytibility reasons
{
- DBG_CTOR( OPatternModel, NULL );
m_nClassId = FormComponentType::PATTERNFIELD;
initValueProperty( PROPERTY_TEXT, PROPERTY_ID_TEXT );
@@ -104,13 +102,11 @@ OPatternModel::OPatternModel(const Reference<XComponentContext>& _rxFactory)
OPatternModel::OPatternModel( const OPatternModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
:OEditBaseModel( _pOriginal, _rxFactory )
{
- DBG_CTOR( OPatternModel, NULL );
}
//------------------------------------------------------------------
OPatternModel::~OPatternModel()
{
- DBG_DTOR( OPatternModel, NULL );
}
// XCloneable
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index 51cf309..1430c1b 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -98,13 +98,11 @@ InterfaceRef SAL_CALL ORadioButtonModel_CreateInstance(const Reference<XMultiSer
}
//------------------------------------------------------------------
-DBG_NAME( ORadioButtonModel )
//------------------------------------------------------------------
ORadioButtonModel::ORadioButtonModel(const Reference<XComponentContext>& _rxFactory)
:OReferenceValueComponent( _rxFactory, VCL_CONTROLMODEL_RADIOBUTTON, FRM_SUN_CONTROL_RADIOBUTTON,sal_True )
// use the old control name for compytibility reasons
{
- DBG_CTOR( ORadioButtonModel, NULL );
m_nClassId = FormComponentType::RADIOBUTTON;
m_aLabelServiceName = FRM_SUN_COMPONENT_GROUPBOX;
@@ -116,13 +114,11 @@ ORadioButtonModel::ORadioButtonModel(const Reference<XComponentContext>& _rxFact
ORadioButtonModel::ORadioButtonModel( const ORadioButtonModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
:OReferenceValueComponent( _pOriginal, _rxFactory )
{
- DBG_CTOR( ORadioButtonModel, NULL );
}
//------------------------------------------------------------------------------
ORadioButtonModel::~ORadioButtonModel()
{
- DBG_DTOR( ORadioButtonModel, NULL );
}
// XCloneable
diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx
index 73e668b..b768fde 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -120,14 +120,12 @@ Sequence<Type> OTimeModel::_getTypes()
}
//------------------------------------------------------------------
-DBG_NAME( OTimeModel )
//------------------------------------------------------------------
OTimeModel::OTimeModel(const Reference<XComponentContext>& _rxFactory)
:OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_TIMEFIELD, FRM_SUN_CONTROL_TIMEFIELD, sal_True, sal_True )
// use the old control name for compytibility reasons
,OLimitedFormats( _rxFactory, FormComponentType::TIMEFIELD)
{
- DBG_CTOR( OTimeModel, NULL );
m_nClassId = FormComponentType::TIMEFIELD;
initValueProperty( PROPERTY_TIME, PROPERTY_ID_TIME );
@@ -140,7 +138,6 @@ OTimeModel::OTimeModel( const OTimeModel* _pOriginal, const Reference<XComponent
:OEditBaseModel( _pOriginal, _rxFactory )
,OLimitedFormats( _rxFactory, FormComponentType::TIMEFIELD )
{
- DBG_CTOR( OTimeModel, NULL );
setAggregateSet( m_xAggregateFastSet, getOriginalHandle( PROPERTY_ID_TIMEFORMAT ) );
}
@@ -149,7 +146,6 @@ OTimeModel::OTimeModel( const OTimeModel* _pOriginal, const Reference<XComponent
OTimeModel::~OTimeModel( )
{
setAggregateSet(Reference< XFastPropertySet >(), -1);
- DBG_DTOR( OTimeModel, NULL );
}
// XCloneable
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index 0a423548..3f9a661 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -447,7 +447,6 @@ namespace frm
}
//------------------------------------------------------------------
- DBG_NAME( OClickableImageBaseModel )
//------------------------------------------------------------------
OClickableImageBaseModel::OClickableImageBaseModel( const Reference< XComponentContext >& _rxFactory, const OUString& _rUnoControlModelTypeName,
const OUString& rDefault )
@@ -459,7 +458,6 @@ namespace frm
,m_bDownloading(sal_False)
,m_bProdStarted(sal_False)
{
- DBG_CTOR( OClickableImageBaseModel, NULL );
implConstruct();
m_eButtonType = FormButtonType_PUSH;
}
@@ -474,7 +472,6 @@ namespace frm
,m_bDownloading( sal_False )
,m_bProdStarted( sal_False )
{
- DBG_CTOR( OClickableImageBaseModel, NULL );
implConstruct();
// copy properties
@@ -525,7 +522,6 @@ namespace frm
DBG_ASSERT(m_pMedium == NULL, "OClickableImageBaseModel::~OClickableImageBaseModel : leaving a memory leak ...");
// spaetestens im dispose sollte das aufgeraeumt worden sein
- DBG_DTOR( OClickableImageBaseModel, NULL );
}
// XImageProducer
diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx
index 0aa5311..ffbe14b 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -56,13 +56,11 @@ namespace frm
//==================================================================
// ONavigationBarModel
//==================================================================
- DBG_NAME( ONavigationBarModel )
//------------------------------------------------------------------
ONavigationBarModel::ONavigationBarModel( const Reference< XComponentContext >& _rxFactory )
:OControlModel( _rxFactory, OUString() )
,FontControlModel( true )
{
- DBG_CTOR( ONavigationBarModel, NULL );
m_nClassId = FormComponentType::NAVIGATIONBAR;
implInitPropertyContainer();
@@ -86,7 +84,6 @@ namespace frm
:OControlModel( _pOriginal, _rxFactory )
,FontControlModel( _pOriginal )
{
- DBG_CTOR( ONavigationBarModel, NULL );
implInitPropertyContainer();
@@ -139,7 +136,6 @@ namespace frm
dispose();
}
- DBG_DTOR( ONavigationBarModel, NULL );
}
//------------------------------------------------------------------
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index 72266041..a6c30ae 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -98,13 +98,11 @@ namespace frm
//= OScrollBarModel
//====================================================================
//--------------------------------------------------------------------
- DBG_NAME( OScrollBarModel )
//--------------------------------------------------------------------
OScrollBarModel::OScrollBarModel( const Reference<XComponentContext>& _rxFactory )
:OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_SCROLLBAR, VCL_CONTROL_SCROLLBAR, sal_True, sal_True, sal_False )
,m_nDefaultScrollValue( 0 )
{
- DBG_CTOR( OScrollBarModel, NULL );
m_nClassId = FormComponentType::SCROLLBAR;
initValueProperty( PROPERTY_SCROLL_VALUE, PROPERTY_ID_SCROLL_VALUE );
@@ -114,14 +112,12 @@ namespace frm
OScrollBarModel::OScrollBarModel( const OScrollBarModel* _pOriginal, const Reference< XComponentContext >& _rxFactory )
:OBoundControlModel( _pOriginal, _rxFactory )
{
- DBG_CTOR( OScrollBarModel, NULL );
m_nDefaultScrollValue = _pOriginal->m_nDefaultScrollValue;
}
//--------------------------------------------------------------------
OScrollBarModel::~OScrollBarModel( )
{
- DBG_DTOR( OScrollBarModel, NULL );
}
//--------------------------------------------------------------------
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index cd27c96..f7103af 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -54,13 +54,11 @@ namespace frm
//= OSpinButtonModel
//====================================================================
//--------------------------------------------------------------------
- DBG_NAME( OSpinButtonModel )
//--------------------------------------------------------------------
OSpinButtonModel::OSpinButtonModel( const Reference<XComponentContext>& _rxFactory )
:OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_SPINBUTTON, VCL_CONTROL_SPINBUTTON, sal_True, sal_True, sal_False )
,m_nDefaultSpinValue( 0 )
{
- DBG_CTOR( OSpinButtonModel, NULL );
m_nClassId = FormComponentType::SPINBUTTON;
initValueProperty( PROPERTY_SPIN_VALUE, PROPERTY_ID_SPIN_VALUE );
@@ -70,14 +68,12 @@ namespace frm
OSpinButtonModel::OSpinButtonModel( const OSpinButtonModel* _pOriginal, const Reference< XComponentContext >& _rxFactory )
:OBoundControlModel( _pOriginal, _rxFactory )
{
- DBG_CTOR( OSpinButtonModel, NULL );
m_nDefaultSpinValue = _pOriginal->m_nDefaultSpinValue;
}
//--------------------------------------------------------------------
OSpinButtonModel::~OSpinButtonModel( )
{
- DBG_DTOR( OSpinButtonModel, NULL );
}
//--------------------------------------------------------------------
diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx
index 410b76a..8acc422a 100644
--- a/forms/source/helper/formnavigation.cxx
+++ b/forms/source/helper/formnavigation.cxx
@@ -42,20 +42,17 @@ namespace frm
//==================================================================
//= OFormNavigationHelper
//==================================================================
- DBG_NAME( OFormNavigationHelper )
//------------------------------------------------------------------
OFormNavigationHelper::OFormNavigationHelper( const Reference< XComponentContext >& _rxORB )
:m_xORB( _rxORB )
,m_nConnectedFeatures( 0 )
{
- DBG_CTOR( OFormNavigationHelper, NULL );
m_pFeatureInterception.reset( new ControlFeatureInterception( m_xORB ) );
}
//------------------------------------------------------------------
OFormNavigationHelper::~OFormNavigationHelper()
{
- DBG_DTOR( OFormNavigationHelper, NULL );
}
//------------------------------------------------------------------
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 4686762..aa89f89 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -78,18 +78,15 @@ namespace frm
//==================================================================
// ORichTextControl
//==================================================================
- DBG_NAME( ORichTextControl )
//------------------------------------------------------------------
ORichTextControl::ORichTextControl()
:UnoEditControl()
{
- DBG_CTOR( ORichTextControl, NULL );
}
//------------------------------------------------------------------
ORichTextControl::~ORichTextControl()
{
- DBG_DTOR( ORichTextControl, NULL );
}
//------------------------------------------------------------------
@@ -306,7 +303,6 @@ namespace frm
//==================================================================
// ORichTextPeer
//==================================================================
- DBG_NAME( ORichTextPeer )
//------------------------------------------------------------------
ORichTextPeer* ORichTextPeer::Create( const Reference< XControlModel >& _rxModel, Window* _pParentWindow, WinBits _nStyle )
{
@@ -335,13 +331,11 @@ namespace frm
//------------------------------------------------------------------
ORichTextPeer::ORichTextPeer()
{
- DBG_CTOR( ORichTextPeer, NULL );
}
//------------------------------------------------------------------
ORichTextPeer::~ORichTextPeer()
{
- DBG_DTOR( ORichTextPeer, NULL );
}
//------------------------------------------------------------------
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index 8285819..0f2997d 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -97,19 +97,16 @@ namespace frm
return pClone;
}
- DBG_NAME(RichTextEngine)
//--------------------------------------------------------------------
RichTextEngine::RichTextEngine( SfxItemPool* _pPool )
:EditEngine( _pPool )
,m_pEnginePool( _pPool )
{
- DBG_CTOR(RichTextEngine,NULL);
}
//--------------------------------------------------------------------
RichTextEngine::~RichTextEngine( )
{
- DBG_DTOR(RichTextEngine,NULL);
}
//--------------------------------------------------------------------
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 592b0d2..25134d6 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -58,7 +58,6 @@ namespace frm
//====================================================================
//= ORichTextModel
//====================================================================
- DBG_NAME( ORichTextModel )
//--------------------------------------------------------------------
ORichTextModel::ORichTextModel( const Reference< XComponentContext >& _rxFactory )
:OControlModel ( _rxFactory, OUString() )
@@ -67,7 +66,6 @@ namespace frm
,m_bSettingEngineText( false )
,m_aModifyListeners ( m_aMutex )
{
- DBG_CTOR( ORichTextModel, NULL );
m_nClassId = FormComponentType::TEXTFIELD;
getPropertyDefaultByHandle( PROPERTY_ID_DEFAULTCONTROL ) >>= m_sDefaultControl;
@@ -100,7 +98,6 @@ namespace frm
,m_bSettingEngineText( false )
,m_aModifyListeners ( m_aMutex )
{
- DBG_CTOR( ORichTextModel, NULL );
m_aTabStop = _pOriginal->m_aTabStop;
m_aBackgroundColor = _pOriginal->m_aBackgroundColor;
@@ -222,7 +219,6 @@ namespace frm
}
- DBG_DTOR( ORichTextModel, NULL );
}
//------------------------------------------------------------------
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 71eb891..825191a 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -67,18 +67,15 @@ namespace frm
//==================================================================
// ONavigationBarControl
//==================================================================
- DBG_NAME( ONavigationBarControl )
//------------------------------------------------------------------
ONavigationBarControl::ONavigationBarControl( const Reference< XComponentContext >& _rxORB)
:UnoControl(), m_xContext(_rxORB)
{
- DBG_CTOR( ONavigationBarControl, NULL );
}
//------------------------------------------------------------------
ONavigationBarControl::~ONavigationBarControl()
{
- DBG_DTOR( ONavigationBarControl, NULL );
}
//------------------------------------------------------------------
@@ -234,7 +231,6 @@ namespace frm
//==================================================================
// ONavigationBarPeer
//==================================================================
- DBG_NAME( ONavigationBarPeer )
//------------------------------------------------------------------
ONavigationBarPeer* ONavigationBarPeer::Create( const Reference< XComponentContext >& _rxORB,
Window* _pParentWindow, const Reference< XControlModel >& _rxModel )
@@ -274,13 +270,11 @@ namespace frm
ONavigationBarPeer::ONavigationBarPeer( const Reference< XComponentContext >& _rxORB )
:OFormNavigationHelper( _rxORB )
{
- DBG_CTOR( ONavigationBarPeer, NULL );
}
//------------------------------------------------------------------
ONavigationBarPeer::~ONavigationBarPeer()
{
- DBG_DTOR( ONavigationBarPeer, NULL );
}
//------------------------------------------------------------------
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index 3b07018..6578ef2 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -139,7 +139,6 @@ namespace frm
//=====================================================================
//= NavigationToolBar
//=====================================================================
- DBG_NAME( NavigationToolBar )
//---------------------------------------------------------------------
NavigationToolBar::NavigationToolBar( Window* _pParent, WinBits _nStyle, const PCommandImageProvider& _pImageProvider,
const PCommandDescriptionProvider& _pDescriptionProvider )
@@ -150,7 +149,6 @@ namespace frm
,m_eImageSize( eSmall )
,m_pToolbar( NULL )
{
- DBG_CTOR( NavigationToolBar, NULL );
implInit( );
}
@@ -165,7 +163,6 @@ namespace frm
delete *loopChildWins;
}
delete m_pToolbar;
- DBG_DTOR( NavigationToolBar, NULL );
}
//---------------------------------------------------------------------
diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx
index ac63114..a2a2486 100644
--- a/forms/source/xforms/datatyperepository.cxx
+++ b/forms/source/xforms/datatyperepository.cxx
@@ -54,11 +54,9 @@ namespace xforms
//====================================================================
//= ODataTypeRepository
//====================================================================
- DBG_NAME( ODataTypeRepository )
//--------------------------------------------------------------------
ODataTypeRepository::ODataTypeRepository( )
{
- DBG_CTOR( ODataTypeRepository, NULL );
// insert some basic types
OUString sName( FRM_RES_STRING( RID_STR_DATATYPE_STRING ) );
@@ -101,7 +99,6 @@ namespace xforms
//--------------------------------------------------------------------
ODataTypeRepository::~ODataTypeRepository( )
{
- DBG_DTOR( ODataTypeRepository, NULL );
}
//--------------------------------------------------------------------
More information about the Libreoffice-commits
mailing list