include/vcl/window.hxx | 3 --- vcl/source/window/dlgctrl.cxx | 10 ---------- vcl/source/window/legacyaccessibility.cxx | 20 ++------------------ 3 files changed, 2 insertions(+), 31 deletions(-)
New commits: commit 7c84ce6960cbb9fccad20ad4d816b08b32e9567c Author: Caolán McNamara <[email protected]> AuthorDate: Fri Jul 26 17:07:05 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Jul 27 12:45:49 2019 +0200 drop empty GetParentLabeledBy and GetParentLabelFor members Change-Id: I92b36874879f89ef4dc862d61da58edd64867e92 Reviewed-on: https://gerrit.libreoffice.org/76450 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 39c0fb4fd4e1..e1a91e9e1e35 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1264,9 +1264,6 @@ public: bool IsAccessibilityEventsSuppressed( bool bTraverseParentPath = true ); void SetAccessibilityEventsSuppressed(bool bSuppressed); - // Deprecated - can use SetAccessibleRelationLabelFor/By nowadays - vcl::Window* GetParentLabelFor( const vcl::Window* pLabel ) const; - vcl::Window* GetParentLabeledBy( const vcl::Window* pLabeled ) const; KeyEvent GetActivationKey() const; protected: diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index dbbe5641d272..6721455ff94c 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -1107,16 +1107,6 @@ vcl::Window* Window::ImplFindDlgCtrlWindow( vcl::Window* pWindow ) return ::ImplFindDlgCtrlWindow( this, pWindow, nIndex, nFormStart, nFormEnd ); } -vcl::Window* Window::GetParentLabelFor( const vcl::Window* ) const -{ - return nullptr; -} - -vcl::Window* Window::GetParentLabeledBy( const vcl::Window* ) const -{ - return nullptr; -} - KeyEvent Window::GetActivationKey() const { KeyEvent aKeyEvent; diff --git a/vcl/source/window/legacyaccessibility.cxx b/vcl/source/window/legacyaccessibility.cxx index 11914595fb4c..9a17eb4874a2 100644 --- a/vcl/source/window/legacyaccessibility.cxx +++ b/vcl/source/window/legacyaccessibility.cxx @@ -101,7 +101,6 @@ namespace vcl { Window* Window::getLegacyNonLayoutAccessibleRelationLabelFor() const { - Window* pWindow = nullptr; Window* pFrameWindow = ImplGetFrameWindow(); WinBits nFrameStyle = pFrameWindow->GetStyle(); @@ -110,15 +109,9 @@ Window* Window::getLegacyNonLayoutAccessibleRelationLabelFor() const ) return nullptr; - if ( mpWindowImpl->mpRealParent ) - pWindow = mpWindowImpl->mpRealParent->GetParentLabelFor( this ); - - if( pWindow ) - return pWindow; - sal_Unicode nAccel = getAccel( GetText() ); - pWindow = ImplGetLabelFor( pFrameWindow, GetType(), const_cast<Window*>(this), nAccel ); + Window* pWindow = ImplGetLabelFor( pFrameWindow, GetType(), const_cast<Window*>(this), nAccel ); if( ! pWindow && mpWindowImpl->mpRealParent ) pWindow = ImplGetLabelFor( mpWindowImpl->mpRealParent, GetType(), const_cast<Window*>(this), nAccel ); return pWindow; @@ -181,17 +174,8 @@ static Window* ImplGetLabeledBy( Window* pFrameWindow, WindowType nMyType, Windo Window* Window::getLegacyNonLayoutAccessibleRelationLabeledBy() const { - Window* pWindow = nullptr; Window* pFrameWindow = ImplGetFrameWindow(); - if ( mpWindowImpl->mpRealParent ) - { - pWindow = mpWindowImpl->mpRealParent->GetParentLabeledBy( this ); - - if( pWindow ) - return pWindow; - } - // #i62723#, #104191# checkboxes and radiobuttons are not supposed to have labels if( GetType() == WindowType::CHECKBOX || GetType() == WindowType::RADIOBUTTON ) return nullptr; @@ -202,7 +186,7 @@ Window* Window::getLegacyNonLayoutAccessibleRelationLabeledBy() const // #i100833# MT 2010/02: Group box and fixed lines can also label a fixed text. // See tools/options/print for example. - pWindow = ImplGetLabeledBy( pFrameWindow, GetType(), const_cast<Window*>(this) ); + Window* pWindow = ImplGetLabeledBy( pFrameWindow, GetType(), const_cast<Window*>(this) ); if( ! pWindow && mpWindowImpl->mpRealParent ) pWindow = ImplGetLabeledBy( mpWindowImpl->mpRealParent, GetType(), const_cast<Window*>(this) ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
