ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

weld SwCondCollPage

Browse Source 
and put back original SvTreeListBox a11y factory use

Change-Id: I4ad8ce29d8fed6ec5d44e9a1d641919a89226b79
Reviewed-on: https://gerrit.libreoffice.org/63501
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2018-11-21 22:08:04 +01:00
parent cfa76f538a
commit 47897fdd93
146 changed files with 1094 additions and 1003 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accessibility/Library_acc.mk
+2
View File
@@ -84,6 +84,8 @@ $(eval $(call gb_Library_add_exception_objects,acc,\
accessibility/source/standard/vclxaccessibleedit \
accessibility/source/standard/vclxaccessiblefixedhyperlink \
accessibility/source/standard/vclxaccessiblefixedtext \
accessibility/source/standard/vclxaccessibleheaderbar \
accessibility/source/standard/vclxaccessibleheaderbaritem \
accessibility/source/standard/vclxaccessiblelist \
accessibility/source/standard/vclxaccessiblelistbox \
accessibility/source/standard/vclxaccessiblelistitem \
accessibility/inc/extended/AccessibleBrowseBox.hxx
+8 -8
View File
@@ -24,7 +24,7 @@
#include <extended/AccessibleBrowseBoxBase.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <memory>
namespace accessibility {
@@ -42,7 +42,7 @@ protected:
AccessibleBrowseBox(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator,
::svt::IAccessibleTableProvider& _rBrowseBox
::vcl::IAccessibleTableProvider& _rBrowseBox
);
virtual ~AccessibleBrowseBox() override;
@@ -122,7 +122,7 @@ public:
*/
css::uno::Reference<
css::accessibility::XAccessible >
getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType )
getHeaderBar( ::vcl::AccessibleBrowseBoxObjType _eObjType )
{
return implGetHeaderBar(_eObjType);
}
@@ -159,7 +159,7 @@ protected:
@return The XAccessible interface of the header bar. */
css::uno::Reference<
css::accessibility::XAccessible >
implGetHeaderBar( ::svt::AccessibleBrowseBoxObjType eObjType );
implGetHeaderBar( ::vcl::AccessibleBrowseBoxObjType eObjType );
/** This method returns one of the children that are always present:
Data table, row and column header bar or corner control.
@@ -195,20 +195,20 @@ private:
*/
class AccessibleBrowseBoxAccess:
public cppu::WeakImplHelper<css::accessibility::XAccessible>,
public ::svt::IAccessibleBrowseBox
public ::vcl::IAccessibleBrowseBox
{
private:
::osl::Mutex m_aMutex;
css::uno::Reference< css::accessibility::XAccessible >
m_xParent;
::svt::IAccessibleTableProvider& m_rBrowseBox;
::vcl::IAccessibleTableProvider& m_rBrowseBox;
rtl::Reference<AccessibleBrowseBox> m_xContext;
public:
AccessibleBrowseBoxAccess(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
::svt::IAccessibleTableProvider& _rBrowseBox
::vcl::IAccessibleTableProvider& _rBrowseBox
);
/// returns the AccessibleContext belonging to this Accessible
@@ -233,7 +233,7 @@ protected:
return m_xContext.is() && m_xContext->isAlive();
}
virtual css::uno::Reference< css::accessibility::XAccessible >
getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) override
getHeaderBar( ::vcl::AccessibleBrowseBoxObjType _eObjType ) override
{
css::uno::Reference< css::accessibility::XAccessible > xAccessible;
AccessibleBrowseBox* pContext( getContext() );
accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+14 -14
View File
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
#include <rtl/ustring.hxx>
#include <tools/gen.hxx>
#include <vcl/svapp.hxx>
@@ -52,7 +52,7 @@ namespace utl {
class AccessibleStateSetHelper;
}
namespace svt {
namespace vcl {
class IAccessibleTableProvider;
}
@@ -86,9 +86,9 @@ public:
@param eObjType Object type */
AccessibleBrowseBoxBase(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::IAccessibleTableProvider& rBrowseBox,
::vcl::IAccessibleTableProvider& rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
::svt::AccessibleBrowseBoxObjType eObjType );
::vcl::AccessibleBrowseBoxObjType eObjType );
/** Constructor sets specified name and description.
@param rxParent XAccessible interface of the parent object.
@@ -99,9 +99,9 @@ public:
@param rDescription The description text of this object. */
AccessibleBrowseBoxBase(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::IAccessibleTableProvider& rBrowseBox,
::vcl::IAccessibleTableProvider& rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
::svt::AccessibleBrowseBoxObjType eObjType,
::vcl::AccessibleBrowseBoxObjType eObjType,
const OUString& rName,
const OUString& rDescription );
@@ -219,7 +219,7 @@ public:
// helper methods
/** @return The BrowseBox object type. */
inline ::svt::AccessibleBrowseBoxObjType getType() const;
inline ::vcl::AccessibleBrowseBoxObjType getType() const;
/** Changes the name of the object and notifies listeners. */
void setAccessibleName( const OUString& rName );
@@ -297,7 +297,7 @@ protected:
/** The parent accessible object. */
css::uno::Reference< css::accessibility::XAccessible > mxParent;
/** The VCL BrowseBox control. */
::svt::IAccessibleTableProvider* mpBrowseBox;
::vcl::IAccessibleTableProvider* mpBrowseBox;
/** This is the window which get all the nice focus events
*/
@@ -310,7 +310,7 @@ private:
OUString maDescription;
/** The type of this object (for names, descriptions, state sets, ...). */
::svt::AccessibleBrowseBoxObjType meObjType;
::vcl::AccessibleBrowseBoxObjType meObjType;
::comphelper::AccessibleEventNotifier::TClientId m_aClientId;
};
@@ -340,9 +340,9 @@ protected:
*/
BrowseBoxAccessibleElement(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::IAccessibleTableProvider& rBrowseBox,
::vcl::IAccessibleTableProvider& rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
::svt::AccessibleBrowseBoxObjType eObjType );
::vcl::AccessibleBrowseBoxObjType eObjType );
/** Constructor sets specified name and description.
@@ -355,9 +355,9 @@ protected:
*/
BrowseBoxAccessibleElement(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::IAccessibleTableProvider& rBrowseBox,
::vcl::IAccessibleTableProvider& rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
::svt::AccessibleBrowseBoxObjType eObjType,
::vcl::AccessibleBrowseBoxObjType eObjType,
const OUString& rName,
const OUString& rDescription );
@@ -395,7 +395,7 @@ public:
// inlines
inline ::svt::AccessibleBrowseBoxObjType AccessibleBrowseBoxBase::getType() const
inline ::vcl::AccessibleBrowseBoxObjType AccessibleBrowseBoxBase::getType() const
{
return meObjType;
}
accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+1 -1
View File
@@ -47,7 +47,7 @@ namespace accessibility
public:
AccessibleCheckBoxCell(const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
::svt::IAccessibleTableProvider& _rBrowseBox,
::vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos,
accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
+4 -4
View File
@@ -47,8 +47,8 @@ public:
BBTYPE_COLUMNHEADERBAR. */
AccessibleBrowseBoxHeaderBar(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::IAccessibleTableProvider& rBrowseBox,
::svt::AccessibleBrowseBoxObjType eObjType );
::vcl::IAccessibleTableProvider& rBrowseBox,
::vcl::AccessibleBrowseBoxObjType eObjType );
private:
virtual ~AccessibleBrowseBoxHeaderBar() override;
@@ -204,12 +204,12 @@ private:
inline bool AccessibleBrowseBoxHeaderBar::isRowBar() const
{
return getType() == ::svt::BBTYPE_ROWHEADERBAR;
return getType() == ::vcl::BBTYPE_ROWHEADERBAR;
}
inline bool AccessibleBrowseBoxHeaderBar::isColumnBar() const
{
return getType() == ::svt::BBTYPE_COLUMNHEADERBAR;
return getType() == ::vcl::BBTYPE_COLUMNHEADERBAR;
}
accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
+3 -3
View File
@@ -29,9 +29,9 @@ namespace accessibility
public:
AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnRowId,
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::IAccessibleTableProvider& _rBrowseBox,
::vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
::svt::AccessibleBrowseBoxObjType _eObjType);
::vcl::AccessibleBrowseBoxObjType _eObjType);
/** @return The count of visible children. */
virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
@@ -47,7 +47,7 @@ namespace accessibility
bool isRowBarCell() const
{
return getType() == ::svt::BBTYPE_ROWHEADERCELL;
return getType() == ::vcl::BBTYPE_ROWHEADERCELL;
}
/** @return
accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
+1 -1
View File
@@ -35,7 +35,7 @@ class AccessibleBrowseBoxTable : public AccessibleBrowseBoxTableBase
public:
AccessibleBrowseBoxTable(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::IAccessibleTableProvider& rBrowseBox );
::vcl::IAccessibleTableProvider& rBrowseBox );
protected:
virtual ~AccessibleBrowseBoxTable() override;
accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
+2 -2
View File
@@ -50,8 +50,8 @@ public:
@param eObjType Type of BrowseBox object. */
AccessibleBrowseBoxTableBase(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::IAccessibleTableProvider& rBrowseBox,
::svt::AccessibleBrowseBoxObjType eObjType );
::vcl::IAccessibleTableProvider& rBrowseBox,
::vcl::AccessibleBrowseBoxObjType eObjType );
protected:
virtual ~AccessibleBrowseBoxTableBase() override = default;
accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
+1 -1
View File
@@ -45,7 +45,7 @@ namespace accessibility
public:
AccessibleBrowseBoxTableCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
::svt::IAccessibleTableProvider& _rBrowseBox,
::vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
sal_Int32 _nRowId,
sal_uInt16 _nColId,
accessibility/inc/extended/AccessibleGridControl.hxx
+6 -6
View File
@@ -24,7 +24,7 @@
#include <extended/AccessibleGridControlTable.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <svtools/accessibletable.hxx>
#include <vcl/accessibletable.hxx>
#include <memory>
namespace accessibility {
@@ -40,7 +40,7 @@ class AccessibleGridControl final : public AccessibleGridControlBase
AccessibleGridControl(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator,
::svt::table::IAccessibleTable& _rTable
::vcl::table::IAccessibleTable& _rTable
);
virtual ~AccessibleGridControl() override = default;
@@ -125,7 +125,7 @@ private:
@attention This method requires locked mutex's and a living object.
@return The XAccessible interface of the header bar. */
css::uno::Reference< css::accessibility::XAccessible >
implGetHeaderBar( ::svt::table::AccessibleTableControlObjType eObjType );
implGetHeaderBar( ::vcl::table::AccessibleTableControlObjType eObjType );
/** This method returns one of the children that are always present:
Data table, row and column header bar or corner control.
@@ -163,17 +163,17 @@ private:
class AccessibleGridControlAccess :
public ::cppu::WeakImplHelper< css::accessibility::XAccessible >
,public ::svt::table::IAccessibleTableControl
,public ::vcl::table::IAccessibleTableControl
{
private:
css::uno::Reference< css::accessibility::XAccessible > m_xParent;
::svt::table::IAccessibleTable * m_pTable;
::vcl::table::IAccessibleTable * m_pTable;
rtl::Reference<AccessibleGridControl> m_xContext;
public:
AccessibleGridControlAccess(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
::svt::table::IAccessibleTable& _rTable
::vcl::table::IAccessibleTable& _rTable
);
/// returns the AccessibleContext belonging to this Accessible
accessibility/inc/extended/AccessibleGridControlBase.hxx
+9 -9
View File
@@ -21,7 +21,7 @@
#ifndef INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLBASE_HXX
#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLBASE_HXX
#include <svtools/accessibletable.hxx>
#include <vcl/accessibletable.hxx>
#include <rtl/ustring.hxx>
#include <tools/gen.hxx>
#include <vcl/svapp.hxx>
@@ -73,8 +73,8 @@ public:
@param eObjType Type of accessible table control. */
AccessibleGridControlBase(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::table::IAccessibleTable& rTable,
::svt::table::AccessibleTableControlObjType eObjType );
::vcl::table::IAccessibleTable& rTable,
::vcl::table::AccessibleTableControlObjType eObjType );
protected:
virtual ~AccessibleGridControlBase() override;
@@ -191,7 +191,7 @@ public:
// helper methods
/** @return The GridControl object type. */
inline ::svt::table::AccessibleTableControlObjType getType() const;
inline ::vcl::table::AccessibleTableControlObjType getType() const;
/** Commits an event to all listeners. */
void commitEvent(
@@ -258,9 +258,9 @@ protected:
/** The parent accessible object. */
css::uno::Reference< css::accessibility::XAccessible > m_xParent;
/** The SVT Table control. */
::svt::table::IAccessibleTable& m_aTable;
::vcl::table::IAccessibleTable& m_aTable;
/** The type of this object (for names, descriptions, state sets, ...). */
::svt::table::AccessibleTableControlObjType m_eObjType;
::vcl::table::AccessibleTableControlObjType m_eObjType;
private:
/** Localized name. */
@@ -290,8 +290,8 @@ protected:
*/
GridControlAccessibleElement(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::table::IAccessibleTable& rTable,
::svt::table::AccessibleTableControlObjType eObjType );
::vcl::table::IAccessibleTable& rTable,
::vcl::table::AccessibleTableControlObjType eObjType );
public:
// XInterface
@@ -316,7 +316,7 @@ private:
// inlines
inline ::svt::table::AccessibleTableControlObjType AccessibleGridControlBase::getType() const
inline ::vcl::table::AccessibleTableControlObjType AccessibleGridControlBase::getType() const
{
return m_eObjType;
}
accessibility/inc/extended/AccessibleGridControlHeader.hxx
+4 -4
View File
@@ -40,8 +40,8 @@ public:
AccessibleGridControlHeader(
const css::uno::Reference<
css::accessibility::XAccessible >& rxParent,
::svt::table::IAccessibleTable& rTable,
::svt::table::AccessibleTableControlObjType eObjType );
::vcl::table::IAccessibleTable& rTable,
::vcl::table::AccessibleTableControlObjType eObjType );
private:
virtual ~AccessibleGridControlHeader() override = default;
@@ -141,12 +141,12 @@ private:
inline bool AccessibleGridControlHeader::isRowBar() const
{
return getType() == ::svt::table::TCTYPE_ROWHEADERBAR;
return getType() == ::vcl::table::TCTYPE_ROWHEADERBAR;
}
inline bool AccessibleGridControlHeader::isColumnBar() const
{
return getType() == ::svt::table::TCTYPE_COLUMNHEADERBAR;
return getType() == ::vcl::table::TCTYPE_COLUMNHEADERBAR;
}
accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
+2 -2
View File
@@ -29,8 +29,8 @@ namespace accessibility
public:
AccessibleGridControlHeaderCell(sal_Int32 _nColumnRowId,
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::table::IAccessibleTable& _rTable,
::svt::table::AccessibleTableControlObjType _eObjType);
::vcl::table::IAccessibleTable& _rTable,
::vcl::table::AccessibleTableControlObjType _eObjType);
/** @return The count of visible children. */
virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
accessibility/inc/extended/AccessibleGridControlTable.hxx
+1 -1
View File
@@ -40,7 +40,7 @@ class AccessibleGridControlTable final : public AccessibleGridControlTableBase,
public:
AccessibleGridControlTable(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::table::IAccessibleTable& rTable);
::vcl::table::IAccessibleTable& rTable);
private:
virtual ~AccessibleGridControlTable() override = default;
accessibility/inc/extended/AccessibleGridControlTableBase.hxx
+2 -2
View File
@@ -46,8 +46,8 @@ public:
@param eObjType Type of table control object */
AccessibleGridControlTableBase(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::table::IAccessibleTable& rTable,
::svt::table::AccessibleTableControlObjType eObjType );
::vcl::table::IAccessibleTable& rTable,
::vcl::table::AccessibleTableControlObjType eObjType );
protected:
virtual ~AccessibleGridControlTableBase() override = default;
accessibility/inc/extended/AccessibleGridControlTableCell.hxx
+4 -4
View File
@@ -22,7 +22,7 @@
#include <comphelper/accessibletexthelper.hxx>
#include <cppuhelper/implbase2.hxx>
#include <extended/AccessibleGridControlBase.hxx>
#include <svtools/accessibletable.hxx>
#include <vcl/accessibletable.hxx>
namespace accessibility
{
@@ -43,10 +43,10 @@ namespace accessibility
protected:
AccessibleGridControlCell(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
::svt::table::IAccessibleTable& _rTable,
::vcl::table::IAccessibleTable& _rTable,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos,
::svt::table::AccessibleTableControlObjType _eType
::vcl::table::AccessibleTableControlObjType _eType
);
virtual ~AccessibleGridControlCell() override = default;
@@ -74,7 +74,7 @@ namespace accessibility
public:
AccessibleGridControlTableCell( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
::svt::table::IAccessibleTable& _rTable,
::vcl::table::IAccessibleTable& _rTable,
sal_Int32 _nRowId,
sal_uInt16 _nColId);
accessibility/inc/extended/accessiblebrowseboxcell.hxx
+3 -4
View File
@@ -21,8 +21,7 @@
#define INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXCELL_HXX
#include <extended/AccessibleBrowseBoxBase.hxx>
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
namespace accessibility
{
@@ -54,11 +53,11 @@ namespace accessibility
protected:
AccessibleBrowseBoxCell(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
::svt::IAccessibleTableProvider& _rBrowseBox,
::vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos,
::svt::AccessibleBrowseBoxObjType _eType = ::svt::BBTYPE_TABLECELL
::vcl::AccessibleBrowseBoxObjType _eType = ::vcl::BBTYPE_TABLECELL
);
virtual ~AccessibleBrowseBoxCell() override;
accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
+3 -3
View File
@@ -41,7 +41,7 @@ namespace accessibility
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
const css::uno::Reference< css::accessibility::XAccessible >& _rxOwningAccessible,
const css::uno::Reference< css::accessibility::XAccessibleContext >& _xControlChild,
::svt::IAccessibleTableProvider& _rBrowseBox,
::vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos
@@ -107,7 +107,7 @@ namespace accessibility
m_xControlAccessible;
css::uno::Reference< css::awt::XWindow >
m_xFocusWindow;
::svt::IAccessibleTableProvider* m_pBrowseBox;
::vcl::IAccessibleTableProvider* m_pBrowseBox;
sal_Int32 m_nRowPos;
sal_uInt16 m_nColPos;
@@ -116,7 +116,7 @@ namespace accessibility
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
const css::uno::Reference< css::accessibility::XAccessible >& _rxControlAccessible,
const css::uno::Reference< css::awt::XWindow >& _rxFocusWindow,
::svt::IAccessibleTableProvider& _rBrowseBox,
::vcl::IAccessibleTableProvider& _rBrowseBox,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos
);
accessibility/inc/extended/accessibletablistbox.hxx
+3 -3
View File
@@ -23,7 +23,7 @@
#include <extended/AccessibleBrowseBox.hxx>
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/accessibletableprovider.hxx>
class SvHeaderTabListBox;
@@ -39,7 +39,7 @@ typedef ::cppu::ImplHelper1 < css::accessibility::XAccessible
class AccessibleTabListBox final
:public AccessibleBrowseBox
,public AccessibleTabListBox_Base
,public ::svt::IAccessibleTabListBox
,public ::vcl::IAccessibleTabListBox
{
private:
VclPtr<SvHeaderTabListBox> m_pTabListBox;
@@ -79,7 +79,7 @@ public:
css::uno::Reference< css::accessibility::XAccessible >
getHeaderBar() override
{
return AccessibleBrowseBox::getHeaderBar( svt::BBTYPE_COLUMNHEADERBAR );
return AccessibleBrowseBox::getHeaderBar( vcl::BBTYPE_COLUMNHEADERBAR );
}
private:
accessibility/inc/pch/precompiled_acc.hxx
+4 -4
View File
@@ -337,10 +337,6 @@
#include <svl/SfxBroadcaster.hxx>
#include <svl/hint.hxx>
#include <svl/svldllapi.h>
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <svtools/accessibletable.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <svtools/headbar.hxx>
#include <svtools/svtdllapi.h>
#include <svtools/tabbar.hxx>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
@@ -380,6 +376,10 @@
#include <unotools/resmgr.hxx>
#include <unotools/syslocale.hxx>
#include <unotools/unotoolsdllapi.h>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
#include <vcl/accessibletable.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <vcl/headbar.hxx>
#include <vcl/transfer.hxx>
#include <vcl/treelist.hxx>
#include <vcl/treelistbox.hxx>
svtools/inc/vclxaccessibleheaderbar.hxx → accessibility/inc/standard/vclxaccessibleheaderbar.hxx
+4 -20
View File
@@ -16,19 +16,15 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVTOOLS_INC_VCLXACCESSIBLEHEADERBAR_HXX
#define INCLUDED_SVTOOLS_INC_VCLXACCESSIBLEHEADERBAR_HXX
#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBAR_HXX
#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBAR_HXX
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
#include <toolkit/awt/vclxwindow.hxx>
class HeaderBar;
// class VCLXAccessibleHeaderBar
typedef std::vector< css::uno::WeakReference< css::accessibility::XAccessible > >
ListItems;
@@ -57,20 +53,8 @@ public:
private:
ListItems m_aAccessibleChildren;
};
class VCLXHeaderBar : public VCLXWindow
{
public:
VCLXHeaderBar(vcl::Window* pHeaderBar);
virtual ~VCLXHeaderBar() override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
};
#endif // INCLUDED_SVTOOLS_INC_VCLXACCESSIBLEHEADERBAR_HXX
#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBAR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svtools/inc/vclxaccessibleheaderbaritem.hxx → accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
+3 -3
View File
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVTOOLS_INC_VCLXACCESSIBLEHEADERBARITEM_HXX
#define INCLUDED_SVTOOLS_INC_VCLXACCESSIBLEHEADERBARITEM_HXX
#ifndef INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBARITEM_HXX
#define INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBARITEM_HXX
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -101,6 +101,6 @@ public:
virtual OUString SAL_CALL getToolTipText( ) override;
};
#endif // INCLUDED_SVTOOLS_INC_VCLXACCESSIBLEHEADERBARITEM_HXX
#endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEHEADERBARITEM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
accessibility/source/extended/AccessibleBrowseBox.cxx
+16 -20
View File
@@ -20,7 +20,7 @@
#include <extended/AccessibleBrowseBox.hxx>
#include <extended/AccessibleBrowseBoxTable.hxx>
#include <extended/AccessibleBrowseBoxHeaderBar.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <sal/types.h>
@@ -38,8 +38,8 @@ using namespace ::svt;
AccessibleBrowseBox::AccessibleBrowseBox(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator,
::svt::IAccessibleTableProvider& _rBrowseBox )
: AccessibleBrowseBoxBase( _rxParent, _rBrowseBox,nullptr, BBTYPE_BROWSEBOX ),
::vcl::IAccessibleTableProvider& _rBrowseBox )
: AccessibleBrowseBoxBase( _rxParent, _rBrowseBox,nullptr, vcl::BBTYPE_BROWSEBOX ),
m_aCreator(_rxCreator)
{
m_xFocusWindow = VCLUnoHelper::GetInterface(mpBrowseBox->GetWindowInstance());
@@ -93,7 +93,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount()
SolarMethodGuard aGuard(getMutex());
ensureIsAlive();
return BBINDEX_FIRSTCONTROL + mpBrowseBox->GetAccessibleControlCount();
return vcl::BBINDEX_FIRSTCONTROL + mpBrowseBox->GetAccessibleControlCount();
}
@@ -106,12 +106,12 @@ AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex )
css::uno::Reference< css::accessibility::XAccessible > xRet;
if( nChildIndex >= 0 )
{
if( nChildIndex < BBINDEX_FIRSTCONTROL )
if( nChildIndex < vcl::BBINDEX_FIRSTCONTROL )
xRet = implGetFixedChild( nChildIndex );
else
{
// additional controls
nChildIndex -= BBINDEX_FIRSTCONTROL;
nChildIndex -= vcl::BBINDEX_FIRSTCONTROL;
if( nChildIndex < mpBrowseBox->GetAccessibleControlCount() )
xRet = mpBrowseBox->CreateAccessibleControl( nChildIndex );
}
@@ -139,7 +139,7 @@ AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint )
// try whether point is in one of the fixed children
// (table, header bars, corner control)
Point aPoint( VCLPoint( rPoint ) );
for( nIndex = 0; (nIndex < BBINDEX_FIRSTCONTROL) && !xChild.is(); ++nIndex )
for( nIndex = 0; (nIndex < vcl::BBINDEX_FIRSTCONTROL) && !xChild.is(); ++nIndex )
{
css::uno::Reference< css::accessibility::XAccessible > xCurrChild( implGetFixedChild( nIndex ) );
css::uno::Reference< css::accessibility::XAccessibleComponent >
@@ -185,9 +185,7 @@ tools::Rectangle AccessibleBrowseBox::implGetBoundingBoxOnScreen()
return mpBrowseBox->GetWindowExtentsRelative( nullptr );
}
// internal helper methods
css::uno::Reference< css::accessibility::XAccessible > AccessibleBrowseBox::implGetTable()
{
if( !mxTable.is() )
@@ -198,16 +196,15 @@ css::uno::Reference< css::accessibility::XAccessible > AccessibleBrowseBox::impl
return mxTable.get();
}
css::uno::Reference< css::accessibility::XAccessible >
AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType )
AccessibleBrowseBox::implGetHeaderBar(vcl::AccessibleBrowseBoxObjType eObjType)
{
css::uno::Reference< css::accessibility::XAccessible > xRet;
rtl::Reference< AccessibleBrowseBoxHeaderBar >* pxMember = nullptr;
if( eObjType == BBTYPE_ROWHEADERBAR )
if( eObjType == vcl::BBTYPE_ROWHEADERBAR )
pxMember = &mxRowHeaderBar;
else if( eObjType == BBTYPE_COLUMNHEADERBAR )
else if( eObjType == vcl::BBTYPE_COLUMNHEADERBAR )
pxMember = &mxColumnHeaderBar;
if( pxMember )
@@ -223,20 +220,19 @@ AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType )
return xRet;
}
css::uno::Reference< css::accessibility::XAccessible >
AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex )
{
css::uno::Reference< css::accessibility::XAccessible > xRet;
switch( nChildIndex )
{
case BBINDEX_COLUMNHEADERBAR:
xRet = implGetHeaderBar( BBTYPE_COLUMNHEADERBAR );
case vcl::BBINDEX_COLUMNHEADERBAR:
xRet = implGetHeaderBar( vcl::BBTYPE_COLUMNHEADERBAR );
break;
case BBINDEX_ROWHEADERBAR:
xRet = implGetHeaderBar( BBTYPE_ROWHEADERBAR );
case vcl::BBINDEX_ROWHEADERBAR:
xRet = implGetHeaderBar( vcl::BBTYPE_ROWHEADERBAR );
break;
case BBINDEX_TABLE:
case vcl::BBINDEX_TABLE:
xRet = implGetTable();
break;
}
@@ -270,7 +266,7 @@ void AccessibleBrowseBox::commitHeaderBarEvent( sal_Int16 _nEventId,
// = AccessibleBrowseBoxAccess
AccessibleBrowseBoxAccess::AccessibleBrowseBoxAccess( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::svt::IAccessibleTableProvider& _rBrowseBox )
AccessibleBrowseBoxAccess::AccessibleBrowseBoxAccess( const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::vcl::IAccessibleTableProvider& _rBrowseBox )
:m_xParent( _rxParent )
,m_rBrowseBox( _rBrowseBox )
{
accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+17 -17
View File
@@ -18,7 +18,7 @@
*/
#include <extended/AccessibleBrowseBoxBase.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
@@ -48,9 +48,9 @@ using namespace com::sun::star::accessibility::AccessibleStateType;
AccessibleBrowseBoxBase::AccessibleBrowseBoxBase(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::IAccessibleTableProvider& rBrowseBox,
::vcl::IAccessibleTableProvider& rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
::svt::AccessibleBrowseBoxObjType eObjType ) :
::vcl::AccessibleBrowseBoxObjType eObjType ) :
AccessibleBrowseBoxImplHelper( m_aMutex ),
mxParent( rxParent ),
mpBrowseBox( &rBrowseBox ),
@@ -66,9 +66,9 @@ AccessibleBrowseBoxBase::AccessibleBrowseBoxBase(
AccessibleBrowseBoxBase::AccessibleBrowseBoxBase(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::IAccessibleTableProvider& rBrowseBox,
::vcl::IAccessibleTableProvider& rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
::svt::AccessibleBrowseBoxObjType eObjType,
::vcl::AccessibleBrowseBoxObjType eObjType,
const OUString& rName,
const OUString& rDescription ) :
AccessibleBrowseBoxImplHelper( m_aMutex ),
@@ -439,24 +439,24 @@ sal_Int16 SAL_CALL AccessibleBrowseBoxBase::getAccessibleRole()
sal_Int16 nRole = AccessibleRole::UNKNOWN;
switch ( meObjType )
{
case BBTYPE_ROWHEADERCELL:
case vcl::BBTYPE_ROWHEADERCELL:
nRole = AccessibleRole::ROW_HEADER;
break;
case BBTYPE_COLUMNHEADERCELL:
case vcl::BBTYPE_COLUMNHEADERCELL:
nRole = AccessibleRole::COLUMN_HEADER;
break;
case BBTYPE_COLUMNHEADERBAR:
case BBTYPE_ROWHEADERBAR:
case BBTYPE_TABLE:
case vcl::BBTYPE_COLUMNHEADERBAR:
case vcl::BBTYPE_ROWHEADERBAR:
case vcl::BBTYPE_TABLE:
nRole = AccessibleRole::TABLE;
break;
case BBTYPE_TABLECELL:
case vcl::BBTYPE_TABLECELL:
nRole = AccessibleRole::TABLE_CELL;
break;
case BBTYPE_BROWSEBOX:
case vcl::BBTYPE_BROWSEBOX:
nRole = AccessibleRole::PANEL;
break;
case BBTYPE_CHECKBOXCELL:
case vcl::BBTYPE_CHECKBOXCELL:
nRole = AccessibleRole::CHECK_BOX;
break;
}
@@ -533,15 +533,15 @@ Reference< css::accessibility::XAccessibleContext > SAL_CALL BrowseBoxAccessible
}
BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::svt::IAccessibleTableProvider& rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::svt::AccessibleBrowseBoxObjType eObjType )
BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::IAccessibleTableProvider& rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::vcl::AccessibleBrowseBoxObjType eObjType )
:AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType )
{
}
BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::svt::IAccessibleTableProvider& rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::svt::AccessibleBrowseBoxObjType eObjType,
BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::IAccessibleTableProvider& rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::vcl::AccessibleBrowseBoxObjType eObjType,
const OUString& rName, const OUString& rDescription )
:AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType, rName, rDescription )
{
accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
+3 -3
View File
@@ -19,7 +19,7 @@
#include <extended/AccessibleBrowseBoxCheckBoxCell.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/accessibletableprovider.hxx>
namespace accessibility
{
@@ -29,13 +29,13 @@ namespace accessibility
using namespace ::svt;
AccessibleCheckBoxCell::AccessibleCheckBoxCell(const Reference<XAccessible >& _rxParent,
IAccessibleTableProvider& _rBrowseBox,
vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos
,const TriState& _eState,
bool _bIsTriState)
:AccessibleBrowseBoxCell(_rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos, BBTYPE_CHECKBOXCELL)
:AccessibleBrowseBoxCell(_rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos, vcl::BBTYPE_CHECKBOXCELL)
,m_eState(_eState)
,m_bIsTriState(_bIsTriState)
{
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+4 -5
View File
@@ -18,8 +18,7 @@
*/
#include <extended/AccessibleBrowseBoxHeaderBar.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/accessibletableprovider.hxx>
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
@@ -37,8 +36,8 @@ namespace accessibility {
AccessibleBrowseBoxHeaderBar::AccessibleBrowseBoxHeaderBar(
const Reference< XAccessible >& rxParent,
IAccessibleTableProvider& rBrowseBox,
AccessibleBrowseBoxObjType eObjType ) :
vcl::IAccessibleTableProvider& rBrowseBox,
vcl::AccessibleBrowseBoxObjType eObjType ) :
AccessibleBrowseBoxTableBase( rxParent, rBrowseBox,eObjType )
{
OSL_ENSURE( isRowBar() || isColumnBar(),
@@ -63,7 +62,7 @@ AccessibleBrowseBoxHeaderBar::getAccessibleChild( sal_Int32 nChildIndex )
sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleIndexInParent()
{
return isRowBar() ? BBINDEX_ROWHEADERBAR : BBINDEX_COLUMNHEADERBAR;
return isRowBar() ? vcl::BBINDEX_ROWHEADERBAR : vcl::BBINDEX_COLUMNHEADERBAR;
}
// XAccessibleComponent -------------------------------------------------------
accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+4 -4
View File
@@ -19,7 +19,7 @@
#include <extended/AccessibleBrowseBoxHeaderCell.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <extended/AccessibleBrowseBox.hxx>
namespace accessibility
@@ -31,9 +31,9 @@ namespace accessibility
AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnRowId,
const Reference< XAccessible >& rxParent,
IAccessibleTableProvider& rBrowseBox,
vcl::IAccessibleTableProvider& rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
AccessibleBrowseBoxObjType eObjType)
vcl::AccessibleBrowseBoxObjType eObjType)
: BrowseBoxAccessibleElement(rxParent,
rBrowseBox,
_xFocusWindow,
@@ -117,7 +117,7 @@ OUString SAL_CALL AccessibleBrowseBoxHeaderCell::getImplementationName()
namespace
{
tools::Rectangle getRectangle(IAccessibleTableProvider* _pBrowseBox,sal_Int32 _nRowColIndex, bool _bOnScreen,bool _bRowBar)
tools::Rectangle getRectangle(vcl::IAccessibleTableProvider* _pBrowseBox,sal_Int32 _nRowColIndex, bool _bOnScreen,bool _bRowBar)
{
sal_Int32 nRow = 0;
sal_uInt16 nCol = static_cast<sal_uInt16>(_nRowColIndex);
accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+6 -6
View File
@@ -18,7 +18,7 @@
*/
#include <extended/AccessibleBrowseBoxTable.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/accessibletableprovider.hxx>
using ::com::sun::star::uno::Reference;
@@ -36,8 +36,8 @@ namespace accessibility {
AccessibleBrowseBoxTable::AccessibleBrowseBoxTable(
const Reference< XAccessible >& rxParent,
IAccessibleTableProvider& rBrowseBox ) :
AccessibleBrowseBoxTableBase( rxParent, rBrowseBox, BBTYPE_TABLE )
vcl::IAccessibleTableProvider& rBrowseBox ) :
AccessibleBrowseBoxTableBase( rxParent, rBrowseBox, vcl::BBTYPE_TABLE )
{
}
@@ -62,7 +62,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTable::getAccessibleIndexInParent()
{
osl::MutexGuard aGuard( getMutex() );
ensureIsAlive();
return BBINDEX_TABLE;
return vcl::BBINDEX_TABLE;
}
// XAccessibleComponent -------------------------------------------------------
@@ -112,14 +112,14 @@ Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleRo
{
::osl::MutexGuard aGuard( getMutex() );
ensureIsAlive();
return implGetHeaderBar( BBINDEX_ROWHEADERBAR );
return implGetHeaderBar( vcl::BBINDEX_ROWHEADERBAR );
}
Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleColumnHeaders()
{
::osl::MutexGuard aGuard( getMutex() );
ensureIsAlive();
return implGetHeaderBar( BBINDEX_COLUMNHEADERBAR );
return implGetHeaderBar( vcl::BBINDEX_COLUMNHEADERBAR );
}
Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleRows()
accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+3 -3
View File
@@ -18,7 +18,7 @@
*/
#include <extended/AccessibleBrowseBoxTableBase.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <tools/multisel.hxx>
#include <comphelper/sequence.hxx>
@@ -39,8 +39,8 @@ namespace accessibility {
AccessibleBrowseBoxTableBase::AccessibleBrowseBoxTableBase(
const Reference< XAccessible >& rxParent,
IAccessibleTableProvider& rBrowseBox,
AccessibleBrowseBoxObjType eObjType ) :
vcl::IAccessibleTableProvider& rBrowseBox,
vcl::AccessibleBrowseBoxObjType eObjType ) :
BrowseBoxAccessibleElement( rxParent, rBrowseBox,nullptr, eObjType )
{
}
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+6 -6
View File
@@ -19,7 +19,7 @@
#include <extended/AccessibleBrowseBoxTableCell.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
namespace accessibility
@@ -65,17 +65,17 @@ namespace accessibility
}
AccessibleBrowseBoxTableCell::AccessibleBrowseBoxTableCell(const Reference<XAccessible >& _rxParent,
IAccessibleTableProvider& _rBrowseBox,
vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos,
sal_Int32 _nOffset )
:AccessibleBrowseBoxCell( _rxParent, _rBrowseBox, _xFocusWindow, _nRowPos, _nColPos )
{
m_nOffset = ( _nOffset == OFFSET_DEFAULT ) ? sal_Int32(BBINDEX_FIRSTCONTROL) : _nOffset;
m_nOffset = ( _nOffset == OFFSET_DEFAULT ) ? sal_Int32(vcl::BBINDEX_FIRSTCONTROL) : _nOffset;
sal_Int32 nIndex = getIndex_Impl( _nRowPos, _nColPos, _rBrowseBox.GetColumnCount() );
setAccessibleName( _rBrowseBox.GetAccessibleObjectName( BBTYPE_TABLECELL, nIndex ) );
setAccessibleDescription( _rBrowseBox.GetAccessibleObjectDescription( BBTYPE_TABLECELL, nIndex ) );
setAccessibleName( _rBrowseBox.GetAccessibleObjectName( vcl::BBTYPE_TABLECELL, nIndex ) );
setAccessibleDescription( _rBrowseBox.GetAccessibleObjectDescription( vcl::BBTYPE_TABLECELL, nIndex ) );
// Need to register as event listener
Reference< XComponent > xComponent(_rxParent, UNO_QUERY);
if( xComponent.is() )
@@ -206,7 +206,7 @@ namespace accessibility
SolarMethodGuard aGuard(getMutex());
ensureIsAlive();
return /*BBINDEX_FIRSTCONTROL*/ m_nOffset + ( getRowPos() * mpBrowseBox->GetColumnCount() ) + getColumnPos();
return /*vcl::BBINDEX_FIRSTCONTROL*/ m_nOffset + ( getRowPos() * mpBrowseBox->GetColumnCount() ) + getColumnPos();
}
sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCaretPosition( )
accessibility/source/extended/AccessibleGridControl.cxx
+7 -9
View File
@@ -23,24 +23,22 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
#include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
#include <svtools/accessibletable.hxx>
#include <vcl/accessibletable.hxx>
#include <comphelper/types.hxx>
namespace accessibility
{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::accessibility;
using namespace ::svt;
using namespace ::svt::table;
using namespace ::vcl;
using namespace ::vcl::table;
AccessibleGridControl::AccessibleGridControl(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator,
::svt::table::IAccessibleTable& _rTable )
::vcl::table::IAccessibleTable& _rTable )
: AccessibleGridControlBase( _rxParent, _rTable, TCTYPE_GRIDCONTROL ),
m_aCreator(_rxCreator)
{
@@ -102,7 +100,7 @@ AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex )
{
if(!m_xColumnHeaderBar.is())
{
m_xColumnHeaderBar = new AccessibleGridControlHeader(m_aCreator, m_aTable, svt::table::TCTYPE_COLUMNHEADERBAR);
m_xColumnHeaderBar = new AccessibleGridControlHeader(m_aCreator, m_aTable, vcl::table::TCTYPE_COLUMNHEADERBAR);
}
xChild = m_xColumnHeaderBar.get();
}
@@ -110,7 +108,7 @@ AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex )
{
if(!m_xRowHeaderBar.is())
{
m_xRowHeaderBar = new AccessibleGridControlHeader(m_aCreator, m_aTable, svt::table::TCTYPE_ROWHEADERBAR);
m_xRowHeaderBar = new AccessibleGridControlHeader(m_aCreator, m_aTable, vcl::table::TCTYPE_ROWHEADERBAR);
}
xChild = m_xRowHeaderBar.get();
}
@@ -348,7 +346,7 @@ void AccessibleGridControl::commitTableEvent(sal_Int16 _nEventId,const Any& _rNe
AccessibleGridControlAccess::AccessibleGridControlAccess(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::svt::table::IAccessibleTable& rTable )
const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::table::IAccessibleTable& rTable )
: m_xParent( rxParent )
, m_pTable( & rTable )
{
accessibility/source/extended/AccessibleGridControlBase.cxx
+7 -7
View File
@@ -18,7 +18,7 @@
*/
#include <extended/AccessibleGridControlBase.hxx>
#include <svtools/accessibletable.hxx>
#include <vcl/accessibletable.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <sal/types.h>
@@ -34,8 +34,8 @@ using ::com::sun::star::uno::Any;
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using namespace ::comphelper;
using namespace ::svt;
using namespace ::svt::table;
using namespace ::vcl;
using namespace ::vcl::table;
namespace accessibility {
@@ -45,8 +45,8 @@ using namespace com::sun::star::accessibility::AccessibleStateType;
AccessibleGridControlBase::AccessibleGridControlBase(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::table::IAccessibleTable& rTable,
::svt::table::AccessibleTableControlObjType eObjType ) :
::vcl::table::IAccessibleTable& rTable,
::vcl::table::AccessibleTableControlObjType eObjType ) :
AccessibleGridControlImplHelper( m_aMutex ),
m_xParent( rxParent ),
m_aTable( rTable),
@@ -430,8 +430,8 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground( )
GridControlAccessibleElement::GridControlAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
::svt::table::IAccessibleTable& rTable,
::svt::table::AccessibleTableControlObjType eObjType )
::vcl::table::IAccessibleTable& rTable,
::vcl::table::AccessibleTableControlObjType eObjType )
:AccessibleGridControlBase( rxParent, rTable, eObjType )
{
}
accessibility/source/extended/AccessibleGridControlHeader.cxx
+14 -15
View File
@@ -20,8 +20,7 @@
#include <extended/AccessibleGridControlHeader.hxx>
#include <extended/AccessibleGridControlHeaderCell.hxx>
#include <extended/AccessibleGridControlTableCell.hxx>
#include <svtools/accessibletable.hxx>
#include <vcl/accessibletable.hxx>
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
@@ -30,8 +29,8 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::accessibility;
using namespace ::svt;
using namespace ::svt::table;
using namespace ::vcl;
using namespace ::vcl::table;
namespace accessibility {
@@ -39,8 +38,8 @@ namespace accessibility {
AccessibleGridControlHeader::AccessibleGridControlHeader(
const Reference< XAccessible >& rxParent,
::svt::table::IAccessibleTable& rTable,
::svt::table::AccessibleTableControlObjType eObjType):
::vcl::table::IAccessibleTable& rTable,
::vcl::table::AccessibleTableControlObjType eObjType):
AccessibleGridControlTableBase( rxParent, rTable, eObjType )
{
OSL_ENSURE( isRowBar() || isColumnBar(),
@@ -58,14 +57,14 @@ AccessibleGridControlHeader::getAccessibleChild( sal_Int32 nChildIndex )
throw IndexOutOfBoundsException();
ensureIsAlive();
Reference< XAccessible > xChild;
if(m_eObjType == svt::table::TCTYPE_COLUMNHEADERBAR)
if(m_eObjType == vcl::table::TCTYPE_COLUMNHEADERBAR)
{
AccessibleGridControlHeaderCell* pColHeaderCell = new AccessibleGridControlHeaderCell(nChildIndex, this, m_aTable, svt::table::TCTYPE_COLUMNHEADERCELL);
AccessibleGridControlHeaderCell* pColHeaderCell = new AccessibleGridControlHeaderCell(nChildIndex, this, m_aTable, vcl::table::TCTYPE_COLUMNHEADERCELL);
xChild = pColHeaderCell;
}
else if(m_eObjType == svt::table::TCTYPE_ROWHEADERBAR)
else if(m_eObjType == vcl::table::TCTYPE_ROWHEADERBAR)
{
AccessibleGridControlHeaderCell* pRowHeaderCell = new AccessibleGridControlHeaderCell(nChildIndex, this, m_aTable, svt::table::TCTYPE_ROWHEADERCELL);
AccessibleGridControlHeaderCell* pRowHeaderCell = new AccessibleGridControlHeaderCell(nChildIndex, this, m_aTable, vcl::table::TCTYPE_ROWHEADERCELL);
xChild = pRowHeaderCell;
}
return xChild;
@@ -74,7 +73,7 @@ AccessibleGridControlHeader::getAccessibleChild( sal_Int32 nChildIndex )
sal_Int32 SAL_CALL AccessibleGridControlHeader::getAccessibleIndexInParent()
{
ensureIsAlive();
if(m_eObjType == svt::table::TCTYPE_ROWHEADERBAR && m_aTable.HasColHeader())
if(m_eObjType == vcl::table::TCTYPE_ROWHEADERBAR && m_aTable.HasColHeader())
return 1;
else
return 0;
@@ -212,14 +211,14 @@ Reference< XAccessible > AccessibleGridControlHeader::implGetChild(
sal_Int32 nRow, sal_uInt32 nColumnPos )
{
Reference< XAccessible > xChild;
if(m_eObjType == svt::table::TCTYPE_COLUMNHEADERBAR)
if(m_eObjType == vcl::table::TCTYPE_COLUMNHEADERBAR)
{
AccessibleGridControlHeaderCell* pColHeaderCell = new AccessibleGridControlHeaderCell(nColumnPos, this, m_aTable, svt::table::TCTYPE_COLUMNHEADERCELL);
AccessibleGridControlHeaderCell* pColHeaderCell = new AccessibleGridControlHeaderCell(nColumnPos, this, m_aTable, vcl::table::TCTYPE_COLUMNHEADERCELL);
xChild = pColHeaderCell;
}
else if(m_eObjType == svt::table::TCTYPE_ROWHEADERBAR)
else if(m_eObjType == vcl::table::TCTYPE_ROWHEADERBAR)
{
AccessibleGridControlHeaderCell* pRowHeaderCell = new AccessibleGridControlHeaderCell(nRow, this, m_aTable, svt::table::TCTYPE_ROWHEADERCELL);
AccessibleGridControlHeaderCell* pRowHeaderCell = new AccessibleGridControlHeaderCell(nRow, this, m_aTable, vcl::table::TCTYPE_ROWHEADERCELL);
xChild = pRowHeaderCell;
}
return xChild;
accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
+3 -4
View File
@@ -17,9 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <extended/AccessibleGridControlHeaderCell.hxx>
#include <svtools/accessibletable.hxx>
#include <vcl/accessibletable.hxx>
#include <extended/AccessibleGridControl.hxx>
namespace accessibility
@@ -27,8 +26,8 @@ namespace accessibility
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::svt;
using namespace ::svt::table;
using namespace ::vcl;
using namespace ::vcl::table;
AccessibleGridControlHeaderCell::AccessibleGridControlHeaderCell(sal_Int32 _nColumnRowId,
const Reference< XAccessible >& rxParent,
accessibility/source/extended/AccessibleGridControlTable.cxx
+3 -4
View File
@@ -19,8 +19,7 @@
#include <extended/AccessibleGridControlTable.hxx>
#include <extended/AccessibleGridControlTableCell.hxx>
#include <svtools/accessibletable.hxx>
#include <vcl/accessibletable.hxx>
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
@@ -28,8 +27,8 @@ using ::com::sun::star::uno::Any;
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using namespace ::svt;
using namespace ::svt::table;
using namespace ::vcl;
using namespace ::vcl::table;
namespace accessibility {
accessibility/source/extended/AccessibleGridControlTableBase.cxx
+3 -4
View File
@@ -18,19 +18,18 @@
*/
#include <extended/AccessibleGridControlTableBase.hxx>
#include <svtools/accessibletable.hxx>
#include <vcl/accessibletable.hxx>
#include <tools/multisel.hxx>
#include <comphelper/sequence.hxx>
using css::uno::Reference;
using css::uno::Sequence;
using css::uno::Any;
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using namespace ::svt;
using namespace ::svt::table;
using namespace ::vcl;
using namespace ::vcl::table;
namespace accessibility {
accessibility/source/extended/AccessibleGridControlTableCell.cxx
+6 -7
View File
@@ -17,9 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <extended/AccessibleGridControlTableCell.hxx>
#include <svtools/accessibletable.hxx>
#include <vcl/accessibletable.hxx>
#include <tools/gen.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
@@ -42,16 +41,16 @@ namespace accessibility
using namespace ::com::sun::star::uno;
using ::com::sun::star::accessibility::XAccessible;
using namespace ::com::sun::star::accessibility;
using namespace ::svt;
using namespace ::svt::table;
using namespace ::vcl;
using namespace ::vcl::table;
// = AccessibleGridControlCell
AccessibleGridControlCell::AccessibleGridControlCell(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::svt::table::IAccessibleTable& _rTable,
sal_Int32 _nRowPos, sal_uInt16 _nColPos, ::svt::table::AccessibleTableControlObjType _eType )
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::vcl::table::IAccessibleTable& _rTable,
sal_Int32 _nRowPos, sal_uInt16 _nColPos, ::vcl::table::AccessibleTableControlObjType _eType )
:AccessibleGridControlBase( _rxParent, _rTable, _eType )
,m_nRowPos( _nRowPos )
,m_nColPos( _nColPos )
@@ -95,7 +94,7 @@ namespace accessibility
}
AccessibleGridControlTableCell::AccessibleGridControlTableCell(const css::uno::Reference<XAccessible >& _rxParent,
::svt::table::IAccessibleTable& _rTable,
::vcl::table::IAccessibleTable& _rTable,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos)
:AccessibleGridControlCell( _rxParent, _rTable, _nRowPos, _nColPos, TCTYPE_TABLECELL )
accessibility/source/extended/accessiblebrowseboxcell.cxx
+4 -4
View File
@@ -18,7 +18,7 @@
*/
#include <sal/types.h>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <extended/accessiblebrowseboxcell.hxx>
namespace accessibility
@@ -30,9 +30,9 @@ namespace accessibility
// AccessibleBrowseBoxCell
AccessibleBrowseBoxCell::AccessibleBrowseBoxCell(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::svt::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent, ::vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
sal_Int32 _nRowPos, sal_uInt16 _nColPos, ::svt::AccessibleBrowseBoxObjType _eType )
sal_Int32 _nRowPos, sal_uInt16 _nColPos, ::vcl::AccessibleBrowseBoxObjType _eType )
:AccessibleBrowseBoxBase( _rxParent, _rBrowseBox, _xFocusWindow, _eType )
,m_nRowPos( _nRowPos )
,m_nColPos( _nColPos )
@@ -40,7 +40,7 @@ namespace accessibility
// set accessible name here, because for that we need the position of the cell
// and so the base class isn't capable of doing this
sal_Int32 nPos = _nRowPos * _rBrowseBox.GetColumnCount() + _nColPos;
OUString aAccName = _rBrowseBox.GetAccessibleObjectName( BBTYPE_TABLECELL, nPos );
OUString aAccName = _rBrowseBox.GetAccessibleObjectName( vcl::BBTYPE_TABLECELL, nPos );
implSetName( aAccName );
}
accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+2 -2
View File
@@ -39,7 +39,7 @@ namespace accessibility
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
const css::uno::Reference< css::accessibility::XAccessible >& _rxOwningAccessible,
const css::uno::Reference< css::accessibility::XAccessibleContext >& _xControlChild,
::svt::IAccessibleTableProvider& _rBrowseBox,
::vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos)
@@ -185,7 +185,7 @@ namespace accessibility
EditBrowseBoxTableCellAccess::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,
::svt::IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos, sal_uInt16 _nColPos )
::vcl::IAccessibleTableProvider& _rBrowseBox, sal_Int32 _nRowPos, sal_uInt16 _nColPos )
:WeakComponentImplHelper( m_aMutex )
,m_xParent( _rxParent )
,m_xControlAccessible( _rxControlAccessible )
accessibility/source/extended/accessibletablistbox.cxx
+2 -5
View File
@@ -20,7 +20,7 @@
#include <extended/accessibletablistbox.hxx>
#include <extended/accessibletablistboxtable.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
namespace accessibility
@@ -40,7 +40,6 @@ namespace accessibility
AccessibleTabListBox::AccessibleTabListBox( const Reference< XAccessible >& rxParent, SvHeaderTabListBox& rBox )
:AccessibleBrowseBox( rxParent, nullptr, rBox )
,m_pTabListBox( &rBox )
{
osl_atomic_increment( &m_refCount );
{
@@ -78,13 +77,11 @@ namespace accessibility
return 2; // header and table
}
Reference< XAccessibleContext > SAL_CALL AccessibleTabListBox::getAccessibleContext()
{
return this;
}
Reference< XAccessible > SAL_CALL
AccessibleTabListBox::getAccessibleChild( sal_Int32 nChildIndex )
{
@@ -98,7 +95,7 @@ namespace accessibility
if (nChildIndex == 0)
{
//! so far the actual implementation object only supports column headers
xRet = implGetHeaderBar( ::svt::BBTYPE_COLUMNHEADERBAR );
xRet = implGetHeaderBar( ::vcl::BBTYPE_COLUMNHEADERBAR );
}
else if (nChildIndex == 1)
xRet = implGetTable();
accessibility/source/extended/accessibletablistboxtable.cxx
+1 -1
View File
@@ -21,7 +21,7 @@
#include <extended/accessibletablistboxtable.hxx>
#include <extended/AccessibleBrowseBoxTableCell.hxx>
#include <extended/AccessibleBrowseBoxCheckBoxCell.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
accessibility/source/helper/acc_factory.cxx
+47 -45
View File
@@ -21,7 +21,7 @@
#include <toolkit/awt/vclxwindows.hxx>
#include <toolkit/helper/accessiblefactory.hxx>
#include <svtools/accessiblefactory.hxx>
#include <vcl/accessiblefactory.hxx>
#include <standard/vclxaccessiblebutton.hxx>
#include <standard/vclxaccessiblecheckbox.hxx>
#include <standard/vclxaccessibledropdowncombobox.hxx>
@@ -30,6 +30,7 @@
#include <standard/vclxaccessibleedit.hxx>
#include <standard/vclxaccessiblefixedhyperlink.hxx>
#include <standard/vclxaccessiblefixedtext.hxx>
#include <standard/vclxaccessibleheaderbar.hxx>
#include <standard/vclxaccessiblelistbox.hxx>
#include <standard/vclxaccessiblemenu.hxx>
#include <standard/vclxaccessibleradiobutton.hxx>
@@ -55,9 +56,8 @@
#include <extended/accessibleeditbrowseboxcell.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/combobox.hxx>
#include <vcl/treelistbox.hxx>
#include <extended/AccessibleGridControl.hxx>
#include <svtools/accessibletable.hxx>
#include <vcl/accessibletable.hxx>
#include <vcl/popupmenuwindow.hxx>
#include <floatingwindowaccessible.hxx>
@@ -66,8 +66,8 @@ using namespace ::accessibility;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::accessibility;
using namespace ::svt;
using namespace ::svt::table;
using namespace ::vcl;
using namespace ::vcl::table;
namespace {
@@ -79,7 +79,7 @@ bool hasFloatingChild(vcl::Window *pWindow)
// IAccessibleFactory
class AccessibleFactory :public ::toolkit::IAccessibleFactory
,public ::svt::IAccessibleFactory
,public ::vcl::IAccessibleFactory
{
public:
AccessibleFactory();
@@ -105,22 +105,24 @@ public:
createAccessibleContext( VCLXComboBox* _pXWindow ) override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleContext( VCLXToolBox* _pXWindow ) override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleContext( VCLXHeaderBar* _pXWindow ) override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleContext( VCLXWindow* _pXWindow ) override;
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessible( Menu* _pMenu, bool _bIsMenuBar ) override;
// ::svt::IAccessibleFactory
virtual IAccessibleTabListBox*
// ::vcl::IAccessibleFactory
virtual vcl::IAccessibleTabListBox*
createAccessibleTabListBox(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
SvHeaderTabListBox& rBox
) const override;
virtual IAccessibleBrowseBox*
virtual vcl::IAccessibleBrowseBox*
createAccessibleBrowseBox(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
IAccessibleTableProvider& _rBrowseBox
vcl::IAccessibleTableProvider& _rBrowseBox
) const override;
virtual IAccessibleTableControl*
@@ -145,17 +147,23 @@ public:
VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView
) const override;
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleTreeListBox(
SvTreeListBox& _rListBox,
const css::uno::Reference< css::accessibility::XAccessible >& _xParent
) const override;
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleBrowseBoxHeaderBar(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
IAccessibleTableProvider& _rOwningTable,
AccessibleBrowseBoxObjType _eObjType
vcl::IAccessibleTableProvider& _rOwningTable,
vcl::AccessibleBrowseBoxObjType _eObjType
) const override;
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleBrowseBoxTableCell(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
IAccessibleTableProvider& _rBrowseBox,
vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
sal_Int32 _nRowId,
sal_uInt16 _nColId,
@@ -166,15 +174,15 @@ public:
createAccessibleBrowseBoxHeaderCell(
sal_Int32 _nColumnRowId,
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
IAccessibleTableProvider& _rBrowseBox,
vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
AccessibleBrowseBoxObjType _eObjType
vcl::AccessibleBrowseBoxObjType _eObjType
) const override;
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleCheckBoxCell(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
IAccessibleTableProvider& _rBrowseBox,
vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos,
@@ -187,7 +195,7 @@ public:
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
const css::uno::Reference< css::accessibility::XAccessible >& _rxControlAccessible,
const css::uno::Reference< css::awt::XWindow >& _rxFocusWindow,
IAccessibleTableProvider& _rBrowseBox,
vcl::IAccessibleTableProvider& _rBrowseBox,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos
) const override;
@@ -309,23 +317,6 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLX
xContext = static_cast<XAccessibleContext*>(new VCLXAccessibleTabControl( _pXWindow ));
}
else if ( nType == WindowType::TREELISTBOX )
{
vcl::Window* pParent = pWindow->GetAccessibleParentWindow();
DBG_ASSERT(pParent, "SvTreeListBox::CreateAccessible - accessible parent not found");
if (pParent)
{
css::uno::Reference< XAccessible > xAccParent = pParent->GetAccessible();
DBG_ASSERT(xAccParent.is(), "SvTreeListBox::CreateAccessible - accessible parent not found");
if (xAccParent.is())
{
xContext = static_cast<XAccessibleContext*>(new AccessibleListBox(*static_cast<SvTreeListBox*>(pWindow.get()), xAccParent));
return xContext;
}
}
xContext = static_cast<XAccessibleContext*>(new VCLXAccessibleComponent( _pXWindow ));
}
else if ( nType == WindowType::TABPAGE && pWindow->GetAccessibleParentWindow() && pWindow->GetAccessibleParentWindow()->GetType() == WindowType::TABCONTROL )
{
xContext = new VCLXAccessibleTabPageWindow( _pXWindow );
@@ -370,14 +361,19 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLX
return new VCLXAccessibleToolBox( _pXWindow );
}
IAccessibleTabListBox* AccessibleFactory::createAccessibleTabListBox(
Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXHeaderBar* _pXWindow )
{
return new VCLXAccessibleHeaderBar(_pXWindow);
}
vcl::IAccessibleTabListBox* AccessibleFactory::createAccessibleTabListBox(
const Reference< XAccessible >& rxParent, SvHeaderTabListBox& rBox ) const
{
return new AccessibleTabListBox( rxParent, rBox );
}
IAccessibleBrowseBox* AccessibleFactory::createAccessibleBrowseBox(
const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox ) const
vcl::IAccessibleBrowseBox* AccessibleFactory::createAccessibleBrowseBox(
const Reference< XAccessible >& _rxParent, vcl::IAccessibleTableProvider& _rBrowseBox ) const
{
return new AccessibleBrowseBoxAccess( _rxParent, _rBrowseBox );
}
@@ -405,15 +401,21 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleTextWindowCon
return new Document( pVclXWindow, rEngine, rView );
}
Reference< XAccessible > AccessibleFactory::createAccessibleTreeListBox(
SvTreeListBox& _rListBox, const Reference< XAccessible >& _xParent ) const
{
return new AccessibleListBox( _rListBox, _xParent );
}
Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderBar(
const Reference< XAccessible >& rxParent, IAccessibleTableProvider& _rOwningTable,
AccessibleBrowseBoxObjType _eObjType ) const
const Reference< XAccessible >& rxParent, vcl::IAccessibleTableProvider& _rOwningTable,
vcl::AccessibleBrowseBoxObjType _eObjType ) const
{
return new AccessibleBrowseBoxHeaderBar( rxParent, _rOwningTable, _eObjType );
}
Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxTableCell(
const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox,
const Reference< XAccessible >& _rxParent, vcl::IAccessibleTableProvider& _rBrowseBox,
const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowId, sal_uInt16 _nColId, sal_Int32 _nOffset ) const
{
return new AccessibleBrowseBoxTableCell( _rxParent, _rBrowseBox, _xFocusWindow,
@@ -421,15 +423,15 @@ Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxTableCell(
}
Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderCell(
sal_Int32 _nColumnRowId, const Reference< XAccessible >& rxParent, IAccessibleTableProvider& _rBrowseBox,
const Reference< XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType _eObjType ) const
sal_Int32 _nColumnRowId, const Reference< XAccessible >& rxParent, vcl::IAccessibleTableProvider& _rBrowseBox,
const Reference< XWindow >& _xFocusWindow, vcl::AccessibleBrowseBoxObjType _eObjType ) const
{
return new AccessibleBrowseBoxHeaderCell( _nColumnRowId, rxParent, _rBrowseBox,
_xFocusWindow, _eObjType );
}
Reference< XAccessible > AccessibleFactory::createAccessibleCheckBoxCell(
const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox,
const Reference< XAccessible >& _rxParent, vcl::IAccessibleTableProvider& _rBrowseBox,
const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos,
const TriState& _eState, bool _bIsTriState ) const
{
@@ -439,7 +441,7 @@ Reference< XAccessible > AccessibleFactory::createAccessibleCheckBoxCell(
Reference< XAccessible > AccessibleFactory::createEditBrowseBoxTableCellAccess(
const Reference< XAccessible >& _rxParent, const Reference< XAccessible >& _rxControlAccessible,
const Reference< XWindow >& _rxFocusWindow, IAccessibleTableProvider& _rBrowseBox,
const Reference< XWindow >& _rxFocusWindow, vcl::IAccessibleTableProvider& _rBrowseBox,
sal_Int32 _nRowPos, sal_uInt16 _nColPos ) const
{
return new EditBrowseBoxTableCellAccess( _rxParent, _rxControlAccessible,
@@ -475,7 +477,7 @@ extern "C"
{
SAL_DLLPUBLIC_EXPORT void* getSvtAccessibilityComponentFactory()
{
::svt::IAccessibleFactory* pFactory = new AccessibleFactory;
::vcl::IAccessibleFactory* pFactory = new AccessibleFactory;
pFactory->acquire();
return pFactory;
}
svtools/source/control/vclxaccessibleheaderbar.cxx → accessibility/source/standard/vclxaccessibleheaderbar.cxx
+4 -18
View File
@@ -16,11 +16,12 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <vclxaccessibleheaderbar.hxx>
#include <vclxaccessibleheaderbaritem.hxx>
#include <standard/vclxaccessibleheaderbar.hxx>
#include <standard/vclxaccessibleheaderbaritem.hxx>
#include <toolkit/awt/vclxwindows.hxx>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
@@ -37,21 +38,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::accessibility;
using namespace ::comphelper;
VCLXHeaderBar::VCLXHeaderBar(vcl::Window* pHeaderBar)
{
SetWindow(pHeaderBar);
}
VCLXHeaderBar::~VCLXHeaderBar()
{
}
css::uno::Reference< css::accessibility::XAccessibleContext > VCLXHeaderBar::CreateAccessibleContext()
{
return new VCLXAccessibleHeaderBar(this);
}
VCLXAccessibleHeaderBar::VCLXAccessibleHeaderBar( VCLXWindow* pVCLWindow )
:VCLXAccessibleComponent( pVCLWindow )
,m_pHeadBar(nullptr)
svtools/source/control/vclxaccessibleheaderbaritem.cxx → accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
+2 -2
View File
@@ -16,9 +16,9 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <vclxaccessibleheaderbaritem.hxx>
#include <standard/vclxaccessibleheaderbaritem.hxx>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
basctl/source/basicide/baside2.hxx
+2 -2
View File
@@ -27,8 +27,8 @@
#include "breakpoint.hxx"
#include "linenumberwindow.hxx"
#include <svtools/svtabbx.hxx>
#include <svtools/headbar.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <vcl/button.hxx>
#include <basic/sbmod.hxx>
basctl/source/basicide/moduldlg.hxx
+1 -1
View File
@@ -21,7 +21,7 @@
#define INCLUDED_BASCTL_SOURCE_BASICIDE_MODULDLG_HXX
#include <bastype2.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/tabctrl.hxx>
basctl/uiconfig/basicide/ui/basicmacrodialog.ui
+7 -15
View File
@@ -4,16 +4,12 @@
<requires lib="gtk+" version="3.18"/>
<object class="GtkTreeStore" id="liststore1">
<columns>
<!-- column-name expander -->
<column type="GdkPixbuf"/>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
<!-- column-name image -->
<column type="GdkPixbuf"/>
<!-- column-name surface -->
<column type="CairoSurface"/>
<!-- column-name expander -->
<column type="GdkPixbuf"/>
</columns>
</object>
<object class="GtkTreeStore" id="liststore2">
@@ -22,12 +18,6 @@
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
<!-- column-name image -->
<column type="GdkPixbuf"/>
<!-- column-name surface -->
<column type="CairoSurface"/>
<!-- column-name expander -->
<column type="GdkPixbuf"/>
</columns>
</object>
<object class="GtkDialog" id="BasicMacroDialog">
@@ -174,6 +164,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="basicmacrodialog|existingmacrosft">Existing Macros In:</property>
<property name="ellipsize">end</property>
<property name="track_visited_links">False</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -218,7 +209,8 @@
<property name="vexpand">True</property>
<property name="model">liststore1</property>
<property name="headers_visible">False</property>
<property name="search_column">0</property>
<property name="search_column">1</property>
<property name="show_expanders">True</property>
<property name="enable_tree_lines">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library List-selection1"/>
@@ -229,13 +221,13 @@
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext4"/>
<attributes>
<attribute name="pixbuf">4</attribute>
<attribute name="pixbuf">0</attribute>
</attributes>
</child>
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
<attribute name="text">0</attribute>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
chart2/source/controller/dialogs/tp_DataSource.hxx
+1 -1
View File
@@ -22,7 +22,7 @@
#include <svtools/wizardmachine.hxx>
#include <vcl/fixed.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/treelistbox.hxx>
#include <RangeSelectionListener.hxx>
chart2/uiconfig/ui/tp_ChartType.ui
+4 -4
View File
@@ -19,12 +19,12 @@
</object>
<object class="GtkTreeStore" id="liststore2">
<columns>
<!-- column-name image -->
<column type="GdkPixbuf"/>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
<!-- column-name image -->
<column type="GdkPixbuf"/>
</columns>
</object>
<object class="GtkBox" id="tp_ChartType">
@@ -425,7 +425,7 @@
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext3"/>
<attributes>
<attribute name="pixbuf">2</attribute>
<attribute name="pixbuf">0</attribute>
</attributes>
</child>
</object>
@@ -435,7 +435,7 @@
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
<attribute name="text">0</attribute>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
chart2/uiconfig/ui/tp_DataSource.ui
+1 -1
View File
@@ -187,7 +187,7 @@
</packing>
</child>
<child>
<object class="svtlo-SvTabListBox" id="LB_ROLE:border">
<object class="vcllo-SvTabListBox" id="LB_ROLE:border">
<property name="width_request">440</property>
<property name="height_request">100</property>
<property name="visible">True</property>
compilerplugins/clang/unusedenumconstants.py
+1 -1
View File
@@ -155,7 +155,7 @@ def is_ignore(srcLoc):
"include/oox/drawingml/shapepropertymap.hxx",
"include/svl/nfkeytab.hx",
"include/svl/zforlist.hxx",
"include/svtools/svtabbx.hxx",
"include/vcl/svtabbx.hxx",
"include/vcl/print.hxx", # NupOrderType, from UI combobox
"sw/source/uibase/inc/swcont.hxx", # RegionMode, from UI; ContentTypeId, from UI(registry)
"sw/inc/toxe.hxx", # ToxAuthorityType (from UI)
cui/source/dialogs/linkdlg.cxx
+1 -1
View File
@@ -30,7 +30,7 @@
#include <vcl/weld.hxx>
#include <vcl/timer.hxx>
#include <vcl/idle.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/treelistentry.hxx>
#include <strings.hrc>
cui/source/inc/acccfg.hxx
+1 -1
View File
@@ -34,7 +34,7 @@
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
#include <vcl/lstbox.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/treelistbox.hxx>
#include <sfx2/tabdlg.hxx>
#include <sfx2/basedlgs.hxx>
cui/source/inc/autocdlg.hxx
+1 -1
View File
@@ -22,7 +22,7 @@
#include <sfx2/tabdlg.hxx>
#include <svtools/langtab.hxx>
#include <svtools/simptabl.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/treelistentry.hxx>
#include <svx/checklbx.hxx>
#include <svx/langbox.hxx>
cui/source/inc/cfgutil.hxx
+1 -1
View File
@@ -30,7 +30,7 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/script/browse/XBrowseNode.hpp>
#include <vcl/timer.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/treelistbox.hxx>
#include <vcl/dialog.hxx>
#include <vcl/image.hxx>
cui/source/inc/headertablistbox.hxx
+2 -3
View File
@@ -20,9 +20,8 @@
#ifndef INCLUDED_CUI_SOURCE_INC_HEADERTABLISTBOX_HXX
#define INCLUDED_CUI_SOURCE_INC_HEADERTABLISTBOX_HXX
#include <svtools/headbar.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <vcl/svtabbx.hxx>
class MacroEventListBox final : public Control
{
cui/source/inc/linkdlg.hxx
+1 -1
View File
@@ -29,7 +29,7 @@
#include <vcl/fixedhyper.hxx>
#include <svtools/svmedit.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
/********************** SvUpdateLinksDialog ******************************
*************************************************************************/
cui/source/options/dbregister.cxx
+1 -1
View File
@@ -34,7 +34,7 @@
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <svl/itemset.hxx>
#include "doclinkdialog.hxx"
#include <unotools/localfilehelper.hxx>
cui/source/options/optHeaderTabListbox.cxx
+1 -1
View File
@@ -20,7 +20,7 @@
#include "optHeaderTabListbox.hxx"
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <vcl/svlbitm.hxx>
#include <vcl/treelistentry.hxx>
#include <o3tl/make_unique.hxx>
cui/source/options/optcolor.cxx
+1 -1
View File
@@ -24,7 +24,7 @@
#include <editeng/editids.hrc>
#include <svtools/colorcfg.hxx>
#include <svtools/extcolorcfg.hxx>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <svtools/ctrlbox.hxx>
#include <vcl/scrbar.hxx>
#include <svx/colorbox.hxx>
cui/source/options/optinet2.hxx
+2 -2
View File
@@ -24,11 +24,11 @@
#include <vcl/field.hxx>
#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <sfx2/tabdlg.hxx>
#include <unotools/configitem.hxx>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
namespace svx {
class SecurityOptionsDialog;
cui/source/options/optpath.cxx
+1 -1
View File
@@ -21,7 +21,7 @@
#include <sfx2/filedlghelper.hxx>
#include <sfx2/app.hxx>
#include <svl/aeitem.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/treelistentry.hxx>
#include <tools/urlobj.hxx>
#include <vcl/svapp.hxx>
cui/uiconfig/ui/acorreplacepage.ui
+1 -1
View File
@@ -71,7 +71,7 @@
</packing>
</child>
<child>
<object class="svtlo-SvTabListBox" id="tabview:border">
<object class="vcllo-SvTabListBox" id="tabview:border">
<property name="width_request">1</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
cui/uiconfig/ui/baselinksdialog.ui
+1 -1
View File
@@ -184,7 +184,7 @@
</packing>
</child>
<child>
<object class="svtlo-SvTabListBox" id="TB_LINKS:border">
<object class="vcllo-SvTabListBox" id="TB_LINKS:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
cui/uiconfig/ui/editdictionarydialog.ui
+1 -1
View File
@@ -213,7 +213,7 @@
</packing>
</child>
<child>
<object class="svtlo-SvTabListBox" id="words:border">
<object class="vcllo-SvTabListBox" id="words:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
cui/uiconfig/ui/javaclasspathdialog.ui
+4 -4
View File
@@ -4,12 +4,12 @@
<requires lib="gtk+" version="3.18"/>
<object class="GtkTreeStore" id="liststore1">
<columns>
<!-- column-name image -->
<column type="GdkPixbuf"/>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
<!-- column-name image -->
<column type="GdkPixbuf"/>
</columns>
</object>
<object class="GtkDialog" id="JavaClassPath">
@@ -138,7 +138,7 @@
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext1"/>
<attributes>
<attribute name="pixbuf">2</attribute>
<attribute name="pixbuf">0</attribute>
</attributes>
</child>
</object>
@@ -148,7 +148,7 @@
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
<attribute name="text">0</attribute>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
cui/uiconfig/ui/numberingformatpage.ui
+1 -11
View File
@@ -38,12 +38,6 @@
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
<!-- column-name image -->
<column type="GdkPixbuf"/>
<!-- column-name image -->
<column type="CairoSurface"/>
<!-- column-name textcolor -->
<column type="GdkRGBA"/>
</columns>
</object>
<object class="GtkTreeStore" id="liststore3">
@@ -52,10 +46,6 @@
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
<!-- column-name image -->
<column type="GdkPixbuf"/>
<!-- column-name image -->
<column type="CairoSurface"/>
<!-- column-name textcolor -->
<column type="GdkRGBA"/>
</columns>
@@ -529,7 +519,7 @@
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
<attribute name="text">0</attribute>
<attribute name="foreground-rgba">4</attribute>
<attribute name="foreground-rgba">2</attribute>
</attributes>
</child>
</object>
dbaccess/source/ui/browser/sbagrid.cxx
+2 -2
View File
@@ -1460,10 +1460,10 @@ IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent, void*, void)
m_aDataDescriptor.clear();
}
OUString SbaGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition) const
OUString SbaGridControl::GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition) const
{
OUString sRet;
if ( ::svt::BBTYPE_BROWSEBOX == eObjType )
if ( ::vcl::BBTYPE_BROWSEBOX == eObjType )
{
SolarMutexGuard aGuard;
sRet = DBA_RES(STR_DATASOURCE_GRIDCONTROL_DESC);
dbaccess/source/ui/inc/sbagrid.hxx
+1 -1
View File
@@ -239,7 +239,7 @@ namespace dbaui
@return
The description of the specified object.
*/
virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
virtual OUString GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
using FmGridControl::DeleteSelectedRows;
/** copies the currently selected rows to the clipboard
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+2 -2
View File
@@ -2559,12 +2559,12 @@ OUString OSelectionBrowseBox::GetRowDescription( sal_Int32 _nRow ) const
return aLabel.getToken(nToken, ';');
}
OUString OSelectionBrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition) const
OUString OSelectionBrowseBox::GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition) const
{
OUString sRetText;
switch( _eObjType )
{
case ::svt::BBTYPE_ROWHEADERCELL:
case ::vcl::BBTYPE_ROWHEADERCELL:
sRetText = GetRowDescription(_nPosition);
break;
default:
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+1 -1
View File
@@ -170,7 +170,7 @@ namespace dbaui
@return
The name of the specified object.
*/
virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
virtual OUString GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
// IAccessibleTableProvider
/** Creates the accessible object of a data table cell.
dbaccess/uiconfig/ui/sqlexception.ui
+4 -4
View File
@@ -6,10 +6,10 @@
<columns>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
<!-- column-name image -->
<column type="GdkPixbuf"/>
<!-- column-name id -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkDialog" id="SQLExceptionDialog">
@@ -137,7 +137,7 @@
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext1"/>
<attributes>
<attribute name="pixbuf">2</attribute>
<attribute name="pixbuf">0</attribute>
</attributes>
</child>
</object>
@@ -147,7 +147,7 @@
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
<attribute name="text">0</attribute>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
desktop/source/deployment/gui/dp_gui.h
+2 -2
View File
@@ -30,8 +30,8 @@
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <salhelper/simplereferenceobject.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/headbar.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <com/sun/star/ucb/XContentEventListener.hpp>
#include <osl/mutex.hxx>
extensions/source/bibliography/datman.cxx
+2 -2
View File
@@ -49,8 +49,8 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <svl/urihelper.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/headbar.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
extras/source/glade/libreoffice-catalog.xml.in
+2 -2
View File
@@ -312,11 +312,11 @@
<glade-widget-class title="Animation ListBox" name="sdlo-CustomAnimationList"
generic-name="Animation ListBox" parent="vcllo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Tab List" name="svtlo-SvTabListBox"
<glade-widget-class title="Tab List" name="vcllo-SvTabListBox"
generic-name="Tab List" parent="vcllo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="CheckBox List" name="basctllo-CheckBox"
generic-name="CheckBox List" parent="svtlo-SvTabListBox"
generic-name="CheckBox List" parent="vcllo-SvTabListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="SwIdxTreeListBox" name="swuilo-SwIdxTreeListBox"
generic-name="SwIdxTreeListBox" parent="vcllo-SvTreeListBox"
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+1 -1
View File
@@ -26,7 +26,7 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <unotools/resmgr.hxx>
#include <tools/urlobj.hxx>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <unotools/streamwrap.hxx>
#include <unotools/pathoptions.hxx>
#include <osl/file.hxx>
filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+1 -1
View File
@@ -26,7 +26,7 @@
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <vcl/layout.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <svl/poolitem.hxx>
#include <unotools/moduleoptions.hxx>
filter/uiconfig/ui/warnpdfdialog.ui
+5 -5
View File
@@ -6,10 +6,10 @@
<columns>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
<!-- column-name image -->
<column type="GdkPixbuf"/>
<!-- column-name id -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkMessageDialog" id="WarnPDFDialog">
@@ -82,7 +82,7 @@
<property name="model">liststore1</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="search_column">0</property>
<property name="search_column">1</property>
<property name="show_expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
@@ -92,7 +92,7 @@
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext1"/>
<attributes>
<attribute name="pixbuf">2</attribute>
<attribute name="pixbuf">0</attribute>
</attributes>
</child>
</object>
@@ -102,7 +102,7 @@
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
<attribute name="text">0</attribute>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
fpicker/source/office/PlacesListBox.cxx
+1 -1
View File
@@ -10,7 +10,7 @@
#include "PlacesListBox.hxx"
#include <svtools/PlaceEditDialog.hxx>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <bitmaps.hlst>
#define COLUMN_NAME 1
fpicker/source/office/PlacesListBox.hxx
+1 -1
View File
@@ -12,7 +12,7 @@
#include "iodlg.hxx"
#include <svtools/place.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <memory>
#include <vector>
fpicker/source/office/iodlg.cxx
+1 -1
View File
@@ -39,7 +39,7 @@
#include <unotools/viewoptions.hxx>
#include <svtools/fileview.hxx>
#include <svtools/sfxecode.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/treelistentry.hxx>
#include <fpicker/strings.hrc>
fpicker/source/office/iodlgimp.cxx
+1 -1
View File
@@ -18,7 +18,7 @@
*/
#include "iodlgimp.hxx"
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <tools/debug.hxx>
#include <unotools/resmgr.hxx>
#include <tools/urlobj.hxx>
include/sfx2/dinfdlg.hxx
+1 -1
View File
@@ -29,7 +29,7 @@
#include <svl/stritem.hxx>
#include <svl/zforlist.hxx>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <svtools/svmedit.hxx>
#include <unotools/syslocale.hxx>
include/svtools/brwbox.hxx
+12 -9
View File
@@ -24,10 +24,10 @@
#include <vcl/ctrl.hxx>
#include <vcl/vclptr.hxx>
#include <tools/multisel.hxx>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <vcl/transfer.hxx>
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <vector>
#include <stack>
@@ -42,13 +42,16 @@ class BrowserHeader;
namespace svt {
class BrowseBoxImpl;
class IAccessibleFactory;
}
namespace utl {
class AccessibleStateSetHelper;
}
namespace vcl {
class IAccessibleFactory;
}
#define BROWSER_INVALIDID SAL_MAX_UINT16
#define BROWSER_ENDOFSELECTION (static_cast<long>(SFX_ENDOFSELECTION))
@@ -186,7 +189,7 @@ class SVT_DLLPUBLIC BrowseBox
:public Control
,public DragSourceHelper
,public DropTargetHelper
,public svt::IAccessibleTableProvider
,public vcl::IAccessibleTableProvider
{
friend class BrowserDataWin;
friend class ::svt::BrowseBoxImpl;
@@ -309,7 +312,7 @@ private:
protected:
/// retrieves the XAccessible implementation associated with the BrowseBox instance
::svt::IAccessibleFactory& getAccessibleFactory();
::vcl::IAccessibleFactory& getAccessibleFactory();
protected:
sal_uInt16 ColCount() const;
@@ -706,7 +709,7 @@ public:
@return
The name of the specified object.
*/
virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
virtual OUString GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
/** return the description of the specified object.
@param eObjType
@@ -716,7 +719,7 @@ public:
@return
The description of the specified object.
*/
virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
virtual OUString GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
/** @return The header text of the specified row. */
virtual OUString GetRowDescription( sal_Int32 nRow ) const override;
@@ -728,7 +731,7 @@ public:
the accessible object), depending on the specified object type. */
virtual void FillAccessibleStateSet(
::utl::AccessibleStateSetHelper& rStateSet,
::svt::AccessibleBrowseBoxObjType eObjType ) const override;
::vcl::AccessibleBrowseBoxObjType eObjType ) const override;
/** Fills the StateSet with all states for one cell (except DEFUNC and SHOWING, done by
the accessible object). */
include/svtools/brwhead.hxx
+1 -1
View File
@@ -21,7 +21,7 @@
#define INCLUDED_SVTOOLS_BRWHEAD_HXX
#include <svtools/svtdllapi.h>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
class BrowseBox;
include/svtools/simptabl.hxx
+2 -2
View File
@@ -21,8 +21,8 @@
#define INCLUDED_SVTOOLS_SIMPTABL_HXX
#include <svtools/svtdllapi.h>
#include <svtools/headbar.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <vcl/svtabbx.hxx>
#include <unotools/intlwrapper.hxx>
#include <unotools/collatorwrapper.hxx>
#include <vcl/commandevent.hxx>
include/svx/ctredlin.hxx
+1 -1
View File
@@ -25,7 +25,7 @@
#include <svx/svxdllapi.h>
#include <svtools/simptabl.hxx>
#include <vcl/svlbitm.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/treelistbox.hxx>
#include <vcl/treelistentry.hxx>
#include <tools/color.hxx>
include/svx/fmgridcl.hxx
+2 -2
View File
@@ -133,7 +133,7 @@ public:
@return
The name of the specified object.
*/
virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
virtual OUString GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
/** return the description of the specified object.
@param eObjType
@@ -143,7 +143,7 @@ public:
@return
The description of the specified object.
*/
virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
virtual OUString GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
protected:
virtual void Command(const CommandEvent& rEvt) override;
include/svx/fontlb.hxx
+1 -1
View File
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_FONTLB_HXX
#define INCLUDED_SVX_FONTLB_HXX
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/svlbitm.hxx>
#include <vcl/virdev.hxx>
#include <svx/svxdllapi.h>
include/toolkit/awt/vclxwindows.hxx
+10
View File
@@ -1242,6 +1242,16 @@ public:
virtual ~VCLXToolBox() override;
};
class VCLXHeaderBar : public VCLXWindow
{
public:
VCLXHeaderBar();
virtual ~VCLXHeaderBar() override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
};
#endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
include/toolkit/helper/accessiblefactory.hxx
+6
View File
@@ -38,6 +38,7 @@ class VCLXScrollBar;
class VCLXEdit;
class VCLXComboBox;
class VCLXToolBox;
class VCLXHeaderBar;
class VCLXWindow;
class Menu;
@@ -111,6 +112,11 @@ namespace toolkit
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleContext( VCLXToolBox* _pXWindow ) = 0;
/** creates an accessible context for a headerbar window
*/
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleContext( VCLXHeaderBar* _pXWindow ) = 0;
/** creates an accessible context for a generic window
*/
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
include/tools/wintypes.hxx
+2 -1
View File
@@ -99,7 +99,8 @@ enum class WindowType : sal_uInt16
DOCKINGAREA ,
RULER , // 70 (374)
CALCINPUTLINE ,
LAST = CALCINPUTLINE,
HEADERBAR ,
LAST = HEADERBAR,
// only used in vclxtoolkit.cxx
TOOLKIT_FRAMEWINDOW = 0x1000,
TOOLKIT_SYSTEMCHILDWINDOW = 0x1001,
include/svtools/AccessibleBrowseBoxObjType.hxx → include/vcl/AccessibleBrowseBoxObjType.hxx
+3 -7
View File
@@ -18,12 +18,10 @@
*/
#ifndef INCLUDED_SVTOOLS_ACCESSIBLEBROWSEBOXOBJTYPE_HXX
#define INCLUDED_SVTOOLS_ACCESSIBLEBROWSEBOXOBJTYPE_HXX
namespace svt {
#ifndef INCLUDED_VCL_ACCESSIBLEBROWSEBOXOBJTYPE_HXX
#define INCLUDED_VCL_ACCESSIBLEBROWSEBOXOBJTYPE_HXX
namespace vcl {
/** This enumeration contains a constant for each kind of accessible object of
a BrowseBox. */
@@ -39,10 +37,8 @@ enum AccessibleBrowseBoxObjType
BBTYPE_CHECKBOXCELL /// A cell with a checkbox.
};
} // namespace svt
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
include/svtools/accessiblefactory.hxx → include/vcl/accessiblefactory.hxx
+22 -23
View File
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVTOOLS_ACCESSIBLEFACTORY_HXX
#define INCLUDED_SVTOOLS_ACCESSIBLEFACTORY_HXX
#ifndef INCLUDED_VCL_ACCESSIBLEFACTORY_HXX
#define INCLUDED_VCL_ACCESSIBLEFACTORY_HXX
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <com/sun/star/uno/Reference.hxx>
@@ -45,12 +45,8 @@ class VCLXWindow;
class TextEngine;
class TextView;
namespace svt
namespace vcl
{
class PanelTabBar;
namespace table
{
class IAccessibleTable;
@@ -72,16 +68,20 @@ namespace svt
class IAccessibleFactory : public virtual ::salhelper::SimpleReferenceObject
{
public:
virtual IAccessibleTabListBox*
virtual vcl::IAccessibleTabListBox*
createAccessibleTabListBox(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
SvHeaderTabListBox& rBox
) const = 0;
virtual IAccessibleBrowseBox*
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleTreeListBox(
SvTreeListBox& _rListBox,
const css::uno::Reference< css::accessibility::XAccessible >& _xParent
) const = 0;
virtual vcl::IAccessibleBrowseBox*
createAccessibleBrowseBox(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
IAccessibleTableProvider& _rBrowseBox
vcl::IAccessibleTableProvider& _rBrowseBox
) const = 0;
virtual table::IAccessibleTableControl*
createAccessibleTableControl(
@@ -108,14 +108,14 @@ namespace svt
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleBrowseBoxHeaderBar(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
IAccessibleTableProvider& _rOwningTable,
AccessibleBrowseBoxObjType _eObjType
vcl::IAccessibleTableProvider& _rOwningTable,
vcl::AccessibleBrowseBoxObjType _eObjType
) const = 0;
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleBrowseBoxTableCell(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
IAccessibleTableProvider& _rBrowseBox,
vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
sal_Int32 _nRowId,
sal_uInt16 _nColId,
@@ -126,15 +126,15 @@ namespace svt
createAccessibleBrowseBoxHeaderCell(
sal_Int32 _nColumnRowId,
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
IAccessibleTableProvider& _rBrowseBox,
vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
AccessibleBrowseBoxObjType _eObjType
vcl::AccessibleBrowseBoxObjType _eObjType
) const = 0;
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleCheckBoxCell(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
IAccessibleTableProvider& _rBrowseBox,
vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos,
@@ -147,7 +147,7 @@ namespace svt
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
const css::uno::Reference< css::accessibility::XAccessible >& _rxControlAccessible,
const css::uno::Reference< css::awt::XWindow >& _rxFocusWindow,
IAccessibleTableProvider& _rBrowseBox,
vcl::IAccessibleTableProvider& _rBrowseBox,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos
) const = 0;
@@ -156,10 +156,9 @@ namespace svt
virtual ~IAccessibleFactory() override {}
};
} // namespace svt
} // namespace vcl
#endif // INCLUDED_SVTOOLS_ACCESSIBLEFACTORY_HXX
#endif // INCLUDED_VCL_ACCESSIBLEFACTORY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
include/svtools/accessibletable.hxx → include/vcl/accessibletable.hxx
+5 -7
View File
@@ -17,15 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVTOOLS_ACCESSIBLETABLE_HXX
#define INCLUDED_SVTOOLS_ACCESSIBLETABLE_HXX
#ifndef INCLUDED_VCL_ACCESSIBLETABLE_HXX
#define INCLUDED_VCL_ACCESSIBLETABLE_HXX
#include <vcl/window.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
namespace svt{ namespace table
namespace vcl { namespace table
{
typedef sal_Int32 RowPos;
@@ -166,10 +165,9 @@ protected:
~IAccessibleTableControl() {}
};
} // namespace table
} // namespace svt
} // namespace vcl
#endif // INCLUDED_SVTOOLS_ACCESSIBLETABLE_HXX
#endif // INCLUDED_VCL_ACCESSIBLETABLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
include/svtools/accessibletableprovider.hxx → include/vcl/accessibletableprovider.hxx
+10 -13
View File
@@ -17,16 +17,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVTOOLS_ACCESSIBLETABLEPROVIDER_HXX
#define INCLUDED_SVTOOLS_ACCESSIBLETABLEPROVIDER_HXX
#ifndef INCLUDED_VCL_ACCESSIBLETABLEPROVIDER_HXX
#define INCLUDED_VCL_ACCESSIBLETABLEPROVIDER_HXX
#include <vcl/window.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
namespace svt
namespace vcl
{
#define OFFSET_DEFAULT (sal_Int32(-1))
@@ -103,10 +102,10 @@ public:
virtual bool ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ) = 0;
virtual bool ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ) = 0;
virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0;
virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0;
virtual OUString GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0;
virtual OUString GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0;
virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const = 0;
virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::vcl::AccessibleBrowseBoxObjType _eType ) const = 0;
virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0;
virtual void GrabTableFocus() = 0;
@@ -179,7 +178,7 @@ public:
/** returns the accessible object for the row or the column header bar
*/
virtual css::uno::Reference< css::accessibility::XAccessible >
getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) = 0;
getHeaderBar( ::vcl::AccessibleBrowseBoxObjType _eObjType ) = 0;
/** returns the accessible object for the table representation
*/
@@ -226,10 +225,8 @@ protected:
~IAccessibleBrowseBox() {}
};
} // namespace vcl
} // namespace svt
#endif // INCLUDED_SVTOOLS_ACCESSIBLETABLEPROVIDER_HXX
#endif // INCLUDED_VCL_ACCESSIBLETABLEPROVIDER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
include/vcl/builder.hxx
+2 -2
View File
@@ -38,7 +38,7 @@ class PopupMenu;
class SalInstanceBuilder;
class ScreenshotTest;
class ScrollBar;
class SvTreeListBox;
class SvTabListBox;
class Slider;
class DateField;
class TimeField;
@@ -220,7 +220,7 @@ private:
const ListStore* get_model_by_name(const OString& sID) const;
void mungeModel(ListBox &rTarget, const ListStore &rStore, sal_uInt16 nActiveId);
void mungeModel(ComboBox &rTarget, const ListStore &rStore, sal_uInt16 nActiveId);
void mungeModel(SvTreeListBox &rTarget, const ListStore &rStore, sal_uInt16 nActiveId);
void mungeModel(SvTabListBox &rTarget, const ListStore &rStore, sal_uInt16 nActiveId);
typedef stringmap TextBuffer;
const TextBuffer* get_buffer_by_name(const OString& sID) const;
include/svtools/headbar.hxx → include/vcl/headbar.hxx
+17 -19
View File
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVTOOLS_HEADBAR_HXX
#define INCLUDED_SVTOOLS_HEADBAR_HXX
#ifndef INCLUDED_VCL_HEADBAR_HXX
#define INCLUDED_VCL_HEADBAR_HXX
#include <svtools/svtdllapi.h>
#include <vcl/dllapi.h>
#include <tools/link.hxx>
#include <vcl/window.hxx>
#include <o3tl/typed_flags_set.hxx>
@@ -212,7 +212,7 @@ namespace o3tl
class VCLXHeaderBar;
class SVT_DLLPUBLIC HeaderBar : public vcl::Window
class VCL_DLLPUBLIC HeaderBar : public vcl::Window
{
private:
std::vector<std::unique_ptr<ImplHeadItem>> mvItemList;
@@ -243,22 +243,22 @@ private:
mxAccessible;
using Window::ImplInit;
SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle );
SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
SVT_DLLPRIVATE long ImplGetItemPos( sal_uInt16 nPos ) const;
SVT_DLLPRIVATE tools::Rectangle ImplGetItemRect( sal_uInt16 nPos ) const;
VCL_DLLPRIVATE void ImplInit( WinBits nWinStyle );
VCL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
VCL_DLLPRIVATE long ImplGetItemPos( sal_uInt16 nPos ) const;
VCL_DLLPRIVATE tools::Rectangle ImplGetItemRect( sal_uInt16 nPos ) const;
using Window::ImplHitTest;
SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, long& nMouseOff, sal_uInt16& nPos ) const;
SVT_DLLPRIVATE void ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos );
SVT_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh,
VCL_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, long& nMouseOff, sal_uInt16& nPos ) const;
VCL_DLLPRIVATE void ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos );
VCL_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh,
const tools::Rectangle& rItemRect, const tools::Rectangle* pRect);
SVT_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh,
VCL_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh,
const tools::Rectangle* pRect);
SVT_DLLPRIVATE void ImplUpdate( sal_uInt16 nPos,
VCL_DLLPRIVATE void ImplUpdate( sal_uInt16 nPos,
bool bEnd = false );
SVT_DLLPRIVATE void ImplStartDrag( const Point& rPos, bool bCommand );
SVT_DLLPRIVATE void ImplDrag( const Point& rPos );
SVT_DLLPRIVATE void ImplEndDrag( bool bCancel );
VCL_DLLPRIVATE void ImplStartDrag( const Point& rPos, bool bCommand );
VCL_DLLPRIVATE void ImplDrag( const Point& rPos );
VCL_DLLPRIVATE void ImplEndDrag( bool bCancel );
virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
@@ -326,10 +326,8 @@ public:
/** Creates and returns the accessible object of the header bar. */
virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
void SetAccessible( const css::uno::Reference< css::accessibility::XAccessible >& );
virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface( bool bCreate = true ) override;
};
#endif // INCLUDED_SVTOOLS_HEADBAR_HXX
#endif // INCLUDED_VCL_HEADBAR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
include/vcl/svimpbox.hxx
+4
View File
@@ -23,6 +23,7 @@
#include <vcl/dllapi.h>
#include <vcl/seleng.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/svtaccessiblefactory.hxx>
#include <vcl/vclevent.hxx>
#include <unotools/intlwrapper.hxx>
#include <o3tl/enumarray.hxx>
@@ -100,6 +101,9 @@ private:
VclPtr<ScrollBar> aHorSBar;
VclPtr<ScrollBarBox> aScrBarBox;
::vcl::AccessibleFactoryAccess
m_aFactoryAccess;
static Image* s_pDefCollapsed;
static Image* s_pDefExpanded;
static oslInterlockedCount s_nImageRefCount; /// When 0 all static images will be destroyed
include/svtools/svtabbx.hxx → include/vcl/svtabbx.hxx
+16 -17
View File
@@ -16,12 +16,12 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVTOOLS_SVTABBX_HXX
#define INCLUDED_SVTOOLS_SVTABBX_HXX
#ifndef INCLUDED_VCL_SVTABBX_HXX
#define INCLUDED_VCL_SVTABBX_HXX
#include <svtools/svtdllapi.h>
#include <vcl/dllapi.h>
#include <vcl/treelistbox.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <memory>
#include <vector>
@@ -44,7 +44,7 @@ struct TabListBoxEventData
m_pEntry( pEntry ), m_nColumn( nColumn ), m_sOldText( rOldText ) {}
};
class SVT_DLLPUBLIC SvTabListBox : public SvTreeListBox
class VCL_DLLPUBLIC SvTabListBox : public SvTreeListBox
{
private:
std::vector<SvLBoxTab> mvTabList;
@@ -114,19 +114,19 @@ inline long SvTabListBox::GetTab( sal_uInt16 nTab ) const
// class SvHeaderTabListBox ---------------------------------------------------
class HeaderBar;
namespace svt {
namespace vcl {
class IAccessibleTabListBox;
struct SvHeaderTabListBoxImpl;
}
class SVT_DLLPUBLIC SvHeaderTabListBox : public SvTabListBox, public svt::IAccessibleTableProvider
class VCL_DLLPUBLIC SvHeaderTabListBox : public SvTabListBox, public vcl::IAccessibleTableProvider
{
private:
typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
bool m_bFirstPaint;
std::unique_ptr<::svt::SvHeaderTabListBoxImpl> m_pImpl;
::svt::IAccessibleTabListBox* m_pAccessible;
std::unique_ptr<::vcl::SvHeaderTabListBoxImpl> m_pImpl;
::vcl::IAccessibleTabListBox* m_pAccessible;
AccessibleChildren m_aAccessibleChildren;
DECL_DLLPRIVATE_LINK( ScrollHdl_Impl, SvTreeListBox*, void );
@@ -218,11 +218,11 @@ public:
virtual bool ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ) override;
virtual bool ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ) override;
virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const override;
virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const override;
virtual OUString GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const override;
virtual OUString GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const override;
virtual vcl::Window* GetWindowInstance() override;
virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const override;
virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::vcl::AccessibleBrowseBoxObjType _eType ) const override;
virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumn ) const override;
virtual void GrabTableFocus() override;
@@ -230,19 +230,18 @@ public:
virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, MetricVector& rVector ) override;
// Window
virtual tools::Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const override;
virtual tools::Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const override;
virtual void GrabFocus() override;
virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible() override;
virtual vcl::Window* GetAccessibleParentWindow() const override;
/** Creates and returns the accessible object of the whole BrowseBox. */
virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
virtual vcl::Window* GetAccessibleParentWindow() const override;
virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override;
virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override;
virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override;
};
#endif // INCLUDED_SVTOOLS_SVTABBX_HXX
#endif // INCLUDED_VCL_SVTABBX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

Some files were not shown because too many files have changed in this diff Show More