diff options
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/inc/ShellFactory.hxx | 5 | ||||
-rw-r--r-- | sd/source/ui/view/FormShellManager.cxx | 7 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellManager.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/viewshel.cxx | 10 |
4 files changed, 6 insertions, 18 deletions
diff --git a/sd/source/ui/inc/ShellFactory.hxx b/sd/source/ui/inc/ShellFactory.hxx index af410037a300..9b8d5f8258ac 100644 --- a/sd/source/ui/inc/ShellFactory.hxx +++ b/sd/source/ui/inc/ShellFactory.hxx @@ -47,10 +47,7 @@ public: Return the new view shell or NULL when a creation is not possible. */ - virtual ShellType* CreateShell ( - ShellId nId, - vcl::Window* pParentWindow, - FrameView* pFrameView) = 0; + virtual ShellType* CreateShell(ShellId nId) = 0; /** Tell the factory that a shell is no longer in use. It may destroy it or put it for future use in a cache. diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index d978012620e1..373e72a1c3cd 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -37,7 +37,7 @@ class FormShellManagerFactory { public: FormShellManagerFactory (ViewShell& rViewShell, FormShellManager& rManager); - virtual FmFormShell* CreateShell (ShellId nId, vcl::Window* pParentWindow, FrameView* pFrameView) override; + virtual FmFormShell* CreateShell (ShellId nId) override; virtual void ReleaseShell (SfxShell* pShell) override; private: @@ -291,10 +291,7 @@ FormShellManagerFactory::FormShellManagerFactory ( { } -FmFormShell* FormShellManagerFactory::CreateShell ( - ::sd::ShellId nId, - vcl::Window*, - ::sd::FrameView*) +FmFormShell* FormShellManagerFactory::CreateShell( ::sd::ShellId nId ) { FmFormShell* pShell = nullptr; diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 2eb56764739f..66a589cdcd68 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -1041,7 +1041,7 @@ ShellDescriptor ViewShellManager::Implementation::CreateSubShell ( { SharedShellFactory pFactory = iFactory->second; if (pFactory != nullptr) - aResult.mpShell = pFactory->CreateShell(nShellId, nullptr, nullptr); + aResult.mpShell = pFactory->CreateShell(nShellId); // Exit the loop when the shell has been successfully created. if (aResult.mpShell != nullptr) diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 71319f90ff80..169e751d947d 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -102,10 +102,7 @@ class ViewShellObjectBarFactory public: explicit ViewShellObjectBarFactory (::sd::ViewShell& rViewShell); virtual ~ViewShellObjectBarFactory() override; - virtual SfxShell* CreateShell ( - ::sd::ShellId nId, - vcl::Window* pParentWindow, - ::sd::FrameView* pFrameView) override; + virtual SfxShell* CreateShell( ::sd::ShellId nId ) override; virtual void ReleaseShell (SfxShell* pShell) override; private: ::sd::ViewShell& mrViewShell; @@ -1630,10 +1627,7 @@ ViewShellObjectBarFactory::~ViewShellObjectBarFactory() } } -SfxShell* ViewShellObjectBarFactory::CreateShell ( - ::sd::ShellId nId, - vcl::Window*, - ::sd::FrameView* ) +SfxShell* ViewShellObjectBarFactory::CreateShell( ::sd::ShellId nId ) { SfxShell* pShell = nullptr; |