diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-05-22 09:18:28 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-05-22 09:18:28 +0000 |
| commit | cf870dd89503bdf7b00e3aa403c413e362c9c31d (patch) | |
| tree | 31d78438eab7fa93c0a1dd9e43302fc74440ea66 /wizards/source/importwizard/FilesModul.xba | |
| parent | 861cc5d9a3cc6b2be793e5bc3fd503a221c207cf (diff) | |
INTEGRATION: CWS extras6 (1.34.4); FILE MERGED
2003/05/12 16:26:51 bc 1.34.4.2: #108942# comment for bug added to sourcecode
2003/05/12 16:16:02 bc 1.34.4.1: #108942# Mimetype for draw templates added
Diffstat (limited to 'wizards/source/importwizard/FilesModul.xba')
| -rw-r--r-- | wizards/source/importwizard/FilesModul.xba | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/wizards/source/importwizard/FilesModul.xba b/wizards/source/importwizard/FilesModul.xba index 97503458ae8d..1ee5a0ade362 100644 --- a/wizards/source/importwizard/FilesModul.xba +++ b/wizards/source/importwizard/FilesModul.xba @@ -91,7 +91,9 @@ Dim bAssignFileName as Boolean If a < MaxIndex And a > -1 Then ReDim Preserve NewList(a, 1) as String End If - AddListtoFilesList(FilesList(), NewList(), NewContentList()) + If a > -1 Then + AddListtoFilesList(FilesList(), NewList(), NewContentList()) + End If End If Else MaxIndex = Ubound(NewList()) @@ -242,6 +244,7 @@ Dim MaxFileIndex as Integer Dim bContainsBasicMacro as Boolean Dim bIsPassWordProtected as Boolean Dim iOverwrite as Integer +Dim sMimeTypeorExtension as String bConversionisrunning = True InteractionTypes(0) = com.sun.star.task.PasswordRequestMode.PASSWORD_REENTER oInteractionHandler = createUnoService("com.sun.star.task.InteractionHandler") @@ -286,7 +289,8 @@ Dim iOverwrite as Integer End If bDoSave = True sSourceUrl = FilesList(i,0) - CurFiltername = GetFilterName(FilesList(i,1), sFilterName(), sExtension, FilterIndex) + sMimeTypeorExtension = FilesList(i,1) + CurFiltername = GetFilterName(sMimeTypeorExtension, sFilterName(), sExtension, FilterIndex) ApplIndex = FilesList(i,2) If ApplIndex > Ubound(Applications) or (ApplIndex < 0) Then Msgbox "Applicationindex out of bounds:" & sSourcUrl @@ -344,7 +348,6 @@ Dim iOverwrite as Integer bIsPassWordProtected = CheckPassWordProtection(oDocument) CheckIfMacroExists(oDocument.BasicLibraries, sComment) On Local Error Goto NOSAVING - ' Todo: Due to bug #93651 the handling of the fileProperties has to be handled without Redimensioning If bIsPassWordProtected Then PWFileProperties(0).Name = "FilterName" PWFileProperties(0).Value = CurFilterName |