diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-02-25 15:45:44 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-02-25 15:45:44 +0000 |
| commit | 6c2027d3bf61d33f6c497c883d0e1d7cb33b4129 (patch) | |
| tree | 9c3baf37ff80c5990fa6dd611ce1bad06da59eee /scp2/inc | |
| parent | 6c0870e16ca62d5154fe6f2d031b4bf87ebd2b2e (diff) | |
INTEGRATION: CWS supdremove02 (1.16.150); FILE MERGED
2008/02/05 08:35:18 rt 1.16.150.2: #i85482# Without UPD there is no difference between LIBSHORTNAME and LIBNAME any more. Consolidate, i.e. remove macro LIBSHORTNAME.
2008/02/05 08:28:59 rt 1.16.150.1: #i85482# Remove UPD from library and resource name
Diffstat (limited to 'scp2/inc')
| -rw-r--r-- | scp2/inc/macros.inc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 3119cca33509..3ec9c248832a 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -66,16 +66,14 @@ #endif #ifdef UNX - #define LIBNAME(name) STRING(CONCAT5(lib,name,OFFICEUPD,DLLPOSTFIX,UNXSUFFIX)) - #define LIBSHORTNAME(name) STRING(CONCAT4(lib,name,DLLPOSTFIX,UNXSUFFIX)) + #define LIBNAME(name) STRING(CONCAT4(lib,name,DLLPOSTFIX,UNXSUFFIX)) #define FILTER_LIBNAME(name) LIBNAME(name) #define EXENAME(name) STRING(name) #define PROFILENAME(name) STRING(CONCAT2(name,rc)) #define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX)) #define SPECIAL_COMPONENT_LIB_NAME(name) STRING(CONCAT2(name,UNXSUFFIX)) #else - #define LIBNAME(name) STRING(CONCAT4(name,OFFICEUPD,DLLPOSTFIX,.dll)) - #define LIBSHORTNAME(name) STRING(CONCAT3(name,DLLPOSTFIX,.dll)) + #define LIBNAME(name) STRING(CONCAT3(name,DLLPOSTFIX,.dll)) #define FILTER_LIBNAME(name) LIBNAME(name) #define EXENAME(name) STRING(CONCAT2(name,.exe)) #define PROFILENAME(name) STRING(CONCAT2(name,.ini)) @@ -83,7 +81,7 @@ #define SPECIAL_COMPONENT_LIB_NAME(name) STRING(CONCAT2(name,.dll)) #endif -#define RESFILENAME(name,lang) STRING(CONCAT4(name,OFFICEUPD,lang,.res)) +#define RESFILENAME(name,lang) STRING(CONCAT3(name,lang,.res)) #define SHORTRESFILENAME(name,lang) STRING(CONCAT3(name,lang,.res)) #define READMETXTFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext)) #define READMEFILENAME(name,lang) STRING(CONCAT2(name,lang)) @@ -371,7 +369,7 @@ #define SPECIAL_NO_WARNING_IF_NOT_EXISTS_FILE(id,name) \ File id \ TXT_FILE_BODY; \ - Name = LIBSHORTNAME(name); \ + Name = LIBNAME(name); \ Dir = gid_Dir_Program; \ Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS); \ End @@ -379,7 +377,7 @@ #define SPECIAL_UNO_NO_WARNING_IF_NOT_EXISTS_FILE(id,name) \ File id \ TXT_FILE_BODY; \ - Name = LIBSHORTNAME(name); \ + Name = LIBNAME(name); \ Dir = gid_Dir_Program; \ Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS, UNO_COMPONENT); \ RegistryID = gid_Starregistry_Services_Rdb; \ |