diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-05-24 13:07:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-24 13:07:31 +0100 |
| commit | 3b26995b8e704438fc3f2cd5bb4c224d75f64b95 (patch) | |
| tree | e38b2dc779917f9f4ec99deab7148a5cabbdba91 /vcl | |
| parent | 96e6f65907e68d72d61acf6777d5f615c27ed696 (diff) | |
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
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/window.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
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 <set> #include <typeinfo> -#ifdef WNT // see #140456# -#include <win/salframe.h> -#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 <win/salframe.h> +#endif + uno::Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscreenSize, bool bFullscreen, bool bSpriteCanvas ) const |