#91296# UWINAPI and UNICOWS used

7 files changed, 26 insertions, 25 deletions

diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index 15a1c66cb41d..8de62e94e480 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: WinFileOpenImpl.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: tra $ $Date: 2002-03-28 08:57:33 $
+ *  last change: $Author: hro $ $Date: 2002-08-15 08:41:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,9 +115,6 @@
 #include <rtl/ustrbuf.hxx>
 #endif
 
-#include <systools/win32/comdlg9x.h>
-#include <systools/win32/user9x.h>
-
 #ifndef _RESOURCEPROVIDER_HXX_
 #include "..\misc\resourceprovider.hxx"
 #endif
diff --git a/fpicker/source/win32/filepicker/controlaccess.cxx b/fpicker/source/win32/filepicker/controlaccess.cxx
index db62e3adc62e..914f17ee084a 100644
--- a/fpicker/source/win32/filepicker/controlaccess.cxx
+++ b/fpicker/source/win32/filepicker/controlaccess.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: controlaccess.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: tra $ $Date: 2002-03-21 07:40:13 $
+ *  last change: $Author: hro $ $Date: 2002-08-15 08:41:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,8 +75,6 @@
 #include "..\misc\WinImplHelper.hxx"
 #endif
 
-#include <systools/win32/user9x.h>
-
 //------------------------------------------------------------
 // we are using a table based algorithm to dispatch control
 // actions there is one table containing one action table for
diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx
index b91915c32a71..78c1fa5895b6 100644
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dibpreview.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: tra $ $Date: 2002-03-21 07:37:13 $
+ *  last change: $Author: hro $ $Date: 2002-08-15 08:41:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,8 +82,6 @@
 #include <stdexcept>
 #include <string>
 
-#include <systools/win32/user9x.h>
-
 //------------------------------------------------------------------------
 //
 //------------------------------------------------------------------------
diff --git a/fpicker/source/win32/filepicker/filepickerstate.hxx b/fpicker/source/win32/filepicker/filepickerstate.hxx
index b5b2692f5182..620e56fa66e7 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.hxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: filepickerstate.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: tra $ $Date: 2001-08-10 12:09:20 $
+ *  last change: $Author: hro $ $Date: 2002-08-15 08:41:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,8 +86,8 @@
 #include <rtl/ustring.hxx>
 #endif
 
-#include <systools/win32/user9x.h>
-
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 //---------------------------------------------
 //
 //---------------------------------------------
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
index c990a62057d6..f0f209b2d41d 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: getfilenamewrapper.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: tra $ $Date: 2002-03-28 08:57:33 $
+ *  last change: $Author: hro $ $Date: 2002-08-15 08:44:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,6 +71,7 @@
 #include "getfilenamewrapper.hxx"
 #endif
 
+#include <objbase.h>
 #include <process.h>
 
 
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.hxx b/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
index 2606ad020012..ab7d97c13319 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: getfilenamewrapper.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: tra $ $Date: 2002-03-28 08:57:33 $
+ *  last change: $Author: hro $ $Date: 2002-08-15 08:44:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,7 +66,13 @@
 // includes
 //------------------------------------------------------------------------
 
-#include <systools/win32/comdlg9x.h>
+#ifndef _SAL_TYPES_H_
+#include <sal/types.h>
+#endif
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <commdlg.h>
 
 /*
     A simple wrapper around the GetOpenFileName/GetSaveFileName API.
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.hxx b/fpicker/source/win32/filepicker/helppopupwindow.hxx
index 1e543d4e36c3..e7f11bec637a 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.hxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: helppopupwindow.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: tra $ $Date: 2001-09-05 13:32:17 $
+ *  last change: $Author: hro $ $Date: 2002-08-15 08:42:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,7 +78,8 @@
 #include <osl/mutex.hxx>
 #endif
 
-#include <systools/win32/user9x.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 //---------------------------------------------
 // declaration