offapi/com/sun/star/drawing/framework/XPane.idl | 2 +- offapi/com/sun/star/drawing/framework/XPane2.idl | 5 ----- sd/source/ui/framework/factories/FullScreenPane.cxx | 13 ------------- sd/source/ui/framework/factories/FullScreenPane.hxx | 2 -- sd/source/ui/framework/factories/Pane.cxx | 10 ---------- sd/source/ui/inc/framework/Pane.hxx | 2 -- 6 files changed, 1 insertion(+), 33 deletions(-)
New commits: commit fa5e99ccfe964f63ee69b312229f8446e0688cf2 Author: Michael Weghorn <[email protected]> AuthorDate: Tue May 13 22:57:00 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Thu May 15 06:48:23 2025 +0200 XPane doc: "closer button" -> "close button" Change-Id: Id9072685c4ad12325316dcb968fa93d43b90421d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185284 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/offapi/com/sun/star/drawing/framework/XPane.idl b/offapi/com/sun/star/drawing/framework/XPane.idl index 1f815325716e..48c90101e2ab 100644 --- a/offapi/com/sun/star/drawing/framework/XPane.idl +++ b/offapi/com/sun/star/drawing/framework/XPane.idl @@ -22,7 +22,7 @@ module com { module sun { module star { module drawing { module framework { /** A pane is an abstraction of a window and is one of the resources managed by the drawing framework. <p>Apart from the area that displays a view a pane may contain other - parts like title, menu, closer button.</p> + parts like title, menu, close button.</p> <p>The URL prefix of panes is <code>private:resource/floater</code></p> */ interface XPane commit 26bf576f85f760c4495f34002d28c9114e1778cc Author: Michael Weghorn <[email protected]> AuthorDate: Tue May 13 21:20:11 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Thu May 15 06:48:16 2025 +0200 [API CHANGE] a11y: Drop unused XPane2::getAccessible Drop the unused method from the unpublished XPane2 interface that's used inside Draw/Impress. How accessibility is implemented is an implementation detail and likely subject to change in the near future. XPane2::setAccessible is currently used, so remains for now. Change-Id: I49c475a795f382a8bf62238f2d6bbd7a95bed97a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185279 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/offapi/com/sun/star/drawing/framework/XPane2.idl b/offapi/com/sun/star/drawing/framework/XPane2.idl index d24b7e9f0a1d..bd3920853afe 100644 --- a/offapi/com/sun/star/drawing/framework/XPane2.idl +++ b/offapi/com/sun/star/drawing/framework/XPane2.idl @@ -49,11 +49,6 @@ interface XPane2 May be an empty reference. */ void setAccessible ([in] ::com::sun::star::accessibility::XAccessible xAccessible); - - /** Return the accessibility object that is currently associated with - the windows that implement the pane. - */ - ::com::sun::star::accessibility::XAccessible getAccessible (); }; }; }; }; }; }; // ::com::sun::star::drawing::framework diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index e8688a30adff..d24d3bb21dcc 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -140,16 +140,6 @@ void SAL_CALL FullScreenPane::setVisible (const sal_Bool bIsVisible) mpWorkWindow->Show(bIsVisible); } -Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessible() -{ - ThrowIfDisposed(); - - if (mpWorkWindow != nullptr) - return mpWorkWindow->GetAccessible(false); - else - return nullptr; -} - void SAL_CALL FullScreenPane::setAccessible ( const Reference<css::accessibility::XAccessible>& rxAccessible) { diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index fb5838d9eccd..6939eeeacbed 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -65,8 +65,6 @@ public: virtual void SAL_CALL setVisible (sal_Bool bIsVisible) override; - virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible() override; - virtual void SAL_CALL setAccessible ( const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible) override; diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 0aaea2cfcb10..2ef106694ba5 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -103,16 +103,6 @@ void SAL_CALL Pane::setVisible (sal_Bool bIsVisible) pWindow->Show(bIsVisible); } -Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible() -{ - ThrowIfDisposed(); - vcl::Window* pWindow = GetWindow(); - if (pWindow != nullptr) - return pWindow->GetAccessible(false); - else - return nullptr; -} - void SAL_CALL Pane::setAccessible ( const Reference<css::accessibility::XAccessible>& rxAccessible) { diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index 51b7a5ed0934..97337f4898e6 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -90,8 +90,6 @@ public: virtual void SAL_CALL setVisible (sal_Bool bIsVisible) override; - virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible() override; - virtual void SAL_CALL setAccessible ( const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible) override; commit 63e50f38693a8901d582cbc3ab893929b5c124f1 Author: Michael Weghorn <[email protected]> AuthorDate: Tue May 13 21:12:17 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Thu May 15 06:48:09 2025 +0200 sd: Drop unnecessary null check `mpWorkWindow` was just created a few lines above, so can't be null here. Change-Id: Ibab8b77b9b28821588ee03fea0b5e76ff77975de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185278 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 6441b5af2785..e8688a30adff 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -58,9 +58,6 @@ FullScreenPane::FullScreenPane ( if ( ! rxPaneId.is()) throw lang::IllegalArgumentException(); - if (!mpWorkWindow) - return; - // Create a new top-level window that is displayed full screen. if (bFullScreen) mpWorkWindow->ShowFullScreenMode(bFullScreen, nScreenNumber);
