From 25547fbddda1d540d2191e9e9a893c7f263b80e2 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 3 May 2013 13:35:26 +0100 Subject: 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 --- wizards/source/importwizard/DialogModul.xba | 2 -- wizards/source/importwizard/FilesModul.xba | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'wizards') diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba index c5210ce88595..673113fc59ce 100644 --- a/wizards/source/importwizard/DialogModul.xba +++ b/wizards/source/importwizard/DialogModul.xba @@ -74,8 +74,6 @@ Public XMLTemplateList() ' Applications(X,8) = "File:///..." (TargetUrl of the templates) ' 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 b33404b1d537..4e2bd4c156b7 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) > SBMAXEXTENSIONLENGTH Then ' 7 == Length of two extensions like 'sda|sdd + If Instr(LocExtension, "vnd.sun.xml.") = 1 Then LocExtension = SetExtension(LocExtension) LocContentString = sFilterName(iKey +DistIndex, 0) LocContentString = ReplaceString(LocContentString, "|", ";") -- cgit