rpms/openoffice.org/F-13 openoffice.org.spec, 1.2172, 1.2173 workspace.slideshow1.patch, 1.2, 1.3
David Tardon
dtardon at fedoraproject.org
Tue Apr 6 06:01:57 UTC 2010
Author: dtardon
Update of /cvs/pkgs/rpms/openoffice.org/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15219
Modified Files:
openoffice.org.spec workspace.slideshow1.patch
Log Message:
Resolves: rhbz#574542 [abrt] crash in slideshow::internal::EventMultiplexerImpl::forEachView<>
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-13/openoffice.org.spec,v
retrieving revision 1.2172
retrieving revision 1.2173
diff -u -p -r1.2172 -r1.2173
--- openoffice.org.spec 1 Apr 2010 16:14:58 -0000 1.2172
+++ openoffice.org.spec 6 Apr 2010 06:01:53 -0000 1.2173
@@ -1,6 +1,6 @@
%define oootag OOO320
%define ooomilestone 12
-%define rh_rpm_release 14
+%define rh_rpm_release 15
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -1663,7 +1663,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
%patch20 -p1 -b .oooXXXXX.solenv.allowmissing.patch
%patch21 -p1 -b .ooo2497.filter.svg.patch
%patch22 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch23 -p2 -b .workspace.slideshow1.patch
+%patch23 -p1 -b .workspace.slideshow1.patch
%patch24 -p0 -b .ooo101274.opening-a-directory.patch
%patch25 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
%patch26 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
@@ -4199,6 +4199,10 @@ fi
%endif
%changelog
+* Tue Apr 06 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.15
+- Resolves: rhbz#574542 [abrt] crash in
+ slideshow::internal::EventMultiplexerImpl::forEachView<> (dtardon)
+
* Thu Apr 01 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.14
- add openoffice.org-3.3.0.ooo110523.rdf.resetsecprefs.patch
workspace.slideshow1.patch:
cws/slideshow1/slideshow/source/engine/eventmultiplexer.cxx | 10 +++
slideshow1/sd/source/ui/dlg/docprev.cxx | 6 +-
slideshow1/sdext/source/presenter/PresenterSlideShowView.cxx | 12 ++++
slideshow1/slideshow/source/engine/shapes/viewmediashape.cxx | 12 +++-
slideshow1/slideshow/source/engine/shapes/viewmediashape.hxx | 1
slideshow1/slideshow/source/engine/slideshowimpl.cxx | 28 +++++++++++
slideshow1/slideshow/source/engine/slideview.cxx | 16 +++++-
slideshow1/slideshow/source/inc/unoview.hxx | 10 +++
8 files changed, 89 insertions(+), 6 deletions(-)
Index: workspace.slideshow1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-13/workspace.slideshow1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.slideshow1.patch 20 Apr 2009 07:23:19 -0000 1.2
+++ workspace.slideshow1.patch 6 Apr 2010 06:01:57 -0000 1.3
@@ -1,7 +1,7 @@
Index: cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.cxx
===================================================================
---- cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.cxx (revision 269948)
-+++ cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.cxx (revision 269949)
+--- slideshow1/slideshow/source/engine/shapes/viewmediashape.cxx (revision 269948)
++++ slideshow1/slideshow/source/engine/shapes/viewmediashape.cxx (revision 269949)
@@ -71,6 +71,7 @@
#include "viewmediashape.hxx"
#include "mediashape.hxx"
@@ -42,8 +42,8 @@ Index: cws/slideshow1/slideshow/source/e
getPropertyValue( nVolumeDB,
Index: cws/slideshow1/slideshow/source/engine/slideshowimpl.cxx
===================================================================
---- cws/slideshow1/slideshow/source/engine/slideshowimpl.cxx (revision 269948)
-+++ cws/slideshow1/slideshow/source/engine/slideshowimpl.cxx (revision 269949)
+--- slideshow1/slideshow/source/engine/slideshowimpl.cxx (revision 269948)
++++ slideshow1/slideshow/source/engine/slideshowimpl.cxx (revision 269949)
@@ -1451,6 +1451,34 @@
return (rProperty.Value >>= mbNoSlideTransitions);
}
@@ -81,8 +81,8 @@ Index: cws/slideshow1/slideshow/source/e
Index: cws/slideshow1/slideshow/source/engine/slideview.cxx
===================================================================
---- cws/slideshow1/slideshow/source/engine/slideview.cxx (revision 269948)
-+++ cws/slideshow1/slideshow/source/engine/slideview.cxx (revision 269949)
+--- slideshow1/slideshow/source/engine/slideview.cxx (revision 269948)
++++ slideshow1/slideshow/source/engine/slideview.cxx (revision 269949)
@@ -715,6 +715,8 @@
// UnoView:
virtual void _dispose();
@@ -129,8 +129,8 @@ Index: cws/slideshow1/slideshow/source/e
dispose();
Index: cws/slideshow1/slideshow/source/inc/unoview.hxx
===================================================================
---- cws/slideshow1/slideshow/source/inc/unoview.hxx (revision 269948)
-+++ cws/slideshow1/slideshow/source/inc/unoview.hxx (revision 269949)
+--- slideshow1/slideshow/source/inc/unoview.hxx (revision 269948)
++++ slideshow1/slideshow/source/inc/unoview.hxx (revision 269949)
@@ -68,6 +68,16 @@
with a different calling convention under Windows).
*/
@@ -150,8 +150,8 @@ Index: cws/slideshow1/slideshow/source/i
typedef ::boost::shared_ptr< UnoView > UnoViewSharedPtr;
Index: cws/slideshow1/sdext/source/presenter/PresenterSlideShowView.cxx
===================================================================
---- cws/slideshow1/sdext/source/presenter/PresenterSlideShowView.cxx (revision 269950)
-+++ cws/slideshow1/sdext/source/presenter/PresenterSlideShowView.cxx (revision 269951)
+--- slideshow1/sdext/source/presenter/PresenterSlideShowView.cxx (revision 269950)
++++ slideshow1/sdext/source/presenter/PresenterSlideShowView.cxx (revision 269951)
@@ -162,7 +162,17 @@
// Add the new slide show view to the slide show.
if (mxSlideShow.is() && ! mbIsViewAdded)
@@ -173,8 +173,8 @@ Index: cws/slideshow1/sdext/source/prese
Index: cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.hxx
===================================================================
---- cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.hxx (revision 270163)
-+++ cws/slideshow1/slideshow/source/engine/shapes/viewmediashape.hxx (revision 270164)
+--- slideshow1/slideshow/source/engine/shapes/viewmediashape.hxx (revision 270163)
++++ slideshow1/slideshow/source/engine/shapes/viewmediashape.hxx (revision 270164)
@@ -166,6 +166,7 @@
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer;
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > mxPlayerWindow;
@@ -183,3 +183,41 @@ Index: cws/slideshow1/slideshow/source/e
};
typedef ::boost::shared_ptr< ViewMediaShape > ViewMediaShapeSharedPtr;
+Index: slideshow1/slideshow/source/engine/eventmultiplexer.cxx
+===================================================================
+--- slideshow1/slideshow/source/engine/eventmultiplexer.cxx (revision 270942)
++++ cws/slideshow1/slideshow/source/engine/eventmultiplexer.cxx (revision 270943)
+@@ -448,7 +448,15 @@
+ for( UnoViewVector::const_iterator aIter( mrViewContainer.begin() ),
+ aEnd( mrViewContainer.end() ); aIter != aEnd; ++aIter )
+ {
+- ((*aIter)->getUnoView().get()->*pViewMethod)( mxListener.get() );
++ uno::Reference<presentation::XSlideShowView> xView ((*aIter)->getUnoView());
++ if (xView.is())
++ {
++ (xView.get()->*pViewMethod)( mxListener.get() );
++ }
++ else
++ {
++ OSL_ASSERT(xView.is());
++ }
+ }
+ }
+ }
+Index: slideshow1/sd/source/ui/dlg/docprev.cxx
+===================================================================
+--- slideshow1/sd/source/ui/dlg/docprev.cxx (revision 270943)
++++ slideshow1/sd/source/ui/dlg/docprev.cxx (revision 270944)
+@@ -67,7 +67,11 @@
+ {
+ mpObj = pObj;
+ mnShowPage = nShowPage;
+- mxSlideShow.clear();
++ if (mxSlideShow.is())
++ {
++ mxSlideShow->end();
++ mxSlideShow.clear();
++ }
+ updateViewSettings();
+ }
+
More information about the scm-commits
mailing list