rpms/openoffice.org/devel openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch, NONE, 1.1 openoffice.org.spec, 1.2234, 1.2235

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15615

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch 
Log Message:
Resolves: rhbz#601599 openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch

openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch:
 AutoPilotRun.xba |   31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

--- NEW FILE openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch ---
--- wizards/source/euro/AutoPilotRun.xba	2010-06-08 11:34:12.000000000 +0100
+++ wizards/source/euro/AutoPilotRun.xba	2010-06-08 12:54:34.000000000 +0100
@@ -11,7 +11,7 @@
 Public SubstFile as String
 Public SubstDir as String
 Public NoArgs()
-Public FilterList(9) as String
+Public TypeList(14) as String
 Public GoOn as Boolean
 Public DoUnprotect as Integer
 Public Password as String
@@ -55,20 +55,25 @@
 		Else
 			SourceDir = Source
 			TargetStemDir = TargetDir
-			FilterList(0) = "application/x-starcalc"
-			FilterList(1) = "application/vnd.stardivision.calc"
-			FilterList(2) = "application/vnd.sun.xml.calc"
-			FilterList(3) = "application/vnd.oasis.opendocument.spreadsheet"
+			TypeList(0) = "calc8"
+			TypeList(1) = "calc_StarOffice_XML_Calc"
+			TypeList(2) = "calc_StarCalc_30"
+			TypeList(3) = "calc_StarCalc_40"
+			TypeList(4) = "calc_StarCalc_50"
 			If DialogModel.chkTextDocuments.State = 1 Then
-				ReDim Preserve FilterList(8) as String
-				
-				FilterList(4) = "application/x-starwriter"
-				FilterList(5) = "application/vnd.stardivision.writer"
-				FilterList(6) = "application/vnd.stardivision.writer/web"
-				FilterList(7) = "application/vnd.sun.xml.writer"
-				FilterList(8) = "application/vnd.oasis.opendocument.text"
+				ReDim Preserve TypeList(13) as String
+
+				TypeList(5) = "writer8"
+				TypeList(6) = "writerglobal8"
+				TypeList(7) = "writer_StarOffice_XML_Writer"
+				TypeList(8) = "writer_globaldocument_StarOffice_XML_Writer_GlobalDocument"
+				TypeList(9) = "writer_StarWriter_30"
+				TypeList(10) = "writer_StarWriter_40"
+				TypeList(11) = "writer_globaldocument_StarWriter_40GlobalDocument"
+				TypeList(12) = "writer_StarWriter_50"
+				TypeList(13) = "writer_globaldocument_StarWriter_50GlobalDocument"
 			End If
-			FilesList() = ReadDirectories(SourceDir, bRecursive, True, False, FilterList())
+			FilesList() = ReadDirectories(SourceDir, bRecursive, True, False, TypeList())
 			TotDocCount = Ubound(FilesList(),1) + 1
 		End If
 		InitializeProgressPage(DialogModel)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2234
retrieving revision 1.2235
diff -u -p -r1.2234 -r1.2235
--- openoffice.org.spec	4 Jun 2010 12:12:51 -0000	1.2234
+++ openoffice.org.spec	8 Jun 2010 12:06:23 -0000	1.2235
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 19
-%define rh_rpm_release 8
+%define rh_rpm_release 9
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -147,6 +147,7 @@ Patch76: openoffice.org-3.3.0.ooo112059.
 Patch77: workspace.os140.patch
 Patch78: workspace.vcl112.patch
 Patch79: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
+Patch80: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1707,6 +1708,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch77 -p1 -b .workspace.os140.patch
 %patch78 -p1 -b .workspace.vcl112.patch
 %patch79 -p1 -b .ooo107490.cppu.lifecycle.patch
+%patch80 -p0 -b .openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4197,6 +4199,9 @@ fi
 %endif
 
 %changelog
+* Tue Jun 08 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.9
+- Resolves: rhbz#601599 openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
+
 * Fri Jun 04 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.8
 - Resolves: rhbz#596980 workspace.vcl112.patch (caolanm)
 - Resolves: rhbz#599596 openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch (caolanm)