diff options
author | Arnaud Versini <arnaud.versini@gmail.com> | 2014-01-19 15:51:52 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-21 16:20:10 +0000 |
commit | 5b2ba8ed5d6406492205b08ef25fe640253f66a1 (patch) | |
tree | 166e6fd0c9e802a5cf8fb8d9895ef828a88daea1 /dbaccess/source/ui/tabledesign | |
parent | de2d5d9abb7f625269cd4ee54c983c6dfde33767 (diff) |
DBACCESS : Remove usage of DBG_CTOR and DBG_DTOR.
Valgrind is capable of detecting such bugs. No need for extra macros.
Conflicts:
dbaccess/source/ui/dlg/tablespage.cxx
Change-Id: I25ea9174a042050efdb371246417ee7f2edae997
Reviewed-on: https://gerrit.libreoffice.org/7532
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess/source/ui/tabledesign')
10 files changed, 0 insertions, 126 deletions
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index 4c7fd621b2d2..8ddece24afb3 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -28,11 +28,9 @@ using namespace dbaui; // class OFieldDescGenWin -DBG_NAME(OFieldDescGenWin) OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp ) : TabPage( pParent, WB_3DLOOK | WB_DIALOGCONTROL ) { - DBG_CTOR(OFieldDescGenWin,NULL); m_pFieldControl = new OTableFieldControl(this,pHelp); m_pFieldControl->SetHelpId(HID_TAB_DESIGN_FIELDCONTROL); m_pFieldControl->Show(); @@ -40,7 +38,6 @@ OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp OFieldDescGenWin::~OFieldDescGenWin() { - DBG_DTOR(OFieldDescGenWin,NULL); ::std::auto_ptr<Window> aTemp(m_pFieldControl); m_pFieldControl = NULL; } @@ -60,27 +57,23 @@ void OFieldDescGenWin::Resize() void OFieldDescGenWin::SetReadOnly( sal_Bool bReadOnly ) { - DBG_CHKTHIS(OFieldDescGenWin,NULL); m_pFieldControl->SetReadOnly(bReadOnly); } OUString OFieldDescGenWin::GetControlText( sal_uInt16 nControlId ) { - DBG_CHKTHIS(OFieldDescGenWin,NULL); return m_pFieldControl->GetControlText(nControlId); } void OFieldDescGenWin::SetControlText( sal_uInt16 nControlId, const OUString& rText ) { - DBG_CHKTHIS(OFieldDescGenWin,NULL); // Texte der Controls setzen m_pFieldControl->SetControlText(nControlId,rText); } void OFieldDescGenWin::DisplayData( OFieldDescription* pFieldDescr ) { - DBG_CHKTHIS(OFieldDescGenWin,NULL); m_pFieldControl->DisplayData(pFieldDescr); } @@ -88,7 +81,6 @@ void OFieldDescGenWin::DisplayData( OFieldDescription* pFieldDescr ) #if OSL_DEBUG_LEVEL > 0 OTableEditorCtrl* OFieldDescGenWin::GetEditorCtrl() { - DBG_CHKTHIS(OFieldDescGenWin,NULL); OTableDesignView* pDesignWin = static_cast<OTableDesignView*>(GetParent()->GetParent()->GetParent()); return pDesignWin->GetEditorCtrl(); } @@ -96,13 +88,11 @@ OTableEditorCtrl* OFieldDescGenWin::GetEditorCtrl() #endif void OFieldDescGenWin::SaveData( OFieldDescription* pFieldDescr ) { - DBG_CHKTHIS(OFieldDescGenWin,NULL); m_pFieldControl->SaveData(pFieldDescr); } void OFieldDescGenWin::GetFocus() { - DBG_CHKTHIS(OFieldDescGenWin,NULL); // Setzt den Focus auf das zuletzt aktive Control TabPage::GetFocus(); if(m_pFieldControl) @@ -112,7 +102,6 @@ void OFieldDescGenWin::GetFocus() void OFieldDescGenWin::LoseFocus() { - DBG_CHKTHIS(OFieldDescGenWin,NULL); m_pFieldControl->LoseFocus(); TabPage::LoseFocus(); } diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index 1eb193aaf79a..e8668f9a1806 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::util; // class OFieldDescription -DBG_NAME(OFieldDescription) OFieldDescription::OFieldDescription() :m_pType() ,m_nType(DataType::VARCHAR) @@ -54,7 +53,6 @@ OFieldDescription::OFieldDescription() ,m_bIsCurrency(sal_False) ,m_bHidden(sal_False) { - DBG_CTOR(OFieldDescription,NULL); } OFieldDescription::OFieldDescription( const OFieldDescription& rDescr ) @@ -80,12 +78,10 @@ OFieldDescription::OFieldDescription( const OFieldDescription& rDescr ) ,m_bIsCurrency(rDescr.m_bIsCurrency) ,m_bHidden(rDescr.m_bHidden) { - DBG_CTOR(OFieldDescription,NULL); } OFieldDescription::~OFieldDescription() { - DBG_DTOR(OFieldDescription,NULL); } OFieldDescription::OFieldDescription(const Reference< XPropertySet >& xAffectedCol,sal_Bool _bUseAsDest) @@ -101,7 +97,6 @@ OFieldDescription::OFieldDescription(const Reference< XPropertySet >& xAffectedC ,m_bIsCurrency(sal_False) ,m_bHidden(sal_False) { - DBG_CTOR(OFieldDescription,NULL); OSL_ENSURE(xAffectedCol.is(),"PropetySet can notbe null!"); if ( xAffectedCol.is() ) { diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 664d4c9dc92e..40f149ce4dae 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -67,7 +67,6 @@ namespace dbaui } // TYPEINIT1(OTableEditorCtrl, DBView); -DBG_NAME(OTableEditorCtrl) #define HANDLE_ID 0 @@ -79,11 +78,9 @@ DBG_NAME(OTableEditorCtrl) // Maximum length in description field #define MAX_DESCR_LEN 256 -DBG_NAME(ClipboardInvalidator) OTableEditorCtrl::ClipboardInvalidator::ClipboardInvalidator(sal_uLong nTimeout,OTableEditorCtrl* _pOwner) : m_pOwner(_pOwner) { - DBG_CTOR(ClipboardInvalidator,NULL); m_aInvalidateTimer.SetTimeout(nTimeout); m_aInvalidateTimer.SetTimeoutHdl(LINK(this, OTableEditorCtrl::ClipboardInvalidator, OnInvalidate)); @@ -94,7 +91,6 @@ OTableEditorCtrl::ClipboardInvalidator::~ClipboardInvalidator() { m_aInvalidateTimer.Stop(); - DBG_DTOR(ClipboardInvalidator,NULL); } IMPL_LINK_NOARG(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate) @@ -107,7 +103,6 @@ IMPL_LINK_NOARG(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate) void OTableEditorCtrl::Init() { - DBG_CHKTHIS(OTableEditorCtrl,NULL); OTableRowView::Init(); // Should it be opened ReadOnly ? @@ -141,7 +136,6 @@ void OTableEditorCtrl::Init() void OTableEditorCtrl::UpdateAll() { - DBG_CHKTHIS(OTableEditorCtrl,NULL); RowRemoved(0, GetRowCount(), sal_False); m_nDataPos = 0; @@ -168,7 +162,6 @@ OTableEditorCtrl::OTableEditorCtrl(Window* pWindow) ,bReadOnly(sal_True) ,m_aInvalidate(500,this) { - DBG_CTOR(OTableEditorCtrl,NULL); SetHelpId(HID_TABDESIGN_BACKGROUND); GetDataWindow().SetHelpId(HID_CTL_TABLEEDIT); @@ -184,7 +177,6 @@ SfxUndoManager& OTableEditorCtrl::GetUndoManager() const sal_Bool OTableEditorCtrl::IsReadOnly() { - DBG_CHKTHIS(OTableEditorCtrl,NULL); return bReadOnly; } @@ -196,7 +188,6 @@ void OTableEditorCtrl::SetReadOnly( sal_Bool bRead ) // or worse, this action may not be reversed afterwards return; - DBG_CHKTHIS(OTableEditorCtrl,NULL); bReadOnly = bRead; // Disable active cells @@ -217,7 +208,6 @@ void OTableEditorCtrl::SetReadOnly( sal_Bool bRead ) void OTableEditorCtrl::InitCellController() { - DBG_CHKTHIS(OTableEditorCtrl,NULL); // Cell Field name sal_Int32 nMaxTextLen = EDIT_NOLIMIT; OUString sExtraNameChars; @@ -274,7 +264,6 @@ void OTableEditorCtrl::InitCellController() void OTableEditorCtrl::ClearModified() { - DBG_CHKTHIS(OTableEditorCtrl,NULL); pNameCell->ClearModifyFlag(); pDescrCell->ClearModifyFlag(); pHelpTextCell->ClearModifyFlag(); @@ -283,7 +272,6 @@ void OTableEditorCtrl::ClearModified() OTableEditorCtrl::~OTableEditorCtrl() { - DBG_DTOR(OTableEditorCtrl,NULL); // Reset the Undo-Manager GetUndoManager().Clear(); @@ -308,7 +296,6 @@ OTableEditorCtrl::~OTableEditorCtrl() sal_Bool OTableEditorCtrl::SetDataPtr( long nRow ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); if(nRow == -1) return sal_False; @@ -324,7 +311,6 @@ sal_Bool OTableEditorCtrl::SeekRow(long _nRow) // Call the Base class to remember which row must be repainted EditBrowseBox::SeekRow(_nRow); - DBG_CHKTHIS(OTableEditorCtrl,NULL); m_nCurrentPos = _nRow; return SetDataPtr(_nRow); } @@ -332,7 +318,6 @@ sal_Bool OTableEditorCtrl::SeekRow(long _nRow) void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const { - DBG_CHKTHIS(OTableEditorCtrl,NULL); const OUString aText( GetCellText( m_nCurrentPos, nColumnId )); rDev.Push( PUSH_CLIPREGION ); @@ -343,7 +328,6 @@ void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); // If EditorCtrl is ReadOnly, editing is forbidden Reference<XPropertySet> xTable = GetView()->getController().getTable(); if (IsReadOnly() || ( xTable.is() && @@ -382,7 +366,6 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId) void OTableEditorCtrl::InitController(CellControllerRef&, long nRow, sal_uInt16 nColumnId) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); SeekRow( nRow == -1 ? GetCurRow() : nRow); OFieldDescription* pActFieldDescr = pActRow->GetActFieldDescr(); OUString aInitString; @@ -432,7 +415,6 @@ void OTableEditorCtrl::InitController(CellControllerRef&, long nRow, sal_uInt16 EditBrowseBox::RowStatus OTableEditorCtrl::GetRowStatus(long nRow) const { - DBG_CHKTHIS(OTableEditorCtrl,NULL); const_cast<OTableEditorCtrl*>(this)->SetDataPtr( nRow ); if( !pActRow ) return EditBrowseBox::CLEAN; @@ -452,7 +434,6 @@ EditBrowseBox::RowStatus OTableEditorCtrl::GetRowStatus(long nRow) const sal_Bool OTableEditorCtrl::SaveCurRow() { - DBG_CHKTHIS(OTableEditorCtrl,NULL); if (GetFieldDescr(GetCurRow()) == NULL) // there is no data in the current row return sal_True; @@ -493,7 +474,6 @@ void OTableEditorCtrl::DisplayData(long nRow, sal_Bool bGrabFocus) void OTableEditorCtrl::CursorMoved() { - DBG_CHKTHIS(OTableEditorCtrl,NULL); // New line ? m_nDataPos = GetCurRow(); if( m_nDataPos != nOldDataPos && m_nDataPos != -1) @@ -510,7 +490,6 @@ void OTableEditorCtrl::CursorMoved() sal_Int32 OTableEditorCtrl::HasFieldName( const OUString& rFieldName ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); Reference<XConnection> xCon = GetView()->getController().getConnection(); Reference< XDatabaseMetaData> xMetaData = xCon.is() ? xCon->getMetaData() : Reference< XDatabaseMetaData>(); @@ -532,7 +511,6 @@ sal_Int32 OTableEditorCtrl::HasFieldName( const OUString& rFieldName ) sal_Bool OTableEditorCtrl::SaveData(long nRow, sal_uInt16 nColId) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); // Store the cell content SetDataPtr( nRow == -1 ? GetCurRow() : nRow); OFieldDescription* pActFieldDescr = pActRow->GetActFieldDescr(); @@ -620,7 +598,6 @@ sal_Bool OTableEditorCtrl::SaveData(long nRow, sal_uInt16 nColId) sal_Bool OTableEditorCtrl::SaveModified() { - DBG_CHKTHIS(OTableEditorCtrl,NULL); sal_uInt16 nColId = GetCurColumnId(); switch( nColId ) @@ -638,7 +615,6 @@ sal_Bool OTableEditorCtrl::SaveModified() sal_Bool OTableEditorCtrl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); if (!EditBrowseBox::CursorMoving(nNewRow, nNewCol)) return sal_False; @@ -664,7 +640,6 @@ sal_Bool OTableEditorCtrl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) IMPL_LINK( OTableEditorCtrl, InvalidateFieldType, void*, /*EMPTYTAG*/ ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); nInvalidateTypeEvent = 0; Invalidate( GetFieldRectPixel(nOldDataPos, FIELD_TYPE) ); @@ -673,7 +648,6 @@ IMPL_LINK( OTableEditorCtrl, InvalidateFieldType, void*, /*EMPTYTAG*/ ) void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); // If the description is null, use the default if(nRow == -1) @@ -743,7 +717,6 @@ void OTableEditorCtrl::resetType() void OTableEditorCtrl::CellModified() { - DBG_CHKTHIS(OTableEditorCtrl,NULL); CellModified( GetCurRow(), GetCurColumnId() ); } @@ -756,20 +729,17 @@ void OTableEditorCtrl::InvalidateFeatures() void OTableEditorCtrl::Undo() { - DBG_CHKTHIS(OTableEditorCtrl,NULL); InvalidateFeatures(); } void OTableEditorCtrl::Redo() { - DBG_CHKTHIS(OTableEditorCtrl,NULL); InvalidateFeatures(); } void OTableEditorCtrl::CopyRows() { - DBG_CHKTHIS(OTableEditorCtrl,NULL); // set to the right row and save it if( SetDataPtr(m_nDataPos) ) pDescrWin->SaveData( pActRow->GetActFieldDescr() ); @@ -800,7 +770,6 @@ void OTableEditorCtrl::CopyRows() OUString OTableEditorCtrl::GenerateName( const OUString& rName ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); // Create a base name for appending numbers to OUString aBaseName; Reference<XConnection> xCon = GetView()->getController().getConnection(); @@ -827,7 +796,6 @@ OUString OTableEditorCtrl::GenerateName( const OUString& rName ) void OTableEditorCtrl::InsertRows( long nRow ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); ::std::vector< ::boost::shared_ptr<OTableRow> > vInsertedUndoRedoRows; // need for undo/redo handling // get rows from clipboard @@ -878,7 +846,6 @@ void OTableEditorCtrl::InsertRows( long nRow ) void OTableEditorCtrl::DeleteRows() { - DBG_CHKTHIS(OTableEditorCtrl,NULL); OSL_ENSURE(GetView()->getController().isDropAllowed(),"Call of DeleteRows not valid here. Please check isDropAllowed!"); // Create the Undo-Action GetUndoManager().AddUndoAction( new OTableEditorDelUndoAct(this) ); @@ -916,7 +883,6 @@ void OTableEditorCtrl::DeleteRows() void OTableEditorCtrl::InsertNewRows( long nRow ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); OSL_ENSURE(GetView()->getController().isAddAllowed(),"Call of InsertNewRows not valid here. Please check isAppendAllowed!"); // Create Undo-Action long nInsertRows = GetSelectRowCount(); @@ -934,7 +900,6 @@ void OTableEditorCtrl::InsertNewRows( long nRow ) OUString OTableEditorCtrl::GetControlText( long nRow, sal_uInt16 nColId ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); // Read the Browser Controls if( nColId < FIELD_FIRST_VIRTUAL_COLUMN ) { @@ -954,7 +919,6 @@ OUString OTableEditorCtrl::GetControlText( long nRow, sal_uInt16 nColId ) void OTableEditorCtrl::SetControlText( long nRow, sal_uInt16 nColId, const OUString& rText ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); // Set the Browser Controls if( nColId < FIELD_FIRST_VIRTUAL_COLUMN ) { @@ -976,7 +940,6 @@ void OTableEditorCtrl::SetControlText( long nRow, sal_uInt16 nColId, const OUStr void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); // Relocate the current pointer if( nRow == -1 ) nRow = GetCurRow(); @@ -998,7 +961,6 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const TOTypeIn void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rNewData ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); // Relocate the current pointer if( nRow == -1 ) nRow = GetCurRow(); @@ -1079,7 +1041,6 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const ::com::s Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); OFieldDescription* pFieldDescr = GetFieldDescr( nRow ); if( !pFieldDescr ) return Any(); @@ -1149,7 +1110,6 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId ) OUString OTableEditorCtrl::GetCellText( long nRow, sal_uInt16 nColId ) const { - DBG_CHKTHIS(OTableEditorCtrl,NULL); OUString sCellText; const_cast< OTableEditorCtrl* >( this )->GetCellData( nRow, nColId ) >>= sCellText; return sCellText; @@ -1157,13 +1117,11 @@ OUString OTableEditorCtrl::GetCellText( long nRow, sal_uInt16 nColId ) const sal_uInt32 OTableEditorCtrl::GetTotalCellWidth(long nRow, sal_uInt16 nColId) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); return GetTextWidth(GetCellText(nRow, nColId)) + 2 * GetTextWidth(OUString('0')); } OFieldDescription* OTableEditorCtrl::GetFieldDescr( long nRow ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); std::vector< ::boost::shared_ptr<OTableRow> >::size_type nListCount( m_pRowList->size()); if( (nRow<0) || (sal::static_int_cast< unsigned long >(nRow)>=nListCount) ) @@ -1179,7 +1137,6 @@ OFieldDescription* OTableEditorCtrl::GetFieldDescr( long nRow ) sal_Bool OTableEditorCtrl::IsCutAllowed( long nRow ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); sal_Bool bIsCutAllowed = (GetView()->getController().isAddAllowed() && GetView()->getController().isDropAllowed()) || GetView()->getController().isAlterAllowed(); @@ -1210,7 +1167,6 @@ sal_Bool OTableEditorCtrl::IsCutAllowed( long nRow ) sal_Bool OTableEditorCtrl::IsCopyAllowed( long /*nRow*/ ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); sal_Bool bIsCopyAllowed = sal_False; if(m_eChildFocus == DESCRIPTION ) bIsCopyAllowed = !pDescrCell->GetSelected().isEmpty(); @@ -1244,7 +1200,6 @@ sal_Bool OTableEditorCtrl::IsCopyAllowed( long /*nRow*/ ) sal_Bool OTableEditorCtrl::IsPasteAllowed( long /*nRow*/ ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); sal_Bool bAllowed = GetView()->getController().isAddAllowed(); if ( bAllowed ) { @@ -1345,14 +1300,12 @@ void OTableEditorCtrl::paste() sal_Bool OTableEditorCtrl::IsDeleteAllowed( long /*nRow*/ ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); return GetSelectRowCount() != 0 && GetView()->getController().isDropAllowed(); } sal_Bool OTableEditorCtrl::IsInsertNewAllowed( long nRow ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); sal_Bool bInsertNewAllowed = GetView()->getController().isAddAllowed(); // If fields can be added, Paste in the new fields @@ -1368,7 +1321,6 @@ sal_Bool OTableEditorCtrl::IsInsertNewAllowed( long nRow ) sal_Bool OTableEditorCtrl::IsPrimaryKeyAllowed( long /*nRow*/ ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); if( !GetSelectRowCount() ) return sal_False; @@ -1415,7 +1367,6 @@ sal_Bool OTableEditorCtrl::IsPrimaryKeyAllowed( long /*nRow*/ ) void OTableEditorCtrl::Command(const CommandEvent& rEvt) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); switch (rEvt.GetCommand()) { case COMMAND_CONTEXTMENU: @@ -1574,7 +1525,6 @@ IMPL_LINK( OTableEditorCtrl, DelayedDelete, void*, /*EMPTYTAG*/ ) IMPL_LINK( OTableEditorCtrl, DelayedInsNewRows, void*, /*EMPTYTAG*/ ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); nInsNewRowsEvent = 0; sal_Int32 nPastePosition = GetView()->getController().getFirstEmptyRowPosition(); if ( !GetView()->getController().getTable().is() ) @@ -1616,7 +1566,6 @@ void OTableEditorCtrl::AdjustFieldDescription(OFieldDescription* _pFieldDesc, void OTableEditorCtrl::SetPrimaryKey( sal_Bool bSet ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); // Delete any existing Primary Keys MultiSelection aDeletedPrimKeys; aDeletedPrimKeys.SetTotalRange( Range(0,GetRowCount()) ); @@ -1662,7 +1611,6 @@ void OTableEditorCtrl::SetPrimaryKey( sal_Bool bSet ) sal_Bool OTableEditorCtrl::IsPrimaryKey() { - DBG_CHKTHIS(OTableEditorCtrl,NULL); // Are all marked fields part of the Primary Key ? long nPrimaryKeys = 0; ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin(); @@ -1681,7 +1629,6 @@ sal_Bool OTableEditorCtrl::IsPrimaryKey() void OTableEditorCtrl::SwitchType( const TOTypeInfoSP& _pType ) { - DBG_CHKTHIS(OTableEditorCtrl,NULL); // if there is no assigned field name long nRow(GetCurRow()); OFieldDescription* pActFieldDescr = GetFieldDescr( nRow ); diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index ceba53a3b18a..f6dace202c9f 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -138,14 +138,12 @@ Reference< XInterface > SAL_CALL OTableController::Create(const Reference<XMulti return *(new OTableController(comphelper::getComponentContext(_rxFactory))); } -DBG_NAME(OTableController) OTableController::OTableController(const Reference< XComponentContext >& _rM) : OTableController_BASE(_rM) ,m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES)) ,m_pTypeInfo() ,m_bAllowAutoIncrementValue(sal_False) ,m_bNew(sal_True) { - DBG_CTOR(OTableController,NULL); InvalidateAll(); m_pTypeInfo = TOTypeInfoSP(new OTypeInfo()); @@ -157,7 +155,6 @@ OTableController::~OTableController() m_aTypeInfoIndex.clear(); m_aTypeInfo.clear(); - DBG_DTOR(OTableController,NULL); } void OTableController::startTableListening() diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index a4aecb4e22b9..ec7986dac4d1 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star::util; //--- Defines #define HANDLE_ID 0 -DBG_NAME(OTableRowView) OTableRowView::OTableRowView(Window* pParent) :EditBrowseBox(pParent, ModuleRes(RID_DB_TAB_EDITOR),EBBF_NONE, BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_AUTOSIZE_LASTCOL | @@ -46,14 +45,12 @@ OTableRowView::OTableRowView(Window* pParent) ,m_bUpdatable(sal_False) ,m_bClipboardFilled(sal_False) { - DBG_CTOR(OTableRowView,NULL); } OTableRowView::~OTableRowView() { - DBG_DTOR(OTableRowView,NULL); } void OTableRowView::Init() diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index e2681b021ba3..912ee70128db 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -25,11 +25,9 @@ using namespace dbaui; #define STANDARD_MARGIN 6 // class OTableDesignHelpBar -DBG_NAME(OTableDesignHelpBar) OTableDesignHelpBar::OTableDesignHelpBar( Window* pParent ) : TabPage( pParent, WB_3DLOOK ) { - DBG_CTOR(OTableDesignHelpBar,NULL); m_pTextWin = new MultiLineEdit( this, WB_VSCROLL | WB_LEFT | WB_BORDER | WB_NOTABSTOP | WB_READONLY); m_pTextWin->SetHelpId(HID_TABLE_DESIGN_HELP_WINDOW); m_pTextWin->SetReadOnly(); @@ -39,14 +37,12 @@ OTableDesignHelpBar::OTableDesignHelpBar( Window* pParent ) : OTableDesignHelpBar::~OTableDesignHelpBar() { - DBG_DTOR(OTableDesignHelpBar,NULL); ::std::auto_ptr<Window> aTemp(m_pTextWin); m_pTextWin = NULL; } void OTableDesignHelpBar::SetHelpText( const OUString& rText ) { - DBG_CHKTHIS(OTableDesignHelpBar,NULL); if(m_pTextWin) m_pTextWin->SetText( rText ); Invalidate(); @@ -54,7 +50,6 @@ void OTableDesignHelpBar::SetHelpText( const OUString& rText ) void OTableDesignHelpBar::Resize() { - DBG_CHKTHIS(OTableDesignHelpBar,NULL); // Abmessungen parent window Size aOutputSize( GetOutputSizePixel() ); diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index c459c7615035..92e286e34484 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -39,11 +39,9 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; // class OTableBorderWindow -DBG_NAME(OTableBorderWindow) OTableBorderWindow::OTableBorderWindow(Window* pParent) : Window(pParent,WB_BORDER) ,m_aHorzSplitter( this ) { - DBG_CTOR(OTableBorderWindow,NULL); ImplInitSettings( sal_True, sal_True, sal_True ); // Children erzeugen @@ -80,7 +78,6 @@ OTableBorderWindow::~OTableBorderWindow() m_pFieldDescWin = NULL; } - DBG_DTOR(OTableBorderWindow,NULL); } void OTableBorderWindow::Resize() @@ -172,7 +169,6 @@ void OTableBorderWindow::GetFocus() } // class OTableDesignView -DBG_NAME(OTableDesignView); OTableDesignView::OTableDesignView( Window* pParent, const Reference< XComponentContext >& _rxOrb, OTableController& _rController @@ -181,7 +177,6 @@ OTableDesignView::OTableDesignView( Window* pParent, ,m_rController( _rController ) ,m_eChildFocus(NONE) { - DBG_CTOR(OTableDesignView,NULL); try { @@ -197,7 +192,6 @@ OTableDesignView::OTableDesignView( Window* pParent, OTableDesignView::~OTableDesignView() { - DBG_DTOR(OTableDesignView,NULL); m_pWin->Hide(); { diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index fd6633619786..da5c37e4e67c 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -44,11 +44,9 @@ using namespace dbaui; // class OTableFieldDescWin -DBG_NAME(OTableFieldDescWin) OTableFieldDescWin::OTableFieldDescWin( Window* pParent) :TabPage(pParent, WB_3DLOOK) { - DBG_CTOR(OTableFieldDescWin,NULL); // Header m_pHeader = new FixedText( this, WB_CENTER | WB_INFO ); // | WB_3DLOOK m_pHeader->SetText( OUString(ModuleRes(STR_TAB_PROPERTIES)) ); @@ -66,7 +64,6 @@ OTableFieldDescWin::OTableFieldDescWin( Window* pParent) OTableFieldDescWin::~OTableFieldDescWin() { - DBG_DTOR(OTableFieldDescWin,NULL); // Children zerstoeren m_pHelpBar->Hide(); getGenPage()->Hide(); @@ -100,25 +97,21 @@ void OTableFieldDescWin::Init() void OTableFieldDescWin::SetReadOnly( sal_Bool bRead ) { - DBG_CHKTHIS(OTableFieldDescWin,NULL); getGenPage()->SetReadOnly( bRead ); } void OTableFieldDescWin::DisplayData( OFieldDescription* pFieldDescr ) { - DBG_CHKTHIS(OTableFieldDescWin,NULL); getGenPage()->DisplayData( pFieldDescr ); } void OTableFieldDescWin::SaveData( OFieldDescription* pFieldDescr ) { - DBG_CHKTHIS(OTableFieldDescWin,NULL); getGenPage()->SaveData( pFieldDescr ); } void OTableFieldDescWin::Paint( const Rectangle& /*rRect*/ ) { - DBG_CHKTHIS(OTableFieldDescWin,NULL); // 3D-Linie am oberen Fensterrand const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -133,7 +126,6 @@ void OTableFieldDescWin::Paint( const Rectangle& /*rRect*/ ) void OTableFieldDescWin::Resize() { - DBG_CHKTHIS(OTableFieldDescWin,NULL); // Abmessungen parent window Size aOutputSize( GetOutputSizePixel() ); long nOutputWidth = aOutputSize.Width(); diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index 03dfe087ee19..a67cbd48ac23 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -29,14 +29,12 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; // class OTableRow -DBG_NAME(OTableRow) OTableRow::OTableRow() :m_pActFieldDescr( NULL ) ,m_nPos( -1 ) ,m_bReadOnly( false ) ,m_bOwnsDescriptions(false) { - DBG_CTOR(OTableRow,NULL); } OTableRow::OTableRow(const Reference< XPropertySet >& xAffectedCol) @@ -45,7 +43,6 @@ OTableRow::OTableRow(const Reference< XPropertySet >& xAffectedCol) ,m_bReadOnly( false ) ,m_bOwnsDescriptions(true) { - DBG_CTOR(OTableRow,NULL); m_pActFieldDescr = new OFieldDescription(xAffectedCol); } @@ -55,7 +52,6 @@ OTableRow::OTableRow( const OTableRow& rRow, long nPosition ) ,m_bReadOnly(rRow.IsReadOnly()) ,m_bOwnsDescriptions(false) { - DBG_CTOR(OTableRow,NULL); OFieldDescription* pSrcField = rRow.GetActFieldDescr(); if(pSrcField) @@ -67,27 +63,23 @@ OTableRow::OTableRow( const OTableRow& rRow, long nPosition ) OTableRow::~OTableRow() { - DBG_DTOR(OTableRow,NULL); if(m_bOwnsDescriptions) delete m_pActFieldDescr; } void OTableRow::SetPrimaryKey( sal_Bool bSet ) { - DBG_CHKTHIS(OTableRow,NULL); if(m_pActFieldDescr) m_pActFieldDescr->SetPrimaryKey(bSet); } sal_Bool OTableRow::IsPrimaryKey() const { - DBG_CHKTHIS(OTableRow,NULL); return m_pActFieldDescr && m_pActFieldDescr->IsPrimaryKey(); } void OTableRow::SetFieldType( const TOTypeInfoSP& _pType, sal_Bool _bForce ) { - DBG_CHKTHIS(OTableRow,NULL); if ( _pType.get() ) { if( !m_pActFieldDescr ) diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx index 5445f1c6ff9d..b4ef8f109513 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.cxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx @@ -41,17 +41,14 @@ TYPEINIT1( OTableEditorInsNewUndoAct, OTableEditorUndoAct ); TYPEINIT1( OPrimKeyUndoAct, OTableEditorUndoAct ); // class OTableDesignUndoAct -DBG_NAME(OTableDesignUndoAct); OTableDesignUndoAct::OTableDesignUndoAct( OTableRowView* pOwner,sal_uInt16 nCommentID ) : OCommentUndoAction(nCommentID) ,m_pTabDgnCtrl( pOwner ) { - DBG_CTOR(OTableDesignUndoAct,NULL); m_pTabDgnCtrl->m_nCurUndoActId++; } OTableDesignUndoAct::~OTableDesignUndoAct() { - DBG_DTOR(OTableDesignUndoAct,NULL); } void OTableDesignUndoAct::Undo() @@ -79,20 +76,17 @@ void OTableDesignUndoAct::Redo() } // class OTableDesignCellUndoAct -DBG_NAME(OTableDesignCellUndoAct); OTableDesignCellUndoAct::OTableDesignCellUndoAct( OTableRowView* pOwner, long nRowID, sal_uInt16 nColumn ) : OTableDesignUndoAct( pOwner ,STR_TABED_UNDO_CELLMODIFIED) ,m_nCol( nColumn ) ,m_nRow( nRowID ) { - DBG_CTOR(OTableDesignCellUndoAct,NULL); // read text at position (m_nRow, m_nCol) m_sOldText = m_pTabDgnCtrl->GetCellData( m_nRow, m_nCol ); } OTableDesignCellUndoAct::~OTableDesignCellUndoAct() { - DBG_DTOR(OTableDesignCellUndoAct,NULL); } void OTableDesignCellUndoAct::Undo() @@ -124,33 +118,27 @@ void OTableDesignCellUndoAct::Redo() } // class OTableEditorUndoAct -DBG_NAME(OTableEditorUndoAct); OTableEditorUndoAct::OTableEditorUndoAct( OTableEditorCtrl* pOwner,sal_uInt16 _nCommentID ) : OTableDesignUndoAct( pOwner ,_nCommentID) ,pTabEdCtrl(pOwner) { - DBG_CTOR(OTableEditorUndoAct,NULL); } OTableEditorUndoAct::~OTableEditorUndoAct() { - DBG_DTOR(OTableEditorUndoAct,NULL); } // class OTableEditorTypeSelUndoAct -DBG_NAME(OTableEditorTypeSelUndoAct); OTableEditorTypeSelUndoAct::OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, sal_uInt16 nColumn, const TOTypeInfoSP& _pOldType ) :OTableEditorUndoAct( pOwner ,STR_TABED_UNDO_TYPE_CHANGED) ,m_nCol( nColumn ) ,m_nRow( nRowID ) ,m_pOldType( _pOldType ) { - DBG_CTOR(OTableEditorTypeSelUndoAct,NULL); } OTableEditorTypeSelUndoAct::~OTableEditorTypeSelUndoAct() { - DBG_DTOR(OTableEditorTypeSelUndoAct,NULL); } void OTableEditorTypeSelUndoAct::Undo() @@ -177,11 +165,9 @@ void OTableEditorTypeSelUndoAct::Redo() } // class OTableEditorDelUndoAct -DBG_NAME(OTableEditorDelUndoAct); OTableEditorDelUndoAct::OTableEditorDelUndoAct( OTableEditorCtrl* pOwner) : OTableEditorUndoAct( pOwner ,STR_TABED_UNDO_ROWDELETED) { - DBG_CTOR(OTableEditorDelUndoAct,NULL); // fill DeletedRowList ::std::vector< ::boost::shared_ptr<OTableRow> >* pOriginalRows = pOwner->GetRowList(); long nIndex = pOwner->FirstSelectedRow(); @@ -200,7 +186,6 @@ OTableEditorDelUndoAct::OTableEditorDelUndoAct( OTableEditorCtrl* pOwner) : OTableEditorDelUndoAct::~OTableEditorDelUndoAct() { - DBG_DTOR(OTableEditorDelUndoAct,NULL); m_aDeletedRows.clear(); } @@ -246,7 +231,6 @@ void OTableEditorDelUndoAct::Redo() } // class OTableEditorInsUndoAct -DBG_NAME(OTableEditorInsUndoAct); OTableEditorInsUndoAct::OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition , const ::std::vector< ::boost::shared_ptr<OTableRow> >& _vInsertedRows) @@ -254,12 +238,10 @@ OTableEditorInsUndoAct::OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, ,m_vInsertedRows(_vInsertedRows) ,m_nInsPos( nInsertPosition ) { - DBG_CTOR(OTableEditorInsUndoAct,NULL); } OTableEditorInsUndoAct::~OTableEditorInsUndoAct() { - DBG_DTOR(OTableEditorInsUndoAct,NULL); m_vInsertedRows.clear(); } @@ -300,18 +282,15 @@ void OTableEditorInsUndoAct::Redo() } // class OTableEditorInsNewUndoAct -DBG_NAME(OTableEditorInsNewUndoAct); OTableEditorInsNewUndoAct::OTableEditorInsNewUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition, long nInsertedRows ) : OTableEditorUndoAct( pOwner ,STR_TABED_UNDO_NEWROWINSERTED) ,m_nInsPos( nInsertPosition ) ,m_nInsRows( nInsertedRows ) { - DBG_CTOR(OTableEditorInsNewUndoAct,NULL); } OTableEditorInsNewUndoAct::~OTableEditorInsNewUndoAct() { - DBG_DTOR(OTableEditorInsNewUndoAct,NULL); } void OTableEditorInsNewUndoAct::Undo() @@ -345,19 +324,16 @@ void OTableEditorInsNewUndoAct::Redo() } // class OPrimKeyUndoAct -DBG_NAME(OPrimKeyUndoAct); OPrimKeyUndoAct::OPrimKeyUndoAct( OTableEditorCtrl* pOwner, MultiSelection aDeletedKeys, MultiSelection aInsertedKeys) : OTableEditorUndoAct( pOwner ,STR_TABLEDESIGN_UNDO_PRIMKEY) ,m_aDelKeys( aDeletedKeys ) ,m_aInsKeys( aInsertedKeys ) ,m_pEditorCtrl( pOwner ) { - DBG_CTOR(OPrimKeyUndoAct,NULL); } OPrimKeyUndoAct::~OPrimKeyUndoAct() { - DBG_DTOR(OPrimKeyUndoAct,NULL); } void OPrimKeyUndoAct::Undo() |