From ooo-commits-return-1787-apmail-incubator-ooo-commits-archive=incubator.apache.org@incubator.apache.org Wed Oct 12 18:47:38 2011 Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8540A7610 for ; Wed, 12 Oct 2011 18:47:38 +0000 (UTC) Received: (qmail 30639 invoked by uid 500); 12 Oct 2011 18:47:38 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 30603 invoked by uid 500); 12 Oct 2011 18:47:38 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 30596 invoked by uid 99); 12 Oct 2011 18:47:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Oct 2011 18:47:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Oct 2011 18:47:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AC3AC238888F; Wed, 12 Oct 2011 18:47:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1182521 - /incubator/ooo/trunk/main/wizards/source/euro/AutoPilotRun.xba Date: Wed, 12 Oct 2011 18:47:16 -0000 To: ooo-commits@incubator.apache.org From: pfg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111012184716.AC3AC238888F@eris.apache.org> Author: pfg Date: Wed Oct 12 18:47:16 2011 New Revision: 1182521 URL: http://svn.apache.org/viewvc?rev=1182521&view=rev Log: i100686 - wizards: Euro converter wizard don't work when searching for calc documents in a dir Modified: incubator/ooo/trunk/main/wizards/source/euro/AutoPilotRun.xba Modified: incubator/ooo/trunk/main/wizards/source/euro/AutoPilotRun.xba URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/wizards/source/euro/AutoPilotRun.xba?rev=1182521&r1=1182520&r2=1182521&view=diff ============================================================================== --- incubator/ooo/trunk/main/wizards/source/euro/AutoPilotRun.xba (original) +++ incubator/ooo/trunk/main/wizards/source/euro/AutoPilotRun.xba Wed Oct 12 18:47:16 2011 @@ -11,7 +11,7 @@ Public Source as String 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 @@ Dim bDisposable as Boolean 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)