summaryrefslogtreecommitdiff
path: root/accessibility/inc
diff options
context:
space:
mode:
Diffstat (limited to 'accessibility/inc')
-rw-r--r--accessibility/inc/extended/AccessibleBrowseBox.hxx2
-rw-r--r--accessibility/inc/extended/AccessibleBrowseBoxBase.hxx12
-rw-r--r--accessibility/inc/extended/AccessibleGridControl.hxx5
-rw-r--r--accessibility/inc/extended/AccessibleGridControlBase.hxx24
-rw-r--r--accessibility/inc/extended/AccessibleGridControlTable.hxx7
-rw-r--r--accessibility/inc/extended/AccessibleGridControlTableCell.hxx4
-rw-r--r--accessibility/inc/extended/AccessibleIconView.hxx30
-rw-r--r--accessibility/inc/extended/accessibleeditbrowseboxcell.hxx6
-rw-r--r--accessibility/inc/extended/accessiblelistbox.hxx9
-rw-r--r--accessibility/inc/extended/textwindowaccessibility.hxx2
-rw-r--r--accessibility/inc/standard/vclxaccessiblelistitem.hxx2
11 files changed, 61 insertions, 42 deletions
diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx
index e2d5de3f2600..ba00e00d6c91 100644
--- a/accessibility/inc/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx
@@ -206,7 +206,7 @@ private:
public:
AccessibleBrowseBoxAccess(
- const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
+ css::uno::Reference< css::accessibility::XAccessible > _xParent,
::vcl::IAccessibleTableProvider& _rBrowseBox
);
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index 71cde0280ad2..7e9ada30ab86 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -80,9 +80,9 @@ public:
@param _xFocusWindow The window that gets all the focus events.
@param eObjType Object type */
AccessibleBrowseBoxBase(
- const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+ css::uno::Reference< css::accessibility::XAccessible > xParent,
::vcl::IAccessibleTableProvider& rBrowseBox,
- const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
+ css::uno::Reference< css::awt::XWindow > _xFocusWindow,
AccessibleBrowseBoxObjType eObjType );
/** Constructor sets specified name and description.
@@ -93,12 +93,12 @@ public:
@param rName The name of this object.
@param rDescription The description text of this object. */
AccessibleBrowseBoxBase(
- const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+ css::uno::Reference< css::accessibility::XAccessible > xParent,
::vcl::IAccessibleTableProvider& rBrowseBox,
- const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
+ css::uno::Reference< css::awt::XWindow > _xFocusWindow,
AccessibleBrowseBoxObjType eObjType,
- const OUString& rName,
- const OUString& rDescription );
+ OUString rName,
+ OUString rDescription );
protected:
virtual ~AccessibleBrowseBoxBase() override;
diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx
index 6fa1a91b4919..302f240ee65f 100644
--- a/accessibility/inc/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/extended/AccessibleGridControl.hxx
@@ -149,9 +149,6 @@ private:
/** The header bar for columns (first row of the table). */
rtl::Reference<AccessibleGridControlHeader> m_xColumnHeaderBar;
- /** The table cell child. */
- rtl::Reference<AccessibleGridControlTableCell> m_xCell;
-
/** @return The count of visible children. */
inline sal_Int32 implGetAccessibleChildCount();
};
@@ -174,7 +171,7 @@ private:
public:
AccessibleGridControlAccess(
- const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
+ css::uno::Reference< css::accessibility::XAccessible > _xParent,
::vcl::table::IAccessibleTable& _rTable
);
diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx
index 361c8d4d59f6..8523b78926d6 100644
--- a/accessibility/inc/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx
@@ -61,12 +61,12 @@ class AccessibleGridControlBase :
public AccessibleGridControlImplHelper
{
public:
- /** Constructor sets specified name and description.
+ /** Constructor.
@param rxParent XAccessible interface of the parent object.
@param rTable The Table control.
@param eObjType Type of accessible table control. */
AccessibleGridControlBase(
- const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+ css::uno::Reference< css::accessibility::XAccessible > xParent,
::vcl::table::IAccessibleTable& rTable,
::vcl::table::AccessibleTableControlObjType eObjType );
@@ -188,10 +188,8 @@ public:
inline ::vcl::table::AccessibleTableControlObjType getType() const;
/** Commits an event to all listeners. */
- void commitEvent(
- sal_Int16 nEventId,
- const css::uno::Any& rNewValue,
- const css::uno::Any& rOldValue );
+ virtual void commitEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue,
+ const css::uno::Any& rOldValue);
/** @return TRUE, if the object is not disposed or disposing. */
bool isAlive() const;
@@ -227,10 +225,6 @@ protected:
/** @throws <type>DisposedException</type> If the object is not alive. */
void ensureIsAlive() const;
- /** Changes the name of the object (flat assignment, no notify).
- @attention This method requires a locked mutex. */
- inline void implSetName( const OUString& rName );
-
/** Locks all mutex's and calculates the bounding box relative to the
parent window.
@return The bounding box (VCL rect.) relative to the parent object.
@@ -257,10 +251,6 @@ protected:
::vcl::table::AccessibleTableControlObjType m_eObjType;
private:
- /** Localized name. */
- OUString m_aName;
- /** Localized description text. */
- OUString m_aDescription;
::comphelper::AccessibleEventNotifier::TClientId m_aClientId;
};
@@ -315,12 +305,6 @@ inline ::vcl::table::AccessibleTableControlObjType AccessibleGridControlBase::ge
return m_eObjType;
}
-inline void AccessibleGridControlBase::implSetName(
- const OUString& rName )
-{
- m_aName = rName;
-}
-
} // namespace accessibility
diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx
index 73c4f6a19050..69e3d9229694 100644
--- a/accessibility/inc/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx
@@ -139,8 +139,11 @@ public:
/** @return The name of this class. */
virtual OUString SAL_CALL getImplementationName() override;
- /**@return m_pCellVector*/
- std::vector< rtl::Reference<AccessibleGridControlTableCell> >& getCellVector() { return m_aCellVector;}
+ // XComponent
+ virtual void SAL_CALL dispose() override;
+
+ virtual void commitEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue,
+ const css::uno::Any& rOldValue) override;
private:
// internal virtual methods
diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
index 77077183b54b..6e3ee3367ae8 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
@@ -40,6 +40,10 @@ namespace accessibility
// XAccessibleComponent
virtual void SAL_CALL grabFocus() override;
+ public:
+ // XAccessibleContext
+ virtual OUString SAL_CALL getAccessibleName() override;
+
protected:
AccessibleGridControlCell(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
diff --git a/accessibility/inc/extended/AccessibleIconView.hxx b/accessibility/inc/extended/AccessibleIconView.hxx
new file mode 100644
index 000000000000..d5ab5eafb198
--- /dev/null
+++ b/accessibility/inc/extended/AccessibleIconView.hxx
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <sal/config.h>
+
+#include "accessiblelistbox.hxx"
+
+namespace accessibility
+{
+class AccessibleIconView final : public AccessibleListBox
+{
+public:
+ AccessibleIconView(SvTreeListBox const& _rListBox,
+ const css::uno::Reference<css::accessibility::XAccessible>& _xParent);
+
+protected:
+ // VCLXAccessibleComponent
+ virtual void ProcessWindowEvent(const VclWindowEvent& rVclWindowEvent) override;
+};
+} // namespace accessibility
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
index ea42155fd0eb..093a3ade4587 100644
--- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
@@ -105,9 +105,9 @@ namespace accessibility
public:
EditBrowseBoxTableCellAccess(
- const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
- const css::uno::Reference< css::accessibility::XAccessible >& _rxControlAccessible,
- const css::uno::Reference< css::awt::XWindow >& _rxFocusWindow,
+ css::uno::Reference< css::accessibility::XAccessible > _xParent,
+ css::uno::Reference< css::accessibility::XAccessible > _xControlAccessible,
+ css::uno::Reference< css::awt::XWindow > _xFocusWindow,
::vcl::IAccessibleTableProvider& _rBrowseBox,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos
diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx
index 4f4104701709..40b01ea180a5 100644
--- a/accessibility/inc/extended/accessiblelistbox.hxx
+++ b/accessibility/inc/extended/accessiblelistbox.hxx
@@ -37,7 +37,7 @@ namespace accessibility
/** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry
*/
- class AccessibleListBox final :
+ class AccessibleListBox :
public cppu::ImplHelper2<
css::accessibility::XAccessible,
css::accessibility::XAccessibleSelection>,
@@ -45,18 +45,17 @@ namespace accessibility
{
css::uno::Reference< css::accessibility::XAccessible > m_xParent;
-
- virtual ~AccessibleListBox() override;
-
// OComponentHelper overridables
/** this function is called upon disposing the component */
virtual void SAL_CALL disposing() override;
+ protected:
// VCLXAccessibleComponent
virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override;
virtual void ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent ) override;
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override;
+ private:
VclPtr< SvTreeListBox > getListBox() const;
void RemoveChildEntries(SvTreeListEntry*);
@@ -73,6 +72,8 @@ namespace accessibility
AccessibleListBox( SvTreeListBox const & _rListBox,
const css::uno::Reference< css::accessibility::XAccessible >& _xParent );
+ virtual ~AccessibleListBox() override;
+
rtl::Reference<AccessibleListBoxEntry> implGetAccessible(SvTreeListEntry & rEntry);
// XTypeProvider
diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx
index 43e52384a536..f5696d8bfb61 100644
--- a/accessibility/inc/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/extended/textwindowaccessibility.hxx
@@ -132,7 +132,7 @@ class Paragraph final:
private cppu::BaseMutex, public ParagraphBase, private ::comphelper::OCommonAccessibleText
{
public:
- Paragraph(::rtl::Reference< Document > const & rDocument,
+ Paragraph(::rtl::Reference< Document > xDocument,
Paragraphs::size_type nNumber);
// Not thread-safe.
diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
index 4af3c5afd65e..6542d7b43425 100644
--- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -85,7 +85,7 @@ public:
is our parent accessible object
*/
VCLXAccessibleListItem(sal_Int32 _nIndexInParent,
- const rtl::Reference< VCLXAccessibleList >& _xParent);
+ rtl::Reference< VCLXAccessibleList > _xParent);
void NotifyAccessibleEvent( sal_Int16 _nEventId, const css::uno::Any& _aOldValue, const css::uno::Any& _aNewValue );