summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authornccuong <cao.cuong.ngo@gmail.com>2013-03-04 15:25:02 +0100
committerEike Rathke <erack@redhat.com>2013-03-06 12:59:26 +0000
commita6b91730053fc61416716ae176081b91de52532b (patch)
tree192e578875f9abe82ca535e3cb794944bac9d9aa /slideshow
parent6374ae0721a5e5da9ed1a477f9642feba01199a6 (diff)
fdo#60148 Clean up warnings from the Clang compiler plugin
Change-Id: I08d755677c46c476710ecbd067ed9f7e2f54a671 loplugin: clean warnings: unused variables, incorrect indentation and log area. Reviewed-on: https://gerrit.libreoffice.org/2544 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx8
-rw-r--r--slideshow/source/engine/transitions/fanwipe.cxx2
2 files changed, 6 insertions, 4 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 2446fb3bc8ec..61e89896176c 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -609,8 +609,8 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
GLWin.dpy = reinterpret_cast<unx::Display*>(pChildSysData->pDisplay);
GLWin.win = pChildSysData->aWindow;
#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
- if( mbHasTFPVisual )
- GLWin.fbc = fbconfigs[i];
+ if( mbHasTFPVisual )
+ GLWin.fbc = fbconfigs[i];
#endif
GLWin.vi = vi;
GLWin.GLXExtensions = unx::glXQueryExtensionsString( GLWin.dpy, GLWin.screen );
@@ -884,8 +884,10 @@ void OGLTransitionerImpl::impl_prepareSlides()
// TODO
#ifdef UNX
if(GLWin.ctx)//if we have a rendering context, let's init the slides
-#endif
+ GLInitSlides();
+#else
GLInitSlides();
+#endif
SAL_WARN_IF(SlideBitmapLayout.PlaneStride != 0, "slideshow.opengl","only handle no plane stride now");
diff --git a/slideshow/source/engine/transitions/fanwipe.cxx b/slideshow/source/engine/transitions/fanwipe.cxx
index dc102ff99b89..5281412d3120 100644
--- a/slideshow/source/engine/transitions/fanwipe.cxx
+++ b/slideshow/source/engine/transitions/fanwipe.cxx
@@ -51,7 +51,7 @@ namespace internal {
}
else
{
- SAL_WARN_IF( m_fanIn, "slideshow", "FanWipe: m_fanIn is true ?" );
+ SAL_WARN_IF( m_fanIn, "slideshow.opengl", "FanWipe: m_fanIn is true ?" );
res.transform(basegfx::tools::createScaleTranslateB2DHomMatrix(0.5, 1.0, 0.5, 1.0));
}
return res;