strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sb116: #i106845# removed obsolete IRIX port

Browse source
This commit is contained in:
sb 2009-11-13 11:04:06 +01:00
parent a1ce3509a0
commit 497ee5f728
4 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
shell/source/backends/localebe/localebackend.cxx
View file

@ -39,7 +39,7 @@
#include <stdio.h> #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 <rtl/ustrbuf.hxx>
#include <locale.h> #include <locale.h>
@ -256,7 +256,7 @@ LocaleBackend* LocaleBackend::createInstance(
rtl::OUString LocaleBackend::getLocale(void) 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); return ImplGetLocale(LC_CTYPE);
#elif defined (MACOSX) #elif defined (MACOSX)
return ImplGetLocale("AppleLocale"); return ImplGetLocale("AppleLocale");
@ -269,7 +269,7 @@ rtl::OUString LocaleBackend::getLocale(void)
rtl::OUString LocaleBackend::getUILocale(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); return ImplGetLocale(LC_MESSAGES);
#elif defined(MACOSX) #elif defined(MACOSX)
return ImplGetLocale("AppleLanguages"); return ImplGetLocale("AppleLanguages");

5
svx/source/gengal/gengal.sh
View file

@ -80,11 +80,6 @@ case $sd_platform in
export SHLIB_PATH 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}} LD_LIBRARY_PATH=${sd_prog}${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
export LD_LIBRARY_PATH export LD_LIBRARY_PATH

4
svx/util/makefile.mk
View file

@ -42,10 +42,6 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(OS)"=="IRIX"
LINKFLAGS+=-Wl,-LD_LAYOUT:lgot_buffer=30
.ENDIF
RSCLOCINC+=-I$(PRJ)$/source$/svdraw RSCLOCINC+=-I$(PRJ)$/source$/svdraw
# --- Svx - DLL ---------- # --- Svx - DLL ----------

8
xmloff/source/text/txtimp.cxx
View file

@ -1572,15 +1572,7 @@ void XMLTextImportHelper::AddOutlineStyleCandidate( const sal_Int8 nOutlineLevel
{ {
if( !mpOutlineStylesCandidates ) 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()]; mpOutlineStylesCandidates = new ::std::vector<OUString>[xChapterNumbering->getCount()];
#endif
} }
mpOutlineStylesCandidates[nOutlineLevel-1].push_back( rStyleName ); mpOutlineStylesCandidates[nOutlineLevel-1].push_back( rStyleName );
} }