fpicker: fixed build problems for macos and windows

Change-Id: I34a7d62f8ee55cbc7f8506c1bdc4b12fe6e5d7bf

fpicker/inc/fpicker/fpicker.hrc

@@ -45,7 +45,8 @@
 #define STR_SVT_FILEPICKER_FILTER_TITLE             (STR_SVT_FILEPICKER_START+11)
 #define STR_SVT_FOLDERPICKER_DEFAULT_TITLE          (STR_SVT_FILEPICKER_START+12)
 #define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION    (STR_SVT_FILEPICKER_START+13)
-#define STR_SVT_FILEPICKER_END                      (STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION)
+#define STR_SVT_ALREADYEXISTOVERWRITE               (STR_SVT_FILEPICKER_START+14)
+#define STR_SVT_FILEPICKER_END                      (STR_SVT_ALREADYEXISTOVERWRITE)
 
 
 #endif

fpicker/source/aqua/resourceprovider.mm

@@ -38,7 +38,7 @@
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
-#include "fpicker.hrc"
+#include <fpicker/fpicker.hrc>
 #include <svtools/filedlg2.hrc>
 #include "NSString_OOoAdditions.hxx"
 

fpicker/source/office/OfficeFilePicker.hrc

@@ -36,7 +36,6 @@
 
 #define RID_FILEPICKER_IMAGES                       (RID_FPICKER_START+17)
 #define STR_SVT_NEW_FOLDER                          (RID_FPICKER_START+19)
-#define STR_SVT_ALREADYEXISTOVERWRITE               (RID_FPICKER_START+20)
 #define RID_FILEOPEN_INVALIDFOLDER                  (RID_FPICKER_START+23)
 #define RID_FILEOPEN_NOTEXISTENTFILE                (RID_FPICKER_START+24)
 #define STR_SVT_NOREMOVABLEDEVICE                   (RID_FPICKER_START+25)

fpicker/source/win32/misc/resourceprovider.cxx

@@ -40,7 +40,7 @@
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
-#include "fpicker.hrc"
+#include <fpicker/fpicker.hrc>
 
 //------------------------------------------------------------
 // namespace directives