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>

28 files changed, 13 insertions, 13 deletions

diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index cc08f47525d5..27432868c004 100644
--- a/fpicker/Library_fps.mk
+++ b/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:
diff --git a/fpicker/WinResTarget_fps.mk b/fpicker/WinResTarget_fps.mk
index ef69bde33d10..07fe66bcca35 100644
--- a/fpicker/WinResTarget_fps.mk
+++ b/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:
diff --git a/fpicker/source/win32/filepicker/FPServiceInfo.hxx b/fpicker/source/win32/FPServiceInfo.hxx
index edc350c1a9cc..edc350c1a9cc 100644
--- a/fpicker/source/win32/filepicker/FPServiceInfo.hxx
+++ b/fpicker/source/win32/FPServiceInfo.hxx
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/FPentry.cxx
index 885104529f48..2e24682d5544 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/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;
diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/FilterContainer.cxx
index 088c4744db05..088c4744db05 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.cxx
+++ b/fpicker/source/win32/FilterContainer.cxx
diff --git a/fpicker/source/win32/filepicker/FilterContainer.hxx b/fpicker/source/win32/FilterContainer.hxx
index 89c3987aca45..89c3987aca45 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.hxx
+++ b/fpicker/source/win32/FilterContainer.hxx
diff --git a/fpicker/source/win32/filepicker/Fps.rc b/fpicker/source/win32/Fps.rc
index 6cab1a5f426c..6cab1a5f426c 100644
--- a/fpicker/source/win32/filepicker/Fps.rc
+++ b/fpicker/source/win32/Fps.rc
diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/IVistaFilePickerInternalNotify.hxx
index 3501a37c94f9..3501a37c94f9 100644
--- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
+++ b/fpicker/source/win32/IVistaFilePickerInternalNotify.hxx
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/VistaFilePicker.cxx
index 17b6a566d8ce..0737100d07e6 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/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"
 
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/VistaFilePicker.hxx
index 8a138cc90f21..8a138cc90f21 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx
+++ b/fpicker/source/win32/VistaFilePicker.hxx
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/VistaFilePickerEventHandler.cxx
index 0bf9165f9e48..0bf9165f9e48 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/VistaFilePickerEventHandler.cxx
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/VistaFilePickerEventHandler.hxx
index 8e01df71a18c..8e01df71a18c 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx
+++ b/fpicker/source/win32/VistaFilePickerEventHandler.hxx
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/VistaFilePickerImpl.cxx
index 598f42a6f58f..533c8b0242b7 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/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>
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/VistaFilePickerImpl.hxx
index cb7468c9f09b..9cce75b5714f 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx
+++ b/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>
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/WinImplHelper.cxx
index 09de0484e134..09de0484e134 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/WinImplHelper.cxx
diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/WinImplHelper.hxx
index acac133d3ae6..acac133d3ae6 100644
--- a/fpicker/source/win32/misc/WinImplHelper.hxx
+++ b/fpicker/source/win32/WinImplHelper.hxx
diff --git a/fpicker/source/win32/filepicker/afxres.h b/fpicker/source/win32/afxres.h
index 6b84f154296e..6b84f154296e 100644
--- a/fpicker/source/win32/filepicker/afxres.h
+++ b/fpicker/source/win32/afxres.h
diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx b/fpicker/source/win32/asyncrequests.cxx
index 766a2309d991..766a2309d991 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.cxx
+++ b/fpicker/source/win32/asyncrequests.cxx
diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/asyncrequests.hxx
index c1a3f569fbfa..c1a3f569fbfa 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.hxx
+++ b/fpicker/source/win32/asyncrequests.hxx
diff --git a/fpicker/source/win32/filepicker/comptr.hxx b/fpicker/source/win32/comptr.hxx
index 2469d8b5e289..2469d8b5e289 100644
--- a/fpicker/source/win32/filepicker/comptr.hxx
+++ b/fpicker/source/win32/comptr.hxx
diff --git a/fpicker/source/win32/filepicker/platform_vista.h b/fpicker/source/win32/platform_vista.h
index a6e6d2121dbe..a6e6d2121dbe 100644
--- a/fpicker/source/win32/filepicker/platform_vista.h
+++ b/fpicker/source/win32/platform_vista.h
diff --git a/fpicker/source/win32/filepicker/resource.h b/fpicker/source/win32/resource.h
index 9cd716c20507..9cd716c20507 100644
--- a/fpicker/source/win32/filepicker/resource.h
+++ b/fpicker/source/win32/resource.h
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/resourceprovider.cxx
index a0d536f23032..a0d536f23032 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/resourceprovider.cxx
diff --git a/fpicker/source/win32/misc/resourceprovider.hxx b/fpicker/source/win32/resourceprovider.hxx
index a611d1aaf195..a611d1aaf195 100644
--- a/fpicker/source/win32/misc/resourceprovider.hxx
+++ b/fpicker/source/win32/resourceprovider.hxx
diff --git a/fpicker/source/win32/filepicker/shared.hxx b/fpicker/source/win32/shared.hxx
index be8813f32c68..be8813f32c68 100644
--- a/fpicker/source/win32/filepicker/shared.hxx
+++ b/fpicker/source/win32/shared.hxx
diff --git a/fpicker/source/win32/filepicker/vistatypes.h b/fpicker/source/win32/vistatypes.h
index 4271b0cea482..4271b0cea482 100644
--- a/fpicker/source/win32/filepicker/vistatypes.h
+++ b/fpicker/source/win32/vistatypes.h
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/workbench/Test_fps.cxx
index 63b290a698eb..63b290a698eb 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/workbench/Test_fps.cxx
diff --git a/fpicker/source/win32/filepicker/workbench/makefile.mk b/fpicker/source/win32/workbench/makefile.mk
index 5398300c1583..5398300c1583 100644
--- a/fpicker/source/win32/filepicker/workbench/makefile.mk
+++ b/fpicker/source/win32/workbench/makefile.mk