desktop/inc/app.hxx | 4 ++++ desktop/source/app/sofficemain.cxx | 4 ---- desktop/unx/source/glxtest.cxx | 1 + vcl/inc/opengl/x11/X11DeviceInfo.hxx | 2 +- vcl/opengl/x11/X11DeviceInfo.cxx | 4 +--- 5 files changed, 7 insertions(+), 8 deletions(-)
New commits: commit 06097771671e439c7aca2bd6bcf010444f111141 Author: Tor Lillqvist <t...@collabora.com> Date: Thu Nov 20 15:23:18 2014 +0200 WaE: work around loplugin:unreffun and loplugin:externandnotdefined Change-Id: I5192ad1f068746da257f3e1d9340325956b1e69d diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 33e7c0c..876b643 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -192,6 +192,10 @@ OUString ReplaceStringHookProc(const OUString& rStr); } +#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID +bool fire_glxtest_process(); +#endif + #endif // INCLUDED_DESKTOP_INC_APP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 606ba4f..9cee2c4 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -53,10 +53,6 @@ #include <touch/touch.h> #endif -#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID -bool fire_glxtest_process(); -#endif - extern "C" int DESKTOP_DLLPUBLIC soffice_main() { #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID diff --git a/desktop/unx/source/glxtest.cxx b/desktop/unx/source/glxtest.cxx index d8d9c20..df9603a 100644 --- a/desktop/unx/source/glxtest.cxx +++ b/desktop/unx/source/glxtest.cxx @@ -5,6 +5,7 @@ * 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 "app.hxx" ////////////////////////////////////////////////////////////////////////////// // commit 24b49879338cd01fece071576504821e5e36cbb4 Author: Tor Lillqvist <t...@collabora.com> Date: Thu Nov 20 15:13:42 2014 +0200 WaE: unused variable 'aOSRelease' Actually we don't need the aOS variable either, we can check maOS directly. Change-Id: Ib14d6baf0bda28a45361886059629460641571bc diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx index 972f123..6899f53 100644 --- a/vcl/opengl/x11/X11DeviceInfo.cxx +++ b/vcl/opengl/x11/X11DeviceInfo.cxx @@ -305,9 +305,7 @@ bool X11OpenGLDeviceInfo::isDeviceBlocked() } // Bug 724640: FGLRX + Linux 2.6.32 is a crashy combo bool unknownOS = maOS.isEmpty() || maOSRelease.isEmpty(); - OUString aOS = rtl::OStringToOUString(maOS, RTL_TEXTENCODING_UTF8); - OUString aOSRelease = rtl::OStringToOUString(maOSRelease, RTL_TEXTENCODING_UTF8); - bool badOS = aOS.indexOf("Linux") != -1 && + bool badOS = maOS.indexOf("Linux") != -1 && maOSRelease.indexOf("2.6.32") != -1; if (unknownOS || badOS) { SAL_WARN("vcl.opengl", "blocked OS version with fglrx"); commit 0145e05a2e866dbad0372bf21c30d8264677a7b9 Author: Tor Lillqvist <t...@collabora.com> Date: Thu Nov 20 15:11:19 2014 +0200 WaE: overriding virtual function declaration not marked 'override' Change-Id: Ieb8da224e02a9c8e19eabb4c5bcbd81120900245 diff --git a/vcl/inc/opengl/x11/X11DeviceInfo.hxx b/vcl/inc/opengl/x11/X11DeviceInfo.hxx index 5e41b6b..dfb7204 100644 --- a/vcl/inc/opengl/x11/X11DeviceInfo.hxx +++ b/vcl/inc/opengl/x11/X11DeviceInfo.hxx @@ -43,7 +43,7 @@ public: X11OpenGLDeviceInfo(); virtual ~X11OpenGLDeviceInfo(); - virtual bool isDeviceBlocked(); + virtual bool isDeviceBlocked() SAL_OVERRIDE; }; #endif _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits