distro-configs/LibreOfficeFlatpak.conf | 1 solenv/flatpak-manifest.in | 106 +++++++++++++++++++++++++++++++-- sw/source/filter/ww8/wrtww8.cxx | 1 3 files changed, 104 insertions(+), 4 deletions(-)
New commits: commit 564c34b01269ff4b574f1cc2a5de52ceebdd8b25 Author: Stephan Bergmann <[email protected]> AuthorDate: Sat Nov 25 14:52:51 2023 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Sat Nov 25 19:31:35 2023 +0100 -Werror=maybe-uninitialized Change-Id: I7b3dca8c698d3be304817ad3fa863bd3dfe54a1a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159952 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index fdadb13d34a7..38fbfb21666a 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -1911,6 +1911,7 @@ void MSWordExportBase::SaveData( SwNodeOffset nStt, SwNodeOffset nEnd ) aData.pOldFlyOffset = m_pFlyOffset; aData.eOldAnchorType = m_eNewAnchorType; + aData.bOldWriteAll = false; aData.bOldOutTable = m_bOutTable; aData.bOldFlyFrameAttrs = m_bOutFlyFrameAttrs; aData.bOldStartTOX = m_bStartTOX; commit 4333186f8ccfb7309e1212a2c46624b4d56cf0f9 Author: Stephan Bergmann <[email protected]> AuthorDate: Fri Nov 24 13:18:27 2023 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Sat Nov 25 19:31:25 2023 +0100 Update solenv/flatpak-manifest.in * Incorporate <https://github.com/flathub/org.libreoffice.LibreOffice/commit/e8d48d8a15c9069dd420eac9f651f81fb377567b> "Update runtime to 23.08" * Adapt to recent FONT_NOTO_* change * Adapt to 3d5cafbe1727a95a54eb4a65d98d6d79ec46f0c8 "tdf#157518: external: bundle zxcvbn-c" Change-Id: Ia956a35c99f487b56a0f58bb591bea366faddbce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159926 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf index dae435621e89..b8375380ce02 100644 --- a/distro-configs/LibreOfficeFlatpak.conf +++ b/distro-configs/LibreOfficeFlatpak.conf @@ -60,4 +60,5 @@ --without-system-redland --without-system-sane --without-system-xmlsec +--without-system-zxcvbn --without-system-zxing diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 6e174109c78a..58e2ce8f46f2 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -1,7 +1,7 @@ { "id": "org.libreoffice.LibreOffice", "runtime": "org.freedesktop.Platform", - "runtime-version": "22.08", + "runtime-version": "23.08", "sdk": "org.freedesktop.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.openjdk17" @@ -402,11 +402,102 @@ "dest-filename": "@MDDS_TARBALL@" }, { - "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_TARBALL@";, - "sha256": "@FONT_NOTO_SHA256SUM@", + "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_KUFI_ARABIC_TARBALL@";, + "sha256": "@FONT_NOTO_KUFI_ARABIC_SHA256SUM@", "type": "file", "dest": "external/tarballs", - "dest-filename": "@FONT_NOTO_TARBALL@" + "dest-filename": "@FONT_NOTO_KUFI_ARABIC_TARBALL@" + }, + { + "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SANS_TARBALL@";, + "sha256": "@FONT_NOTO_SANS_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@FONT_NOTO_SANS_TARBALL@" + }, + { + "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SERIF_TARBALL@";, + "sha256": "@FONT_NOTO_SERIF_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@FONT_NOTO_SERIF_TARBALL@" + }, + { + "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SANS_ARABIC_TARBALL@";, + "sha256": "@FONT_NOTO_SANS_ARABIC_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@FONT_NOTO_SANS_ARABIC_TARBALL@" + }, + { + "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_NASKH_ARABIC_TARBALL@";, + "sha256": "@FONT_NOTO_NASKH_ARABIC_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@FONT_NOTO_NASKH_ARABIC_TARBALL@" + }, + { + "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SANS_HEBREW_TARBALL@";, + "sha256": "@FONT_NOTO_SANS_HEBREW_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@FONT_NOTO_SANS_HEBREW_TARBALL@" + }, + { + "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SERIF_HEBREW_TARBALL@";, + "sha256": "@FONT_NOTO_SERIF_HEBREW_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@FONT_NOTO_SERIF_HEBREW_TARBALL@" + }, + { + "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SANS_ARMENIAN_TARBALL@";, + "sha256": "@FONT_NOTO_SANS_ARMENIAN_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@FONT_NOTO_SANS_ARMENIAN_TARBALL@" + }, + { + "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SERIF_ARMENIAN_TARBALL@";, + "sha256": "@FONT_NOTO_SERIF_ARMENIAN_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@FONT_NOTO_SERIF_ARMENIAN_TARBALL@" + }, + { + "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SANS_GEORGIAN_TARBALL@";, + "sha256": "@FONT_NOTO_SANS_GEORGIAN_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@FONT_NOTO_SANS_GEORGIAN_TARBALL@" + }, + { + "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SERIF_GEORGIAN_TARBALL@";, + "sha256": "@FONT_NOTO_SERIF_GEORGIAN_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@FONT_NOTO_SERIF_GEORGIAN_TARBALL@" + }, + { + "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SANS_LAO_TARBALL@";, + "sha256": "@FONT_NOTO_SANS_LAO_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@FONT_NOTO_SANS_LAO_TARBALL@" + }, + { + "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SERIF_LAO_TARBALL@";, + "sha256": "@FONT_NOTO_SERIF_LAO_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@FONT_NOTO_SERIF_LAO_TARBALL@" + }, + { + "url": "https://dev-www.libreoffice.org/src/@FONT_NOTO_SANS_LISU_TARBALL@";, + "sha256": "@FONT_NOTO_SANS_LISU_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@FONT_NOTO_SANS_LISU_TARBALL@" }, { "url": "https://dev-www.libreoffice.org/src/@OPENLDAP_TARBALL@";, @@ -688,6 +779,13 @@ "dest": "external/tarballs", "dest-filename": "@JAVA_WEBSOCKET_TARBALL@" }, + { + "url": "https://dev-www.libreoffice.org/src/@ZXCVBN_C_TARBALL@";, + "sha256": "@ZXCVBN_C_SHA256SUM@", + "type": "file", + "dest": "external/tarballs", + "dest-filename": "@ZXCVBN_C_TARBALL@" + }, { "url": "https://dev-www.libreoffice.org/extern/@OPENSYMBOL_TTF@";, "sha256": "@OPENSYMBOL_SHA256SUM@",
