[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                      |    3 
 patches/dev300/wizards-euroconv-types-not-mediatypes.diff |   50 ++++++++++++++
 2 files changed, 53 insertions(+)

New commits:
commit 7189fdf8785b6c9ef9e687d16c410c1f8a944b5d
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Wed Jun 16 11:08:39 2010 +0200

    make the Euro Converter wizard work again by Caolan (i#100686)
    
    * patches/dev300/wizards-euroconv-types-not-mediatypes.diff:
    * patches/dev300/apply: corect the media types check; fix by Caolan (i#100686)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index e83fade..b8c6d92 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2479,6 +2479,9 @@ ooo83878.unopkg.enablelinking.diff, i#83878, bnc#493994, caolan
 # graphical bullets invisible after saving documents on 64bit Linux
 sw-64bit-Size-mismatch.diff, i#101131, caolan
 
+# make the Euro Converter wizard work again
+wizards-euroconv-types-not-mediatypes.diff, 100686, caolan
+
 [ CairoFonts ]
 # needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
 ooo59127.vcl.honourcairofont.diff
diff --git a/patches/dev300/wizards-euroconv-types-not-mediatypes.diff b/patches/dev300/wizards-euroconv-types-not-mediatypes.diff
new file mode 100644
index 0000000..4b05e71
--- /dev/null
+++ b/patches/dev300/wizards-euroconv-types-not-mediatypes.diff
@@ -0,0 +1,50 @@
+diff -ru wizards.orig/source/euro/AutoPilotRun.xba wizards/source/euro/AutoPilotRun.xba
+--- wizards.orig/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) = &quot;application/x-starcalc&quot;
+-			FilterList(1) = &quot;application/vnd.stardivision.calc&quot;
+-			FilterList(2) = &quot;application/vnd.sun.xml.calc&quot;
+-			FilterList(3) = &quot;application/vnd.oasis.opendocument.spreadsheet&quot;
++			TypeList(0) = &quot;calc8&quot;
++			TypeList(1) = &quot;calc_StarOffice_XML_Calc&quot;
++			TypeList(2) = &quot;calc_StarCalc_30&quot;
++			TypeList(3) = &quot;calc_StarCalc_40&quot;
++			TypeList(4) = &quot;calc_StarCalc_50&quot;
+ 			If DialogModel.chkTextDocuments.State = 1 Then
+-				ReDim Preserve FilterList(8) as String
+-				
+-				FilterList(4) = &quot;application/x-starwriter&quot;
+-				FilterList(5) = &quot;application/vnd.stardivision.writer&quot;
+-				FilterList(6) = &quot;application/vnd.stardivision.writer/web&quot;
+-				FilterList(7) = &quot;application/vnd.sun.xml.writer&quot;
+-				FilterList(8) = &quot;application/vnd.oasis.opendocument.text&quot;
++				ReDim Preserve TypeList(13) as String
++
++				TypeList(5) = &quot;writer8&quot;
++				TypeList(6) = &quot;writerglobal8&quot;
++				TypeList(7) = &quot;writer_StarOffice_XML_Writer&quot;
++				TypeList(8) = &quot;writer_globaldocument_StarOffice_XML_Writer_GlobalDocument&quot;
++				TypeList(9) = &quot;writer_StarWriter_30&quot;
++				TypeList(10) = &quot;writer_StarWriter_40&quot;
++				TypeList(11) = &quot;writer_globaldocument_StarWriter_40GlobalDocument&quot;
++				TypeList(12) = &quot;writer_StarWriter_50&quot;
++				TypeList(13) = &quot;writer_globaldocument_StarWriter_50GlobalDocument&quot;
+ 			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)