diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-28 15:02:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-28 15:02:18 +0100 |
commit | 1714f4d3e8d5a6ae586a0facca4871037896adde (patch) | |
tree | 578299bf4be2eb3d6529236a7f8421f4c4ea25df /basctl | |
parent | 70245edb948c7f084f8490ed1e7f79f3962b4322 (diff) |
Remove remaining DBG_CTOR etc. remnants from basctl
Change-Id: I383021580f69ac51ca65f3464bf863b800ccd931
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/accessibility/accessibledialogwindow.cxx | 11 | ||||
-rw-r--r-- | basctl/source/basicide/baside2.cxx | 40 | ||||
-rw-r--r-- | basctl/source/basicide/baside3.cxx | 5 | ||||
-rw-r--r-- | basctl/source/basicide/bastypes.cxx | 14 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedmod.cxx | 5 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedobj.cxx | 8 | ||||
-rw-r--r-- | basctl/source/dlged/propbrw.cxx | 8 |
7 files changed, 0 insertions, 91 deletions
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index cf6cf626c5fb..280b8ed11d0c 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -47,13 +47,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::accessibility; using namespace ::comphelper; -DBG_NAME( AccessibleDialogWindow ) - - - -// class ChildDescriptor - - AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( DlgEdObj* _pDlgEdObj ) :pDlgEdObj( _pDlgEdObj ) ,rxAccessible( 0 ) @@ -116,7 +109,6 @@ AccessibleDialogWindow::AccessibleDialogWindow (basctl::DialogWindow* pDialogWin , m_pDlgEditor(NULL) , m_pDlgEdModel(NULL) { - DBG_CTOR( AccessibleDialogWindow, NULL ); m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() ); if ( m_pDialogWindow ) @@ -147,7 +139,6 @@ AccessibleDialogWindow::AccessibleDialogWindow (basctl::DialogWindow* pDialogWin AccessibleDialogWindow::~AccessibleDialogWindow() { - DBG_DTOR( AccessibleDialogWindow, NULL ); if ( m_pDialogWindow ) m_pDialogWindow->RemoveEventListener( LINK( this, AccessibleDialogWindow, WindowEventListener ) ); @@ -355,8 +346,6 @@ void AccessibleDialogWindow::SortChildren() IMPL_LINK( AccessibleDialogWindow, WindowEventListener, VclSimpleEvent*, pEvent ) { - DBG_CHKTHIS( AccessibleDialogWindow, 0 ); - if (VclWindowEvent* pWinEvent = dynamic_cast<VclWindowEvent*>(pEvent)) { DBG_ASSERT(pWinEvent->GetWindow(), "AccessibleDialogWindow::WindowEventListener: no window!"); diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 0ddd014c3266..bbf8a526a9d0 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -92,9 +92,6 @@ using namespace ::com::sun::star::ui::dialogs; using namespace utl; using namespace comphelper; - -DBG_NAME( ModulWindow ) - TYPEINIT1( ModulWindow , BaseWindow ); namespace @@ -205,7 +202,6 @@ ModulWindow::ModulWindow ( aXEditorWindow(this), m_aModule(aModule) { - DBG_CTOR( ModulWindow, 0 ); aXEditorWindow.Show(); SetBackground(); } @@ -238,7 +234,6 @@ SbModuleRef ModulWindow::XModule() ModulWindow::~ModulWindow() { - DBG_DTOR( ModulWindow, 0 ); nValid = 0; StarBASIC::Stop(); @@ -249,15 +244,12 @@ void ModulWindow::GetFocus() { if (nValid != ValidWindow) return; - DBG_CHKTHIS( ModulWindow, 0 ); aXEditorWindow.GetEdtWindow().GrabFocus(); // don't call basic calls because focus is somewhere else... } void ModulWindow::DoInit() { - DBG_CHKTHIS( ModulWindow, 0 ); - if ( GetVScrollBar() ) GetVScrollBar()->Hide(); GetHScrollBar()->Show(); @@ -278,8 +270,6 @@ void ModulWindow::Resize() void ModulWindow::CheckCompileBasic() { - DBG_CHKTHIS( ModulWindow, 0 ); - if ( XModule().Is() ) { // never compile while running! @@ -320,8 +310,6 @@ void ModulWindow::CheckCompileBasic() bool ModulWindow::BasicExecute() { - DBG_CHKTHIS( ModulWindow, 0 ); - // #116444# check security settings before macro execution ScriptDocument aDocument( GetDocument() ); if ( aDocument.isDocument() ) @@ -389,7 +377,6 @@ bool ModulWindow::BasicExecute() bool ModulWindow::CompileBasic() { - DBG_CHKTHIS( ModulWindow, 0 ); CheckCompileBasic(); return XModule().Is() && xModule->IsCompiled(); @@ -397,15 +384,12 @@ bool ModulWindow::CompileBasic() bool ModulWindow::BasicRun() { - DBG_CHKTHIS( ModulWindow, 0 ); - aStatus.nBasicFlags = 0; return BasicExecute(); } bool ModulWindow::BasicStepOver() { - DBG_CHKTHIS( ModulWindow, 0 ); aStatus.nBasicFlags = SbDEBUG_STEPINTO | SbDEBUG_STEPOVER; return BasicExecute(); } @@ -413,16 +397,12 @@ bool ModulWindow::BasicStepOver() bool ModulWindow::BasicStepInto() { - DBG_CHKTHIS( ModulWindow, 0 ); - aStatus.nBasicFlags = SbDEBUG_STEPINTO; return BasicExecute(); } bool ModulWindow::BasicStepOut() { - DBG_CHKTHIS( ModulWindow, 0 ); - aStatus.nBasicFlags = SbDEBUG_STEPOUT; return BasicExecute(); } @@ -431,15 +411,12 @@ bool ModulWindow::BasicStepOut() void ModulWindow::BasicStop() { - DBG_CHKTHIS( ModulWindow, 0 ); - GetBasic()->Stop(); aStatus.bIsRunning = false; } bool ModulWindow::LoadBasic() { - DBG_CHKTHIS( ModulWindow, 0 ); bool bDone = false; Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -485,7 +462,6 @@ bool ModulWindow::LoadBasic() bool ModulWindow::SaveBasicSource() { - DBG_CHKTHIS( ModulWindow, 0 ); bool bDone = false; Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); @@ -599,7 +575,6 @@ void ModulWindow::UpdateBreakPoint( const BreakPoint& rBrk ) bool ModulWindow::BasicToggleBreakPoint() { - DBG_CHKTHIS( ModulWindow, 0 ); AssertValidEditEngine(); TextSelection aSel = GetEditView()->GetSelection(); @@ -621,7 +596,6 @@ bool ModulWindow::BasicToggleBreakPoint() void ModulWindow::BasicToggleBreakPointEnabled() { - DBG_CHKTHIS( ModulWindow, 0 ); AssertValidEditEngine(); ExtTextView* pView = GetEditView(); @@ -656,7 +630,6 @@ void ModulWindow::ManageBreakPoints() bool ModulWindow::BasicErrorHdl( StarBASIC * pBasic ) { - DBG_CHKTHIS( ModulWindow, 0 ); GoOnTop(); // ReturnWert: BOOL @@ -693,8 +666,6 @@ bool ModulWindow::BasicErrorHdl( StarBASIC * pBasic ) long ModulWindow::BasicBreakHdl( StarBASIC* pBasic ) { - DBG_CHKTHIS( ModulWindow, 0 ); - // #i69280 Required in Window despite normal usage in next command! (void)pBasic; @@ -738,7 +709,6 @@ long ModulWindow::BasicBreakHdl( StarBASIC* pBasic ) void ModulWindow::BasicAddWatch() { - DBG_CHKTHIS( ModulWindow, 0 ); AssertValidEditEngine(); bool bAdd = true; if ( !GetEditView()->HasSelection() ) @@ -766,7 +736,6 @@ void ModulWindow::BasicAddWatch() void ModulWindow::EditMacro( const OUString& rMacroName ) { - DBG_CHKTHIS( ModulWindow, 0 ); DBG_ASSERT( XModule().Is(), "Kein Modul!" ); if ( XModule().Is() ) @@ -811,7 +780,6 @@ void ModulWindow::EditMacro( const OUString& rMacroName ) void ModulWindow::StoreData() { - DBG_CHKTHIS( ModulWindow, 0 ); // StoreData is called when the BasicManager is destroyed or // this window is closed. // => interrupts undesired! @@ -820,7 +788,6 @@ void ModulWindow::StoreData() bool ModulWindow::CanClose() { - DBG_CHKTHIS( ModulWindow, 0 ); return true; } @@ -833,7 +800,6 @@ bool ModulWindow::AllowUndo() void ModulWindow::UpdateData() { - DBG_CHKTHIS( ModulWindow, 0 ); DBG_ASSERT( XModule().Is(), "Kein Modul!" ); // UpdateData is called when the source has changed from outside // => interrupts undesired! @@ -871,8 +837,6 @@ void ModulWindow::printPage( sal_Int32 nPage, Printer* pPrinter ) */ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage ) { - DBG_CHKTHIS( ModulWindow, 0 ); - AssertValidEditEngine(); MapMode eOldMapMode( pPrinter->GetMapMode() ); @@ -942,7 +906,6 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage ) void ModulWindow::ExecuteCommand (SfxRequest& rReq) { - DBG_CHKTHIS( ModulWindow, 0 ); AssertValidEditEngine(); switch (rReq.GetSlot()) { @@ -1117,7 +1080,6 @@ void ModulWindow::ExecuteGlobal (SfxRequest& rReq) void ModulWindow::GetState( SfxItemSet &rSet ) { - DBG_CHKTHIS( ModulWindow, 0 ); SfxWhichIter aIter(rSet); for ( sal_uInt16 nWh = aIter.FirstWhich(); 0 != nWh; nWh = aIter.NextWhich() ) { @@ -1193,7 +1155,6 @@ void ModulWindow::GetState( SfxItemSet &rSet ) void ModulWindow::DoScroll( ScrollBar* pCurScrollBar ) { - DBG_CHKTHIS( ModulWindow, 0 ); if ( ( pCurScrollBar == GetHScrollBar() ) && GetEditView() ) { // don't scroll with the value but rather use the Thumb-Pos for the VisArea: @@ -1555,7 +1516,6 @@ void ModulWindowLayout::BasicAddWatch (OUString const& rWatchStr) void ModulWindowLayout::BasicRemoveWatch () { - DBG_CHKTHIS( ModulWindow, 0 ); aWatchWindow.RemoveSelectedWatch(); } diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 1f2122bd419b..878dad9f43c4 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -71,8 +71,6 @@ char const FilterMask_All[] = "*.*"; char const FilterMask_All[] = "*"; #endif -DBG_NAME( DialogWindow ) - TYPEINIT1( DialogWindow, BaseWindow ); DialogWindow::DialogWindow ( @@ -706,7 +704,6 @@ static OUString aResourceResolverPropName( "ResourceResolver" ); bool DialogWindow::SaveDialog() { - DBG_CHKTHIS( DialogWindow, 0 ); bool bDone = false; Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); @@ -1246,8 +1243,6 @@ bool implImportDialog( Window* pWin, const OUString& rCurPath, const ScriptDocum bool DialogWindow::ImportDialog() { - DBG_CHKTHIS( DialogWindow, 0 ); - const ScriptDocument& rDocument = GetDocument(); OUString aLibName = GetLibName(); return implImportDialog( this, aCurPath, rDocument, aLibName ); diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index c3bef5de55cf..784de8749843 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -44,14 +44,6 @@ namespace basctl using namespace ::com::sun::star::uno; using namespace ::com::sun::star; - - -// BaseWindow - - - -DBG_NAME( BaseWindow ) - TYPEINIT0( BaseWindow ) TYPEINIT1( SbxItem, SfxPoolItem ); @@ -61,7 +53,6 @@ BaseWindow::BaseWindow( Window* pParent, const ScriptDocument& rDocument, const ,m_aLibName( aLibName ) ,m_aName( aName ) { - DBG_CTOR( BaseWindow, 0 ); pShellHScrollBar = 0; pShellVScrollBar = 0; nStatus = 0; @@ -69,7 +60,6 @@ BaseWindow::BaseWindow( Window* pParent, const ScriptDocument& rDocument, const BaseWindow::~BaseWindow() { - DBG_DTOR( BaseWindow, 0 ); if ( pShellVScrollBar ) pShellVScrollBar->SetScrollHdl( Link() ); if ( pShellHScrollBar ) @@ -80,7 +70,6 @@ BaseWindow::~BaseWindow() void BaseWindow::Init() { - DBG_CHKTHIS( BaseWindow, 0 ); if ( pShellVScrollBar ) pShellVScrollBar->SetScrollHdl( LINK( this, BaseWindow, ScrollHdl ) ); if ( pShellHScrollBar ) @@ -97,7 +86,6 @@ void BaseWindow::DoInit() void BaseWindow::GrabScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll ) { - DBG_CHKTHIS( BaseWindow, 0 ); pShellHScrollBar = pHScroll; pShellVScrollBar = pVScroll; // Init(); // does not make sense, leads to flickering and errors... @@ -107,7 +95,6 @@ void BaseWindow::GrabScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll ) IMPL_LINK_INLINE_START( BaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar ) { - DBG_CHKTHIS( BaseWindow, 0 ); DoScroll( pCurScrollBar ); return 0; } @@ -153,7 +140,6 @@ bool BaseWindow::Notify( NotifyEvent& rNEvt ) void BaseWindow::DoScroll( ScrollBar* ) { - DBG_CHKTHIS( BaseWindow, 0 ); } diff --git a/basctl/source/dlged/dlgedmod.cxx b/basctl/source/dlged/dlgedmod.cxx index e95a62862071..55dd92cf74fb 100644 --- a/basctl/source/dlged/dlgedmod.cxx +++ b/basctl/source/dlged/dlgedmod.cxx @@ -24,24 +24,19 @@ namespace basctl { -DBG_NAME(DlgEdModel) - TYPEINIT1(DlgEdModel,SdrModel); DlgEdModel::DlgEdModel() :SdrModel() { - DBG_CTOR(DlgEdModel,0); } DlgEdModel::~DlgEdModel() { - DBG_DTOR(DlgEdModel,0); } SdrPage* DlgEdModel::AllocPage(bool bMasterPage) { - DBG_CHKTHIS(DlgEdModel, 0); return new DlgEdPage(*this, bMasterPage); } diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 379f6bc8956c..48522b7741dd 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -50,7 +50,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::script; TYPEINIT1(DlgEdObj, SdrUnoObj); -DBG_NAME(DlgEdObj); DlgEditor& DlgEdObj::GetDialogEditor () { @@ -65,7 +64,6 @@ DlgEdObj::DlgEdObj() ,bIsListening(false) ,pDlgEdForm( NULL ) { - DBG_CTOR(DlgEdObj, NULL); } DlgEdObj::DlgEdObj(const OUString& rModelName, @@ -74,13 +72,10 @@ DlgEdObj::DlgEdObj(const OUString& rModelName, ,bIsListening(false) ,pDlgEdForm( NULL ) { - DBG_CTOR(DlgEdObj, NULL); } DlgEdObj::~DlgEdObj() { - DBG_DTOR(DlgEdObj, NULL); - if ( isListening() ) EndListening(); } @@ -1213,17 +1208,14 @@ void DlgEdObj::SetLayer(SdrLayerID nLayer) } TYPEINIT1(DlgEdForm, DlgEdObj); -DBG_NAME(DlgEdForm); DlgEdForm::DlgEdForm (DlgEditor& rDlgEditor_) : rDlgEditor(rDlgEditor_) { - DBG_CTOR(DlgEdForm, NULL); } DlgEdForm::~DlgEdForm() { - DBG_DTOR(DlgEdForm, NULL); } void DlgEdForm::SetRectFromProps() diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index d03bbb72dfa9..847bdfd7cfb8 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -79,18 +79,12 @@ const long WIN_BORDER = 2; } // namespace - -DBG_NAME(PropBrw) - - PropBrw::PropBrw (DialogWindowLayout& rLayout_): DockingWindow(&rLayout_), m_bInitialStateChange(true), m_xContextDocument(SfxViewShell::Current() ? SfxViewShell::Current()->GetCurrentDocument() : Reference<XModel>()), pView(0) { - DBG_CTOR(PropBrw,NULL); - Size aPropWinSize(STD_WIN_SIZE_X,STD_WIN_SIZE_Y); SetMinOutputSizePixel(Size(STD_MIN_SIZE_X,STD_MIN_SIZE_Y)); SetOutputSizePixel(aPropWinSize); @@ -198,8 +192,6 @@ PropBrw::~PropBrw() { if ( m_xBrowserController.is() ) ImplDestroyController(); - - DBG_DTOR(PropBrw,NULL); } |