Attachment #28229 for issue #50599

View | Details | Raw Unified | Return to issue 50599
Collapse All | Expand All




 */
static void cpp_vtable_call()
{
	sal_Int64 nRegReturn;
	int nFunctionIndex;
	void** pCallStack;
	int vTableOffset;

void * pRegReturn = &nRegReturn;

	__asm__( "st %%i0, %0\n\t"
			"st %%i1, %1\n\t"
 			"st %%i2, %2\n\t"

		case typelib_TypeClass_BYTE:
			__asm__( "ld %0, %%l0\n\t"
					 "ldsb [%%l0], %%i0\n"
					 : : "m"(pRegReturn) );
			break;
		case typelib_TypeClass_CHAR:
		case typelib_TypeClass_SHORT:
		case typelib_TypeClass_UNSIGNED_SHORT:
			__asm__( "ld %0, %%l0\n\t"
					 "ldsh [%%l0], %%i0\n"
					 : : "m"(pRegReturn) );
			break;
		case typelib_TypeClass_HYPER:
		case typelib_TypeClass_UNSIGNED_HYPER:

			__asm__( "ld %0, %%l0\n\t"
					 "ld [%%l0], %%i0\n\t"
					 "add %%l0, 4, %%l0\n\t"
					 "ld [%%l0], %%i1\n\t"
					  : : "m"(pRegReturn) );

			break;
		case typelib_TypeClass_FLOAT:
			__asm__( "ld %0, %%l0\n\t"
					 "ld [%%l0], %%f0\n"
					 : : "m"(pRegReturn) );
			break;
		case typelib_TypeClass_DOUBLE:
			__asm__( "ld %0, %%l0\n\t"
					 "ldd [%%l0], %%f0\n"
					 : : "m"(pRegReturn) );
			break;
		case typelib_TypeClass_VOID:
			break;
		default:
			__asm__( "ld %0, %%l0\n\t"
					 "ld [%%l0], %%i0\n"
					 : : "m"(pRegReturn) );
			break;
	}





AC_SUBST(USE_XINERAMA)
AC_SUBST(XINERAMA_LINK)

dnl ===================================================================
dnl Test for the presence of Ant and that it works
dnl ===================================================================

if test "$SOLAR_JAVA" != ""; then
ANT_HOME=; export ANT_HOME
WITH_ANT_HOME=; export WITH_ANT_HOME
if test -z "$with_ant_home"; then
   AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat])
else
   AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH)
   WITH_ANT_HOME=$with_ant_home
fi

if test -z "$ANT"; then
  AC_MSG_ERROR([Ant not found - Make sure it's in the path or use --with-ant-home])
else
  # resolve relative or absolute symlink
  while test -h "$ANT"; do
     a_cwd=`pwd`
     a_basename=`basename "$ANT"`
     a_script=`ls -l "$ANT" | sed "s/.*${a_basename} -> //g"`
     cd "`dirname "$ANT"`"
     cd "`dirname "$a_script"`"
     ANT="`pwd`"/"`basename "$a_script"`"
     cd "$a_cwd"
  done
  AC_MSG_CHECKING([if $ANT works])
cat > conftest.java << EOF
    public class conftest {
	int testmethod(int a, int b) {
            return a + b;
	}
    }
EOF

cat > conftest.xml << EOF
    <project name="conftest" default="conftest">
	<target name="conftest">
            <javac srcdir="." includes="conftest.java">
	    </javac>
	</target>
    </project>
EOF
  oldJAVA_HOME=$JAVA_HOME
  if test "$JDK" = "gcj"; then
    JAVA_HOME=; export JAVA_HOME
    ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
  else
    ant_cmd="$ANT -buildfile conftest.xml 1>&2"
  fi
  AC_TRY_EVAL(ant_cmd)
  if test $? = 0 && test -f ./conftest.class ; then
    AC_MSG_RESULT([Ant works]) 
    if test -z "$WITH_ANT_HOME"; then
        ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"`
    else
        ANT_HOME="$WITH_ANT_HOME"
    fi
  else
    echo "configure: Ant test failed" >&5
    cat conftest.java >&5
    cat conftest.xml >&5
    AC_MSG_WARN([Ant does not work - Some Java projects will not build!])
    ANT_HOME=""
    echo "Ant does not work - Some Java projects will not build!" >>warn
  fi
  JAVA_HOME=$oldJAVA_HOME
  rm -f conftest* core core.* *.core
fi
if test -z "$ANT_HOME"; then
   ANT_HOME="NO_ANT_HOME"
fi
AC_SUBST(ANT_HOME)

dnl Checking for ant.jar
if test "$ANT_HOME" != "NO_ANT_HOME"; then
   AC_MSG_CHECKING([Ant lib directory])
   if test -f $ANT_HOME/lib/ant.jar; then
	  ANT_LIB="$ANT_HOME/lib"
   else
      if test -f $ANT_HOME/ant.jar; then
	     ANT_LIB="$ANT_HOME"
      else
          if test -f /usr/share/java/ant.jar; then
              ANT_LIB=/usr/share/java
          else
             if test -f /usr/share/ant-core/lib/ant.jar; then
                 ANT_LIB=/usr/share/ant-core/lib
             else
                 AC_MSG_ERROR([Ant libraries not found!])
             fi
          fi
      fi
   fi
   AC_MSG_RESULT([Ant lib directory found.])
fi
AC_SUBST(ANT_LIB)
fi

AC_MSG_CHECKING([which languages to be built])
WITH_LANG="$with_lang"
if test -z "$WITH_LANG"; then

Lines 1406-1414 Link Here

(-)config_office/set_soenv.in (-3 lines)
1406	ToFile( "JAVADOC", "@JAVADOC@", "e" );	1406	ToFile( "JAVADOC", "@JAVADOC@", "e" );
1407	}	1407	}
1408	ToFile( "XSLTPROC", "@XSLTPROC@", "e" );	1408	ToFile( "XSLTPROC", "@XSLTPROC@", "e" );
1409	ToFile( "ANT_HOME", "@ANT_HOME@", "e" );
1410	ToFile( "ANT_LIB", "@ANT_LIB@", "e" );
1411	ToFile( "ANT", "@ANT@", "e" );
1412	ToFile( "JDKLIB", $JAVA_LIB, "e" );	1409	ToFile( "JDKLIB", $JAVA_LIB, "e" );
1413	ToFile( "STLPORT4", $STLPORT4, "e" );	1410	ToFile( "STLPORT4", $STLPORT4, "e" );
1414	ToFile( "ASM_PATH", $ASM_PATH, "e" );	1411	ToFile( "ASM_PATH", $ASM_PATH, "e" );

