diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-16 11:08:32 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
| commit | c6a73009747814513ab5a7277c211449c7378870 (patch) | |
| tree | 2adc961b3c83deffcea251c41744f2626e476f38 /vcl/generic | |
| parent | 18041138d3169d565755565bdbabd8de596b5ac7 (diff) | |
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
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/app/gensys.cxx | 4 | ||||
| -rw-r--r-- | vcl/generic/fontmanager/helper.cxx | 13 |
2 files changed, 10 insertions, 7 deletions
diff --git a/vcl/generic/app/gensys.cxx b/vcl/generic/app/gensys.cxx index d07f6bea12cc..611ea333ff98 100644 --- a/vcl/generic/app/gensys.cxx +++ b/vcl/generic/app/gensys.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <generic/gensys.h> #include <vcl/msgbox.hxx> @@ -193,7 +195,7 @@ const char* SalGenericSystem::getFrameClassName() { OUString aIni, aProduct; rtl::Bootstrap::get( "BRAND_BASE_DIR", aIni ); - aIni += "/program/" SAL_CONFIGFILE( "bootstrap" ); + aIni += "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ); rtl::Bootstrap aBootstrap( aIni ); aBootstrap.getFrom( "ProductKey", aProduct ); diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx index fc582bdf01e2..1d131a6c41e9 100644 --- a/vcl/generic/fontmanager/helper.cxx +++ b/vcl/generic/fontmanager/helper.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include <cstring> #include <sys/stat.h> @@ -48,7 +49,7 @@ OUString getOfficePath( enum whichOfficePath ePath ) bOnce = true; OUString aIni; Bootstrap::get( "BRAND_BASE_DIR", aInstallationRootPath ); - aIni = aInstallationRootPath + "/program/" + SAL_CONFIGFILE( "bootstrap" ); + aIni = aInstallationRootPath + "/" LIBO_ETC_FOLDER "/" + SAL_CONFIGFILE( "bootstrap" ); Bootstrap aBootstrap( aIni ); aBootstrap.getFrom( "CustomDataUrl", aConfigPath ); aBootstrap.getFrom( "UserInstallation", aUserPath ); @@ -117,7 +118,7 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub aPathBuffer.append( getOfficePath( psp::InstallationRootPath ) ); if( !aPathBuffer.isEmpty() ) { - aPathBuffer.appendAscii( "/share/psprint" ); + aPathBuffer.appendAscii( "/" LIBO_SHARE_FOLDER "/psprint" ); if( pSubDir ) { aPathBuffer.append( sal_Unicode('/') ); @@ -199,7 +200,7 @@ OUString psp::getFontPath() // #i53530# Path from CustomDataUrl will completely // replace net and user paths if the path exists aPathBuffer.append(aConfigPath); - aPathBuffer.appendAscii("/share/fonts"); + aPathBuffer.appendAscii("/" LIBO_SHARE_FOLDER "/fonts"); // check existance of config path struct stat aStat; if( 0 != stat( OUStringToOString( aPathBuffer.makeStringAndClear(), osl_getThreadTextEncoding() ).getStr(), &aStat ) @@ -208,7 +209,7 @@ OUString psp::getFontPath() else { aPathBuffer.append(aConfigPath); - aPathBuffer.appendAscii("/share/fonts"); + aPathBuffer.appendAscii("/" LIBO_SHARE_FOLDER "/fonts"); } } if( aConfigPath.isEmpty() ) @@ -216,9 +217,9 @@ OUString psp::getFontPath() if( !aInstallationRootPath.isEmpty() ) { aPathBuffer.append( aInstallationRootPath ); - aPathBuffer.appendAscii( "/share/fonts/truetype;"); + aPathBuffer.appendAscii( "/" LIBO_SHARE_FOLDER "/fonts/truetype;"); aPathBuffer.append( aInstallationRootPath ); - aPathBuffer.appendAscii( "/share/fonts/type1;" ); + aPathBuffer.appendAscii( "/" LIBO_SHARE_FOLDER "/fonts/type1;" ); } if( !aUserPath.isEmpty() ) { |