[Libreoffice-commits] core.git: wizards/source

[Caolán McNamara]

 wizards/source/importwizard/DialogModul.xba |    2 --
 wizards/source/importwizard/FilesModul.xba  |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 25547fbddda1d540d2191e9e9a893c7f263b80e2
Author: Caolán McNamara <caol...@redhat.com>
Date:   Fri May 3 13:35:26 2013 +0100

    Related: fdo#60265 fix lunatic way to detect special filter name
    
    The use of SBMAXEXTENSIONLENGTH appears to be an insane way
    to detect full filter names and map them back to short suffixes
    but we are passing suffixes separated by | and if that string
    hits the SBMAXEXTENSIONLENGTH it gets blanked.
    
    So, lets try only doing the conversion to suffix if the filter
    name starts with a common substr handled by SetExtension
    
    Change-Id: I42914d3e042133a2c5e28c9704b5fded7ca938dc

diff --git a/wizards/source/importwizard/DialogModul.xba 
b/wizards/source/importwizard/DialogModul.xba
index c5210ce..673113f 100644
--- a/wizards/source/importwizard/DialogModul.xba
+++ b/wizards/source/importwizard/DialogModul.xba
@@ -74,8 +74,6 @@ Public XMLTemplateList()
 &apos; Applications(X,8) = &quot;File:///...&quot;     (TargetUrl of the 
templates)
 &apos; Applications(X,9) = 0                               (Key to the 
original Index of the Applications)
 
-Public Const SBMAXEXTENSIONLENGTH = 15
-
 
 Sub FillStep_Welcome()
 Dim i as Integer
diff --git a/wizards/source/importwizard/FilesModul.xba 
b/wizards/source/importwizard/FilesModul.xba
index b33404b..4e2bd4c 100644
--- a/wizards/source/importwizard/FilesModul.xba
+++ b/wizards/source/importwizard/FilesModul.xba
@@ -187,7 +187,7 @@ Dim LocXMLTemplateContent as String
        iKey = Applications(ApplIndex, SBAPPLKEY)
        CurListString = PathCollection(CollectIndex, 2)
        LocExtension = sFilterName(iKey +DistIndex, 0)
-       If Len(LocExtension) &gt; SBMAXEXTENSIONLENGTH Then                     
&apos; 7 == Length of two extensions like &apos;sda|sdd
+       If Instr(LocExtension, &quot;vnd.sun.xml.&quot;) = 1 Then
                LocExtension = SetExtension(LocExtension)
                LocContentString = sFilterName(iKey +DistIndex, 0)
                LocContentString = ReplaceString(LocContentString, 
&quot;|&quot;, &quot;;&quot;)

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits