[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 4 commits - sc/source sd/source sfx2/sdi solenv/flatpak-manifest.in svx/source sw/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jun 17 11:00:51 UTC 2021
sc/source/ui/inc/tpformula.hxx | 2
sc/source/ui/optdlg/tpformula.cxx | 87 +++++--
sd/source/ui/view/drviews7.cxx | 4
sd/source/ui/view/drviewse.cxx | 5
sd/source/ui/view/outlnvs2.cxx | 5
sd/source/ui/view/outlnvsh.cxx | 4
sfx2/sdi/sfx.sdi | 4
solenv/flatpak-manifest.in | 264 +++++++++++++++--------
svx/source/sidebar/shapes/DefaultShapesPanel.cxx | 7
sw/source/uibase/uiview/pview.cxx | 16 -
sw/source/uibase/uiview/view2.cxx | 2
sw/source/uibase/uiview/viewstat.cxx | 4
12 files changed, 264 insertions(+), 140 deletions(-)
New commits:
commit fbf9029e0539eb6fe1dc130d0304cfd0c12101c9
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jun 15 16:32:51 2021 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jun 17 13:00:12 2021 +0200
Adapt to flatpak-builder 1.0.14 split "dest" + "dest-filename"
see <https://github.com/flatpak/flatpak-builder/issues/399> "flatpak-builder
1.0.14 breaks build of org.libreoffice.LibreOffice, empty
/run/build/libreoffice"
Change-Id: Ia6383d8afb97396cb690a9859fc5d1c8f513970e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117263
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 63adce70ac25..562895ebf940 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -78,529 +78,617 @@
"url": "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2",
"sha256": "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8",
"type": "file",
- "dest-filename": "external/tarballs/pdfium-4306.tar.bz2"
+ "dest": "external/tarballs",
+ "dest-filename": "pdfium-4306.tar.bz2"
},
{
"url": "https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz",
"sha256": "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776",
"type": "file",
- "dest-filename": "external/tarballs/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/xmlsec1-1.2.30.tar.gz",
"sha256": "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8",
"type": "file",
- "dest-filename": "external/tarballs/xmlsec1-1.2.30.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "xmlsec1-1.2.30.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz",
"sha256": "c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09",
"type": "file",
- "dest-filename": "external/tarballs/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz",
"sha256": "4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a",
"type": "file",
- "dest-filename": "external/tarballs/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip",
"sha256": "7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a",
"type": "file",
- "dest-filename": "external/tarballs/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip",
"sha256": "2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc",
"type": "file",
- "dest-filename": "external/tarballs/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz",
"sha256": "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3",
"type": "file",
- "dest-filename": "external/tarballs/liberation-narrow-fonts-ttf-1.07.6.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "liberation-narrow-fonts-ttf-1.07.6.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz",
"sha256": "c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45",
"type": "file",
- "dest-filename": "external/tarballs/liberation-fonts-ttf-2.00.4.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "liberation-fonts-ttf-2.00.4.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip",
"sha256": "54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5",
"type": "file",
- "dest-filename": "external/tarballs/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz",
"sha256": "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f",
"type": "file",
- "dest-filename": "external/tarballs/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz",
"sha256": "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61",
"type": "file",
- "dest-filename": "external/tarballs/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz",
"sha256": "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3",
"type": "file",
- "dest-filename": "external/tarballs/source-serif-pro-3.000R.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "source-serif-pro-3.000R.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz",
"sha256": "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7",
"type": "file",
- "dest-filename": "external/tarballs/EmojiOneColor-SVGinOT-1.3.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "EmojiOneColor-SVGinOT-1.3.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/boost_1_71_0.tar.xz",
"sha256": "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543",
"type": "file",
- "dest-filename": "external/tarballs/boost_1_71_0.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "boost_1_71_0.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz",
"sha256": "ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab",
"type": "file",
- "dest-filename": "external/tarballs/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz",
"sha256": "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f",
"type": "file",
- "dest-filename": "external/tarballs/CoinMP-1.7.6.tgz"
+ "dest": "external/tarballs",
+ "dest-filename": "CoinMP-1.7.6.tgz"
},
{
"url": "https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz",
"sha256": "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7",
"type": "file",
- "dest-filename": "external/tarballs/cppunit-1.15.1.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "cppunit-1.15.1.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2",
"sha256": "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860",
"type": "file",
- "dest-filename": "external/tarballs/Firebird-3.0.0.32483-0.tar.bz2"
+ "dest": "external/tarballs",
+ "dest-filename": "Firebird-3.0.0.32483-0.tar.bz2"
},
{
"url": "https://dev-www.libreoffice.org/src/glm-0.9.9.7.zip",
"sha256": "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95",
"type": "file",
- "dest-filename": "external/tarballs/glm-0.9.9.7.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "glm-0.9.9.7.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/gpgme-1.13.1.tar.bz2",
"sha256": "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46",
"type": "file",
- "dest-filename": "external/tarballs/gpgme-1.13.1.tar.bz2"
+ "dest": "external/tarballs",
+ "dest-filename": "gpgme-1.13.1.tar.bz2"
},
{
"url": "https://dev-www.libreoffice.org/src/libassuan-2.5.3.tar.bz2",
"sha256": "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702",
"type": "file",
- "dest-filename": "external/tarballs/libassuan-2.5.3.tar.bz2"
+ "dest": "external/tarballs",
+ "dest-filename": "libassuan-2.5.3.tar.bz2"
},
{
"url": "https://dev-www.libreoffice.org/src/libgpg-error-1.37.tar.bz2",
"sha256": "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763",
"type": "file",
- "dest-filename": "external/tarballs/libgpg-error-1.37.tar.bz2"
+ "dest": "external/tarballs",
+ "dest-filename": "libgpg-error-1.37.tar.bz2"
},
{
"url": "https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz",
"sha256": "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed",
"type": "file",
- "dest-filename": "external/tarballs/libabw-0.1.3.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libabw-0.1.3.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz",
"sha256": "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861",
"type": "file",
- "dest-filename": "external/tarballs/libcdr-0.1.6.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libcdr-0.1.6.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz",
"sha256": "d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2",
"type": "file",
- "dest-filename": "external/tarballs/libcmis-0.5.2.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libcmis-0.5.2.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz",
"sha256": "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9",
"type": "file",
- "dest-filename": "external/tarballs/libe-book-0.1.3.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libe-book-0.1.3.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz",
"sha256": "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a",
"type": "file",
- "dest-filename": "external/tarballs/libetonyek-0.1.9.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libetonyek-0.1.9.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz",
"sha256": "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8",
"type": "file",
- "dest-filename": "external/tarballs/libexttextcat-3.4.5.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libexttextcat-3.4.5.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz",
"sha256": "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac",
"type": "file",
- "dest-filename": "external/tarballs/libfreehand-0.1.2.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libfreehand-0.1.2.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-03-05.tar.bz2",
"sha256": "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a",
"type": "file",
- "dest-filename": "external/tarballs/language-subtag-registry-2021-03-05.tar.bz2"
+ "dest": "external/tarballs",
+ "dest-filename": "language-subtag-registry-2021-03-05.tar.bz2"
},
{
"url": "https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2",
"sha256": "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e",
"type": "file",
- "dest-filename": "external/tarballs/liblangtag-0.6.2.tar.bz2"
+ "dest": "external/tarballs",
+ "dest-filename": "liblangtag-0.6.2.tar.bz2"
},
{
"url": "https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz",
"sha256": "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba",
"type": "file",
- "dest-filename": "external/tarballs/libmspub-0.1.4.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libmspub-0.1.4.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libmwaw-0.3.17.tar.xz",
"sha256": "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c",
"type": "file",
- "dest-filename": "external/tarballs/libmwaw-0.3.17.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libmwaw-0.3.17.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2",
"sha256": "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2",
"type": "file",
- "dest-filename": "external/tarballs/libodfgen-0.1.6.tar.bz2"
+ "dest": "external/tarballs",
+ "dest-filename": "libodfgen-0.1.6.tar.bz2"
},
{
"url": "https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz",
"sha256": "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d",
"type": "file",
- "dest-filename": "external/tarballs/libpagemaker-0.0.4.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libpagemaker-0.0.4.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2",
"sha256": "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf",
"type": "file",
- "dest-filename": "external/tarballs/librevenge-0.0.4.tar.bz2"
+ "dest": "external/tarballs",
+ "dest-filename": "librevenge-0.0.4.tar.bz2"
},
{
"url": "https://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz",
"sha256": "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db",
"type": "file",
- "dest-filename": "external/tarballs/libstaroffice-0.0.7.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libstaroffice-0.0.7.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/ltm-1.0.zip",
"sha256": "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483",
"type": "file",
- "dest-filename": "external/tarballs/ltm-1.0.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "ltm-1.0.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz",
"sha256": "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c",
"type": "file",
- "dest-filename": "external/tarballs/libvisio-0.1.7.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libvisio-0.1.7.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz",
"sha256": "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09",
"type": "file",
- "dest-filename": "external/tarballs/libwpd-0.10.3.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libwpd-0.10.3.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz",
"sha256": "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c",
"type": "file",
- "dest-filename": "external/tarballs/libwpg-0.3.3.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libwpg-0.3.3.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libwps-0.4.12.tar.xz",
"sha256": "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb",
"type": "file",
- "dest-filename": "external/tarballs/libwps-0.4.12.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libwps-0.4.12.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz",
"sha256": "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22",
"type": "file",
- "dest-filename": "external/tarballs/libzmf-0.0.2.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libzmf-0.0.2.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz",
"sha256": "171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695",
"type": "file",
- "dest-filename": "external/tarballs/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz",
"sha256": "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b",
"type": "file",
- "dest-filename": "external/tarballs/mariadb-connector-c-3.1.8-src.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "mariadb-connector-c-3.1.8-src.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/mdds-1.7.0.tar.bz2",
"sha256": "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf",
"type": "file",
- "dest-filename": "external/tarballs/mdds-1.7.0.tar.bz2"
+ "dest": "external/tarballs",
+ "dest-filename": "mdds-1.7.0.tar.bz2"
},
{
"url": "https://dev-www.libreoffice.org/src/neon-0.31.2.tar.gz",
"sha256": "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678",
"type": "file",
- "dest-filename": "external/tarballs/neon-0.31.2.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "neon-0.31.2.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz",
"sha256": "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994",
"type": "file",
- "dest-filename": "external/tarballs/noto-fonts-20171024.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "noto-fonts-20171024.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz",
"sha256": "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824",
"type": "file",
- "dest-filename": "external/tarballs/openldap-2.4.45.tgz"
+ "dest": "external/tarballs",
+ "dest-filename": "openldap-2.4.45.tgz"
},
{
"url": "https://dev-www.libreoffice.org/src/liborcus-0.16.1.tar.bz2",
"sha256": "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4",
"type": "file",
- "dest-filename": "external/tarballs/liborcus-0.16.1.tar.bz2"
+ "dest": "external/tarballs",
+ "dest-filename": "liborcus-0.16.1.tar.bz2"
},
{
"url": "https://dev-www.libreoffice.org/src/poppler-21.01.0.tar.xz",
"sha256": "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3",
"type": "file",
- "dest-filename": "external/tarballs/poppler-21.01.0.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "poppler-21.01.0.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2",
"sha256": "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f",
"type": "file",
- "dest-filename": "external/tarballs/postgresql-13.1.tar.bz2"
+ "dest": "external/tarballs",
+ "dest-filename": "postgresql-13.1.tar.bz2"
},
{
"url": "https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz",
"sha256": "fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a",
"type": "file",
- "dest-filename": "external/tarballs/QR-Code-generator-1.4.0.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "QR-Code-generator-1.4.0.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz",
"sha256": "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed",
"type": "file",
- "dest-filename": "external/tarballs/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz",
"sha256": "6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c",
"type": "file",
- "dest-filename": "external/tarballs/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz",
"sha256": "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681",
"type": "file",
- "dest-filename": "external/tarballs/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/ReemKufi-0.7.zip",
"sha256": "f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f",
"type": "file",
- "dest-filename": "external/tarballs/ReemKufi-0.7.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "ReemKufi-0.7.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz",
"sha256": "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad",
"type": "file",
- "dest-filename": "external/tarballs/libepubgen-0.1.1.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libepubgen-0.1.1.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz",
"sha256": "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c",
"type": "file",
- "dest-filename": "external/tarballs/libqxp-0.0.2.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libqxp-0.0.2.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/alef-1.001.tar.gz",
"sha256": "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52",
"type": "file",
- "dest-filename": "external/tarballs/alef-1.001.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "alef-1.001.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/Amiri-0.111.zip",
"sha256": "1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166",
"type": "file",
- "dest-filename": "external/tarballs/Amiri-0.111.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "Amiri-0.111.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz",
"sha256": "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b",
"type": "file",
- "dest-filename": "external/tarballs/culmus-0.131.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "culmus-0.131.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz",
"sha256": "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a",
"type": "file",
- "dest-filename": "external/tarballs/libre-hebrew-1.0.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "libre-hebrew-1.0.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/Scheherazade-2.100.zip",
"sha256": "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5",
"type": "file",
- "dest-filename": "external/tarballs/Scheherazade-2.100.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "Scheherazade-2.100.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz",
"sha256": "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56",
"type": "file",
- "dest-filename": "external/tarballs/ttf-kacst_2.01+mry.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "ttf-kacst_2.01+mry.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip",
"sha256": "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96",
"type": "file",
- "dest-filename": "external/tarballs/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz",
"sha256": "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81",
"type": "file",
- "dest-filename": "external/tarballs/commons-logging-1.2-src.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "commons-logging-1.2-src.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip",
"sha256": "233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd",
"type": "file",
- "dest-filename": "external/tarballs/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip",
"sha256": "1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133",
"type": "file",
- "dest-filename": "external/tarballs/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip",
"sha256": "d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370",
"type": "file",
- "dest-filename": "external/tarballs/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip",
"sha256": "75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba",
"type": "file",
- "dest-filename": "external/tarballs/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip",
"sha256": "e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743",
"type": "file",
- "dest-filename": "external/tarballs/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip",
"sha256": "5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b",
"type": "file",
- "dest-filename": "external/tarballs/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip",
"sha256": "e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772",
"type": "file",
- "dest-filename": "external/tarballs/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip",
"sha256": "3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8",
"type": "file",
- "dest-filename": "external/tarballs/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip",
"sha256": "abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095",
"type": "file",
- "dest-filename": "external/tarballs/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip",
"sha256": "05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343",
"type": "file",
- "dest-filename": "external/tarballs/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip",
"sha256": "7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66",
"type": "file",
- "dest-filename": "external/tarballs/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip",
"sha256": "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753",
"type": "file",
- "dest-filename": "external/tarballs/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip",
"sha256": "085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045",
"type": "file",
- "dest-filename": "external/tarballs/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip",
"sha256": "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1",
"type": "file",
- "dest-filename": "external/tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
+ "dest": "external/tarballs",
+ "dest-filename": "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
},
{
"url": "https://dev-www.libreoffice.org/src/libnumbertext-1.0.7.tar.xz",
"sha256": "17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc",
"type": "file",
- "dest-filename": "external/tarballs/libnumbertext-1.0.7.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "libnumbertext-1.0.7.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz",
"sha256": "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665",
"type": "file",
- "dest-filename": "external/tarballs/libatomic_ops-7.6.8.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "libatomic_ops-7.6.8.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/src/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz",
"sha256": "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301",
"type": "file",
- "dest-filename": "external/tarballs/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
+ "dest": "external/tarballs",
+ "dest-filename": "skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz",
"sha256": "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4",
"type": "file",
- "dest-filename": "external/tarballs/dtoa-20180411.tgz"
+ "dest": "external/tarballs",
+ "dest-filename": "dtoa-20180411.tgz"
},
{
"url": "https://dev-www.libreoffice.org/src/box2d-2.3.1.tar.gz",
"sha256": "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c",
"type": "file",
- "dest-filename": "external/tarballs/box2d-2.3.1.tar.gz"
+ "dest": "external/tarballs",
+ "dest-filename": "box2d-2.3.1.tar.gz"
},
{
"url": "https://dev-www.libreoffice.org/extern/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf",
"sha256": "f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140",
"type": "file",
- "dest-filename": "external/tarballs/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf"
+ "dest": "external/tarballs",
+ "dest-filename": "f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf"
}
{
"url": "https://github.com/antijingoist/opendyslexic/releases/download/v0.9.10/opendyslexic-0.9.10-beta-2019.09.16.zip",
commit 1c10af136ef00cddd81452ae8e2202e8d4f6a7bf
Author: Jim Raykowski <raykowj at gmail.com>
AuthorDate: Thu May 27 19:21:11 2021 -0800
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jun 17 13:00:12 2021 +0200
Resolves tdf#142513 fix zoom caller handling
Calling ZoomPlus has always executed shell SID_ZOOM_OUT case handling.
ZoomMinus, which replaced ZoomIn, does SID_ZOOM_IN case handling.
This patch changes ZoomPlus to do SID_ZOOM_IN case handling and
ZoomMinus to do SID_ZOOM_OUT case handling and makes appropriate
changes required by these name changes to provide expected zoom
results in all module shells that have handling for these calls.
Change-Id: If148f4f7866bfc8fc6452ad1c1dace723a125ef6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116287
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj at gmail.com>
(cherry picked from commit ec629c5ee22d02f99d66a5cf975ce239876b7f4d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116702
Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index baac52ee46e1..4e6d10ede19d 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -988,11 +988,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
{
if( GetActiveWindow()->GetZoom() <= GetActiveWindow()->GetMinZoom() || GetDocSh()->IsUIActive() )
{
- rSet.DisableItem( SID_ZOOM_IN );
+ rSet.DisableItem( SID_ZOOM_OUT );
rSet.DisableItem( SID_ZOOM_PANNING );
}
if( GetActiveWindow()->GetZoom() >= GetActiveWindow()->GetMaxZoom() || GetDocSh()->IsUIActive() )
- rSet.DisableItem( SID_ZOOM_OUT );
+ rSet.DisableItem( SID_ZOOM_IN );
}
if (!mpZoomList->IsNextPossible())
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index ca4b46223954..ddac65d20231 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1181,7 +1181,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
}
break;
- case SID_ZOOM_IN: // BASIC
+ case SID_ZOOM_OUT: // BASIC
{
mbZoomOnPage = false;
SetZoom( std::max<::tools::Long>( GetActiveWindow()->GetZoom() / 2, GetActiveWindow()->GetMinZoom() ) );
@@ -1195,7 +1195,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
}
break;
- case SID_ZOOM_OUT:
+ case SID_ZOOM_IN:
{
mbZoomOnPage = false;
SetZoom( std::min<::tools::Long>( GetActiveWindow()->GetZoom() * 2, GetActiveWindow()->GetMaxZoom() ) );
@@ -1203,6 +1203,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
GetActiveWindow()->GetOutputSizePixel()) );
mpZoomList->InsertZoomRect(aVisAreaWin);
Invalidate( SID_ZOOM_IN );
+ Invalidate(SID_ZOOM_OUT);
Invalidate( SID_ZOOM_PANNING );
rReq.Done ();
}
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index 4acabdf2dbf7..94e1d90e8656 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -125,7 +125,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
break;
}
- case SID_ZOOM_OUT:
+ case SID_ZOOM_IN:
{
SetZoom( std::min<::tools::Long>( GetActiveWindow()->GetZoom() * 2, GetActiveWindow()->GetMaxZoom() ) );
::tools::Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( ::tools::Rectangle( Point(0,0),
@@ -133,6 +133,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
mpZoomList->InsertZoomRect(aVisAreaWin);
Invalidate( SID_ATTR_ZOOM );
Invalidate( SID_ZOOM_IN );
+ Invalidate(SID_ZOOM_OUT);
Invalidate( SID_ATTR_ZOOMSLIDER );
Cancel();
rReq.Done();
@@ -152,7 +153,7 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
}
break;
- case SID_ZOOM_IN:
+ case SID_ZOOM_OUT:
{
SetZoom( std::max<::tools::Long>( GetActiveWindow()->GetZoom() / 2, GetActiveWindow()->GetMinZoom() ) );
::tools::Rectangle aVisAreaWin = GetActiveWindow()->PixelToLogic( ::tools::Rectangle( Point(0,0),
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index ce1cb0ceeee3..7bd920d931fc 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -736,9 +736,9 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
SfxItemState::DEFAULT == rSet.GetItemState( SID_ZOOM_OUT ) )
{
if( GetActiveWindow()->GetZoom() <= GetActiveWindow()->GetMinZoom() || GetDocSh()->IsUIActive() )
- rSet.DisableItem( SID_ZOOM_IN );
- if( GetActiveWindow()->GetZoom() >= GetActiveWindow()->GetMaxZoom() || GetDocSh()->IsUIActive() )
rSet.DisableItem( SID_ZOOM_OUT );
+ if( GetActiveWindow()->GetZoom() >= GetActiveWindow()->GetMaxZoom() || GetDocSh()->IsUIActive() )
+ rSet.DisableItem( SID_ZOOM_IN );
}
::Outliner& rOutl = pOlView->GetOutliner();
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 6cdad85a8d53..c94b4ab2f292 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4670,7 +4670,7 @@ SfxBoolItem ViewDataSourceBrowser SID_VIEW_DATA_SOURCE_BROWSER
GroupId = SfxGroupId::View;
]
-SfxVoidItem ZoomMinus SID_ZOOM_IN
+SfxVoidItem ZoomPlus SID_ZOOM_IN
()
[
AutoUpdate = FALSE,
@@ -4706,7 +4706,7 @@ SfxVoidItem ZoomNext SID_ZOOM_NEXT
]
-SfxVoidItem ZoomPlus SID_ZOOM_OUT
+SfxVoidItem ZoomMinus SID_ZOOM_OUT
()
[
AutoUpdate = TRUE,
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 87d04bebed90..1ad4e32a9c55 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -102,18 +102,18 @@ static sal_uInt16 lcl_GetNextZoomStep(sal_uInt16 nCurrentZoom, bool bZoomIn)
const int nZoomArrSize = static_cast<int>(SAL_N_ELEMENTS(aZoomArr));
if (bZoomIn)
{
- for(int i = nZoomArrSize - 1; i >= 0; --i)
+ for(sal_uInt16 i : aZoomArr)
{
- if(nCurrentZoom > aZoomArr[i] || !i)
- return aZoomArr[i];
+ if(nCurrentZoom < i)
+ return i;
}
}
else
{
- for(sal_uInt16 i : aZoomArr)
+ for(int i = nZoomArrSize - 1; i >= 0; --i)
{
- if(nCurrentZoom < i)
- return i;
+ if(nCurrentZoom > aZoomArr[i] || !i)
+ return aZoomArr[i];
}
}
return bZoomIn ? MAX_PREVIEW_ZOOM : MIN_PREVIEW_ZOOM;
@@ -1006,8 +1006,8 @@ void SwPagePreview::GetState( SfxItemSet& rSet )
case SID_ZOOM_OUT:
{
const SwViewOption* pVOpt = GetViewShell()->GetViewOptions();
- if((SID_ZOOM_OUT == nWhich && pVOpt->GetZoom() >= MAX_PREVIEW_ZOOM)||
- (SID_ZOOM_IN == nWhich && pVOpt->GetZoom() <= MIN_PREVIEW_ZOOM))
+ if((SID_ZOOM_IN == nWhich && pVOpt->GetZoom() >= MAX_PREVIEW_ZOOM) ||
+ (SID_ZOOM_OUT == nWhich && pVOpt->GetZoom() <= MIN_PREVIEW_ZOOM))
{
rSet.DisableItem(nWhich);
}
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index f28ebd8f4e83..a9dbb22b904a 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -588,7 +588,7 @@ void SwView::Execute(SfxRequest &rReq)
case SID_ZOOM_OUT:
{
tools::Long nFact = m_pWrtShell->GetViewOptions()->GetZoom();
- if (SID_ZOOM_OUT == nSlot)
+ if (SID_ZOOM_IN == nSlot)
nFact = basegfx::zoomtools::zoomIn(nFact);
else
nFact = basegfx::zoomtools::zoomOut(nFact);
diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx
index 82b1159952fb..59b8dfa1a214 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -74,8 +74,8 @@ void SwView::GetState(SfxItemSet &rSet)
case SID_ZOOM_OUT:
{
tools::Long nFact = m_pWrtShell->GetViewOptions()->GetZoom();
- if ((SID_ZOOM_OUT == nWhich && nFact >= tools::Long(600)) ||
- (SID_ZOOM_IN == nWhich && nFact <= tools::Long(20)))
+ if ((SID_ZOOM_IN == nWhich && nFact >= tools::Long(600)) ||
+ (SID_ZOOM_OUT == nWhich && nFact <= tools::Long(20)))
{
rSet.DisableItem(nWhich);
}
commit a4d78bbbd7b264d3445a0adc9b25bc008eaea10b
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Jun 14 14:39:05 2021 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jun 17 13:00:11 2021 +0200
Resolves: tdf#142767 cannot use itemid of 0 in ValueSets
Change-Id: I2c2b655b512e4e7869fe3784f1b073ecdbd0dac9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117123
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
index 8b97bb5ee4d1..5bdf70ff6e68 100644
--- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
+++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
@@ -121,8 +121,8 @@ IMPL_LINK(DefaultShapesPanel, ShapeSelectHdl, ValueSet*, rValueSet, void)
{
if(rValueSet == aSetMap.first)
{
- int aSelection = aSetMap.first->GetSelectedItemId();
- comphelper::dispatchCommand(aSetMap.second[aSelection], {});
+ sal_uInt16 nSelectionId = aSetMap.first->GetSelectedItemId();
+ comphelper::dispatchCommand(aSetMap.second[nSelectionId - 1], {});
}
else
aSetMap.first->SetNoSelection();
@@ -143,7 +143,8 @@ void DefaultShapesPanel::populateShapes()
auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(sSlotStr,
vcl::CommandInfoProvider::GetModuleIdentifier(mxFrame));
sLabel = vcl::CommandInfoProvider::GetTooltipForCommand(sSlotStr, aProperties, mxFrame);
- aSet.first->InsertItem(i, aSlotImage, sLabel);
+ sal_uInt16 nSelectionId = i + 1; // tdf#142767 id 0 is reserved for nothing-selected
+ aSet.first->InsertItem(nSelectionId, aSlotImage, sLabel);
}
}
}
commit 5736fce7d4ce35f4ab1aab17b47917a22e5f35cc
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Fri Jun 11 19:02:24 2021 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jun 17 13:00:11 2021 +0200
Resolves: tdf#127013 differentiate non-/array separators and restrict
This is a combination of 2 commits.
Resolves: tdf#127013 differentiate non-/array separators and restrict
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117068
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Jenkins
(cherry picked from commit bb54d6d8241a06a6772052b77b67d6a4f686426c)
Related: tdf#127013 Check loaded separators for validity
... not only if something is present at all.
That way future restrictions can reset separators.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117072
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Jenkins
(cherry picked from commit 381bc9d9acd461415cf81eef71ec3dd935a07b62)
I738bcb9e052e8dbecb0a6cd07bbae8f4a8ea1c35
Change-Id: I9ff6b816b0c7af9081954fa407a4d516a576a338
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117075
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index 78d93c798f05..25077921b15c 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -44,7 +44,7 @@ private:
void UpdateCustomCalcRadioButtons(bool bDefault);
void LaunchCustomCalcSettings();
- bool IsValidSeparator(const OUString& rSep) const;
+ bool IsValidSeparator(const OUString& rSep, bool bArray) const;
DECL_LINK(ButtonHdl, weld::Button&, void);
DECL_LINK(SepInsertTextHdl, OUString&, bool);
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 440a509f853d..b4c0045d6469 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -129,40 +129,73 @@ void ScTpFormulaOptions::LaunchCustomCalcSettings()
}
}
-bool ScTpFormulaOptions::IsValidSeparator(const OUString& rSep) const
+bool ScTpFormulaOptions::IsValidSeparator(const OUString& rSep, bool bArray) const
{
if (rSep.getLength() != 1)
// Must be one-character long.
return false;
- if (rSep.compareToAscii("a") >= 0 && rSep.compareToAscii("z") <= 0)
+ const sal_Unicode c = rSep[0];
+
+ if (c == mnDecSep)
+ // decimal separator is not allowed.
+ return false;
+
+ if (c <= 0x20 || c == 0x7f)
+ // Disallow non-printables including space and DEL.
return false;
- if (rSep.compareToAscii("A") >= 0 && rSep.compareToAscii("Z") <= 0)
+ if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || ('0' <= c && c <= '9'))
+ // Disallow alphanumeric.
return false;
- sal_Unicode c = rSep[0];
- switch (c)
+ if (bArray)
{
- case '+':
- case '-':
- case '/':
- case '*':
- case '<':
- case '>':
- case '[':
- case ']':
- case '(':
- case ')':
- case '"':
- case '\'':
- // Disallowed characters. Anything else we want to disallow ?
- return false;
+ switch (c)
+ {
+ case '+':
+ case '-':
+ case '{':
+ case '}':
+ case '"':
+ // All following just to prevent confusion, they are not
+ // evaluated in inline arrays and theoretically would be
+ // possible.
+ case '%':
+ case '/':
+ case '*':
+ case '=':
+ case '<':
+ case '>':
+ case '[':
+ case ']':
+ case '(':
+ case ')':
+ case '\'':
+ // Disallowed characters. Anything else we want to disallow ?
+ return false;
+ }
}
-
- if (c == mnDecSep)
- // decimal separator is not allowed.
+ else if (c <= 0x7f)
+ {
+ switch (c)
+ {
+ default:
+ // Anything bad except the knowns.
+ return false;
+ case ';':
+ case ',':
+ ; // nothing
+ }
+ }
+ else
+ {
+ // Any Unicode character, would have to ask the compiler's localized
+ // symbol map whether it's a known symbol but not a separator
+ // (ocSep,ocArrayRowSep,ocArrayColSep), which we're about to set here.
+ // But really..
return false;
+ }
return true;
}
@@ -181,7 +214,7 @@ IMPL_LINK( ScTpFormulaOptions, ButtonHdl, weld::Button&, rBtn, void )
IMPL_LINK(ScTpFormulaOptions, SepInsertTextHdl, OUString&, rTest, bool)
{
- if (!IsValidSeparator(rTest) && !maOldSepValue.isEmpty())
+ if (!IsValidSeparator(rTest, false) && !maOldSepValue.isEmpty())
// Invalid separator. Restore the old value.
rTest = maOldSepValue;
return true;
@@ -190,7 +223,7 @@ IMPL_LINK(ScTpFormulaOptions, SepInsertTextHdl, OUString&, rTest, bool)
IMPL_LINK(ScTpFormulaOptions, RowSepInsertTextHdl, OUString&, rTest, bool)
{
// Invalid separator or same as ColStr - Restore the old value.
- if ((!IsValidSeparator(rTest) || rTest == mxEdSepArrayCol->get_text()) && !maOldSepValue.isEmpty())
+ if ((!IsValidSeparator(rTest, true) || rTest == mxEdSepArrayCol->get_text()) && !maOldSepValue.isEmpty())
rTest = maOldSepValue;
return true;
}
@@ -198,7 +231,7 @@ IMPL_LINK(ScTpFormulaOptions, RowSepInsertTextHdl, OUString&, rTest, bool)
IMPL_LINK(ScTpFormulaOptions, ColSepInsertTextHdl, OUString&, rTest, bool)
{
// Invalid separator or same as RowStr - Restore the old value.
- if ((!IsValidSeparator(rTest) || rTest == mxEdSepArrayRow->get_text()) && !maOldSepValue.isEmpty())
+ if ((!IsValidSeparator(rTest, true) || rTest == mxEdSepArrayRow->get_text()) && !maOldSepValue.isEmpty())
rTest = maOldSepValue;
return true;
}
@@ -331,9 +364,9 @@ void ScTpFormulaOptions::Reset(const SfxItemSet* rCoreSet)
OUString aSepArrayRow = aOpt.GetFormulaSepArrayRow();
OUString aSepArrayCol = aOpt.GetFormulaSepArrayCol();
- if (aSep.getLength() == 1 && aSepArrayRow.getLength() == 1 && aSepArrayCol.getLength() == 1)
+ if (IsValidSeparator(aSep, false) && IsValidSeparator(aSepArrayRow, true) && IsValidSeparator(aSepArrayCol, true))
{
- // Each separator must be one character long.
+ // Each and all separators must be valid.
mxEdSepFuncArg->set_text(aSep);
mxEdSepArrayCol->set_text(aSepArrayCol);
mxEdSepArrayRow->set_text(aSepArrayRow);
More information about the Libreoffice-commits
mailing list