[Libreoffice-commits] core.git: avmedia/source

[Zolnai Tamás]

 avmedia/source/opengl/oglwindow.cxx |   19 +++----------------
 avmedia/source/opengl/oglwindow.hxx |    1 -
 2 files changed, 3 insertions(+), 17 deletions(-)

New commits:
commit cd0ff1b3c2f388d37c3c9239148a3b302ae19ce4
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Thu May 29 14:41:49 2014 +0200

    OGLWindow: remove unused zoom level
    
    Zooming is solved on a more sophisticated way.
    
    Change-Id: I0386ace8a3751d708ac86ff0ddf0836c79ae603f

diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx
index 545895d..dd43095 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -19,7 +19,6 @@ OGLWindow::OGLWindow( glTFHandle& rHandle, OpenGLContext& rContext, Window& rEve
     , m_rContext( rContext )
     , m_rEventHandler( rEventHandlerParent )
     , m_bVisible ( false )
-    , meZoomLevel( media::ZoomLevel_ORIGINAL )
     , m_aLastMousePos(Point())
 {
 }
@@ -38,26 +37,14 @@ void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException, std::except
     m_rContext.swapBuffers();
 }
 
-sal_Bool SAL_CALL OGLWindow::setZoomLevel( css::media::ZoomLevel eZoomLevel ) throw (css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL OGLWindow::setZoomLevel( css::media::ZoomLevel /*eZoomLevel*/ ) throw (css::uno::RuntimeException, std::exception)
 {
-    bool bRet = false;
-
-    if( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel &&
-        media::ZoomLevel_NOT_AVAILABLE != eZoomLevel )
-    {
-        if( eZoomLevel != meZoomLevel )
-        {
-            meZoomLevel = eZoomLevel;
-        }
-        bRet = true;
-    }
-    // TODO: set zoom level, not just store this value
-    return bRet;
+    return false;
 }
 
 css::media::ZoomLevel SAL_CALL OGLWindow::getZoomLevel() throw (css::uno::RuntimeException, std::exception)
 {
-    return meZoomLevel;
+    return media::ZoomLevel_ORIGINAL;
 }
 
 void SAL_CALL OGLWindow::setPointerType( sal_Int32 ) throw (css::uno::RuntimeException, std::exception)
diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx
index db2d867..9ea0737 100644
--- a/avmedia/source/opengl/oglwindow.hxx
+++ b/avmedia/source/opengl/oglwindow.hxx
@@ -69,7 +69,6 @@ private:
     OpenGLContext& m_rContext;
     Window& m_rEventHandler;
     bool m_bVisible;
-    com::sun::star::media::ZoomLevel meZoomLevel;
     Point m_aLastMousePos;
 };