compilerplugins/clang/virtualdead.unusedparams.results | 9 ---------
sd/source/ui/app/sdmod1.cxx | 4 ++--
sd/source/ui/inc/OutlineViewShell.hxx | 2 +-
sd/source/ui/inc/ViewShell.hxx | 2 +-
sd/source/ui/view/outlnvsh.cxx | 2 +-
sd/source/ui/view/viewshel.cxx | 4 ++--
slideshow/source/engine/opengl/TransitionImpl.cxx | 14 +++++++-------
slideshow/source/engine/opengl/TransitionImpl.hxx | 4 ++--
8 files changed, 16 insertions(+), 25 deletions(-)
New commits:
commit 7837447287bb846a255dd42acec888abdad8c4e7
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Oct 17 15:15:32 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Oct 19 07:58:40 2019 +0200
loplugin:virtualdead unused param in sd::ViewShell::UpdatePreview
Change-Id: I1ac98096d117e3ae7c2f0be2690acef32b85fbdb
Reviewed-on: https://gerrit.libreoffice.org/81073
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results
b/compilerplugins/clang/virtualdead.unusedparams.results
index 74c5dc078e4a..62eeae5aac7b 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -247,9 +247,6 @@ sd/source/ui/inc/View.hxx:92
sd/source/ui/inc/ViewClipboard.hxx:64
unsigned short sd::ViewClipboard::DetermineInsertPosition(const class
SdTransferable &,)
0
-sd/source/ui/inc/ViewShell.hxx:212
- void sd::ViewShell::UpdatePreview(class SdPage *,_Bool,)
- 10
sdext/source/pdfimport/inc/contentsink.hxx:150
void pdfi::ContentSink::drawMask(const class
com::sun::star::uno::Sequence<struct com::sun::star::beans::PropertyValue>
&,_Bool,)
10
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 2949cdad454d..3d84ddb0da56 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -605,12 +605,12 @@ void OutlineToImpressFinalizer::operator() (bool)
// following UpdatePreview() call accesses the
// correct paragraphs.
pView->SetActualPage(pPage);
- pOutlineShell->UpdatePreview(pPage, true);
+ pOutlineShell->UpdatePreview(pPage);
}
// Select the first slide.
SdPage* pPage = mrDocument.GetSdPage(0, PageKind::Standard);
pView->SetActualPage(pPage);
- pOutlineShell->UpdatePreview(pPage, true);
+ pOutlineShell->UpdatePreview(pPage);
}
// Undo-Stack needs to be cleared, else the user may remove the
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx
b/sd/source/ui/inc/OutlineViewShell.hxx
index f7d05f5721b9..b2a6aaf9aef4 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -132,7 +132,7 @@ public:
/** Update the preview to show the specified page.
*/
- virtual void UpdatePreview (SdPage* pPage, bool bInit = false) override;
+ virtual void UpdatePreview (SdPage* pPage) override;
virtual css::uno::Reference<css::drawing::XDrawSubController>
CreateSubController() override;
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index d446cef7996c..fd551dc298a5 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -209,7 +209,7 @@ public:
model according to the content of the outline view. This in turn
updates the previews in the slide sorter.
*/
- virtual void UpdatePreview (SdPage* pPage, bool bInit = false);
+ virtual void UpdatePreview (SdPage* pPage);
void DrawMarkRect(const ::tools::Rectangle& rRect) const;
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 0c0ca15a4062..87bb5de8a454 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1545,7 +1545,7 @@ SdPage* OutlineViewShell::GetActualPage()
return pOlView->GetActualPage();
}
-void OutlineViewShell::UpdatePreview( SdPage* pPage, bool )
+void OutlineViewShell::UpdatePreview( SdPage* pPage )
{
const bool bNewPage = pPage != pLastPage;
pLastPage = pPage;
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 45a775aa3375..5df5c54de71e 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -327,7 +327,7 @@ void ViewShell::Activate(bool bIsMDIActivate)
GetCurrentFunction()->Activate();
if(!GetDocSh()->IsUIActive())
- UpdatePreview( GetActualPage(), true );
+ UpdatePreview( GetActualPage() );
}
ReadFrameViewData( mpFrameView );
@@ -1060,7 +1060,7 @@ bool ViewShell::PrepareClose (bool bUI)
return bResult;
}
-void ViewShell::UpdatePreview (SdPage*, bool )
+void ViewShell::UpdatePreview (SdPage*)
{
// Do nothing. After the actual preview has been removed,
// OutlineViewShell::UpdatePreview() is the place where something
commit 90d9d20227f7b44b61575701933c42c9548088e1
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Oct 17 14:51:20 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Oct 19 07:58:26 2019 +0200
loplugin:virtualdead unused params in OGLTransitionImpl
rename finish to cleanup to avoid conflict with already existing finish
method
Change-Id: I1036eea7e50b20c3c17d769c4094c640939d552d
Reviewed-on: https://gerrit.libreoffice.org/81072
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/virtualdead.unusedparams.results
b/compilerplugins/clang/virtualdead.unusedparams.results
index e512aa6ecf29..74c5dc078e4a 100644
--- a/compilerplugins/clang/virtualdead.unusedparams.results
+++ b/compilerplugins/clang/virtualdead.unusedparams.results
@@ -286,12 +286,6 @@ sdext/source/presenter/PresenterScrollBar.hxx:180
slideshow/source/engine/animationfactory.cxx:443
void slideshow::internal::(anonymous
namespace)::GenericAnimation::prefetch(const class std::shared_ptr<class
slideshow::internal::AnimatableShape> &,const class std::shared_ptr<class
slideshow::internal::ShapeAttributeLayer> &,)
00
-slideshow/source/engine/opengl/TransitionImpl.hxx:174
- void OGLTransitionImpl::prepare(double,double,double,double,double,)
- 01100
-slideshow/source/engine/opengl/TransitionImpl.hxx:180
- void OGLTransitionImpl::finish(double,double,double,double,double,)
- 00000
starmath/source/wordexportbase.hxx:37
void SmWordExportBase::HandleText(const class SmNode *,int,)
10
diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx
b/slideshow/source/engine/opengl/TransitionImpl.cxx
index 62127de1d93e..27f1ac28bb9a 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.cxx
@@ -227,11 +227,11 @@ void OGLTransitionImpl::finish()
CHECK_GL_ERROR();
}
-void OGLTransitionImpl::prepare( double, double, double, double, double )
+void OGLTransitionImpl::prepare( double, double )
{
}
-void OGLTransitionImpl::finish( double, double, double, double, double )
+void OGLTransitionImpl::cleanup()
{
}
@@ -266,7 +266,7 @@ void OGLTransitionImpl::display( double nTime, sal_Int32
glLeavingSlideTex, sal_
CHECK_GL_ERROR();
glBindVertexArray(m_nVertexArrayObject);
- prepare( nTime, SlideWidth, SlideHeight, DispWidth, DispHeight );
+ prepare( SlideWidth, SlideHeight );
CHECK_GL_ERROR();
displaySlides_( nTime, glLeavingSlideTex, glEnteringSlideTex,
SlideWidthScale, SlideHeightScale, pContext );
@@ -1878,7 +1878,7 @@ public:
private:
virtual GLuint makeShader() const override;
virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32
glEnteringSlideTex, OpenGLContext *pContext ) override;
- virtual void prepare( double nTime, double SlideWidth, double SlideHeight,
double DispWidth, double DispHeight ) override;
+ virtual void prepare( double SlideWidth, double SlideHeight ) override;
glm::vec2 maCenter;
GLint maSlideRatioLocation = -1;
@@ -1901,7 +1901,7 @@ void RippleTransition::prepareTransition( sal_Int32,
sal_Int32, OpenGLContext* )
CHECK_GL_ERROR();
}
-void RippleTransition::prepare( double /* nTime */, double SlideWidth, double
SlideHeight, double /* DispWidth */, double /* DispHeight */ )
+void RippleTransition::prepare( double SlideWidth, double SlideHeight )
{
if( maSlideRatioLocation != -1 )
glUniform1f( maSlideRatioLocation, SlideWidth / SlideHeight );
@@ -1975,7 +1975,7 @@ public:
private:
virtual GLuint makeShader() const override;
virtual void prepareTransition( sal_Int32 glLeavingSlideTex, sal_Int32
glEnteringSlideTex, OpenGLContext *pContext ) override;
- virtual void finish( double nTime, double SlideWidth, double SlideHeight,
double DispWidth, double DispHeight ) override;
+ virtual void cleanup() override;
GLuint maBuffer = 0;
};
@@ -2025,7 +2025,7 @@ void GlitterTransition::prepareTransition( sal_Int32
glLeavingSlideTex, sal_Int3
glBindBuffer(GL_ARRAY_BUFFER, 0);
}
-void GlitterTransition::finish( double, double, double, double, double )
+void GlitterTransition::cleanup()
{
CHECK_GL_ERROR();
glDeleteBuffers(1, &maBuffer);
diff --git a/slideshow/source/engine/opengl/TransitionImpl.hxx
b/slideshow/source/engine/opengl/TransitionImpl.hxx
index d2f78c6eb3d9..d0313236d8b4 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.hxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.hxx
@@ -171,13 +171,13 @@ private:
*
* Default implementation does nothing.
*/
- virtual void prepare( double nTime, double SlideWidth, double SlideHeight,
double DispWidth, double DispHeight );
+ virtual void prepare( double SlideWidth, double SlideHeight );
/** This function is called in display method to prepare the slides,
scene, etc.
*
* Default implementation does nothing.
*/
- virtual void finish( double nTime, double SlideWidth, double SlideHeight,
double DispWidth, double DispHeight );
+ virtual void cleanup();
/** This function is called after glx context is ready to let the
transition prepare GL related things, like GLSL program.
*
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
