diff options
Diffstat (limited to 'sdext/source/presenter/PresenterAccessibility.cxx')
| -rw-r--r-- | sdext/source/presenter/PresenterAccessibility.cxx | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index d94a3fc94c5e..9a4864ed3916 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -40,6 +40,7 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase.hxx> #include <boost/bind.hpp> +#include <algorithm> using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; @@ -481,16 +482,16 @@ public: const lang::Locale& rLocale, const Reference<awt::XWindow>& rxContentWindow, const Reference<awt::XWindow>& rxBorderWindow, - const ::boost::shared_ptr<PresenterTextView>& rpTextView); + const std::shared_ptr<PresenterTextView>& rpTextView); - void SetTextView (const ::boost::shared_ptr<PresenterTextView>& rpTextView); + void SetTextView (const std::shared_ptr<PresenterTextView>& rpTextView); virtual void SetWindow ( const css::uno::Reference<css::awt::XWindow>& rxContentWindow, const css::uno::Reference<css::awt::XWindow>& rxBorderWindow) SAL_OVERRIDE; private: - ::boost::shared_ptr<PresenterTextView> mpTextView; + std::shared_ptr<PresenterTextView> mpTextView; void NotifyCaretChange ( const sal_Int32 nOldParagraphIndex, @@ -508,7 +509,7 @@ private: class AccessibleFocusManager { public: - static ::boost::shared_ptr<AccessibleFocusManager> Instance(); + static std::shared_ptr<AccessibleFocusManager> Instance(); void AddFocusableObject (const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject); void RemoveFocusableObject (const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject); @@ -516,7 +517,7 @@ public: void FocusObject (const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject); private: - static ::boost::shared_ptr<AccessibleFocusManager> mpInstance; + static std::shared_ptr<AccessibleFocusManager> mpInstance; ::std::vector<rtl::Reference<PresenterAccessible::AccessibleObject> > maFocusableObjects; AccessibleFocusManager(); @@ -620,7 +621,7 @@ void PresenterAccessible::UpdateAccessibilityHierarchy() pNotesPane ? pNotesPane->mxBorderWindow : Reference<awt::XWindow>(), pNotesView.is() ? pNotesView->GetTextView() - : ::boost::shared_ptr<PresenterTextView>()); + : std::shared_ptr<PresenterTextView>()); } void PresenterAccessible::UpdateAccessibilityHierarchy ( @@ -629,7 +630,7 @@ void PresenterAccessible::UpdateAccessibilityHierarchy ( const OUString& rsTitle, const Reference<awt::XWindow>& rxNotesContentWindow, const Reference<awt::XWindow>& rxNotesBorderWindow, - const ::boost::shared_ptr<PresenterTextView>& rpNotesTextView) + const std::shared_ptr<PresenterTextView>& rpNotesTextView) { if ( ! mpAccessibleConsole.is()) return; @@ -710,7 +711,7 @@ void SAL_CALL PresenterAccessible::disposing() OUString(), NULL, NULL, - ::boost::shared_ptr<PresenterTextView>()); + std::shared_ptr<PresenterTextView>()); if (mxMainWindow.is()) { @@ -1839,7 +1840,7 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create ( const lang::Locale& rLocale, const Reference<awt::XWindow>& rxContentWindow, const Reference<awt::XWindow>& rxBorderWindow, - const ::boost::shared_ptr<PresenterTextView>& rpTextView) + const std::shared_ptr<PresenterTextView>& rpTextView) { OUString sName ("Presenter Notes Text"); { @@ -1865,7 +1866,7 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create ( } void AccessibleNotes::SetTextView ( - const ::boost::shared_ptr<PresenterTextView>& rpTextView) + const std::shared_ptr<PresenterTextView>& rpTextView) { ::std::vector<rtl::Reference<PresenterAccessible::AccessibleObject> > aChildren; @@ -1992,9 +1993,9 @@ void AccessibleNotes::HandleTextChange() //===== AccessibleFocusManager ================================================ -::boost::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::mpInstance; +std::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::mpInstance; -::boost::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::Instance() +std::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::Instance() { if ( ! mpInstance) { |