merge IUndoManager into SfxUndoManager

SfxUndoManager is the only implementation of the IUnderManager
"interface", and it lives in the same header.
Plus this way we can get rid of some covariant parameters,
which will make using std::unique_ptr easier.

Change-Id: I6661b9876b18da830bead78794d237886cd3c5c9
Reviewed-on: https://gerrit.libreoffice.org/57317
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 10 insertions, 14 deletions

diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 1e8d8a771cf6..7e39d8f9da5e 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1251,7 +1251,7 @@ sal_uInt16 ModulWindow::StartSearchAndReplace( const SvxSearchItem& rSearchItem,
     return nFound;
 }
 
-svl::IUndoManager* ModulWindow::GetUndoManager()
+SfxUndoManager* ModulWindow::GetUndoManager()
 {
     if ( GetEditEngine() )
         return &GetEditEngine()->GetUndoManager();
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 05b8bda07041..c899f1dfdde6 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -386,7 +386,7 @@ public:
     virtual void        BasicStarted() override;
     virtual void        BasicStopped() override;
 
-    virtual ::svl::IUndoManager*
+    virtual SfxUndoManager*
                         GetUndoManager() override;
 
     const OUString&         GetModule() const { return m_aModule; }
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index f43d141bb55a..91e1d4972539 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -1131,7 +1131,7 @@ bool DialogWindow::IsModified()
     return m_pEditor->IsModified();
 }
 
-::svl::IUndoManager* DialogWindow::GetUndoManager()
+SfxUndoManager* DialogWindow::GetUndoManager()
 {
     return m_pUndoMgr.get();
 }
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index b0b7a3769110..78009761502d 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -473,9 +473,9 @@ bool Shell::NextPage( bool bPrev )
     return bRet;
 }
 
-::svl::IUndoManager* Shell::GetUndoManager()
+SfxUndoManager* Shell::GetUndoManager()
 {
-    ::svl::IUndoManager* pMgr = nullptr;
+    SfxUndoManager* pMgr = nullptr;
     if( pCurWin )
         pMgr = pCurWin->GetUndoManager();
 
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index d648353c08f9..87d0b85123d1 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -196,7 +196,7 @@ bool BaseWindow::IsModified ()
     return true;
 }
 
-::svl::IUndoManager* BaseWindow::GetUndoManager()
+SfxUndoManager* BaseWindow::GetUndoManager()
 {
     return nullptr;
 }
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 9c078e608d00..6d332ca90c65 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -103,7 +103,7 @@ public:
     virtual bool        IsModified() override;
     bool                IsPasteAllowed();
 
-    virtual svl::IUndoManager* GetUndoManager() override;
+    virtual SfxUndoManager* GetUndoManager() override;
     // return number of pages to be printed
     virtual sal_Int32 countPages( Printer* pPrinter ) override;
     // print page
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index 5bf56c915afb..d732e53747f9 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -162,7 +162,7 @@ public:
 
     SdrView*            GetCurDlgView() const;
 
-    svl::IUndoManager*  GetUndoManager() override;
+    SfxUndoManager*     GetUndoManager() override;
 
     virtual css::uno::Reference< css::view::XRenderable > GetRenderable() override;
 
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 09820d2f6e43..87a5ffc644c9 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -35,11 +35,7 @@ class SfxRequest;
 class SvxSearchItem;
 class Printer;
 enum class SearchOptionFlags;
-
-namespace svl
-{
-    class IUndoManager;
-}
+class SfxUndoManager;
 
 namespace weld
 {
@@ -215,7 +211,7 @@ public:
     void AddStatus(int n) { nStatus |= n; }
     void ClearStatus(int n) { nStatus &= ~n; }
 
-    virtual svl::IUndoManager* GetUndoManager ();
+    virtual SfxUndoManager* GetUndoManager ();
 
     virtual SearchOptionFlags  GetSearchOptions();
     virtual sal_uInt16  StartSearchAndReplace (SvxSearchItem const&, bool bFromStart = false);