rpms/openoffice.org/devel openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch, NONE, 1.1 openoffice.org.spec, 1.215, 1.216

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19022

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch 
Log Message:
rh#159851# stupid binfilter typedetect

openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch:
 binfilter/binfilterdetect/source/bindetect.cxx |    4 +++-
 binfilterdetect/source/bindetect.cxx           |    0 
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch ---
Index: binfilterdetect/source/bindetect.cxx
===================================================================
RCS file: /cvs/framework/binfilter/binfilterdetect/source/bindetect.cxx,v
retrieving revision 1.6
diff -u -p -r1.6 bindetect.cxx
--- openoffice.org.orig/binfilter/binfilterdetect/source/bindetect.cxx	31 Jan 2005 08:34:15 -0000	1.6
+++ openoffice.org/binfilter/binfilterdetect/source/bindetect.cxx	9 Jun 2005 15:14:02 -0000
@@ -77,6 +77,7 @@
 #include <svtools/itemset.hxx>
 #include <vcl/svapp.hxx>
 #include <sot/storage.hxx>
+#include <sot/formats.hxx>
 
 using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::uno;
@@ -240,7 +241,8 @@ BinFilterDetect::~BinFilterDetect()
                         lDescriptor[nIndexOfFilterName].Value <<= ::rtl::OUString();
 
                     // try general detection using clipboard Id
-                    pFilter = rMatcher.GetFilter4ClipBoardId( aStor->GetFormat(), nMust, nDont );
+                    if (aStor->GetFormat() != SOT_FORMATSTR_ID_MSWORD_DOC)
+                    	pFilter = rMatcher.GetFilter4ClipBoardId( aStor->GetFormat(), nMust, nDont );
                 }
             }
         }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- openoffice.org.spec	9 Jun 2005 14:43:20 -0000	1.215
+++ openoffice.org.spec	9 Jun 2005 15:51:18 -0000	1.216
@@ -108,6 +108,7 @@
 Patch45: workspace.vcl39.patch
 Patch46: openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch
 Patch47: openoffice.org-1.9.108.oooXXXXX.solenv.nostipwithsimpleinstall.patch
+Patch48: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
 
 %define instdir %{_libdir}/openoffice.org%{version}
 
@@ -722,6 +723,7 @@
 %patch45 -p1 -b .workspace.vcl39.patch
 %patch46 -p1 -b .ooo30133.lingucomponent.ukrainean.patch
 %patch47 -p1 -b .oooXXXXX.solenv.nostipwithsimpleinstall.patch
+%patch48 -p1 -b .ooo47323.binfilter.stupiddetect.patch
 
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
@@ -2535,6 +2537,8 @@
 %changelog
 * Thu Jun 09 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.108-3
 - rh#159930# use us english thesaurus for australia as well
+- add openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch for
+  rh#159851#/ooo#47323#
 
 * Thu Jun 09 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.108-2
 - add openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch