[Libreoffice-commits] core.git: desktop/source filter/source

[Mert Tumer (via logerrit)]

 desktop/source/lib/init.cxx                        |    6 +++++-
 filter/source/storagefilterdetect/filterdetect.cxx |    7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit b1560344c4ff2d1c5065eccdde31a8d4669510e4
Author:     Mert Tumer <mert.tu...@collabora.com>
AuthorDate: Wed Apr 6 16:59:53 2022 +0300
Commit:     Henry Castro <hcas...@collabora.com>
CommitDate: Thu Aug 11 14:59:00 2022 +0200

    lok: load template documents as regular documents
    
    otherwise lok cannot save them directly because
    libreoffice will try to open a save-as dialog
    For odg, change the draw8_template type draw8
    
    Signed-off-by: Mert Tumer <mert.tu...@collabora.com>
    Change-Id: I34b0ed03adcac89eaa926f8ae6c57e6f622a90f0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132633
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Henry Castro <hcas...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138074
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138098
    Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6f1135248675..7f27f96d9efa 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2563,10 +2563,14 @@ static LibreOfficeKitDocument* 
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
             document::MacroExecMode::NEVER_EXECUTE;
 #endif
 
+        // set AsTemplate explicitly false to be able to load template files
+        // 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("FilterOptions", sFilterOptions),
             comphelper::makePropertyValue("InteractionHandler", xInteraction),
-            comphelper::makePropertyValue("MacroExecutionMode", nMacroExecMode)
+            comphelper::makePropertyValue("MacroExecutionMode", 
nMacroExecMode),
+            comphelper::makePropertyValue("AsTemplate", false)
         };
 
         /* TODO
diff --git a/filter/source/storagefilterdetect/filterdetect.cxx 
b/filter/source/storagefilterdetect/filterdetect.cxx
index 05eb74769b60..8312726e11da 100644
--- a/filter/source/storagefilterdetect/filterdetect.cxx
+++ b/filter/source/storagefilterdetect/filterdetect.cxx
@@ -33,6 +33,8 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <utility>
 
+#include <comphelper/lok.hxx>
+
 using namespace ::com::sun::star;
 using utl::MediaDescriptor;
 
@@ -103,6 +105,11 @@ OUString SAL_CALL 
StorageFilterDetect::detect(uno::Sequence<beans::PropertyValue
         OUString aMediaType;
         xStorageProperties->getPropertyValue( "MediaType" ) >>= aMediaType;
         aTypeName = getInternalFromMediaType( aMediaType );
+        if (comphelper::LibreOfficeKit::isActive() && aTypeName == 
"draw8_template")
+        {
+            // save it as draw8 instead of template format
+            aTypeName = "draw8";
+        }
     }
 
     catch( const lang::WrappedTargetException& aWrap )