[Libreoffice-commits] core.git: accessibility/inc accessibility/Library_acc.mk accessibility/source basctl/source basctl/uiconfig chart2/source chart2/uiconfig compilerplugins/clang cui/source cui/uiconfig dbaccess/source dbaccess/uiconfig desktop/source extensions/source extras/source filter/source filter/uiconfig fpicker/source include/sfx2 include/svtools include/svx include/toolkit include/tools include/vcl reportdesign/inc sc/source sfx2/source solenv/clang-format svtools/inc svtools/Library_svt.mk svtools/source svx/inc svx/source sw/inc sw/source sw/uiconfig toolkit/source vcl/inc vcl/Library_vcl.mk vcl/source vcl/unx xmlsecurity/inc
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Nov 21 21:08:36 UTC 2018
accessibility/Library_acc.mk | 2
accessibility/inc/extended/AccessibleBrowseBox.hxx | 16
accessibility/inc/extended/AccessibleBrowseBoxBase.hxx | 28 -
accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx | 2
accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx | 8
accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx | 6
accessibility/inc/extended/AccessibleBrowseBoxTable.hxx | 2
accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx | 4
accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx | 2
accessibility/inc/extended/AccessibleGridControl.hxx | 12
accessibility/inc/extended/AccessibleGridControlBase.hxx | 18
accessibility/inc/extended/AccessibleGridControlHeader.hxx | 8
accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx | 4
accessibility/inc/extended/AccessibleGridControlTable.hxx | 2
accessibility/inc/extended/AccessibleGridControlTableBase.hxx | 4
accessibility/inc/extended/AccessibleGridControlTableCell.hxx | 8
accessibility/inc/extended/accessiblebrowseboxcell.hxx | 7
accessibility/inc/extended/accessibleeditbrowseboxcell.hxx | 6
accessibility/inc/extended/accessibletablistbox.hxx | 6
accessibility/inc/pch/precompiled_acc.hxx | 8
accessibility/inc/standard/vclxaccessibleheaderbar.hxx | 24
accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx | 6
accessibility/source/extended/AccessibleBrowseBox.cxx | 36 -
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 34 -
accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx | 6
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 9
accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx | 8
accessibility/source/extended/AccessibleBrowseBoxTable.cxx | 12
accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 6
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx | 12
accessibility/source/extended/AccessibleGridControl.cxx | 16
accessibility/source/extended/AccessibleGridControlBase.cxx | 14
accessibility/source/extended/AccessibleGridControlHeader.cxx | 29 -
accessibility/source/extended/AccessibleGridControlHeaderCell.cxx | 7
accessibility/source/extended/AccessibleGridControlTable.cxx | 7
accessibility/source/extended/AccessibleGridControlTableBase.cxx | 7
accessibility/source/extended/AccessibleGridControlTableCell.cxx | 13
accessibility/source/extended/accessiblebrowseboxcell.cxx | 8
accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 4
accessibility/source/extended/accessibletablistbox.cxx | 7
accessibility/source/extended/accessibletablistboxtable.cxx | 2
accessibility/source/helper/acc_factory.cxx | 92 +--
accessibility/source/standard/vclxaccessibleheaderbar.cxx | 22
accessibility/source/standard/vclxaccessibleheaderbaritem.cxx | 4
basctl/source/basicide/baside2.hxx | 4
basctl/source/basicide/moduldlg.hxx | 2
basctl/uiconfig/basicide/ui/basicmacrodialog.ui | 22
chart2/source/controller/dialogs/tp_DataSource.hxx | 2
chart2/uiconfig/ui/tp_ChartType.ui | 8
chart2/uiconfig/ui/tp_DataSource.ui | 2
compilerplugins/clang/unusedenumconstants.py | 2
cui/source/dialogs/linkdlg.cxx | 2
cui/source/inc/acccfg.hxx | 2
cui/source/inc/autocdlg.hxx | 2
cui/source/inc/cfgutil.hxx | 2
cui/source/inc/headertablistbox.hxx | 5
cui/source/inc/linkdlg.hxx | 2
cui/source/options/dbregister.cxx | 2
cui/source/options/optHeaderTabListbox.cxx | 2
cui/source/options/optcolor.cxx | 2
cui/source/options/optinet2.hxx | 4
cui/source/options/optpath.cxx | 2
cui/uiconfig/ui/acorreplacepage.ui | 2
cui/uiconfig/ui/baselinksdialog.ui | 2
cui/uiconfig/ui/editdictionarydialog.ui | 2
cui/uiconfig/ui/javaclasspathdialog.ui | 8
cui/uiconfig/ui/numberingformatpage.ui | 12
dbaccess/source/ui/browser/sbagrid.cxx | 4
dbaccess/source/ui/inc/sbagrid.hxx | 2
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 4
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 2
dbaccess/uiconfig/ui/sqlexception.ui | 8
desktop/source/deployment/gui/dp_gui.h | 4
extensions/source/bibliography/datman.cxx | 4
extras/source/glade/libreoffice-catalog.xml.in | 4
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 2
filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 2
filter/uiconfig/ui/warnpdfdialog.ui | 10
fpicker/source/office/PlacesListBox.cxx | 2
fpicker/source/office/PlacesListBox.hxx | 2
fpicker/source/office/iodlg.cxx | 2
fpicker/source/office/iodlgimp.cxx | 2
include/sfx2/dinfdlg.hxx | 2
include/svtools/brwbox.hxx | 21
include/svtools/brwhead.hxx | 2
include/svtools/simptabl.hxx | 4
include/svx/ctredlin.hxx | 2
include/svx/fmgridcl.hxx | 4
include/svx/fontlb.hxx | 2
include/toolkit/awt/vclxwindows.hxx | 10
include/toolkit/helper/accessiblefactory.hxx | 6
include/tools/wintypes.hxx | 3
include/vcl/AccessibleBrowseBoxObjType.hxx | 10
include/vcl/accessiblefactory.hxx | 45 -
include/vcl/accessibletable.hxx | 12
include/vcl/accessibletableprovider.hxx | 23
include/vcl/builder.hxx | 4
include/vcl/headbar.hxx | 36 -
include/vcl/svimpbox.hxx | 4
include/vcl/svtabbx.hxx | 33 -
include/vcl/svtaccessiblefactory.hxx | 17
include/vcl/treelistbox.hxx | 5
include/vcl/weld.hxx | 5
reportdesign/inc/pch/precompiled_rptui.hxx | 4
sc/source/ui/view/gridwin.cxx | 2
sfx2/source/inc/versdlg.hxx | 2
solenv/clang-format/blacklist | 28 -
svtools/Library_svt.mk | 5
svtools/inc/pch/precompiled_svt.hxx | 4
svtools/inc/table/tablecontrol.hxx | 14
svtools/source/brwbox/brwbox1.cxx | 12
svtools/source/brwbox/brwbox3.cxx | 75 +-
svtools/source/brwbox/brwimpl.hxx | 8
svtools/source/brwbox/editbrowsebox2.cxx | 4
svtools/source/contnr/fileview.cxx | 12
svtools/source/contnr/imivctl.hxx | 6
svtools/source/control/tabbar.cxx | 4
svtools/source/edit/textwindowpeer.cxx | 4
svtools/source/table/tablecontrol.cxx | 50 -
svtools/source/table/tablecontrol_impl.hxx | 6
svx/inc/pch/precompiled_svxcore.hxx | 4
svx/source/fmcomp/fmgridcl.cxx | 12
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 2
sw/inc/pch/precompiled_swui.hxx | 8
sw/source/ui/chrdlg/swuiccoll.cxx | 262 ++++------
sw/source/ui/config/mailconfigpage.cxx | 4
sw/source/ui/dbui/addresslistdialog.hxx | 4
sw/source/ui/dbui/mmaddressblockpage.hxx | 2
sw/source/ui/inc/mmresultdialogs.hxx | 4
sw/source/ui/misc/bookmark.cxx | 2
sw/source/uibase/inc/glosbib.hxx | 2
sw/source/uibase/inc/swuiccoll.hxx | 43 -
sw/uiconfig/swriter/ui/conditionpage.ui | 124 +++-
toolkit/source/awt/vclxwindows.cxx | 12
toolkit/source/helper/accessibilityclient.cxx | 5
toolkit/source/helper/unowrapper.cxx | 2
vcl/Library_vcl.mk | 3
vcl/inc/strings.hrc | 4
vcl/source/app/salvtables.cxx | 60 +-
vcl/source/helper/svtaccessiblefactory.cxx | 36 -
vcl/source/treelist/headbar.cxx | 23
vcl/source/treelist/svtabbx.cxx | 62 +-
vcl/source/treelist/treelistbox.cxx | 21
vcl/source/window/builder.cxx | 16
vcl/unx/gtk3/gtk3gtkinst.cxx | 193 ++++---
xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx | 8
146 files changed, 1093 insertions(+), 1002 deletions(-)
New commits:
commit 47897fdd936d9b6e9ac8cb6110c79352ab080df7
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Nov 17 21:37:50 2018 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Nov 21 22:08:04 2018 +0100
weld SwCondCollPage
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 at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk
index bbec944079df..71acc97315aa 100644
--- a/accessibility/Library_acc.mk
+++ b/accessibility/Library_acc.mk
@@ -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 \
diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx
index 2f6c60f64f57..c0abfc8989c2 100644
--- a/accessibility/inc/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx
@@ -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() );
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index 64c9636e9be5..99fb010e5f82 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -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;
}
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index 0a579376649b..d0edc3af1057 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -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,
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
index 72358475d880..eef541c0caaf 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
@@ -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;
}
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
index e1aae2311957..a0f2c140d16d 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
@@ -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
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
index adc877bc27e8..04e26a28618b 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
@@ -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;
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
index ac98a503b9c0..b74e95969f49 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
@@ -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;
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
index 63229c19b3ce..40acc768917c 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
@@ -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,
diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx
index 3968c3e07e33..4d09a3b9d2af 100644
--- a/accessibility/inc/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/extended/AccessibleGridControl.hxx
@@ -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
diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx
index 2c9cbd42fae1..4e4f86ebba1f 100644
--- a/accessibility/inc/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx
@@ -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;
}
diff --git a/accessibility/inc/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
index b0046627b528..b487b00820c6 100644
--- a/accessibility/inc/extended/AccessibleGridControlHeader.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
@@ -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;
}
diff --git a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
index 00076df2a484..a47c04770055 100644
--- a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
@@ -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;
diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx
index 18627c22e021..0a20021bc1ac 100644
--- a/accessibility/inc/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx
@@ -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;
diff --git a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
index 8df02ca1c88e..4928573ef894 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
@@ -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;
diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
index 6af2e021e5c0..dfbd4a49228b 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
@@ -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);
diff --git a/accessibility/inc/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
index be139a494b16..0f4e291c7657 100644
--- a/accessibility/inc/extended/accessiblebrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessiblebrowseboxcell.hxx
@@ -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;
diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
index 3713c6d162a7..5c4025de4e87 100644
--- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
@@ -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
);
diff --git a/accessibility/inc/extended/accessibletablistbox.hxx b/accessibility/inc/extended/accessibletablistbox.hxx
index 1c56d867bd33..10777aad97a8 100644
--- a/accessibility/inc/extended/accessibletablistbox.hxx
+++ b/accessibility/inc/extended/accessibletablistbox.hxx
@@ -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:
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx
index 064002780e2a..bfcd9876a129 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -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>
diff --git a/svtools/inc/vclxaccessibleheaderbar.hxx b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx
similarity index 81%
rename from svtools/inc/vclxaccessibleheaderbar.hxx
rename to accessibility/inc/standard/vclxaccessibleheaderbar.hxx
index e13ef9fb317d..9a6c74a6177c 100644
--- a/svtools/inc/vclxaccessibleheaderbar.hxx
+++ b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx
@@ -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: */
diff --git a/svtools/inc/vclxaccessibleheaderbaritem.hxx b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
similarity index 94%
rename from svtools/inc/vclxaccessibleheaderbaritem.hxx
rename to accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
index e4b09ef3a655..aa22e6259628 100644
--- a/svtools/inc/vclxaccessibleheaderbaritem.hxx
+++ b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
@@ -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: */
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index 74f9f5903112..f6ffe537e981 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -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 )
{
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 8004451c1e2c..9759737c0759 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -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 )
{
diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
index 9deadb49f409..3ce5479b207e 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
@@ -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)
{
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index 0a8ac6fa3d70..15ba28a03a52 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -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 -------------------------------------------------------
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
index 15318b079f4a..8037c3386e21 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -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);
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index 7235d52c7405..c9d296bc1b49 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -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()
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
index b881cc468105..9387b39b5ddb 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
@@ -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 )
{
}
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index 305a0607a657..53c1a7aa2faa 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -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( )
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index c6554d2f00cf..fe050cef4c20 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -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 )
{
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index dbf25022ca35..5a870ff41814 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -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 )
{
}
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index 296e236e2a5a..b28cbdeba4c1 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -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;
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
index 34a1294811ba..d2d47cbcce27 100644
--- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
@@ -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,
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 505c2cb77e52..6e5e9d6def79 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -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 {
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index 68bee622413d..b34a207d1bdf 100644
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -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 {
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index db605e334e62..3eed001d8df0 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -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 )
diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx
index abf3a4cf382a..6240238379bf 100644
--- a/accessibility/source/extended/accessiblebrowseboxcell.cxx
+++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx
@@ -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 );
}
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index ff5ddbde89eb..67e9ea8ce464 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -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 )
diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx
index ddbc03825c92..4ed0b54b90bd 100644
--- a/accessibility/source/extended/accessibletablistbox.cxx
+++ b/accessibility/source/extended/accessibletablistbox.cxx
@@ -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();
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index d062145a698c..8c8dd1156b2f 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -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>
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 9ce18c4924f3..aeca8b5d40ad 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -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();
@@ -106,21 +106,23 @@ public:
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*
@@ -146,16 +148,22 @@ public:
) 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;
}
diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/accessibility/source/standard/vclxaccessibleheaderbar.cxx
similarity index 91%
rename from svtools/source/control/vclxaccessibleheaderbar.cxx
rename to accessibility/source/standard/vclxaccessibleheaderbar.cxx
index 1c79039eddeb..07ddf5e8e80b 100644
--- a/svtools/source/control/vclxaccessibleheaderbar.cxx
+++ b/accessibility/source/standard/vclxaccessibleheaderbar.cxx
@@ -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)
diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
similarity index 98%
rename from svtools/source/control/vclxaccessibleheaderbaritem.cxx
rename to accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
index 11b0f7446b4b..250ea22f43dc 100644
--- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx
+++ b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
@@ -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>
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index ab46e7de04d2..e0fcac4fa8af 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -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>
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index 3da0ff1a9d2e..38715d017e42 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -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>
diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
index 9548679d2c47..4fbaa0ff41c3 100644
--- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
+++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui
@@ -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>
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index 4d2acf859360..5798894621bd 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -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>
diff --git a/chart2/uiconfig/ui/tp_ChartType.ui b/chart2/uiconfig/ui/tp_ChartType.ui
index 9e00c321d4ff..c31abe35b41e 100644
--- a/chart2/uiconfig/ui/tp_ChartType.ui
+++ b/chart2/uiconfig/ui/tp_ChartType.ui
@@ -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>
diff --git a/chart2/uiconfig/ui/tp_DataSource.ui b/chart2/uiconfig/ui/tp_DataSource.ui
index d8d589f0790e..a1fe9453fea1 100644
--- a/chart2/uiconfig/ui/tp_DataSource.ui
+++ b/chart2/uiconfig/ui/tp_DataSource.ui
@@ -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>
diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py
index 2a2251776a17..ded7f4f8b1aa 100755
--- a/compilerplugins/clang/unusedenumconstants.py
+++ b/compilerplugins/clang/unusedenumconstants.py
@@ -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)
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 2b674be5e0d2..4dbc6dce8a93 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -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>
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index e01aebc45792..166c43d7264a 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -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>
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index d963f48ca1b7..55e1fed825ac 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -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>
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 89e0a0e46033..40661fc20733 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -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>
diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index bab7574d570c..16bad69f85d3 100644
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@ -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
{
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index d9ca0bc67db4..0bd2e64f13bf 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -29,7 +29,7 @@
#include <vcl/fixedhyper.hxx>
#include <svtools/svmedit.hxx>
-#include <svtools/svtabbx.hxx>
+#include <vcl/svtabbx.hxx>
/********************** SvUpdateLinksDialog ******************************
*************************************************************************/
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index e81a66e877a4..18405c4a97ff 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -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>
diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index 23782de05d04..986f5ac4f164 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -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>
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index f33c83cf78b0..296d6c19e3b9 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -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>
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index ec6bcf47da1c..4e199a4d1bbd 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -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;
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 3cec044d3a14..22968fcada98 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -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>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list