sb116: #i106845# removed obsolete IRIX port
This commit is contained in:
@@ -39,7 +39,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
|
||||
#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
|
||||
|
||||
#include <rtl/ustrbuf.hxx>
|
||||
#include <locale.h>
|
||||
@@ -256,7 +256,7 @@ LocaleBackend* LocaleBackend::createInstance(
|
||||
|
||||
rtl::OUString LocaleBackend::getLocale(void)
|
||||
{
|
||||
#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
|
||||
#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
|
||||
return ImplGetLocale(LC_CTYPE);
|
||||
#elif defined (MACOSX)
|
||||
return ImplGetLocale("AppleLocale");
|
||||
@@ -269,7 +269,7 @@ rtl::OUString LocaleBackend::getLocale(void)
|
||||
|
||||
rtl::OUString LocaleBackend::getUILocale(void)
|
||||
{
|
||||
#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
|
||||
#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
|
||||
return ImplGetLocale(LC_MESSAGES);
|
||||
#elif defined(MACOSX)
|
||||
return ImplGetLocale("AppleLanguages");
|
||||
|
@@ -80,11 +80,6 @@ case $sd_platform in
|
||||
export SHLIB_PATH
|
||||
;;
|
||||
|
||||
IRIX*)
|
||||
LD_LIBRARYN32_PATH=${sd_prog}${LD_LIBRARYN32_PATH+:${LD_LIBRARYN32_PATH}}
|
||||
export LD_LIBRARYN32_PATH
|
||||
;;
|
||||
|
||||
*)
|
||||
LD_LIBRARY_PATH=${sd_prog}${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
|
||||
export LD_LIBRARY_PATH
|
||||
|
@@ -42,10 +42,6 @@ USE_DEFFILE=TRUE
|
||||
|
||||
.INCLUDE : settings.mk
|
||||
|
||||
.IF "$(OS)"=="IRIX"
|
||||
LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=30
|
||||
.ENDIF
|
||||
|
||||
RSCLOCINC+=-I$(PRJ)$/source$/svdraw
|
||||
|
||||
# --- Svx - DLL ----------
|
||||
|
@@ -1572,15 +1572,7 @@ void XMLTextImportHelper::AddOutlineStyleCandidate( const sal_Int8 nOutlineLevel
|
||||
{
|
||||
if( !mpOutlineStylesCandidates )
|
||||
{
|
||||
#ifdef IRIX
|
||||
/* GCC 2 bug when member function is called as part of an array
|
||||
* initialiser
|
||||
*/
|
||||
sal_Int8 count = xChapterNumbering->getCount();
|
||||
mpOutlineStylesCandidates = new ::std::vector<OUString>[count];
|
||||
#else
|
||||
mpOutlineStylesCandidates = new ::std::vector<OUString>[xChapterNumbering->getCount()];
|
||||
#endif
|
||||
}
|
||||
mpOutlineStylesCandidates[nOutlineLevel-1].push_back( rStyleName );
|
||||
}
|
||||
|
Reference in New Issue
Block a user