Lines 74-80 Link Here

(-)connectivity/inc/connectivity/sqlparse.hxx (-1 / +1 lines)
74	#ifndef FLEX_SCANNER	74	#ifndef FLEX_SCANNER
75	#ifndef BISON_INCLUDED	75	#ifndef BISON_INCLUDED
76	#define BISON_INCLUDED	76	#define BISON_INCLUDED
77	#include <sqlbison.hxx>	77	#include "sqlbison.hxx"
78	#endif	78	#endif
79	#endif	79	#endif
80	#endif	80	#endif




import java.util.*;
import java.util.zip.Inflater;
import java.util.zip.Deflater;
import Base64;
import sun.misc.BASE64Encoder;

//StarOffice Interfaces and UNO
import com.sun.star.bridge.XBridgeFactory;

	            byte oledata[][]=new byte[1][oleLength];
	            xInput.readBytes(oledata,oleLength);
	            //return the base64 encoded string
	            return Base64.encodeBytes(oledata[0]);
            }catch( Exception ex )
            {
                ex.printStackTrace();

            decompresser.end();
			
			//return the base64 string of the uncompressed data            
            return Base64.encodeBytes(result);
        }catch( Exception ex )
        {
            ex.printStackTrace();

        try
        {
            //Decode and write the data to an temp stream
            byte[] oledata = Base64.decode(aBase64);
            m_RootStream = CreateTempFileStream( m_xMSF );
            XOutputStream xOutput = m_RootStream.getOutputStream();
            xOutput.writeBytes(oledata);

        try
        {
        	//decode the base64 string
            byte[] oledata = Base64.decode(aBase64);
        	//create a temp stream to write data to
            XStream subStream = CreateTempFileStream( m_xMSF );
            XInputStream xInput = subStream.getInputStream();




#JARDIR=$(CLASSDIR)

JARCOMPRESS		= TRUE  
JARCLASSDIRS	= XSLTFilter*.class XSLTransformer*.class XSLTFilterOLEExtracter*.class Base64.class
JARTARGET		= $(TARGET).jar
JARCLASSDIRS 	+= XSLTXalanOLEExtracter*.class

# --- Files --------------------------------------------------------  
JAVACLASSFILES=$(CLASSDIR)$/XSLTFilter.class  $(CLASSDIR)$/XSLTransformer.class  $(CLASSDIR)$/XSLTFilterOLEExtracter.class $(CLASSDIR)$/Base64.class
#this class we need xalan.jar. 
JAVACLASSFILES+=$(CLASSDIR)$/XSLTXalanOLEExtracter.class
.ENDIF

Lines 100-105 Link Here

(-)hsqldb/makefile.mk (+4 lines)
100		100
101	ANT_BUILDFILE=build$/build.xml	101	ANT_BUILDFILE=build$/build.xml
102		102
		103	ANT_HOME:=/usr/share/ant
		104	ANT_LIB:=$(ANT_HOME)$/lib
		105	ANT:=$(JAVAI) $(JAVACPS) $(CLASSPATH)$(PATH_SEPERATOR)$(ANT_LIB)/ant-launcher.jar$(PATH_SEPERATOR)$(ANT_LIB)/ant.jar -Dant.home=$(ANT_HOME) org.apache.tools.ant.Main
		106
103	.IF "$(JDK)"=="gcj"	107	.IF "$(JDK)"=="gcj"
104	JAVA_HOME=	108	JAVA_HOME=
105	.EXPORT : JAVA_HOME	109	.EXPORT : JAVA_HOME

Lines 710-715 Link Here

(-)libxmlsec/xmlsec1-1.2.6.patch (+4 lines)
710	! dummy	710	! dummy
711	--- 1,44 ----	711	--- 1,44 ----
712	! #! /bin/sh	712	! #! /bin/sh
		713	!
		714	! if test "$SYSTEM_LIBXML" = "YES"
		715	! then xml2-config "$@"; exit 0
		716	! fi
713	!	717	!
714	! prefix=${SOLARVERSION}/${INPATH}	718	! prefix=${SOLARVERSION}/${INPATH}
715	! includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external	719	! includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external

Lines 94-100 Link Here

(-)padmin/source/padialog.hxx (-1 / +1 lines)
94		94
95	// forward declaration	95	// forward declaration
96	namespace psp { class PrinterInfoManager; }	96	namespace psp { class PrinterInfoManager; }
97		97	class Printer;
98	namespace padmin {	98	namespace padmin {
99		99
100	class PADialog : public ModalDialog	100	class PADialog : public ModalDialog

Lines 245-251 Link Here

(-)psprint/inc/psprint/fontmanager.hxx (-1 / +1 lines)
245		245
246	// a class to manage printable fonts	246	// a class to manage printable fonts
247	// aims are type1 and truetype fonts	247	// aims are type1 and truetype fonts
248		248	class FontCache;
249	class PrintFontManager	249	class PrintFontManager
250	{	250	{
251	struct PrintFont;	251	struct PrintFont;

Lines 218-223 Link Here

(-)psprint/inc/psprint/printergfx.hxx (+1 lines)
218	GraphicsStatus();	218	GraphicsStatus();
219	};	219	};
220		220
		221	class Font3;
221	class PrinterGfx	222	class PrinterGfx
222	{	223	{
223	private:	224	private:

Lines 2092-2100 Link Here

(-)scp2/source/ooo/file_library_ooo.scp (-2 / +2 lines)
2092	Dir = gid_Dir_Program;	2092	Dir = gid_Dir_Program;
2093	#ifdef UNX	2093	#ifdef UNX
2094	#ifdef MACOSX	2094	#ifdef MACOSX
2095	Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));	2095	Name = STRING(CONCAT3(libxml2,.2.6.20,UNXSUFFIX));
2096	#else	2096	#else
2097	Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));	2097	Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.20));
2098	#endif	2098	#endif
2099	#else	2099	#else
2100	Name = "libxml2.dll";	2100	Name = "libxml2.dll";

Lines 603-611 Link Here

(-)scp2/source/ure/ure.scp (-2 / +2 lines)
603	Name = SCP2_URE_DL_NORMAL(libxml2);	603	Name = SCP2_URE_DL_NORMAL(libxml2);
604	#else	604	#else
605	#ifdef MACOSX	605	#ifdef MACOSX
606	Name = STRING(CONCAT3(libxml2,.2.6.17,UNXSUFFIX));	606	Name = STRING(CONCAT3(libxml2,.2.6.20,UNXSUFFIX));
607	#else	607	#else
608	Name = SCP2_URE_DL_VER(xml2,2.6.17);	608	Name = SCP2_URE_DL_VER(xml2,2.6.20);
609	#endif	609	#endif
610	#endif	610	#endif
611	Styles = (PACKED);	611	Styles = (PACKED);




		my $target = "";
		if ( $installer::globals::compiler =~ /unxlngi/) { $target = "i586"; }
		if ( $installer::globals::compiler =~ /unxlngx/) { $target = "x86_64"; }
		if ( $installer::globals::compiler =~ /unxlngs/) { $target = "sparc"; }

		my $systemcall = "$rpmcommand -bb $specfilename --target $target 2\>\&1 |";


		my $rpmdir;
		if ( $installer::globals::compiler =~ /unxlngi/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/i586"; }
		if ( $installer::globals::compiler =~ /unxlngx/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/x86_64"; }
		if ( $installer::globals::compiler =~ /unxlngs/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/sparc"; }

		my $systemcall = "mv $rpmdir/* $newdir";	# moving the rpms into the directory "RPMS"


		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/x86_64");
		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i586");
		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i386");
		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/sparc");
		installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS");

	}

Lines 321-327 Link Here

(-)solenv/bin/modules/installer/parameter.pm (-1 / +1 lines)
321		321
322	if (( $installer::globals::compiler =~ /unx/ ) && ( $installer::globals::addpackagelist )) { $installer::globals::is_unix_multi = 1; }	322	if (( $installer::globals::compiler =~ /unx/ ) && ( $installer::globals::addpackagelist )) { $installer::globals::is_unix_multi = 1; }
323		323
324	if ( $installer::globals::compiler =~ /unxlngi/ \|\| $installer::globals::compiler =~ /unxlngx/ )	324	if ( $installer::globals::compiler =~ /unxlngi/ \|\| $installer::globals::compiler =~ /unxlngx/ \|\| $installer::globals::compiler =~ /unxlngs/ )
325	{	325	{
326	$installer::globals::islinuxbuild = 1;	326	$installer::globals::islinuxbuild = 1;
327	if ( $installer::globals::packageformat eq "rpm" )	327	if ( $installer::globals::packageformat eq "rpm" )

Lines 142-147 Link Here

(-)solenv/inc/ant.mk (+4 lines)
142	.EXPORT : CLASSPATH	142	.EXPORT : CLASSPATH
143	.EXPORT : PATH	143	.EXPORT : PATH
144		144
		145	ANT_HOME:=/usr/share/ant
		146	ANT_LIB:=$(ANT_HOME)$/lib
		147	ANT:=$(JAVAI) $(JAVACPS) $(CLASSPATH)$(PATH_SEPERATOR)$(ANT_LIB)/ant-launcher.jar$(PATH_SEPERATOR)$(ANT_LIB)/ant.jar -Dant.home=$(ANT_HOME) org.apache.tools.ant.Main
		148
145	# --- TARGETS -----------------------------------------------------	149	# --- TARGETS -----------------------------------------------------
146		150
147	#$(CLASSDIR)$/solar.properties .PHONY:	151	#$(CLASSDIR)$/solar.properties .PHONY:

Lines 204-209 Link Here

(-)testtools/source/bridgetest/makefile.mk (+1 lines)
204	# CLASSPATH, which regcomp needs to be run	204	# CLASSPATH, which regcomp needs to be run
205	MY_CLASSPATH_TMP=$(foreach,i,$(MY_JARS) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR)$(XCLASSPATH)	205	MY_CLASSPATH_TMP=$(foreach,i,$(MY_JARS) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR)$(XCLASSPATH)
206	MY_CLASSPATH=$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/)))$(PATH_SEPERATOR)..$/class	206	MY_CLASSPATH=$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/)))$(PATH_SEPERATOR)..$/class
		207	.EXPORT : CLASSPATH
