Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4106
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/4106/1
fdo#65044, manage Publisher files in Document Converter
Change-Id: I932d53c3c46fb0d654a1ba31b782ebcaced9bbc3
---
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) = "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 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 "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 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/4106
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I932d53c3c46fb0d654a1ba31b782ebcaced9bbc3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet <[email protected]>
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
