From 3b26995b8e704438fc3f2cd5bb4c224d75f64b95 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 24 May 2014 13:07:31 +0100 Subject: Revert "vcl: move included header from end of window.cxx to the start" This reverts commit 4968f83c770edac72cba6ecd81cb096c62e6456a. seeing as its seems to stop windows building --- vcl/source/window/window.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'vcl') diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 01b330812df5..0950e5c86f60 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -68,11 +68,6 @@ #include #include -#ifdef WNT // see #140456# -#include -#endif - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::datatransfer::clipboard; @@ -3719,6 +3714,10 @@ bool Window::IsNativeWidgetEnabled() const return ImplGetWinData()->mbEnableNativeWidget; } +#ifdef WNT // see #140456# +#include +#endif + uno::Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscreenSize, bool bFullscreen, bool bSpriteCanvas ) const -- cgit