rpms/openoffice.org/devel openoffice.org-3.0.0.ooo91977.sd.holdreference.patch, 1.1, 1.2
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Aug 6 16:17:25 UTC 2008
- Previous message (by thread): rpms/libc-client/devel dead.package, NONE, 1.1 imap-2001a-mbox-disable.patch, 1.1, NONE imap-2001a-overflow.patch, 1.1, NONE imap-2002b-krbpath.patch, 1.1, NONE imap-2002d-ssltype.patch, 1.1, NONE imap-2002e-authmd5.patch, 1.1, NONE imap-2002e-cclient-only.patch, 1.1, NONE imap-2002e-redhat-ssl.patch, 1.3, NONE imap-2002e-shared.patch, 1.1, NONE imap-2004g-linux.patch, 1.1, NONE imap-2004g-redhat-version.patch, 1.1, NONE libc-client.spec, 1.19, NONE mirrors, 1.1, NONE sources, 1.4, NONE upstream, 1.1, NONE
- Next message (by thread): rpms/kernel/devel patch-2.6.27-rc2.bz2.sign, NONE, 1.1 .cvsignore, 1.890, 1.891 config-generic, 1.150, 1.151 config-powerpc32-generic, 1.16, 1.17 kernel.spec, 1.854, 1.855 sources, 1.852, 1.853 upstream, 1.768, 1.769 patch-2.6.27-rc1-git6.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7072
Modified Files:
openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
Log Message:
better fix
openoffice.org-3.0.0.ooo91977.sd.holdreference.patch:
Index: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo91977.sd.holdreference.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo91977.sd.holdreference.patch 22 Jul 2008 12:24:06 -0000 1.1
+++ openoffice.org-3.0.0.ooo91977.sd.holdreference.patch 6 Aug 2008 16:16:55 -0000 1.2
@@ -1,30 +1,22 @@
-Index: source/ui/dlg/dlgass.cxx
+Index: source/unodraw/unopage.cxx
===================================================================
-RCS file: /cvs/graphics/sd/source/ui/dlg/dlgass.cxx,v
+RCS file: /cvs/graphics/svx/source/unodraw/unopage.cxx,v
retrieving revision 1.47
-diff -u -r1.47 dlgass.cxx
---- openoffice.org.orig/sd/source/ui/dlg/dlgass.cxx 7 Jul 2008 12:51:57 -0000 1.47
-+++ openoffice.org/sd/source/ui/dlg/dlgass.cxx 22 Jul 2008 12:05:32 -0000
-@@ -241,7 +242,7 @@
- Timer maUpdatePageListTimer;
- Timer maStartScanTimer;
+diff -u -r1.47 unopage.cxx
+--- openoffice.org.orig/svx/source/unodraw/unopage.cxx 1 Jul 2008 13:43:50 -0000 1.47
++++ openoffice.org/svx/source/unodraw/unopage.cxx 6 Aug 2008 13:40:28 -0000
+@@ -967,6 +967,14 @@
+ StartListening( *pNewModel );
-- SfxObjectShellLock xDocShell;
-+ SfxObjectShellLock xDocShell, xBackingLayoutDocShell;
-
- ::std::auto_ptr<WindowUpdater> mpWindowUpdater;
-
-@@ -1638,6 +1639,13 @@
- if( pDoc && pLayoutDoc )
- {
- pDoc->SetMasterPage(0, aEmptyStr, pLayoutDoc, TRUE, FALSE );
+ mpModel = pNewModel;
+
-+ //pDoc now has a mpPage from pLayoutDoc which is referencing a
-+ //SfxItemset which is referencing a PoolRange belonging to the
-+ //LayoutDoc's SdrModels's pool which is going to disappear in the
-+ //xLayoutDocShell dtor unless we hold a reference to it up to and
-+ //past the next SetMasterPage call.
-+ xBackingLayoutDocShell = xLayoutDocShell;
- }
- else
- {
++ if (mpView)
++ {
++ delete mpView;
++ mpView = new SdrView( mpModel );
++ if( mpView )
++ mpView->SetDesignMode(sal_True);
++ }
+ }
+ }
+
- Previous message (by thread): rpms/libc-client/devel dead.package, NONE, 1.1 imap-2001a-mbox-disable.patch, 1.1, NONE imap-2001a-overflow.patch, 1.1, NONE imap-2002b-krbpath.patch, 1.1, NONE imap-2002d-ssltype.patch, 1.1, NONE imap-2002e-authmd5.patch, 1.1, NONE imap-2002e-cclient-only.patch, 1.1, NONE imap-2002e-redhat-ssl.patch, 1.3, NONE imap-2002e-shared.patch, 1.1, NONE imap-2004g-linux.patch, 1.1, NONE imap-2004g-redhat-version.patch, 1.1, NONE libc-client.spec, 1.19, NONE mirrors, 1.1, NONE sources, 1.4, NONE upstream, 1.1, NONE
- Next message (by thread): rpms/kernel/devel patch-2.6.27-rc2.bz2.sign, NONE, 1.1 .cvsignore, 1.890, 1.891 config-generic, 1.150, 1.151 config-powerpc32-generic, 1.16, 1.17 kernel.spec, 1.854, 1.855 sources, 1.852, 1.853 upstream, 1.768, 1.769 patch-2.6.27-rc1-git6.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list