207		208
208	# Use "127.0.0.1" instead of "localhost", see #i32281#:	209	# Use "127.0.0.1" instead of "localhost", see #i32281#:
209	$(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) : makefile.mk	210	$(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) : makefile.mk




// -------------

class ImageList;
class BitmapEx;
class VCL_DLLPUBLIC AlphaMask : private Bitmap
{
	friend class BitmapEx;
	friend class OutputDevice;
	friend VCL_DLLPUBLIC SvStream & operator<<( SvStream &, const ImageList & );

private:

	SAL_DLLPRIVATE const Bitmap &    ImplGetBitmap() const;
	SAL_DLLPRIVATE void             ImplSetBitmap( const Bitmap & rBitmap );

public:

                            AlphaMask();
							AlphaMask( const Bitmap & rBitmap );
                            AlphaMask( const AlphaMask & rAlphaMask );
                            AlphaMask( const Size & rSizePixel, BYTE* pEraseTransparency = NULL );
                            ~AlphaMask();

    AlphaMask &				operator=( const Bitmap & rBitmap );
	AlphaMask &				operator=( const AlphaMask & rAlphaMask ) { return (AlphaMask &) Bitmap::operator=( rAlphaMask ); }
	BOOL					operator!() const { return Bitmap::operator!(); }
    BOOL					operator==( const AlphaMask & rAlphaMask ) const { return Bitmap::operator==( rAlphaMask ); }
    BOOL					operator!=( const AlphaMask & rAlphaMask ) const { return Bitmap::operator!=( rAlphaMask ); }

