vcl/headless/svpdummies.cxx | 2 - vcl/inc/headless/svpdummies.hxx | 2 - vcl/inc/osx/salobj.h | 2 - vcl/inc/qt5/QtObject.hxx | 2 - vcl/inc/salobj.hxx | 2 - vcl/inc/unx/gtk/gtkobject.hxx | 2 - vcl/inc/unx/salobj.h | 2 - vcl/inc/win/salobj.h | 2 - vcl/osx/salobj.cxx | 4 +-- vcl/source/window/syschild.cxx | 2 - vcl/unx/generic/window/salobj.cxx | 18 +++++++-------- vcl/unx/gtk3/gtkobject.cxx | 4 +-- vcl/win/window/salobj.cxx | 4 +-- winaccessibility/source/service/AccTopWindowListener.cxx | 7 ++--- 14 files changed, 27 insertions(+), 28 deletions(-)
New commits: commit 1ad18b401a0d3db3e1ad2533dd021573dd461635 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Thu Dec 5 12:58:37 2024 +0100 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Sat Dec 7 08:29:29 2024 +0100 vcl: Return reference in SalObject::GetSystemData ... instead of a pointer, to make clear that this is always non-null. Change-Id: Ic0f92e672b08494cf3bfaa9a956cb78170bc1ad5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177885 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> (cherry picked from commit 4453b2f65b13d6b7c11344f89695a2a01aaf955d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177950 diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx index b0dd9c9438d4..cc12639d61fa 100644 --- a/vcl/headless/svpdummies.cxx +++ b/vcl/headless/svpdummies.cxx @@ -29,7 +29,7 @@ void SvpSalObject::UnionClipRegion( tools::Long, tools::Long, tools::Long, tools void SvpSalObject::EndSetClipRegion() {} void SvpSalObject::SetPosSize( tools::Long, tools::Long, tools::Long, tools::Long ) {} void SvpSalObject::Show( bool ) {} -const SystemEnvData* SvpSalObject::GetSystemData() const { return &m_aSystemChildData; } +const SystemEnvData& SvpSalObject::GetSystemData() const { return m_aSystemChildData; } // SalSystem SvpSalSystem::~SvpSalSystem() {} diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx index 92958f8d5529..1049637a5de3 100644 --- a/vcl/inc/headless/svpdummies.hxx +++ b/vcl/inc/headless/svpdummies.hxx @@ -42,7 +42,7 @@ public: virtual void SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; virtual void Show( bool bVisible ) override; - virtual const SystemEnvData* GetSystemData() const override; + virtual const SystemEnvData& GetSystemData() const override; }; class SvpSalSystem : public SalGenericSystem diff --git a/vcl/inc/osx/salobj.h b/vcl/inc/osx/salobj.h index 4c2ac88be6c1..0fc41c02d4c9 100644 --- a/vcl/inc/osx/salobj.h +++ b/vcl/inc/osx/salobj.h @@ -63,7 +63,7 @@ public: virtual void EndSetClipRegion() override; virtual void SetPosSize( tools::Long nX, tools::Long nY, tools::Long nWidth, tools::Long nHeight ) override; virtual void Show( bool bVisible ) override; - virtual const SystemEnvData* GetSystemData() const override; + virtual const SystemEnvData& GetSystemData() const override; }; #endif // INCLUDED_VCL_INC_OSX_SALOBJ_H diff --git a/vcl/inc/qt5/QtObject.hxx b/vcl/inc/qt5/QtObject.hxx index 4a8d194a8435..68749129079f 100644 --- a/vcl/inc/qt5/QtObject.hxx +++ b/vcl/inc/qt5/QtObject.hxx @@ -66,7 +66,7 @@ public: virtual void SetForwardKey(bool bEnable) override; - virtual const SystemEnvData* GetSystemData() const override { return &m_aSystemData; } + virtual const SystemEnvData& GetSystemData() const override { return m_aSystemData; } virtual void Reparent(SalFrame* pFrame) override; }; diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index b5d9d64f82e4..c736957d3eeb 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -54,7 +54,7 @@ public: virtual void SetLeaveEnterBackgrounds(const css::uno::Sequence<css::uno::Any>& /*rLeaveArgs*/, const css::uno::Sequence<css::uno::Any>& /*rEnterArgs*/) {} - virtual const SystemEnvData* GetSystemData() const = 0; + virtual const SystemEnvData& GetSystemData() const = 0; virtual Size GetOptimalSize() const { return Size(); } diff --git a/vcl/inc/unx/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx index 63544f56f882..dc79de17c02d 100644 --- a/vcl/inc/unx/gtk/gtkobject.hxx +++ b/vcl/inc/unx/gtk/gtkobject.hxx @@ -43,7 +43,7 @@ public: virtual void SetForwardKey( bool bEnable ) override; - virtual const SystemEnvData* GetSystemData() const override; + virtual const SystemEnvData& GetSystemData() const override; virtual Size GetOptimalSize() const override; diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h index f14af351ebf9..2920d81ef693 100644 --- a/vcl/inc/unx/salobj.h +++ b/vcl/inc/unx/salobj.h @@ -81,7 +81,7 @@ public: virtual void SetLeaveEnterBackgrounds(const css::uno::Sequence<css::uno::Any>& rLeaveArgs, const css::uno::Sequence<css::uno::Any>& rEnterArgs) override; - virtual const SystemEnvData* GetSystemData() const override; + virtual const SystemEnvData& GetSystemData() const override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/win/salobj.h b/vcl/inc/win/salobj.h index 37bcf0317866..09a6b4ed182b 100644 --- a/vcl/inc/win/salobj.h +++ b/vcl/inc/win/salobj.h @@ -46,7 +46,7 @@ public: virtual void Show( bool bVisible ) override; virtual void Enable( bool bEnable ) override; virtual void GrabFocus() override; - virtual const SystemEnvData* GetSystemData() const override; + virtual const SystemEnvData& GetSystemData() const override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx index 6cf114f20c1b..43ce0521080f 100644 --- a/vcl/osx/salobj.cxx +++ b/vcl/osx/salobj.cxx @@ -284,9 +284,9 @@ void AquaSalObject::Show( bool bVisible ) [mpClipView setHidden: (bVisible ? NO : YES)]; } -const SystemEnvData* AquaSalObject::GetSystemData() const +const SystemEnvData& AquaSalObject::GetSystemData() const { - return &maSysData; + return maSysData; } namespace { diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx index 644aa1f095f2..c03df17ba1d5 100644 --- a/vcl/source/window/syschild.cxx +++ b/vcl/source/window/syschild.cxx @@ -130,7 +130,7 @@ void SystemChildWindow::dispose() const SystemEnvData* SystemChildWindow::GetSystemData() const { if ( mpWindowImpl->mpSysObj ) - return mpWindowImpl->mpSysObj->GetSystemData(); + return &mpWindowImpl->mpSysObj->GetSystemData(); else return nullptr; } diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index e2571c7911a2..50090f053825 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -48,10 +48,10 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p { int error_base, event_base; X11SalObject* pObject = new X11SalObject(); - SystemEnvData* pObjData = const_cast<SystemEnvData*>(pObject->GetSystemData()); + SystemEnvData& rObjData = const_cast<SystemEnvData&>(pObject->GetSystemData()); - if ( ! XShapeQueryExtension( static_cast<Display*>(pObjData->pDisplay), - &event_base, &error_base ) ) + if (!XShapeQueryExtension(static_cast<Display*>(rObjData.pDisplay), + &event_base, &error_base)) { delete pObject; return nullptr; @@ -156,10 +156,10 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p XMapWindow( pDisp, pObject->maPrimary ); } - pObjData->pDisplay = pDisp; - pObjData->SetWindowHandle(pObject->maSecondary); - pObjData->pWidget = nullptr; - pObjData->pVisual = pVisual; + rObjData.pDisplay = pDisp; + rObjData.SetWindowHandle(pObject->maSecondary); + rObjData.pWidget = nullptr; + rObjData.pVisual = pVisual; XSync(pDisp, False); if( GetGenericUnixSalData()->ErrorTrapPop( false ) ) @@ -358,9 +358,9 @@ void X11SalObject::GrabFocus() CurrentTime ); } -const SystemEnvData* X11SalObject::GetSystemData() const +const SystemEnvData& X11SalObject::GetSystemData() const { - return &maSystemChildData; + return maSystemChildData; } static sal_uInt16 sal_GetCode( int state ) diff --git a/vcl/unx/gtk3/gtkobject.cxx b/vcl/unx/gtk3/gtkobject.cxx index bd553137a81b..2352c4eec425 100644 --- a/vcl/unx/gtk3/gtkobject.cxx +++ b/vcl/unx/gtk3/gtkobject.cxx @@ -239,9 +239,9 @@ Size GtkSalObjectBase::GetOptimalSize() const return Size(); } -const SystemEnvData* GtkSalObjectBase::GetSystemData() const +const SystemEnvData& GtkSalObjectBase::GetSystemData() const { - return &m_aSystemData; + return m_aSystemData; } #if !GTK_CHECK_VERSION(4, 0, 0) diff --git a/vcl/win/window/salobj.cxx b/vcl/win/window/salobj.cxx index 05ad16b0d4cd..ce39575b9341 100644 --- a/vcl/win/window/salobj.cxx +++ b/vcl/win/window/salobj.cxx @@ -671,9 +671,9 @@ void WinSalObject::GrabFocus() ::SetFocus( mhWndChild ); } -const SystemEnvData* WinSalObject::GetSystemData() const +const SystemEnvData& WinSalObject::GetSystemData() const { - return &maSysData; + return maSysData; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit be2a50cf9b5d6bd77cec6f0c140d59e04593e68f Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Thu Dec 5 11:42:25 2024 +0000 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Sat Dec 7 08:29:23 2024 +0100 wina11y: Drop duplicate variable + check No need to have `pAccessibleContext` as a raw pointer, just use the `xContext`. And that one has already been checked for being a non-empty Reference above. Change-Id: I15d7e70ddbc8b260e5e1bc0eb4e190c54d6a2ea2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177884 Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> Tested-by: Jenkins (cherry picked from commit 070b198961977ec0a3197d1ac85aa065b62c432c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177949 diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx index 3d51db848ece..40d9ba8755c1 100644 --- a/winaccessibility/source/service/AccTopWindowListener.cxx +++ b/winaccessibility/source/service/AccTopWindowListener.cxx @@ -61,9 +61,8 @@ void AccTopWindowListener::HandleWindowOpened( css::accessibility::XAccessible* if(!xContext.is()) return; - css::accessibility::XAccessibleContext* pAccessibleContext = xContext.get(); - //Only AccessibleContext exist, add all listeners - if(pAccessibleContext != nullptr && systemdata != nullptr) + // add all listeners + if (systemdata != nullptr) { m_aAccObjectManager.SaveTopWindowHandle(systemdata->hWnd, pAccessible); @@ -72,7 +71,7 @@ void AccTopWindowListener::HandleWindowOpened( css::accessibility::XAccessible* if( window->GetStyle() & WB_MOVEABLE ) m_aAccObjectManager.IncreaseState( pAccessible, static_cast<unsigned short>(-1) /* U_MOVEBLE */ ); - short role = pAccessibleContext->getAccessibleRole(); + short role = xContext->getAccessibleRole(); if (role == css::accessibility::AccessibleRole::POPUP_MENU || role == css::accessibility::AccessibleRole::MENU )