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 /shell | |
| 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 'shell')
| -rw-r--r-- | shell/source/cmdmail/cmdmailsuppl.cxx | 4 | ||||
| -rw-r--r-- | shell/source/unix/exec/shellexec.cxx | 6 | ||||
| -rw-r--r-- | shell/source/win32/simplemail/smplmailclient.cxx | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index 05b16f2dc42f..90f5e8af051a 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <osl/diagnose.h> #include <osl/thread.h> @@ -122,7 +124,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM } - OUString aProgramURL("$BRAND_BASE_DIR/program/senddoc"); + OUString aProgramURL("$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/senddoc"); rtl::Bootstrap::expandMacros(aProgramURL); OUString aProgram; diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index b962f8a58172..3f97806d33c5 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <osl/diagnose.h> #include <osl/thread.h> #include <osl/process.h> @@ -161,14 +163,14 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar // the CWD) on stderr and SystemShellExecuteException. aBuffer.append("open --"); #else - // The url launchers are expected to be in the $BRAND_BASE_DIR/program + // The url launchers are expected to be in the $BRAND_BASE_DIR/LIBO_LIBEXEC_FOLDER // directory: com::sun::star::uno::Reference< com::sun::star::util::XMacroExpander > exp = com::sun::star::util::theMacroExpander::get(m_xContext); OUString aProgramURL; try { aProgramURL = exp->expandMacros( - OUString( "$BRAND_BASE_DIR/program/")); + OUString( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/")); } catch (com::sun::star::lang::IllegalArgumentException &) { throw SystemShellExecuteException( diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx index 5a9b30de840f..a3a91338eecc 100644 --- a/shell/source/win32/simplemail/smplmailclient.cxx +++ b/shell/source/win32/simplemail/smplmailclient.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <osl/diagnose.h> #include <osl/process.h> #include <rtl/bootstrap.hxx> @@ -101,7 +103,7 @@ namespace /* private */ if (senddocUrl.getLength() == 0) { - senddocUrl = OUString( "$BRAND_BASE_DIR/program/senddoc.exe"); + senddocUrl = OUString( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/senddoc.exe"); rtl::Bootstrap::expandMacros(senddocUrl); //TODO: detect failure } return senddocUrl; |