[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - writerfilter/source
Szymon Kłos
szymon.klos at collabora.com
Tue Jul 11 15:55:53 UTC 2017
writerfilter/source/dmapper/OLEHandler.cxx | 7 +++++++
1 file changed, 7 insertions(+)
New commits:
commit 2b954c3cbd81ef62e8856f315c7e4a2c3a084fce
Author: Szymon Kłos <szymon.klos at collabora.com>
Date: Fri Jul 7 12:58:42 2017 +0200
tdf#108544 edit in window (XLSX inside DOCX)
Change-Id: If1dd46643dc2ae9cc74ba94038609ae3445a416c
Reviewed-on: https://gerrit.libreoffice.org/39706
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
(cherry picked from commit 505ce3a2ba3adeef46daecbf9b14c42cea211408)
Reviewed-on: https://gerrit.libreoffice.org/39715
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index 194d1d3b1113..317fe5c80239 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -191,6 +191,8 @@ void OLEHandler::importStream(const uno::Reference<uno::XComponentContext>& xCom
OUString aFilterService;
if (m_sProgId == "Word.Document.12")
aFilterService = "com.sun.star.comp.Writer.WriterFilter";
+ else if (m_sProgId == "Excel.Sheet.12")
+ aFilterService = "com.sun.star.comp.oox.xls.ExcelFilter";
else if (m_sProgId == "Equation.3")
aFilterService = "com.sun.star.comp.Math.MathTypeFilter";
else
@@ -233,6 +235,11 @@ OUString OLEHandler::getCLSID(const uno::Reference<uno::XComponentContext>& xCom
if (officecfg::Office::Common::Filter::Microsoft::Import::WinWordToWriter::get(xComponentContext))
aRet = "8BC6B165-B1B2-4EDD-aa47-dae2ee689dd6";
}
+ else if (m_sProgId == "Excel.Sheet.12")
+ {
+ if (officecfg::Office::Common::Filter::Microsoft::Import::ExcelToCalc::get(xComponentContext))
+ aRet = "47BBB4CB-CE4C-4E80-A591-42D9AE74950F";
+ }
else if (m_sProgId == "Equation.3")
{
if (officecfg::Office::Common::Filter::Microsoft::Import::MathTypeToMath::get(xComponentContext))
More information about the Libreoffice-commits
mailing list