summaryrefslogtreecommitdiff
path: root/filter/source/config/cache
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2023-11-28 08:44:23 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2023-11-28 09:21:06 +0100
commite2aa7041b9a831bbd235f698a6485e2282b6f5ca (patch)
treee9e3feb89ed6aa9f1db1491266ec669db010abfe /filter/source/config/cache
parent5beec1db91b590ebb8e043dfabeaba553c586fad (diff)
lok: don't use template flag in more places
Similar to commit e2ee3dd61ab8ea5d970d8da5df3233e7bba5909e (lok: add broken package interaction handler, 2023-10-02), all places of broken package handling should allow replacing the original document. Change-Id: I8450dfc0ab60444fa08014cc952ac857998d35ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160009 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'filter/source/config/cache')
-rw-r--r--filter/source/config/cache/typedetection.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 15a257eef878..c411249877af 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -40,6 +40,7 @@
#include <comphelper/diagnose_ex.hxx>
#include <tools/urlobj.hxx>
#include <comphelper/fileurl.hxx>
+#include <comphelper/lok.hxx>
#include <comphelper/sequence.hxx>
#include <utility>
@@ -931,8 +932,10 @@ OUString TypeDetection::impl_detectTypeFlatAndDeep( utl::MediaDescriptor& r
if (aRequest.isApproved())
{
+ // lok: we want to overwrite file in jail, so don't use template flag
+ const bool bIsLOK = comphelper::LibreOfficeKit::isActive();
rDescriptor[utl::MediaDescriptor::PROP_DOCUMENTTITLE] <<= aDocumentTitle;
- rDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE] <<= true;
+ rDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE] <<= !bIsLOK;
rDescriptor["RepairPackage"] <<= true;
}
else