[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/source writerperfect/source

2020-09-27 Thread David Tardon (via logerrit) 
 filter/Configuration_filter.mk  |2 
 filter/source/config/fragments/filters/PocketWord_File.xcu  |   29 
++
 filter/source/config/fragments/types/writer_PocketWord_File.xcu |   29 
++
 writerperfect/source/writer/MSWorksImportFilter.cxx |3 +
 4 files changed, 63 insertions(+)

New commits:
commit 1e6e891016ae926868de493ab0e29871a2d06b95
Author: David Tardon 
AuthorDate: Sun Sep 27 15:29:44 2020 +0200
Commit: David Tardon 
CommitDate: Sun Sep 27 19:03:20 2020 +0200

restore PocketWord filter, this time backed by libwps

Change-Id: If9843ae717f58e683252c8ea55360a567978395e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103514
Tested-by: Jenkins
Reviewed-by: David Tardon 

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index e71ffacf8f25..d53afa704fc9 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -367,6 +367,7 @@ $(eval $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
Palm_Text_Document \
StarOffice_Writer \
writer_EPUB_Document \
+   writer_PocketWord_File \
 ))
 
 $(eval $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,filter/source/config/fragments/filters,\
@@ -415,6 +416,7 @@ $(eval $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
Palm_Text_Document \
StarOffice_Writer \
EPUB \
+   PocketWord_File \
 ))
 
 # fcfg_web
