diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-05-04 15:31:17 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-05-04 15:31:27 +0200 |
| commit | 48d0e203edffd8521b692af340619cbcb0db9aca (patch) | |
| tree | 2270bfb1bb2df01a4189bef92cfdb83feb9f9d06 /fpicker | |
| parent | 57e21cb5e7b20a0c886475eb49e5d17f8dae527d (diff) | |
fpicker: fixed build problems for macos and windows
Change-Id: I34a7d62f8ee55cbc7f8506c1bdc4b12fe6e5d7bf
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/inc/fpicker/fpicker.hrc | 3 | ||||
| -rw-r--r-- | fpicker/source/aqua/resourceprovider.mm | 2 | ||||
| -rw-r--r-- | fpicker/source/office/OfficeFilePicker.hrc | 1 | ||||
| -rw-r--r-- | fpicker/source/win32/misc/resourceprovider.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/fpicker/inc/fpicker/fpicker.hrc b/fpicker/inc/fpicker/fpicker.hrc index 32d7eb9961e1..521610fac3e5 100644 --- a/fpicker/inc/fpicker/fpicker.hrc +++ b/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 diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm index 92efaac1dfc5..2bf6bf96760e 100644 --- a/fpicker/source/aqua/resourceprovider.mm +++ b/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" diff --git a/fpicker/source/office/OfficeFilePicker.hrc b/fpicker/source/office/OfficeFilePicker.hrc index adbd32898b16..acb14a98503b 100644 --- a/fpicker/source/office/OfficeFilePicker.hrc +++ b/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) diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx index 6fb8e17d986b..b1e781e29165 100644 --- a/fpicker/source/win32/misc/resourceprovider.cxx +++ b/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 |