diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-05 17:10:18 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-05 18:17:00 +0200 |
| commit | 791a8b96f754798192875da287c84f8cfa4e533e (patch) | |
| tree | 54d9249ae49370c67465417e47c374b53094cc10 /framework | |
| parent | 0bf232422af9d2b53e54230c1ae0f554f42eb2ff (diff) | |
Revert "fdo#68552: Don't (attempt to) do run-time expansion of build-time parameters"
This reverts commit ac4e19f9085dbd0103c7336a5318aa1e55b3e3e0.
Unfortunately does not work if BUILDDIR is different from SRCDIR.
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/services/substitutepathvars.hxx | 1 | ||||
| -rw-r--r-- | framework/source/services/substitutepathvars.cxx | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx index 7604a879a2a4..085a99cb9e10 100644 --- a/framework/inc/services/substitutepathvars.hxx +++ b/framework/inc/services/substitutepathvars.hxx @@ -179,6 +179,7 @@ enum PreDefVariable PREDEFVAR_BASEINSTURL, PREDEFVAR_USERDATAURL, PREDEFVAR_BRANDBASEURL, + PREDEFVAR_SHARE_SUBDIR_NAME, PREDEFVAR_COUNT }; diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index e1093b7f540a..b9b390c75792 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -104,6 +104,7 @@ #define VARIABLE_BASEINSTURL "$(baseinsturl)" #define VARIABLE_USERDATAURL "$(userdataurl)" #define VARIABLE_BRANDBASEURL "$(brandbaseurl)" +#define VARIABLE_SHARE_SUBDIR_NAME "$(share_subdir_name)" using namespace com::sun::star::uno; using namespace com::sun::star::beans; @@ -193,7 +194,8 @@ static const FixedVariable aFixedVarTable[] = // New variable of hierachy service (#i32656#) { VARIABLE_BASEINSTURL, PREDEFVAR_BASEINSTURL, REPLACELENGTH_BASEINSTURL,true }, { VARIABLE_USERDATAURL, PREDEFVAR_USERDATAURL, REPLACELENGTH_USERDATAURL,true }, - { VARIABLE_BRANDBASEURL,PREDEFVAR_BRANDBASEURL, RTL_CONSTASCII_LENGTH(VARIABLE_BRANDBASEURL), true } + { VARIABLE_BRANDBASEURL,PREDEFVAR_BRANDBASEURL, RTL_CONSTASCII_LENGTH(VARIABLE_BRANDBASEURL), true }, + { VARIABLE_SHARE_SUBDIR_NAME,PREDEFVAR_SHARE_SUBDIR_NAME, RTL_CONSTASCII_LENGTH(VARIABLE_SHARE_SUBDIR_NAME), false } }; //_________________________________________________________________________________________________________________ @@ -1115,6 +1117,8 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable rtl::Bootstrap::expandMacros( aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL]); + aPreDefPathVariables.m_FixedVar[PREDEFVAR_SHARE_SUBDIR_NAME] = rtl::OUString(LIBO_SHARE_FOLDER); + Any aAny; // Get inspath and userpath from bootstrap mechanism in every case as file URL |