chart2/source/controller/main/ObjectHierarchy.cxx | 12 ++++++++++-- chart2/source/controller/sidebar/ChartAxisPanel.cxx | 1 - sd/source/ui/view/frmview.cxx | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-)
New commits: commit 456a1868c4cd53d7151f788081c05e0b2dbecabe Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jan 29 10:33:32 2026 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Feb 24 09:21:54 2026 +0100 Allow Enter/ESC to navigate levels in chart hierarchy Change-Id: I9baa2512ac97ca9376591254c64852e280d1a11c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198499 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200108 Reviewed-by: Caolán McNamara <[email protected]> diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index 2e517602328e..182b8328a589 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -599,9 +599,17 @@ bool ObjectKeyNavigation::handleKeyEvent( else bResult = down(); break; + // allow 'Enter' to go down a level + case awt::Key::RETURN: + bResult = down(); + break; case awt::Key::ESCAPE: - setCurrentSelection( ObjectIdentifier() ); - bResult = true; + bResult = up(); // allow 'Esc' to go up a level if inside a sublevel + if (!bResult) + { + setCurrentSelection( ObjectIdentifier() ); + bResult = true; + } break; default: bResult = false; commit 988df0328dd5b5c4da8ac098399d5a9625dbf8ad Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jan 29 17:26:02 2026 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Feb 24 09:21:47 2026 +0100 drop assert, this can happen when tabbing between chart elements when entering into the chart hierarchy by keyboard Change-Id: Ifa9d16e8669e4d8047cac34c9f9856e66ba5e6e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198498 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200107 Reviewed-by: Caolán McNamara <[email protected]> diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx index 7554d164f11f..a26e4515ec16 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx @@ -157,7 +157,6 @@ OUString getCID(const css::uno::Reference<css::frame::XModel>& xModel) return OUString(); uno::Any aAny = xSelectionSupplier->getSelection(); - assert(aAny.hasValue()); OUString aCID; aAny >>= aCID; #if defined DBG_UTIL && !defined NDEBUG commit 08e665ec87e4b2fe342260974dac5e3d8cf21e7e Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jan 22 13:02:47 2026 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Feb 24 09:21:39 2026 +0100 cid#1680366 Unchecked dynamic_cast Change-Id: I92e29cbb4ba34cf0d6addfd106f8370b7befe9a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197915 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200106 Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index 2d6cc454bb02..e67e49830e9c 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -480,7 +480,7 @@ void FrameView::WriteUserDataSequence ( css::uno::Sequence < css::beans::Propert aUserData.emplace_back( sUNO_View_GridSnapWidthYDenominator, Any( GetSnapGridWidthY().GetDenominator() ) ); aUserData.emplace_back( sUNO_View_IsAngleSnapEnabled, Any( IsAngleSnapEnabled() ) ); aUserData.emplace_back( sUNO_View_SnapAngle, Any( static_cast<sal_Int32>(GetSnapAngle()) ) ); - aUserData.emplace_back( sUNO_View_HasCanvasPage, Any( pDrawDocument->HasCanvasPage() ) ); + aUserData.emplace_back( sUNO_View_HasCanvasPage, Any( pDrawDocument && pDrawDocument->HasCanvasPage() ) ); const sal_Int32 nOldLength = rValues.getLength(); rValues.realloc( nOldLength + aUserData.size() );
