mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

there's no need for this nutso redefine

Browse Source 
both BMP_PLUGIN resources point to the same plugin.png ultimately

Change-Id: Ifa1cc00698f749ba84f17a79074c73e080e1d356
This commit is contained in:
Caolán McNamara
2017-01-18 12:41:26 +00:00
parent e54999c00b
commit e3bc14ecce
3 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/update_pch
View File

@@ -377,7 +377,6 @@ def filter_ignore(line, module):
ignore_list += [ ignore_list += [
'sdgslots.hxx', # special directives 'sdgslots.hxx', # special directives
'sdslots.hxx', # special directives 'sdslots.hxx', # special directives
'svtools/sores.hxx', # redefines BMP_PLUGIN defined in svtools.hrc
] ]
if module == 'sfx2': if module == 'sfx2':
ignore_list += [ ignore_list += [

5
include/svtools/sores.hxx
View File

@@ -27,11 +27,6 @@
#define STR_FURTHER_OBJECT 32026 #define STR_FURTHER_OBJECT 32026
#define STR_UNKNOWN_SOURCE 32027 #define STR_UNKNOWN_SOURCE 32027
#ifdef BMP_PLUGIN
#undef BMP_PLUGIN
#endif
#define BMP_PLUGIN 32000
// Sot Format Strings // Sot Format Strings
#define STR_FORMAT_START 32100 #define STR_FORMAT_START 32100
#define STR_FORMAT_STRING (STR_FORMAT_START + 1) #define STR_FORMAT_STRING (STR_FORMAT_START + 1)

4
svtools/source/dialogs/so3res.src
View File

@@ -185,10 +185,6 @@ String STR_FURTHER_OBJECT
Text [ en-US ] = "Further objects" ; Text [ en-US ] = "Further objects" ;
}; };
Bitmap BMP_PLUGIN
{
File = "plugin.png" ;
};
String STR_UNKNOWN_SOURCE String STR_UNKNOWN_SOURCE
{ {
Text [ en-US ] = "Unknown source" ; Text [ en-US ] = "Unknown source" ;