sd/source/ui/framework/factories/BasicViewFactory.cxx | 16 ++------------
sd/source/ui/inc/NotesPanelViewShell.hxx | 4 +--
sd/source/ui/inc/OutlineViewShell.hxx | 1
sd/source/ui/inc/SlideSorterViewShell.hxx | 2 -
sd/source/ui/inc/framework/factories/BasicViewFactory.hxx | 2 -
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 4 ---
sd/source/ui/view/NotesPanelViewShell.cxx | 4 +--
sd/source/ui/view/outlnvsh.cxx | 1
8 files changed, 8 insertions(+), 26 deletions(-)
New commits:
commit 0f059a2e5f252e6cf1c441b75e54e30fba33dd04
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed May 14 10:21:00 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed May 14 12:41:10 2025 +0200
sd: drop unused parameter
Change-Id: I6331e5091ead6f81b4e3c90b91294ff02a23987d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185297
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx
b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 8ad96a655f01..1d7db09c547c 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -172,12 +172,7 @@ Reference<XResource> SAL_CALL
BasicViewFactory::createResource (
if (xPane.is())
pWindow = VCLUnoHelper::GetWindow(xPane->getWindow());
- // Get the view frame.
- SfxViewFrame* pFrame = nullptr;
- if (mpBase != nullptr)
- pFrame = &mpBase->GetViewFrame();
-
- if (!pFrame || !mpBase || !pWindow)
+ if (!mpBase || !pWindow)
return nullptr;
// Try to get the view from the cache.
@@ -186,7 +181,7 @@ Reference<XResource> SAL_CALL
BasicViewFactory::createResource (
// When the requested view is not in the cache then create a new view.
if (pDescriptor == nullptr)
{
- pDescriptor = CreateView(rxViewId, *pFrame, *pWindow, xPane,
pFrameView, bIsCenterPane);
+ pDescriptor = CreateView(rxViewId, *pWindow, xPane, pFrameView,
bIsCenterPane);
}
rtl::Reference<ViewShellWrapper> xView = pDescriptor->mxView;
@@ -253,7 +248,6 @@ void SAL_CALL BasicViewFactory::releaseResource (const
Reference<XResource>& rxV
std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView
(
const Reference<XResourceId>& rxViewId,
- SfxViewFrame& rFrame,
vcl::Window& rWindow,
const Reference<XPane>& rxPane,
FrameView* pFrameView,
@@ -263,7 +257,6 @@ std::shared_ptr<BasicViewFactory::ViewDescriptor>
BasicViewFactory::CreateView (
pDescriptor->mpViewShell = CreateViewShell(
rxViewId,
- rFrame,
rWindow,
pFrameView);
pDescriptor->mxViewId = rxViewId;
@@ -297,7 +290,6 @@ std::shared_ptr<BasicViewFactory::ViewDescriptor>
BasicViewFactory::CreateView (
std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
const Reference<XResourceId>& rxViewId,
- SfxViewFrame& rFrame,
vcl::Window& rWindow,
FrameView* pFrameView)
{
@@ -324,7 +316,6 @@ std::shared_ptr<ViewShell>
BasicViewFactory::CreateViewShell (
{
pViewShell =
std::make_shared<OutlineViewShell>(
- &rFrame,
*mpBase,
&rWindow,
pFrameView);
@@ -362,7 +353,6 @@ std::shared_ptr<ViewShell>
BasicViewFactory::CreateViewShell (
else if (sViewURL == FrameworkHelper::msSlideSorterURL)
{
pViewShell = ::sd::slidesorter::SlideSorterViewShell::Create (
- &rFrame,
*mpBase,
&rWindow,
pFrameView);
@@ -370,7 +360,7 @@ std::shared_ptr<ViewShell>
BasicViewFactory::CreateViewShell (
}
else if (sViewURL == FrameworkHelper::msNotesPanelViewURL)
{
- pViewShell = std::make_shared<NotesPanelViewShell>(&rFrame, *mpBase,
&rWindow, pFrameView);
+ pViewShell = std::make_shared<NotesPanelViewShell>(*mpBase, &rWindow,
pFrameView);
pViewShell->GetContentWindow()->set_id(u"notes_panel_win"_ustr);
}
diff --git a/sd/source/ui/inc/NotesPanelViewShell.hxx
b/sd/source/ui/inc/NotesPanelViewShell.hxx
index 83afd67ec482..9a84479974d4 100644
--- a/sd/source/ui/inc/NotesPanelViewShell.hxx
+++ b/sd/source/ui/inc/NotesPanelViewShell.hxx
@@ -35,8 +35,8 @@ public:
The frame view that makes it possible to pass information from
one view shell to the next.
*/
- NotesPanelViewShell(SfxViewFrame* pFrame, ViewShellBase& rViewShellBase,
- vcl::Window* pParentWindow, FrameView* pFrameView);
+ NotesPanelViewShell(ViewShellBase& rViewShellBase, vcl::Window*
pParentWindow,
+ FrameView* pFrameView);
virtual ~NotesPanelViewShell() override;
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx
b/sd/source/ui/inc/OutlineViewShell.hxx
index ec12e888a4e6..377fec99947e 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -53,7 +53,6 @@ public:
one view shell to the next.
*/
OutlineViewShell (
- SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
vcl::Window* pParentWindow,
FrameView* pFrameView);
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx
b/sd/source/ui/inc/SlideSorterViewShell.hxx
index 797c44a8e8d0..cb2533740b66 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -46,7 +46,6 @@ private:
public:
static std::shared_ptr<SlideSorterViewShell> Create(
- SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
vcl::Window* pParentWindow,
FrameView* pFrameView);
@@ -201,7 +200,6 @@ private:
bool mbIsArrangeGUIElementsPending;
SlideSorterViewShell (
- SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
vcl::Window* pParentWindow,
FrameView* pFrameView);
diff --git a/sd/source/ui/inc/framework/factories/BasicViewFactory.hxx
b/sd/source/ui/inc/framework/factories/BasicViewFactory.hxx
index 47a2aea5b8ae..8cc0a7bfba06 100644
--- a/sd/source/ui/inc/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/inc/framework/factories/BasicViewFactory.hxx
@@ -93,7 +93,6 @@ private:
std::shared_ptr<ViewDescriptor> CreateView (
const css::uno::Reference<css::drawing::framework::XResourceId>&
rxViewId,
- SfxViewFrame& rFrame,
vcl::Window& rWindow,
const css::uno::Reference<css::drawing::framework::XPane>& rxPane,
FrameView* pFrameView,
@@ -101,7 +100,6 @@ private:
std::shared_ptr<ViewShell> CreateViewShell (
const css::uno::Reference<css::drawing::framework::XResourceId>&
rxViewId,
- SfxViewFrame& rFrame,
vcl::Window& rWindow,
FrameView* pFrameView);
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index e4f7a34fd05d..a3b85897aea2 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -101,7 +101,6 @@ void SlideSorterViewShell::InitInterface_Impl()
std::shared_ptr<SlideSorterViewShell> SlideSorterViewShell::Create (
- SfxViewFrame* pFrame,
ViewShellBase& rViewShellBase,
vcl::Window* pParentWindow,
FrameView* pFrameViewArgument)
@@ -110,7 +109,7 @@ std::shared_ptr<SlideSorterViewShell>
SlideSorterViewShell::Create (
try
{
pViewShell.reset(
- new
SlideSorterViewShell(pFrame,rViewShellBase,pParentWindow,pFrameViewArgument));
+ new
SlideSorterViewShell(rViewShellBase,pParentWindow,pFrameViewArgument));
pViewShell->Initialize();
if (pViewShell->mpSlideSorter == nullptr)
pViewShell.reset();
@@ -123,7 +122,6 @@ std::shared_ptr<SlideSorterViewShell>
SlideSorterViewShell::Create (
}
SlideSorterViewShell::SlideSorterViewShell (
- SfxViewFrame* /*pFrame*/,
ViewShellBase& rViewShellBase,
vcl::Window* pParentWindow,
FrameView* pFrameViewArgument)
diff --git a/sd/source/ui/view/NotesPanelViewShell.cxx
b/sd/source/ui/view/NotesPanelViewShell.cxx
index ad4294cb43ad..5803bcef8861 100644
--- a/sd/source/ui/view/NotesPanelViewShell.cxx
+++ b/sd/source/ui/view/NotesPanelViewShell.cxx
@@ -109,8 +109,8 @@ void NotesPanelViewShell::InitInterface_Impl()
/**
* Default constructor, windows must not center themselves automatically
*/
-NotesPanelViewShell::NotesPanelViewShell(SfxViewFrame* /*pFrame*/,
ViewShellBase& rViewShellBase,
- vcl::Window* pParentWindow,
FrameView* pFrameViewArgument)
+NotesPanelViewShell::NotesPanelViewShell(ViewShellBase& rViewShellBase,
vcl::Window* pParentWindow,
+ FrameView* pFrameViewArgument)
: ViewShell(pParentWindow, rViewShellBase)
{
if (pFrameViewArgument != nullptr)
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 87782fc5603d..221917a299b2 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -177,7 +177,6 @@ Reference<drawing::XDrawSubController>
OutlineViewShell::CreateSubController()
* Default constructor, windows must not center themselves automatically
*/
OutlineViewShell::OutlineViewShell (
- SfxViewFrame* /*pFrame*/,
ViewShellBase& rViewShellBase,
vcl::Window* pParentWindow,
FrameView* pFrameViewArgument)
