vcl/Library_vcl.mk | 1 + vcl/inc/opengl/win/gdiimpl.hxx | 34 ++++++++++++++++++++++++++++++++++ vcl/opengl/win/gdiimpl.cxx | 28 ++++++++++++++++++++++++++++ vcl/win/source/gdi/salgdi.cxx | 4 ++-- 4 files changed, 65 insertions(+), 2 deletions(-)
New commits: commit e413f745080328f38a0746f137b89692a39105fc Author: Markus Mohrhard <[email protected]> Date: Mon Nov 10 00:42:48 2014 +0100 fix windows build Change-Id: I4f8d4f9393b931f7593486f8e1fadee7ad35902a diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index efe0986..81f774a 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -644,6 +644,7 @@ endif ifeq ($(OS),WNT) $(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/opengl/win/gdiimpl \ vcl/win/source/app/saldata \ vcl/win/source/app/salinfo \ vcl/win/source/app/salinst \ diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx new file mode 100644 index 0000000..0af7089 --- /dev/null +++ b/vcl/inc/opengl/win/gdiimpl.hxx @@ -0,0 +1,34 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_VCL_INC_OPENGL_WIN_GDIIMPL_HXX +#define INCLUDED_VCL_INC_OPENGL_WIN_GDIIMPL_HXX + +#include <vcl/dllapi.h> + +#include "openglgdiimpl.hxx" + +class WinOpenGLSalGraphicsImpl : public OpenGLSalGraphicsImpl +{ +private: + +public: + WinOpenGLSalGraphicsImpl(); + +protected: + virtual GLfloat GetWidth() const SAL_OVERRIDE; + virtual GLfloat GetHeight() const SAL_OVERRIDE; + +public: + +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx new file mode 100644 index 0000000..17868c8 --- /dev/null +++ b/vcl/opengl/win/gdiimpl.cxx @@ -0,0 +1,28 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "opengl/win/gdiimpl.hxx" + +WinOpenGLSalGraphicsImpl::WinOpenGLSalGraphicsImpl() +{ +} + +GLfloat WinOpenGLSalGraphicsImpl::GetWidth() const +{ + + return 1; +} + +GLfloat WinOpenGLSalGraphicsImpl::GetHeight() const +{ + + return 1; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index f185955..28394b5 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -34,7 +34,7 @@ #include "salgdiimpl.hxx" #include "gdiimpl.hxx" -#include "openglgdiimpl.hxx" +#include "opengl/win/gdiimpl.hxx" #include <vcl/opengl/OpenGLHelper.hxx> @@ -592,7 +592,7 @@ WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, bool bScreen, HWND hW static bool bOpenGLPossible = OpenGLHelper::supportsVCLOpenGL(); bool bUseOpenGL = bOpenGLPossible && !mbPrinter ? officecfg::Office::Common::VCL::UseOpenGL::get() : false; if (bUseOpenGL) - mpImpl.reset(new OpenGLSalGraphicsImpl()); + mpImpl.reset(new WinOpenGLSalGraphicsImpl()); else mpImpl.reset(new WinSalGraphicsImpl(*this)); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
