rpms/openoffice.org/devel openoffice.org-3.2.0.ooo108976.svx.safestyledelete.patch, NONE, 1.1 openoffice.org.spec, 1.2139, 1.2140 openoffice.org-3.2.0.oooXXXXX.svx.safestyledelete.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Fri Feb 5 09:34:52 UTC 2010
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv638/devel
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.2.0.ooo108976.svx.safestyledelete.patch
Removed Files:
openoffice.org-3.2.0.oooXXXXX.svx.safestyledelete.patch
Log Message:
update upstream id
openoffice.org-3.2.0.ooo108976.svx.safestyledelete.patch:
svdpntv.cxx | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
--- NEW FILE openoffice.org-3.2.0.ooo108976.svx.safestyledelete.patch ---
diff -ru svx.orig/source/svdraw/svdpntv.cxx svx/source/svdraw/svdpntv.cxx
--- svx.orig/source/svdraw/svdpntv.cxx 2010-02-04 11:40:05.000000000 +0000
+++ svx/source/svdraw/svdpntv.cxx 2010-02-04 14:25:45.000000000 +0000
@@ -296,6 +296,8 @@
SdrPaintView::~SdrPaintView()
{
DBG_DTOR(SdrPaintView,NULL);
+ if (pDefaultStyleSheet)
+ EndListening(*pDefaultStyleSheet);
EndListening( maColorConfig );
ClearPageView();
@@ -319,8 +321,16 @@
////////////////////////////////////////////////////////////////////////////////////////////////////
-void __EXPORT SdrPaintView::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
+void __EXPORT SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
+ //If the stylesheet has been destroyed
+ if (&rBC == pDefaultStyleSheet)
+ {
+ if (rHint.ISA(SfxSimpleHint) && ((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING)
+ pDefaultStyleSheet = NULL;
+ return;
+ }
+
BOOL bObjChg=!bSomeObjChgdFlag; // TRUE= auswerten fuer ComeBack-Timer
if (bObjChg) {
SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint);
@@ -1240,7 +1250,12 @@
void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
{
- pDefaultStyleSheet=pStyleSheet;
+ if (pDefaultStyleSheet)
+ EndListening(*pDefaultStyleSheet);
+ pDefaultStyleSheet=pStyleSheet;
+ if (pDefaultStyleSheet)
+ StartListening(*pDefaultStyleSheet);
+
if (pStyleSheet!=NULL && !bDontRemoveHardAttr) {
SfxWhichIter aIter(pStyleSheet->GetItemSet());
USHORT nWhich=aIter.FirstWhich();
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2139
retrieving revision 1.2140
diff -u -p -r1.2139 -r1.2140
--- openoffice.org.spec 4 Feb 2010 15:06:12 -0000 1.2139
+++ openoffice.org.spec 5 Feb 2010 09:34:51 -0000 1.2140
@@ -134,7 +134,7 @@ Patch58: workspace.cmcfixes70.patch
Patch59: workspace.s390xport02.patch
Patch60: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
Patch61: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
-Patch62: openoffice.org-3.2.0.oooXXXXX.svx.safestyledelete.patch
+Patch62: openoffice.org-3.2.0.ooo108976.svx.safestyledelete.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -1696,7 +1696,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
%patch59 -p1 -b .workspace.s390xport02.patch
%patch60 -p1 -b .ooo108637.sfx2.uisavedir.patch
%patch61 -p1 -b .ooo108846.sfx2.qstartfixes.patch
-%patch62 -p0 -b .oooXXXXX.svx.safestyledelete.patch
+%patch62 -p0 -b .ooo108976.svx.safestyledelete.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
--- openoffice.org-3.2.0.oooXXXXX.svx.safestyledelete.patch DELETED ---
More information about the scm-commits
mailing list