To comment on the following update, log in, then open the issue:
http://www.openoffice.org/issues/show_bug.cgi?id=78548
------- Additional comments from [EMAIL PROTECTED] Wed Jun 27 09:05:41 +0000
2007 -------
1
---8<---
--- osl/unx/makefile.mk 25 Jan 2007 15:24:24 -0000 1.31
+++ osl/unx/makefile.mk 16 Jun 2007 01:29:28 -0000 1.31.58.1
@@ -113,6 +113,10 @@ OBJFILES= $(OBJ)$/conditn.obj \
$(OBJ)$/file_stat.obj
#.ENDIF
+.IF "$(OS)"=="MACOSX"
+SLOFILES += $(SLO)$/osxlocale.obj
+.ENDIF
+
.IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" ||
"$(OS)$(CPU)"=="LINUXS"
SLOFILES += $(SLO)$/backtrace.obj
OBJFILES += $(OBJ)$/backtrace.obj
---8<---
misses to add to OBJFILES (whether or not that is necessary at all). Might be
better to move the conditional from makefile.mk into osxlocale.cxx?
2
---8<---
--- osl/unx/module.c 19 Jun 2007 16:16:39 -0000 1.34
+++ osl/unx/module.c 26 Jun 2007 15:41:12 -0000 1.33.172.5
@@ -94,6 +94,8 @@ extern int UnicodeToText(char *, size_t,
oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32
nRtldMode);
+oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl(rtl_uString **
ppFileURL);
+
/*****************************************************************************/
/* osl_loadModule */
/*****************************************************************************/
---8<---
declaring external functions in .c[xx] files instead of including headers is a
maintenance nightmare.
3
---8<---
--- osl/unx/module.c 19 Jun 2007 16:16:39 -0000 1.34
+++ osl/unx/module.c 26 Jun 2007 15:41:12 -0000 1.33.172.5
@@ -115,8 +117,23 @@ oslModule SAL_CALL osl_loadModule(rtl_uS
if (UnicodeToText(buffer, PATH_MAX, ustrTmp->buffer, ustrTmp->length))
pModule = osl_psz_loadModule(buffer, nRtldMode);
+
+#ifdef MACOSX
+ if (!pModule && (0 == strchr(buffer, '/')))
+ {
+ rtl_uString* ustrExecutableFile = NULL;
+
+ if (osl_Process_E_None ==
osl_bootstrap_getExecutableFile_Impl(&ustrExecutableFile))
+ {
+ sal_Int32 n =
rtl_ustr_lastIndexOfChar(ustrExecutableFile->buffer, (sal_Unicode) '/');
+ rtl_uString_newReplaceStrAt(&ustrTmp, ustrExecutableFile, n +
1, ustrExecutableFile->length - n - 1, ustrModuleName);
+ pModule = osl_loadModule(ustrTmp, nRtldMode);
+ rtl_uString_release(ustrExecutableFile);
+ }
+ }
+#endif
+ rtl_uString_release(ustrTmp);
}
- rtl_uString_release(ustrTmp);
return pModule;
}
---8<---
why not use "@executable_path/" + buffer?
4
---8<---
--- osl/unx/nlsupport.c 19 Jun 2007 16:16:54 -0000 1.34
+++ osl/unx/nlsupport.c 26 Jun 2007 20:47:06 -0000 1.33.60.3
@@ -845,12 +845,7 @@ rtl_TextEncoding osl_getTextEncodingFrom
#ifdef MACOSX
#include "system.h"
-#include <premac.h>
-#include <CoreFoundation/CoreFoundation.h>
-#include <postmac.h>
-#include <sal/config.h>
-
-/* OS X locale discovery function from dylib */
+/* OS X locale discovery function */
int (*pGetOSXLocale)( char *, sal_uInt32 );
oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32
nRtldMode);
---8<---
pGetOSXLocale can be dropped completely, right?
5
---8<---
--- osl/unx/nlsupport.c 19 Jun 2007 16:16:54 -0000 1.34
+++ osl/unx/nlsupport.c 26 Jun 2007 20:47:06 -0000 1.33.60.3
@@ -858,6 +853,8 @@ oslModule SAL_CALL osl_psz_loadModule(co
return the current process locale
*****************************************************************************/
+int macosx_getLocale(char *locale, sal_uInt32 bufferLen);
+
void _imp_getProcessLocale( rtl_Locale ** ppLocale )
{
static char *locale = NULL;
---8<---
see 2 above
---------------------------------------------------------------------
Please do not reply to this automatically generated notification from
Issue Tracker. Please log onto the website and enter your comments.
http://qa.openoffice.org/issue_handling/project_issues.html#notification
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
