diff options
Diffstat (limited to 'accessibility/inc/extended')
8 files changed, 10 insertions, 12 deletions
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx index ea2a011723f3..7f7788fe3d35 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx @@ -254,7 +254,7 @@ protected: may overwrite this method and add more states. @attention This method requires locked mutex's. @return A filled AccessibleStateSetHelper. */ - virtual ::utl::AccessibleStateSetHelper* implCreateStateSetHelper(); + virtual rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper(); // internal helper methods diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx index 0ad34ba18ede..a550eed5e220 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx @@ -39,7 +39,7 @@ namespace accessibility virtual ~AccessibleCheckBoxCell() override {} - virtual ::utl::AccessibleStateSetHelper* implCreateStateSetHelper() override; + virtual rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper() override; public: AccessibleCheckBoxCell(const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx index 2987483ff65c..366a7c12997b 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx @@ -59,7 +59,7 @@ namespace accessibility @return A filled AccessibleStateSetHelper. */ - ::utl::AccessibleStateSetHelper* implCreateStateSetHelper() override; + rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper() override; private: virtual tools::Rectangle implGetBoundingBox() override; diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx index 89569914c516..8518e5e62b9d 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx @@ -89,7 +89,7 @@ namespace accessibility @return A filled AccessibleStateSetHelper. */ - ::utl::AccessibleStateSetHelper* implCreateStateSetHelper() override; + rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper() override; // XAccessible ------------------------------------------------------------ diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx index b9b0a1b617a3..361c8d4d59f6 100644 --- a/accessibility/inc/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx @@ -22,6 +22,7 @@ #include <vcl/accessibletable.hxx> #include <rtl/ustring.hxx> +#include <rtl/ref.hxx> #include <tools/gen.hxx> #include <cppuhelper/compbase4.hxx> #include <cppuhelper/implbase1.hxx> @@ -219,7 +220,7 @@ protected: may overwrite this method and add more states. @attention This method requires locked mutex's. @return A filled AccessibleStateSetHelper. */ - virtual ::utl::AccessibleStateSetHelper* implCreateStateSetHelper(); + virtual rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper(); // internal helper methods diff --git a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx index 68dbc020ec07..699c7e37afa7 100644 --- a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx @@ -69,7 +69,7 @@ namespace accessibility @return A filled AccessibleStateSetHelper. */ - ::utl::AccessibleStateSetHelper* implCreateStateSetHelper() override; + rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper() override; private: virtual tools::Rectangle implGetBoundingBox() override; diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx index db13b4a2197c..b4f2b7a7dba3 100644 --- a/accessibility/inc/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx @@ -43,8 +43,7 @@ public: private: virtual ~AccessibleGridControlTable() override = default; - std::vector< AccessibleGridControlTableCell* > m_pCellVector; - std::vector< css::uno::Reference< css::accessibility::XAccessible> > m_pAccessCellVector; + std::vector< rtl::Reference<AccessibleGridControlTableCell> > m_aCellVector; public: // XAccessibleContext @@ -141,9 +140,7 @@ public: virtual OUString SAL_CALL getImplementationName() override; /**@return m_pCellVector*/ - std::vector< AccessibleGridControlTableCell* >& getCellVector() { return m_pCellVector;} - /**@return m_xAccessCellVector*/ - std::vector< css::uno::Reference< css::accessibility::XAccessible > >& getAccessibleCellVector() { return m_pAccessCellVector;} + std::vector< rtl::Reference<AccessibleGridControlTableCell> >& getCellVector() { return m_aCellVector;} private: // internal virtual methods diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx index 1c104d14933f..d811156fe909 100644 --- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx @@ -113,7 +113,7 @@ namespace accessibility @return A filled AccessibleStateSetHelper. */ - ::utl::AccessibleStateSetHelper* implCreateStateSetHelper() override; + rtl::Reference<::utl::AccessibleStateSetHelper> implCreateStateSetHelper() override; // XAccessible ------------------------------------------------------------ |