diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-03-28 11:28:48 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-03-28 11:29:02 +0200 |
| commit | f11b69270a41c7b6fe2a1fbd5c0a2110b39e22cf (patch) | |
| tree | 26770afa429b9f15743495a63bb363a7c3eaced4 /fpicker/source | |
| parent | fe551ada2d874b067cf57e80811d9b91e61b5457 (diff) | |
Fix Windows build of fpicker
Diffstat (limited to 'fpicker/source')
| -rw-r--r-- | fpicker/source/generic/fpicker.cxx | 11 | ||||
| -rw-r--r-- | fpicker/source/odma/ODMAFilePicker.cxx | 3 | ||||
| -rw-r--r-- | fpicker/source/odma/ODMAFolderPicker.cxx | 1 |
3 files changed, 10 insertions, 5 deletions
diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index 11130f43400d..f25fbdb062e1 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 cd87c809ecc8..ee5cad46e6ba 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 49963c37b26c..a8d1f15138e3 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 |