diff --git a/filter/source/config/fragments/filters/PocketWord_File.xcu 
b/filter/source/config/fragments/filters/PocketWord_File.xcu
new file mode 100644
index ..1ce83aa68fe4
--- /dev/null
+++ b/filter/source/config/fragments/filters/PocketWord_File.xcu
@@ -0,0 +1,29 @@
+
+
+0
+writer_PocketWord_File
+com.sun.star.text.TextDocument
+
+com.sun.star.comp.Writer.MSWorksImportFilter
+
+
+Pocket Word
+
+IMPORT ALIEN 
3RDPARTYFILTER
+
diff --git a/filter/source/config/fragments/types/writer_PocketWord_File.xcu 
b/filter/source/config/fragments/types/writer_PocketWord_File.xcu
new file mode 100644
index ..3f146aba5e26
--- /dev/null
+++ b/filter/source/config/fragments/types/writer_PocketWord_File.xcu
@@ -0,0 +1,29 @@
+
+
+com.sun.star.comp.Writer.MSWorksImportFilter
+
+psw
+application/x-pocket-word
+false
+PocketWord File
+
+Pocket Word
+
+doctype:pwi
+
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx 
b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 5339d9e3f202..ab0efc04f670 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -115,6 +115,9 @@ bool 
MSWorksImportFilter::doDetectFormat(librevenge::RVNGInputStream& rInput, OU
 case libwps::WPS_RESERVED_1:
 rTypeName = "writer_DosWord";
 break;
+case libwps::WPS_RESERVED_4:
+rTypeName = "writer_PocketWord_File";
+break;
 default:
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/source writerperfect/source

2016-02-15 Thread Sean Young 
 filter/Configuration_filter.mk  |2 
 filter/source/config/fragments/filters/DosWord.xcu  |   28 +
 filter/source/config/fragments/types/writer_DosWord.xcu |   22 +++
 writerperfect/source/writer/MSWorksImportFilter.cxx |   45 +---
 4 files changed, 80 insertions(+), 17 deletions(-)

New commits:
commit 2f7f818eeada83c0491dbf40253934d177c36621
Author: Sean Young 
Date:   Sun Feb 7 13:28:31 2016 +

Add Microsoft Word for DOS conversion

Change-Id: I9e20a35dd8e18ba1a9251f4dc3ce903183c250cf
Reviewed-on: https://gerrit.libreoffice.org/22368
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 38c67fea..5dd20f7 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -324,6 +324,7 @@ $(eval $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
writer_WordPerfect_Document \
writer_MS_Works_Document \
writer_MS_Write \
+   writer_DosWord \
writer_ClarisWorks \
writer_Mac_Word \
writer_Mac_Works \
@@ -367,6 +368,7 @@ $(eval $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
WordPerfect \
MS_Works \
MS_Write \
+   DosWord \
ClarisWorks \
Mac_Word \
Mac_Works \
diff --git a/filter/source/config/fragments/filters/DosWord.xcu 
b/filter/source/config/fragments/filters/DosWord.xcu
new file mode 100644
index 000..697032c9
--- /dev/null
+++ b/filter/source/config/fragments/filters/DosWord.xcu
@@ -0,0 +1,28 @@
+
+
+
+
+IMPORT ALIEN 3RDPARTYFILTER
+
+
+com.sun.star.comp.Writer.MSWorksImportFilter
+
+
+Microsoft Word for DOS
+
+
+0
+
+
+writer_DosWord
+
+
+com.sun.star.text.TextDocument
+
+
diff --git a/filter/source/config/fragments/types/writer_DosWord.xcu 
b/filter/source/config/fragments/types/writer_DosWord.xcu
new file mode 100644
index 000..3733388
--- /dev/null
+++ b/filter/source/config/fragments/types/writer_DosWord.xcu
@@ -0,0 +1,22 @@
+
+
+
+
+com.sun.star.comp.Writer.MSWorksImportFilter
+
+
+doc
+
+
+DosWord
+
+
+Microsoft Word for DOS
+
+
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx 
b/writerperfect/source/writer/MSWorksImportFilter.cxx
index b08ddb3..f8a03c8 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -42,23 +42,31 @@ bool 
MSWorksImportFilter::doImportDocument(librevenge::RVNGInputStream ,
 std::string fileEncoding("");
 try
 {
-if ((kind == libwps::WPS_TEXT) && (creator == libwps::WPS_MSWORKS) && 
(confidence == libwps::WPS_CONFIDENCE_EXCELLENT) && needEncoding)
+if ((kind == libwps::WPS_TEXT) && (confidence == 
libwps::WPS_CONFIDENCE_EXCELLENT) && needEncoding)
 {
-const ScopedVclPtrInstance pDlg(
-"Import MsWorks files(libwps)", "CP850");
-if (pDlg->Execute() == RET_OK)
+OUString title, encoding;
+
+switch (creator)
 {
-if (!pDlg->GetEncoding().isEmpty())
-fileEncoding=pDlg->GetEncoding().toUtf8().getStr();
+case libwps::WPS_MSWORKS:
+title = "Import MsWorks files(libwps)";
+encoding = "CP850";
+break;
+case libwps::WPS_RESERVED_0: // MS Write
+title = "Import MsWrite files(libwps)";
+encoding = "CP1251";
+break;
+case libwps::WPS_RESERVED_1: // DosWord
+title = "Import DosWord files(libwps)";
+encoding = "CP850";
+break;
+default:
+title = "Import files(libwps)";
+encoding = "CP850";
+break;
 }
-// we can fail because we are in headless mode, the user has 
cancelled conversion, ...
-else if (pDlg->hasUserCalledCancel())
-return false;
-}
-else if ((kind == libwps::WPS_TEXT) && (creator == 
libwps::WPS_RESERVED_0) && (confidence == libwps::WPS_CONFIDENCE_EXCELLENT) && 
needEncoding)
-{
-const ScopedVclPtrInstance pDlg(
-"Import MsWrite files(libwps)", "CP1252");
+
+const ScopedVclPtrInstance 
pDlg(title, encoding);
 if (pDlg->Execute() == RET_OK)
 {
 if (!pDlg->GetEncoding().isEmpty())
@@ -68,7 +76,6 @@ bool 
MSWorksImportFilter::doImportDocument(librevenge::RVNGInputStream ,
 else if (pDlg->hasUserCalledCancel())
 return false;
 }
-
 }
 catch (css::uno::Exception )
 {

[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/source writerperfect/source

2015-12-07 Thread David Tardon 
 filter/Configuration_filter.mk   |8 -
 filter/source/config/fragments/filters/Beagle_Works_Calc.xcu |   29 ---
 filter/source/config/fragments/filters/Great_Works_Calc.xcu  |   29 ---
 filter/source/config/fragments/filters/MWAW_Spreadsheet.xcu  |   29 +++
 filter/source/config/fragments/filters/Mac_Wingz_Calc.xcu|   30 ---
 filter/source/config/fragments/types/MWAW_Database.xcu   |   25 +++
 filter/source/config/fragments/types/MWAW_Spreadsheet.xcu|   25 +++
 filter/source/config/fragments/types/calc_Beagle_Works.xcu   |   29 ---
 filter/source/config/fragments/types/calc_Great_Works.xcu|   29 ---
 filter/source/config/fragments/types/calc_Mac_Wingz.xcu  |   29 ---
 writerperfect/source/calc/MWAWCalcImportFilter.cxx   |   88 ++-
 11 files changed, 102 insertions(+), 248 deletions(-)

New commits:
commit 33ff1ba8583f9461ddf5b773bee6c1974c21afbe
Author: David Tardon 
Date:   Mon Dec 7 23:09:01 2015 +0100

merge libmwaw type/filter defs (Calc)

Change-Id: Ic0f01d2f71cad69bea0944c62fb0832bc6caa252

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index ae1a871..eeec55d 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -518,13 +518,12 @@ $(eval $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_calc_types.xcu,f
calc_MS_Works_Document \
calc_WPS_Lotus_Document \
calc_WPS_QPro_Document \
-   calc_Beagle_Works \
calc_ClarisWorks \
calc_Claris_Resolve \
-   calc_Great_Works \
calc_Mac_Works \
-   calc_Mac_Wingz \
calc_AppleNumbers \
+   MWAW_Database \
+   MWAW_Spreadsheet \
 ))
 
 $(eval $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.xcu,filter/source/config/fragments/filters,\
@@ -561,11 +560,8 @@ $(eval $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_calc_filters.x
MS_Works_Calc \
WPS_Lotus_Calc \
WPS_QPro_Calc \
-   Beagle_Works_Calc \
ClarisWorks_Calc \
Claris_Resolve_Calc \
-   Great_Works_Calc \
-   Mac_Wingz_Calc \
Mac_Works_Calc \
AppleNumbers \
 ))
diff --git a/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu 
b/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu
deleted file mode 100644
index a5af0c1..000
--- a/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-IMPORT ALIEN 3RDPARTYFILTER PREFERRED
-
-
-com.sun.star.comp.Calc.MWAWCalcImportFilter
-
-
-BeagleWorks/WordPerfect Works v1 
Spreadsheet
-
-
-0
-
-
-calc_Beagle_Works
-
-
-com.sun.star.sheet.SpreadsheetDocument
-
-
diff --git a/filter/source/config/fragments/filters/Great_Works_Calc.xcu 
b/filter/source/config/fragments/filters/MWAW_Spreadsheet.xcu
similarity index 82%
rename from filter/source/config/fragments/filters/Great_Works_Calc.xcu
rename to filter/source/config/fragments/filters/MWAW_Spreadsheet.xcu
index 6e5d765..05a0d4b 100644
--- a/filter/source/config/fragments/filters/Great_Works_Calc.xcu
+++ b/filter/source/config/fragments/filters/MWAW_Spreadsheet.xcu
@@ -7,7 +7,7 @@
  *
 -->
 
-
+
 
 IMPORT ALIEN 3RDPARTYFILTER PREFERRED
 
@@ -15,13 +15,13 @@
 com.sun.star.comp.Calc.MWAWCalcImportFilter
 
 
-GreatWorks Spreadsheet
+Legacy Mac Spreadsheet/Database
 
 
 0
 
 
-calc_Great_Works
+MWAW_Spreadsheet
 
 
 com.sun.star.sheet.SpreadsheetDocument
diff --git a/filter/source/config/fragments/filters/Mac_Wingz_Calc.xcu 
b/filter/source/config/fragments/filters/Mac_Wingz_Calc.xcu
deleted file mode 100644
index 790dcea..000
--- a/filter/source/config/fragments/filters/Mac_Wingz_Calc.xcu
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-IMPORT ALIEN 3RDPARTYFILTER 
PREFERRED
-
-com.sun.star.comp.Calc.MWAWCalcImportFilter
-
-
-Wingz for Mac Document
-
-0
-calc_Mac_Wingz
-
-com.sun.star.sheet.SpreadsheetDocument
-
diff --git a/filter/source/config/fragments/types/calc_Great_Works.xcu 
b/filter/source/config/fragments/types/MWAW_Database.xcu
similarity index 66%
rename from filter/source/config/fragments/types/calc_Great_Works.xcu
rename to filter/source/config/fragments/types/MWAW_Database.xcu
index f14480d..f4c6d81 100644
--- a/filter/source/config/fragments/types/calc_Great_Works.xcu
+++ b/filter/source/config/fragments/types/MWAW_Database.xcu
@@ -7,23 +7,19 @@
  *
 -->
 
-
+
 
 com.sun.star.comp.Calc.MWAWCalcImportFilter
 
-
-dummy
-
-
-
-
+
+
 
 true
 
 
-Great_Works_Calc
+MWAW_Spreadsheet
 
 
-GreatWorks Document
+Legacy Mac

[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/source writerperfect/source

2015-11-29 Thread osnola 
 filter/Configuration_filter.mk|4 +
 filter/source/config/fragments/filters/MWStyle.xcu|   30 ++
 filter/source/config/fragments/filters/PixelPaint_Draw.xcu|   30 ++
 filter/source/config/fragments/types/draw_PixelPaint.xcu  |   29 +
 filter/source/config/fragments/types/writer_MWStyle.xcu   |   29 +
 writerperfect/source/draw/MWAWDrawImportFilter.cxx|7 +-
 writerperfect/source/impress/MWAWPresentationImportFilter.cxx |1 
 writerperfect/source/writer/MWAWImportFilter.cxx  |5 +
 8 files changed, 132 insertions(+), 3 deletions(-)

New commits:
commit 70a11143ada618a37c2bd5c0c27947a834bc13bb
Author: osnola 
Date:   Thu Nov 26 09:59:54 2015 +0100

enable new file formats supported by libmwaw-0.3.7

Change-Id: I03d0f112f74dce6c307258d9765281d91cdd3a03

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 5e093ca..bf6dc92 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -343,6 +343,7 @@ $(eval $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
writer_MacWritePro \
writer_Mariner_Write \
writer_MindWrite \
+   writer_MWStyle \
writer_Nisus_Writer \
writer_TeachText \
writer_TexEdit \
@@ -405,6 +406,7 @@ $(eval $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
MacWrite \
MacWritePro \
Mariner_Write \
+   MWStyle \
MindWrite \
Nisus_Writer \
TeachText \
@@ -592,6 +594,7 @@ $(eval $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,f
draw_MacDrawPro \
draw_Mac_Works \
draw_MacPaint \
+   draw_PixelPaint \
draw_SuperPaint \
draw_PageMaker_Document \
 ))
@@ -618,6 +621,7 @@ $(eval $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.x
MacDrawPro_Draw \
Mac_Works_Draw \
MacPaint_Draw \
+   PixelPaint_Draw \
SuperPaint_Draw \
PageMakerDocument \
 ))
diff --git a/filter/source/config/fragments/filters/MWStyle.xcu 
b/filter/source/config/fragments/filters/MWStyle.xcu
new file mode 100644
index 000..0a6e210
--- /dev/null
+++ b/filter/source/config/fragments/filters/MWStyle.xcu
@@ -0,0 +1,30 @@
+
+
+IMPORT ALIEN 3RDPARTYFILTER 
PREFERRED
+
+com.sun.star.comp.Writer.MWAWImportFilter
+
+
+Style
+
+0
+writer_MWStyle
+
+com.sun.star.text.TextDocument
+
diff --git a/filter/source/config/fragments/filters/PixelPaint_Draw.xcu 
b/filter/source/config/fragments/filters/PixelPaint_Draw.xcu
new file mode 100644
index 000..ce6c938
--- /dev/null
+++ b/filter/source/config/fragments/filters/PixelPaint_Draw.xcu
@@ -0,0 +1,30 @@
+
+
+IMPORT ALIEN 3RDPARTYFILTER 
PREFERRED
+
+com.sun.star.comp.Draw.MWAWDrawImportFilter
+
+
+PixelPaint (v1)
+
+0
+draw_PixelPaint
+
+com.sun.star.drawing.DrawingDocument
+
diff --git a/filter/source/config/fragments/types/draw_PixelPaint.xcu 
b/filter/source/config/fragments/types/draw_PixelPaint.xcu
new file mode 100644
index 000..2a03ad6
--- /dev/null
+++ b/filter/source/config/fragments/types/draw_PixelPaint.xcu
@@ -0,0 +1,29 @@
+
+
+com.sun.star.comp.Draw.MWAWDrawImportFilter
+
+dummy
+
+true
+PixelPaint_Draw
+
+PixelPaint (v1)
+
+
+
diff --git a/filter/source/config/fragments/types/writer_MWStyle.xcu 
b/filter/source/config/fragments/types/writer_MWStyle.xcu
new file mode 100644
index 000..548076e
--- /dev/null
+++ b/filter/source/config/fragments/types/writer_MWStyle.xcu
@@ -0,0 +1,29 @@
+
+
+com.sun.star.comp.Writer.MWAWImportFilter
+
+dummy
+
+true
+Style (v1)
+
+Style v1 Document
+
+
+
diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx 
b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
index 8b5b21a..3e90a02 100644
--- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx
+++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
@@ -35,6 +35,7 @@ static bool handleEmbeddedMWAWGraphicObject(const 
librevenge::RVNGBinaryData 
 static bool handleEmbeddedMWAWSpreadsheetObject(const 
librevenge::RVNGBinaryData , OdfDocumentHandler *pHandler,  const 
OdfStreamType streamType)
 {
 OdsGenerator exporter;
+exporter.registerEmbeddedObjectHandler("image/mwaw-odg", 
);
 exporter.addDocumentHandler(pHandler, streamType);
 return MWAWDocument::decodeSpreadsheet(data, );
 }
@@ -82,10 +83,13 @@ bool 
MWAWDrawImportFilter::doDetectFormat(librevenge::RVNGInputStream , O
 case

[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/source writerperfect/source

2015-10-06 Thread Sean Young 
 filter/Configuration_filter.mk   |2 +
 filter/source/config/fragments/filters/MS_Write.xcu  |   30 +++
 filter/source/config/fragments/types/writer_MS_Write.xcu |   29 ++
 writerperfect/source/writer/MSWorksImportFilter.cxx  |   25 +++-
 4 files changed, 84 insertions(+), 2 deletions(-)

New commits:
commit c399caebe35e57d55edc4fcc19a7276a23e2645f
Author: Sean Young 
Date:   Sun Oct 4 19:41:17 2015 +0100

Add Microsoft Write conversion

Change-Id: I528fd1e83c2cdd89fb13504beb9f86da9e02122d
Reviewed-on: https://gerrit.libreoffice.org/19182
Tested-by: Jenkins 
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 5fe58b0..0357926 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -323,6 +323,7 @@ $(eval $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
writer_StarOffice_XML_Writer \
writer_WordPerfect_Document \
writer_MS_Works_Document \
+   writer_MS_Write \
writer_Beagle_Works \
writer_ClarisWorks \
writer_DocMaker \
@@ -385,6 +386,7 @@ $(eval $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
StarOffice_XML__Writer_ \
WordPerfect \
MS_Works \
+   MS_Write \
Beagle_Works \
ClarisWorks \
DocMaker \
diff --git a/filter/source/config/fragments/filters/MS_Write.xcu 
b/filter/source/config/fragments/filters/MS_Write.xcu
new file mode 100644
index 000..0616138
--- /dev/null
+++ b/filter/source/config/fragments/filters/MS_Write.xcu
@@ -0,0 +1,30 @@
+
+
+IMPORT ALIEN 
3RDPARTYFILTER
+
+com.sun.star.comp.Writer.MSWorksImportFilter
+WRI
+
+Microsoft Write
+
+0
+writer_MS_Write
+
+com.sun.star.text.TextDocument
+
diff --git a/filter/source/config/fragments/types/writer_MS_Write.xcu 
b/filter/source/config/fragments/types/writer_MS_Write.xcu
new file mode 100644
index 000..f42dca6
--- /dev/null
+++ b/filter/source/config/fragments/types/writer_MS_Write.xcu
@@ -0,0 +1,29 @@
+
+
+com.sun.star.comp.Writer.MSWorksImportFilter
+
+wri
+
+true
+MS_Write
+
+Microsoft Write
+
+
+
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx 
b/writerperfect/source/writer/MSWorksImportFilter.cxx
index ff1e49d..42bd1cd 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -42,7 +42,7 @@ bool 
MSWorksImportFilter::doImportDocument(librevenge::RVNGInputStream ,
 std::string fileEncoding("");
 try
 {
-if ((kind == libwps::WPS_TEXT) && (confidence == 
libwps::WPS_CONFIDENCE_EXCELLENT) && needEncoding)
+if ((kind == libwps::WPS_TEXT) && (creator == libwps::WPS_MSWORKS) && 
(confidence == libwps::WPS_CONFIDENCE_EXCELLENT) && needEncoding)
 {
 const ScopedVclPtrInstance pDlg(
 "Import MsWorks files(libwps)", "CP850");
@@ -55,6 +55,20 @@ bool 
MSWorksImportFilter::doImportDocument(librevenge::RVNGInputStream ,
 else if (pDlg->hasUserCalledCancel())
 return false;
 }
+else if ((kind == libwps::WPS_TEXT) && (creator == 
libwps::WPS_MSWRITE) && (confidence == libwps::WPS_CONFIDENCE_EXCELLENT) && 
needEncoding)
+{
+const ScopedVclPtrInstance pDlg(
+"Import MsWrite files(libwps)", "CP1252");
+if (pDlg->Execute() == RET_OK)
+{
+if (!pDlg->GetEncoding().isEmpty())
+fileEncoding=pDlg->GetEncoding().toUtf8().getStr();
+}
+// we can fail because we are in headless mode, the user has 
cancelled conversion, ...
+else if (pDlg->hasUserCalledCancel())
+return false;
+}
+
 }
 catch (css::uno::Exception )
 {
@@ -72,7 +86,14 @@ bool 
MSWorksImportFilter::doDetectFormat(librevenge::RVNGInputStream , OU
 
 if ((kind == libwps::WPS_TEXT) && (confidence == 
libwps::WPS_CONFIDENCE_EXCELLENT))
 {
-rTypeName = "writer_MS_Works_Document";
+if (creator == libwps::WPS_MSWORKS)
+{
+rTypeName = "writer_MS_Works_Document";
+}
+else
+{
+rTypeName = "writer_MS_Write";
+}
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/source writerperfect/source

2013-11-18 Thread David Tardon 
 filter/Configuration_filter.mk   |6 +
 filter/source/config/fragments/filters/Beagle_Works.xcu  |4 -
 filter/source/config/fragments/filters/Great_Works.xcu   |4 -
 filter/source/config/fragments/filters/MacDoc.xcu|2 
 filter/source/config/fragments/filters/Mac_Acta.xcu  |   29 
 filter/source/config/fragments/filters/Mac_More.xcu  |   29 
 filter/source/config/fragments/types/writer_Beagle_Works.xcu |6 -
 filter/source/config/fragments/types/writer_Great_Works.xcu  |6 -
 filter/source/config/fragments/types/writer_Mac_Acta.xcu |   29 
 filter/source/config/fragments/types/writer_Mac_More.xcu |   29 
 writerperfect/source/writer/MWAWImportFilter.cxx |   37 ++-
 11 files changed, 167 insertions(+), 14 deletions(-)

New commits:
commit 78e2af8d7141015372995a3583242998c977e829
Author: David Tardon dtar...@redhat.com
Date:   Mon Nov 18 11:29:47 2013 +0100

enable more formats supported by libmwaw

Change-Id: I60d5ff673843236436af12f86f40916b7d266cd3

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index bace597..347d00c 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -328,8 +328,11 @@ $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter
writer_eDoc_Document \
writer_FullWrite_Professional \
writer_Great_Works \
+   writer_HanMac_Word_J \
writer_HanMac_Word_K \
writer_LightWayText \
+   writer_Mac_Acta \
+   writer_Mac_More \
writer_Mac_Word \
writer_Mac_Works \
writer_MacDoc \
@@ -384,8 +387,11 @@ $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,fi
eDoc_Document \
FullWrite_Professional \
Great_Works \
+   HanMac_Word_J \
HanMac_Word_K \
LightWayText \
+   Mac_Acta \
+   Mac_More \
Mac_Word \
Mac_Works \
MacDoc \
diff --git a/filter/source/config/fragments/filters/Beagle_Works.xcu 
b/filter/source/config/fragments/filters/Beagle_Works.xcu
index f1cab85..e2f9d4c 100644
--- a/filter/source/config/fragments/filters/Beagle_Works.xcu
+++ b/filter/source/config/fragments/filters/Beagle_Works.xcu
@@ -7,7 +7,7 @@
  *
 --
 
-node oor:name=Beagle Works oor:op=replace
+node oor:name=Beagle_Works oor:op=replace
 prop oor:name=Flags
 valueIMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED/value
 /prop
@@ -15,7 +15,7 @@
 valuecom.sun.star.comp.Writer.MWAWImportFilter/value
 /prop
 prop oor:name=UIName
-value xml:lang=x-defaultBeagle Works Document/value
+value xml:lang=x-defaultBeagleWorks/WordPerfect Works v1 
Document/value
 /prop
 prop oor:name=FileFormatVersion
 value0/value
diff --git a/filter/source/config/fragments/filters/Great_Works.xcu 
b/filter/source/config/fragments/filters/Great_Works.xcu
index 6090504..0e5aeb3 100644
--- a/filter/source/config/fragments/filters/Great_Works.xcu
+++ b/filter/source/config/fragments/filters/Great_Works.xcu
@@ -7,7 +7,7 @@
  *
 --
 
-node oor:name=Great Works oor:op=replace
+node oor:name=Great_Works oor:op=replace
 prop oor:name=Flags
 valueIMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED/value
 /prop
@@ -15,7 +15,7 @@
 valuecom.sun.star.comp.Writer.MWAWImportFilter/value
 /prop
 prop oor:name=UIName
-value xml:lang=x-defaultGreat Works Document/value
+value xml:lang=x-defaultGreatWorks Document/value
 /prop
 prop oor:name=FileFormatVersion
 value0/value
diff --git a/filter/source/config/fragments/filters/MacDoc.xcu 
b/filter/source/config/fragments/filters/MacDoc.xcu
index 70ce7d2..2692709 100644
--- a/filter/source/config/fragments/filters/MacDoc.xcu
+++ b/filter/source/config/fragments/filters/MacDoc.xcu
@@ -15,7 +15,7 @@
 valuecom.sun.star.comp.Writer.MWAWImportFilter/value
 /prop
 prop oor:name=UIName
-value xml:lang=x-defaultMacDoc Document/value
+value xml:lang=x-defaultMacDoc v1 Document/value
 /prop
 prop oor:name=FileFormatVersion
 value0/value
diff --git a/filter/source/config/fragments/filters/Mac_Acta.xcu 
b/filter/source/config/fragments/filters/Mac_Acta.xcu
new file mode 100644
index 000..c60349a
--- /dev/null
+++ b/filter/source/config/fragments/filters/Mac_Acta.xcu
@@ -0,0 +1,29 @@
+!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+--
+
+node oor:name=Mac_Acta oor:op=replace
+prop oor:name=Flags
+valueIMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED/value
+/prop
+prop oor:name=FilterService
+