Auto sync2gitlab import of libreoffice-6.4.7.2-13.el8.src.rpm

0001-rhbz-1980800-allow-convert-to-csv-to-write-each-shee.patch

@@ -1,4 +1,4 @@
-From c5a9fb7f00fe4d701d98c4058ad0f506c8dd146f Mon Sep 17 00:00:00 2001
+From b49380bd288e642352cb7ddc1c050e2fb34b5b43 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
 Date: Tue, 13 Jul 2021 12:38:07 +0100
 Subject: [PATCH] rhbz#1980800 allow --convert-to csv to write each sheet to a
@@ -45,15 +45,24 @@ Tested-by: Jenkins
 Change-Id: Ib99a120f1a2c8d1008a7a3c59a6b39f572fb346e
 b9248c9561e4e340c88458ac5dfd159e443a4cfd
 9431221aadf97739bb197871f25fa151ef4c391c
+
+Plus follow-up fix
+<https://git.libreoffice.org/core/+/d768757872ad25219fa291acd623ab98924acaaa%5E%21>
+"tdf#129829 sfx2: fix handling of password to open vs modify" (which happens to
+also fix saving to smb shares, in addition to the Windows-specific issue it was
+originally meant to fix), plus the relevant parts of its preceding
+<https://git.libreoffice.org/core/+/037cd13af81f8a1169d01e95036ed942f261f9a6%5E%21>
+"sw reqif-xhtml export: add a new RTFOLEMimeType parameter" introducing
+SfxMedium::SetArgs.
 ---
  desktop/source/app/dispatchwatcher.cxx |  50 +++++++--
- include/sfx2/docfile.hxx               |   1 +
+ include/sfx2/docfile.hxx               |   2 +
  sc/source/ui/dbgui/imoptdlg.cxx        |  16 ++-
  sc/source/ui/docshell/docsh.cxx        | 141 +++++++++++++++++++++----
  sc/source/ui/inc/docsh.hxx             |   2 +-
  sc/source/ui/inc/imoptdlg.hxx          |   6 +-
- sfx2/source/doc/docfile.cxx            |   4 +
+ sfx2/source/doc/docfile.cxx            |  13 +++
- 7 files changed, 184 insertions(+), 36 deletions(-)
+ 7 files changed, 194 insertions(+), 36 deletions(-)
 
 diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
 index 04140173c6d1..a5365da618e8 100644
@@ -154,13 +163,14 @@ index 04140173c6d1..a5365da618e8 100644
                                  }
                                  try
 diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
-index 2019b5738c01..09aae02b1976 100644
+index 2019b5738c01..2886348 100644
 --- a/include/sfx2/docfile.hxx
 +++ b/include/sfx2/docfile.hxx
-@@ -108,6 +108,7 @@ public:
+@@ -108,6 +108,8 @@ public:
      const OUString&     GetOrigURL() const;
  
      SfxItemSet  *       GetItemSet() const;
++    void SetArgs(const css::uno::Sequence<css::beans::PropertyValue>& rArgs);
 +    css::uno::Sequence<css::beans::PropertyValue> GetArgs() const;
      void                Close(bool bInDestruction = false);
      void                CloseAndRelease();
@@ -439,7 +449,7 @@ index bac941c2a377..382067d67813 100644
  
  #endif // INCLUDED_SC_SOURCE_UI_INC_IMOPTDLG_HXX
 diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
-index 5d00d39bd837..ccdd3632e6e5 100644
+index 5d00d39bd837..4e4e74a 100644
 --- a/sfx2/source/doc/docfile.cxx
 +++ b/sfx2/source/doc/docfile.cxx
 @@ -328,6 +328,8 @@ public:
@@ -455,14 +465,23 @@ index 5d00d39bd837..ccdd3632e6e5 100644
      SfxAllItemSet *pParams = new SfxAllItemSet( SfxGetpApp()->GetPool() );
      pImpl->m_pSet.reset( pParams );
      TransformParameters( SID_OPENDOC, aArgs, *pParams );
-+    pImpl->m_aArgs = aArgs;
++    SetArgs(aArgs);
  
      OUString aFilterProvider, aFilterName;
      {
-@@ -3301,6 +3304,7 @@ SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) :
+@@ -3301,6 +3304,16 @@ SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) :
      Init_Impl();
  }
  
++void SfxMedium::SetArgs(const uno::Sequence<beans::PropertyValue>& rArgs)
++{
++    pImpl->m_aArgs = rArgs;
++    comphelper::SequenceAsHashMap aArgsMap(rArgs);
++    aArgsMap.erase("Stream");
++    aArgsMap.erase("InputStream");
++    pImpl->m_aArgs = aArgsMap.getAsConstPropertyValueList();
++}
++
 +uno::Sequence<beans::PropertyValue> SfxMedium::GetArgs() const { return pImpl->m_aArgs; }
  
  SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUString& rBaseURL, const std::shared_ptr<SfxItemSet>& p ) :

libreoffice.spec

@@ -54,7 +54,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        12%{?libo_prerelease}%{?dist}
+Release:        13%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
 URL:            http://www.libreoffice.org/
 
@@ -2287,6 +2287,9 @@ done
 %{_includedir}/LibreOfficeKit
 
 %changelog
+* Mon Nov 21 2022 Stephan Bergmann <sbergman@redhat.com> - 1:6.4.7.2-13
+- Resolves: rhbz#2031681 Failure saving to smb share
+
 * Fri Oct 14 2022 Caolán McNamara <caolanm@redhat.com> - 1:6.4.7.2-12
 - Resolves: rhbz#2118928 CVE-2022-26305 Untrusted Macros
 - Resolves: rhbz#2118924 CVE-2022-26307 Weak Master Keys