desktop/source/lib/init.cxx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 8bad43079758460c0b65455bf9f7a2187d05e27b
Author: Gabriel Masei <gabriel.ma...@1and1.ro>
AuthorDate: Fri Jan 19 18:11:42 2024 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Feb 7 13:11:40 2024 +0100
lok: remove non-filter options from filter options
Filter options should be what remains after extracting any
other options from the original list of options.
Change-Id: Iad787b34aba58c3910118e94df66a102b44034c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162316
Tested-by: Jenkins
Reviewed-by: Henry Castro <hcas...@collabora.com>
(cherry picked from commit 8c10c63388502322ac0ac6a7e5b14e657edbe630)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162451
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c76e7a014725..0085b2609800 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2765,8 +2765,6 @@ static LibreOfficeKitDocument*
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
Application::SetDialogCancelMode(DialogCancelMode::LOKSilent);
}
- const OUString sFilterOptions = aOptions;
-
rtl::Reference<LOKInteractionHandler> const pInteraction(
new LOKInteractionHandler("load"_ostr, pLib));
auto const
pair(pLib->mInteractionMap.insert(std::make_pair(aURL.toUtf8(), pInteraction)));
@@ -2802,7 +2800,7 @@ static LibreOfficeKitDocument*
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
// as regular files, otherwise we cannot save them; it will try
// to bring saveas dialog which cannot work with LOK case
uno::Sequence<css::beans::PropertyValue> aFilterOptions{
- comphelper::makePropertyValue(u"FilterOptions"_ustr,
sFilterOptions),
+ comphelper::makePropertyValue(u"FilterOptions"_ustr, aOptions),
comphelper::makePropertyValue(u"InteractionHandler"_ustr,
xInteraction),
comphelper::makePropertyValue(u"MacroExecutionMode"_ustr,
nMacroExecMode),
comphelper::makePropertyValue(u"AsTemplate"_ustr, false),
