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

Undo basis/brand split: move program/{addin,filter,plugin} from basis to brand.

Browse source 
And let $(prog), $(progpath), $(progurl) point to brand program/
instead of basis program/.
This commit is contained in:
Stephan Bergmann 2011-10-18 18:49:34 +02:00
parent d34a819233
commit d0a0513a9c
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
framework/source/services/substitutepathvars.cxx
View file

@ -1186,12 +1186,6 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
::utl::Bootstrap::PathStatus aState; ::utl::Bootstrap::PathStatus aState;
::rtl::OUString sVal ; ::rtl::OUString sVal ;
rtl::OUString basis(RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR"));
rtl::Bootstrap::expandMacros(basis);
if( basis.isEmpty() ) {
LOG_ERROR( "SubstitutePathVariables::SetPredefinedPathVariables", "Bootstrap code has no value for OOO_BASE_DIR!");
}
aState = utl::Bootstrap::locateUserData( sVal ); aState = utl::Bootstrap::locateUserData( sVal );
//There can be the valid case that there is no user installation. For example, "unopkg sync" //There can be the valid case that there is no user installation. For example, "unopkg sync"
//is currently (OOo3.4) run as part of the setup. Then no user installation is required. //is currently (OOo3.4) run as part of the setup. Then no user installation is required.
@ -1215,7 +1209,8 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
// Detect the program directory // Detect the program directory
// Set $(prog), $(progpath), $(progurl) // Set $(prog), $(progpath), $(progurl)
INetURLObject aProgObj( basis ); INetURLObject aProgObj(
aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] );
if ( !aProgObj.HasError() && aProgObj.insertName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("program")) ) ) if ( !aProgObj.HasError() && aProgObj.insertName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("program")) ) )
{ {
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ] = aProgObj.GetMainURL(INetURLObject::NO_DECODE); aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ] = aProgObj.GetMainURL(INetURLObject::NO_DECODE);

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

@ -127,7 +127,7 @@ End
Directory gid_Dir_Addin Directory gid_Dir_Addin
Styles = (CREATE); Styles = (CREATE);
ParentID = gid_Dir_Program; ParentID = gid_Brand_Dir_Program;
DosName = "addin"; DosName = "addin";
End End
@ -137,7 +137,7 @@ Directory gid_Dir_Addin_Source
End End
Directory gid_Dir_Filter Directory gid_Dir_Filter
ParentID = gid_Dir_Program; ParentID = gid_Brand_Dir_Program;
DosName = "filter"; DosName = "filter";
End End
@ -344,7 +344,7 @@ Directory gid_Dir_Work
End End
Directory gid_Dir_Plugin Directory gid_Dir_Plugin
ParentID = gid_Dir_Program; ParentID = gid_Brand_Dir_Program;
DosName = "plugin"; DosName = "plugin";
Styles = (WORKSTATION, CREATE); Styles = (WORKSTATION, CREATE);
End End