Use subfolder names from <config_folders.h>

Change all instances of hardcoded "program", "share" etc subfolder names to
use those from <config_folders.h> instead. In normal builds, the end result
will not change.

Change-Id: I91c95cd8e482818be67307e889ae6df887763f53

3 files changed, 12 insertions, 3 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/license.cxx b/framework/source/services/license.cxx
index 0d5a874256c6..86b2defa9226 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_folders.h>
+
 #include <services/license.hxx>
 #include <threadhelp/resetableguard.hxx>
 #include <macros/debug.hxx>
@@ -68,7 +70,7 @@ using ::Time;
 using ::DateTime;
 
 // license file name
-static const char *szLicensePath = "/share/readme";
+static const char *szLicensePath = "/" LIBO_SHARE_FOLDER "/readme";
 #ifdef UNX
 static const char *szUNXLicenseName = "/LICENSE";
 static const char *szUNXLicenseExt = "";
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index f47ed7bf9f7c..f1c4add2fd0a 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_folders.h>
+
 #include "services/substitutepathvars.hxx"
 #include <threadhelp/resetableguard.hxx>
 #include <helper/networkdomain.hxx>
@@ -102,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;
@@ -191,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 }
 };
 
 //_________________________________________________________________________________________________________________
@@ -1113,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
@@ -1145,7 +1151,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
     // Set $(prog), $(progpath), $(progurl)
     INetURLObject aProgObj(
         aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] );
-    if ( !aProgObj.HasError() && aProgObj.insertName( OUString("program") ) )
+    if ( !aProgObj.HasError() && aProgObj.insertName( OUString(LIBO_BIN_FOLDER) ) )
     {
         aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ] = aProgObj.GetMainURL(INetURLObject::NO_DECODE);
         aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGURL ]  = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ];