Fix Windows build of fpicker

fpicker/source/generic/fpicker.cxx

@@ -34,15 +34,18 @@
 #include "cppuhelper/implementationentry.hxx"
 #include "com/sun/star/lang/XMultiComponentFactory.hpp"
 
-#ifdef WNT
-#include <odma_lib.hxx>
-#endif
-
 #include "svtools/miscopt.hxx"
 #include "svl/pickerhistoryaccess.hxx"
 
 #include "vcl/svapp.hxx"
 
+#ifdef WNT
+#define GradientStyle_RECT BLA_GradientStyle_RECT
+#include <windows.h>
+#undef GradientStyle_RECT
+#include <odma_lib.hxx>
+#endif
+
 namespace css = com::sun::star;
 
 using css::uno::Reference;

fpicker/source/odma/ODMAFilePicker.cxx

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+3/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,6 +49,7 @@
 #include <unotools/ucbhelper.hxx>
 
 #ifndef ODMA_LIB_HXX
+#include <windows.h>
 #include <odma_lib.hxx>
 #endif
 

fpicker/source/odma/ODMAFolderPicker.cxx

@@ -43,6 +43,7 @@
 #include <unotools/pathoptions.hxx>
 
 #ifndef ODMA_LIB_HXX
+#include <windows.h>
 #include <odma_lib.hxx>
 #endif