vcl/inc/osx/a11yfocustracker.hxx | 6 +++++- vcl/osx/a11yfactory.mm | 2 +- vcl/osx/a11yfocuslistener.cxx | 2 +- vcl/osx/a11ylistener.cxx | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-)
New commits: commit 1ac1b375ee3e6359d1519ac94f3ad9e69009859c Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Jun 3 07:50:46 2016 +0200 Follow-up fix (odd missing ~TheAquaA11yFocusTracker error) Change-Id: I18501185f52ab4e90d16313cba299b7501106db3 diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx index b8872f3..9852b51 100644 --- a/vcl/inc/osx/a11yfocustracker.hxx +++ b/vcl/inc/osx/a11yfocustracker.hxx @@ -35,7 +35,7 @@ class ToolBox; class DocumentFocusListener; -class AquaA11yFocusTracker : public rtl::Static< AquaA11yFocusTracker, AquaA11yFocusTracker> +class AquaA11yFocusTracker { public: @@ -94,6 +94,10 @@ private: const rtl::Reference< DocumentFocusListener > m_xDocumentFocusListener; }; +struct TheAquaA11yFocusTracker: + rtl::Static<AquaA11yFocusTracker, TheAquaA11yFocusTracker> +{}; + #endif // INCLUDED_VCL_INC_OSX_A11YFOCUSTRACKER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/osx/a11yfactory.mm b/vcl/osx/a11yfactory.mm index 79ddf64..e9ce490 100644 --- a/vcl/osx/a11yfactory.mm +++ b/vcl/osx/a11yfactory.mm @@ -59,7 +59,7 @@ static bool enabled = false; mdAllWrapper = [ [ [ NSMutableDictionary alloc ] init ] retain ]; // initialize keyboard focus tracker rtl::Reference< AquaA11yFocusListener > listener( AquaA11yFocusListener::get() ); - AquaA11yFocusTracker::get().setFocusListener(listener.get()); + TheAquaA11yFocusTracker::get().setFocusListener(listener.get()); enabled = true; } return mdAllWrapper; diff --git a/vcl/osx/a11yfocuslistener.cxx b/vcl/osx/a11yfocuslistener.cxx index ea593f2..da4e410 100644 --- a/vcl/osx/a11yfocuslistener.cxx +++ b/vcl/osx/a11yfocuslistener.cxx @@ -42,7 +42,7 @@ AquaA11yFocusListener::AquaA11yFocusListener() : m_focusedObject(nil) id AquaA11yFocusListener::getFocusedUIElement() { if ( nil == m_focusedObject ) { - Reference< XAccessible > xAccessible( AquaA11yFocusTracker::get().getFocusedObject() ); + Reference< XAccessible > xAccessible( TheAquaA11yFocusTracker::get().getFocusedObject() ); try { if( xAccessible.is() ) { Reference< XAccessibleContext > xContext(xAccessible->getAccessibleContext()); diff --git a/vcl/osx/a11ylistener.cxx b/vcl/osx/a11ylistener.cxx index aeefaf6..1d56c1f 100644 --- a/vcl/osx/a11ylistener.cxx +++ b/vcl/osx/a11ylistener.cxx @@ -80,7 +80,7 @@ AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( if( m_role != AccessibleRole::LIST ) { Reference< XAccessible > xAccessible; if( aEvent.NewValue >>= xAccessible ) - AquaA11yFocusTracker::get().setFocusedObject( xAccessible ); + TheAquaA11yFocusTracker::get().setFocusedObject( xAccessible ); } break; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits