diff options
-rw-r--r-- | scp2/source/ooo/file_ooo.scp | 14 | ||||
-rw-r--r-- | shell/source/cmdmail/cmdmailsuppl.cxx | 2 | ||||
-rw-r--r-- | shell/source/unix/exec/shellexec.cxx | 6 | ||||
-rw-r--r-- | shell/source/unix/misc/makefile.mk | 2 | ||||
-rw-r--r-- | shell/source/win32/simplemail/makefile.mk | 2 | ||||
-rw-r--r-- | shell/source/win32/simplemail/smplmailclient.cxx | 2 |
6 files changed, 15 insertions, 13 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index d43104d05c3a..37e1f9d77cca 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -139,7 +139,7 @@ End File gid_File_Bin_Open_Url BIN_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Name = "open-url"; Styles = (PACKED); End @@ -150,28 +150,28 @@ End File gid_File_Bin_Gnome_Open_Url BIN_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Name = "gnome-open-url"; Styles = (PACKED); End File gid_File_Bin_Gnome_Open_Url_Bin BIN_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Name = "gnome-open-url.bin"; Styles = (PACKED); End File gid_File_Bin_Kde_Open_Url BIN_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Name = "kde-open-url"; Styles = (PACKED); End File gid_File_Bin_Cde_Open_Url BIN_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Name = "cde-open-url"; Styles = (PACKED); End @@ -182,7 +182,7 @@ End File gid_File_Bin_Uri_Encode BIN_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; Name = "uri-encode"; Styles = (PACKED); End @@ -191,7 +191,7 @@ End File gid_File_Bin_Senddoc BIN_FILE_BODY; - Dir = gid_Dir_Program; + Dir = gid_Brand_Dir_Program; #ifdef UNX Name = "senddoc"; Styles = (PACKED); diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index ec623c02cde4..548b90cc444b 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -153,7 +153,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM OStringBuffer aBuffer; aBuffer.append("\""); - OUString aProgramURL(RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program/senddoc")); + OUString aProgramURL(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/senddoc")); rtl::Bootstrap::expandMacros(aProgramURL); OUString aProgram; diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 4af7c7bfff84..40a2fa3f9b13 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -159,7 +159,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar #ifdef MACOSX aBuffer.append("open"); #else - // The url launchers are expected to be in the $OOO_BASE_DIR/program + // The url launchers are expected to be in the $BRAND_BASE_DIR/program // directory: com::sun::star::uno::Reference< com::sun::star::util::XMacroExpander > exp; @@ -182,11 +182,11 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar try { aProgramURL = exp->expandMacros( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program/"))); + RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program/"))); } catch (com::sun::star::lang::IllegalArgumentException &) { throw SystemShellExecuteException( - OUString(RTL_CONSTASCII_USTRINGPARAM("Could not expand $OOO_BASE_DIR path")), + OUString(RTL_CONSTASCII_USTRINGPARAM("Could not expand $BRAND_BASE_DIR path")), static_cast < XSystemShellExecute * > (this), ENOENT ); } diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk index be4660db3e8c..3f1b64e652e0 100644 --- a/shell/source/unix/misc/makefile.mk +++ b/shell/source/unix/misc/makefile.mk @@ -51,6 +51,7 @@ APP1TARGET = gnome-open-url.bin APP1OBJS = \ $(OBJ)$/gnome-open-url.obj APP1LIBS = +APP1RPATH = BRAND .IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && \ "$(OS)"!="DRAGONFLY" APP1STDLIBS=-ldl @@ -59,6 +60,7 @@ APP1STDLIBS=-ldl APP2TARGET = uri-encode APP2OBJS = $(OBJ)$/uri-encode.obj APP2LIBS = +APP2RPATH = BRAND APP2STDLIBS = OBJFILES = $(APP1OBJS) $(APP2OBJS) diff --git a/shell/source/win32/simplemail/makefile.mk b/shell/source/win32/simplemail/makefile.mk index abd35e408e2d..3e8b15f97a4c 100644 --- a/shell/source/win32/simplemail/makefile.mk +++ b/shell/source/win32/simplemail/makefile.mk @@ -70,7 +70,7 @@ APP1TARGET=senddoc APP1OBJS=$(OBJFILES) APP1STDLIBS=$(KERNEL32LIB)\ $(SALLIB) - +APP1RPATH = BRAND APP1DEF=$(MISC)$/$(APP1TARGET).def # --- Targets ------------------------------------------------------ diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx index 52707b3cac19..2d27049261b8 100644 --- a/shell/source/win32/simplemail/smplmailclient.cxx +++ b/shell/source/win32/simplemail/smplmailclient.cxx @@ -112,7 +112,7 @@ namespace /* private */ { senddocUrl = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( - "$OOO_BASE_DIR/program/senddoc.exe")); + "$BRAND_BASE_DIR/program/senddoc.exe")); rtl::Bootstrap::expandMacros(senddocUrl); //TODO: detect failure } return senddocUrl; |