rpms/openoffice.org/devel openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch, NONE, 1.1 openoffice.org.spec, 1.1652, 1.1653 openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch, 1.3, NONE
Caolan McNamara
caolanm at fedoraproject.org
Tue Sep 16 12:14:06 UTC 2008
- Previous message (by thread): rpms/man/devel man.spec,1.70,1.71 man-1.6b-rpm.patch,1.2,NONE
- Next message (by thread): rpms/ibus-chewing/devel .cvsignore, 1.3, 1.4 ibus-chewing.spec, 1.2, 1.3 sources, 1.3, 1.4
- 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-serv10654
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch
Removed Files:
openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch
Log Message:
wrong id
openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch:
--- NEW FILE openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch ---
Index: source/ui/accessibility/AccessibleDocumentViewBase.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx,v
retrieving revision 1.32
diff -u -r1.32 AccessibleDocumentViewBase.cxx
--- openoffice.org.orig/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx 7 Jul 2008 14:20:57 -0000 1.32
+++ openoffice.org/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx 16 Sep 2008 08:02:46 -0000
@@ -74,8 +74,6 @@
namespace accessibility {
-static SfxViewFrame* mpViewFrame = NULL;
-
//===== internal ============================================================
AccessibleDocumentViewBase::AccessibleDocumentViewBase (
::sd::Window* pSdWindow,
@@ -103,8 +102,6 @@
maShapeTreeInfo.SetViewForwarder (&maViewForwarder);
mxWindow = ::VCLUnoHelper::GetInterface (pSdWindow);
-
- mpViewFrame = pViewShell->GetViewFrame();
}
@@ -149,13 +147,20 @@
OUString (RTL_CONSTASCII_USTRINGPARAM("")),
static_cast<beans::XPropertyChangeListener*>(this));
+ // Register this object as dispose event listener at the controller.
+ if (mxController.is())
+ mxController->addEventListener (
+ static_cast<awt::XWindowListener*>(this));
+
// Register at VCL Window to be informed of activated and deactivated
// OLE objects.
Window* pWindow = maShapeTreeInfo.GetWindow();
- if (pWindow != NULL)
+ if (pWindow)
{
- pWindow->AddChildEventListener (LINK(
- this, AccessibleDocumentViewBase, WindowChildEventListener));
+ maWindowLink = LINK(
+ this, AccessibleDocumentViewBase, WindowChildEventListener);
+
+ pWindow->AddChildEventListener (maWindowLink);
USHORT nCount = pWindow->GetChildCount();
for (sal_uInt16 i=0; i<nCount; i++)
@@ -191,12 +196,10 @@
Window* pWindow = maShapeTreeInfo.GetWindow();
Window* pDyingWindow = static_cast<Window*>(
pWindowEvent->GetWindow());
- if (pWindow==pDyingWindow && pWindow!=NULL)
+ if (pWindow==pDyingWindow && pWindow!=NULL && maWindowLink.IsSet())
{
- pWindow->RemoveChildEventListener (LINK(
- this,
- AccessibleDocumentViewBase,
- WindowChildEventListener));
+ pWindow->RemoveChildEventListener (maWindowLink);
+ maWindowLink = Link();
}
}
break;
@@ -542,8 +545,57 @@
return aTypeList;
}
+void AccessibleDocumentViewBase::impl_dispose()
+{
+ // Unregister from VCL Window.
+ if (maWindowLink.IsSet())
+ {
+ Window* pWindow = maShapeTreeInfo.GetWindow();
+ if (pWindow)
+ pWindow->RemoveChildEventListener (maWindowLink);
+ maWindowLink = Link();
+ }
+ else
+ {
+ DBG_ASSERT (pWindow, "AccessibleDocumentViewBase::disposing");
+ }
+ // Unregister from window.
+ if (mxWindow.is())
+ {
+ mxWindow->removeWindowListener (this);
+ mxWindow->removeFocusListener (this);
+ mxWindow = NULL;
+ }
+
+ // Unregister form the model.
+ if (mxModel.is())
+ mxModel->removeEventListener (
+ static_cast<awt::XWindowListener*>(this));
+
+ // Unregister from the controller.
+ if (mxController.is())
+ {
+ uno::Reference<beans::XPropertySet> xSet (mxController, uno::UNO_QUERY);
+ if (xSet.is())
+ xSet->removePropertyChangeListener (
+ OUString (RTL_CONSTASCII_USTRINGPARAM("")),
+ static_cast<beans::XPropertyChangeListener*>(this));
+
+ mxController->removeEventListener (
+ static_cast<awt::XWindowListener*>(this));
+ }
+
+ // Propagate change of controller down the shape tree.
+ maShapeTreeInfo.SetControllerBroadcaster (NULL);
+ // Reset the model reference.
+ mxModel = NULL;
+ // Reset the model reference.
+ mxController = NULL;
+
+ maShapeTreeInfo.SetDocumentWindow (NULL);
+}
//===== XEventListener ======================================================
@@ -560,32 +612,10 @@
{
// Paranoia. Can this really happen?
}
- else if (rEventObject.Source == mxModel)
+ else if (rEventObject.Source == mxModel || rEventObject.Source == mxController)
{
::osl::Guard< ::osl::Mutex> aGuard (::osl::Mutex::getGlobalMutex());
-
- mxModel->removeEventListener (
- static_cast<awt::XWindowListener*>(this));
-
- // Reset the model reference.
- mxModel = NULL;
-
- // Propagate change of controller down the shape tree.
- maShapeTreeInfo.SetControllerBroadcaster (NULL);
- }
- else if (rEventObject.Source == mxController)
- {
- ::osl::Guard< ::osl::Mutex> aGuard (::osl::Mutex::getGlobalMutex());
-
- // Unregister as property change listener at the controller.
- uno::Reference<beans::XPropertySet> xSet (mxController,uno::UNO_QUERY);
- if (xSet.is())
- xSet->removePropertyChangeListener (
- OUString (RTL_CONSTASCII_USTRINGPARAM("")),
- static_cast<beans::XPropertyChangeListener*>(this));
-
- // Reset the model reference.
- mxController = NULL;
+ impl_dispose();
}
}
@@ -688,36 +718,7 @@
// This method is called from the component helper base class while disposing.
void SAL_CALL AccessibleDocumentViewBase::disposing (void)
{
- // Unregister from VCL Window.
- Window* pWindow = maShapeTreeInfo.GetWindow();
- if (pWindow != NULL)
- {
- pWindow->RemoveChildEventListener (LINK(
- this, AccessibleDocumentViewBase, WindowChildEventListener));
- }
- else
- {
- DBG_ASSERT (pWindow, "AccessibleDocumentViewBase::disposing");
- }
-
- // Unregister from window.
- if (mxWindow.is())
- {
- mxWindow->removeWindowListener (this);
- mxWindow->removeFocusListener (this);
- }
-
- // Unregister form the model.
- if (mxModel.is())
- mxModel->removeEventListener (
- static_cast<awt::XWindowListener*>(this));
-
- // Unregister from the controller.
- uno::Reference<beans::XPropertySet> xSet (mxController, uno::UNO_QUERY);
- if (xSet.is())
- xSet->removePropertyChangeListener (
- OUString (RTL_CONSTASCII_USTRINGPARAM("")),
- static_cast<beans::XPropertyChangeListener*>(this));
+ impl_dispose();
AccessibleContextBase::disposing ();
}
Index: source/ui/accessibility/AccessibleDrawDocumentView.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx,v
retrieving revision 1.30
diff -u -r1.30 AccessibleDrawDocumentView.cxx
--- openoffice.org.orig/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx 7 Jul 2008 14:21:10 -0000 1.30
+++ openoffice.org/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx 16 Sep 2008 08:02:46 -0000
@@ -664,6 +666,16 @@
}
+void AccessibleDrawDocumentView::impl_dispose()
+{
+ if (mpChildrenManager != NULL)
+ {
+ delete mpChildrenManager;
+ mpChildrenManager = NULL;
+ }
+
+ AccessibleDocumentViewBase::impl_dispose();
+}
/** This method is called from the component helper base class while
Index: source/ui/inc/AccessibleDocumentViewBase.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/inc/AccessibleDocumentViewBase.hxx,v
retrieving revision 1.13
diff -u -r1.13 AccessibleDocumentViewBase.hxx
--- openoffice.org.orig/sd/source/ui/inc/AccessibleDocumentViewBase.hxx 10 Apr 2008 20:33:06 -0000 1.13
+++ openoffice.org/sd/source/ui/inc/AccessibleDocumentViewBase.hxx 16 Sep 2008 08:02:47 -0000
@@ -257,7 +257,6 @@
throw (::com::sun::star::uno::RuntimeException);
private:
-
// return the member maMutex;
virtual ::osl::Mutex&
implGetMutex();
@@ -306,6 +305,8 @@
::com::sun::star::accessibility::XAccessible>
mxAccessibleOLEObject;
+ Link maWindowLink;
+
// This method is called from the component helper base class while
// disposing.
virtual void SAL_CALL disposing (void);
@@ -362,6 +363,8 @@
virtual void SetAccessibleOLEObject (
const ::com::sun::star::uno::Reference <
::com::sun::star::accessibility::XAccessible>& xOLEObject);
+
+ virtual void impl_dispose();
};
} // end of namespace accessibility
Index: source/ui/inc/AccessibleDrawDocumentView.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/inc/AccessibleDrawDocumentView.hxx,v
retrieving revision 1.12
diff -u -r1.12 AccessibleDrawDocumentView.hxx
--- openoffice.org.orig/sd/source/ui/inc/AccessibleDrawDocumentView.hxx 10 Apr 2008 20:33:23 -0000 1.12
+++ openoffice.org/sd/source/ui/inc/AccessibleDrawDocumentView.hxx 16 Sep 2008 08:02:47 -0000
@@ -164,6 +164,8 @@
change event indicating that it has lost the focus.
*/
virtual void Deactivated (void);
+
+ virtual void impl_dispose();
};
} // end of namespace accessibility
Index: source/ui/unoidl/DrawController.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/unoidl/DrawController.cxx,v
retrieving revision 1.27
diff -u -r1.27 DrawController.cxx
--- openoffice.org.orig/sd/source/ui/unoidl/DrawController.cxx 7 Jul 2008 14:22:34 -0000 1.27
+++ openoffice.org/sd/source/ui/unoidl/DrawController.cxx 16 Sep 2008 08:02:48 -0000
@@ -316,8 +316,8 @@
const Reference< view::XSelectionChangeListener >& xListener )
throw(RuntimeException)
{
- if( mbDisposing )
- throw lang::DisposedException();
+ if( rBHelper.bDisposed )
+ throw lang::DisposedException();
BroadcastHelperOwner::maBroadcastHelper.removeListener (saSelectionTypeIdentifier, xListener);
}
Index: source/accessibility/ChildrenManagerImpl.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/accessibility/ChildrenManagerImpl.cxx,v
retrieving revision 1.41
diff -u -r1.41 ChildrenManagerImpl.cxx
--- openoffice.org.orig/svx/source/accessibility/ChildrenManagerImpl.cxx 24 Jun 2008 16:38:48 -0000 1.41
+++ openoffice.org/svx/source/accessibility/ChildrenManagerImpl.cxx 16 Sep 2008 08:13:52 -0000
@@ -45,6 +45,8 @@
#include <rtl/ustring.hxx>
#include <tools/debug.hxx>
+#include <stdio.h>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using ::com::sun::star::uno::Reference;
@@ -77,7 +79,8 @@
mxParent (rxParent),
maShapeTreeInfo (rShapeTreeInfo),
mrContext (rContext),
- mnNewNameIndex(1)
+ mnNewNameIndex(1),
+ mpFocusedShape(NULL)
{
}
@@ -95,12 +98,19 @@
void ChildrenManagerImpl::Init (void)
{
+
// Register as view::XSelectionChangeListener.
+ Reference<frame::XController> xController(maShapeTreeInfo.GetController());
Reference<view::XSelectionSupplier> xSelectionSupplier (
- maShapeTreeInfo.GetController(), uno::UNO_QUERY);
+ xController, uno::UNO_QUERY);
if (xSelectionSupplier.is())
+ {
+ xController->addEventListener(
+ static_cast<document::XEventListener*>(this));
+
xSelectionSupplier->addSelectionChangeListener (
static_cast<view::XSelectionChangeListener*>(this));
+ }
// Register at model as document::XEventListener.
if (maShapeTreeInfo.GetModelBroadcaster().is())
@@ -217,26 +227,46 @@
Rectangle aVisibleArea = maShapeTreeInfo.GetViewForwarder()->GetVisibleArea();
// 1. Create a local list of visible shapes.
- ChildDescriptorListType aNewChildList;
- CreateListOfVisibleShapes (aNewChildList);
-
- // 2. Find all shapes in the current list that are not in the new list,
- // send appropriate events and remove the accessible shape.
- RemoveNonVisibleChildren (aNewChildList);
+ ChildDescriptorListType aChildList;
+ CreateListOfVisibleShapes (aChildList);
- // 3. Merge the information that is already known about the visible
+ // 2. Merge the information that is already known about the visible
// shapes from the current list into the new list.
- MergeAccessibilityInformation (aNewChildList);
+ MergeAccessibilityInformation (aChildList);
- // 4. Replace the current list of visible shapes with the new one. Do
+ // 3. Replace the current list of visible shapes with the new one. Do
// the same with the visible area.
{
::osl::MutexGuard aGuard (maMutex);
- adjustIndexInParentOfShapes(aNewChildList);
+ adjustIndexInParentOfShapes(aChildList);
// Use swap to copy the contents of the new list in constant time.
- maVisibleChildren.swap (aNewChildList);
- aNewChildList.clear();
+ maVisibleChildren.swap (aChildList);
+
+ // aChildList now contains all the old children, while maVisibleChildren
+ // contains all the current children
+
+ // 4. Find all shapes in the old list that are not in the current list,
+ // send appropriate events and remove the accessible shape.
+ //
+ // Do this *after* we have set our new list of children, because
+ // removing a child may cause
+ //
+ // ChildDescriptor::disposeAccessibleObject -->
+ // AccessibleContextBase::CommitChange -->
+ // AtkListener::notifyEvent ->
+ // AtkListener::handleChildRemoved ->
+ // AtkListener::updateChildList
+ // AccessibleDrawDocumentView::getAccessibleChildCount ->
+ // ChildrenManagerImpl::GetChildCount ->
+ // maVisibleChildren.size()
+ //
+ // to be fired, and so the operations will take place on
+ // the list we are trying to replace
+ //
+ RemoveNonVisibleChildren (maVisibleChildren, aChildList);
+
+ aChildList.clear();
maVisibleArea = aVisibleArea;
}
@@ -318,15 +348,15 @@
void ChildrenManagerImpl::RemoveNonVisibleChildren (
- ChildDescriptorListType& raNewChildList)
+ const ChildDescriptorListType& rNewChildList, ChildDescriptorListType& rOldChildList)
{
// Iterate over list of formerly visible children and remove those that
// are not visible anymore, i.e. member of the new list of visible
// children.
- ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
- for (I=maVisibleChildren.begin(); I != aEnd; ++I)
+ ChildDescriptorListType::iterator I, aEnd = rOldChildList.end();
+ for (I=rOldChildList.begin(); I != aEnd; ++I)
{
- if (::std::find(raNewChildList.begin(), raNewChildList.end(), *I) == raNewChildList.end())
+ if (::std::find(rNewChildList.begin(), rNewChildList.end(), *I) == rNewChildList.end())
{
// The child is disposed when there is a UNO shape from which
// the accessible shape can be created when the shape becomes
@@ -573,12 +603,14 @@
{
// Remember the current broadcasters and exchange the shape tree info.
Reference<document::XEventBroadcaster> xCurrentBroadcaster;
+ Reference<frame::XController> xCurrentController;
Reference<view::XSelectionSupplier> xCurrentSelectionSupplier;
{
::osl::MutexGuard aGuard (maMutex);
xCurrentBroadcaster = maShapeTreeInfo.GetModelBroadcaster();
+ xCurrentController = maShapeTreeInfo.GetController();
xCurrentSelectionSupplier = Reference<view::XSelectionSupplier> (
- maShapeTreeInfo.GetController(), uno::UNO_QUERY);
+ xCurrentController, uno::UNO_QUERY);
maShapeTreeInfo = rShapeTreeInfo;
}
@@ -597,19 +629,30 @@
}
// Move registration to new selection supplier.
+ Reference<frame::XController> xNewController(maShapeTreeInfo.GetController());
Reference<view::XSelectionSupplier> xNewSelectionSupplier (
- maShapeTreeInfo.GetController(), uno::UNO_QUERY);
+ xNewController, uno::UNO_QUERY);
if (xNewSelectionSupplier != xCurrentSelectionSupplier)
{
// Register at new broadcaster.
if (xNewSelectionSupplier.is())
+ {
+ xNewController->addEventListener(
+ static_cast<document::XEventListener*>(this));
+
xNewSelectionSupplier->addSelectionChangeListener (
static_cast<view::XSelectionChangeListener*>(this));
+ }
// Unregister at old broadcaster.
if (xCurrentSelectionSupplier.is())
+ {
xCurrentSelectionSupplier->removeSelectionChangeListener (
static_cast<view::XSelectionChangeListener*>(this));
+
+ xCurrentController->removeEventListener(
+ static_cast<document::XEventListener*>(this));
+ }
}
}
@@ -622,22 +665,13 @@
ChildrenManagerImpl::disposing (const lang::EventObject& rEventObject)
throw (uno::RuntimeException)
{
- if (rEventObject.Source == maShapeTreeInfo.GetModelBroadcaster())
- {
- maShapeTreeInfo.SetModelBroadcaster (NULL);
- // The disposing of a model should be handled elsewhere. But to be
- // on the safe side we remove all of our children.
- ClearAccessibleShapeList ();
- SetShapeList (NULL);
- }
-
- else if (rEventObject.Source
- == Reference<view::XSelectionSupplier> (
- maShapeTreeInfo.GetController(), uno::UNO_QUERY))
+ if (
+ rEventObject.Source == maShapeTreeInfo.GetModelBroadcaster() ||
+ rEventObject.Source == maShapeTreeInfo.GetController()
+ )
{
- maShapeTreeInfo.SetController (NULL);
+ impl_dispose();
}
-
// Handle disposing UNO shapes.
else
{
@@ -694,29 +728,47 @@
}
+void ChildrenManagerImpl::impl_dispose()
+{
+ Reference<frame::XController> xController(maShapeTreeInfo.GetController());
+ // Remove from broadcasters.
+ try {
+ Reference<view::XSelectionSupplier> xSelectionSupplier (
+ xController, uno::UNO_QUERY);
+ if (xSelectionSupplier.is())
+ {
+ xSelectionSupplier->removeSelectionChangeListener (
+ static_cast<view::XSelectionChangeListener*>(this));
+ }
+ }
+ catch( uno::RuntimeException&) { }
+ try {
+ if (xController.is())
+ xController->removeEventListener(
+ static_cast<document::XEventListener*>(this));
+ } catch( uno::RuntimeException&) { }
-void SAL_CALL ChildrenManagerImpl::disposing (void)
-{
- try
- {
- // Remove from broadcasters.
- Reference<view::XSelectionSupplier> xSelectionSupplier (
- maShapeTreeInfo.GetController(), uno::UNO_QUERY);
- if (xSelectionSupplier.is())
- xSelectionSupplier->removeSelectionChangeListener (
- static_cast<view::XSelectionChangeListener*>(this));
-
- if (maShapeTreeInfo.GetModelBroadcaster().is())
- maShapeTreeInfo.GetModelBroadcaster()->removeEventListener (
- static_cast<document::XEventListener*>(this));
- }
- catch( uno::RuntimeException& )
- {
- // our XSelectionSupplier may be already disposed
- }
+ maShapeTreeInfo.SetController (NULL);
+
+ try {
+ // Remove from broadcaster.
+ if (maShapeTreeInfo.GetModelBroadcaster().is())
+ maShapeTreeInfo.GetModelBroadcaster()->removeEventListener (
+ static_cast<document::XEventListener*>(this));
+ maShapeTreeInfo.SetModelBroadcaster (NULL);
+ }
+ catch( uno::RuntimeException& ) { }
ClearAccessibleShapeList ();
+ SetShapeList (NULL);
+}
+
+
+
+void SAL_CALL ChildrenManagerImpl::disposing (void)
+{
+ impl_dispose();
}
Index: source/accessibility/ChildrenManagerImpl.hxx
===================================================================
RCS file: /cvs/graphics/svx/source/accessibility/ChildrenManagerImpl.hxx,v
retrieving revision 1.24
diff -u -r1.24 ChildrenManagerImpl.hxx
--- openoffice.org.orig/svx/source/accessibility/ChildrenManagerImpl.hxx 24 Jun 2008 16:39:05 -0000 1.24
+++ openoffice.org/svx/source/accessibility/ChildrenManagerImpl.hxx 16 Sep 2008 08:13:52 -0000
@@ -378,6 +378,7 @@
::com::sun::star::accessibility::XAccessible>& xChild) const
throw (::com::sun::star::uno::RuntimeException);
+ void impl_dispose();
private:
/** Names of new accessible objects are disambiguated with this index.
It gets increased every time a new object is created and (at the
@@ -406,14 +407,18 @@
*/
void CreateListOfVisibleShapes (ChildDescriptorListType& raChildList);
- /** From the internal list of (former) visible shapes remove those that
- are not member of the given list. Send appropriate events for every
+ /** From the old list of (former) visible shapes remove those that
+ are not member of the new list. Send appropriate events for every
such shape.
- @param raChildList
- The new list of visible children against which the internal one
+ @param raNewChildList
+ The new list of visible children against which the old one
+ is compared.
+ @param raOldChildList
+ The old list of visible children against which the new one
is compared.
*/
- void RemoveNonVisibleChildren (ChildDescriptorListType& raChildList);
+ void RemoveNonVisibleChildren (const ChildDescriptorListType& raNewChildList,
+ ChildDescriptorListType& raOldChildList);
/** Merge the information that is already known about the visible shapes
from the current list into the new list.
@@ -548,7 +553,7 @@
descriptor may be based on a UNO shape or, already, on an accessible
shape.
*/
- inline bool operator == (const ChildDescriptor& aDescriptor)
+ inline bool operator == (const ChildDescriptor& aDescriptor) const
{
return (this == &aDescriptor || (mxShape.get() == aDescriptor.mxShape.get() ) && ( mxShape.is() || mxAccessibleShape.get() == aDescriptor.mxAccessibleShape.get()));
}
@@ -557,7 +562,7 @@
to put child descriptors in some STL containers. The ordering itself is
not so important, its 'features' are not used.
*/
- inline bool operator < (const ChildDescriptor& aDescriptor)
+ inline bool operator < (const ChildDescriptor& aDescriptor) const
{
return (mxShape.get() < aDescriptor.mxShape.get());
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1652
retrieving revision 1.1653
diff -u -r1.1652 -r1.1653
--- openoffice.org.spec 16 Sep 2008 11:06:58 -0000 1.1652
+++ openoffice.org.spec 16 Sep 2008 12:13:35 -0000 1.1653
@@ -112,7 +112,7 @@
Patch41: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
Patch42: workspace.cmcfixes50.patch
Patch43: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
-Patch44: openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch
+Patch44: openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch
Patch45: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
%define instdir %{_libdir}
@@ -1312,7 +1312,7 @@
%patch41 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
%patch42 -p1 -b .workspace.cmcfixes50.patch
%patch43 -p1 -b .ooo93515.vcl.jrb-frames.patch
-%patch44 -p1 -b .ooo93419.svx.accessibity-loops.patch
+%patch44 -p1 -b .ooo93942.svx.accessibity-loops.patch
%patch45 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
%build
--- openoffice.org-3.0.0.ooo93419.svx.accessibity-loops.patch DELETED ---
- Previous message (by thread): rpms/man/devel man.spec,1.70,1.71 man-1.6b-rpm.patch,1.2,NONE
- Next message (by thread): rpms/ibus-chewing/devel .cvsignore, 1.3, 1.4 ibus-chewing.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list