rpms/openoffice.org/devel workspace.fwk92.patch, NONE, 1.1 openoffice.org.spec, 1.1699, 1.1700 openoffice.org-3.0.0.ooo95793.goodies.met.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29462

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.fwk92.patch 
Removed Files:
	openoffice.org-3.0.0.ooo95793.goodies.met.patch 
Log Message:
move to workspace.fwk92.patch solution

workspace.fwk92.patch:

--- NEW FILE workspace.fwk92.patch ---
Index: filter/source/config/cache/typedetection.cxx
===================================================================
--- openoffice.org.orig/filter/source/config/cache/typedetection.cxx	(.../trunk)	(revision 263288)
+++ openoffice.org/filter/source/config/cache/typedetection.cxx	(.../cws/fwk92)	(revision 264093)
@@ -298,9 +298,28 @@
             aLock.clear();
             // <- SAFE
 
-            if (lFilters.size() > 0)
+            for (  OUStringList::const_iterator pIt  = lFilters.begin();
+                   pIt != lFilters.end() && sFilter.getLength() == 0 ;
+                 ++pIt                    )
             {
-                sFilter = *(lFilters.begin());
+                // SAFE ->
+                aLock.reset();
+                try
+                {
+                    CacheItem aFilter = m_rCache->getItem(FilterCache::E_FILTER, *pIt);
+                    sal_Int32 nFlags  = 0;
+                    aFilter[PROPNAME_FLAGS] >>= nFlags;
+
+                    if ((nFlags & FLAGVAL_IMPORT) == FLAGVAL_IMPORT)
+                        sFilter = *pIt;
+                }
+                catch(const css::uno::Exception&) {}
+                aLock.clear();
+                // <- SAFE
+            }
+
+            if (sFilter.getLength() > 0)
+            {
                 rDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()  ] <<= sRealType;
                 rDescriptor[::comphelper::MediaDescriptor::PROP_FILTERNAME()] <<= sFilter;
                 sType = sRealType;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1699
retrieving revision 1.1700
diff -u -r1.1699 -r1.1700
--- openoffice.org.spec	20 Nov 2008 15:21:53 -0000	1.1699
+++ openoffice.org.spec	20 Nov 2008 17:50:45 -0000	1.1700
@@ -125,7 +125,7 @@
 Patch52: workspace.vcl96.patch
 Patch53: openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch
 Patch54: openoffice.org-3.0.0.ooo95341.cppcanvas.patch
-Patch55: openoffice.org-3.0.0.ooo95793.goodies.met.patch
+Patch55: workspace.fwk92.patch
 Patch56: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
 Patch57: openoffice.org-3.0.0.ooo90653.pyuno.debugging.spew.patch
 Patch58: openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch
@@ -1381,7 +1381,7 @@
 %patch52 -p1 -b .workspace.vcl96.patch
 %patch53 -p1 -b .ooo95533.sw.safertableexport.patch
 %patch54 -p1 -b .ooo95341.cppcanvas.patch
-%patch55 -p1 -b .ooo95793.goodies.met.patch
+%patch55 -p1 -b .workspace.fwk92.patch
 %patch56 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
 %patch57 -p1 -b .ooo90653.pyuno.debugging.spew.patch
 %patch58 -p1 -b .ooo90072.sw.undo-longtext.patch


--- openoffice.org-3.0.0.ooo95793.goodies.met.patch DELETED ---