[Libreoffice-commits] .: fpicker/source

[Fridrich Strba]

 fpicker/source/generic/fpicker.cxx       |   11 +++++++----
 fpicker/source/odma/ODMAFilePicker.cxx   |    3 ++-
 fpicker/source/odma/ODMAFolderPicker.cxx |    1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 02af20b778c0bb489690078e9854d41746a78ed4
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Mar 28 11:28:48 2011 +0200

    Fix Windows build of fpicker

diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx
index 69bb2ff..2044885 100644
--- a/fpicker/source/generic/fpicker.cxx
+++ b/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;
diff --git a/fpicker/source/odma/ODMAFilePicker.cxx b/fpicker/source/odma/ODMAFilePicker.cxx
index cd87c80..ee5cad4 100644
--- a/fpicker/source/odma/ODMAFilePicker.cxx
+++ b/fpicker/source/odma/ODMAFilePicker.cxx
@@ -1,4 +1,4 @@
-/* -*- 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
 
diff --git a/fpicker/source/odma/ODMAFolderPicker.cxx b/fpicker/source/odma/ODMAFolderPicker.cxx
index 49963c3..a8d1f15 100644
--- a/fpicker/source/odma/ODMAFolderPicker.cxx
+++ b/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