followup changes to 44861f2435a0c487d4fb5b196f7e4fe7f9569396

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

6 files changed, 8 insertions, 34 deletions

diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index fbda06a1648f..95201da53176 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -691,7 +691,7 @@ long ModulWindow::BasicErrorHdl( StarBASIC * pBasic )
         aErrorTextPrefixBuf.append(IDE_RESSTR(RID_STR_RUNTIMEERROR));
         aErrorTextPrefixBuf.append(StarBASIC::GetVBErrorCode(pBasic->GetErrorCode()));
         aErrorTextPrefixBuf.append(' ');
-        rLayout.UpdateDebug();
+        rLayout.UpdateDebug(false);
     }
     ::rtl::OUString aErrorTextPrefix(aErrorTextPrefixBuf.makeStringAndClear());
     // 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 ) ) );
     aXEditorWindow.GetBrkWindow().SetMarkerPos( nErrorLine );
 
-    rLayout.UpdateDebug();
+    rLayout.UpdateDebug(false);
 
     aStatus.bIsInReschedule = true;
     aStatus.bIsRunning = true;
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index e1e639244357..0319dd2075c2 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -435,7 +435,7 @@ public:
     virtual void Activating (IDEBaseWindow&);
     virtual void Deactivating ();
     virtual void GetState (SfxItemSet&, unsigned nWhich);
-    virtual void UpdateDebug (bool bBasicStopped = false);
+    virtual void UpdateDebug (bool bBasicStopped);
 public:
     void BasicAddWatch (String const&);
     void BasicRemoveWatch ();
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 841c4bc13f1b..233e01cdf667 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -699,8 +699,6 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
         break;
 
         default:
-            if (pLayout)
-                pLayout->ExecuteGlobal(rReq);
             if (pCurWin)
                 pCurWin->ExecuteGlobal(rReq);
             break;
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx
index 7fd33d7f5e9b..684a26bdd009 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -108,17 +108,6 @@ void Layout::Deactivating ()
     pChild = 0;
 }
 
-void Layout::ExecuteGlobal (SfxRequest&)
-{ }
-
-void Layout::GetState (SfxItemSet&, unsigned /*nWhich*/)
-{ }
-
-void Layout::UpdateDebug (bool bBasicStopped)
-{
-    static_cast<void>(bBasicStopped);
-}
-
 // virtual
 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
 // ============
diff --git a/basctl/source/basicide/layout.hxx b/basctl/source/basicide/layout.hxx
index eca1b985c547..2f733f852348 100644
--- a/basctl/source/basicide/layout.hxx
+++ b/basctl/source/basicide/layout.hxx
@@ -40,7 +40,7 @@ namespace basctl
 // Layout -- the common base of ModulLayout and DialogLayout.
 // Handles the splitting lines and the dockable windows.
 //
-class Layout: public Window, public utl::ConfigurationListener
+class Layout: public Window
 {
 public:
     void DockaWindow (DockingWindow*);
@@ -48,9 +48,8 @@ public:
 
     virtual void Activating (IDEBaseWindow&);
     virtual void Deactivating ();
-    virtual void ExecuteGlobal (SfxRequest&);
-    virtual void GetState (SfxItemSet&, unsigned nWhich);
-    virtual void UpdateDebug (bool bBasicStopped = false);
+    virtual void GetState (SfxItemSet&, unsigned nWhich) = 0;
+    virtual void UpdateDebug (bool bBasicStopped ) = 0;
 
 protected:
     Layout (Window* pParent);
@@ -63,10 +62,8 @@ protected:
     // Window:
     virtual void Resize ();
     virtual void DataChanged (DataChangedEvent const& rDCEvt);
-    // ConfigurationListener:
-    virtual void ConfigurationChanged (utl::ConfigurationBroadcaster*, sal_uInt32);
     // new:
-    virtual void OnFirstSize (int nWidth, int nHeight);
+    virtual void OnFirstSize (int nWidth, int nHeight) = 0;
 
 private:
     // the main child window (either ModulWindow or DialogWindow)
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index f54e9adeb078..dda678b7c395 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -127,7 +127,7 @@ public:
     virtual void Activating (IDEBaseWindow&);
     virtual void Deactivating ();
     virtual void GetState (SfxItemSet&, unsigned nWhich);
-
+    virtual void UpdateDebug (bool){};
 protected:
     // Layout:
     virtual void OnFirstSize (int nWidth, int nHeight);