fpicker/Library_fps.mk | 16 +++---- fpicker/WinResTarget_fps.mk | 2 fpicker/source/win32/FPentry.cxx | 2 fpicker/source/win32/VistaFilePicker.cxx | 2 fpicker/source/win32/VistaFilePickerImpl.cxx | 2 fpicker/source/win32/VistaFilePickerImpl.hxx | 2 solenv/clang-format/blacklist | 57 +++++++++++---------------- 7 files changed, 37 insertions(+), 46 deletions(-)
New commits: commit 591db0f97b6084723c138a01d5f336b1f1a3a639 Author: Jan-Marek Glogowski <glo...@fbihome.de> AuthorDate: Fri Sep 7 13:09:35 2018 +0200 Commit: Jan-Marek Glogowski <glo...@fbihome.de> CommitDate: Tue Sep 11 18:05:35 2018 +0200 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 <glo...@fbihome.de> 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 similarity index 100% rename from fpicker/source/win32/filepicker/FPServiceInfo.hxx rename to fpicker/source/win32/FPServiceInfo.hxx diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/FPentry.cxx similarity index 98% rename from fpicker/source/win32/filepicker/FPentry.cxx rename to 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 similarity index 100% rename from fpicker/source/win32/filepicker/FilterContainer.cxx rename to fpicker/source/win32/FilterContainer.cxx diff --git a/fpicker/source/win32/filepicker/FilterContainer.hxx b/fpicker/source/win32/FilterContainer.hxx similarity index 100% rename from fpicker/source/win32/filepicker/FilterContainer.hxx rename to fpicker/source/win32/FilterContainer.hxx diff --git a/fpicker/source/win32/filepicker/Fps.rc b/fpicker/source/win32/Fps.rc similarity index 100% rename from fpicker/source/win32/filepicker/Fps.rc rename to fpicker/source/win32/Fps.rc diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/IVistaFilePickerInternalNotify.hxx similarity index 100% rename from fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx rename to fpicker/source/win32/IVistaFilePickerInternalNotify.hxx diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/VistaFilePicker.cxx similarity index 99% rename from fpicker/source/win32/filepicker/VistaFilePicker.cxx rename to 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 similarity index 100% rename from fpicker/source/win32/filepicker/VistaFilePicker.hxx rename to fpicker/source/win32/VistaFilePicker.hxx diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/VistaFilePickerEventHandler.cxx similarity index 100% rename from fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx rename to fpicker/source/win32/VistaFilePickerEventHandler.cxx diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/VistaFilePickerEventHandler.hxx similarity index 100% rename from fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx rename to fpicker/source/win32/VistaFilePickerEventHandler.hxx diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/VistaFilePickerImpl.cxx similarity index 99% rename from fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx rename to 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 similarity index 99% rename from fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx rename to 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 similarity index 100% rename from fpicker/source/win32/misc/WinImplHelper.cxx rename to fpicker/source/win32/WinImplHelper.cxx diff --git a/fpicker/source/win32/misc/WinImplHelper.hxx b/fpicker/source/win32/WinImplHelper.hxx similarity index 100% rename from fpicker/source/win32/misc/WinImplHelper.hxx rename to fpicker/source/win32/WinImplHelper.hxx diff --git a/fpicker/source/win32/filepicker/afxres.h b/fpicker/source/win32/afxres.h similarity index 100% rename from fpicker/source/win32/filepicker/afxres.h rename to fpicker/source/win32/afxres.h diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx b/fpicker/source/win32/asyncrequests.cxx similarity index 100% rename from fpicker/source/win32/filepicker/asyncrequests.cxx rename to fpicker/source/win32/asyncrequests.cxx diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/asyncrequests.hxx similarity index 100% rename from fpicker/source/win32/filepicker/asyncrequests.hxx rename to fpicker/source/win32/asyncrequests.hxx diff --git a/fpicker/source/win32/filepicker/comptr.hxx b/fpicker/source/win32/comptr.hxx similarity index 100% rename from fpicker/source/win32/filepicker/comptr.hxx rename to fpicker/source/win32/comptr.hxx diff --git a/fpicker/source/win32/filepicker/platform_vista.h b/fpicker/source/win32/platform_vista.h similarity index 100% rename from fpicker/source/win32/filepicker/platform_vista.h rename to fpicker/source/win32/platform_vista.h diff --git a/fpicker/source/win32/filepicker/resource.h b/fpicker/source/win32/resource.h similarity index 100% rename from fpicker/source/win32/filepicker/resource.h rename to fpicker/source/win32/resource.h diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/resourceprovider.cxx similarity index 100% rename from fpicker/source/win32/misc/resourceprovider.cxx rename to fpicker/source/win32/resourceprovider.cxx diff --git a/fpicker/source/win32/misc/resourceprovider.hxx b/fpicker/source/win32/resourceprovider.hxx similarity index 100% rename from fpicker/source/win32/misc/resourceprovider.hxx rename to fpicker/source/win32/resourceprovider.hxx diff --git a/fpicker/source/win32/filepicker/shared.hxx b/fpicker/source/win32/shared.hxx similarity index 100% rename from fpicker/source/win32/filepicker/shared.hxx rename to fpicker/source/win32/shared.hxx diff --git a/fpicker/source/win32/filepicker/vistatypes.h b/fpicker/source/win32/vistatypes.h similarity index 100% rename from fpicker/source/win32/filepicker/vistatypes.h rename to fpicker/source/win32/vistatypes.h diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/workbench/Test_fps.cxx similarity index 100% rename from fpicker/source/win32/filepicker/workbench/Test_fps.cxx rename to fpicker/source/win32/workbench/Test_fps.cxx diff --git a/fpicker/source/win32/filepicker/workbench/makefile.mk b/fpicker/source/win32/workbench/makefile.mk similarity index 100% rename from fpicker/source/win32/filepicker/workbench/makefile.mk rename to fpicker/source/win32/workbench/makefile.mk diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 810ca66431fc..60b94466e9c8 100644 --- a/solenv/clang-format/blacklist +++ b/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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits