diff options
Diffstat (limited to 'patches/src680/cws-sixtyfour09.diff')
| -rw-r--r-- | patches/src680/cws-sixtyfour09.diff | 102 |
1 files changed, 102 insertions, 0 deletions
diff --git a/patches/src680/cws-sixtyfour09.diff b/patches/src680/cws-sixtyfour09.diff new file mode 100644 index 000000000..69e2a828a --- /dev/null +++ b/patches/src680/cws-sixtyfour09.diff @@ -0,0 +1,102 @@ +Index: tools/inc/stream.hxx +=================================================================== +RCS file: /cvs/util/tools/inc/stream.hxx,v +retrieving revision 1.11 +retrieving revision 1.11.60.1 +diff -u -p -u -p -r1.11 -r1.11.60.1 +--- tools/inc/stream.hxx 19 Jul 2006 17:12:49 -0000 1.11 ++++ tools/inc/stream.hxx 9 Nov 2006 15:29:31 -0000 1.11.60.1 +@@ -104,7 +104,7 @@ typedef sal_uInt16 StreamMode; + #define STREAM_STD_READWRITE (STREAM_READWRITE | STREAM_SHARE_DENYALL) + + #define STREAM_SEEK_TO_BEGIN 0L +-#define STREAM_SEEK_TO_END 0xFFFFFFFFL ++#define STREAM_SEEK_TO_END ULONG_MAX + + #define NUMBERFORMAT_INT_BIGENDIAN (sal_uInt16)0x0000 + #define NUMBERFORMAT_INT_LITTLEENDIAN (sal_uInt16)0xFFFF +Index: svx/source/inc/fmshimp.hxx +=================================================================== +RCS file: /cvs/graphics/svx/source/inc/fmshimp.hxx,v +retrieving revision 1.30 +retrieving revision 1.30.82.1 +diff -u -p -u -p -r1.30 -r1.30.82.1 +--- svx/source/inc/fmshimp.hxx 12 Oct 2006 12:50:50 -0000 1.30 ++++ svx/source/inc/fmshimp.hxx 15 Nov 2006 13:54:50 -0000 1.30.82.1 +@@ -221,7 +221,7 @@ class FmCursorActionThread; + struct SAL_DLLPRIVATE CursorActionDescription + { + FmCursorActionThread* pThread; +- sal_uInt32 nFinishedEvent; ++ ULONG nFinishedEvent; + // we want to do the cleanup of the thread in the main thread so we post an event to ourself + sal_Bool bCanceling; + // this thread is being canceled +@@ -234,11 +234,11 @@ class FmFormPage; + struct SAL_DLLPRIVATE FmLoadAction + { + FmFormPage* pPage; +- sal_uInt32 nEventId; ++ ULONG nEventId; + sal_uInt16 nFlags; + + FmLoadAction( ) : pPage( NULL ), nEventId( 0 ), nFlags( 0 ) { } +- FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, sal_uInt32 _nEventId ) ++ FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, ULONG _nEventId ) + :pPage( _pPage ), nEventId( _nEventId ), nFlags( _nFlags ) + { + } +Index: dtrans/source/X11/X11_droptarget.cxx +=================================================================== +RCS file: /cvs/gsl/dtrans/source/X11/X11_droptarget.cxx,v +retrieving revision 1.10 +retrieving revision 1.10.20.1 +diff -u -p -u -p -r1.10 -r1.10.20.1 +--- dtrans/source/X11/X11_droptarget.cxx 17 Sep 2006 16:53:04 -0000 1.10 ++++ dtrans/source/X11/X11_droptarget.cxx 9 Nov 2006 15:24:05 -0000 1.10.20.1 +@@ -83,7 +83,7 @@ void DropTarget::initialize( const Seque + m_xSelectionManager = static_cast< XDragSource* >(m_pSelectionManager); + m_pSelectionManager->initialize( arguments ); + +- sal_Int32 aWindow = None; ++ sal_Size aWindow = None; + arguments.getConstArray()[1] >>= aWindow; + m_pSelectionManager->registerDropTarget( aWindow, this ); + m_aTargetWindow = aWindow; +Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx +=================================================================== +RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v +retrieving revision 1.12 +retrieving revision 1.12.10.1 +diff -u -p -u -p -r1.12 -r1.12.10.1 +--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 27 Sep 2006 10:54:01 -0000 1.12 ++++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx 9 Nov 2006 15:19:07 -0000 1.12.10.1 +@@ -192,6 +192,28 @@ bool GnuInfo::initialize(vector<pair<OUS + } + } + } ++ ++#ifdef X86_64 ++ //Make one last final legacy attempt on x86_64 in case the distro placed it in lib64 instead ++ if (!bRt && m_sJavaHome != rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib"))) ++ { ++ m_sHome = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///usr/lib64")); ++ for(i_path ip = libpaths.begin(); ip != libpaths.end(); ip++) ++ { ++ //Construct an absolute path to the possible runtime ++ OUString usRt= m_sHome + *ip; ++ DirectoryItem item; ++ if(DirectoryItem::get(usRt, item) == File::E_None) ++ { ++ //found runtime lib ++ m_sRuntimeLibrary = usRt; ++ bRt = true; ++ break; ++ } ++ } ++ } ++#endif ++ + if (!bRt) + return false; + |