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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/objmisc.cxx | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index da6a2188df32..581404b7b489 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <shutdownicon.hxx> #include <app.hrc> #include <sfx2/app.hxx> @@ -860,7 +862,7 @@ void ShutdownIcon::SetAutostart( bool bActivate ) #else // UNX getAutostartDir( true ); - OUString aPath( "${BRAND_BASE_DIR}/share/xdg/qstart.desktop" ); + OUString aPath( "${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/xdg/qstart.desktop" ); Bootstrap::expandMacros( aPath ); OUString aDesktopFile; diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 3b09a22f4e0b..0e37c5d989d6 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -18,6 +18,7 @@ */ #include <config_features.h> +#include <config_folders.h> #include <tools/inetmsg.hxx> #include <tools/diagnose_ex.h> @@ -2074,11 +2075,11 @@ void SfxObjectShell::StoreLog() if ( pImp->m_xLogRing.is() ) { - OUString aFileURL = OUString( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}" ); + OUString aFileURL = OUString( "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}" ); ::rtl::Bootstrap::expandMacros( aFileURL ); - OUString aBuildID = OUString( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("setup") ":buildid}" ); + OUString aBuildID = OUString( "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("setup") ":buildid}" ); ::rtl::Bootstrap::expandMacros( aBuildID ); |