configure.ac | 2 +- sc/source/ui/unoobj/docuno.cxx | 1 + shell/Library_syssh.mk | 4 ++++ shell/source/win32/SysShExec.cxx | 9 +++++++++ 4 files changed, 15 insertions(+), 1 deletion(-)
New commits: commit d2f81ad28e0cf0e71faa27fdb34d728f28e86d04 Author: Andras Timar <[email protected]> AuthorDate: Tue Jan 21 21:57:51 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Tue Jan 21 22:05:34 2025 +0100 Bump version to 24.04.11.4 Change-Id: Ie25bc9fe42b5ef595064b0a19490bebda832d73d diff --git a/configure.ac b/configure.ac index 6a0fbb5ec288..1612ffd8f594 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[24.04.11.2],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[24.04.11.4],[],[],[https://collaboraoffice.com/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard commit c5ed4761107cfb8a8b20dfbf383eefce63142def Author: Caolán McNamara <[email protected]> AuthorDate: Tue Jan 7 08:59:25 2025 +0000 Commit: Andras Timar <[email protected]> CommitDate: Tue Jan 21 22:05:34 2025 +0100 check if non-file uris could be interpreted as a file system pathname Change-Id: If283bec44ad1d648c68a5d0f028855e09c09017e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179868 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit 400970acf4241632d084f66275161fc4b4ac1b21) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179991 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk index 72ff73842dc3..27657c4456aa 100644 --- a/shell/Library_syssh.mk +++ b/shell/Library_syssh.mk @@ -25,6 +25,10 @@ $(eval $(call gb_Library_use_system_win32_libs,syssh,\ shell32 \ )) +$(eval $(call gb_Library_use_libraries,syssh,\ + tl \ +)) + $(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh,services)) $(eval $(call gb_Library_add_exception_objects,syssh,\ diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx index 57e59f96b6f0..41c9fd3be7fe 100644 --- a/shell/source/win32/SysShExec.cxx +++ b/shell/source/win32/SysShExec.cxx @@ -38,6 +38,7 @@ #include <o3tl/runtimetooustring.hxx> #include <o3tl/safeCoInitUninit.hxx> #include <o3tl/string_view.hxx> +#include <tools/urlobj.hxx> #include <prewin.h> #include <Shlobj.h> @@ -360,6 +361,14 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa } } } + } else { + // Filter out input that technically is a non-file URI, but could be interpreted by + // ShellExecuteExW as a file system pathname. + if (INetURLObject(aCommand, INetProtocol::File).GetProtocol() == INetProtocol::File) { + throw css::lang::IllegalArgumentException( + "XSystemShellExecute.execute URIS_ONLY with non-URI pathname " + aCommand, + getXWeak(), 0); + } } } commit acc01e30b959e35aaf3a661913d71fc8f43081d5 Author: Gökay Şatır <[email protected]> AuthorDate: Tue Jan 7 11:14:10 2025 +0300 Commit: Andras Timar <[email protected]> CommitDate: Tue Jan 21 21:53:27 2025 +0100 Online Calc: Update view pos after setting the client zoom. Issue: If user zooms in/out while editing is active, the edited area is misplaced and tiles are rendering wrong. Signed-off-by: Gökay Şatır <[email protected]> Change-Id: Ib9ec8237da52363bffcf586b85a1bd041785c693 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179857 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Marco Cecchetti <[email protected]> diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index cc3ea8d9cab9..d08ef82fda24 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1103,6 +1103,7 @@ void ScModelObj::setClientZoom(int nTilePixelWidth_, int nTilePixelHeight_, int pHdl->SetRefScale(pViewData->GetZoomX(), pViewData->GetZoomY()); // refresh our view's take on other view's cursors & selections + pViewData->GetActiveWin()->UpdateEditViewPos(); pViewData->GetActiveWin()->updateKitOtherCursors(); pViewData->GetActiveWin()->updateOtherKitSelections();
