rpms/openoffice.org/devel ooo-build.ooo68717.gstreamer.video.patch, 1.1, 1.2 openoffice.org.spec, 1.1902, 1.1903 workspace.fwk103.patch, 1.2, 1.3 openoffice.org-3.0.1.ooo99050.sw.htmlload.patch, 1.2, NONE
Caolan McNamara
caolanm at fedoraproject.org
Tue Apr 28 09:32:53 UTC 2009
- Previous message: rpms/openoffice.org/F-11 ooo-build.ooo68717.gstreamer.video.patch, 1.1, 1.2 openoffice.org.spec, 1.1901, 1.1902 workspace.fwk103.patch, 1.2, 1.3 openoffice.org-3.0.1.ooo99050.sw.htmlload.patch, 1.2, NONE
- Next message: rpms/openoffice.org/devel openoffice.org.spec,1.1903,1.1904
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22104/devel
Modified Files:
ooo-build.ooo68717.gstreamer.video.patch openoffice.org.spec
workspace.fwk103.patch
Removed Files:
openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
Log Message:
Resolves: rhbz#497882 audio/visual loop stub
ooo-build.ooo68717.gstreamer.video.patch:
Index: ooo-build.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/ooo-build.ooo68717.gstreamer.video.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ooo-build.ooo68717.gstreamer.video.patch 18 Mar 2009 12:36:26 -0000 1.1
+++ ooo-build.ooo68717.gstreamer.video.patch 28 Apr 2009 09:32:23 -0000 1.2
@@ -960,14 +960,13 @@ retrieving revision 1.8.90.1
diff -u -p -r1.8.90.1 gtkobject.cxx
--- vcl/unx/gtk/window/gtkobject.cxx 10 Aug 2006 14:54:05 -0000 1.8.90.1
+++ vcl/unx/gtk/window/gtkobject.cxx 5 Jan 2007 15:00:54 -0000
-@@ -211,3 +242,12 @@ void GtkSalObject::signalDestroy( GtkObj
+@@ -211,3 +242,11 @@ void GtkSalObject::signalDestroy( GtkObj
pThis->m_pSocket = NULL;
}
}
+
+void GtkSalObject::SetForwardKey( BOOL bEnable )
+{
-+ printf ("GtkSalObject::SetForwardKey\n");
+ if( bEnable )
+ gtk_widget_add_events( GTK_WIDGET( m_pSocket ), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE );
+ else
@@ -3267,3 +3266,15 @@ diff -ru /usr/src/redhat/BUILD/OOF680_m1
sal_Bool mbMuted;
sal_Bool mbLooping;
sal_Bool mbInitialized;
+diff -ru avmedia.orig/source/gstreamer/gstplayer.cxx avmedia/source/gstreamer/gstplayer.cxx
+--- avmedia.orig/source/gstreamer/gstplayer.cxx 2009-04-28 08:28:19.000000000 +0100
++++ avmedia/source/gstreamer/gstplayer.cxx 2009-04-28 09:11:50.000000000 +0100
+@@ -142,6 +142,8 @@
+ //DBG( "EOS, reset state to NULL" );
+ gst_element_set_state( mpPlaybin, GST_STATE_READY );
+ mbPlayPending = false;
++ if (mbLooping)
++ start();
+ break;
+ case GST_MESSAGE_STATE_CHANGED:
+ if( message->src == GST_OBJECT( mpPlaybin ) ) {
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1902
retrieving revision 1.1903
diff -u -p -r1.1902 -r1.1903
--- openoffice.org.spec 27 Apr 2009 14:08:00 -0000 1.1902
+++ openoffice.org.spec 28 Apr 2009 09:32:23 -0000 1.1903
@@ -115,29 +115,28 @@ Patch39: workspace.cmcfixes54.patch
Patch40: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
Patch41: workspace.fwk103.patch
Patch42: workspace.hb18.patch
-Patch43: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
-Patch44: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
-Patch45: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
-Patch46: workspace.vcl100.patch
-Patch47: workspace.xmergeclean.patch
-Patch48: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
-Patch49: workspace.impress169.patch
-Patch50: workspace.os130.patch
-Patch51: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
-Patch52: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch53: workspace.cmcfixes57.patch
-Patch54: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
-Patch55: ooo-build.ooo2497.filter.svg.patch
-Patch56: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
-Patch57: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch58: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
-Patch59: workspace.vcl101.patch
-Patch60: workspace.slideshow1.patch
-Patch61: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch62: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch63: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch64: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch65: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
+Patch43: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
+Patch44: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
+Patch45: workspace.vcl100.patch
+Patch46: workspace.xmergeclean.patch
+Patch47: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
+Patch48: workspace.impress169.patch
+Patch49: workspace.os130.patch
+Patch50: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
+Patch51: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch52: workspace.cmcfixes57.patch
+Patch53: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
+Patch54: ooo-build.ooo2497.filter.svg.patch
+Patch55: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
+Patch56: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch57: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+Patch58: workspace.vcl101.patch
+Patch59: workspace.slideshow1.patch
+Patch60: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch61: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch62: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch63: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch64: openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1611,29 +1610,28 @@ cat %{PATCH11} >> svtools/source/dialogs
%patch40 -p1 -b .gccXXXXX.solenv.javaregistration.patch
%patch41 -p1 -b .workspace.fwk103.patch
%patch42 -p0 -b .workspace.hb18.patch
-%patch43 -p1 -R -b .ooo99050.sw.htmlload.patch
-%patch44 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
-%patch45 -p0 -b .ooo99250.sc.autooutline-reflists.patch
-%patch46 -p0 -b .workspace.vcl100.patch
-%patch47 -p0 -b .workspace.xmergeclean.patch
-%patch48 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
-%patch49 -p0 -b .workspace.impress169.patch
-%patch50 -p0 -b .workspace.os130.patch
-%patch51 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
-%patch52 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch53 -p0 -b .workspace.cmcfixes57.patch
-%patch54 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
-%patch55 -p1 -b .ooo2497.filter.svg.patch
-%patch56 -p0 -b .ooo100353.svx.rtfbrackets.patch
-%patch57 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch58 -p1 -b .ooo101074.sd.bad.nothrow.patch
-%patch59 -p1 -b .workspace.vcl101.patch
-%patch60 -p2 -b .workspace.slideshow1.patch
-%patch61 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch62 -p0 -b .ooo101274.opening-a-directory.patch
-%patch63 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch64 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch65 -p0 -b .ooo101379.vcl.qstart.SM.patch
+%patch43 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
+%patch44 -p0 -b .ooo99250.sc.autooutline-reflists.patch
+%patch45 -p0 -b .workspace.vcl100.patch
+%patch46 -p0 -b .workspace.xmergeclean.patch
+%patch47 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
+%patch48 -p0 -b .workspace.impress169.patch
+%patch49 -p0 -b .workspace.os130.patch
+%patch50 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
+%patch51 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch52 -p0 -b .workspace.cmcfixes57.patch
+%patch53 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
+%patch54 -p1 -b .ooo2497.filter.svg.patch
+%patch55 -p0 -b .ooo100353.svx.rtfbrackets.patch
+%patch56 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch57 -p1 -b .ooo101074.sd.bad.nothrow.patch
+%patch58 -p1 -b .workspace.vcl101.patch
+%patch59 -p2 -b .workspace.slideshow1.patch
+%patch60 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch61 -p0 -b .ooo101274.opening-a-directory.patch
+%patch62 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch63 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch64 -p0 -b .ooo101379.vcl.qstart.SM.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4132,10 +4130,11 @@ fi
unopkg list --shared > /dev/null 2>&1 || :
%changelog
-* Mon Apr 27 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.2-UNRELEASED
+* Tue Apr 27 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.2-UNRELEASED
- Resolves: rhbz#484177 openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
- add openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
- Resolves: rhbz#491159 openoffice.org-3.1.0.ooo101379.vcl.qstart.SM.patch
+- Resolves: rhbz#497882 implement audio/visual looping stub
* Fri Apr 24 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.1
- add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
workspace.fwk103.patch:
Index: workspace.fwk103.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.fwk103.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.fwk103.patch 26 Feb 2009 14:01:38 -0000 1.2
+++ workspace.fwk103.patch 28 Apr 2009 09:32:23 -0000 1.3
@@ -38,3 +38,163 @@ diff -u -r1.7 plugin.cxx
}
return FALSE;
+Index: htmlform.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/html/htmlform.cxx,v
+retrieving revision 1.26
+retrieving revision 1.26.112.1
+diff -u -r1.26 -r1.26.112.1
+--- openoffice.org/sw/source/filter/html/htmlform.cxx 10 Apr 2008 16:42:33 -0000 1.26
++++ openoffice.org.orig/sw/source/filter/html/htmlform.cxx 20 Jun 2008 06:47:28 -0000 1.26.112.1
+@@ -706,6 +706,7 @@
+ sal_Bool bMinHeight,
+ int nToken )
+ {
++ nToken = 0;
+ if( !rTextSz.Width() && !rTextSz.Height() && !bMinWidth && !bMinHeight )
+ return;
+
+@@ -721,35 +722,14 @@
+ // one, no view shell will be created. That for, we have to do that of
+ // our own. This happens if a linked section is inserted or refreshed.
+ SwDocShell *pDocSh = pDoc->GetDocShell();
+- if( pDocSh && SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() )
++ if( pDocSh )
+ {
+- SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
++
++ pTempViewFrame = SfxViewFrame::CreateViewFrame( *pDocSh, 0, sal_True );
+ CallStartAction();
+ pDoc->GetEditShell( &pVSh );
+ }
+ }
+- if( !pVSh )
+- {
+- // If there is no view shell by now, but the document is loaded
+- // asynchronous, the view shell will be created delayed because
+- // the view was locked during the call to DocumentDetected. If this
+- // is the case we wait until another call to our DataAvailable
+- // link, because the SFX calls it if it creates the view.
+- ASSERT( bDocInitalized, "DocumentDetected nocht nicht augerufen" );
+- ASSERT( !IsParserWorking() || nEventId,
+- "Keine ViewShell bei nicht gesetztem DataAvailable-Link" );
+- if( IsParserWorking() && bDocInitalized && nEventId )
+- {
+- pPendStack = new SwPendingStack( nToken, pPendStack );
+- pPendStack->pData =
+- new SwHTMLFormPendingStackData_Impl( rShape, rTextSz,
+- bMinWidth, bMinHeight );
+- SaveState( nToken );
+- eState = SVPAR_PENDING;
+- }
+-
+- return;
+- }
+
+ uno::Reference< XUnoTunnel> xTunnel( xPropSet, UNO_QUERY );
+ SwXShape *pSwShape = xTunnel.is() ?
+@@ -768,8 +748,7 @@
+ ASSERT( pObj, "SdrObject nicht gefunden" );
+ ASSERT( FmFormInventor == pObj->GetObjInventor(), "falscher Inventor" );
+
+- const SdrView* pDrawView = pVSh->GetDrawView();
+- ASSERT( pDrawView, "DrawView not found" );
++ const SdrView* pDrawView = pVSh ? pVSh->GetDrawView() : 0;
+
+ SdrUnoObj *pFormObj = PTR_CAST( SdrUnoObj, pObj );
+ uno::Reference< awt::XControl > xControl;
+Index: swhtml.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/html/swhtml.cxx,v
+retrieving revision 1.49
+retrieving revision 1.49.112.1
+diff -u -r1.49 -r1.49.112.1
+--- openoffice.org/sw/source/filter/html/swhtml.cxx 10 Apr 2008 16:47:35 -0000 1.49
++++ openoffice.org.orig/sw/source/filter/html/swhtml.cxx 20 Jun 2008 06:48:01 -0000 1.49.112.1
+@@ -114,6 +114,8 @@
+ #include <breakit.hxx>
+ #include <SwAppletImpl.hxx>
+
++#include <sfx2/viewfrm.hxx>
++
+ #ifndef _STATSTR_HRC
+ #include <statstr.hrc> // ResId fuer Statusleiste
+ #endif
+@@ -330,7 +332,9 @@
+ bSelect( FALSE ),
+ bInFootEndNoteAnchor( FALSE ),
+ bInFootEndNoteSymbol( FALSE ),
+- bIgnoreHTMLComments( bNoHTMLComments )
++// bIgnoreHTMLComments( bNoHTMLComments )
++ bIgnoreHTMLComments( bNoHTMLComments ),
++ pTempViewFrame(0)
+ {
+ nEventId = 0;
+ bUpperSpace = bViewCreated = bChkJumpMark =
+@@ -390,9 +394,7 @@
+ SwDocShell* pDocSh = pDoc->GetDocShell();
+ if( pDocSh )
+ {
+- if( SFX_CREATE_MODE_INTERNAL == pDocSh->GetCreateMode() ||
+- SFX_CREATE_MODE_PREVIEW == pDocSh->GetCreateMode() )
+- bViewCreated = TRUE; // dann nicht, synchron laden
++ bViewCreated = TRUE; // nicht, synchron laden
+
+ // es ist ein Sprungziel vorgegeben.
+
+@@ -500,6 +502,9 @@
+ // keiner will mehr das Doc haben, also weg damit
+ delete pDoc;
+ }
++
++ if ( pTempViewFrame )
++ pTempViewFrame->DoClose();
+ }
+
+ IMPL_LINK( SwHTMLParser, AsyncCallback, void*, /*pVoid*/ )
+@@ -595,8 +600,8 @@
+
+ // Die ViewShell vom Dokument holen, merken und als aktuelle setzen.
+ ViewShell *pInitVSh = CallStartAction();
+-
+- if( SVPAR_ERROR != eState && !pInitVSh && GetMedium() && !bViewCreated )
++
++ if( SVPAR_ERROR != eState && GetMedium() && !bViewCreated )
+ {
+ // Beim ersten Aufruf erstmal returnen, Doc anzeigen
+ // und auf Timer Callback warten.
+@@ -2462,8 +2467,7 @@
+ ViewShell *pOldVSh = pVSh;
+ #endif
+ pDoc->GetEditShell( &pVSh );
+- ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh,
+- "CallStartAction: Wer hat die ViewShell ausgetauscht?" );
++ ASSERT( !pVSh || !pOldVSh || pOldVSh == pVSh, "CallStartAction: Wer hat die ViewShell ausgetauscht?" );
+ #ifndef PRODUCT
+ if( pOldVSh && !pVSh )
+ pVSh = 0;
+Index: swhtml.hxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/html/swhtml.hxx,v
+retrieving revision 1.16
+retrieving revision 1.16.112.1
+diff -u -r1.16 -r1.16.112.1
+--- openoffice.org/sw/source/filter/html/swhtml.hxx 10 Apr 2008 16:47:54 -0000 1.16
++++ openoffice.org.orig/sw/source/filter/html/swhtml.hxx 20 Jun 2008 06:48:01 -0000 1.16.112.1
+@@ -59,6 +59,7 @@
+ #include "htmlvsh.hxx"
+
+ class SfxMedium;
++class SfxViewFrame;
+ class SdrObject;
+ class SvxMacroTableDtor;
+ class SvStringsDtor;
+@@ -499,6 +500,8 @@
+ sal_Bool bInFootEndNoteSymbol : 1;
+ sal_Bool bIgnoreHTMLComments : 1;
+
++ SfxViewFrame* pTempViewFrame;
++
+ void DeleteFormImpl();
+
+ void DocumentDetected();
--- openoffice.org-3.0.1.ooo99050.sw.htmlload.patch DELETED ---
- Previous message: rpms/openoffice.org/F-11 ooo-build.ooo68717.gstreamer.video.patch, 1.1, 1.2 openoffice.org.spec, 1.1901, 1.1902 workspace.fwk103.patch, 1.2, 1.3 openoffice.org-3.0.1.ooo99050.sw.htmlload.patch, 1.2, NONE
- Next message: rpms/openoffice.org/devel openoffice.org.spec,1.1903,1.1904
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list