[PATCH libreoffice-4-1] fdo#65044, manage Publisher files in Document Converter

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4187

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/4187/1

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>
---
M wizards/source/importwizard/DialogModul.xba
M wizards/source/importwizard/FilesModul.xba
M wizards/source/importwizard/importwi.src
3 files changed, 7 insertions(+), 7 deletions(-)



diff --git a/wizards/source/importwizard/DialogModul.xba 
b/wizards/source/importwizard/DialogModul.xba
index 673113f..65fb1f2 100644
--- a/wizards/source/importwizard/DialogModul.xba
+++ b/wizards/source/importwizard/DialogModul.xba
@@ -342,11 +342,11 @@
        MSFilterName(1,3) = sMSDocumentCheckBox(1)
        MSFilterName(1,4) = &quot;Excel&quot;
 
-       MSFilterName(2,0) = &quot;ppt|pps|pptx|pptm|ppsx|ppsm&quot;
-       MSFilterName(2,1) = &quot;impress8|impress8|impress8|impress8|impress8|impress8&quot;
-       MSFilterName(2,2) = &quot;odp|odp|odp|odp|odp|odp&quot;
+       MSFilterName(2,0) = &quot;ppt|pps|pptx|pub|pptm|ppsx|ppsm&quot;
+       MSFilterName(2,1) = 
&quot;impress8|impress8|impress8|impress8|impress8|impress8|impress8&quot;
+       MSFilterName(2,2) = &quot;odp|odp|odp|odp|odp|odp|odp&quot;
        MSFilterName(2,3) = sMSDocumentCheckBox(2)
-       MSFilterName(2,4) = &quot;PowerPoint&quot;
+       MSFilterName(2,4) = &quot;PowerPoint/Publisher&quot;
 
        MSFilterName(3,0) = &quot;dot|dotx|dotm&quot;
        MSFilterName(3,1) = &quot;writer8_template|writer8_template|writer8_template&quot;
diff --git a/wizards/source/importwizard/FilesModul.xba b/wizards/source/importwizard/FilesModul.xba
index f0e26cc..c796cad 100644
--- a/wizards/source/importwizard/FilesModul.xba
+++ b/wizards/source/importwizard/FilesModul.xba
@@ -450,7 +450,7 @@
                FirstList(i,1) = SecList(s,1)
                sLocExtension = lcase(FirstList(i,1))
                Select Case sLocExtension
-                       Case &quot;sdw&quot;, &quot;sdc&quot;, &quot;sda&quot;, &quot;sdd&quot;, 
&quot;smf&quot;, &quot;sgl&quot;, &quot;doc&quot;, &quot;docx&quot;, &quot;docm&quot;, 
&quot;xls&quot;, &quot;xlsx&quot;, &quot;xlsm&quot;, &quot;ppt&quot;, &quot;pps&quot;, 
&quot;pptx&quot;, &quot;pptm&quot;, &quot;ppsx&quot;, &quot;ppsm&quot;, &quot;sxi&quot;, 
&quot;sxw&quot;, &quot;sxd&quot;, &quot;sxg&quot;, &quot;sxm&quot;, &quot;sxc&quot;
+                       Case &quot;sdw&quot;, &quot;sdc&quot;, &quot;sda&quot;, &quot;sdd&quot;, 
&quot;smf&quot;, &quot;sgl&quot;, &quot;doc&quot;, &quot;docx&quot;, &quot;docm&quot;, 
&quot;xls&quot;, &quot;xlsx&quot;, &quot;xlsm&quot;, &quot;ppt&quot;, &quot;pps&quot;, 
&quot;pptx&quot;, &quot;pptm&quot;, &quot;ppsx&quot;, &quot;ppsm&quot;, &quot;pub&quot;, 
&quot;sxi&quot;, &quot;sxw&quot;, &quot;sxd&quot;, &quot;sxg&quot;, &quot;sxm&quot;, &quot;sxc&quot;
                         AbsDocuFound = AbsDocuFound + 1
                        Case else
                                AbsTemplateFound = AbsTemplateFound + 1
diff --git a/wizards/source/importwizard/importwi.src b/wizards/source/importwizard/importwi.src
index 9ffc79a..20e22b1 100644
--- a/wizards/source/importwizard/importwi.src
+++ b/wizards/source/importwizard/importwi.src
@@ -159,7 +159,7 @@
 
 String sMSDocumentCheckbox_3_
 {
-    Text [ en-US ] = "PowerPoint documents";
+    Text [ en-US ] = "PowerPoint/Publisher documents";
 };
 
 
@@ -400,7 +400,7 @@
 
 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:";
 };
 
 

-- 
To view, visit https://gerrit.libreoffice.org/4187
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I932d53c3c46fb0d654a1ba31b782ebcaced9bbc3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Julien Nabet <serval2412@yahoo.fr>
Gerrit-Reviewer: Miklos Vajna <vmiklos@suse.cz>