followup changes to 44861f2435
a) got rid of defaulted params in virtual base class methods b) made some no-op virtual methods in the base class pure thus making the base class abstract c) made LayoutManager no longer inherit utl::ConfigurationListener as it wasn't actually listening or acting on any configuration changes Change-Id: Iab1783f6b5a35b130287a2aedbd1dc8413793182
This commit is contained in:
@@ -691,7 +691,7 @@ long ModulWindow::BasicErrorHdl( StarBASIC * pBasic )
|
|||||||
aErrorTextPrefixBuf.append(IDE_RESSTR(RID_STR_RUNTIMEERROR));
|
aErrorTextPrefixBuf.append(IDE_RESSTR(RID_STR_RUNTIMEERROR));
|
||||||
aErrorTextPrefixBuf.append(StarBASIC::GetVBErrorCode(pBasic->GetErrorCode()));
|
aErrorTextPrefixBuf.append(StarBASIC::GetVBErrorCode(pBasic->GetErrorCode()));
|
||||||
aErrorTextPrefixBuf.append(' ');
|
aErrorTextPrefixBuf.append(' ');
|
||||||
rLayout.UpdateDebug();
|
rLayout.UpdateDebug(false);
|
||||||
}
|
}
|
||||||
::rtl::OUString aErrorTextPrefix(aErrorTextPrefixBuf.makeStringAndClear());
|
::rtl::OUString aErrorTextPrefix(aErrorTextPrefixBuf.makeStringAndClear());
|
||||||
// if other basic, the IDE should try to display the correct module
|
// if other basic, the IDE should try to display the correct module
|
||||||
@@ -739,7 +739,7 @@ long ModulWindow::BasicBreakHdl( StarBASIC* pBasic )
|
|||||||
GetEditView()->SetSelection( TextSelection( TextPaM( nErrorLine, 0 ), TextPaM( nErrorLine, 0 ) ) );
|
GetEditView()->SetSelection( TextSelection( TextPaM( nErrorLine, 0 ), TextPaM( nErrorLine, 0 ) ) );
|
||||||
aXEditorWindow.GetBrkWindow().SetMarkerPos( nErrorLine );
|
aXEditorWindow.GetBrkWindow().SetMarkerPos( nErrorLine );
|
||||||
|
|
||||||
rLayout.UpdateDebug();
|
rLayout.UpdateDebug(false);
|
||||||
|
|
||||||
aStatus.bIsInReschedule = true;
|
aStatus.bIsInReschedule = true;
|
||||||
aStatus.bIsRunning = true;
|
aStatus.bIsRunning = true;
|
||||||
|
@@ -435,7 +435,7 @@ public:
|
|||||||
virtual void Activating (IDEBaseWindow&);
|
virtual void Activating (IDEBaseWindow&);
|
||||||
virtual void Deactivating ();
|
virtual void Deactivating ();
|
||||||
virtual void GetState (SfxItemSet&, unsigned nWhich);
|
virtual void GetState (SfxItemSet&, unsigned nWhich);
|
||||||
virtual void UpdateDebug (bool bBasicStopped = false);
|
virtual void UpdateDebug (bool bBasicStopped);
|
||||||
public:
|
public:
|
||||||
void BasicAddWatch (String const&);
|
void BasicAddWatch (String const&);
|
||||||
void BasicRemoveWatch ();
|
void BasicRemoveWatch ();
|
||||||
|
@@ -699,8 +699,6 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
if (pLayout)
|
|
||||||
pLayout->ExecuteGlobal(rReq);
|
|
||||||
if (pCurWin)
|
if (pCurWin)
|
||||||
pCurWin->ExecuteGlobal(rReq);
|
pCurWin->ExecuteGlobal(rReq);
|
||||||
break;
|
break;
|
||||||
|
@@ -108,17 +108,6 @@ void Layout::Deactivating ()
|
|||||||
pChild = 0;
|
pChild = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Layout::ExecuteGlobal (SfxRequest&)
|
|
||||||
{ }
|
|
||||||
|
|
||||||
void Layout::GetState (SfxItemSet&, unsigned /*nWhich*/)
|
|
||||||
{ }
|
|
||||||
|
|
||||||
void Layout::UpdateDebug (bool bBasicStopped)
|
|
||||||
{
|
|
||||||
static_cast<void>(bBasicStopped);
|
|
||||||
}
|
|
||||||
|
|
||||||
// virtual
|
// virtual
|
||||||
void Layout::DataChanged (DataChangedEvent const& rDCEvt)
|
void Layout::DataChanged (DataChangedEvent const& rDCEvt)
|
||||||
{
|
{
|
||||||
@@ -145,16 +134,6 @@ void Layout::DataChanged (DataChangedEvent const& rDCEvt)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// virtual
|
|
||||||
void Layout::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 )
|
|
||||||
{ }
|
|
||||||
|
|
||||||
// This virtual function is called the first time when the Layout has nonzero size.
|
|
||||||
// The overrider can initialize the docking windows.
|
|
||||||
void Layout::OnFirstSize (int, int)
|
|
||||||
{ }
|
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// SplittedSide
|
// SplittedSide
|
||||||
// ============
|
// ============
|
||||||
|
@@ -40,7 +40,7 @@ namespace basctl
|
|||||||
// Layout -- the common base of ModulLayout and DialogLayout.
|
// Layout -- the common base of ModulLayout and DialogLayout.
|
||||||
// Handles the splitting lines and the dockable windows.
|
// Handles the splitting lines and the dockable windows.
|
||||||
//
|
//
|
||||||
class Layout: public Window, public utl::ConfigurationListener
|
class Layout: public Window
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void DockaWindow (DockingWindow*);
|
void DockaWindow (DockingWindow*);
|
||||||
@@ -48,9 +48,8 @@ public:
|
|||||||
|
|
||||||
virtual void Activating (IDEBaseWindow&);
|
virtual void Activating (IDEBaseWindow&);
|
||||||
virtual void Deactivating ();
|
virtual void Deactivating ();
|
||||||
virtual void ExecuteGlobal (SfxRequest&);
|
virtual void GetState (SfxItemSet&, unsigned nWhich) = 0;
|
||||||
virtual void GetState (SfxItemSet&, unsigned nWhich);
|
virtual void UpdateDebug (bool bBasicStopped ) = 0;
|
||||||
virtual void UpdateDebug (bool bBasicStopped = false);
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Layout (Window* pParent);
|
Layout (Window* pParent);
|
||||||
@@ -63,10 +62,8 @@ protected:
|
|||||||
// Window:
|
// Window:
|
||||||
virtual void Resize ();
|
virtual void Resize ();
|
||||||
virtual void DataChanged (DataChangedEvent const& rDCEvt);
|
virtual void DataChanged (DataChangedEvent const& rDCEvt);
|
||||||
// ConfigurationListener:
|
|
||||||
virtual void ConfigurationChanged (utl::ConfigurationBroadcaster*, sal_uInt32);
|
|
||||||
// new:
|
// new:
|
||||||
virtual void OnFirstSize (int nWidth, int nHeight);
|
virtual void OnFirstSize (int nWidth, int nHeight) = 0;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// the main child window (either ModulWindow or DialogWindow)
|
// the main child window (either ModulWindow or DialogWindow)
|
||||||
|
@@ -127,7 +127,7 @@ public:
|
|||||||
virtual void Activating (IDEBaseWindow&);
|
virtual void Activating (IDEBaseWindow&);
|
||||||
virtual void Deactivating ();
|
virtual void Deactivating ();
|
||||||
virtual void GetState (SfxItemSet&, unsigned nWhich);
|
virtual void GetState (SfxItemSet&, unsigned nWhich);
|
||||||
|
virtual void UpdateDebug (bool){};
|
||||||
protected:
|
protected:
|
||||||
// Layout:
|
// Layout:
|
||||||
virtual void OnFirstSize (int nWidth, int nHeight);
|
virtual void OnFirstSize (int nWidth, int nHeight);
|
||||||
|
Reference in New Issue
Block a user