[Libreoffice-commits] core.git: reportdesign/source
Arnaud Versini
arnaud.versini at gmail.com
Tue Jan 21 08:25:08 PST 2014
reportdesign/source/core/api/FixedLine.cxx | 4 -
reportdesign/source/core/api/FixedText.cxx | 4 -
reportdesign/source/core/api/FormatCondition.cxx | 3 -
reportdesign/source/core/api/FormattedField.cxx | 4 -
reportdesign/source/core/api/Function.cxx | 3 -
reportdesign/source/core/api/Functions.cxx | 3 -
reportdesign/source/core/api/Group.cxx | 3 -
reportdesign/source/core/api/Groups.cxx | 3 -
reportdesign/source/core/api/ImageControl.cxx | 4 -
reportdesign/source/core/api/ReportDefinition.cxx | 4 -
reportdesign/source/core/api/ReportEngineJFree.cxx | 3 -
reportdesign/source/core/api/Section.cxx | 3 -
reportdesign/source/core/api/Shape.cxx | 4 -
reportdesign/source/core/sdr/ModuleHelper.cxx | 5 -
reportdesign/source/core/sdr/PropertyForward.cxx | 3 -
reportdesign/source/core/sdr/ReportUndoFactory.cxx | 3 -
reportdesign/source/core/sdr/RptModel.cxx | 4 -
reportdesign/source/core/sdr/RptObject.cxx | 34 -------------
reportdesign/source/core/sdr/RptObjectListener.cxx | 3 -
reportdesign/source/core/sdr/RptPage.cxx | 8 ---
reportdesign/source/core/sdr/UndoActions.cxx | 6 --
reportdesign/source/core/sdr/UndoEnv.cxx | 3 -
reportdesign/source/core/sdr/formatnormalizer.cxx | 3 -
reportdesign/source/filter/xml/xmlAutoStyle.cxx | 5 -
reportdesign/source/filter/xml/xmlCell.cxx | 3 -
reportdesign/source/filter/xml/xmlColumn.cxx | 3 -
reportdesign/source/filter/xml/xmlComponent.cxx | 3 -
reportdesign/source/filter/xml/xmlCondPrtExpr.cxx | 5 -
reportdesign/source/filter/xml/xmlControlProperty.cxx | 5 -
reportdesign/source/filter/xml/xmlFixedContent.cxx | 3 -
reportdesign/source/filter/xml/xmlFormatCondition.cxx | 5 -
reportdesign/source/filter/xml/xmlFormattedField.cxx | 3 -
reportdesign/source/filter/xml/xmlFunction.cxx | 3 -
reportdesign/source/filter/xml/xmlGroup.cxx | 3 -
reportdesign/source/filter/xml/xmlHelper.cxx | 3 -
reportdesign/source/filter/xml/xmlImage.cxx | 3 -
reportdesign/source/filter/xml/xmlMasterFields.cxx | 3 -
reportdesign/source/filter/xml/xmlPropertyHandler.cxx | 3 -
reportdesign/source/filter/xml/xmlReport.cxx | 3 -
reportdesign/source/filter/xml/xmlReportElement.cxx | 3 -
reportdesign/source/filter/xml/xmlRow.cxx | 3 -
reportdesign/source/filter/xml/xmlSection.cxx | 3 -
reportdesign/source/filter/xml/xmlStyleImport.cxx | 6 --
reportdesign/source/filter/xml/xmlSubDocument.cxx | 3 -
reportdesign/source/filter/xml/xmlTable.cxx | 3 -
reportdesign/source/filter/xml/xmlfilter.cxx | 6 --
reportdesign/source/ui/dlg/AddField.cxx | 6 --
reportdesign/source/ui/dlg/CondFormat.cxx | 3 -
reportdesign/source/ui/dlg/DateTime.cxx | 6 --
reportdesign/source/ui/dlg/GroupsSorting.cxx | 26 ---------
reportdesign/source/ui/dlg/Navigator.cxx | 9 ---
reportdesign/source/ui/dlg/PageNumber.cxx | 3 -
reportdesign/source/ui/inspection/DefaultInspection.cxx | 3 -
reportdesign/source/ui/inspection/GeometryHandler.cxx | 3 -
reportdesign/source/ui/misc/ColorListener.cxx | 3 -
reportdesign/source/ui/misc/RptUndo.cxx | 3 -
reportdesign/source/ui/misc/toolboxcontroller.cxx | 3 -
reportdesign/source/ui/report/DesignView.cxx | 3 -
reportdesign/source/ui/report/EndMarker.cxx | 3 -
reportdesign/source/ui/report/FixedTextColor.cxx | 3 -
reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 3 -
reportdesign/source/ui/report/ReportController.cxx | 3 -
reportdesign/source/ui/report/ReportControllerObserver.cxx | 3 -
reportdesign/source/ui/report/ReportRuler.cxx | 3 -
reportdesign/source/ui/report/ReportSection.cxx | 3 -
reportdesign/source/ui/report/ReportWindow.cxx | 3 -
reportdesign/source/ui/report/ScrollHelper.cxx | 3 -
reportdesign/source/ui/report/SectionView.cxx | 7 --
reportdesign/source/ui/report/SectionWindow.cxx | 3 -
reportdesign/source/ui/report/StartMarker.cxx | 3 -
reportdesign/source/ui/report/ViewsWindow.cxx | 5 -
reportdesign/source/ui/report/propbrw.cxx | 4 -
72 files changed, 320 deletions(-)
New commits:
commit d3410004066070df4cf1944e241e29cd88f1eef3
Author: Arnaud Versini <arnaud.versini at gmail.com>
Date: Sun Jan 19 16:38:25 2014 +0100
REPORTDESIGN : Remove usage of DBG_CTOR and DBG_DTOR.
Valgrind is capable of detecting such bugs. No need for extra macros.
Change-Id: I9cb8af9dad93a7ee7114489b13e3994515357a10
Reviewed-on: https://gerrit.libreoffice.org/7533
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx
index 5c33e81..b3d0332 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -126,7 +126,6 @@ uno::Sequence< OUString > lcl_getLineOptionals()
};
return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
}
-DBG_NAME(rpt_OFixedLine)
// -----------------------------------------------------------------------------
OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContext)
:FixedLineBase(m_aMutex)
@@ -137,7 +136,6 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex
,m_LineTransparence(0)
,m_LineWidth(0)
{
- DBG_CTOR(rpt_OFixedLine,NULL);
m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDLINE,m_aProps.aComponent.m_xContext->getServiceManager());
m_aProps.aComponent.m_nWidth = MIN_WIDTH;
}
@@ -154,7 +152,6 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex
,m_LineTransparence(0)
,m_LineWidth(0)
{
- DBG_CTOR(rpt_OFixedLine,NULL);
m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDLINE,m_aProps.aComponent.m_xContext->getServiceManager());
m_aProps.aComponent.m_xFactory = _xFactory;
osl_atomic_increment( &m_refCount );
@@ -185,7 +182,6 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex
// -----------------------------------------------------------------------------
OFixedLine::~OFixedLine()
{
- DBG_DTOR(rpt_OFixedLine,NULL);
}
// -----------------------------------------------------------------------------
IMPLEMENT_FORWARD_REFCOUNT( OFixedLine, FixedLineBase )
diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx
index fc7ea17..0255ba8 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -41,14 +41,12 @@ uno::Sequence< OUString > lcl_getFixedTextOptionals()
OUString pProps[] = { OUString(PROPERTY_DATAFIELD),OUString(PROPERTY_MASTERFIELDS),OUString(PROPERTY_DETAILFIELDS) };
return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
}
-DBG_NAME( rpt_OFixedText )
// -----------------------------------------------------------------------------
OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContext)
:FixedTextBase(m_aMutex)
,FixedTextPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFixedTextOptionals())
,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
{
- DBG_CTOR( rpt_OFixedText,NULL);
m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDTEXT,m_aProps.aComponent.m_xContext->getServiceManager());
m_aProps.aComponent.m_nBorder = 0; // no border
}
@@ -60,7 +58,6 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContex
,FixedTextPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFixedTextOptionals())
,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
{
- DBG_CTOR( rpt_OFixedText,NULL);
m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FIXEDTEXT,m_aProps.aComponent.m_xContext->getServiceManager());
m_aProps.aComponent.m_nBorder = 0; // no border
m_aProps.aComponent.m_xFactory = _xFactory;
@@ -73,7 +70,6 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContex
// -----------------------------------------------------------------------------
OFixedText::~OFixedText()
{
- DBG_DTOR( rpt_OFixedText,NULL);
}
// -----------------------------------------------------------------------------
IMPLEMENT_FORWARD_REFCOUNT( OFixedText, FixedTextBase )
diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx
index b470349..6190851 100644
--- a/reportdesign/source/core/api/FormatCondition.cxx
+++ b/reportdesign/source/core/api/FormatCondition.cxx
@@ -39,19 +39,16 @@ uno::Reference< uno::XInterface > OFormatCondition::create(uno::Reference< uno::
return *(new OFormatCondition(xContext));
}
-DBG_NAME( rpt_OFormatCondition )
// -----------------------------------------------------------------------------
OFormatCondition::OFormatCondition(uno::Reference< uno::XComponentContext > const & _xContext)
:FormatConditionBase(m_aMutex)
,FormatConditionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >())
,m_bEnabled(sal_True)
{
- DBG_CTOR( rpt_OFormatCondition,NULL);
}
// -----------------------------------------------------------------------------
OFormatCondition::~OFormatCondition()
{
- DBG_DTOR( rpt_OFormatCondition,NULL);
}
// -----------------------------------------------------------------------------
IMPLEMENT_FORWARD_XINTERFACE2(OFormatCondition,FormatConditionBase,FormatConditionPropertySet)
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx
index 4e3dff2..fef22da 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -48,7 +48,6 @@ uno::Sequence< OUString > lcl_getFormattedFieldOptionals()
OUString pProps[] = { OUString(PROPERTY_MASTERFIELDS),OUString(PROPERTY_DETAILFIELDS) };
return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
}
-DBG_NAME( rpt_OFormattedField )
// -----------------------------------------------------------------------------
OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const & _xContext)
:FormattedFieldBase(m_aMutex)
@@ -56,7 +55,6 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const
,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
,m_nFormatKey(0)
{
- DBG_CTOR( rpt_OFormattedField,NULL);
m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FORMATTEDFIELD,m_aProps.aComponent.m_xContext->getServiceManager());
}
// -----------------------------------------------------------------------------
@@ -68,7 +66,6 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const
,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
,m_nFormatKey(0)
{
- DBG_CTOR( rpt_OFormattedField,NULL);
m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_FORMATTEDFIELD,m_aProps.aComponent.m_xContext->getServiceManager());
m_aProps.aComponent.m_xFactory = _xFactory;
osl_atomic_increment( &m_refCount );
@@ -80,7 +77,6 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const
// -----------------------------------------------------------------------------
OFormattedField::~OFormattedField()
{
- DBG_DTOR( rpt_OFormattedField,NULL);
}
// -----------------------------------------------------------------------------
IMPLEMENT_FORWARD_REFCOUNT( OFormattedField, FormattedFieldBase )
diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx
index 422e365..c82ccee 100644
--- a/reportdesign/source/core/api/Function.cxx
+++ b/reportdesign/source/core/api/Function.cxx
@@ -36,7 +36,6 @@ uno::Reference< uno::XInterface > OFunction::create(uno::Reference< uno::XCompon
return *(new OFunction(xContext));
}
-DBG_NAME( rpt_OFunction )
// -----------------------------------------------------------------------------
OFunction::OFunction(uno::Reference< uno::XComponentContext > const & _xContext)
:FunctionBase(m_aMutex)
@@ -46,12 +45,10 @@ OFunction::OFunction(uno::Reference< uno::XComponentContext > const & _xContext)
,m_bDeepTraversing(sal_False)
{
m_sInitialFormula.IsPresent = sal_False;
- DBG_CTOR( rpt_OFunction,NULL);
}
// -----------------------------------------------------------------------------
OFunction::~OFunction()
{
- DBG_DTOR( rpt_OFunction,NULL);
}
// -----------------------------------------------------------------------------
IMPLEMENT_FORWARD_XINTERFACE2(OFunction,FunctionBase,FunctionPropertySet)
diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx
index e7e6434..a61cce2 100644
--- a/reportdesign/source/core/api/Functions.cxx
+++ b/reportdesign/source/core/api/Functions.cxx
@@ -29,7 +29,6 @@ namespace reportdesign
{
// =============================================================================
using namespace com::sun::star;
-DBG_NAME( rpt_OFunctions )
// -----------------------------------------------------------------------------
OFunctions::OFunctions(const uno::Reference< report::XFunctionsSupplier >& _xParent,const uno::Reference< uno::XComponentContext >& context)
:FunctionsBase(m_aMutex)
@@ -37,14 +36,12 @@ OFunctions::OFunctions(const uno::Reference< report::XFunctionsSupplier >& _xPar
,m_xContext(context)
,m_xParent(_xParent)
{
- DBG_CTOR( rpt_OFunctions,NULL);
}
//--------------------------------------------------------------------------
// TODO: VirtualFunctionFinder: This is virtual function!
//
OFunctions::~OFunctions()
{
- DBG_DTOR( rpt_OFunctions,NULL);
}
//--------------------------------------------------------------------------
void SAL_CALL OFunctions::dispose() throw(uno::RuntimeException)
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index 2bbd6ca..b5d3ba7 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -36,7 +36,6 @@ namespace reportdesign
// =============================================================================
using namespace com::sun::star;
using namespace comphelper;
-DBG_NAME( rpt_OGroup )
// -----------------------------------------------------------------------------
OGroup::OGroup(const uno::Reference< report::XGroups >& _xParent
,const uno::Reference< uno::XComponentContext >& _xContext)
@@ -45,7 +44,6 @@ OGroup::OGroup(const uno::Reference< report::XGroups >& _xParent
,m_xContext(_xContext)
,m_xParent(_xParent)
{
- DBG_CTOR( rpt_OGroup,NULL);
osl_atomic_increment(&m_refCount);
{
m_xFunctions = new OFunctions(this,m_xContext);
@@ -57,7 +55,6 @@ OGroup::OGroup(const uno::Reference< report::XGroups >& _xParent
//
OGroup::~OGroup()
{
- DBG_DTOR( rpt_OGroup,NULL);
}
//--------------------------------------------------------------------------
void OGroup::copyGroup(const uno::Reference< report::XGroup >& _xSource)
diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx
index 8d46791..f1ca56a 100644
--- a/reportdesign/source/core/api/Groups.cxx
+++ b/reportdesign/source/core/api/Groups.cxx
@@ -28,7 +28,6 @@ namespace reportdesign
{
// =============================================================================
using namespace com::sun::star;
-DBG_NAME( rpt_OGroups )
// -----------------------------------------------------------------------------
OGroups::OGroups(const uno::Reference< report::XReportDefinition >& _xParent,const uno::Reference< uno::XComponentContext >& context)
:GroupsBase(m_aMutex)
@@ -36,14 +35,12 @@ OGroups::OGroups(const uno::Reference< report::XReportDefinition >& _xParent,con
,m_xContext(context)
,m_xParent(_xParent)
{
- DBG_CTOR( rpt_OGroups,NULL);
}
//--------------------------------------------------------------------------
// TODO: VirtualFunctionFinder: This is virtual function!
//
OGroups::~OGroups()
{
- DBG_DTOR( rpt_OGroups,NULL);
}
//--------------------------------------------------------------------------
void OGroups::copyGroups(const uno::Reference< report::XGroups >& _xSource)
diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx
index 0b3f657..2648286 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -112,7 +112,6 @@ uno::Sequence< OUString > lcl_getImageOptionals()
return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
}
-DBG_NAME( rpt_OImageControl )
// -----------------------------------------------------------------------------
OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _xContext)
:ImageControlBase(m_aMutex)
@@ -121,7 +120,6 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x
,m_nScaleMode(awt::ImageScaleMode::NONE)
,m_bPreserveIRI(sal_True)
{
- DBG_CTOR( rpt_OImageControl,NULL);
m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_IMAGECONTROL,m_aProps.aComponent.m_xContext->getServiceManager());
}
// -----------------------------------------------------------------------------
@@ -134,7 +132,6 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x
,m_nScaleMode(awt::ImageScaleMode::NONE)
,m_bPreserveIRI(sal_True)
{
- DBG_CTOR( rpt_OImageControl,NULL);
m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_IMAGECONTROL,m_aProps.aComponent.m_xContext->getServiceManager());
m_aProps.aComponent.m_xFactory = _xFactory;
osl_atomic_increment( &m_refCount );
@@ -146,7 +143,6 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x
// -----------------------------------------------------------------------------
OImageControl::~OImageControl()
{
- DBG_DTOR( rpt_OImageControl,NULL);
}
// -----------------------------------------------------------------------------
//IMPLEMENT_FORWARD_XINTERFACE2(OImageControl,ImageControlBase,ImageControlPropertySet)
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 659a0b7..9dd7ca6 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -632,7 +632,6 @@ OReportDefinitionImpl::~OReportDefinitionImpl()
{
}
-DBG_NAME( rpt_OReportDefinition )
// -----------------------------------------------------------------------------
OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > const & _xContext)
: ReportDefinitionBase(m_aMutex)
@@ -640,7 +639,6 @@ OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > co
,m_aProps(new OReportComponentProperties(_xContext))
,m_pImpl(new OReportDefinitionImpl(m_aMutex))
{
- DBG_CTOR( rpt_OReportDefinition,NULL);
m_aProps->m_sName = RPT_RESSTRING(RID_STR_REPORT,m_aProps->m_xContext->getServiceManager());
osl_atomic_increment(&m_refCount);
{
@@ -681,7 +679,6 @@ OReportDefinition::OReportDefinition(const OReportDefinition& _rCopy)
,m_aProps(new OReportComponentProperties(*_rCopy.m_aProps))
,m_pImpl(new OReportDefinitionImpl(m_aMutex,*_rCopy.m_pImpl))
{
- DBG_CTOR( rpt_OReportDefinition,NULL);
osl_atomic_increment(&m_refCount);
{
init();
@@ -705,7 +702,6 @@ OReportDefinition::OReportDefinition(const OReportDefinition& _rCopy)
// -----------------------------------------------------------------------------
OReportDefinition::~OReportDefinition()
{
- DBG_DTOR( rpt_OReportDefinition,NULL);
if ( !ReportDefinitionBase::rBHelper.bInDispose && !ReportDefinitionBase::rBHelper.bDisposed )
{
acquire();
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index a00b9ab..8fbb357 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -60,7 +60,6 @@ namespace reportdesign
using namespace com::sun::star;
using namespace comphelper;
-DBG_NAME( rpt_OReportEngineJFree )
// -----------------------------------------------------------------------------
OReportEngineJFree::OReportEngineJFree( const uno::Reference< uno::XComponentContext >& context)
:ReportEngineBase(m_aMutex)
@@ -68,14 +67,12 @@ OReportEngineJFree::OReportEngineJFree( const uno::Reference< uno::XComponentCon
,m_xContext(context)
,m_nMaxRows(0)
{
- DBG_CTOR( rpt_OReportEngineJFree,NULL);
}
// -----------------------------------------------------------------------------
// TODO: VirtualFunctionFinder: This is virtual function!
//
OReportEngineJFree::~OReportEngineJFree()
{
- DBG_DTOR( rpt_OReportEngineJFree,NULL);
}
//--------------------------------------------------------------------------
IMPLEMENT_FORWARD_XINTERFACE2(OReportEngineJFree,ReportEngineBase,ReportEnginePropertySet)
diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx
index 3787f0a..a597c6b 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -43,7 +43,6 @@ namespace reportdesign
// =============================================================================
using namespace com::sun::star;
using namespace comphelper;
-DBG_NAME( rpt_OSection )
// -----------------------------------------------------------------------------
uno::Sequence< OUString> lcl_getGroupAbsent()
@@ -127,14 +126,12 @@ OSection::OSection(const uno::Reference< report::XReportDefinition >& xParentDef
,m_bInRemoveNotify(false)
,m_bInInsertNotify(false)
{
- DBG_CTOR( rpt_OSection,NULL);
}
//--------------------------------------------------------------------------
// TODO: VirtualFunctionFinder: This is virtual function!
//
OSection::~OSection()
{
- DBG_DTOR( rpt_OSection,NULL);
}
//--------------------------------------------------------------------------
//IMPLEMENT_FORWARD_XINTERFACE2(OSection,SectionBase,SectionPropertySet)
diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index 9b3a436..1dd7bcf 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -51,7 +51,6 @@ uno::Sequence< OUString > lcl_getShapeOptionals()
return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
}
-DBG_NAME( rpt_OShape )
// -----------------------------------------------------------------------------
OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext)
:ShapeBase(m_aMutex)
@@ -60,7 +59,6 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext)
,m_nZOrder(0)
,m_bOpaque(sal_False)
{
- DBG_CTOR( rpt_OShape,NULL);
m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_SHAPE,m_aProps.aComponent.m_xContext->getServiceManager());
}
// -----------------------------------------------------------------------------
@@ -75,7 +73,6 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext
,m_bOpaque(sal_False)
,m_sServiceName(_sServiceName)
{
- DBG_CTOR( rpt_OShape,NULL);
m_aProps.aComponent.m_sName = RPT_RESSTRING(RID_STR_SHAPE,m_aProps.aComponent.m_xContext->getServiceManager());
m_aProps.aComponent.m_xFactory = _xFactory;
osl_atomic_increment( &m_refCount );
@@ -93,7 +90,6 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext
// -----------------------------------------------------------------------------
OShape::~OShape()
{
- DBG_DTOR( rpt_OShape,NULL);
}
// -----------------------------------------------------------------------------
//IMPLEMENT_FORWARD_XINTERFACE2(OShape,ShapeBase,ShapePropertySet)
diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx
index 7b16502..7a8759b 100644
--- a/reportdesign/source/core/sdr/ModuleHelper.cxx
+++ b/reportdesign/source/core/sdr/ModuleHelper.cxx
@@ -54,13 +54,10 @@ public:
ResMgr* getResManager();
};
-DBG_NAME( rpt_OModuleImpl )
//-------------------------------------------------------------------------
OModuleImpl::OModuleImpl()
:m_pResources(NULL)
{
- DBG_CTOR( rpt_OModuleImpl,NULL);
-
}
//-------------------------------------------------------------------------
@@ -68,8 +65,6 @@ OModuleImpl::~OModuleImpl()
{
if (m_pResources)
delete m_pResources;
-
- DBG_DTOR( rpt_OModuleImpl,NULL);
}
//-------------------------------------------------------------------------
diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx
index 0c59089..e10f891 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -33,7 +33,6 @@ namespace rptui
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
-DBG_NAME( rpt_OPropertyMediator )
OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource
,const Reference< XPropertySet>& _xDest
,const TPropertyNamePair& _aNameMap
@@ -44,7 +43,6 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource
,m_xDest(_xDest)
,m_bInChange(sal_False)
{
- DBG_CTOR( rpt_OPropertyMediator,NULL);
osl_atomic_increment(&m_refCount);
OSL_ENSURE(m_xDest.is(),"Dest is NULL!");
OSL_ENSURE(m_xSource.is(),"Source is NULL!");
@@ -91,7 +89,6 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource
// -----------------------------------------------------------------------------
OPropertyMediator::~OPropertyMediator()
{
- DBG_DTOR( rpt_OPropertyMediator,NULL);
}
// -----------------------------------------------------------------------------
void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException)
diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
index 8d418af..6c061ba 100644
--- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx
+++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
@@ -41,16 +41,13 @@ SdrUndoAction* lcl_createUndo(SdrObject& rObject,Action _eAction,sal_uInt16 _nCo
return pUndo;
}
// -----------------------------------------------------------------------------
-DBG_NAME( rpt_OReportUndoFactory )
// -----------------------------------------------------------------------------
OReportUndoFactory::OReportUndoFactory() : m_pUndoFactory(new SdrUndoFactory)
{
- DBG_CTOR( rpt_OReportUndoFactory,NULL);
}
// -----------------------------------------------------------------------------
OReportUndoFactory::~OReportUndoFactory()
{
- DBG_DTOR( rpt_OReportUndoFactory,NULL);
}
///////////////////////////////////////////////////////////////////////
// shapes
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 640018b..3505804 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -43,7 +43,6 @@ namespace rptui
{
using namespace reportdesign;
using namespace com::sun::star;
-DBG_NAME( rpt_OReportModel )
TYPEINIT1(OReportModel,SdrModel);
//----------------------------------------------------------------------------
@@ -53,7 +52,6 @@ OReportModel::OReportModel(::reportdesign::OReportDefinition* _pReportDefinition
,m_pController(NULL)
,m_pReportDefinition(_pReportDefinition)
{
- DBG_CTOR( rpt_OReportModel,0);
m_pUndoEnv = new OXUndoEnvironment(*this);
m_pUndoEnv->acquire();
SetSdrUndoFactory(new OReportUndoFactory);
@@ -62,7 +60,6 @@ OReportModel::OReportModel(::reportdesign::OReportDefinition* _pReportDefinition
//----------------------------------------------------------------------------
OReportModel::~OReportModel()
{
- DBG_DTOR( rpt_OReportModel,0);
detachController();
m_pUndoEnv->release();
}
@@ -78,7 +75,6 @@ void OReportModel::detachController()
//----------------------------------------------------------------------------
SdrPage* OReportModel::AllocPage(bool /*bMasterPage*/)
{
- DBG_CHKTHIS( rpt_OReportModel, 0);
OSL_FAIL("Who called me!");
return NULL;
}
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index 4615cc1..fb1f185 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -310,11 +310,9 @@ const TPropertyNamePair& getPropertyNameMap(sal_uInt16 _nObjectId)
}
// -----------------------------------------------------------------------------
-DBG_NAME( rpt_OObjectBase )
OObjectBase::OObjectBase(const uno::Reference< report::XReportComponent>& _xComponent)
:m_bIsListening(sal_False)
{
- DBG_CTOR( rpt_OObjectBase,NULL);
m_xReportComponent = _xComponent;
}
//----------------------------------------------------------------------------
@@ -322,12 +320,10 @@ OObjectBase::OObjectBase(const OUString& _sComponentName)
:m_sComponentName(_sComponentName)
,m_bIsListening(sal_False)
{
- DBG_CTOR( rpt_OObjectBase,NULL);
}
//----------------------------------------------------------------------------
OObjectBase::~OObjectBase()
{
- DBG_DTOR( rpt_OObjectBase,NULL);
m_xMediator.reset();
if ( isListening() )
EndListening();
@@ -355,7 +351,6 @@ uno::Reference< beans::XPropertySet> OObjectBase::getAwtComponent()
//----------------------------------------------------------------------------
void OObjectBase::StartListening()
{
- DBG_CHKTHIS( rpt_OObjectBase,NULL);
OSL_ENSURE(!isListening(), "OUnoObject::StartListening: already listening!");
if ( !isListening() && m_xReportComponent.is() )
@@ -373,7 +368,6 @@ void OObjectBase::StartListening()
//----------------------------------------------------------------------------
void OObjectBase::EndListening(sal_Bool /*bRemoveListener*/)
{
- DBG_CHKTHIS( rpt_OObjectBase,NULL);
OSL_ENSURE(!m_xReportComponent.is() || isListening(), "OUnoObject::EndListening: not listening currently!");
m_bIsListening = sal_False;
@@ -398,7 +392,6 @@ void OObjectBase::EndListening(sal_Bool /*bRemoveListener*/)
//----------------------------------------------------------------------------
void OObjectBase::SetPropsFromRect(const Rectangle& _rRect)
{
- DBG_CHKTHIS( rpt_OObjectBase,NULL);
// set properties
OReportPage* pPage = dynamic_cast<OReportPage*>(GetImplPage());
if ( pPage && !_rRect.IsEmpty() )
@@ -416,7 +409,6 @@ void OObjectBase::SetPropsFromRect(const Rectangle& _rRect)
//----------------------------------------------------------------------------
void OObjectBase::_propertyChange( const beans::PropertyChangeEvent& /*evt*/ ) throw( uno::RuntimeException)
{
- DBG_CHKTHIS( rpt_OObjectBase,NULL);
}
//----------------------------------------------------------------------------
void OObjectBase::SetObjectItemHelper(const SfxPoolItem& /*rItem*/)
@@ -427,7 +419,6 @@ void OObjectBase::SetObjectItemHelper(const SfxPoolItem& /*rItem*/)
//----------------------------------------------------------------------------
sal_Bool OObjectBase::supportsService( const OUString& _sServiceName ) const
{
- DBG_CHKTHIS( rpt_OObjectBase,NULL);
sal_Bool bSupports = sal_False;
Reference< lang::XServiceInfo > xServiceInfo( m_xReportComponent , UNO_QUERY );
@@ -478,13 +469,11 @@ uno::Reference< uno::XInterface > OObjectBase::getUnoShapeOf( SdrObject& _rSdrOb
//----------------------------------------------------------------------------
TYPEINIT1(OCustomShape, SdrObjCustomShape);
-DBG_NAME( rpt_OCustomShape );
OCustomShape::OCustomShape(const uno::Reference< report::XReportComponent>& _xComponent
)
:SdrObjCustomShape()
,OObjectBase(_xComponent)
{
- DBG_CTOR( rpt_OCustomShape, NULL);
impl_setUnoShape( uno::Reference< uno::XInterface >(_xComponent,uno::UNO_QUERY) );
m_bIsListening = sal_True;
}
@@ -493,14 +482,12 @@ OCustomShape::OCustomShape(const OUString& _sComponentName)
:SdrObjCustomShape()
,OObjectBase(_sComponentName)
{
- DBG_CTOR( rpt_OCustomShape, NULL);
m_bIsListening = sal_True;
}
//----------------------------------------------------------------------------
OCustomShape::~OCustomShape()
{
- DBG_DTOR( rpt_OCustomShape, NULL);
}
// -----------------------------------------------------------------------------
sal_uInt16 OCustomShape::GetObjIdentifier() const
@@ -622,7 +609,6 @@ void OCustomShape::impl_setUnoShape( const uno::Reference< uno::XInterface >& rx
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
TYPEINIT1(OUnoObject, SdrUnoObj);
-DBG_NAME( rpt_OUnoObject );
//----------------------------------------------------------------------------
OUnoObject::OUnoObject(const OUString& _sComponentName
,const OUString& rModelName
@@ -631,7 +617,6 @@ OUnoObject::OUnoObject(const OUString& _sComponentName
,OObjectBase(_sComponentName)
,m_nObjectType(_nObjectType)
{
- DBG_CTOR( rpt_OUnoObject, NULL);
if ( !rModelName.isEmpty() )
impl_initializeModel_nothrow();
}
@@ -643,7 +628,6 @@ OUnoObject::OUnoObject(const uno::Reference< report::XReportComponent>& _xCompon
,OObjectBase(_xComponent)
,m_nObjectType(_nObjectType)
{
- DBG_CTOR( rpt_OUnoObject, NULL);
impl_setUnoShape( uno::Reference< uno::XInterface >( _xComponent, uno::UNO_QUERY ) );
if ( !rModelName.isEmpty() )
@@ -653,7 +637,6 @@ OUnoObject::OUnoObject(const uno::Reference< report::XReportComponent>& _xCompon
//----------------------------------------------------------------------------
OUnoObject::~OUnoObject()
{
- DBG_DTOR( rpt_OUnoObject, NULL);
}
// -----------------------------------------------------------------------------
void OUnoObject::impl_initializeModel_nothrow()
@@ -703,19 +686,16 @@ sal_uInt32 OUnoObject::GetObjInventor() const
//----------------------------------------------------------------------------
SdrPage* OUnoObject::GetImplPage() const
{
- DBG_CHKTHIS( rpt_OUnoObject,NULL);
return GetPage();
}
//----------------------------------------------------------------------------
void OUnoObject::SetSnapRectImpl(const Rectangle& _rRect)
{
- DBG_CHKTHIS( rpt_OUnoObject,NULL);
SetSnapRect( _rRect );
}
//----------------------------------------------------------------------------
sal_Int32 OUnoObject::GetStep() const
{
- DBG_CHKTHIS( rpt_OUnoObject,NULL);
// get step property
sal_Int32 nStep = 0;
OSL_FAIL("Who called me!");
@@ -725,7 +705,6 @@ sal_Int32 OUnoObject::GetStep() const
//----------------------------------------------------------------------------
void OUnoObject::NbcMove( const Size& rSize )
{
- DBG_CHKTHIS( rpt_OUnoObject,NULL);
if ( m_bIsListening )
{
@@ -775,7 +754,6 @@ void OUnoObject::NbcMove( const Size& rSize )
void OUnoObject::NbcResize(const Point& rRef, const Fraction& xFract, const Fraction& yFract)
{
- DBG_CHKTHIS( rpt_OUnoObject,NULL);
SdrUnoObj::NbcResize( rRef, xFract, yFract );
// stop listening
@@ -804,7 +782,6 @@ void OUnoObject::NbcSetLogicRect(const Rectangle& rRect)
bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
- DBG_CHKTHIS( rpt_OUnoObject,NULL);
bool bResult = SdrUnoObj::EndCreate(rStat, eCmd);
if ( bResult )
{
@@ -863,7 +840,6 @@ OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj)
// -----------------------------------------------------------------------------
void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt ) throw( uno::RuntimeException)
{
- DBG_CHKTHIS( rpt_OUnoObject,NULL);
OObjectBase::_propertyChange(evt);
if (isListening())
{
@@ -970,14 +946,12 @@ OUnoObject* OUnoObject::Clone() const
// OOle2Obj
//----------------------------------------------------------------------------
TYPEINIT1(OOle2Obj, SdrOle2Obj);
-DBG_NAME( rpt_OOle2Obj );
OOle2Obj::OOle2Obj(const uno::Reference< report::XReportComponent>& _xComponent,sal_uInt16 _nType)
:SdrOle2Obj()
,OObjectBase(_xComponent)
,m_nType(_nType)
,m_bOnlyOnce(true)
{
- DBG_CTOR( rpt_OOle2Obj, NULL);
impl_setUnoShape( uno::Reference< uno::XInterface >( _xComponent, uno::UNO_QUERY ) );
m_bIsListening = sal_True;
@@ -989,13 +963,11 @@ OOle2Obj::OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType)
,m_nType(_nType)
,m_bOnlyOnce(true)
{
- DBG_CTOR( rpt_OOle2Obj, NULL);
m_bIsListening = sal_True;
}
//----------------------------------------------------------------------------
OOle2Obj::~OOle2Obj()
{
- DBG_DTOR( rpt_OOle2Obj, NULL);
}
// -----------------------------------------------------------------------------
sal_uInt16 OOle2Obj::GetObjIdentifier() const
@@ -1010,19 +982,16 @@ sal_uInt32 OOle2Obj::GetObjInventor() const
//----------------------------------------------------------------------------
SdrPage* OOle2Obj::GetImplPage() const
{
- DBG_CHKTHIS( rpt_OOle2Obj,NULL);
return GetPage();
}
//----------------------------------------------------------------------------
void OOle2Obj::SetSnapRectImpl(const Rectangle& _rRect)
{
- DBG_CHKTHIS( rpt_OOle2Obj,NULL);
SetSnapRect( _rRect );
}
//----------------------------------------------------------------------------
sal_Int32 OOle2Obj::GetStep() const
{
- DBG_CHKTHIS( rpt_OOle2Obj,NULL);
// get step property
sal_Int32 nStep = 0;
OSL_FAIL("Who called me!");
@@ -1032,7 +1001,6 @@ sal_Int32 OOle2Obj::GetStep() const
//----------------------------------------------------------------------------
void OOle2Obj::NbcMove( const Size& rSize )
{
- DBG_CHKTHIS( rpt_OOle2Obj,NULL);
if ( m_bIsListening )
{
@@ -1087,7 +1055,6 @@ void OOle2Obj::NbcMove( const Size& rSize )
void OOle2Obj::NbcResize(const Point& rRef, const Fraction& xFract, const Fraction& yFract)
{
- DBG_CHKTHIS( rpt_OOle2Obj,NULL);
SdrOle2Obj::NbcResize( rRef, xFract, yFract );
// stop listening
@@ -1116,7 +1083,6 @@ void OOle2Obj::NbcSetLogicRect(const Rectangle& rRect)
bool OOle2Obj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
- DBG_CHKTHIS( rpt_OOle2Obj,NULL);
bool bResult = SdrOle2Obj::EndCreate(rStat, eCmd);
if ( bResult )
{
diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx
index 8ac3008..31a4815 100644
--- a/reportdesign/source/core/sdr/RptObjectListener.cxx
+++ b/reportdesign/source/core/sdr/RptObjectListener.cxx
@@ -27,18 +27,15 @@ namespace rptui
//============================================================================
//----------------------------------------------------------------------------
-DBG_NAME(rpt_OObjectListener)
OObjectListener::OObjectListener(OObjectBase* _pObject)
:m_pObject(_pObject)
{
- DBG_CTOR(rpt_OObjectListener,NULL);
}
//----------------------------------------------------------------------------
OObjectListener::~OObjectListener()
{
- DBG_DTOR(rpt_OObjectListener,NULL);
}
// XEventListener
diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx
index 6b84358..f203606 100644
--- a/reportdesign/source/core/sdr/RptPage.cxx
+++ b/reportdesign/source/core/sdr/RptPage.cxx
@@ -30,7 +30,6 @@ using namespace ::com::sun::star;
TYPEINIT1( OReportPage, SdrPage );
//----------------------------------------------------------------------------
-DBG_NAME( rpt_OReportPage )
OReportPage::OReportPage( OReportModel& _rModel
,const uno::Reference< report::XSection >& _xSection
,bool bMasterPage )
@@ -39,7 +38,6 @@ OReportPage::OReportPage( OReportModel& _rModel
,m_xSection(_xSection)
,m_bSpecialInsertMode(false)
{
- DBG_CTOR( rpt_OReportPage,NULL);
}
//----------------------------------------------------------------------------
@@ -51,28 +49,24 @@ OReportPage::OReportPage( const OReportPage& rPage )
,m_bSpecialInsertMode(rPage.m_bSpecialInsertMode)
,m_aTemporaryObjectList(rPage.m_aTemporaryObjectList)
{
- DBG_CTOR( rpt_OReportPage,NULL);
}
//----------------------------------------------------------------------------
OReportPage::~OReportPage()
{
- DBG_DTOR( rpt_OReportPage,NULL);
}
//----------------------------------------------------------------------------
SdrPage* OReportPage::Clone() const
{
- DBG_CHKTHIS( rpt_OReportPage,NULL);
return new OReportPage( *this );
}
//----------------------------------------------------------------------------
sal_uLong OReportPage::getIndexOf(const uno::Reference< report::XReportComponent >& _xObject)
{
- DBG_CHKTHIS( rpt_OReportPage,NULL);
sal_uLong nCount = GetObjCount();
sal_uLong i = 0;
for (; i < nCount; ++i)
@@ -89,7 +83,6 @@ sal_uLong OReportPage::getIndexOf(const uno::Reference< report::XReportComponent
//----------------------------------------------------------------------------
void OReportPage::removeSdrObject(const uno::Reference< report::XReportComponent >& _xObject)
{
- DBG_CHKTHIS( rpt_OReportPage,NULL);
sal_uLong nPos = getIndexOf(_xObject);
if ( nPos < GetObjCount() )
{
@@ -125,7 +118,6 @@ SdrObject* OReportPage::RemoveObject(sal_uLong nObjNum)
//----------------------------------------------------------------------------
void OReportPage::insertObject(const uno::Reference< report::XReportComponent >& _xObject)
{
- DBG_CHKTHIS( rpt_OReportPage,NULL);
OSL_ENSURE(_xObject.is(),"Object is not valid to create a SdrObject!");
if ( !_xObject.is() )
return;
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index ec39535..b8738c2 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -83,19 +83,16 @@ namespace rptui
//------------------------------------------------------------------------------
TYPEINIT1( OCommentUndoAction, SdrUndoAction );
-DBG_NAME(rpt_OCommentUndoAction)
//----------------------------------------------------------------------------
OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,sal_uInt16 nCommentID)
:SdrUndoAction(_rMod)
{
- DBG_CTOR(rpt_OCommentUndoAction,NULL);
m_pController = static_cast< OReportModel& >( _rMod ).getController();
if ( nCommentID )
m_strComment = ModuleRes(nCommentID);
}
OCommentUndoAction::~OCommentUndoAction()
{
- DBG_DTOR(rpt_OCommentUndoAction,NULL);
}
//----------------------------------------------------------------------------
void OCommentUndoAction::Undo()
@@ -105,7 +102,6 @@ void OCommentUndoAction::Undo()
void OCommentUndoAction::Redo()
{
}
-DBG_NAME( rpt_OUndoContainerAction );
//------------------------------------------------------------------------------
OUndoContainerAction::OUndoContainerAction(SdrModel& _rMod
,Action _eAction
@@ -117,7 +113,6 @@ OUndoContainerAction::OUndoContainerAction(SdrModel& _rMod
,m_xContainer(_xContainer)
,m_eAction( _eAction )
{
- DBG_CTOR( rpt_OUndoContainerAction,NULL);
// normalize
if ( m_eAction == Removed )
// we now own the element
@@ -154,7 +149,6 @@ OUndoContainerAction::~OUndoContainerAction()
}
}
}
- DBG_DTOR( rpt_OUndoContainerAction,NULL);
}
//------------------------------------------------------------------------------
void OUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) )
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index e25c1c4..0f54f75 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -123,19 +123,16 @@ OXUndoEnvironmentImpl::OXUndoEnvironmentImpl(OReportModel& _rModel) : m_rModel(_
}
//------------------------------------------------------------------------------
-DBG_NAME( rpt_OXUndoEnvironment );
//------------------------------------------------------------------------------
OXUndoEnvironment::OXUndoEnvironment(OReportModel& _rModel)
:m_pImpl(new OXUndoEnvironmentImpl(_rModel) )
{
- DBG_CTOR( rpt_OXUndoEnvironment,NULL);
StartListening(m_pImpl->m_rModel);
}
//------------------------------------------------------------------------------
OXUndoEnvironment::~OXUndoEnvironment()
{
- DBG_DTOR( rpt_OXUndoEnvironment,NULL);
}
// -----------------------------------------------------------------------------
void OXUndoEnvironment::Lock()
diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx
index 0532817..a55d0f1 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.cxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.cxx
@@ -54,20 +54,17 @@ namespace rptui
//====================================================================
//= FormatNormalizer
//====================================================================
- DBG_NAME(rpt_FormatNormalizer)
//--------------------------------------------------------------------
FormatNormalizer::FormatNormalizer( const OReportModel& _rModel )
:m_rModel( _rModel )
,m_xReportDefinition( )
,m_bFieldListDirty( true )
{
- DBG_CTOR(rpt_FormatNormalizer,NULL);
}
//--------------------------------------------------------------------
FormatNormalizer::~FormatNormalizer()
{
- DBG_DTOR(rpt_FormatNormalizer,NULL);
}
//--------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx
index 9b511bd..2fb68ef 100644
--- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx
+++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx
@@ -68,20 +68,15 @@ void OXMLAutoStylePoolP::exportStyleAttributes(
}
}
}
-DBG_NAME( rpt_OXMLAutoStylePoolP )
// -----------------------------------------------------------------------------
OXMLAutoStylePoolP::OXMLAutoStylePoolP(ORptExport& rTempORptExport):
SvXMLAutoStylePoolP(rTempORptExport),
rORptExport(rTempORptExport)
{
- DBG_CTOR( rpt_OXMLAutoStylePoolP,NULL);
-
}
// -----------------------------------------------------------------------------
OXMLAutoStylePoolP::~OXMLAutoStylePoolP()
{
-
- DBG_DTOR( rpt_OXMLAutoStylePoolP,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index 65e4d51..094e7d7 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -47,7 +47,6 @@ namespace rptxml
using namespace beans;
using namespace xml::sax;
-DBG_NAME( rpt_OXMLCell )
OXMLCell::OXMLCell( ORptFilter& rImport
,sal_uInt16 nPrfx
@@ -61,7 +60,6 @@ OXMLCell::OXMLCell( ORptFilter& rImport
,m_nCurrentCount(0)
,m_bContainsShape(false)
{
- DBG_CTOR( rpt_OXMLCell,NULL);
if ( !m_pCell )
m_pCell = this;
@@ -96,7 +94,6 @@ OXMLCell::OXMLCell( ORptFilter& rImport
// -----------------------------------------------------------------------------
OXMLCell::~OXMLCell()
{
- DBG_DTOR( rpt_OXMLCell,NULL);
}
// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLCell::CreateChildContext(
diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx
index a50e2b6..24da3e3 100644
--- a/reportdesign/source/filter/xml/xmlColumn.cxx
+++ b/reportdesign/source/filter/xml/xmlColumn.cxx
@@ -43,7 +43,6 @@ namespace rptxml
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME( rpt_OXMLRowColumn )
OXMLRowColumn::OXMLRowColumn( ORptFilter& rImport
,sal_uInt16 nPrfx
@@ -54,7 +53,6 @@ OXMLRowColumn::OXMLRowColumn( ORptFilter& rImport
SvXMLImportContext( rImport, nPrfx, _sLocalName )
,m_pContainer(_pContainer)
{
- DBG_CTOR( rpt_OXMLRowColumn,NULL);
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
const SvXMLTokenMap& rTokenMap = rImport.GetColumnTokenMap();
@@ -81,7 +79,6 @@ OXMLRowColumn::OXMLRowColumn( ORptFilter& rImport
OXMLRowColumn::~OXMLRowColumn()
{
- DBG_DTOR( rpt_OXMLRowColumn,NULL);
}
// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLRowColumn::CreateChildContext(
diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx
index b413136..e6cfe1f 100644
--- a/reportdesign/source/filter/xml/xmlComponent.cxx
+++ b/reportdesign/source/filter/xml/xmlComponent.cxx
@@ -42,7 +42,6 @@ namespace rptxml
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::report;
using namespace ::com::sun::star::xml::sax;
- DBG_NAME( rpt_OXMLComponent )
OXMLComponent::OXMLComponent( ORptFilter& _rImport
,sal_uInt16 nPrfx
,const OUString& _sLocalName
@@ -52,7 +51,6 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport
SvXMLImportContext( _rImport, nPrfx, _sLocalName )
,m_xComponent(_xComponent)
{
- DBG_CTOR( rpt_OXMLComponent,NULL);
OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
OSL_ENSURE(m_xComponent.is(),"Component is NULL!");
@@ -94,7 +92,6 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport
OXMLComponent::~OXMLComponent()
{
- DBG_DTOR( rpt_OXMLComponent,NULL);
}
// -----------------------------------------------------------------------------
//----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
index 07a1f794..578d3f5 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
@@ -33,7 +33,6 @@ namespace rptxml
using namespace report;
using namespace uno;
using namespace xml::sax;
-DBG_NAME( rpt_OXMLCondPrtExpr )
OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport,
sal_uInt16 nPrfx
@@ -43,8 +42,6 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport,
SvXMLImportContext( _rImport, nPrfx, rLName )
,m_xComponent(_xComponent)
{
- DBG_CTOR( rpt_OXMLCondPrtExpr,NULL);
-
OSL_ENSURE(m_xComponent.is(),"Component is NULL!");
const SvXMLNamespaceMap& rMap = _rImport.GetNamespaceMap();
const SvXMLTokenMap& rTokenMap = _rImport.GetFunctionElemTokenMap();
@@ -78,8 +75,6 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport,
OXMLCondPrtExpr::~OXMLCondPrtExpr()
{
-
- DBG_DTOR( rpt_OXMLCondPrtExpr,NULL);
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 6509da4..7404861 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -46,8 +46,6 @@ namespace rptxml
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME( rpt_OXMLControlProperty )
-
OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
,sal_uInt16 nPrfx
,const OUString& _sLocalName
@@ -59,8 +57,6 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
,m_pContainer(_pContainer)
,m_bIsList(sal_False)
{
- DBG_CTOR( rpt_OXMLControlProperty,NULL);
-
m_aPropType = ::getVoidCppuType();
OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
@@ -118,7 +114,6 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
OXMLControlProperty::~OXMLControlProperty()
{
- DBG_DTOR( rpt_OXMLControlProperty,NULL);
}
// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLControlProperty::CreateChildContext(
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index e0197fe..bfbab18 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -106,7 +106,6 @@ void OXMLCharContent::InsertString(const OUString& _sString)
}
// -----------------------------------------------------------------------------
-DBG_NAME( rpt_OXMLFixedContent )
OXMLFixedContent::OXMLFixedContent( ORptFilter& rImport,
sal_uInt16 nPrfx, const OUString& rLName
@@ -118,14 +117,12 @@ OXMLFixedContent::OXMLFixedContent( ORptFilter& rImport,
,m_pInP(_pInP)
,m_bFormattedField(false)
{
- DBG_CTOR( rpt_OXMLFixedContent,NULL);
}
// -----------------------------------------------------------------------------
OXMLFixedContent::~OXMLFixedContent()
{
- DBG_DTOR( rpt_OXMLFixedContent,NULL);
}
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
index e50edf7..9162f4e 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
@@ -41,8 +41,6 @@ namespace rptxml
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::beans;
-DBG_NAME( rpt_OXMLFormatCondition )
-
OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList > & _xAttrList
@@ -51,7 +49,6 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport,
,m_rImport(rImport)
,m_xComponent(_xComponent)
{
- DBG_CTOR( rpt_OXMLFormatCondition,NULL);
OSL_ENSURE(m_xComponent.is(),"Component is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
@@ -92,8 +89,6 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport,
OXMLFormatCondition::~OXMLFormatCondition()
{
-
- DBG_DTOR( rpt_OXMLFormatCondition,NULL);
}
// -----------------------------------------------------------------------------
void OXMLFormatCondition::EndElement()
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index 31c262f..fe363e8 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -34,7 +34,6 @@ namespace rptxml
{
using namespace ::com::sun::star;
using namespace xml::sax;
-DBG_NAME( rpt_OXMLFormattedField )
OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
sal_uInt16 nPrfx, const OUString& rLName
@@ -44,7 +43,6 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
,bool _bPageCount) :
OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),_pContainer)
{
- DBG_CTOR( rpt_OXMLFormattedField,NULL);
OSL_ENSURE(m_xComponent.is(),"Component is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
const SvXMLTokenMap& rTokenMap = rImport.GetControlElemTokenMap();
@@ -88,7 +86,6 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
// -----------------------------------------------------------------------------
OXMLFormattedField::~OXMLFormattedField()
{
- DBG_DTOR( rpt_OXMLFormattedField,NULL);
}
// -----------------------------------------------------------------------------
//----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx
index 923847f..0d4f240 100644
--- a/reportdesign/source/filter/xml/xmlFunction.cxx
+++ b/reportdesign/source/filter/xml/xmlFunction.cxx
@@ -33,7 +33,6 @@ namespace rptxml
using namespace ::com::sun::star::report;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME( rpt_OXMLFunction )
OXMLFunction::OXMLFunction( ORptFilter& _rImport
,sal_uInt16 nPrfx
@@ -46,7 +45,6 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport
,m_xFunctions(_xFunctions->getFunctions())
,m_bAddToReport(_bAddToReport)
{
- DBG_CTOR( rpt_OXMLFunction,NULL);
OSL_ENSURE(m_xFunctions.is(),"Functions is NULL!");
m_xFunction = m_xFunctions->createFunction();
@@ -99,7 +97,6 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport
OXMLFunction::~OXMLFunction()
{
- DBG_DTOR( rpt_OXMLFunction,NULL);
}
// -----------------------------------------------------------------------------
ORptFilter& OXMLFunction::GetOwnImport()
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 602caf9..7073839 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -46,7 +46,6 @@ namespace rptxml
SvXMLUnitConverter::convertEnum( nRet, _sValue, aXML_EnumMap );
return nRet;
}
-DBG_NAME( rpt_OXMLGroup )
OXMLGroup::OXMLGroup( ORptFilter& _rImport
,sal_uInt16 nPrfx
@@ -55,7 +54,6 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
) :
SvXMLImportContext( _rImport, nPrfx, _sLocalName )
{
- DBG_CTOR( rpt_OXMLGroup,NULL);
m_xGroups = _rImport.getReportDefinition()->getGroups();
OSL_ENSURE(m_xGroups.is(),"Groups is NULL!");
@@ -192,7 +190,6 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
OXMLGroup::~OXMLGroup()
{
- DBG_DTOR( rpt_OXMLGroup,NULL);
}
// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLGroup::CreateChildContext(
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index d1cd6a9..55c8e9e 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -58,15 +58,12 @@ namespace rptxml
using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::form;
using namespace ::com::sun::star::beans;
-DBG_NAME(rpt_OPropertyHandlerFactory)
OPropertyHandlerFactory::OPropertyHandlerFactory()
{
- DBG_CTOR(rpt_OPropertyHandlerFactory,NULL);
}
// -----------------------------------------------------------------------------
OPropertyHandlerFactory::~OPropertyHandlerFactory()
{
- DBG_DTOR(rpt_OPropertyHandlerFactory,NULL);
}
// -----------------------------------------------------------------------------
const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 _nType) const
diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx
index bc0e247..82845d7 100644
--- a/reportdesign/source/filter/xml/xmlImage.cxx
+++ b/reportdesign/source/filter/xml/xmlImage.cxx
@@ -37,7 +37,6 @@ namespace rptxml
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME( rpt_OXMLImage )
// -----------------------------------------------------------------------------
@@ -48,7 +47,6 @@ OXMLImage::OXMLImage( ORptFilter& rImport,
,OXMLTable* _pContainer) :
OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),_pContainer)
{
- DBG_CTOR( rpt_OXMLImage,NULL);
OSL_ENSURE(m_xComponent.is(),"Component is NULL!");
const SvXMLNamespaceMap& rMap = m_rImport.GetNamespaceMap();
@@ -111,7 +109,6 @@ OXMLImage::OXMLImage( ORptFilter& rImport,
OXMLImage::~OXMLImage()
{
- DBG_DTOR( rpt_OXMLImage,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx
index 18549f9..135c514 100644
--- a/reportdesign/source/filter/xml/xmlMasterFields.cxx
+++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx
@@ -32,7 +32,6 @@ namespace rptxml
using namespace ::com::sun::star::report;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME( rpt_OXMLMasterFields )
OXMLMasterFields::OXMLMasterFields( ORptFilter& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
@@ -42,7 +41,6 @@ OXMLMasterFields::OXMLMasterFields( ORptFilter& rImport,
SvXMLImportContext( rImport, nPrfx, rLName)
,m_pReport(_pReport)
{
- DBG_CTOR( rpt_OXMLMasterFields,NULL);
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
const SvXMLTokenMap& rTokenMap = rImport.GetSubDocumentElemTokenMap();
@@ -77,7 +75,6 @@ OXMLMasterFields::OXMLMasterFields( ORptFilter& rImport,
OXMLMasterFields::~OXMLMasterFields()
{
- DBG_DTOR( rpt_OXMLMasterFields,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx
index caf9f16..855dbd3 100644
--- a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx
@@ -31,16 +31,13 @@ namespace rptxml
using namespace xmloff;
using namespace ::com::sun::star::report;
using namespace ::com::sun::star::uno;
-DBG_NAME( rpt_OXMLRptPropHdlFactory )
OXMLRptPropHdlFactory::OXMLRptPropHdlFactory()
{
- DBG_CTOR( rpt_OXMLRptPropHdlFactory,NULL);
}
// -----------------------------------------------------------------------------
OXMLRptPropHdlFactory::~OXMLRptPropHdlFactory()
{
- DBG_DTOR( rpt_OXMLRptPropHdlFactory,NULL);
}
// -----------------------------------------------------------------------------
}// rptxml
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx
index d236223..812135f 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -37,7 +37,6 @@ namespace rptxml
using namespace uno;
using namespace xml::sax;
-DBG_NAME( rpt_OXMLReport )
OXMLReport::OXMLReport( ORptFilter& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
@@ -47,7 +46,6 @@ OXMLReport::OXMLReport( ORptFilter& rImport,
OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),_pContainer)
,m_xComponent(_xComponent)
{
- DBG_CTOR( rpt_OXMLReport,NULL);
OSL_ENSURE(m_xComponent.is(),"No Report definition!");
impl_initRuntimeDefaults();
@@ -108,7 +106,6 @@ OXMLReport::OXMLReport( ORptFilter& rImport,
OXMLReport::~OXMLReport()
{
- DBG_DTOR( rpt_OXMLReport,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx
index 738691f..9d6862d 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.cxx
@@ -34,7 +34,6 @@ namespace rptxml
using namespace report;
using namespace uno;
using namespace xml::sax;
-DBG_NAME( rpt_OXMLReportElement )
OXMLReportElement::OXMLReportElement( ORptFilter& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
@@ -43,7 +42,6 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport,
SvXMLImportContext( rImport, nPrfx, rLName )
,m_xComponent(_xComponent)
{
- DBG_CTOR( rpt_OXMLReportElement,NULL);
OSL_ENSURE(m_xComponent.is(),"Component is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
@@ -83,7 +81,6 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport,
OXMLReportElement::~OXMLReportElement()
{
- DBG_DTOR( rpt_OXMLReportElement,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx
index ce99996..156e3e3 100644
--- a/reportdesign/source/filter/xml/xmlRow.cxx
+++ b/reportdesign/source/filter/xml/xmlRow.cxx
@@ -38,7 +38,6 @@ namespace rptxml
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME( rpt_OXMLRow )
OXMLRow::OXMLRow( ORptFilter& rImport
,sal_uInt16 nPrfx
@@ -48,7 +47,6 @@ OXMLRow::OXMLRow( ORptFilter& rImport
SvXMLImportContext( rImport, nPrfx, _sLocalName )
,m_pContainer(_pContainer)
{
- DBG_CTOR( rpt_OXMLRow,NULL);
OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
@@ -81,7 +79,6 @@ OXMLRow::OXMLRow( ORptFilter& rImport
OXMLRow::~OXMLRow()
{
- DBG_DTOR( rpt_OXMLRow,NULL);
}
// -----------------------------------------------------------------------------
SvXMLImportContext* OXMLRow::CreateChildContext(
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index b51186e..a3eeb02 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -50,7 +50,6 @@ namespace rptxml
}
-DBG_NAME( rpt_OXMLSection )
OXMLSection::OXMLSection( ORptFilter& rImport,
sal_uInt16 nPrfx, const OUString& _sLocalName,
@@ -61,7 +60,6 @@ OXMLSection::OXMLSection( ORptFilter& rImport,
,m_xSection(_xSection)
,m_bPageHeader(_bPageHeader)
{
- DBG_CTOR( rpt_OXMLSection,NULL);
OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
@@ -104,7 +102,6 @@ OXMLSection::OXMLSection( ORptFilter& rImport,
// -----------------------------------------------------------------------------
OXMLSection::~OXMLSection()
{
- DBG_DTOR( rpt_OXMLSection,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 4b504af..d6a39b0 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -70,7 +70,6 @@ public:
TYPEINIT1( OControlStyleContext, XMLPropStyleContext );
TYPEINIT1( OReportStylesContext, SvXMLStylesContext );
-DBG_NAME( rpt_OControlStyleContext )
OControlStyleContext::OControlStyleContext( ORptFilter& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
@@ -84,7 +83,6 @@ OControlStyleContext::OControlStyleContext( ORptFilter& rImport,
bConditionalFormatCreated(sal_False),
bParentSet(sal_False)
{
- DBG_CTOR( rpt_OControlStyleContext,NULL);
}
// -----------------------------------------------------------------------------
@@ -92,7 +90,6 @@ OControlStyleContext::OControlStyleContext( ORptFilter& rImport,
OControlStyleContext::~OControlStyleContext()
{
- DBG_DTOR( rpt_OControlStyleContext,NULL);
}
// -----------------------------------------------------------------------------
@@ -158,7 +155,6 @@ ORptFilter& OControlStyleContext::GetOwnImport() const
return m_rImport;
}
// -----------------------------------------------------------------------------
-DBG_NAME( rpt_OReportStylesContext )
OReportStylesContext::OReportStylesContext( ORptFilter& rImport,
sal_uInt16 nPrfx ,
@@ -174,7 +170,6 @@ OReportStylesContext::OReportStylesContext( ORptFilter& rImport,
m_nNumberFormatIndex(-1),
bAutoStyles(bTempAutoStyles)
{
- DBG_CTOR( rpt_OReportStylesContext,NULL);
}
// -----------------------------------------------------------------------------
@@ -182,7 +177,6 @@ OReportStylesContext::OReportStylesContext( ORptFilter& rImport,
OReportStylesContext::~OReportStylesContext()
{
- DBG_DTOR( rpt_OReportStylesContext,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index 49ae6e0..3de5ae7 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -35,7 +35,6 @@ namespace rptxml
using namespace ::com::sun::star::report;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
-DBG_NAME( rpt_OXMLSubDocument )
OXMLSubDocument::OXMLSubDocument( ORptFilter& rImport,
sal_uInt16 nPrfx
@@ -49,14 +48,12 @@ OXMLSubDocument::OXMLSubDocument( ORptFilter& rImport,
,m_nCurrentCount(0)
,m_bContainsShape(false)
{
- DBG_CTOR( rpt_OXMLSubDocument,NULL);
}
// -----------------------------------------------------------------------------
OXMLSubDocument::~OXMLSubDocument()
{
- DBG_DTOR( rpt_OXMLSubDocument,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index 29e5258..245158b 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -53,7 +53,6 @@ namespace rptxml
SvXMLUnitConverter::convertEnum( nRet,_sValue,aXML_EnumMap );
return nRet;
}
-DBG_NAME( rpt_OXMLTable )
OXMLTable::OXMLTable( ORptFilter& rImport
,sal_uInt16 nPrfx
@@ -68,7 +67,6 @@ OXMLTable::OXMLTable( ORptFilter& rImport
,m_nRowIndex(0)
,m_nColumnIndex(0)
{
- DBG_CTOR( rpt_OXMLTable,NULL);
OSL_ENSURE(_xAttrList.is(),"Attribute list is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
const SvXMLTokenMap& rTokenMap = rImport.GetSectionElemTokenMap();
@@ -117,7 +115,6 @@ OXMLTable::OXMLTable( ORptFilter& rImport
// -----------------------------------------------------------------------------
OXMLTable::~OXMLTable()
{
- DBG_DTOR( rpt_OXMLTable,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index a4dd612..e2ab7904 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -95,7 +95,6 @@ public:
};
TYPEINIT1( RptMLMasterStylesContext_Impl, XMLTextMasterStylesContext );
-DBG_NAME(rpt_RptMLMasterStylesContext_Impl)
RptMLMasterStylesContext_Impl::RptMLMasterStylesContext_Impl(
ORptFilter& rImport, sal_uInt16 nPrfx,
const OUString& rLName ,
@@ -103,12 +102,10 @@ RptMLMasterStylesContext_Impl::RptMLMasterStylesContext_Impl(
XMLTextMasterStylesContext( rImport, nPrfx, rLName, xAttrList )
,m_rImport(rImport)
{
- DBG_CTOR(rpt_RptMLMasterStylesContext_Impl,NULL);
}
RptMLMasterStylesContext_Impl::~RptMLMasterStylesContext_Impl()
{
- DBG_DTOR(rpt_RptMLMasterStylesContext_Impl,NULL);
}
void RptMLMasterStylesContext_Impl::EndElement()
@@ -356,11 +353,9 @@ Sequence< OUString > ORptMetaImportHelper::getSupportedServiceNames_Static( ) t
// -------------
// - ORptFilter -
// -------------
-DBG_NAME(rpt_ORptFilter)
ORptFilter::ORptFilter( const uno::Reference< XComponentContext >& _rxContext,sal_uInt16 nImportFlags )
:SvXMLImport(_rxContext, getImplementationName_Static(), nImportFlags)
{
- DBG_CTOR(rpt_ORptFilter,NULL);
GetMM100UnitConverter().SetCoreMeasureUnit(util::MeasureUnit::MM_100TH);
GetMM100UnitConverter().SetXMLMeasureUnit(util::MeasureUnit::CM);
GetNamespaceMap().Add( OUString( sXML_np__rpt ),
@@ -382,7 +377,6 @@ ORptFilter::ORptFilter( const uno::Reference< XComponentContext >& _rxContext,sa
ORptFilter::~ORptFilter() throw()
{
- DBG_DTOR(rpt_ORptFilter,NULL);
}
//------------------------------------------------------------------------------
uno::Reference< XInterface > ORptFilter::create(uno::Reference< XComponentContext > const & xContext)
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index a938abe..d301053 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -99,13 +99,11 @@ uno::Sequence< beans::PropertyValue > OAddFieldWindowListBox::getSelectedFieldDe
//==================================================================
// class OAddFieldWindowListBox
//==================================================================
-DBG_NAME( rpt_OAddFieldWindowListBox );
//------------------------------------------------------------------------------
OAddFieldWindowListBox::OAddFieldWindowListBox( OAddFieldWindow* _pParent )
:SvTreeListBox( _pParent, WB_TABSTOP|WB_BORDER|WB_SORT )
,m_pTabWin( _pParent )
{
- DBG_CTOR( rpt_OAddFieldWindowListBox,NULL);
SetHelpId( HID_RPT_FIELD_SEL );
SetSelectionMode(MULTIPLE_SELECTION);
SetDragDropMode( 0xFFFF );
@@ -115,7 +113,6 @@ OAddFieldWindowListBox::OAddFieldWindowListBox( OAddFieldWindow* _pParent )
//------------------------------------------------------------------------------
OAddFieldWindowListBox::~OAddFieldWindowListBox()
{
- DBG_DTOR( rpt_OAddFieldWindowListBox,NULL);
}
//------------------------------------------------------------------------------
@@ -146,7 +143,6 @@ void OAddFieldWindowListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_r
//========================================================================
// class OAddFieldWindow
//========================================================================
-DBG_NAME( rpt_OAddFieldWindow );
//-----------------------------------------------------------------------
OAddFieldWindow::OAddFieldWindow(Window* pParent
,const uno::Reference< beans::XPropertySet >& _xRowSet
@@ -165,7 +161,6 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent
,m_pChangeListener(NULL)
,m_pContainerListener(NULL)
{
- DBG_CTOR( rpt_OAddFieldWindow,NULL);
SetHelpId( HID_RPT_FIELD_SEL_WIN );
SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) );
SetMinOutputSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y));
@@ -227,7 +222,6 @@ OAddFieldWindow::~OAddFieldWindow()
m_pChangeListener->dispose();
if ( m_pContainerListener.is() )
m_pContainerListener->dispose();
- DBG_DTOR( rpt_OAddFieldWindow,NULL);
}
//-----------------------------------------------------------------------
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 3bf741a..e6fd029 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -82,7 +82,6 @@ namespace rptui
//========================================================================
// class ConditionalFormattingDialog
//========================================================================
- DBG_NAME(rpt_ConditionalFormattingDialog)
ConditionalFormattingDialog::ConditionalFormattingDialog(
Window* _pParent, const Reference< XReportControlModel >& _rxFormatConditions, ::rptui::OReportController& _rController )
:ModalDialog( _pParent, ModuleRes(RID_CONDFORMAT) )
@@ -96,7 +95,6 @@ namespace rptui
,m_xFormatConditions( _rxFormatConditions )
,m_bDeletingCondition( false )
{
- DBG_CTOR(rpt_ConditionalFormattingDialog,NULL);
OSL_ENSURE( m_xFormatConditions.is(), "ConditionalFormattingDialog::ConditionalFormattingDialog: ReportControlModel is NULL -> Prepare for GPF!" );
m_xCopy.set( m_xFormatConditions->createClone(), UNO_QUERY_THROW );
@@ -112,7 +110,6 @@ namespace rptui
ConditionalFormattingDialog::~ConditionalFormattingDialog()
{
m_aConditions.clear();
- DBG_DTOR(rpt_ConditionalFormattingDialog,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index ea2f473..c3c30dc 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -44,7 +44,6 @@ namespace rptui
using namespace ::com::sun::star;
using namespace ::comphelper;
-DBG_NAME( rpt_ODateTimeDialog )
//========================================================================
// class ODateTimeDialog
//========================================================================
@@ -66,7 +65,6 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent
get(m_pTimeListBox,"timelistbox");
get(m_pPB_OK,"ok");
- DBG_CTOR( rpt_ODateTimeDialog,NULL);
try
{
@@ -115,12 +113,10 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent
//------------------------------------------------------------------------
ODateTimeDialog::~ODateTimeDialog()
{
- DBG_DTOR( rpt_ODateTimeDialog,NULL);
}
// -----------------------------------------------------------------------------
short ODateTimeDialog::Execute()
{
- DBG_CHKTHIS( rpt_ODateTimeDialog,NULL);
short nRet = ModalDialog::Execute();
if ( nRet == RET_OK && (m_pDate->IsChecked() || m_pTime->IsChecked()) )
{
@@ -199,7 +195,6 @@ OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,con
IMPL_LINK( ODateTimeDialog, CBClickHdl, CheckBox*, _pBox )
{
(void)_pBox;
- DBG_CHKTHIS( rpt_ODateTimeDialog,NULL);
if ( _pBox == m_pDate || _pBox == m_pTime)
{
@@ -219,7 +214,6 @@ IMPL_LINK( ODateTimeDialog, CBClickHdl, CheckBox*, _pBox )
// -----------------------------------------------------------------------------
sal_Int32 ODateTimeDialog::getFormatKey(sal_Bool _bDate) const
{
- DBG_CHKTHIS( rpt_ODateTimeDialog,NULL);
sal_Int32 nFormatKey;
if ( _bDate )
{
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 0bfdd46..8ed49d8 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -166,7 +166,6 @@ public:
//========================================================================
// class OFieldExpressionControl
//========================================================================
-DBG_NAME( rpt_OFieldExpressionControl )
//------------------------------------------------------------------------
OFieldExpressionControl::OFieldExpressionControl( OGroupsSortingDialog* _pParent,const ResId& _rResId )
:EditBrowseBox( _pParent, _rResId,EBBF_NONE, WB_TABSTOP | BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_AUTOSIZE_LASTCOL |
@@ -180,7 +179,6 @@ OFieldExpressionControl::OFieldExpressionControl( OGroupsSortingDialog* _pParent
,m_pParent(_pParent)
,m_bIgnoreEvent(false)
{
- DBG_CTOR( rpt_OFieldExpressionControl,NULL);
SetBorderStyle(WINDOW_BORDER_MONO);
}
@@ -198,7 +196,6 @@ OFieldExpressionControl::~OFieldExpressionControl()
Application::RemoveUserEvent( m_nDeleteEvent );
delete m_pComboCell;
- DBG_DTOR( rpt_OFieldExpressionControl,NULL);
}
//------------------------------------------------------------------------------
uno::Sequence<uno::Any> OFieldExpressionControl::fillSelectedGroups()
@@ -236,7 +233,6 @@ uno::Sequence<uno::Any> OFieldExpressionControl::fillSelectedGroups()
//------------------------------------------------------------------------------
void OFieldExpressionControl::StartDrag( sal_Int8 /*_nAction*/ , const Point& /*_rPosPixel*/ )
{
- DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
if ( m_pParent && !m_pParent->isReadOnly( ) )
{
uno::Sequence<uno::Any> aClipboardList = fillSelectedGroups();
@@ -252,7 +248,6 @@ void OFieldExpressionControl::StartDrag( sal_Int8 /*_nAction*/ , const Point& /*
//------------------------------------------------------------------------------
sal_Int8 OFieldExpressionControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
{
- DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
sal_Int8 nAction = DND_ACTION_NONE;
if ( IsEditing() )
{
@@ -270,7 +265,6 @@ sal_Int8 OFieldExpressionControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt
//------------------------------------------------------------------------------
sal_Int8 OFieldExpressionControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt )
{
- DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
sal_Int8 nAction = DND_ACTION_NONE;
if ( IsDropFormatSupported( OGroupExchange::getReportGroupId() ) )
{
@@ -390,7 +384,6 @@ void OFieldExpressionControl::lateInit()
// -----------------------------------------------------------------------------
IMPL_LINK( OFieldExpressionControl, CBChangeHdl, ComboBox*, /*pComboBox*/ )
{
- DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
SaveModified();
return 0L;
@@ -399,7 +392,6 @@ IMPL_LINK( OFieldExpressionControl, CBChangeHdl, ComboBox*, /*pComboBox*/ )
//------------------------------------------------------------------------------
sal_Bool OFieldExpressionControl::IsTabAllowed(sal_Bool /*bForward*/) const
{
- DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
return sal_False;
}
@@ -411,7 +403,6 @@ sal_Bool OFieldExpressionControl::SaveModified()
//------------------------------------------------------------------------------
sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow)
{
- DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
sal_Int32 nRow = GetCurRow();
if ( nRow != BROWSER_ENDOFSELECTION )
{
@@ -492,7 +483,6 @@ sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow)
//------------------------------------------------------------------------------
OUString OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ ) const
{
- DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
OUString sText;
if ( nRow != BROWSER_ENDOFSELECTION && m_aGroupPositions[nRow] != NO_GROUP )
{
@@ -523,14 +513,12 @@ OUString OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/
//------------------------------------------------------------------------------
void OFieldExpressionControl::InitController( CellControllerRef& /*rController*/, long nRow, sal_uInt16 nColumnId )
{
- DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
m_pComboCell->SetText( GetCellText( nRow, nColumnId ) );
}
//------------------------------------------------------------------------------
sal_Bool OFieldExpressionControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol)
{
- DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
if (!EditBrowseBox::CursorMoving(nNewRow, nNewCol))
return sal_False;
@@ -546,7 +534,6 @@ sal_Bool OFieldExpressionControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol)
//------------------------------------------------------------------------------
CellController* OFieldExpressionControl::GetController( long /*nRow*/, sal_uInt16 /*nColumnId*/ )
{
- DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
ComboBoxCellController* pCellController = new ComboBoxCellController( m_pComboCell );
pCellController->GetComboBox().SetReadOnly(!m_pParent->m_pController->isEditable());
return pCellController;
@@ -555,7 +542,6 @@ CellController* OFieldExpressionControl::GetController( long /*nRow*/, sal_uInt1
//------------------------------------------------------------------------------
sal_Bool OFieldExpressionControl::SeekRow( long _nRow )
{
- DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
// die Basisklasse braucht den Aufruf, da sie sich dort merkt, welche Zeile gepainted wird
EditBrowseBox::SeekRow(_nRow);
m_nCurrentPos = _nRow;
@@ -565,7 +551,6 @@ sal_Bool OFieldExpressionControl::SeekRow( long _nRow )
//------------------------------------------------------------------------------
void OFieldExpressionControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
{
- DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
OUString aText =const_cast< OFieldExpressionControl*>(this)->GetCellText( m_nCurrentPos, nColumnId );
Point aPos( rRect.TopLeft() );
@@ -583,7 +568,6 @@ void OFieldExpressionControl::PaintCell( OutputDevice& rDev, const Rectangle& rR
//------------------------------------------------------------------------------
EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const
{
- DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
if (nRow >= 0 && nRow == m_nDataPos)
return EditBrowseBox::CURRENT;
if ( nRow != BROWSER_ENDOFSELECTION && nRow < static_cast<long>(m_aGroupPositions.size()) && m_aGroupPositions[nRow] != NO_GROUP )
@@ -753,7 +737,6 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt)
//------------------------------------------------------------------------------
void OFieldExpressionControl::DeleteRows()
{
- DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
sal_Bool bIsEditing = IsEditing();
if (bIsEditing)
@@ -820,7 +803,6 @@ void OFieldExpressionControl::cut()
//------------------------------------------------------------------------------
void OFieldExpressionControl::copy()
{
- DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
//////////////////////////////////////////////////////////////////////
// set to the right row and save it
m_pParent->SaveData( m_nDataPos );
@@ -869,7 +851,6 @@ IMPL_LINK( OFieldExpressionControl, DelayedDelete, void*, )
//------------------------------------------------------------------------------
void OFieldExpressionControl::InsertRows( long nRow )
{
- DBG_CHKTHIS( rpt_OFieldExpressionControl,NULL);
sal_Int32 nSize = 0;
//////////////////////////////////////////////////////////////////////
@@ -927,7 +908,6 @@ void OFieldExpressionControl::InsertRows( long nRow )
}
//------------------------------------------------------------------------------
-DBG_NAME( rpt_OGroupsSortingDialog )
//========================================================================
// class OGroupsSortingDialog
//========================================================================
@@ -961,7 +941,6 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
,m_xGroups(m_pController->getReportDefinition()->getGroups())
,m_bReadOnly(_bReadOnly)
{
- DBG_CTOR( rpt_OGroupsSortingDialog,NULL);
Control* pControlsLst[] = { &m_aHeaderLst, &m_aFooterLst, &m_aGroupOnLst, &m_aKeepTogetherLst, &m_aOrderLst, &m_aGroupIntervalEd};
for (size_t i = 0; i < sizeof (pControlsLst) / sizeof (pControlsLst[0]); ++i)
@@ -1025,7 +1004,6 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
//------------------------------------------------------------------------
OGroupsSortingDialog::~OGroupsSortingDialog()
{
- DBG_DTOR( rpt_OGroupsSortingDialog,NULL);
delete m_pFieldExpression;
m_xColumns.clear();
m_pReportListener->dispose();
@@ -1049,7 +1027,6 @@ void OGroupsSortingDialog::UpdateData( )
//------------------------------------------------------------------------------
void OGroupsSortingDialog::DisplayData( sal_Int32 _nRow )
{
- DBG_CHKTHIS( rpt_OGroupsSortingDialog,NULL);
sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(_nRow);
sal_Bool bEmpty = nGroupPos == NO_GROUP;
m_aHeaderLst.Enable(!bEmpty);
@@ -1086,7 +1063,6 @@ void OGroupsSortingDialog::DisplayData( sal_Int32 _nRow )
//------------------------------------------------------------------------------
void OGroupsSortingDialog::SaveData( sal_Int32 _nRow)
{
- DBG_CHKTHIS( rpt_OGroupsSortingDialog,NULL);
sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(_nRow);
if ( nGroupPos == NO_GROUP )
return;
@@ -1174,7 +1150,6 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusLost, Control*, pControl )
// -----------------------------------------------------------------------------
IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ )
{
- DBG_CHKTHIS( rpt_OGroupsSortingDialog,NULL);
sal_uInt16 nCommand = m_aToolBox.GetCurItemId();
@@ -1218,7 +1193,6 @@ IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ )
// -----------------------------------------------------------------------------
IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox*, pListBox )
{
- DBG_CHKTHIS( rpt_OGroupsSortingDialog,NULL);
if ( pListBox->GetSavedValue() != pListBox->GetSelectEntryPos() )
{
sal_Int32 nRow = m_pFieldExpression->GetCurRow();
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 9e5b9d6..0e9f336 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -206,7 +206,6 @@ public:
private:
using SvTreeListBox::ExecuteDrop;
};
-DBG_NAME(rpt_NavigatorTree)
// -----------------------------------------------------------------------------
NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController )
:SvTreeListBox( pParent, WB_TABSTOP| WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL|WB_HASBUTTONSATROOT )
@@ -219,7 +218,6 @@ NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController )
,m_pDragedEntry(NULL)
,m_nTimerCounter( DROP_ACTION_TIMER_INITIAL_TICKS )
{
- DBG_CTOR(rpt_NavigatorTree,NULL);
m_pReportListener = new OPropertyChangeMultiplexer(this,m_rController.getReportDefinition().get());
m_pReportListener->addProperty(PROPERTY_PAGEHEADERON);
m_pReportListener->addProperty(PROPERTY_PAGEFOOTERON);
@@ -257,7 +255,6 @@ NavigatorTree::~NavigatorTree()
}
m_pReportListener->dispose();
m_pSelectionListener->dispose();
- DBG_DTOR(rpt_NavigatorTree,NULL);
}
//------------------------------------------------------------------------------
void NavigatorTree::Command( const CommandEvent& rEvt )
@@ -751,7 +748,6 @@ void NavigatorTree::removeEntry(SvTreeListEntry* _pEntry,bool _bRemove)
GetModel()->Remove(_pEntry);
}
}
-DBG_NAME(rpt_NavigatorTree_UserData)
// -----------------------------------------------------------------------------
NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno::XInterface>& _xContent)
: OPropertyChangeListener(m_aMutex)
@@ -759,7 +755,6 @@ NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno
, m_xContent(_xContent)
, m_pTree(_pTree)
{
- DBG_CTOR(rpt_NavigatorTree_UserData,NULL);
uno::Reference<beans::XPropertySet> xProp(m_xContent,uno::UNO_QUERY);
if ( xProp.is() )
{
@@ -790,7 +785,6 @@ NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno
// -----------------------------------------------------------------------------
NavigatorTree::UserData::~UserData()
{
- DBG_DTOR(rpt_NavigatorTree_UserData,NULL);
if ( m_pContainerListener.is() )
m_pContainerListener->dispose();
if ( m_pListener.is() )
@@ -893,7 +887,6 @@ ONavigatorImpl::~ONavigatorImpl()
{
}
// -----------------------------------------------------------------------------
-DBG_NAME( rpt_ONavigator )
const long STD_WIN_SIZE_X = 210;
const long STD_WIN_SIZE_Y = 280;
const long LISTBOX_BORDER = 2;
@@ -904,7 +897,6 @@ ONavigator::ONavigator( Window* _pParent
,OReportController& _rController)
: FloatingWindow( _pParent, ModuleRes(RID_NAVIGATOR) )
{
- DBG_CTOR( rpt_ONavigator,NULL);
m_pImpl.reset(new ONavigatorImpl(_rController,this));
@@ -920,7 +912,6 @@ ONavigator::ONavigator( Window* _pParent
//------------------------------------------------------------------------
ONavigator::~ONavigator()
{
- DBG_DTOR( rpt_ONavigator,NULL);
}
//------------------------------------------------------------------------------
void ONavigator::Resize()
diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx
index 1465e32..f108e83 100644
--- a/reportdesign/source/ui/dlg/PageNumber.cxx
+++ b/reportdesign/source/ui/dlg/PageNumber.cxx
@@ -36,7 +36,6 @@ namespace rptui
using namespace ::com::sun::star;
using namespace ::comphelper;
-DBG_NAME( rpt_OPageNumberDialog )
//========================================================================
// class OPageNumberDialog
//========================================================================
@@ -54,7 +53,6 @@ OPageNumberDialog::OPageNumberDialog( Window* _pParent
get(m_pAlignmentLst,"alignment");
get(m_pShowNumberOnFirstPage,"shownumberonfirstpage");
- DBG_CTOR( rpt_OPageNumberDialog,NULL);
m_pShowNumberOnFirstPage->Hide();
@@ -63,7 +61,6 @@ OPageNumberDialog::OPageNumberDialog( Window* _pParent
//------------------------------------------------------------------------
OPageNumberDialog::~OPageNumberDialog()
{
- DBG_DTOR( rpt_OPageNumberDialog,NULL);
}
// -----------------------------------------------------------------------------
short OPageNumberDialog::Execute()
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index ca32010..d058364 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -50,7 +50,6 @@ namespace rptui
//====================================================================
//= DefaultComponentInspectorModel
//====================================================================
- DBG_NAME(DefaultComponentInspectorModel)
//--------------------------------------------------------------------
DefaultComponentInspectorModel::DefaultComponentInspectorModel( const Reference< XComponentContext >& _rxContext)
:m_xContext( _rxContext )
@@ -61,12 +60,10 @@ namespace rptui
,m_nMaxHelpTextLines( 8 )
,m_pInfoService(new OPropertyInfoService())
{
- DBG_CTOR(DefaultComponentInspectorModel,NULL);
}
DefaultComponentInspectorModel::~DefaultComponentInspectorModel()
{
- DBG_DTOR(DefaultComponentInspectorModel,NULL);
}
OUString SAL_CALL DefaultComponentInspectorModel::getImplementationName( ) throw(RuntimeException)
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index bfc6d9f..ec3ef75 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -225,7 +225,6 @@ OUString GeometryHandler::impl_convertToFormula( const uno::Any& _rControlValue
aParser = ReportFormula( impl_isDataField(sName) ? ReportFormula::Field : ReportFormula::Expression, sName );
return aParser.getCompleteFormula();
}
-DBG_NAME(rpt_GeometryHandler)
GeometryHandler::GeometryHandler(uno::Reference< uno::XComponentContext > const & context) :
GeometryHandler_Base(m_aMutex)
,m_aPropertyListeners( m_aMutex )
@@ -234,7 +233,6 @@ GeometryHandler::GeometryHandler(uno::Reference< uno::XComponentContext > const
,m_nDataFieldType(0)
,m_bIn(false)
{
- DBG_CTOR(rpt_GeometryHandler,NULL);
try
{
m_xFormComponentHandler = form::inspection::FormComponentPropertyHandler::create(m_xContext);
@@ -248,7 +246,6 @@ GeometryHandler::GeometryHandler(uno::Reference< uno::XComponentContext > const
// -----------------------------------------------------------------------------
GeometryHandler::~GeometryHandler()
{
- DBG_DTOR(rpt_GeometryHandler,NULL);
}
//------------------------------------------------------------------------
OUString SAL_CALL GeometryHandler::getImplementationName( ) throw(uno::RuntimeException)
diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx
index 66e83b9..f5a2d45 100644
--- a/reportdesign/source/ui/misc/ColorListener.cxx
+++ b/reportdesign/source/ui/misc/ColorListener.cxx
@@ -24,7 +24,6 @@
namespace rptui
{
//=====================================================================
- DBG_NAME( rpt_OColorListener )
OColorListener::OColorListener(Window* _pParent ,const OUString& _sColorEntry)
: Window(_pParent)
,m_sColorEntry(_sColorEntry)
@@ -32,7 +31,6 @@ OColorListener::OColorListener(Window* _pParent ,const OUString& _sColorEntry)
,m_bCollapsed(sal_False)
,m_bMarked(sal_False)
{
- DBG_CTOR( rpt_OColorListener,NULL);
StartListening(m_aExtendedColorConfig);
m_nColor = m_aExtendedColorConfig.GetColorValue(CFG_REPORTDESIGNER,m_sColorEntry).getColor();
m_nTextBoundaries = m_aColorConfig.GetColorValue(::svtools::DOCBOUNDARIES).nColor;
@@ -40,7 +38,6 @@ OColorListener::OColorListener(Window* _pParent ,const OUString& _sColorEntry)
// -----------------------------------------------------------------------------
OColorListener::~OColorListener()
{
- DBG_DTOR( rpt_OColorListener,NULL);
EndListening(m_aExtendedColorConfig);
}
// -----------------------------------------------------------------------
diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx
index 82ed522..a4b89c5 100644
--- a/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/reportdesign/source/ui/misc/RptUndo.cxx
@@ -109,7 +109,6 @@ namespace
}
//----------------------------------------------------------------------------
TYPEINIT1( OSectionUndo, OCommentUndoAction );
-DBG_NAME(rpt_OSectionUndo)
//----------------------------------------------------------------------------
OSectionUndo::OSectionUndo(OReportModel& _rMod
,sal_uInt16 _nSlot
@@ -120,7 +119,6 @@ OSectionUndo::OSectionUndo(OReportModel& _rMod
,m_nSlot(_nSlot)
,m_bInserted(false)
{
- DBG_CTOR(rpt_OSectionUndo,NULL);
}
// -----------------------------------------------------------------------------
OSectionUndo::~OSectionUndo()
@@ -150,7 +148,6 @@ OSectionUndo::~OSectionUndo()
}
}
}
- DBG_DTOR(rpt_OSectionUndo,NULL);
}
// -----------------------------------------------------------------------------
void OSectionUndo::collectControls(const uno::Reference< report::XSection >& _xSection)
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index b5af954..97eca05 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -89,13 +89,11 @@ Reference< XInterface > OToolboxController::create(Reference< XComponentContext
return * new OToolboxController(xContext);
}
// -----------------------------------------------------------------------------
-DBG_NAME(rpt_OToolboxController)
OToolboxController::OToolboxController(const Reference< XComponentContext >& _rxORB)
: m_pToolbarController(NULL)
,m_nToolBoxId(1)
,m_nSlotId(0)
{
- DBG_CTOR(rpt_OToolboxController,NULL);
osl_atomic_increment(&m_refCount);
m_xContext = _rxORB;
osl_atomic_decrement(&m_refCount);
@@ -104,7 +102,6 @@ OToolboxController::OToolboxController(const Reference< XComponentContext >& _rx
// -----------------------------------------------------------------------------
OToolboxController::~OToolboxController()
{
- DBG_DTOR(rpt_OToolboxController,NULL);
}
// -----------------------------------------------------------------------------
// XInterface
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index b07fb4b..6c358a1 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -84,7 +84,6 @@ public:
//==================================================================
// class ODesignView
//==================================================================
-DBG_NAME( rpt_ODesignView )
//------------------------------------------------------------------------------
ODesignView::ODesignView( Window* pParent,
const Reference< XComponentContext >& _rxOrb,
@@ -107,7 +106,6 @@ ODesignView::ODesignView( Window* pParent,
,m_bGridSnap(sal_True)
,m_bDeleted( sal_False )
{
- DBG_CTOR( rpt_ODesignView,NULL);
SetHelpId(UID_RPT_RPT_APP_VIEW);
ImplInitSettings();
@@ -132,7 +130,6 @@ ODesignView::ODesignView( Window* pParent,
//------------------------------------------------------------------------------
ODesignView::~ODesignView()
{
- DBG_DTOR( rpt_ODesignView,NULL);
m_bDeleted = sal_True;
Hide();
m_aScrollWindow.Hide();
diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx
index bf414c5..5f74b67 100644
--- a/reportdesign/source/ui/report/EndMarker.cxx
+++ b/reportdesign/source/ui/report/EndMarker.cxx
@@ -30,18 +30,15 @@
namespace rptui
{
//=====================================================================
- DBG_NAME( rpt_OEndMarker )
OEndMarker::OEndMarker(Window* _pParent ,const OUString& _sColorEntry)
: OColorListener(_pParent,_sColorEntry)
{
- DBG_CTOR( rpt_OEndMarker,NULL);
SetUniqueId(HID_RPT_ENDMARKER);
ImplInitSettings();
}
// -----------------------------------------------------------------------------
OEndMarker::~OEndMarker()
{
- DBG_DTOR( rpt_OEndMarker,NULL);
}
// -----------------------------------------------------------------------------
void OEndMarker::Paint( const Rectangle& /*rRect*/ )
diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx
index 7fcf2d9..efbc65c 100644
--- a/reportdesign/source/ui/report/FixedTextColor.cxx
+++ b/reportdesign/source/ui/report/FixedTextColor.cxx
@@ -49,18 +49,15 @@ namespace rptui
{
using namespace ::com::sun::star;
- DBG_NAME(rpt_FixedTextColor)
FixedTextColor::FixedTextColor(const OReportController& _aController)
:m_rReportController(_aController)
{
- DBG_CTOR(rpt_FixedTextColor, NULL);
}
//--------------------------------------------------------------------
FixedTextColor::~FixedTextColor()
{
- DBG_DTOR(rpt_FixedTextColor,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
index d442b1c..8322f67 100644
--- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
+++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
@@ -47,14 +47,12 @@ namespace rptui
{
using namespace ::com::sun::star;
- DBG_NAME(rpt_FormattedFieldBeautifier)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list