summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper/OLEHandler.cxx
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2017-07-07 12:58:42 +0200
committerSzymon Kłos <szymon.klos@collabora.com>2017-07-08 09:28:09 +0200
commit505ce3a2ba3adeef46daecbf9b14c42cea211408 (patch)
treeaab90b60e9c0c0ac5b7ea912dc3b25a8c45614cf /writerfilter/source/dmapper/OLEHandler.cxx
parent3340ce30562832b584dd0576d9e0733aa03d867f (diff)
tdf#108544 edit in window (XLSX inside DOCX)
Change-Id: If1dd46643dc2ae9cc74ba94038609ae3445a416c Reviewed-on: https://gerrit.libreoffice.org/39706 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'writerfilter/source/dmapper/OLEHandler.cxx')
-rw-r--r--writerfilter/source/dmapper/OLEHandler.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index 68067648c1ef..24ec24c8f844 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -186,6 +186,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
@@ -228,6 +230,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))