WIN drop unused fpicker subdirs

While the folder picker had some shared code with the file picker,
the folder hierarchy made some sense, but since it's gone now,
move the files to the base directory.

Change-Id: Ib78ada9cdb570df64ccbc28da835cfcaf25009db
Reviewed-on: https://gerrit.libreoffice.org/60145
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>

fpicker/Library_fps.mk

@@ -61,14 +61,14 @@ $(eval $(call gb_Library_add_libs,fps,\
 endif
 
 $(eval $(call gb_Library_add_exception_objects,fps,\
-	fpicker/source/win32/filepicker/asyncrequests \
-	fpicker/source/win32/filepicker/FilterContainer \
-	fpicker/source/win32/filepicker/FPentry \
-	fpicker/source/win32/filepicker/VistaFilePicker \
-	fpicker/source/win32/filepicker/VistaFilePickerEventHandler \
-	fpicker/source/win32/filepicker/VistaFilePickerImpl \
-	fpicker/source/win32/misc/resourceprovider \
-	fpicker/source/win32/misc/WinImplHelper \
+	fpicker/source/win32/asyncrequests \
+	fpicker/source/win32/FilterContainer \
+	fpicker/source/win32/FPentry \
+	fpicker/source/win32/VistaFilePicker \
+	fpicker/source/win32/VistaFilePickerEventHandler \
+	fpicker/source/win32/VistaFilePickerImpl \
+	fpicker/source/win32/resourceprovider \
+	fpicker/source/win32/WinImplHelper \
 ))
 
 # vim: set noet sw=4 ts=4:

fpicker/WinResTarget_fps.mk

@@ -9,6 +9,6 @@
 
 $(eval $(call gb_WinResTarget_WinResTarget,fps/Fps))
 
-$(eval $(call gb_WinResTarget_set_rcfile,fps/Fps,fpicker/source/win32/filepicker/Fps))
+$(eval $(call gb_WinResTarget_set_rcfile,fps/Fps,fpicker/source/win32/Fps))
 
 # vim: set ts=4 sw=4 et:

fpicker/source/win32/filepicker/FPentry.cxx → fpicker/source/win32/FPentry.cxx

@@ -23,7 +23,7 @@
 #include "FPServiceInfo.hxx"
 
 #include "VistaFilePicker.hxx"
-#include "../misc/WinImplHelper.hxx"
+#include "WinImplHelper.hxx"
 #include <stdio.h>
 
 using namespace ::com::sun::star;

fpicker/source/win32/filepicker/VistaFilePicker.cxx → fpicker/source/win32/VistaFilePicker.cxx

@@ -19,7 +19,7 @@
 
 #include "VistaFilePicker.hxx"
 
-#include "../misc/WinImplHelper.hxx"
+#include "WinImplHelper.hxx"
 #include "FPServiceInfo.hxx"
 #include "shared.hxx"
 

fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx → fpicker/source/win32/VistaFilePickerImpl.cxx

@@ -33,7 +33,7 @@
 #include <osl/mutex.hxx>
 #include <rtl/process.h>
 #include <o3tl/char16_t2wchar_t.hxx>
-#include "../misc/WinImplHelper.hxx"
+#include "WinImplHelper.hxx"
 
 #include <shlguid.h>
 #include <shlobj.h>

fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx → fpicker/source/win32/VistaFilePickerImpl.hxx

@@ -30,7 +30,7 @@
 #include "FilterContainer.hxx"
 #include "VistaFilePickerEventHandler.hxx"
 #include "IVistaFilePickerInternalNotify.hxx"
-#include "../misc/resourceprovider.hxx"
+#include "resourceprovider.hxx"
 
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/basemutex.hxx>

solenv/clang-format/blacklist

@@ -5101,39 +5101,30 @@ fpicker/source/office/iodlg.hxx
 fpicker/source/office/iodlgimp.cxx
 fpicker/source/office/iodlgimp.hxx
 fpicker/source/office/pickercallbacks.hxx
-fpicker/source/win32/filepicker/FPServiceInfo.hxx
-fpicker/source/win32/filepicker/FPentry.cxx
-fpicker/source/win32/filepicker/FilterContainer.cxx
-fpicker/source/win32/filepicker/FilterContainer.hxx
-fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
-fpicker/source/win32/filepicker/VistaFilePicker.cxx
-fpicker/source/win32/filepicker/VistaFilePicker.hxx
-fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
-fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
-fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
-fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
-fpicker/source/win32/filepicker/afxres.h
-fpicker/source/win32/filepicker/asyncrequests.cxx
-fpicker/source/win32/filepicker/asyncrequests.hxx
-fpicker/source/win32/filepicker/comptr.hxx
-fpicker/source/win32/filepicker/platform_vista.h
-fpicker/source/win32/filepicker/resource.h
-fpicker/source/win32/filepicker/shared.hxx
-fpicker/source/win32/filepicker/vistatypes.h
-fpicker/source/win32/filepicker/workbench/Test_fps.cxx
-fpicker/source/win32/folderpicker/FOPServiceInfo.hxx
-fpicker/source/win32/folderpicker/FolderPicker.cxx
-fpicker/source/win32/folderpicker/FolderPicker.hxx
-fpicker/source/win32/folderpicker/FopEvtDisp.hxx
-fpicker/source/win32/folderpicker/MtaFop.cxx
-fpicker/source/win32/folderpicker/MtaFop.hxx
-fpicker/source/win32/folderpicker/WinFOPImpl.cxx
-fpicker/source/win32/folderpicker/WinFOPImpl.hxx
-fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
-fpicker/source/win32/misc/WinImplHelper.cxx
-fpicker/source/win32/misc/WinImplHelper.hxx
-fpicker/source/win32/misc/resourceprovider.cxx
-fpicker/source/win32/misc/resourceprovider.hxx
+fpicker/source/win32/FPServiceInfo.hxx
+fpicker/source/win32/FPentry.cxx
+fpicker/source/win32/FilterContainer.cxx
+fpicker/source/win32/FilterContainer.hxx
+fpicker/source/win32/IVistaFilePickerInternalNotify.hxx
+fpicker/source/win32/VistaFilePicker.cxx
+fpicker/source/win32/VistaFilePicker.hxx
+fpicker/source/win32/VistaFilePickerEventHandler.cxx
+fpicker/source/win32/VistaFilePickerEventHandler.hxx
+fpicker/source/win32/VistaFilePickerImpl.cxx
+fpicker/source/win32/VistaFilePickerImpl.hxx
+fpicker/source/win32/afxres.h
+fpicker/source/win32/asyncrequests.cxx
+fpicker/source/win32/asyncrequests.hxx
+fpicker/source/win32/comptr.hxx
+fpicker/source/win32/platform_vista.h
+fpicker/source/win32/resource.h
+fpicker/source/win32/shared.hxx
+fpicker/source/win32/vistatypes.h
+fpicker/source/win32/workbench/Test_fps.cxx
+fpicker/source/win32/WinImplHelper.cxx
+fpicker/source/win32/WinImplHelper.hxx
+fpicker/source/win32/resourceprovider.cxx
+fpicker/source/win32/resourceprovider.hxx
 fpicker/test/svdem.cxx
 framework/inc/acceleratorconst.h
 framework/inc/classes/actiontriggercontainer.hxx