diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2013-05-30 22:02:58 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-06-10 05:13:43 +0000 |
| commit | c2fe77fbfcd3b2d044c11ee33984de52a3fb028c (patch) | |
| tree | 3c020b6fc9336f9f89761ce8740a674805313563 /wizards | |
| parent | 680f307c3cb70331e28cde26665dddd23135e235 (diff) | |
fdo#65044, manage Publisher files in Document Converter
Change-Id: I932d53c3c46fb0d654a1ba31b782ebcaced9bbc3
Reviewed-on: https://gerrit.libreoffice.org/4106
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Reviewed-on: https://gerrit.libreoffice.org/4187
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/source/importwizard/DialogModul.xba | 8 | ||||
| -rw-r--r-- | wizards/source/importwizard/FilesModul.xba | 2 | ||||
| -rw-r--r-- | wizards/source/importwizard/importwi.src | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/wizards/source/importwizard/DialogModul.xba b/wizards/source/importwizard/DialogModul.xba index 673113fc59ce..65fb1f2aec84 100644 --- a/wizards/source/importwizard/DialogModul.xba +++ b/wizards/source/importwizard/DialogModul.xba @@ -342,11 +342,11 @@ Sub SetupMSConfiguration() MSFilterName(1,3) = sMSDocumentCheckBox(1) MSFilterName(1,4) = "Excel" - MSFilterName(2,0) = "ppt|pps|pptx|pptm|ppsx|ppsm" - MSFilterName(2,1) = "impress8|impress8|impress8|impress8|impress8|impress8" - MSFilterName(2,2) = "odp|odp|odp|odp|odp|odp" + MSFilterName(2,0) = "ppt|pps|pptx|pub|pptm|ppsx|ppsm" + MSFilterName(2,1) = "impress8|impress8|impress8|impress8|impress8|impress8|impress8" + MSFilterName(2,2) = "odp|odp|odp|odp|odp|odp|odp" MSFilterName(2,3) = sMSDocumentCheckBox(2) - MSFilterName(2,4) = "PowerPoint" + MSFilterName(2,4) = "PowerPoint/Publisher" MSFilterName(3,0) = "dot|dotx|dotm" MSFilterName(3,1) = "writer8_template|writer8_template|writer8_template" diff --git a/wizards/source/importwizard/FilesModul.xba b/wizards/source/importwizard/FilesModul.xba index f0e26cce9149..c796cad5ea2e 100644 --- a/wizards/source/importwizard/FilesModul.xba +++ b/wizards/source/importwizard/FilesModul.xba @@ -450,7 +450,7 @@ Dim s as Integer FirstList(i,1) = SecList(s,1) sLocExtension = lcase(FirstList(i,1)) Select Case sLocExtension - Case "sdw", "sdc", "sda", "sdd", "smf", "sgl", "doc", "docx", "docm", "xls", "xlsx", "xlsm", "ppt", "pps", "pptx", "pptm", "ppsx", "ppsm", "sxi", "sxw", "sxd", "sxg", "sxm", "sxc" + Case "sdw", "sdc", "sda", "sdd", "smf", "sgl", "doc", "docx", "docm", "xls", "xlsx", "xlsm", "ppt", "pps", "pptx", "pptm", "ppsx", "ppsm", "pub", "sxi", "sxw", "sxd", "sxg", "sxm", "sxc" AbsDocuFound = AbsDocuFound + 1 Case else AbsTemplateFound = AbsTemplateFound + 1 diff --git a/wizards/source/importwizard/importwi.src b/wizards/source/importwizard/importwi.src index 9ffc79a776b5..20e22b1ff063 100644 --- a/wizards/source/importwizard/importwi.src +++ b/wizards/source/importwizard/importwi.src @@ -159,7 +159,7 @@ String sMSDocumentCheckbox_2_ String sMSDocumentCheckbox_3_ { - Text [ en-US ] = "PowerPoint documents"; + Text [ en-US ] = "PowerPoint/Publisher documents"; }; @@ -400,7 +400,7 @@ String sSumMSTableDocuments String sSumMSDrawDocuments { - Text [ en-US ] = "All PowerPoint documents contained in the following directory will be imported:"; + Text [ en-US ] = "All PowerPoint/Publisher documents contained in the following directory will be imported:"; }; |