vcl/inc/win/salframe.h | 1 +
vcl/source/window/window.cxx | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit aa453de65b8b44f9c1e6012caaeef11df9ff65fc
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat May 24 14:43:18 2014 +0100
try harder to fix windows build
This reverts commit 3b26995b8e704438fc3f2cd5bb4c224d75f64b95.
Change-Id: I756e1730f8d9e87484710699177349166b87baaf
diff --git a/vcl/inc/win/salframe.h b/vcl/inc/win/salframe.h
index e2305b7..6a13b80 100644
--- a/vcl/inc/win/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -22,6 +22,7 @@
#include <vcl/sysdata.hxx>
#include <salframe.hxx>
+#include <svsys.h>
class WinSalGraphics;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 0950e5c..01b3308 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -68,6 +68,11 @@
#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;
@@ -3714,10 +3719,6 @@ 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
