Kaydet (Commit) 505ce3a2 authored tarafından Szymon Kłos's avatar Szymon Kłos

tdf#108544 edit in window (XLSX inside DOCX)

Change-Id: If1dd46643dc2ae9cc74ba94038609ae3445a416c
Reviewed-on: https://gerrit.libreoffice.org/39706Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarSzymon Kłos <szymon.klos@collabora.com>
üst 3340ce30
...@@ -186,6 +186,8 @@ void OLEHandler::importStream(const uno::Reference<uno::XComponentContext>& xCom ...@@ -186,6 +186,8 @@ void OLEHandler::importStream(const uno::Reference<uno::XComponentContext>& xCom
OUString aFilterService; OUString aFilterService;
if (m_sProgId == "Word.Document.12") if (m_sProgId == "Word.Document.12")
aFilterService = "com.sun.star.comp.Writer.WriterFilter"; 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") else if (m_sProgId == "Equation.3")
aFilterService = "com.sun.star.comp.Math.MathTypeFilter"; aFilterService = "com.sun.star.comp.Math.MathTypeFilter";
else else
...@@ -228,6 +230,11 @@ OUString OLEHandler::getCLSID(const uno::Reference<uno::XComponentContext>& xCom ...@@ -228,6 +230,11 @@ OUString OLEHandler::getCLSID(const uno::Reference<uno::XComponentContext>& xCom
if (officecfg::Office::Common::Filter::Microsoft::Import::WinWordToWriter::get(xComponentContext)) if (officecfg::Office::Common::Filter::Microsoft::Import::WinWordToWriter::get(xComponentContext))
aRet = "8BC6B165-B1B2-4EDD-aa47-dae2ee689dd6"; 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") else if (m_sProgId == "Equation.3")
{ {
if (officecfg::Office::Common::Filter::Microsoft::Import::MathTypeToMath::get(xComponentContext)) if (officecfg::Office::Common::Filter::Microsoft::Import::MathTypeToMath::get(xComponentContext))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment