strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Undo basis/brand split: merge basis program/resource/ into brand program/resource/.

Browse source
This commit is contained in:
Stephan Bergmann 2011-10-19 12:22:31 +02:00
parent ad9c1ffdd0
commit 0a158b7800
4 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scp2/inc/macros.inc
View file

@ -190,14 +190,6 @@
Styles = (PACKED); \ Styles = (PACKED); \
End End
#define BRAND_RES_FILE(id,name) \
File id \
TXT_FILE_BODY; \
RESFILE_ALL_LANG(name); \
Dir = gid_Brand_Dir_Program_Resource; \
Styles = (PACKED); \
End
#define STD_RES_FILE_PATCH(id,name) \ #define STD_RES_FILE_PATCH(id,name) \
File id \ File id \
TXT_FILE_BODY; \ TXT_FILE_BODY; \

6
scp2/source/ooo/common_brand.scp
View file

@ -120,7 +120,6 @@ Module gid_Module_Langpack_Brand_Template
InstallOrder = "1050"; InstallOrder = "1050";
Dirs = (gid_Brand_Dir_Program, Dirs = (gid_Brand_Dir_Program,
gid_Brand_Dir_Program_Shell, gid_Brand_Dir_Program_Shell,
gid_Brand_Dir_Program_Resource,
gid_Brand_Dir_Readme); gid_Brand_Dir_Readme);
Files = (gid_Brand_File_Res_Iso, Files = (gid_Brand_File_Res_Iso,
gid_Brand_File_Res_Ooo, gid_Brand_File_Res_Ooo,
@ -147,11 +146,6 @@ Directory gid_Brand_Dir_Program
#endif #endif
End End
Directory gid_Brand_Dir_Program_Resource
ParentID = gid_Brand_Dir_Program;
DosName = "resource";
End
Directory gid_Brand_Dir_Program_Shell Directory gid_Brand_Dir_Program_Shell
ParentID = gid_Brand_Dir_Program; ParentID = gid_Brand_Dir_Program;
DosName = "shell"; DosName = "shell";

2
scp2/source/ooo/directory_ooo.scp
View file

@ -142,7 +142,7 @@ Directory gid_Dir_Filter
End End
Directory gid_Dir_Resource Directory gid_Dir_Resource
ParentID = gid_Dir_Program; ParentID = gid_Brand_Dir_Program;
DosName = "resource"; DosName = "resource";
End End

4
tools/source/rc/resmgr.cxx
View file

@ -207,10 +207,6 @@ void ResMgrContainer::init()
RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/resource")); RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/resource"));
rtl::Bootstrap::expandMacros(uri); rtl::Bootstrap::expandMacros(uri);
aDirs.push_back(uri); aDirs.push_back(uri);
uri = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program/resource"));
rtl::Bootstrap::expandMacros(uri);
aDirs.push_back(uri);
// 2. in STAR_RESOURCEPATH // 2. in STAR_RESOURCEPATH
const sal_Char* pEnv = getenv( "STAR_RESOURCEPATH" ); const sal_Char* pEnv = getenv( "STAR_RESOURCEPATH" );