rpms/openoffice.org/devel workspace.aw024.patch, NONE, 1.1 workspace.cmcfixes29.patch, NONE, 1.1 workspace.dba22b.patch, NONE, 1.1 workspace.dr51.patch, NONE, 1.1 workspace.os89.patch, NONE, 1.1 workspace.sixtyfour09.patch, NONE, 1.1 workspace.sixtyfour10.patch, NONE, 1.1 workspace.thbpp6.patch, NONE, 1.1 workspace.vcl69.patch, NONE, 1.1 workspace.vcl70.patch, NONE, 1.1 workspace.vcl71.patch, NONE, 1.1 openoffice.org.spec, 1.976, 1.977 openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch, 1.1, NONE openoffice.org-2.0.3.ooo67644.sw.spacing.patch, 1.1, NONE openoffice.org-2.0.3.ooo67716.svx.overflow.patch, 1.1, NONE openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch, 1.1, NONE openoffice.org-2.0.4.ooo69780.goodies.hugetile.patch, 1.1, NONE openoffice.org-2.0.4.ooo70782.secondaryfpicker.atk.patch, 1.1, NONE openoffice.org-2.0.4.ooo70835.vcl.minimizealerts.patch, 1.1, NONE openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch, 1.2, NONE openoffice.org-2.0.4.ooo71076.dtrans.64bitdragdrop.patch, 1.1, NONE openoffice! .org-2.0.4.ooo71077.sc.purevirtual.patch, 1.1, NONE openoffice.org-2.0.4.ooo71285.tools.ulongmax.patch, 1.1, NONE openoffice.org-2.0.4.ooo71562.svx.64bitcrash.patch, 1.1, NONE openoffice.org-2.0.4.ooo71570.psprint.noonecopy.patch, 1.1, NONE openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch, 1.2, NONE openoffice.org-2.1.0.ooo71662.dbaccess.noasync.patch, 1.2, NONE openoffice.org-2.1.0.ooo71815.bridges.x86_64.patch, 1.2, NONE openoffice.org-2.1.0.ooo72058.vcl.dontalwaysaddunderline.patch, 1.1, NONE openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Dec 18 16:00:54 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20812
Modified Files:
openoffice.org.spec
Added Files:
workspace.aw024.patch workspace.cmcfixes29.patch
workspace.dba22b.patch workspace.dr51.patch
workspace.os89.patch workspace.sixtyfour09.patch
workspace.sixtyfour10.patch workspace.thbpp6.patch
workspace.vcl69.patch workspace.vcl70.patch
workspace.vcl71.patch
Removed Files:
openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
openoffice.org-2.0.3.ooo67644.sw.spacing.patch
openoffice.org-2.0.3.ooo67716.svx.overflow.patch
openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
openoffice.org-2.0.4.ooo69780.goodies.hugetile.patch
openoffice.org-2.0.4.ooo70782.secondaryfpicker.atk.patch
openoffice.org-2.0.4.ooo70835.vcl.minimizealerts.patch
openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch
openoffice.org-2.0.4.ooo71076.dtrans.64bitdragdrop.patch
openoffice.org-2.0.4.ooo71077.sc.purevirtual.patch
openoffice.org-2.0.4.ooo71285.tools.ulongmax.patch
openoffice.org-2.0.4.ooo71562.svx.64bitcrash.patch
openoffice.org-2.0.4.ooo71570.psprint.noonecopy.patch
openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch
openoffice.org-2.1.0.ooo71662.dbaccess.noasync.patch
openoffice.org-2.1.0.ooo71815.bridges.x86_64.patch
openoffice.org-2.1.0.ooo72058.vcl.dontalwaysaddunderline.patch
openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch
Log Message:
match patches to upstream workspaces
workspace.aw024.patch:
binfilter/inc/bf_svx/svdobj.hxx | 2 +-
inc/bf_svx/svdobj.hxx | 0
inc/svdobj.hxx | 0
svx/inc/svdobj.hxx | 2 +-
4 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE workspace.aw024.patch ---
Index: inc/svdobj.hxx
===================================================================
RCS file: /cvs/graphics/svx/inc/svdobj.hxx,v
retrieving revision 1.41
diff -u -r1.41 svdobj.hxx
--- openoffice.org.orig/svx/inc/svdobj.hxx 19 Jun 2006 14:44:11 -0000 1.41
+++ openoffice.org/svx/inc/svdobj.hxx 31 Oct 2006 14:28:29 -0000
@@ -323,7 +323,7 @@
{}
virtual ~SdrObjUserData();
- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
UINT32 GetInventor() const { return nInventor; }
UINT16 GetId() const { return nIdentifier; }
//BFS01virtual void WriteData(SvStream& rOut);
Index: inc/bf_svx/svdobj.hxx
===================================================================
RCS file: /cvs/framework/binfilter/inc/bf_svx/svdobj.hxx,v
retrieving revision 1.5
diff -u -r1.5 svdobj.hxx
--- openoffice.org.orig/binfilter/inc/bf_svx/svdobj.hxx 9 Sep 2005 14:38:27 -0000 1.5
+++ openoffice.org/binfilter/inc/bf_svx/svdobj.hxx 1 Nov 2006 09:42:05 -0000
@@ -265,7 +265,7 @@
{}
virtual ~SdrObjUserData();
- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL;
+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0;
UINT32 GetInventor() const { return nInventor; }
UINT16 GetId() const { return nIdentifier; }
virtual void WriteData(SvStream& rOut);
workspace.cmcfixes29.patch:
config_office/configure.in | 3 ++-
extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 2 +-
extensions/source/plugin/unx/makefile.mk | 4 ++--
extensions/source/plugin/unx/npwrap.cxx | 2 +-
source/plugin/inc/plugin/unx/plugcon.hxx | 0
source/plugin/unx/makefile.mk | 0
source/plugin/unx/npwrap.cxx | 0
7 files changed, 6 insertions(+), 5 deletions(-)
--- NEW FILE workspace.cmcfixes29.patch ---
Index: source/plugin/inc/plugin/unx/plugcon.hxx
===================================================================
RCS file: /cvs/util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx,v
retrieving revision 1.9
diff -u -r1.9 plugcon.hxx
--- openoffice.org.orig/extensions/source/plugin/inc/plugin/unx/plugcon.hxx 20 Jan 2006 12:58:34 -0000 1.9
+++ openoffice.org/extensions/source/plugin/inc/plugin/unx/plugcon.hxx 18 Apr 2006 09:59:51 -0000
@@ -69,7 +69,7 @@
#if defined USE_MOTIF
#include <Xm/DrawingA.h>
#else
-#include <X11/Xaw/Label.h>
+#include <X11/Composite.h>
#endif
#include <X11/Xatom.h>
#define XP_UNIX
Index: source/plugin/unx/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/plugin/unx/makefile.mk,v
retrieving revision 1.9
diff -u -r1.9 makefile.mk
--- openoffice.org.orig/extensions/source/plugin/unx/makefile.mk 20 Jan 2006 12:59:15 -0000 1.9
+++ openoffice.org/extensions/source/plugin/unx/makefile.mk 18 Apr 2006 09:59:51 -0000
@@ -72,9 +72,9 @@
APP1STDLIBS+=-lXm -lXt -lXext -lX11 -ldl
.ELSE
.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
-APP1STDLIBS+=-lXaw -lXt -lXext -lX11
+APP1STDLIBS+=-lXt -lXext -lX11
.ELSE
-APP1STDLIBS+=-lXaw -lXt -lXext -lX11 -ldl
+APP1STDLIBS+=-lXt -lXext -lX11 -ldl
.ENDIF
.ENDIF
Index: source/plugin/unx/npwrap.cxx
===================================================================
RCS file: /cvs/util/extensions/source/plugin/unx/npwrap.cxx,v
retrieving revision 1.12
diff -u -r1.12 npwrap.cxx
--- openoffice.org.orig/extensions/source/plugin/unx/npwrap.cxx 8 Sep 2005 19:56:16 -0000 1.12
+++ openoffice.org/extensions/source/plugin/unx/npwrap.cxx 18 Apr 2006 09:59:52 -0000
@@ -117,7 +117,7 @@
xmDrawingAreaWidgetClass,
#else
"",
- labelWidgetClass,
+ compositeWidgetClass,
#endif
shell,
XtNwidth, 200,
diff -ru config_office.orig/configure.in config_office/configure.in
--- openoffice.org.orig/config_office/configure.in 2006-04-18 11:00:38.000000000 +0100
+++ openoffice.org/config_office/configure.in 2006-04-18 11:02:40.000000000 +0100
@@ -3323,7 +3323,7 @@
AC_PATH_X
AC_PATH_XTRA
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])])
+ AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt include headers not found])])
if test "x$x_includes" = "x"; then
x_includes="/usr/include"
@@ -3431,6 +3431,7 @@
AC_MSG_RESULT([internal])
SYSTEM_NAS=NO
ENABLE_NAS=YES
+ AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])])
BUILD_TYPE="$BUILD_TYPE NAS"
dnl ===================================================================
dnl Check whether xmkmf program can be used, x systems only
workspace.dba22b.patch:
dlg/dbwizsetup.cxx | 116 ++++++++++++++++++++++++++++++++++++++----------
inc/AsyncronousLink.hxx | 2
2 files changed, 95 insertions(+), 23 deletions(-)
--- NEW FILE workspace.dba22b.patch ---
Index: source/ui/dlg/dbwizsetup.cxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/ui/dlg/dbwizsetup.cxx,v
retrieving revision 1.22
retrieving revision 1.22.40.1
diff -u -r1.22 -r1.22.40.1
--- openoffice.org.orig/dbaccess/source/ui/dlg/dbwizsetup.cxx 18 Oct 2006 13:30:58 -0000 1.22
+++ openoffice.org/dbaccess/source/ui/dlg/dbwizsetup.cxx 4 Dec 2006 15:03:44 -0000 1.22.40.1
@@ -114,15 +114,17 @@
#ifndef DBAUI_ASYNCRONOUSLINK_HXX
#include "AsyncronousLink.hxx"
#endif
+#ifndef _FILEDLGHELPER_HXX
+#include <sfx2/filedlghelper.hxx>
+#endif
+
+/** === begin UNO includes === **/
#ifndef _COM_SUN_STAR_FRAME_XSTORABLE_HPP_
#include <com/sun/star/frame/XStorable.hpp>
#endif
#ifndef _COM_SUN_STAR_UNO_XNAMINGSERVICE_HPP_
#include <com/sun/star/uno/XNamingService.hpp>
#endif
-#ifndef _FILEDLGHELPER_HXX
-#include <sfx2/filedlghelper.hxx>
-#endif
#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#endif
@@ -138,9 +140,6 @@
#ifndef _COM_SUN_STAR_FRAME_FRAMESEARCHFLAG_HPP_
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#endif
-#ifndef _DBAUI_LINKEDDOCUMENTS_HXX_
-#include "linkeddocuments.hxx"
-#endif
#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_
#include <com/sun/star/frame/XComponentLoader.hpp>
#endif
@@ -165,6 +164,17 @@
#ifndef _COM_SUN_STAR_IO_IOEXCEPTION_HPP_
#include <com/sun/star/io/IOException.hpp>
#endif
+#ifndef _COM_SUN_STAR_FRAME_XTERMINATELISTENER_HPP_
+#include <com/sun/star/frame/XTerminateListener.hpp>
+#endif
+#ifndef _COM_SUN_STAR_FRAME_XDESKTOP_HPP_
+#include <com/sun/star/frame/XDesktop.hpp>
+#endif
+/** === end UNO includes === **/
+
+#ifndef _DBAUI_LINKEDDOCUMENTS_HXX_
+#include "linkeddocuments.hxx"
+#endif
#ifndef SVTOOLS_FILENOTATION_HXX_
#include <svtools/filenotation.hxx>
#endif
@@ -1185,38 +1195,99 @@
namespace
{
// .............................................................................
- class AsyncLoader
+ typedef ::cppu::WeakImplHelper1 < XTerminateListener
+ > AsyncLoader_Base;
+ class AsyncLoader : public AsyncLoader_Base
{
private:
Reference< XComponentLoader > m_xFrameLoader;
+ Reference< XDesktop > m_xDesktop;
::rtl::OUString m_sURL;
OAsyncronousLink m_aAsyncCaller;
public:
- AsyncLoader( const Reference< XComponentLoader >& _rxLoader, const ::rtl::OUString& _rURL )
- :m_xFrameLoader( _rxLoader )
- ,m_sURL( _rURL )
- ,m_aAsyncCaller( LINK( this, AsyncLoader, OnOpenDocument ) )
+ AsyncLoader( const Reference< XMultiServiceFactory >& _rxORB, const ::rtl::OUString& _rURL );
+
+ void doLoadAsync();
+
+ // XTerminateListener
+ virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException);
+ virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException);
+ // XEventListener
+ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+
+ private:
+ DECL_LINK( OnOpenDocument, void* );
+ };
+
+ // .............................................................................
+ AsyncLoader::AsyncLoader( const Reference< XMultiServiceFactory >& _rxORB, const ::rtl::OUString& _rURL )
+ :m_sURL( _rURL )
+ ,m_aAsyncCaller( LINK( this, AsyncLoader, OnOpenDocument ) )
+ {
+ try
+ {
+ m_xDesktop.set( _rxORB->createInstance( SERVICE_FRAME_DESKTOP ), UNO_QUERY_THROW );
+ m_xFrameLoader.set( m_xDesktop, UNO_QUERY_THROW );
+ }
+ catch( const Exception& )
{
+ DBG_UNHANDLED_EXCEPTION();
}
+ }
+
+ // .............................................................................
+ void AsyncLoader::doLoadAsync()
+ {
+ OSL_ENSURE( !m_aAsyncCaller.IsRunning(), "AsyncLoader:doLoadAsync: already running!" );
- void doLoadAsync()
+ acquire();
+ try
{
- m_aAsyncCaller.Call( NULL );
+ if ( m_xDesktop.is() )
+ m_xDesktop->addTerminateListener( this );
}
+ catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); }
- private:
- DECL_LINK( OnOpenDocument, void* );
- };
+ m_aAsyncCaller.Call( NULL );
+ }
// .............................................................................
IMPL_LINK( AsyncLoader, OnOpenDocument, void*, /*_pEmptyArg*/ )
{
- m_xFrameLoader->loadComponentFromURL( m_sURL,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ), FrameSearchFlag::ALL, Sequence<PropertyValue >() );
- delete this;
+ try
+ {
+ if ( m_xFrameLoader.is() )
+ m_xFrameLoader->loadComponentFromURL( m_sURL,
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ), FrameSearchFlag::ALL, Sequence<PropertyValue >() );
+ }
+ catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); }
+
+ try
+ {
+ if ( m_xDesktop.is() )
+ m_xDesktop->removeTerminateListener( this );
+ }
+ catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); }
+
+ release();
return 0L;
}
+
+ // .............................................................................
+ void SAL_CALL AsyncLoader::queryTermination( const EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException)
+ {
+ throw TerminationVetoException();
+ }
+
+ // .............................................................................
+ void SAL_CALL AsyncLoader::notifyTermination( const EventObject& /*Event*/ ) throw (RuntimeException)
+ {
+ }
+ // .............................................................................
+ void SAL_CALL AsyncLoader::disposing( const EventObject& /*Source*/ ) throw (RuntimeException)
+ {
+ }
}
// -----------------------------------------------------------------------------
@@ -1234,15 +1305,14 @@
Reference< XComponentLoader > xFrameLoader;
try
{
- xFrameLoader = Reference< XComponentLoader >( getORB()->createInstance( SERVICE_FRAME_DESKTOP ), UNO_QUERY_THROW );
+ AsyncLoader* pAsyncLoader = new AsyncLoader( getORB(), m_pGeneralPage->GetSelectedDocument().sURL );
+ ::rtl::Reference< AsyncLoader > xKeepAlive( pAsyncLoader );
+ pAsyncLoader->doLoadAsync();
}
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
}
-
- AsyncLoader* pAsyncLoader = new AsyncLoader( xFrameLoader, m_pGeneralPage->GetSelectedDocument().sURL );
- pAsyncLoader->doLoadAsync();
return sal_True;
}
Index: source/ui/inc/AsyncronousLink.hxx
===================================================================
RCS file: /cvs/dba/dbaccess/source/ui/inc/AsyncronousLink.hxx,v
retrieving revision 1.3
retrieving revision 1.3.236.1
diff -u -r1.3 -r1.3.236.1
--- openoffice.org.orig/dbaccess/source/ui/inc/AsyncronousLink.hxx 8 Sep 2005 15:14:42 -0000 1.3
+++ openoffice.org/dbaccess/source/ui/inc/AsyncronousLink.hxx 4 Dec 2006 15:04:49 -0000 1.3.236.1
@@ -82,6 +82,8 @@
void Call(void* _pArgument = NULL);
void CancelCall();
+ bool IsRunning() const { return m_nEventId != 0; }
+
protected:
DECL_LINK(OnAsyncCall, void*);
};
workspace.dr51.patch:
sc/source/ui/inc/csvcontrol.hxx | 2 +-
source/ui/inc/csvcontrol.hxx | 0
2 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE workspace.dr51.patch ---
Index: source/ui/inc/csvcontrol.hxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/inc/csvcontrol.hxx,v
retrieving revision 1.13
diff -u -r1.13 csvcontrol.hxx
--- openoffice.org.orig/sc/source/ui/inc/csvcontrol.hxx 8 Sep 2005 21:17:47 -0000 1.13
+++ openoffice.org/sc/source/ui/inc/csvcontrol.hxx 1 Nov 2006 14:51:16 -0000
@@ -444,7 +444,7 @@
protected:
/** Derived classes create a new accessible object here. */
- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL;
+ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0;
};
workspace.os89.patch:
source/dialog/cuihyperdlg.cxx | 0
source/ui/envelp/label.src | 0
source/ui/ribbar/inputwin.cxx | 0
svx/source/dialog/cuihyperdlg.cxx | 2 +-
sw/source/ui/envelp/label.src | 2 +-
sw/source/ui/ribbar/inputwin.cxx | 13 ++++++-------
6 files changed, 8 insertions(+), 9 deletions(-)
--- NEW FILE workspace.os89.patch ---
Index: source/ui/ribbar/inputwin.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/ribbar/inputwin.cxx,v
retrieving revision 1.13
diff -u -r1.13 inputwin.cxx
--- openoffice.org.orig/sw/source/ui/ribbar/inputwin.cxx 9 Sep 2005 10:44:29 -0000 1.13
+++ openoffice.org/sw/source/ui/ribbar/inputwin.cxx 26 Jul 2006 11:53:19 -0000
@@ -329,14 +329,13 @@
switch ( nCurID )
{
case FN_FORMULA_CALC :
- {
- Point aBL = GetItemRect( FN_FORMULA_CALC ).BottomLeft();
- Point aPt(aBL.X(), aBL.Y());
- aPopMenu.Execute( this, aPt );
- }
- }
+ aPopMenu.Execute( this, GetItemRect( FN_FORMULA_CALC ), POPUPMENU_NOMOUSEUPCLOSE );
+ break;
+ default:
+ break;
+ }
- return TRUE;
+ return TRUE;
}
//==================================================================
Index: source/dialog/cuihyperdlg.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/cuihyperdlg.cxx,v
retrieving revision 1.4
diff -u -r1.4 cuihyperdlg.cxx
--- openoffice.org.orig/svx/source/dialog/cuihyperdlg.cxx 8 Sep 2005 20:52:04 -0000 1.4
+++ openoffice.org/svx/source/dialog/cuihyperdlg.cxx 24 Jul 2006 09:07:43 -0000
@@ -368,7 +368,7 @@
SvxHyperlinkTabPageBase* pCurrentPage = (SvxHyperlinkTabPageBase*)GetTabPage( nPageId );
- mbIsHTMLDoc = BOOL( pItem->GetInsertMode() & HLINK_HTMLMODE );
+ mbIsHTMLDoc = (pItem->GetInsertMode() & HLINK_HTMLMODE) ? true : false;
SfxItemSet& aPageSet = (SfxItemSet&)GetTabPage (nPageId)->GetItemSet ();
aPageSet.Put ( *pItem );
Index: source/ui/envelp/label.src
===================================================================
RCS file: /cvs/sw/sw/source/ui/envelp/label.src,v
retrieving revision 1.56
diff -u -r1.56 label.src
--- openoffice.org.orig/sw/source/ui/envelp/label.src 23 Sep 2005 13:01:31 -0000 1.56
+++ openoffice.org/sw/source/ui/envelp/label.src 21 Jul 2006 08:39:29 -0000
@@ -408,7 +408,7 @@
Pos = MAP_APPFONT ( 12 , 32) ;
Size = MAP_APPFONT ( 90 , 8 ) ;
Text [ de ] = "~Vor-/Name/Kürzel 2" ;
- Text [ en-US ] = "First / Last ~Name / Initials 2";
+ Text [ en-US ] = "First/Last ~name/Initials 2";
};
Edit ED_FIRSTNAME_2
{
workspace.sixtyfour09.patch:
dtrans/source/X11/X11_droptarget.cxx | 2 +-
inc/stream.hxx | 0
source/X11/X11_droptarget.cxx | 0
source/inc/fmshimp.hxx | 0
svx/source/inc/fmshimp.hxx | 6 +++---
tools/inc/stream.hxx | 2 +-
6 files changed, 5 insertions(+), 5 deletions(-)
--- NEW FILE workspace.sixtyfour09.patch ---
Index: source/inc/fmshimp.hxx
===================================================================
RCS file: /cvs/graphics/svx/source/inc/fmshimp.hxx,v
retrieving revision 1.29
diff -u -r1.29 fmshimp.hxx
--- openoffice.org.orig/svx/source/inc/fmshimp.hxx 19 Jun 2006 16:06:24 -0000 1.29
+++ openoffice.org/svx/source/inc/fmshimp.hxx 15 Nov 2006 13:12:04 -0000
@@ -221,7 +221,7 @@
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 @@
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: inc/stream.hxx
===================================================================
RCS file: /cvs/util/tools/inc/stream.hxx,v
retrieving revision 1.11
diff -u -r1.11 stream.hxx
--- openoffice.org.orig/tools/inc/stream.hxx 19 Jul 2006 17:12:49 -0000 1.11
+++ openoffice.orgr/tools/inc/stream.hxx 7 Nov 2006 09:44:24 -0000
@@ -104,7 +104,7 @@
#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: source/X11/X11_droptarget.cxx
===================================================================
RCS file: /cvs/gsl/dtrans/source/X11/X11_droptarget.cxx,v
retrieving revision 1.9
diff -u -r1.9 X11_droptarget.cxx
--- openoffice.org.orig/dtrans/source/X11/X11_droptarget.cxx 8 Sep 2005 18:02:19 -0000 1.9
+++ openoffice.org/dtrans/source/X11/X11_droptarget.cxx 1 Nov 2006 14:30:38 -0000
@@ -80,7 +80,7 @@
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;
workspace.sixtyfour10.patch:
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 32 ++++++++++++-------
source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 0
2 files changed, 21 insertions(+), 11 deletions(-)
--- NEW FILE workspace.sixtyfour10.patch ---
Index: source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
===================================================================
RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx,v
retrieving revision 1.6
diff -u -r1.6 uno2cpp.cxx
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx 16 Sep 2006 15:50:53 -0000 1.6
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx 21 Nov 2006 13:02:25 -0000
@@ -49,6 +49,7 @@
#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx"
#include "bridges/cpp_uno/shared/vtables.hxx"
+#include "abi.hxx"
#include "share.hxx"
using namespace ::rtl;
@@ -165,7 +166,7 @@
//==================================================================================================
static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
- void * pRegisterReturn, typelib_TypeClass eReturnType,
+ void * pRegisterReturn, typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn,
char * pPT, sal_uInt64 * pStackLongs, sal_uInt32 nStackLongs)
{
sal_uInt32 nr_gpr, nr_fpr, nr_stack;
@@ -175,8 +176,6 @@
if (nr_stack)
nr_stack = (nr_stack + 1) & ~1;
- bool bReturnsSimpleType = bridges::cpp_uno::shared::isSimpleType( eReturnType );
-
#if OSL_DEBUG_LEVEL > 1
// Let's figure out what is really going on here
fprintf(stderr,"callVirtualMethod() parameters string is %s\n", pPT);
@@ -244,7 +243,7 @@
#undef ARG_GPR
}
- if ( bReturnsSimpleType )
+ if ( bSimpleReturn )
a0 = (sal_uInt64) pThis;
else
a1 = (sal_uInt64) pThis;
@@ -275,7 +274,7 @@
// Perform the call
ReturnValue aRet = ( ( FunctionCall ) pMethod )( a0, a1, a2, a3, a4, a5 );
- switch (eReturnType)
+ switch (pReturnTypeDescr->eTypeClass)
{
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
@@ -301,6 +300,15 @@
case typelib_TypeClass_DOUBLE:
*reinterpret_cast<double *>( pRegisterReturn ) = *reinterpret_cast<double*>( &aRet.f.xmm0 );
break;
+ default: {
+ sal_Int32 const nRetSize = pReturnTypeDescr->nSize;
+ if (bSimpleReturn && nRetSize <= 16 && nRetSize > 0) {
+ if (nRetSize > 8)
+ static_cast<sal_uInt64 *>(pRegisterReturn)[1] = aRet.i.rdx;
+ static_cast<sal_uInt64 *>(pRegisterReturn)[0] = aRet.i.rax;
+ }
+ break;
+ }
}
}
@@ -327,13 +335,15 @@
OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
-
+
+ bool bSimpleReturn = true;
if (pReturnTypeDescr)
{
- if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
- {
+ if ( x86_64::return_in_hidden_param( pReturnTypeRef ) )
+ bSimpleReturn = false;
+
+ if (bSimpleReturn)
pCppReturn = pUnoReturn; // direct way for simple types
- }
else
{
// complex return via ptr
@@ -458,7 +468,7 @@
OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 7), "UNALIGNED STACK !!! (Please DO panic)" );
callVirtualMethod(
pAdjustedThisPtr, aVtableSlot.index,
- pCppReturn, pReturnTypeDescr->eTypeClass, pParamType,
+ pCppReturn, pReturnTypeDescr, bSimpleReturn, pParamType,
(sal_uInt64 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_uInt64) );
// NO exception occured...
*ppUnoExc = 0;
--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx 16 Sep 2006 15:50:53 -0000 1.6
+++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx 21 Nov 2006 16:15:19 -0000
@@ -122,7 +122,7 @@ invoke_copy_to_stack(sal_uInt64 * pDS,
// value verbatim, as a double without conversion.
pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ );
else
- *pDS++ = *reinterpret_cast<double *>( pSV++ );
+ *pDS++ = *pSV++;
break;
case 'H': // 64-bit Word
workspace.thbpp6.patch:
goodies/source/graphic/grfmgr.cxx | 6 ++++++
source/graphic/grfmgr.cxx | 0
2 files changed, 6 insertions(+)
--- NEW FILE workspace.thbpp6.patch ---
Index: source/graphic/grfmgr.cxx
===================================================================
RCS file: /cvs/graphics/goodies/source/graphic/grfmgr.cxx,v
retrieving revision 1.31
diff -u -r1.31 grfmgr.cxx
--- openoffice.org.orig/goodies/source/graphic/grfmgr.cxx 19 Jun 2006 21:49:42 -0000 1.31
+++ openoffice.org/goodies/source/graphic/grfmgr.cxx 23 Sep 2006 16:21:52 -0000
@@ -784,6 +784,12 @@
const Size aOutTileSize( ::std::max( 1L, pOut->LogicToPixel( rSize, aOutMapMode ).Width() ),
::std::max( 1L, pOut->LogicToPixel( rSize, aOutMapMode ).Height() ) );
+ //#i69780 clip final tile size to a sane max size
+ while ((rSize.Width() * nTileCacheSize1D) > SAL_MAX_UINT16)
+ nTileCacheSize1D /= 2;
+ while ((rSize.Height() * nTileCacheSize1D) > SAL_MAX_UINT16)
+ nTileCacheSize1D /= 2;
+
return ImplDrawTiled( pOut, rArea, aOutTileSize, rOffset, pAttr, nFlags, nTileCacheSize1D );
}
workspace.vcl69.patch:
fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 4 +++-
psprint/source/printergfx/printerjob.cxx | 22 +++++++++++++---------
psprint/source/printergfx/text_gfx.cxx | 7 +++++++
source/printergfx/printerjob.cxx | 0
source/printergfx/text_gfx.cxx | 0
source/unx/gnome/SalGtkFilePicker.cxx | 0
source/window/window.cxx | 0
vcl/source/window/window.cxx | 20 +++++++++++++++-----
8 files changed, 38 insertions(+), 15 deletions(-)
--- NEW FILE workspace.vcl69.patch ---
Index: source/printergfx/printerjob.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/printergfx/printerjob.cxx,v
retrieving revision 1.40
diff -u -r1.40 printerjob.cxx
--- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx 24 Oct 2006 15:06:47 -0000 1.40
+++ openoffice.org/psprint/source/printergfx/printerjob.cxx 15 Nov 2006 15:51:57 -0000
@@ -1126,16 +1130,20 @@
}
}
- // setup code
- ByteString aLine( "/#copies " );
- aLine += ByteString::CreateFromInt32( rJob.m_nCopies );
- aLine += " def\n";
- sal_uInt64 nWritten = 0;
- bool bSuccess = pFile->write( aLine.GetBuffer(), aLine.Len(), nWritten )
- || nWritten != aLine.Len() ? false : true;
+ bool bSuccess = true;
+ if (rJob.m_nCopies > 1)
+ {
+ // setup code
+ ByteString aLine( "/#copies " );
+ aLine += ByteString::CreateFromInt32( rJob.m_nCopies );
+ aLine += " def\n";
+ sal_uInt64 nWritten = 0;
+ bSuccess = pFile->write( aLine.GetBuffer(), aLine.Len(), nWritten )
+ || nWritten != aLine.Len() ? false : true;
- if( bSuccess && GetPostscriptLevel( &rJob ) >= 2 )
- WritePS (pFile, "<< /NumCopies null /Policies << /NumCopies 1 >> >> setpagedevice\n" );
+ if( bSuccess && GetPostscriptLevel( &rJob ) >= 2 )
+ WritePS (pFile, "<< /NumCopies null /Policies << /NumCopies 1 >> >> setpagedevice\n" );
+ }
bool bFeatureSuccess = writeFeatureList( pFile, rJob, true );
Index: source/printergfx/text_gfx.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/printergfx/text_gfx.cxx,v
retrieving revision 1.27
diff -u -r1.27 text_gfx.cxx
--- openoffice.org.orig/psprint/source/printergfx/text_gfx.cxx 19 Jun 2006 10:27:19 -0000 1.27
+++ openoffice.org/psprint/source/printergfx/text_gfx.cxx 8 Nov 2006 17:15:58 -0000
@@ -799,6 +800,13 @@
{
convertPfbToPfa (aFontFile, *pFile);
aFontFile.close ();
+
+ pFile->setPos(osl_Pos_Current, -1);
+ char lastchar = '\n';
+ sal_uInt64 uBytes(1);
+ pFile->read((void *)(&lastchar), uBytes, uBytes);
+ if (lastchar != '\n')
+ WritePS (pFile, "\n");
}
WritePS (pFile, "%%EndResource\n");
rSuppliedFonts.push_back( aPostScriptName );
Index: source/window/window.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/window/window.cxx,v
retrieving revision 1.241.4.1
diff -u -r1.241.4.1 window.cxx
--- openoffice.org.orig/vcl/source/window/window.cxx 28 Aug 2006 15:49:39 -0000 1.241.4.1
+++ openoffice.org/vcl/source/window/window.cxx 25 Oct 2006 10:19:11 -0000
@@ -822,11 +827,21 @@
if( nStyle & WB_NOSHADOW )
nFrameStyle |= SAL_FRAME_STYLE_NOSHADOW;
- if( mpWindowImpl->mnType == WINDOW_DIALOG ||
- mpWindowImpl->mnType == WINDOW_TABDIALOG ||
- mpWindowImpl->mnType == WINDOW_MODALDIALOG ||
- mpWindowImpl->mnType == WINDOW_MODELESSDIALOG )
- nFrameStyle |= SAL_FRAME_STYLE_DIALOG;
+ switch (mpWindowImpl->mnType)
+ {
+ case WINDOW_DIALOG:
+ case WINDOW_TABDIALOG:
+ case WINDOW_MODALDIALOG:
+ case WINDOW_MODELESSDIALOG:
+ case WINDOW_MESSBOX:
+ case WINDOW_INFOBOX:
+ case WINDOW_WARNINGBOX:
+ case WINDOW_ERRORBOX:
+ case WINDOW_QUERYBOX:
+ nFrameStyle |= SAL_FRAME_STYLE_DIALOG;
+ default:
+ break;
+ }
SalFrame* pParentFrame = NULL;
if ( pParent )
Index: source/unx/gnome/SalGtkFilePicker.cxx
===================================================================
RCS file: /cvs/gsl/fpicker/source/unx/gnome/SalGtkFilePicker.cxx,v
retrieving revision 1.16
diff -u -r1.16 SalGtkFilePicker.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 7 Aug 2006 13:59:36 -0000 1.16
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 24 Oct 2006 11:10:32 -0000
@@ -1089,7 +1089,9 @@
OUStringToOString(aResProvider.getResString(FILE_PICKER_TITLE_SAVE ),
RTL_TEXTENCODING_UTF8 ).getStr() );
- btn = gtk_dialog_run( GTK_DIALOG( dlg ) );
+ RunDialog aAnotherRunInMain(dlg);
+ btn = aAnotherRunInMain.runandwaitforresult();
+
gtk_widget_destroy( dlg );
}
workspace.vcl70.patch:
gtkframe.cxx | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
--- NEW FILE workspace.vcl70.patch ---
--- OOE680_m5/vcl/unx/gtk/window/gtkframe.cxx.orig 2006-11-28 10:18:53.000000000 +0000
+++ OOE680_m5/vcl/unx/gtk/window/gtkframe.cxx 2006-11-28 10:24:31.000000000 +0000
@@ -3073,6 +3073,7 @@
end = g_utf8_pointer_to_offset (pText, pText + end);
tmp_list = attr_list = pango_attr_iterator_get_attrs (iter);
+ sal_attr = 0;
while (tmp_list)
{
PangoAttribute *pango_attr = (PangoAttribute *)(tmp_list->data);
@@ -3080,10 +3081,10 @@
switch (pango_attr->klass->type)
{
case PANGO_ATTR_BACKGROUND:
- sal_attr |= (SAL_EXTTEXTINPUT_ATTR_HIGHLIGHT | SAL_EXTTEXTINPUT_CURSOR_INVISIBLE);
+ sal_attr |= (SAL_EXTTEXTINPUT_ATTR_HIGHLIGHT | SAL_EXTTEXTINPUT_CURSOR_INVISIBLE);
break;
case PANGO_ATTR_UNDERLINE:
- sal_attr |= SAL_EXTTEXTINPUT_ATTR_UNDERLINE;
+ sal_attr |= SAL_EXTTEXTINPUT_ATTR_UNDERLINE;
break;
case PANGO_ATTR_STRIKETHROUGH:
sal_attr |= SAL_EXTTEXTINPUT_ATTR_REDTEXT;
@@ -3094,6 +3095,8 @@
pango_attribute_destroy (pango_attr);
tmp_list = tmp_list->next;
}
+ if (sal_attr == 0)
+ sal_attr |= SAL_EXTTEXTINPUT_ATTR_UNDERLINE;
g_slist_free (attr_list);
// Set the sal attributes on our text
workspace.vcl71.patch:
source/window/window.cxx | 0
vcl/source/window/window.cxx | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE workspace.vcl71.patch ---
Index: source/window/window.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/window/window.cxx,v
retrieving revision 1.246
diff -u -r1.246 window.cxx
--- openoffice.org.orig/vcl/source/window/window.cxx 13 Oct 2006 08:32:58 -0000 1.246
+++ openoffice.org/vcl/source/window/window.cxx 12 Dec 2006 16:13:26 -0000
@@ -1230,7 +1245,7 @@
char* pRes = (char*)GetClassRes();
pRes += 8;
- ULONG nStyle = GetLongRes( (void*)pRes );
+ sal_uInt32 nStyle = (sal_uInt32)GetLongRes( (void*)pRes );
((ResId&)rResId).aWinBits = nStyle;
return nStyle;
}
@@ -1242,7 +1257,7 @@
// newer move this line after IncrementRes
char* pRes = (char*)GetClassRes();
pRes += 12;
- ULONG nHelpId = (ULONG)GetLongRes( (void*)pRes );
+ sal_uInt32 nHelpId = (sal_uInt32)GetLongRes( (void*)pRes );
if ( !nHelpId )
nHelpId = ImplAutoHelpID();
SetHelpId( nHelpId );
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.976
retrieving revision 1.977
diff -u -r1.976 -r1.977
--- openoffice.org.spec 13 Dec 2006 16:08:53 -0000 1.976
+++ openoffice.org.spec 18 Dec 2006 16:00:52 -0000 1.977
@@ -1,6 +1,6 @@
%define oootag OOE680
%define ooomilestone 6
-%define rh_rpm_release 7
+%define rh_rpm_release 8
# gcc#19664#
%define stlvisibilityfcked 1
@@ -87,7 +87,7 @@
Patch19: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
Patch20: workspace.inplaceobjects.patch
Patch21: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch22: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
+Patch22: workspace.cmcfixes29.patch
Patch23: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
Patch24: workspace.fpicker6.patch
Patch25: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
@@ -96,50 +96,43 @@
Patch28: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
Patch29: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
Patch30: ooobuild.VBAObjects.patch
-Patch31: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch32: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch33: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch34: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch35: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch36: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch37: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
-Patch38: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch39: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch40: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
-Patch41: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
-Patch42: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch43: pseudoworkspace.valgrind1.patch
-Patch44: openoffice.org-2.0.4.gccXXXXX.svtools.fsstorage.patch
-Patch45: openoffice.org-2.0.4.ooo69780.goodies.hugetile.patch
-Patch46: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch47: openoffice.org-2.0.4.ooo69992.sw.syncbackspace.patch
-Patch48: openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch
-Patch49: openoffice.org-2.0.4.ooo70782.secondaryfpicker.atk.patch
-Patch50: openoffice.org-2.0.4.ooo70835.vcl.minimizealerts.patch
-Patch51: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
-Patch52: openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch
-Patch53: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
-Patch54: openoffice.org-2.0.4.ooo71076.dtrans.64bitdragdrop.patch
-Patch55: openoffice.org-2.0.4.ooo71077.sc.purevirtual.patch
-Patch56: openoffice.org-1.9.129.ooo54603.fontconfig.part4.patch
-Patch57: openoffice.org-2.0.4.rh213710.vba.patch
-Patch58: openoffice.org-2.0.4.ooo71285.tools.ulongmax.patch
-Patch59: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch60: openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch
-Patch61: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
-Patch62: openoffice.org-2.0.4.ooo71562.svx.64bitcrash.patch
-Patch63: openoffice.org-2.0.4.ooo71570.psprint.noonecopy.patch
-Patch64: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch65: openoffice.org-2.1.0.ooo71662.dbaccess.noasync.patch
-Patch66: openoffice.org-2.1.0.ooo71815.bridges.x86_64.patch
-Patch67: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
-Patch68: visibility.warning.patch
-Patch69: openoffice.org-2.1.0.ooo72058.vcl.dontalwaysaddunderline.patch
-Patch70: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
-Patch71: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch72: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch73: openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch
-Patch74: openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch
+Patch31: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch32: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch33: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch34: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch35: workspace.os89.patch
+Patch36: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch37: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch38: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+Patch39: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
+Patch40: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch41: pseudoworkspace.valgrind1.patch
+Patch42: openoffice.org-2.0.4.gccXXXXX.svtools.fsstorage.patch
+Patch43: workspace.thbpp6.patch
+Patch44: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch45: openoffice.org-2.0.4.ooo69992.sw.syncbackspace.patch
+Patch46: openoffice.org-2.0.4.ooo70779.vcl.setprgname.patch
+Patch47: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
+Patch48: workspace.aw024.patch
+Patch49: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
+Patch50: workspace.dr51.patch
+Patch51: openoffice.org-1.9.129.ooo54603.fontconfig.part4.patch
+Patch52: openoffice.org-2.0.4.rh213710.vba.patch
+Patch53: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch54: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
+Patch55: workspace.sixtyfour09.patch
+Patch56: workspace.vcl69.patch
+Patch57: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch58: workspace.dba22b.patch
+Patch59: workspace.sixtyfour10.patch
+Patch60: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
+Patch61: visibility.warning.patch
+Patch62: workspace.vcl70.patch
+Patch63: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
+Patch64: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch65: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch66: openoffice.org-2.1.0.oooXXXXX.vcl.filterzwatrender.patch
+Patch67: workspace.vcl71.patch
%define instdir %{_libdir}/openoffice.org2.1
@@ -964,7 +957,7 @@
%patch19 -p1 -b .ooo58606.sw.pre-edit.patch
%patch20 -p1 -b .workspace.inplaceobjects.patch
%patch21 -p1
-%patch22 -p1 -b .ooo64463.extensions.noxaw.patch
+%patch22 -p1 -b .workspace.cmcfixes29.patch
%patch23 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
%patch24 -p1 -b .workspace.fpicker6.patch
%patch25 -p1 -b .oooXXXXX.selinux.bridges.patch
@@ -973,50 +966,43 @@
%patch28 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
%patch29 -p1 -b .rh187919.gtkunderkde.patch
%patch30 -p0 -b .ooobuild.VBAObjects.patch
-%patch31 -p1 -b .ooo67644.sw.spacing.patch
-%patch32 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch33 -p1 -b .ooo67716.svx.overflow.patch
-%patch34 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch35 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch36 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch37 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch38 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch39 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch40 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
-%patch41 -p1 -b .ooo54603.fontconfig.part3.patch
-%patch42 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch43 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch44 -p1 -b .gccXXXXX.svtools.fsstorage.patch
-%patch45 -p1 -b .ooo69780.goodies.hugetile.patch
-%patch46 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch47 -p1 -b .ooo69992.sw.syncbackspace.patch
-%patch48 -p1 -b .ooo70779.vcl.setprgname.patch
-%patch49 -p1 -b .ooo70782.secondaryfpicker.atk.patch
-%patch50 -p1 -b .ooo70835.vcl.minimizealerts.patch
-%patch51 -p1 -b .ooo70155.fasterhelplinking.patch
-%patch52 -p1 -b .ooo71039.svx.purevirtual.patch
-%patch53 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
-%patch54 -p1 -b .ooo71076.dtrans.64bitdragdrop.patch
-%patch55 -p1 -b .ooo71077.sc.purevirtual.patch
-%patch56 -p1 -b .ooo54603.fontconfig.part4.patch
-%patch57 -p1 -b .rh213710.vba.patch
-%patch58 -p1 -b .ooo71285.tools.ulongmax.patch
-%patch59 -p1 -b .ooo65491.psprint.enablenups.patch
-%patch60 -p1 -b .ooo71379.psprint.endfeatureonnewline.patch
-%patch61 -p1 -b .ooo61812.svx.a11ycrash.patch
-%patch62 -p1 -b .ooo71562.svx.64bitcrash.patch
-%patch63 -p1 -b .ooo71570.psprint.noonecopy.patch
-cat %{PATCH64} >> svtools/source/dialogs/localize.sdf
-%patch65 -p1 -b .ooo71662.dbaccess.noasync.patch
-%patch66 -p1 -b .ooo71815.bridges.x86_64.patch
-%patch67 -p1 -b .ooo72014.officecfg.malayammenu.patch
-%patch68 -p1 -b .visibility.warning.patch
-%patch69 -p1 -b .ooo72058.vcl.dontalwaysaddunderline.patch
-%patch70 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
-%patch71 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch72 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch73 -p1 -b .oooXXXXX.vcl.filterzwatrender.patch
-%patch74 -p1 -b .ooo72505.vcl.wrongrole.patch
+%patch31 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch32 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch33 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch34 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch35 -p1 -b .workspace.os89.patch
+%patch36 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch37 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch38 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
+%patch39 -p1 -b .ooo54603.fontconfig.part3.patch
+%patch40 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch41 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch42 -p1 -b .gccXXXXX.svtools.fsstorage.patch
+%patch43 -p1 -b .workspace.thbpp6.patch
+%patch44 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch45 -p1 -b .ooo69992.sw.syncbackspace.patch
+%patch46 -p1 -b .ooo70779.vcl.setprgname.patch
+%patch47 -p1 -b .ooo70155.fasterhelplinking.patch
+%patch48 -p1 -b .workspace.aw024.patch
+%patch49 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
+%patch50 -p1 -b .workspace.dr51.patch
+%patch51 -p1 -b .ooo54603.fontconfig.part4.patch
+%patch52 -p1 -b .rh213710.vba.patch
+%patch53 -p1 -b .ooo65491.psprint.enablenups.patch
+%patch54 -p1 -b .ooo61812.svx.a11ycrash.patch
+%patch55 -p1 -b .workspace.sixtyfour09.patch
+%patch56 -p1 -b .workspace.vcl69.patch
+cat %{PATCH57} >> svtools/source/dialogs/localize.sdf
+%patch58 -p1 -b .workspace.dba22b.patch
+%patch59 -p1 -b .workspace.sixtyfour10.patch
+%patch60 -p1 -b .ooo72014.officecfg.malayammenu.patch
+%patch61 -p1 -b .visibility.warning.patch
+%patch62 -p1 -b .workspace.vcl70.patch
+%patch63 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
+%patch64 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch65 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch66 -p1 -b .oooXXXXX.vcl.filterzwatrender.patch
+%patch67 -p1 -b .workspace.vcl71.patch
%if %{langpacks}
tar xzf %{SOURCE1}
@@ -1037,7 +1023,7 @@
cd config_office
autoconf
export PATH=$PATH:/usr/sbin
-%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj --enable-gcjaot --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --without-system-mspack --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang}
+%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj --enable-gcjaot --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --without-system-mspack --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --with-images=industrial %{stlflags} %{withlang}
cd ..
./bootstrap
source Linux*Env.Set.sh
@@ -2601,6 +2587,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Mon Dec 18 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-6.8
+- rename commited patches as their respective workspaces
+
* Wed Dec 13 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-6.7
- split out english dictionaries into hunspell-en
--- openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch DELETED ---
--- openoffice.org-2.0.3.ooo67644.sw.spacing.patch DELETED ---
--- openoffice.org-2.0.3.ooo67716.svx.overflow.patch DELETED ---
--- openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch DELETED ---
--- openoffice.org-2.0.4.ooo69780.goodies.hugetile.patch DELETED ---
--- openoffice.org-2.0.4.ooo70782.secondaryfpicker.atk.patch DELETED ---
--- openoffice.org-2.0.4.ooo70835.vcl.minimizealerts.patch DELETED ---
--- openoffice.org-2.0.4.ooo71039.svx.purevirtual.patch DELETED ---
--- openoffice.org-2.0.4.ooo71076.dtrans.64bitdragdrop.patch DELETED ---
--- openoffice.org-2.0.4.ooo71077.sc.purevirtual.patch DELETED ---
--- openoffice.org-2.0.4.ooo71285.tools.ulongmax.patch DELETED ---
--- openoffice.org-2.0.4.ooo71562.svx.64bitcrash.patch DELETED ---
--- openoffice.org-2.0.4.ooo71570.psprint.noonecopy.patch DELETED ---
--- openoffice.org-2.1.0.ooo71379.psprint.endfeatureonnewline.patch DELETED ---
--- openoffice.org-2.1.0.ooo71662.dbaccess.noasync.patch DELETED ---
--- openoffice.org-2.1.0.ooo71815.bridges.x86_64.patch DELETED ---
--- openoffice.org-2.1.0.ooo72058.vcl.dontalwaysaddunderline.patch DELETED ---
--- openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch DELETED ---
More information about the fedora-cvs-commits
mailing list