    const MapMode &			GetPrefMapMode() const { return Bitmap::GetPrefMapMode(); }
    void					SetPrefMapMode( const MapMode & rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); }

    const Size &				GetPrefSize() const { return Bitmap::GetPrefSize(); }
    void					SetPrefSize( const Size & rSize ) { Bitmap::SetPrefSize( rSize ); }

    Size					GetSizePixel() const { return Bitmap::GetSizePixel(); }
	void					SetSizePixel( const Size & rNewSize ) { Bitmap::SetSizePixel( rNewSize ); }

    ULONG					GetSizeBytes() const { return Bitmap::GetSizeBytes(); }
	ULONG					GetChecksum() const { return Bitmap::GetChecksum(); }


public:

    BOOL                    Crop( const Rectangle & rRectPixel );
    BOOL                    Expand( ULONG nDX, ULONG nDY, BYTE* pInitTransparency = NULL );
    BOOL                    CopyPixel( const Rectangle & rRectDst, const Rectangle & rRectSrc, const AlphaMask* pAlphaSrc = NULL );
    BOOL                    Erase( BYTE cTransparency );
    BOOL                    Invert();
    BOOL                    Mirror( ULONG nMirrorFlags );
    BOOL                    Scale( const Size & rNewSize, ULONG nScaleFlag = BMP_SCALE_FAST );
    BOOL                    Scale( const double & rScaleX, const double & rScaleY, ULONG nScaleFlag = BMP_SCALE_FAST );
    BOOL                    Rotate( long nAngle10, BYTE cFillTransparency );
    BOOL                    Replace( const Bitmap & rMask, BYTE rReplaceTransparency );
    BOOL                    Replace( BYTE cSearchTransparency, BYTE cReplaceTransparency, ULONG nTol = 0UL );
    BOOL                    Replace( BYTE* pSearchTransparencies, BYTE* pReplaceTransparencies,
									 ULONG nColorCount, ULONG* pTols = NULL );


public:

    BOOL					Read( SvStream & rIStm, BOOL bFileHeader = TRUE ) { return Bitmap::Read( rIStm, bFileHeader ); }
	BOOL					Write( SvStream & rOStm, BOOL bCompressed = TRUE, BOOL bFileHeader = TRUE ) const { return Bitmap::Write( rOStm, bCompressed, bFileHeader ); }

	friend VCL_DLLPUBLIC SvStream & operator<<( SvStream & rOStm, const BitmapEx & rBitmapEx );
	friend VCL_DLLPUBLIC SvStream & operator>>( SvStream & rIStm, BitmapEx & rBitmapEx );
};

#endif // _SV_ALPHA_HXX

Lines 201-207 Link Here

(-)vcl/inc/bitmap.hxx (-1 / +3 lines)
201	// --------------------	201	// --------------------
202	// - FilterParameters -	202	// - FilterParameters -
203	// --------------------	203	// --------------------
204		204	class Bitmap;
		205	class BitmapEx;
