diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-05-29 14:41:49 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-05-29 14:42:29 +0200 |
| commit | cd0ff1b3c2f388d37c3c9239148a3b302ae19ce4 (patch) | |
| tree | cb8a66242f7af0cf4402c2b7da625f57866e54e3 | |
| parent | 49a0d8eedf6758c8bceaf7824945167d669b71ff (diff) | |
OGLWindow: remove unused zoom level
Zooming is solved on a more sophisticated way.
Change-Id: I0386ace8a3751d708ac86ff0ddf0836c79ae603f
| -rw-r--r-- | avmedia/source/opengl/oglwindow.cxx | 19 | ||||
| -rw-r--r-- | avmedia/source/opengl/oglwindow.hxx | 1 |
2 files changed, 3 insertions, 17 deletions
diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx index 545895de0c0b..dd43095cb017 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 db2d867af81a..9ea073745990 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; }; |