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 /svx/source | |
| parent | make install or install-strip hardly make sense on OS X (diff) | |
| download | core-c6a73009747814513ab5a7277c211449c7378870.tar.gz core-c6a73009747814513ab5a7277c211449c7378870.zip | |
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 'svx/source')
| -rw-r--r-- | svx/source/dialog/docrecovery.cxx | 3 | ||||
| -rw-r--r-- | svx/source/dialog/sendreportunx.cxx | 3 | ||||
| -rw-r--r-- | svx/source/unodraw/recoveryui.cxx | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 9d59e82b0b62..76ebd368f3f9 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include <sal/macros.h> @@ -1925,7 +1926,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() { #if defined(WNT) - OUString ustrValue = OUString("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"); + OUString ustrValue = OUString("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/bootstrap.ini:UserInstallation}"); #elif defined( MACOSX ) OUString ustrValue = OUString("~"); #else diff --git a/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx index 3271f6803f9c..9a058ad54fc6 100644 --- a/svx/source/dialog/sendreportunx.cxx +++ b/svx/source/dialog/sendreportunx.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include "docrecovery.hxx" #include "osl/file.hxx" @@ -223,7 +224,7 @@ namespace svx{ } int ret = -1; - OUString path1("$BRAND_BASE_DIR/program/crashrep"); + OUString path1("$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/crashrep"); rtl::Bootstrap::expandMacros(path1); OString path2; if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) == diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 21c1ac4f0fea..e1da634b103a 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include "recoveryui.hxx" #include "docrecovery.hxx" #include <com/sun/star/lang/XInitialization.hpp> @@ -175,7 +177,7 @@ static OUString GetCrashConfigDir() { #if defined(WNT) - OUString ustrValue = OUString("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"); + OUString ustrValue = OUString("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/bootstrap.ini:UserInstallation}"); #elif defined(MACOSX) OUString ustrValue = OUString("~"); #else |