205	class VCL_DLLPUBLIC BmpFilterParam	206	class VCL_DLLPUBLIC BmpFilterParam
206	{	207	{
207	friend class Bitmap;	208	friend class Bitmap;
Lines 276-281 Link Here
276	class RMBitmap;	277	class RMBitmap;
277	class GDIMetaFile;	278	class GDIMetaFile;
278	class AlphaMask;	279	class AlphaMask;
		280	class OutputDevice;
279		281
280	struct BitmapSystemData	282	struct BitmapSystemData
281	{	283	{

Lines 330-336 Link Here

(-)vcl/inc/outdev.hxx (-1 / +1 lines)
330	// ----------------	330	// ----------------
331	// - OutputDevice -	331	// - OutputDevice -
332	// ----------------	332	// ----------------
333		333	class VirtualDevice;
334	class VCL_DLLPUBLIC OutputDevice : public Resource	334	class VCL_DLLPUBLIC OutputDevice : public Resource
335	{	335	{
336	friend class Application;	336	friend class Application;

Return to issue 50599

Lines 397-407 Link Here

(-)bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx (-9 / +10 lines)
397	*/	397	*/
398	static void cpp_vtable_call()	398	static void cpp_vtable_call()
399	{	399	{
400	volatile sal_Int64 nRegReturn;	400	sal_Int64 nRegReturn;
401	int nFunctionIndex;	401	int nFunctionIndex;
402	void** pCallStack;	402	void** pCallStack;
403	int vTableOffset;	403	int vTableOffset;
404		404
		405	void * pRegReturn = &nRegReturn;
		406
405	__asm__( "st %%i0, %0\n\t"	407	__asm__( "st %%i0, %0\n\t"
406	"st %%i1, %1\n\t"	408	"st %%i1, %1\n\t"
407	"st %%i2, %2\n\t"	409	"st %%i2, %2\n\t"
Lines 420-460 Link Here
420	case typelib_TypeClass_BYTE:	422	case typelib_TypeClass_BYTE:
421	__asm__( "ld %0, %%l0\n\t"	423	__asm__( "ld %0, %%l0\n\t"
422	"ldsb [%%l0], %%i0\n"	424	"ldsb [%%l0], %%i0\n"
423	: : "m"(&nRegReturn) );	425	: : "m"(pRegReturn) );
424	break;	426	break;
425	case typelib_TypeClass_CHAR:	427	case typelib_TypeClass_CHAR:
426	case typelib_TypeClass_SHORT:	428	case typelib_TypeClass_SHORT:
427	case typelib_TypeClass_UNSIGNED_SHORT:	429	case typelib_TypeClass_UNSIGNED_SHORT:
428	__asm__( "ld %0, %%l0\n\t"	430	__asm__( "ld %0, %%l0\n\t"
429	"ldsh [%%l0], %%i0\n"	431	"ldsh [%%l0], %%i0\n"
430	: : "m"(&nRegReturn) );	432	: : "m"(pRegReturn) );
431	break;	433	break;
432	case typelib_TypeClass_HYPER:	434	case typelib_TypeClass_HYPER:
433	case typelib_TypeClass_UNSIGNED_HYPER:	435	case typelib_TypeClass_UNSIGNED_HYPER:
434
435	__asm__( "ld %0, %%l0\n\t"	436	__asm__( "ld %0, %%l0\n\t"
436	"ld [%%l0], %%i0\n\t"	437	"ld [%%l0], %%i0\n\t"
437	"ld %1, %%l0\n\t"	438	"add %%l0, 4, %%l0\n\t"
438	"ld [%%l0], %%i1\n\t"	439	"ld [%%l0], %%i1\n\t"
439	: : "m"(&nRegReturn), "m"(((long*)&nRegReturn) +1) );	440	: : "m"(pRegReturn) );
440		441
441	break;	442	break;
442	case typelib_TypeClass_FLOAT:	443	case typelib_TypeClass_FLOAT:
443	__asm__( "ld %0, %%l0\n\t"	444	__asm__( "ld %0, %%l0\n\t"
444	"ld [%%l0], %%f0\n"	445	"ld [%%l0], %%f0\n"
445	: : "m"(&nRegReturn) );	446	: : "m"(pRegReturn) );
446	break;	447	break;
447	case typelib_TypeClass_DOUBLE:	448	case typelib_TypeClass_DOUBLE:
448	__asm__( "ld %0, %%l0\n\t"	449	__asm__( "ld %0, %%l0\n\t"
449	"ldd [%%l0], %%f0\n"	450	"ldd [%%l0], %%f0\n"
450	: : "m"(&nRegReturn) );	451	: : "m"(pRegReturn) );
451	break;	452	break;
452	case typelib_TypeClass_VOID:	453	case typelib_TypeClass_VOID:
453	break;	454	break;
454	default:	455	default:
455	__asm__( "ld %0, %%l0\n\t"	456	__asm__( "ld %0, %%l0\n\t"
456	"ld [%%l0], %%i0\n"	457	"ld [%%l0], %%i0\n"
457	: : "m"(&nRegReturn) );	458	: : "m"(pRegReturn) );
458	break;	459	break;
459	}	460	}
460		461

Lines 3919-4024 Link Here

(-)config_office/configure.in (-100 lines)
3919	AC_SUBST(USE_XINERAMA)	3919	AC_SUBST(USE_XINERAMA)
3920	AC_SUBST(XINERAMA_LINK)	3920	AC_SUBST(XINERAMA_LINK)
3921		3921
3922	dnl ===================================================================
3923	dnl Test for the presence of Ant and that it works
3924	dnl ===================================================================
3925
3926	if test "$SOLAR_JAVA" != ""; then
3927	ANT_HOME=; export ANT_HOME
3928	WITH_ANT_HOME=; export WITH_ANT_HOME
3929	if test -z "$with_ant_home"; then
3930	AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat])
3931	else
3932	AC_PATH_PROGS(ANT, [jakarta-ant ant ant.sh ant.bat],,$with_ant_home/bin:$PATH)
3933	WITH_ANT_HOME=$with_ant_home
3934	fi
3935
3936	if test -z "$ANT"; then
3937	AC_MSG_ERROR([Ant not found - Make sure it's in the path or use --with-ant-home])
3938	else
3939	# resolve relative or absolute symlink
3940	while test -h "$ANT"; do
3941	a_cwd=`pwd`
3942	a_basename=`basename "$ANT"`
3943	a_script=`ls -l "$ANT" \| sed "s/.*${a_basename} -> //g"`
3944	cd "`dirname "$ANT"`"
3945	cd "`dirname "$a_script"`"
3946	ANT="`pwd`"/"`basename "$a_script"`"
3947	cd "$a_cwd"
3948	done
3949	AC_MSG_CHECKING([if $ANT works])
3950	cat > conftest.java << EOF
3951	public class conftest {
3952	int testmethod(int a, int b) {
3953	return a + b;
3954	}
3955	}
3956	EOF
3957
3958	cat > conftest.xml << EOF
3959	<project name="conftest" default="conftest">
3960	<target name="conftest">
3961	<javac srcdir="." includes="conftest.java">
3962	</javac>
3963	</target>
3964	</project>
3965	EOF
3966	oldJAVA_HOME=$JAVA_HOME
3967	if test "$JDK" = "gcj"; then
3968	JAVA_HOME=; export JAVA_HOME
3969	ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
3970	else
3971	ant_cmd="$ANT -buildfile conftest.xml 1>&2"
3972	fi
3973	AC_TRY_EVAL(ant_cmd)
3974	if test $? = 0 && test -f ./conftest.class ; then
3975	AC_MSG_RESULT([Ant works])
3976	if test -z "$WITH_ANT_HOME"; then
3977	ANT_HOME=`echo $ANT \| $SED -n "s/\/bin\/ant.*\$//p"`
3978	else
3979	ANT_HOME="$WITH_ANT_HOME"
3980	fi
3981	else
3982	echo "configure: Ant test failed" >&5
3983	cat conftest.java >&5
3984	cat conftest.xml >&5
3985	AC_MSG_WARN([Ant does not work - Some Java projects will not build!])
3986	ANT_HOME=""
3987	echo "Ant does not work - Some Java projects will not build!" >>warn
3988	fi
3989	JAVA_HOME=$oldJAVA_HOME
3990	rm -f conftest* core core.* *.core
3991	fi
3992	if test -z "$ANT_HOME"; then
3993	ANT_HOME="NO_ANT_HOME"
3994	fi
3995	AC_SUBST(ANT_HOME)
3996
3997	dnl Checking for ant.jar
3998	if test "$ANT_HOME" != "NO_ANT_HOME"; then
3999	AC_MSG_CHECKING([Ant lib directory])
4000	if test -f $ANT_HOME/lib/ant.jar; then
4001	ANT_LIB="$ANT_HOME/lib"
4002	else
4003	if test -f $ANT_HOME/ant.jar; then
4004	ANT_LIB="$ANT_HOME"
4005	else
4006	if test -f /usr/share/java/ant.jar; then
4007	ANT_LIB=/usr/share/java
4008	else
4009	if test -f /usr/share/ant-core/lib/ant.jar; then
4010	ANT_LIB=/usr/share/ant-core/lib
4011	else
4012	AC_MSG_ERROR([Ant libraries not found!])
4013	fi
4014	fi
4015	fi
4016	fi
4017	AC_MSG_RESULT([Ant lib directory found.])
4018	fi
4019	AC_SUBST(ANT_LIB)
4020	fi
4021
4022	AC_MSG_CHECKING([which languages to be built])	3922	AC_MSG_CHECKING([which languages to be built])
4023	WITH_LANG="$with_lang"	3923	WITH_LANG="$with_lang"
4024	if test -z "$WITH_LANG"; then	3924	if test -z "$WITH_LANG"; then

Lines 1687-1692 Link Here

(-)solenv/bin/modules/installer/epmfile.pm (+3 lines)
1687	my $target = "";	1687	my $target = "";
1688	if ( $installer::globals::compiler =~ /unxlngi/) { $target = "i586"; }	1688	if ( $installer::globals::compiler =~ /unxlngi/) { $target = "i586"; }
1689	if ( $installer::globals::compiler =~ /unxlngx/) { $target = "x86_64"; }	1689	if ( $installer::globals::compiler =~ /unxlngx/) { $target = "x86_64"; }
		1690	if ( $installer::globals::compiler =~ /unxlngs/) { $target = "sparc"; }
1690		1691
1691	my $systemcall = "$rpmcommand -bb $specfilename --target $target 2\>\&1 \|";	1692	my $systemcall = "$rpmcommand -bb $specfilename --target $target 2\>\&1 \|";
1692		1693
Lines 1867-1872 Link Here
1867	my $rpmdir;	1868	my $rpmdir;
1868	if ( $installer::globals::compiler =~ /unxlngi/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/i586"; }	1869	if ( $installer::globals::compiler =~ /unxlngi/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/i586"; }
1869	if ( $installer::globals::compiler =~ /unxlngx/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/x86_64"; }	1870	if ( $installer::globals::compiler =~ /unxlngx/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/x86_64"; }
		1871	if ( $installer::globals::compiler =~ /unxlngs/) { $rpmdir = "$installer::globals::epmoutpath/RPMS/sparc"; }
1870		1872
1871	my $systemcall = "mv $rpmdir/* $newdir"; # moving the rpms into the directory "RPMS"	1873	my $systemcall = "mv $rpmdir/* $newdir"; # moving the rpms into the directory "RPMS"
1872		1874
Lines 1891-1896 Link Here
1891	installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/x86_64");	1893	installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/x86_64");
1892	installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i586");	1894	installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i586");
1893	installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i386");	1895	installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i386");
		1896	installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/sparc");
1894	installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS");	1897	installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS");
1895		1898
1896	}	1899	}

Lines 58-65 Link Here

(-)filter/source/xsltfilter/XSLTFilterOLEExtracter.java (-6 / +5 lines)
58	import java.util.*;	58	import java.util.*;
59	import java.util.zip.Inflater;	59	import java.util.zip.Inflater;
60	import java.util.zip.Deflater;	60	import java.util.zip.Deflater;
61	import sun.misc.BASE64Decoder;	61	import Base64;
62	import sun.misc.BASE64Encoder;
63		62
64	//StarOffice Interfaces and UNO	63	//StarOffice Interfaces and UNO
65	import com.sun.star.bridge.XBridgeFactory;	64	import com.sun.star.bridge.XBridgeFactory;
Lines 161-167 Link Here
161	byte oledata[][]=new byte[1][oleLength];	160	byte oledata[][]=new byte[1][oleLength];
162	xInput.readBytes(oledata,oleLength);	161	xInput.readBytes(oledata,oleLength);
163	//return the base64 encoded string	162	//return the base64 encoded string
164	return new sun.misc.BASE64Encoder().encodeBuffer(oledata[0]);	163	return Base64.encodeBytes(oledata[0]);
165	}catch( Exception ex )	164	}catch( Exception ex )
166	{	165	{
167	ex.printStackTrace();	166	ex.printStackTrace();
Lines 225-231 Link Here
225	decompresser.end();	224	decompresser.end();
226		225
227	//return the base64 string of the uncompressed data	226	//return the base64 string of the uncompressed data
228	return new sun.misc.BASE64Encoder().encodeBuffer(result);	227	return Base64.encodeBytes(result);
229	}catch( Exception ex )	228	}catch( Exception ex )
230	{	229	{
231	ex.printStackTrace();	230	ex.printStackTrace();
Lines 255-261 Link Here
255	try	254	try
256	{	255	{
257	//Decode and write the data to an temp stream	256	//Decode and write the data to an temp stream
258	byte[] oledata = new sun.misc.BASE64Decoder().decodeBuffer(aBase64);	257	byte[] oledata = Base64.decode(aBase64);
259	m_RootStream = CreateTempFileStream( m_xMSF );	258	m_RootStream = CreateTempFileStream( m_xMSF );
260	XOutputStream xOutput = m_RootStream.getOutputStream();	259	XOutputStream xOutput = m_RootStream.getOutputStream();
261	xOutput.writeBytes(oledata);	260	xOutput.writeBytes(oledata);
Lines 308-314 Link Here
308	try	307	try
309	{	308	{
310	//decode the base64 string	309	//decode the base64 string
311	byte[] oledata = new sun.misc.BASE64Decoder().decodeBuffer(aBase64);	310	byte[] oledata = Base64.decode(aBase64);
312	//create a temp stream to write data to	311	//create a temp stream to write data to
313	XStream subStream = CreateTempFileStream( m_xMSF );	312	XStream subStream = CreateTempFileStream( m_xMSF );
314	XInputStream xInput = subStream.getInputStream();	313	XInputStream xInput = subStream.getInputStream();

Lines 105-116 Link Here

(-)filter/source/xsltfilter/makefile.mk (-2 / +2 lines)
105	#JARDIR=$(CLASSDIR)	105	#JARDIR=$(CLASSDIR)
106		106
107	JARCOMPRESS = TRUE	107	JARCOMPRESS = TRUE
108	JARCLASSDIRS = XSLTFilter.class XSLTransformer.class XSLTFilterOLEExtracter*.class	108	JARCLASSDIRS = XSLTFilter.class XSLTransformer.class XSLTFilterOLEExtracter*.class Base64.class
109	JARTARGET = $(TARGET).jar	109	JARTARGET = $(TARGET).jar
110	JARCLASSDIRS += XSLTXalanOLEExtracter*.class	110	JARCLASSDIRS += XSLTXalanOLEExtracter*.class
111		111
112	# --- Files --------------------------------------------------------	112	# --- Files --------------------------------------------------------
113	JAVACLASSFILES=$(CLASSDIR)$/XSLTFilter.class $(CLASSDIR)$/XSLTransformer.class $(CLASSDIR)$/XSLTFilterOLEExtracter.class	113	JAVACLASSFILES=$(CLASSDIR)$/XSLTFilter.class $(CLASSDIR)$/XSLTransformer.class $(CLASSDIR)$/XSLTFilterOLEExtracter.class $(CLASSDIR)$/Base64.class
114	#this class we need xalan.jar.	114	#this class we need xalan.jar.
115	JAVACLASSFILES+=$(CLASSDIR)$/XSLTXalanOLEExtracter.class	115	JAVACLASSFILES+=$(CLASSDIR)$/XSLTXalanOLEExtracter.class
116	.ENDIF	116	.ENDIF

Lines 75-114 Link Here

(-)vcl/inc/alpha.hxx (-25 / +25 lines)
75	// -------------	75	// -------------
76		76
77	class ImageList;	77	class ImageList;
78		78	class BitmapEx;
79	class VCL_DLLPUBLIC AlphaMask : private Bitmap	79	class VCL_DLLPUBLIC AlphaMask : private Bitmap
80	{	80	{
81	friend class BitmapEx;	81	friend class BitmapEx;
82	friend class OutputDevice;	82	friend class OutputDevice;
83	friend VCL_DLLPUBLIC SvStream& operator<<( SvStream&, const ImageList& );	83	friend VCL_DLLPUBLIC SvStream & operator<<( SvStream &, const ImageList & );
84		84
85	private:	85	private:
86		86
87	SAL_DLLPRIVATE const Bitmap& ImplGetBitmap() const;	87	SAL_DLLPRIVATE const Bitmap & ImplGetBitmap() const;
88	SAL_DLLPRIVATE void ImplSetBitmap( const Bitmap& rBitmap );	88	SAL_DLLPRIVATE void ImplSetBitmap( const Bitmap & rBitmap );
89		89
90	public:	90	public:
91		91
92	AlphaMask();	92	AlphaMask();
93	AlphaMask( const Bitmap& rBitmap );	93	AlphaMask( const Bitmap & rBitmap );
94	AlphaMask( const AlphaMask& rAlphaMask );	94	AlphaMask( const AlphaMask & rAlphaMask );
95	AlphaMask( const Size& rSizePixel, BYTE* pEraseTransparency = NULL );	95	AlphaMask( const Size & rSizePixel, BYTE* pEraseTransparency = NULL );
96	~AlphaMask();	96	~AlphaMask();
97		97
98	AlphaMask& operator=( const Bitmap& rBitmap );	98	AlphaMask & operator=( const Bitmap & rBitmap );
99	AlphaMask& operator=( const AlphaMask& rAlphaMask ) { return (AlphaMask&) Bitmap::operator=( rAlphaMask ); }	99	AlphaMask & operator=( const AlphaMask & rAlphaMask ) { return (AlphaMask &) Bitmap::operator=( rAlphaMask ); }
100	BOOL operator!() const { return Bitmap::operator!(); }	100	BOOL operator!() const { return Bitmap::operator!(); }
101	BOOL operator==( const AlphaMask& rAlphaMask ) const { return Bitmap::operator==( rAlphaMask ); }	101	BOOL operator==( const AlphaMask & rAlphaMask ) const { return Bitmap::operator==( rAlphaMask ); }
102	BOOL operator!=( const AlphaMask& rAlphaMask ) const { return Bitmap::operator!=( rAlphaMask ); }	102	BOOL operator!=( const AlphaMask & rAlphaMask ) const { return Bitmap::operator!=( rAlphaMask ); }
103		103
104	const MapMode& GetPrefMapMode() const { return Bitmap::GetPrefMapMode(); }	104	const MapMode & GetPrefMapMode() const { return Bitmap::GetPrefMapMode(); }
105	void SetPrefMapMode( const MapMode& rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); }	105	void SetPrefMapMode( const MapMode & rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); }
106		106
107	const Size& GetPrefSize() const { return Bitmap::GetPrefSize(); }	107	const Size & GetPrefSize() const { return Bitmap::GetPrefSize(); }
108	void SetPrefSize( const Size& rSize ) { Bitmap::SetPrefSize( rSize ); }	108	void SetPrefSize( const Size & rSize ) { Bitmap::SetPrefSize( rSize ); }
109		109
110	Size GetSizePixel() const { return Bitmap::GetSizePixel(); }	110	Size GetSizePixel() const { return Bitmap::GetSizePixel(); }
111	void SetSizePixel( const Size& rNewSize ) { Bitmap::SetSizePixel( rNewSize ); }	111	void SetSizePixel( const Size & rNewSize ) { Bitmap::SetSizePixel( rNewSize ); }
112		112
113	ULONG GetSizeBytes() const { return Bitmap::GetSizeBytes(); }	113	ULONG GetSizeBytes() const { return Bitmap::GetSizeBytes(); }
114	ULONG GetChecksum() const { return Bitmap::GetChecksum(); }	114	ULONG GetChecksum() const { return Bitmap::GetChecksum(); }
Lines 117-132 Link Here
117		117
118	public:	118	public:
119		119
120	BOOL Crop( const Rectangle& rRectPixel );	120	BOOL Crop( const Rectangle & rRectPixel );
121	BOOL Expand( ULONG nDX, ULONG nDY, BYTE* pInitTransparency = NULL );	121	BOOL Expand( ULONG nDX, ULONG nDY, BYTE* pInitTransparency = NULL );
122	BOOL CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const AlphaMask* pAlphaSrc = NULL );	122	BOOL CopyPixel( const Rectangle & rRectDst, const Rectangle & rRectSrc, const AlphaMask* pAlphaSrc = NULL );
123	BOOL Erase( BYTE cTransparency );	123	BOOL Erase( BYTE cTransparency );
124	BOOL Invert();	124	BOOL Invert();
125	BOOL Mirror( ULONG nMirrorFlags );	125	BOOL Mirror( ULONG nMirrorFlags );
126	BOOL Scale( const Size& rNewSize, ULONG nScaleFlag = BMP_SCALE_FAST );	126	BOOL Scale( const Size & rNewSize, ULONG nScaleFlag = BMP_SCALE_FAST );
127	BOOL Scale( const double& rScaleX, const double& rScaleY, ULONG nScaleFlag = BMP_SCALE_FAST );	127	BOOL Scale( const double & rScaleX, const double & rScaleY, ULONG nScaleFlag = BMP_SCALE_FAST );
128	BOOL Rotate( long nAngle10, BYTE cFillTransparency );	128	BOOL Rotate( long nAngle10, BYTE cFillTransparency );
129	BOOL Replace( const Bitmap& rMask, BYTE rReplaceTransparency );	129	BOOL Replace( const Bitmap & rMask, BYTE rReplaceTransparency );
130	BOOL Replace( BYTE cSearchTransparency, BYTE cReplaceTransparency, ULONG nTol = 0UL );	130	BOOL Replace( BYTE cSearchTransparency, BYTE cReplaceTransparency, ULONG nTol = 0UL );
131	BOOL Replace( BYTE* pSearchTransparencies, BYTE* pReplaceTransparencies,	131	BOOL Replace( BYTE* pSearchTransparencies, BYTE* pReplaceTransparencies,
132	ULONG nColorCount, ULONG* pTols = NULL );	132	ULONG nColorCount, ULONG* pTols = NULL );
Lines 139-149 Link Here
139		139
140	public:	140	public:
141		141
142	BOOL Read( SvStream& rIStm, BOOL bFileHeader = TRUE ) { return Bitmap::Read( rIStm, bFileHeader ); }	142	BOOL Read( SvStream & rIStm, BOOL bFileHeader = TRUE ) { return Bitmap::Read( rIStm, bFileHeader ); }
143	BOOL Write( SvStream& rOStm, BOOL bCompressed = TRUE, BOOL bFileHeader = TRUE ) const { return Bitmap::Write( rOStm, bCompressed, bFileHeader ); }	143	BOOL Write( SvStream & rOStm, BOOL bCompressed = TRUE, BOOL bFileHeader = TRUE ) const { return Bitmap::Write( rOStm, bCompressed, bFileHeader ); }
144		144
145	friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx );	145	friend VCL_DLLPUBLIC SvStream & operator<<( SvStream & rOStm, const BitmapEx & rBitmapEx );
146	friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, BitmapEx& rBitmapEx );	146	friend VCL_DLLPUBLIC SvStream & operator>>( SvStream & rIStm, BitmapEx & rBitmapEx );
147	};	147	};
148		148
149	#endif // _SV_ALPHA_HXX	149	#endif // _SV_ALPHA_HXX