download.lst | 4 ++-- sc/sdi/scalc.sdi | 4 ++-- sc/source/ui/view/tabvwsha.cxx | 2 +- sd/source/ui/docshell/docshell.cxx | 2 +- sw/source/uibase/uiview/viewsrch.cxx | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit cb038a2073a740284cb6b0a57885412ce1084ff5 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Feb 11 17:36:26 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Feb 13 17:36:26 2025 +0100 openssl: upgrade to 3.0.16 Downloaded from https://github.com/openssl/openssl/releases/download/openssl-3.0.16/openssl-3.0.16.tar.gz Change-Id: I9eeb10132455be1240cbe7312275d5211dee3600 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181442 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> (cherry picked from commit fe39e60102f34f6dba59828579ee75e4c05486e0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181453 Reviewed-by: Michael Weghorn <[email protected]> diff --git a/download.lst b/download.lst index fb55904af774..85cec46a2641 100644 --- a/download.lst +++ b/download.lst @@ -611,8 +611,8 @@ OPENLDAP_TARBALL := openldap-2.6.7.tgz # three static lines # so that git cherry-pick # will not run into conflicts -OPENSSL_SHA256SUM := 23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533 -OPENSSL_TARBALL := openssl-3.0.15.tar.gz +OPENSSL_SHA256SUM := 57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86 +OPENSSL_TARBALL := openssl-3.0.16.tar.gz # three static lines # so that git cherry-pick # will not run into conflicts commit c3496d645429612189f16c168955f277cce6d1a4 Author: Mike Kaganski <[email protected]> AuthorDate: Tue Feb 11 14:24:40 2025 +0500 Commit: Andras Timar <[email protected]> CommitDate: Thu Feb 13 17:36:26 2025 +0100 tdf#165185: consider LOK read-only view in SID_SEARCH_OPTIONS This reverts commit cae3ed92df74672a886ee706ebb970a763be3712 "disable invoking Search and Replace dialog (by Ctrl+H) in read-only documents", 2025-02-11. Instead, the dialog will disable replacement controls. Change-Id: Iefef1f636492f60b2bcff07379c2c2dc7bcead79 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181412 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index ead308730fd9..ddd94926303a 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -255,7 +255,7 @@ void ScTabViewShell::GetState( SfxItemSet& rSet ) SearchOptionFlags nOptions = SearchOptionFlags::ALL; // No replacement if ReadOnly - if (GetViewData().GetDocShell()->IsReadOnly()) + if (GetViewData().GetDocShell()->IsReadOnly() || IsCurrentLokViewReadOnly()) nOptions &= ~SearchOptionFlags( SearchOptionFlags::REPLACE | SearchOptionFlags::REPLACE_ALL ); rSet.Put( SfxUInt16Item( nWhich, static_cast<sal_uInt16>(nOptions) ) ); } diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 5ac592f80be3..6dae05250ba1 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -241,7 +241,7 @@ void DrawDocShell::GetState(SfxItemSet &rSet) SearchOptionFlags::SIMILARITY | SearchOptionFlags::SELECTION; - if (!IsReadOnly()) + if (!IsReadOnly() && !SfxViewShell::IsCurrentLokViewReadOnly()) { nOpt |= SearchOptionFlags::REPLACE; nOpt |= SearchOptionFlags::REPLACE_ALL; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 7318b659c292..ad4a5a5b4189 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -3968,7 +3968,7 @@ SfxBoolItem SearchDialog SID_SEARCH_DLG [ AutoUpdate = TRUE, FastCall = FALSE, - ReadOnlyDoc = FALSE, + ReadOnlyDoc = TRUE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx index 5fc92d517b1b..1b2b64d1d460 100644 --- a/sw/source/uibase/uiview/viewsrch.cxx +++ b/sw/source/uibase/uiview/viewsrch.cxx @@ -855,7 +855,7 @@ void SwView::StateSearch(SfxItemSet &rSet) case SID_SEARCH_OPTIONS: { SearchOptionFlags nOpt = SearchOptionFlags::ALL; - if( GetDocShell()->IsReadOnly() ) + if (GetDocShell()->IsReadOnly() || IsCurrentLokViewReadOnly()) nOpt &= ~SearchOptionFlags( SearchOptionFlags::REPLACE | SearchOptionFlags::REPLACE_ALL ); rSet.Put( SfxUInt16Item( SID_SEARCH_OPTIONS, static_cast<sal_uInt16>(nOpt) )); commit b1f9a9716f7f1a4834411491f7157a1c9da5fc05 Author: Andras Timar <[email protected]> AuthorDate: Mon Feb 10 19:31:17 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Feb 13 17:36:26 2025 +0100 disable invoking Search and Replace dialog (by Ctrl+H) in read-only documents Change-Id: Ib49d6260ec465070caa6dae6620ea01b5814648e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181377 Reviewed-by: Andras Timar <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index ad4a5a5b4189..7318b659c292 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -3968,7 +3968,7 @@ SfxBoolItem SearchDialog SID_SEARCH_DLG [ AutoUpdate = TRUE, FastCall = FALSE, - ReadOnlyDoc = TRUE, + ReadOnlyDoc = FALSE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, commit d9150dcfd24fdcb01345b17e59e95d77e1b4dfb7 Author: Andras Timar <[email protected]> AuthorDate: Mon Feb 10 19:31:54 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Feb 13 17:36:26 2025 +0100 disable resetting cell attributes (by Ctrl+M) in read-only spreadsheets Change-Id: I31dd5db509d06951df6df68ae47b746b5807e15e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181378 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index f49f8e960ed7..81b748eb1f6e 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -4461,7 +4461,7 @@ SfxVoidItem ResetAttributes SID_CELL_FORMAT_RESET [ AutoUpdate = FALSE, FastCall = FALSE, - ReadOnlyDoc = TRUE, + ReadOnlyDoc = FALSE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE, commit 84d22abb03a8905f336e6e25184dc9c7e4083c16 Author: Andras Timar <[email protected]> AuthorDate: Mon Feb 10 18:30:51 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Thu Feb 13 17:36:26 2025 +0100 cool#11123 disable .uno:FillDown (invoked by Ctrl+D) in read-only spreadsheets Change-Id: I252f7ff8ba79795355f8f70f6fea321e7f1bc41c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181372 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Michael Meeks <[email protected]> diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi index e56ce2d1a56f..f49f8e960ed7 100644 --- a/sc/sdi/scalc.sdi +++ b/sc/sdi/scalc.sdi @@ -1634,7 +1634,7 @@ SfxVoidItem FillDown FID_FILL_TO_BOTTOM [ AutoUpdate = FALSE, FastCall = FALSE, - ReadOnlyDoc = TRUE, + ReadOnlyDoc = FALSE, Toggle = FALSE, Container = FALSE, RecordAbsolute = FALSE,
