From e3bc14eccefe3841f11de1672e2d6b6e0e94ee0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 18 Jan 2017 12:41:26 +0000 Subject: [PATCH] there's no need for this nutso redefine both BMP_PLUGIN resources point to the same plugin.png ultimately Change-Id: Ifa1cc00698f749ba84f17a79074c73e080e1d356 --- bin/update_pch | 1 - include/svtools/sores.hxx | 5 ----- svtools/source/dialogs/so3res.src | 4 ---- 3 files changed, 10 deletions(-) diff --git a/bin/update_pch b/bin/update_pch index 9cdff2b4a08b..aba7b2421ba1 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -377,7 +377,6 @@ def filter_ignore(line, module): ignore_list += [ 'sdgslots.hxx', # special directives 'sdslots.hxx', # special directives - 'svtools/sores.hxx', # redefines BMP_PLUGIN defined in svtools.hrc ] if module == 'sfx2': ignore_list += [ diff --git a/include/svtools/sores.hxx b/include/svtools/sores.hxx index 1a1260aa96d1..581197c4a6ce 100644 --- a/include/svtools/sores.hxx +++ b/include/svtools/sores.hxx @@ -27,11 +27,6 @@ #define STR_FURTHER_OBJECT 32026 #define STR_UNKNOWN_SOURCE 32027 -#ifdef BMP_PLUGIN -#undef BMP_PLUGIN -#endif -#define BMP_PLUGIN 32000 - // Sot Format Strings #define STR_FORMAT_START 32100 #define STR_FORMAT_STRING (STR_FORMAT_START + 1) diff --git a/svtools/source/dialogs/so3res.src b/svtools/source/dialogs/so3res.src index bc9207466307..fec8d8925e8c 100644 --- a/svtools/source/dialogs/so3res.src +++ b/svtools/source/dialogs/so3res.src @@ -185,10 +185,6 @@ String STR_FURTHER_OBJECT Text [ en-US ] = "Further objects" ; }; -Bitmap BMP_PLUGIN -{ - File = "plugin.png" ; -}; String STR_UNKNOWN_SOURCE { Text [ en-US ] = "Unknown source" ;