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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk
index bbec944..71acc97 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 2f6c60f..c0abfc8 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 64c9636..99fb010 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 0a57937..d0edc3af 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 7235847..eef541c 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 e1aae23..a0f2c14 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 adc877b..04e26a2 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 ac98a50..b74e959 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 63229c1..40acc76 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 3968c3e..4d09a3b 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 2c9cbd4..4e4f86e 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 b004662..b487b00 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 00076df..a47c047 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 18627c2..0a20021 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 8df02ca..4928573 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 6af2e02..dfbd4a4 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 be139a4..0f4e291 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 3713c6d..5c4025d 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 1c56d86..10777aad 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 0640027..bfcd987 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 80%
rename from svtools/inc/vclxaccessibleheaderbar.hxx
rename to accessibility/inc/standard/vclxaccessibleheaderbar.hxx
index e13ef9f..9a6c74a 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 e4b09ef..aa22e62 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 74f9f59..f6ffe53 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 8004451..9759737 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 9deadb4..3ce5479 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 0a8ac6f..15ba28a 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 15318b0..8037c33 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 7235d52..c9d296b 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 b881cc4..9387b39 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 305a060..53c1a7a 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 c6554d2..fe050ce 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 dbf2502..5a870ff 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 296e236..b28cbde 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 34a1294..d2d47cb 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 505c2cb..6e5e9d6 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 68bee622..b34a207 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 db605e3..3eed001 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 abf3a4c..6240238 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 ff5ddbd..67e9ea8 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 ddbc038..4ed0b54 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 d062145..8c8dd11 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 9ce18c4..aeca8b5 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 90%
rename from svtools/source/control/vclxaccessibleheaderbar.cxx
rename to accessibility/source/standard/vclxaccessibleheaderbar.cxx
index 1c79039..07ddf5e 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 11b0f74..250ea22 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 ab46e7d..e0fcac4 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 3da0ff1..38715d0 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 9548679..4fbaa0f 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 4d2acf8..5798894 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 9e00c32..c31abe3 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 d8d589f..a1fe945 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 2a22517..ded7f4f 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 2b674be..4dbc6dc 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 e01aebc..166c43d 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 d963f48..55e1fed 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 89e0a0e..40661fc 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 bab7574..16bad69 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 d9ca0bc..0bd2e64f 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 e81a66e..18405c4 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 23782de..986f5ac 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 f33c83c..296d6c1 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 ec6bcf4..4e199a4 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 3cec044..22968fc 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>
#include <tools/urlobj.hxx>
#include <vcl/svapp.hxx>
diff --git a/cui/uiconfig/ui/acorreplacepage.ui b/cui/uiconfig/ui/acorreplacepage.ui
index b33dafb..6ab79ee 100644
--- a/cui/uiconfig/ui/acorreplacepage.ui
+++ b/cui/uiconfig/ui/acorreplacepage.ui
@@ -71,7 +71,7 @@
</packing>
</child>
<child>
<object class="svtlo-SvTabListBox" id="tabview:border">
<object class="vcllo-SvTabListBox" id="tabview:border">
<property name="width_request">1</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
diff --git a/cui/uiconfig/ui/baselinksdialog.ui b/cui/uiconfig/ui/baselinksdialog.ui
index 76c2dda..2573d73 100644
--- a/cui/uiconfig/ui/baselinksdialog.ui
+++ b/cui/uiconfig/ui/baselinksdialog.ui
@@ -184,7 +184,7 @@
</packing>
</child>
<child>
<object class="svtlo-SvTabListBox" id="TB_LINKS:border">
<object class="vcllo-SvTabListBox" id="TB_LINKS:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/editdictionarydialog.ui b/cui/uiconfig/ui/editdictionarydialog.ui
index aacdc9d..e95e7b0 100644
--- a/cui/uiconfig/ui/editdictionarydialog.ui
+++ b/cui/uiconfig/ui/editdictionarydialog.ui
@@ -213,7 +213,7 @@
</packing>
</child>
<child>
<object class="svtlo-SvTabListBox" id="words:border">
<object class="vcllo-SvTabListBox" id="words:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
diff --git a/cui/uiconfig/ui/javaclasspathdialog.ui b/cui/uiconfig/ui/javaclasspathdialog.ui
index 130fd4b..d330fa1 100644
--- a/cui/uiconfig/ui/javaclasspathdialog.ui
+++ b/cui/uiconfig/ui/javaclasspathdialog.ui
@@ -4,12 +4,12 @@
<requires lib="gtk+" version="3.18"/>
<object class="GtkTreeStore" id="liststore1">
<columns>
<!-- column-name image -->
<column type="GdkPixbuf"/>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
<!-- column-name image -->
<column type="GdkPixbuf"/>
</columns>
</object>
<object class="GtkDialog" id="JavaClassPath">
@@ -138,7 +138,7 @@
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext1"/>
<attributes>
<attribute name="pixbuf">2</attribute>
<attribute name="pixbuf">0</attribute>
</attributes>
</child>
</object>
@@ -148,7 +148,7 @@
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
<attribute name="text">0</attribute>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
diff --git a/cui/uiconfig/ui/numberingformatpage.ui b/cui/uiconfig/ui/numberingformatpage.ui
index e454bbd..def161ea9 100644
--- a/cui/uiconfig/ui/numberingformatpage.ui
+++ b/cui/uiconfig/ui/numberingformatpage.ui
@@ -38,12 +38,6 @@
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
<!-- column-name image -->
<column type="GdkPixbuf"/>
<!-- column-name image -->
<column type="CairoSurface"/>
<!-- column-name textcolor -->
<column type="GdkRGBA"/>
</columns>
</object>
<object class="GtkTreeStore" id="liststore3">
@@ -52,10 +46,6 @@
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
<!-- column-name image -->
<column type="GdkPixbuf"/>
<!-- column-name image -->
<column type="CairoSurface"/>
<!-- column-name textcolor -->
<column type="GdkRGBA"/>
</columns>
@@ -529,7 +519,7 @@
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
<attribute name="text">0</attribute>
<attribute name="foreground-rgba">4</attribute>
<attribute name="foreground-rgba">2</attribute>
</attributes>
</child>
</object>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 041bfc6..47cc3d5 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -1460,10 +1460,10 @@ IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent, void*, void)
m_aDataDescriptor.clear();
}
OUString SbaGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition) const
OUString SbaGridControl::GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition) const
{
OUString sRet;
if ( ::svt::BBTYPE_BROWSEBOX == eObjType )
if ( ::vcl::BBTYPE_BROWSEBOX == eObjType )
{
SolarMutexGuard aGuard;
sRet = DBA_RES(STR_DATASOURCE_GRIDCONTROL_DESC);
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index c1e920b..1629fbd 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -239,7 +239,7 @@ namespace dbaui
@return
The description of the specified object.
*/
virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
virtual OUString GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
using FmGridControl::DeleteSelectedRows;
/** copies the currently selected rows to the clipboard
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 87754ae..e611e59 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -2559,12 +2559,12 @@ OUString OSelectionBrowseBox::GetRowDescription( sal_Int32 _nRow ) const
return aLabel.getToken(nToken, ';');
}
OUString OSelectionBrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition) const
OUString OSelectionBrowseBox::GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition) const
{
OUString sRetText;
switch( _eObjType )
{
case ::svt::BBTYPE_ROWHEADERCELL:
case ::vcl::BBTYPE_ROWHEADERCELL:
sRetText = GetRowDescription(_nPosition);
break;
default:
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index 7d57074..42c418e 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -170,7 +170,7 @@ namespace dbaui
@return
The name of the specified object.
*/
virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
virtual OUString GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
// IAccessibleTableProvider
/** Creates the accessible object of a data table cell.
diff --git a/dbaccess/uiconfig/ui/sqlexception.ui b/dbaccess/uiconfig/ui/sqlexception.ui
index 488f78e..86521e0 100644
--- a/dbaccess/uiconfig/ui/sqlexception.ui
+++ b/dbaccess/uiconfig/ui/sqlexception.ui
@@ -6,10 +6,10 @@
<columns>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
<!-- column-name image -->
<column type="GdkPixbuf"/>
<!-- column-name id -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkDialog" id="SQLExceptionDialog">
@@ -137,7 +137,7 @@
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext1"/>
<attributes>
<attribute name="pixbuf">2</attribute>
<attribute name="pixbuf">0</attribute>
</attributes>
</child>
</object>
@@ -147,7 +147,7 @@
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
<attribute name="text">0</attribute>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h
index e60109a..62d3311 100644
--- a/desktop/source/deployment/gui/dp_gui.h
+++ b/desktop/source/deployment/gui/dp_gui.h
@@ -30,8 +30,8 @@
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <salhelper/simplereferenceobject.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/headbar.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <com/sun/star/ucb/XContentEventListener.hpp>
#include <osl/mutex.hxx>
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 67e94a0..e7de2bc 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -49,8 +49,8 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <svl/urihelper.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/headbar.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index 294ed10..a02836e 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -312,11 +312,11 @@
<glade-widget-class title="Animation ListBox" name="sdlo-CustomAnimationList"
generic-name="Animation ListBox" parent="vcllo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Tab List" name="svtlo-SvTabListBox"
<glade-widget-class title="Tab List" name="vcllo-SvTabListBox"
generic-name="Tab List" parent="vcllo-SvTreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="CheckBox List" name="basctllo-CheckBox"
generic-name="CheckBox List" parent="svtlo-SvTabListBox"
generic-name="CheckBox List" parent="vcllo-SvTabListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="SwIdxTreeListBox" name="swuilo-SwIdxTreeListBox"
generic-name="SwIdxTreeListBox" parent="vcllo-SvTreeListBox"
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 0caa32e..f1d8232 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -26,7 +26,7 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <unotools/resmgr.hxx>
#include <tools/urlobj.hxx>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <unotools/streamwrap.hxx>
#include <unotools/pathoptions.hxx>
#include <osl/file.hxx>
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 428f5039..816e75a 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -26,7 +26,7 @@
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <vcl/layout.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <svl/poolitem.hxx>
#include <unotools/moduleoptions.hxx>
diff --git a/filter/uiconfig/ui/warnpdfdialog.ui b/filter/uiconfig/ui/warnpdfdialog.ui
index ef3c80e..6a26ff7 100644
--- a/filter/uiconfig/ui/warnpdfdialog.ui
+++ b/filter/uiconfig/ui/warnpdfdialog.ui
@@ -6,10 +6,10 @@
<columns>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
<!-- column-name image -->
<column type="GdkPixbuf"/>
<!-- column-name id -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkMessageDialog" id="WarnPDFDialog">
@@ -82,7 +82,7 @@
<property name="model">liststore1</property>
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="search_column">0</property>
<property name="search_column">1</property>
<property name="show_expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
@@ -92,7 +92,7 @@
<child>
<object class="GtkCellRendererPixbuf" id="cellrenderertext1"/>
<attributes>
<attribute name="pixbuf">2</attribute>
<attribute name="pixbuf">0</attribute>
</attributes>
</child>
</object>
@@ -102,7 +102,7 @@
<child>
<object class="GtkCellRendererText" id="cellrenderertext2"/>
<attributes>
<attribute name="text">0</attribute>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index dba49d2..50bcb58 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -10,7 +10,7 @@
#include "PlacesListBox.hxx"
#include <svtools/PlaceEditDialog.hxx>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <bitmaps.hlst>
#define COLUMN_NAME 1
diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx
index 605f344..ced1c86 100644
--- a/fpicker/source/office/PlacesListBox.hxx
+++ b/fpicker/source/office/PlacesListBox.hxx
@@ -12,7 +12,7 @@
#include "iodlg.hxx"
#include <svtools/place.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <memory>
#include <vector>
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 3524256..3977368 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -39,7 +39,7 @@
#include <unotools/viewoptions.hxx>
#include <svtools/fileview.hxx>
#include <svtools/sfxecode.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/treelistentry.hxx>
#include <fpicker/strings.hrc>
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 171bc3d..2efcf41 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -18,7 +18,7 @@
*/
#include "iodlgimp.hxx"
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <tools/debug.hxx>
#include <unotools/resmgr.hxx>
#include <tools/urlobj.hxx>
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 4b3e576..72ba726 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -29,7 +29,7 @@
#include <svl/stritem.hxx>
#include <svl/zforlist.hxx>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <svtools/svmedit.hxx>
#include <unotools/syslocale.hxx>
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index e300fe9..ba09a67 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -24,10 +24,10 @@
#include <vcl/ctrl.hxx>
#include <vcl/vclptr.hxx>
#include <tools/multisel.hxx>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <vcl/transfer.hxx>
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <vector>
#include <stack>
@@ -42,13 +42,16 @@ class BrowserHeader;
namespace svt {
class BrowseBoxImpl;
class IAccessibleFactory;
}
namespace utl {
class AccessibleStateSetHelper;
}
namespace vcl {
class IAccessibleFactory;
}
#define BROWSER_INVALIDID SAL_MAX_UINT16
#define BROWSER_ENDOFSELECTION (static_cast<long>(SFX_ENDOFSELECTION))
@@ -186,7 +189,7 @@ class SVT_DLLPUBLIC BrowseBox
:public Control
,public DragSourceHelper
,public DropTargetHelper
,public svt::IAccessibleTableProvider
,public vcl::IAccessibleTableProvider
{
friend class BrowserDataWin;
friend class ::svt::BrowseBoxImpl;
@@ -309,7 +312,7 @@ private:
protected:
/// retrieves the XAccessible implementation associated with the BrowseBox instance
::svt::IAccessibleFactory& getAccessibleFactory();
::vcl::IAccessibleFactory& getAccessibleFactory();
protected:
sal_uInt16 ColCount() const;
@@ -706,7 +709,7 @@ public:
@return
The name of the specified object.
*/
virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
virtual OUString GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
/** return the description of the specified object.
@param eObjType
@@ -716,7 +719,7 @@ public:
@return
The description of the specified object.
*/
virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
virtual OUString GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
/** @return The header text of the specified row. */
virtual OUString GetRowDescription( sal_Int32 nRow ) const override;
@@ -728,7 +731,7 @@ public:
the accessible object), depending on the specified object type. */
virtual void FillAccessibleStateSet(
::utl::AccessibleStateSetHelper& rStateSet,
::svt::AccessibleBrowseBoxObjType eObjType ) const override;
::vcl::AccessibleBrowseBoxObjType eObjType ) const override;
/** Fills the StateSet with all states for one cell (except DEFUNC and SHOWING, done by
the accessible object). */
diff --git a/include/svtools/brwhead.hxx b/include/svtools/brwhead.hxx
index 0520007..082e9c1 100644
--- a/include/svtools/brwhead.hxx
+++ b/include/svtools/brwhead.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SVTOOLS_BRWHEAD_HXX
#include <svtools/svtdllapi.h>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
class BrowseBox;
diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index 9f5ff8c..d94b717 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -21,8 +21,8 @@
#define INCLUDED_SVTOOLS_SIMPTABL_HXX
#include <svtools/svtdllapi.h>
#include <svtools/headbar.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <vcl/svtabbx.hxx>
#include <unotools/intlwrapper.hxx>
#include <unotools/collatorwrapper.hxx>
#include <vcl/commandevent.hxx>
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 72cfe20..78eaed2 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -25,7 +25,7 @@
#include <svx/svxdllapi.h>
#include <svtools/simptabl.hxx>
#include <vcl/svlbitm.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/treelistbox.hxx>
#include <vcl/treelistentry.hxx>
#include <tools/color.hxx>
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index 39cb7c7..6eb98eb7 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -133,7 +133,7 @@ public:
@return
The name of the specified object.
*/
virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
virtual OUString GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
/** return the description of the specified object.
@param eObjType
@@ -143,7 +143,7 @@ public:
@return
The description of the specified object.
*/
virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
virtual OUString GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
protected:
virtual void Command(const CommandEvent& rEvt) override;
diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx
index 8cb9fed..d998780 100644
--- a/include/svx/fontlb.hxx
+++ b/include/svx/fontlb.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_FONTLB_HXX
#define INCLUDED_SVX_FONTLB_HXX
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/svlbitm.hxx>
#include <vcl/virdev.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index 58a3209..384bab4 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -1242,6 +1242,16 @@ public:
virtual ~VCLXToolBox() override;
};
class VCLXHeaderBar : public VCLXWindow
{
public:
VCLXHeaderBar();
virtual ~VCLXHeaderBar() override;
virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override;
};
#endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/accessiblefactory.hxx b/include/toolkit/helper/accessiblefactory.hxx
index 8a54833..5a52d97 100644
--- a/include/toolkit/helper/accessiblefactory.hxx
+++ b/include/toolkit/helper/accessiblefactory.hxx
@@ -38,6 +38,7 @@ class VCLXScrollBar;
class VCLXEdit;
class VCLXComboBox;
class VCLXToolBox;
class VCLXHeaderBar;
class VCLXWindow;
class Menu;
@@ -111,6 +112,11 @@ namespace toolkit
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleContext( VCLXToolBox* _pXWindow ) = 0;
/** creates an accessible context for a headerbar window
*/
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleContext( VCLXHeaderBar* _pXWindow ) = 0;
/** creates an accessible context for a generic window
*/
virtual css::uno::Reference< css::accessibility::XAccessibleContext >
diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index baa8119..f3ac395 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -99,7 +99,8 @@ enum class WindowType : sal_uInt16
DOCKINGAREA ,
RULER , // 70 (374)
CALCINPUTLINE ,
LAST = CALCINPUTLINE,
HEADERBAR ,
LAST = HEADERBAR,
// only used in vclxtoolkit.cxx
TOOLKIT_FRAMEWINDOW = 0x1000,
TOOLKIT_SYSTEMCHILDWINDOW = 0x1001,
diff --git a/include/svtools/AccessibleBrowseBoxObjType.hxx b/include/vcl/AccessibleBrowseBoxObjType.hxx
similarity index 92%
rename from include/svtools/AccessibleBrowseBoxObjType.hxx
rename to include/vcl/AccessibleBrowseBoxObjType.hxx
index 33e5433..28086d7 100644
--- a/include/svtools/AccessibleBrowseBoxObjType.hxx
+++ b/include/vcl/AccessibleBrowseBoxObjType.hxx
@@ -18,12 +18,10 @@
*/
#ifndef INCLUDED_SVTOOLS_ACCESSIBLEBROWSEBOXOBJTYPE_HXX
#define INCLUDED_SVTOOLS_ACCESSIBLEBROWSEBOXOBJTYPE_HXX
#ifndef INCLUDED_VCL_ACCESSIBLEBROWSEBOXOBJTYPE_HXX
#define INCLUDED_VCL_ACCESSIBLEBROWSEBOXOBJTYPE_HXX
namespace svt {
namespace vcl {
/** This enumeration contains a constant for each kind of accessible object of
a BrowseBox. */
@@ -39,10 +37,8 @@ enum AccessibleBrowseBoxObjType
BBTYPE_CHECKBOXCELL /// A cell with a checkbox.
};
} // namespace svt
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/accessiblefactory.hxx b/include/vcl/accessiblefactory.hxx
similarity index 83%
rename from include/svtools/accessiblefactory.hxx
rename to include/vcl/accessiblefactory.hxx
index 05c5715..8426333 100644
--- a/include/svtools/accessiblefactory.hxx
+++ b/include/vcl/accessiblefactory.hxx
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVTOOLS_ACCESSIBLEFACTORY_HXX
#define INCLUDED_SVTOOLS_ACCESSIBLEFACTORY_HXX
#ifndef INCLUDED_VCL_ACCESSIBLEFACTORY_HXX
#define INCLUDED_VCL_ACCESSIBLEFACTORY_HXX
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <com/sun/star/uno/Reference.hxx>
@@ -45,12 +45,8 @@ class VCLXWindow;
class TextEngine;
class TextView;
namespace svt
namespace vcl
{
class PanelTabBar;
namespace table
{
class IAccessibleTable;
@@ -72,16 +68,20 @@ namespace svt
class IAccessibleFactory : public virtual ::salhelper::SimpleReferenceObject
{
public:
virtual IAccessibleTabListBox*
virtual vcl::IAccessibleTabListBox*
createAccessibleTabListBox(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
SvHeaderTabListBox& rBox
) const = 0;
virtual IAccessibleBrowseBox*
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleTreeListBox(
SvTreeListBox& _rListBox,
const css::uno::Reference< css::accessibility::XAccessible >& _xParent
) const = 0;
virtual vcl::IAccessibleBrowseBox*
createAccessibleBrowseBox(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
IAccessibleTableProvider& _rBrowseBox
vcl::IAccessibleTableProvider& _rBrowseBox
) const = 0;
virtual table::IAccessibleTableControl*
createAccessibleTableControl(
@@ -108,14 +108,14 @@ namespace svt
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleBrowseBoxHeaderBar(
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
IAccessibleTableProvider& _rOwningTable,
AccessibleBrowseBoxObjType _eObjType
vcl::IAccessibleTableProvider& _rOwningTable,
vcl::AccessibleBrowseBoxObjType _eObjType
) const = 0;
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleBrowseBoxTableCell(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
IAccessibleTableProvider& _rBrowseBox,
vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
sal_Int32 _nRowId,
sal_uInt16 _nColId,
@@ -126,15 +126,15 @@ namespace svt
createAccessibleBrowseBoxHeaderCell(
sal_Int32 _nColumnRowId,
const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
IAccessibleTableProvider& _rBrowseBox,
vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
AccessibleBrowseBoxObjType _eObjType
vcl::AccessibleBrowseBoxObjType _eObjType
) const = 0;
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleCheckBoxCell(
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
IAccessibleTableProvider& _rBrowseBox,
vcl::IAccessibleTableProvider& _rBrowseBox,
const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos,
@@ -147,7 +147,7 @@ namespace svt
const css::uno::Reference< css::accessibility::XAccessible >& _rxParent,
const css::uno::Reference< css::accessibility::XAccessible >& _rxControlAccessible,
const css::uno::Reference< css::awt::XWindow >& _rxFocusWindow,
IAccessibleTableProvider& _rBrowseBox,
vcl::IAccessibleTableProvider& _rBrowseBox,
sal_Int32 _nRowPos,
sal_uInt16 _nColPos
) const = 0;
@@ -156,10 +156,9 @@ namespace svt
virtual ~IAccessibleFactory() override {}
};
} // namespace svt
} // namespace vcl
#endif // INCLUDED_SVTOOLS_ACCESSIBLEFACTORY_HXX
#endif // INCLUDED_VCL_ACCESSIBLEFACTORY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/accessibletable.hxx b/include/vcl/accessibletable.hxx
similarity index 96%
rename from include/svtools/accessibletable.hxx
rename to include/vcl/accessibletable.hxx
index f24e296..d6c0dc3 100644
--- a/include/svtools/accessibletable.hxx
+++ b/include/vcl/accessibletable.hxx
@@ -17,15 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVTOOLS_ACCESSIBLETABLE_HXX
#define INCLUDED_SVTOOLS_ACCESSIBLETABLE_HXX
#ifndef INCLUDED_VCL_ACCESSIBLETABLE_HXX
#define INCLUDED_VCL_ACCESSIBLETABLE_HXX
#include <vcl/window.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
namespace svt{ namespace table
namespace vcl { namespace table
{
typedef sal_Int32 RowPos;
@@ -166,10 +165,9 @@ protected:
~IAccessibleTableControl() {}
};
} // namespace table
} // namespace svt
} // namespace vcl
#endif // INCLUDED_SVTOOLS_ACCESSIBLETABLE_HXX
#endif // INCLUDED_VCL_ACCESSIBLETABLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/accessibletableprovider.hxx b/include/vcl/accessibletableprovider.hxx
similarity index 94%
rename from include/svtools/accessibletableprovider.hxx
rename to include/vcl/accessibletableprovider.hxx
index 094c4a1..982ac62c 100644
--- a/include/svtools/accessibletableprovider.hxx
+++ b/include/vcl/accessibletableprovider.hxx
@@ -17,16 +17,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVTOOLS_ACCESSIBLETABLEPROVIDER_HXX
#define INCLUDED_SVTOOLS_ACCESSIBLETABLEPROVIDER_HXX
#ifndef INCLUDED_VCL_ACCESSIBLETABLEPROVIDER_HXX
#define INCLUDED_VCL_ACCESSIBLETABLEPROVIDER_HXX
#include <vcl/window.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
namespace svt
namespace vcl
{
#define OFFSET_DEFAULT (sal_Int32(-1))
@@ -103,10 +102,10 @@ public:
virtual bool ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ) = 0;
virtual bool ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ) = 0;
virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0;
virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0;
virtual OUString GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0;
virtual OUString GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const = 0;
virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const = 0;
virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::vcl::AccessibleBrowseBoxObjType _eType ) const = 0;
virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const = 0;
virtual void GrabTableFocus() = 0;
@@ -179,7 +178,7 @@ public:
/** returns the accessible object for the row or the column header bar
*/
virtual css::uno::Reference< css::accessibility::XAccessible >
getHeaderBar( ::svt::AccessibleBrowseBoxObjType _eObjType ) = 0;
getHeaderBar( ::vcl::AccessibleBrowseBoxObjType _eObjType ) = 0;
/** returns the accessible object for the table representation
*/
@@ -226,10 +225,8 @@ protected:
~IAccessibleBrowseBox() {}
};
} // namespace vcl
} // namespace svt
#endif // INCLUDED_SVTOOLS_ACCESSIBLETABLEPROVIDER_HXX
#endif // INCLUDED_VCL_ACCESSIBLETABLEPROVIDER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 5cc4c20..5fdb061f 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -38,7 +38,7 @@ class PopupMenu;
class SalInstanceBuilder;
class ScreenshotTest;
class ScrollBar;
class SvTreeListBox;
class SvTabListBox;
class Slider;
class DateField;
class TimeField;
@@ -220,7 +220,7 @@ private:
const ListStore* get_model_by_name(const OString& sID) const;
void mungeModel(ListBox &rTarget, const ListStore &rStore, sal_uInt16 nActiveId);
void mungeModel(ComboBox &rTarget, const ListStore &rStore, sal_uInt16 nActiveId);
void mungeModel(SvTreeListBox &rTarget, const ListStore &rStore, sal_uInt16 nActiveId);
void mungeModel(SvTabListBox &rTarget, const ListStore &rStore, sal_uInt16 nActiveId);
typedef stringmap TextBuffer;
const TextBuffer* get_buffer_by_name(const OString& sID) const;
diff --git a/include/svtools/headbar.hxx b/include/vcl/headbar.hxx
similarity index 93%
rename from include/svtools/headbar.hxx
rename to include/vcl/headbar.hxx
index 08203a2..046ad70 100644
--- a/include/svtools/headbar.hxx
+++ b/include/vcl/headbar.hxx
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVTOOLS_HEADBAR_HXX
#define INCLUDED_SVTOOLS_HEADBAR_HXX
#ifndef INCLUDED_VCL_HEADBAR_HXX
#define INCLUDED_VCL_HEADBAR_HXX
#include <svtools/svtdllapi.h>
#include <vcl/dllapi.h>
#include <tools/link.hxx>
#include <vcl/window.hxx>
#include <o3tl/typed_flags_set.hxx>
@@ -212,7 +212,7 @@ namespace o3tl
class VCLXHeaderBar;
class SVT_DLLPUBLIC HeaderBar : public vcl::Window
class VCL_DLLPUBLIC HeaderBar : public vcl::Window
{
private:
std::vector<std::unique_ptr<ImplHeadItem>> mvItemList;
@@ -243,22 +243,22 @@ private:
mxAccessible;
using Window::ImplInit;
SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle );
SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
SVT_DLLPRIVATE long ImplGetItemPos( sal_uInt16 nPos ) const;
SVT_DLLPRIVATE tools::Rectangle ImplGetItemRect( sal_uInt16 nPos ) const;
VCL_DLLPRIVATE void ImplInit( WinBits nWinStyle );
VCL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
VCL_DLLPRIVATE long ImplGetItemPos( sal_uInt16 nPos ) const;
VCL_DLLPRIVATE tools::Rectangle ImplGetItemRect( sal_uInt16 nPos ) const;
using Window::ImplHitTest;
SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, long& nMouseOff, sal_uInt16& nPos ) const;
SVT_DLLPRIVATE void ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos );
SVT_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh,
VCL_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, long& nMouseOff, sal_uInt16& nPos ) const;
VCL_DLLPRIVATE void ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos );
VCL_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh,
const tools::Rectangle& rItemRect, const tools::Rectangle* pRect);
SVT_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh,
VCL_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh,
const tools::Rectangle* pRect);
SVT_DLLPRIVATE void ImplUpdate( sal_uInt16 nPos,
VCL_DLLPRIVATE void ImplUpdate( sal_uInt16 nPos,
bool bEnd = false );
SVT_DLLPRIVATE void ImplStartDrag( const Point& rPos, bool bCommand );
SVT_DLLPRIVATE void ImplDrag( const Point& rPos );
SVT_DLLPRIVATE void ImplEndDrag( bool bCancel );
VCL_DLLPRIVATE void ImplStartDrag( const Point& rPos, bool bCommand );
VCL_DLLPRIVATE void ImplDrag( const Point& rPos );
VCL_DLLPRIVATE void ImplEndDrag( bool bCancel );
virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
@@ -326,10 +326,8 @@ public:
/** Creates and returns the accessible object of the header bar. */
virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
void SetAccessible( const css::uno::Reference< css::accessibility::XAccessible >& );
virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface( bool bCreate = true ) override;
};
#endif // INCLUDED_SVTOOLS_HEADBAR_HXX
#endif // INCLUDED_VCL_HEADBAR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/svimpbox.hxx b/include/vcl/svimpbox.hxx
index 1ce5681f..88c0688 100644
--- a/include/vcl/svimpbox.hxx
+++ b/include/vcl/svimpbox.hxx
@@ -23,6 +23,7 @@
#include <vcl/dllapi.h>
#include <vcl/seleng.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/svtaccessiblefactory.hxx>
#include <vcl/vclevent.hxx>
#include <unotools/intlwrapper.hxx>
#include <o3tl/enumarray.hxx>
@@ -100,6 +101,9 @@ private:
VclPtr<ScrollBar> aHorSBar;
VclPtr<ScrollBarBox> aScrBarBox;
::vcl::AccessibleFactoryAccess
m_aFactoryAccess;
static Image* s_pDefCollapsed;
static Image* s_pDefExpanded;
static oslInterlockedCount s_nImageRefCount; /// When 0 all static images will be destroyed
diff --git a/include/svtools/svtabbx.hxx b/include/vcl/svtabbx.hxx
similarity index 92%
rename from include/svtools/svtabbx.hxx
rename to include/vcl/svtabbx.hxx
index c33ccc5..a49ca16 100644
--- a/include/svtools/svtabbx.hxx
+++ b/include/vcl/svtabbx.hxx
@@ -16,12 +16,12 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVTOOLS_SVTABBX_HXX
#define INCLUDED_SVTOOLS_SVTABBX_HXX
#ifndef INCLUDED_VCL_SVTABBX_HXX
#define INCLUDED_VCL_SVTABBX_HXX
#include <svtools/svtdllapi.h>
#include <vcl/dllapi.h>
#include <vcl/treelistbox.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <memory>
#include <vector>
@@ -44,7 +44,7 @@ struct TabListBoxEventData
m_pEntry( pEntry ), m_nColumn( nColumn ), m_sOldText( rOldText ) {}
};
class SVT_DLLPUBLIC SvTabListBox : public SvTreeListBox
class VCL_DLLPUBLIC SvTabListBox : public SvTreeListBox
{
private:
std::vector<SvLBoxTab> mvTabList;
@@ -114,19 +114,19 @@ inline long SvTabListBox::GetTab( sal_uInt16 nTab ) const
// class SvHeaderTabListBox ---------------------------------------------------
class HeaderBar;
namespace svt {
namespace vcl {
class IAccessibleTabListBox;
struct SvHeaderTabListBoxImpl;
}
class SVT_DLLPUBLIC SvHeaderTabListBox : public SvTabListBox, public svt::IAccessibleTableProvider
class VCL_DLLPUBLIC SvHeaderTabListBox : public SvTabListBox, public vcl::IAccessibleTableProvider
{
private:
typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
bool m_bFirstPaint;
std::unique_ptr<::svt::SvHeaderTabListBoxImpl> m_pImpl;
::svt::IAccessibleTabListBox* m_pAccessible;
std::unique_ptr<::vcl::SvHeaderTabListBoxImpl> m_pImpl;
::vcl::IAccessibleTabListBox* m_pAccessible;
AccessibleChildren m_aAccessibleChildren;
DECL_DLLPRIVATE_LINK( ScrollHdl_Impl, SvTreeListBox*, void );
@@ -218,11 +218,11 @@ public:
virtual bool ConvertPointToRowHeader( sal_Int32& _rnRow, const Point& _rPoint ) override;
virtual bool ConvertPointToColumnHeader( sal_uInt16& _rnColPos, const Point& _rPoint ) override;
virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const override;
virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const override;
virtual OUString GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const override;
virtual OUString GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const override;
virtual vcl::Window* GetWindowInstance() override;
virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const override;
virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::vcl::AccessibleBrowseBoxObjType _eType ) const override;
virtual void FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumn ) const override;
virtual void GrabTableFocus() override;
@@ -230,19 +230,18 @@ public:
virtual bool GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, MetricVector& rVector ) override;
// Window
virtual tools::Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const override;
virtual tools::Rectangle GetWindowExtentsRelative( vcl::Window *pRelativeWindow ) const override;
virtual void GrabFocus() override;
virtual css::uno::Reference< css::accessibility::XAccessible > GetAccessible() override;
virtual vcl::Window* GetAccessibleParentWindow() const override;
/** Creates and returns the accessible object of the whole BrowseBox. */
virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
virtual vcl::Window* GetAccessibleParentWindow() const override;
virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override;
virtual tools::Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) override;
virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) override;
};
#endif // INCLUDED_SVTOOLS_SVTABBX_HXX
#endif // INCLUDED_VCL_SVTABBX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/inc/svtaccessiblefactory.hxx b/include/vcl/svtaccessiblefactory.hxx
similarity index 82%
rename from svtools/source/inc/svtaccessiblefactory.hxx
rename to include/vcl/svtaccessiblefactory.hxx
index 7469d2d..24ad85f 100644
--- a/svtools/source/inc/svtaccessiblefactory.hxx
+++ b/include/vcl/svtaccessiblefactory.hxx
@@ -17,15 +17,16 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_SVTOOLS_SOURCE_INC_SVTACCESSIBLEFACTORY_HXX
#define INCLUDED_SVTOOLS_SOURCE_INC_SVTACCESSIBLEFACTORY_HXX
#ifndef INCLUDED_INCLUDE_VCL_SVTACCESSIBLEFACTORY_HXX
#define INCLUDED_INCLUDE_VCL_SVTACCESSIBLEFACTORY_HXX
#include <svtools/accessiblefactory.hxx>
#include <vcl/dllapi.h>
#include <vcl/accessiblefactory.hxx>
namespace svt
namespace vcl
{
/** a client for the accessibility implementations which have been outsourced
from the main svtools library
from the main vcl/svtools libraries
All instances of this class share a reference to a common IAccessibleFactory
instance, which is used for creating all kind of Accessibility related
@@ -36,7 +37,7 @@ namespace svt
This class is not thread-safe.
*/
class AccessibleFactoryAccess
class VCL_DLLPUBLIC AccessibleFactoryAccess
{
private:
bool m_bInitialized;
@@ -49,10 +50,8 @@ namespace svt
private:
void ensureInitialized();
};
} // namespace svt
#endif // INCLUDED_SVTOOLS_SOURCE_INC_SVTACCESSIBLEFACTORY_HXX
#endif // INCLUDED_INCLUDE_VCL_SVTACCESSIBLEFACTORY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx
index 675d141..cfb6b8c 100644
--- a/include/vcl/treelistbox.hxx
+++ b/include/vcl/treelistbox.hxx
@@ -493,6 +493,9 @@ public:
// ACCESSIBILITY ==========================================================
/** Creates and returns the accessible object of the Box. */
virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
/** Fills the StateSet of one entry. */
void FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const;
@@ -750,8 +753,6 @@ public:
void EnableContextMenuHandling();
void EnableList( bool _bEnable );
long getPreferredDimensions(std::vector<long> &rWidths) const;
virtual Size GetOptimalSize() const override;
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 0d3db5f..f05e340 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -440,7 +440,8 @@ public:
virtual void set_font_color(int pos, const Color& rColor) const = 0;
//by text
virtual OUString get_text(int pos) const = 0;
virtual OUString get_text(int row, int col = -1) const = 0;
virtual void set_text(int row, const OUString& rText, int col = -1) = 0;
virtual int find_text(const OUString& rText) const = 0;
OUString get_selected_text() const
{
@@ -499,6 +500,8 @@ public:
virtual void clear() = 0;
virtual int get_height_rows(int nRows) const = 0;
virtual void set_column_fixed_widths(const std::vector<int>& rWidths) = 0;
virtual void set_selection_mode(bool bMultiple) = 0;
virtual int count_selected_rows() const = 0;
};
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index 3152ecd..6fcac96 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -432,11 +432,10 @@
#include <svl/stylesheetuser.hxx>
#include <svl/svldllapi.h>
#include <svl/undo.hxx>
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <svtools/accessibilityoptions.hxx>
#include <svtools/colorcfg.hxx>
#include <svtools/framestatuslistener.hxx>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <svtools/optionsdrawinglayer.hxx>
#include <svtools/statusbarcontroller.hxx>
#include <svtools/svtdllapi.h>
@@ -575,6 +574,7 @@
#include <unotools/resmgr.hxx>
#include <unotools/syslocale.hxx>
#include <unotools/unotoolsdllapi.h>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
#include <vcl/transfer.hxx>
#include <vcl/treelistentries.hxx>
#include <vcl/viewdataentry.hxx>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 914640c..ab30657 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -37,7 +37,7 @@
#include <sfx2/docfile.hxx>
#include <sfx2/ipclient.hxx>
#include <svl/stritem.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <svl/urlbmk.hxx>
#include <svl/sharedstringpool.hxx>
#include <vcl/cursor.hxx>
diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx
index 3f545c8..f89c60e 100644
--- a/sfx2/source/inc/versdlg.hxx
+++ b/sfx2/source/inc/versdlg.hxx
@@ -23,7 +23,7 @@
#include <sfx2/basedlgs.hxx>
#include <svtools/simptabl.hxx>
#include <svtools/svmedit.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <vcl/weld.hxx>
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index e7a12ff..28b3971 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -64,6 +64,8 @@ accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx
accessibility/inc/standard/vclxaccessibleedit.hxx
accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx
accessibility/inc/standard/vclxaccessiblefixedtext.hxx
accessibility/inc/standard/vclxaccessibleheaderbar.hxx
accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
accessibility/inc/standard/vclxaccessiblelist.hxx
accessibility/inc/standard/vclxaccessiblelistbox.hxx
accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -131,6 +133,8 @@ accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
accessibility/source/standard/vclxaccessibleedit.cxx
accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx
accessibility/source/standard/vclxaccessiblefixedtext.cxx
accessibility/source/standard/vclxaccessibleheaderbar.cxx
accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
accessibility/source/standard/vclxaccessiblelist.cxx
accessibility/source/standard/vclxaccessiblelistbox.cxx
accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -7003,7 +7007,6 @@ include/svl/visitem.hxx
include/svl/whiter.hxx
include/svl/zforlist.hxx
include/svl/zformat.hxx
include/svtools/AccessibleBrowseBoxObjType.hxx
include/svtools/DocumentInfoPreview.hxx
include/svtools/DocumentToGraphicRenderer.hxx
include/svtools/HtmlWriter.hxx
@@ -7011,10 +7014,7 @@ include/svtools/PlaceEditDialog.hxx
include/svtools/ServerDetailsControls.hxx
include/svtools/acceleratorexecute.hxx
include/svtools/accessibilityoptions.hxx
include/svtools/accessiblefactory.hxx
include/svtools/accessibleruler.hxx
include/svtools/accessibletable.hxx
include/svtools/accessibletableprovider.hxx
include/svtools/addresstemplate.hxx
include/svtools/apearcfg.hxx
include/svtools/asynclink.hxx
@@ -7052,7 +7052,6 @@ include/svtools/fontsubstconfig.hxx
include/svtools/framestatuslistener.hxx
include/svtools/generictoolboxcontroller.hxx
include/svtools/genericunodialog.hxx
include/svtools/headbar.hxx
include/svtools/helpids.h
include/svtools/helpopt.hxx
include/svtools/htmlcfg.hxx
@@ -7101,7 +7100,6 @@ include/svtools/stringtransfer.hxx
include/svtools/svmedit.hxx
include/svtools/svmedit2.hxx
include/svtools/svparser.hxx
include/svtools/svtabbx.hxx
include/svtools/svtdllapi.h
include/svtools/svtresid.hxx
include/svtools/tabbar.hxx
@@ -7881,6 +7879,7 @@ include/vbahelper/vbashaperange.hxx
include/vbahelper/vbashapes.hxx
include/vbahelper/vbatextframe.hxx
include/vbahelper/vbawindowbase.hxx
include/vcl/AccessibleBrowseBoxObjType.hxx
include/vcl/BitmapTools.hxx
include/vcl/EnumContext.hxx
include/vcl/FilterConfigItem.hxx
@@ -7898,6 +7897,9 @@ include/vcl/ImageTree.hxx
include/vcl/NotebookbarContextControl.hxx
include/vcl/abstdlg.hxx
include/vcl/accel.hxx
include/vcl/accessiblefactory.hxx
include/vcl/accessibletable.hxx
include/vcl/accessibletableprovider.hxx
include/vcl/alpha.hxx
include/vcl/animate.hxx
include/vcl/bitmap.hxx
@@ -7952,6 +7954,7 @@ include/vcl/graph.hxx
include/vcl/graphicfilter.hxx
include/vcl/graphictools.hxx
include/vcl/hatch.hxx
include/vcl/headbar.hxx
include/vcl/help.hxx
include/vcl/i18nhelp.hxx
include/vcl/idle.hxx
@@ -8030,6 +8033,8 @@ include/vcl/svapp.hxx
include/vcl/svimpbox.hxx
include/vcl/svlbitm.hxx
include/vcl/svmain.hxx
include/vcl/svtabbx.hxx
include/vcl/svtaccessiblefactory.hxx
include/vcl/syschild.hxx
include/vcl/sysdata.hxx
include/vcl/syswin.hxx
@@ -13839,8 +13844,6 @@ svtools/inc/table/gridtablerenderer.hxx
svtools/inc/table/tablecontrol.hxx
svtools/inc/table/tablecontrolinterface.hxx
svtools/inc/uitest/uiobject.hxx
svtools/inc/vclxaccessibleheaderbar.hxx
svtools/inc/vclxaccessibleheaderbaritem.hxx
svtools/langsupport/langsupport.cxx
svtools/qa/unit/GraphicObjectTest.cxx
svtools/qa/unit/svtools-dialogs-test.cxx
@@ -13883,7 +13886,6 @@ svtools/source/contnr/imivctl1.cxx
svtools/source/contnr/imivctl2.cxx
svtools/source/contnr/ivctrl.cxx
svtools/source/contnr/simptabl.cxx
svtools/source/contnr/svtabbx.cxx
svtools/source/contnr/templwin.cxx
svtools/source/contnr/templwin.hxx
svtools/source/control/accessibleruler.cxx
@@ -13896,7 +13898,6 @@ svtools/source/control/ctrlbox.cxx
svtools/source/control/ctrltool.cxx
svtools/source/control/filectrl.cxx
svtools/source/control/fileurlbox.cxx
svtools/source/control/headbar.cxx
svtools/source/control/hyperlabel.cxx
svtools/source/control/indexentryres.cxx
svtools/source/control/inettbc.cxx
@@ -13913,8 +13914,6 @@ svtools/source/control/urlcontrol.cxx
svtools/source/control/valueacc.cxx
svtools/source/control/valueimp.hxx
svtools/source/control/valueset.cxx
svtools/source/control/vclxaccessibleheaderbar.cxx
svtools/source/control/vclxaccessibleheaderbaritem.cxx
svtools/source/dialogs/PlaceEditDialog.cxx
svtools/source/dialogs/ServerDetailsControls.cxx
svtools/source/dialogs/addresstemplate.cxx
@@ -13941,7 +13940,6 @@ svtools/source/hatchwindow/ipwin.cxx
svtools/source/hatchwindow/ipwin.hxx
svtools/source/inc/hatchwindow.hxx
svtools/source/inc/iconviewimpl.hxx
svtools/source/inc/svtaccessiblefactory.hxx
svtools/source/inc/unoiface.hxx
svtools/source/java/javacontext.cxx
svtools/source/java/javainteractionhandler.cxx
@@ -13961,7 +13959,6 @@ svtools/source/misc/langtab.cxx
svtools/source/misc/openfiledroptargetlistener.cxx
svtools/source/misc/sampletext.cxx
svtools/source/misc/stringtransfer.cxx
svtools/source/misc/svtaccessiblefactory.cxx
svtools/source/misc/svtresid.cxx
svtools/source/misc/templatefoldercache.cxx
svtools/source/misc/unitconv.cxx
@@ -18134,6 +18131,7 @@ vcl/source/helper/displayconnectiondispatch.cxx
vcl/source/helper/evntpost.cxx
vcl/source/helper/lazydelete.cxx
vcl/source/helper/strhelper.cxx
vcl/source/helper/svtaccessiblefactory.cxx
vcl/source/helper/threadex.cxx
vcl/source/image/Image.cxx
vcl/source/image/ImageRepository.cxx
@@ -18165,8 +18163,10 @@ vcl/source/outdev/transparent.cxx
vcl/source/outdev/vclreferencebase.cxx
vcl/source/outdev/wallpaper.cxx
vcl/source/salmain/salmain.cxx
vcl/source/treelist/svtabbx.cxx
vcl/source/treelist/transfer.cxx
vcl/source/treelist/transfer2.cxx
vcl/source/treelist/headbar.cxx
vcl/source/treelist/imap.cxx
vcl/source/treelist/imap2.cxx
vcl/source/treelist/imap3.cxx
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index a10c57c..d17c853 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -97,7 +97,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/contnr/imivctl2 \
svtools/source/contnr/ivctrl \
svtools/source/contnr/simptabl \
svtools/source/contnr/svtabbx \
svtools/source/contnr/templwin \
svtools/source/control/accessibleruler \
svtools/source/control/asynclink \
@@ -109,7 +108,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/control/ctrltool \
svtools/source/control/filectrl \
svtools/source/control/fileurlbox \
svtools/source/control/headbar \
svtools/source/control/hyperlabel \
svtools/source/control/indexentryres \
svtools/source/control/inettbc \
@@ -124,8 +122,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/control/urlcontrol \
svtools/source/control/valueacc \
svtools/source/control/valueset \
svtools/source/control/vclxaccessibleheaderbar \
svtools/source/control/vclxaccessibleheaderbaritem \
svtools/source/dialogs/addresstemplate \
svtools/source/dialogs/colrdlg \
svtools/source/dialogs/insdlg \
@@ -167,7 +163,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/misc/openfiledroptargetlistener \
svtools/source/misc/sampletext \
svtools/source/misc/stringtransfer \
svtools/source/misc/svtaccessiblefactory \
svtools/source/misc/svtresid \
svtools/source/misc/templatefoldercache \
svtools/source/misc/unitconv \
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx
index 3d7c386..ac1a034 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -413,10 +413,8 @@
#include <unotools/ucbhelper.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/unotoolsdllapi.h>
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <svtools/brwbox.hxx>
#include <svtools/colorcfg.hxx>
#include <svtools/headbar.hxx>
#include <svtools/htmlkywd.hxx>
#include <svtools/htmltokn.h>
#include <svtools/iconview.hxx>
@@ -428,6 +426,8 @@
#include <svtools/svtdllapi.h>
#include <svtools/svtresid.hxx>
#include <svtools/table/tabletypes.hxx>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
#include <vcl/headbar.hxx>
#include <vcl/transfer.hxx>
#include <vcl/svlbitm.hxx>
#include <vcl/imap.hxx>
diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx
index 00b04ba..e57801b 100644
--- a/svtools/inc/table/tablecontrol.hxx
+++ b/svtools/inc/table/tablecontrol.hxx
@@ -22,8 +22,8 @@
#include <svtools/svtdllapi.h>
#include <svtools/table/tablemodel.hxx>
#include <svtools/accessibletable.hxx>
#include <svtools/accessiblefactory.hxx>
#include <vcl/accessibletable.hxx>
#include <vcl/accessiblefactory.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/seleng.hxx>
@@ -32,8 +32,6 @@
namespace svt { namespace table
{
class TableControl_Impl;
@@ -55,7 +53,7 @@ namespace svt { namespace table
cell).
The control supports accessibility, this is encapsulated in IAccessibleTable
*/
class SVT_DLLPUBLIC TableControl : public Control, public IAccessibleTable
class SVT_DLLPUBLIC TableControl : public Control, public vcl::table::IAccessibleTable
{
private:
std::shared_ptr<TableControl_Impl> m_pImpl;
@@ -118,10 +116,10 @@ namespace svt { namespace table
/** Creates and returns the accessible object of the whole GridControl. */
SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
SVT_DLLPRIVATE virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleControl( sal_Int32 _nIndex ) override;
SVT_DLLPRIVATE virtual OUString GetAccessibleObjectName(AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const override;
SVT_DLLPRIVATE virtual OUString GetAccessibleObjectName(vcl::table::AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const override;
SVT_DLLPRIVATE virtual void GoToCell( sal_Int32 _nColumnPos, sal_Int32 _nRow ) override;
SVT_DLLPRIVATE virtual OUString GetAccessibleObjectDescription(AccessibleTableControlObjType eObjType) const override;
SVT_DLLPRIVATE virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, AccessibleTableControlObjType eObjType ) const override;
SVT_DLLPRIVATE virtual OUString GetAccessibleObjectDescription(vcl::table::AccessibleTableControlObjType eObjType) const override;
SVT_DLLPRIVATE virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet, vcl::table::AccessibleTableControlObjType eObjType ) const override;
// temporary methods
// Those do not really belong into the public API - they're intended for firing A11Y-related events. However,
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index ce1918b..b9ae51e 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -742,13 +742,13 @@ void BrowseBox::RemoveColumns()
commitBrowseBoxEvent(
CHILD,
Any(),
makeAny(m_pImpl->getAccessibleHeaderBar(BBTYPE_COLUMNHEADERBAR))
makeAny(m_pImpl->getAccessibleHeaderBar(vcl::BBTYPE_COLUMNHEADERBAR))
);
// and now append it again
commitBrowseBoxEvent(
CHILD,
makeAny(m_pImpl->getAccessibleHeaderBar(BBTYPE_COLUMNHEADERBAR)),
makeAny(m_pImpl->getAccessibleHeaderBar(vcl::BBTYPE_COLUMNHEADERBAR)),
Any()
);
@@ -1076,13 +1076,13 @@ void BrowseBox::Clear()
commitBrowseBoxEvent(
CHILD,
Any(),
makeAny( m_pImpl->getAccessibleHeaderBar( BBTYPE_ROWHEADERBAR ) )
makeAny( m_pImpl->getAccessibleHeaderBar( vcl::BBTYPE_ROWHEADERBAR ) )
);
// and now append it again
commitBrowseBoxEvent(
CHILD,
makeAny( m_pImpl->getAccessibleHeaderBar( BBTYPE_ROWHEADERBAR ) ),
makeAny( m_pImpl->getAccessibleHeaderBar( vcl::BBTYPE_ROWHEADERBAR ) ),
Any()
);
@@ -1319,13 +1319,13 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint )
commitBrowseBoxEvent(
CHILD,
Any(),
makeAny( m_pImpl->getAccessibleHeaderBar( BBTYPE_ROWHEADERBAR ) )
makeAny( m_pImpl->getAccessibleHeaderBar( vcl::BBTYPE_ROWHEADERBAR ) )
);
// and now append it again
commitBrowseBoxEvent(
CHILD,
makeAny(m_pImpl->getAccessibleHeaderBar(BBTYPE_ROWHEADERBAR)),
makeAny(m_pImpl->getAccessibleHeaderBar(vcl::BBTYPE_ROWHEADERBAR)),
Any()
);
commitBrowseBoxEvent(
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index 2414978..587ceb4 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -18,7 +18,7 @@
*/
#include <svtools/brwbox.hxx>
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
#include <sal/log.hxx>
#include <tools/debug.hxx>
#include <tools/multisel.hxx>
@@ -41,10 +41,10 @@ namespace svt
static Reference< XAccessible > getHeaderCell( BrowseBoxImpl::THeaderCellMap& _raHeaderCells,
sal_Int32 _nPos,
AccessibleBrowseBoxObjType _eType,
vcl::AccessibleBrowseBoxObjType _eType,
const Reference< XAccessible >& _rParent,
BrowseBox& _rBrowseBox,
IAccessibleFactory const & rFactory
vcl::IAccessibleFactory const & rFactory
)
{
Reference< XAccessible > xRet;
@@ -66,7 +66,7 @@ namespace svt
}
Reference< XAccessible > BrowseBoxImpl::getAccessibleHeaderBar( AccessibleBrowseBoxObjType _eObjType )
Reference< XAccessible > BrowseBoxImpl::getAccessibleHeaderBar( vcl::AccessibleBrowseBoxObjType _eObjType )
{
if ( m_pAccessible && m_pAccessible->isAlive() )
return m_pAccessible->getHeaderBar( _eObjType );
@@ -130,8 +130,8 @@ Reference< XAccessible > BrowseBox::CreateAccessibleRowHeader( sal_Int32 _nRow )
return svt::getHeaderCell(
m_pImpl->m_aRowHeaderCellMap,
_nRow,
svt::BBTYPE_ROWHEADERCELL,
m_pImpl->getAccessibleHeaderBar(svt::BBTYPE_ROWHEADERBAR),
vcl::BBTYPE_ROWHEADERCELL,
m_pImpl->getAccessibleHeaderBar(vcl::BBTYPE_ROWHEADERBAR),
*this,
m_pImpl->m_aFactoryAccess.getFactory()
);
@@ -143,8 +143,8 @@ Reference< XAccessible > BrowseBox::CreateAccessibleColumnHeader( sal_uInt16 _nC
return svt::getHeaderCell(
m_pImpl->m_aColHeaderCellMap,
_nColumnPos,
svt::BBTYPE_COLUMNHEADERCELL,
m_pImpl->getAccessibleHeaderBar(svt::BBTYPE_COLUMNHEADERBAR),
vcl::BBTYPE_COLUMNHEADERCELL,
m_pImpl->getAccessibleHeaderBar(vcl::BBTYPE_COLUMNHEADERBAR),
*this,
m_pImpl->m_aFactoryAccess.getFactory()
);
@@ -206,24 +206,24 @@ bool BrowseBox::ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _r
// Object data and state ------------------------------------------------------
OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition) const
OUString BrowseBox::GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition) const
{
OUString aRetText;
switch( eObjType )
{
case ::svt::BBTYPE_BROWSEBOX:
case ::vcl::BBTYPE_BROWSEBOX:
aRetText = "BrowseBox";
break;
case ::svt::BBTYPE_TABLE:
case ::vcl::BBTYPE_TABLE:
aRetText = "Table";
break;
case ::svt::BBTYPE_ROWHEADERBAR:
case ::vcl::BBTYPE_ROWHEADERBAR:
aRetText = "RowHeaderBar";
break;
case ::svt::BBTYPE_COLUMNHEADERBAR:
case ::vcl::BBTYPE_COLUMNHEADERBAR:
aRetText = "ColumnHeaderBar";
break;
case ::svt::BBTYPE_TABLECELL:
case ::vcl::BBTYPE_TABLECELL:
if( ColCount() !=0 && GetRowCount()!=0)
{
@@ -242,7 +242,7 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e
+ "]";
#endif
break;
case ::svt::BBTYPE_ROWHEADERCELL:
case ::vcl::BBTYPE_ROWHEADERCELL:
{
sal_Int32 rowId = _nPosition + 1;
aRetText = OUString::number( rowId );
@@ -255,7 +255,7 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e
+ "]";
#endif
break;
case ::svt::BBTYPE_COLUMNHEADERCELL:
case ::vcl::BBTYPE_COLUMNHEADERCELL:
aRetText = GetColumnDescription( sal_Int16( _nPosition ) );
#if OSL_DEBUG_LEVEL > 0
aRetText += " ["
@@ -272,33 +272,33 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e
}
OUString BrowseBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 ) const
OUString BrowseBox::GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType eObjType,sal_Int32 ) const
{
OUString aRetText;
switch( eObjType )
{
case ::svt::BBTYPE_BROWSEBOX:
case ::vcl::BBTYPE_BROWSEBOX:
aRetText = "BrowseBox description";
break;
case ::svt::BBTYPE_TABLE:
case ::vcl::BBTYPE_TABLE:
// aRetText = "TABLE description";
break;
case ::svt::BBTYPE_ROWHEADERBAR:
case ::vcl::BBTYPE_ROWHEADERBAR:
// aRetText = "ROWHEADERBAR description";
break;
case ::svt::BBTYPE_COLUMNHEADERBAR:
case ::vcl::BBTYPE_COLUMNHEADERBAR:
// aRetText = "COLUMNHEADERBAR description";
break;
case ::svt::BBTYPE_TABLECELL:
case ::vcl::BBTYPE_TABLECELL:
// aRetText = "TABLECELL description";
break;
case ::svt::BBTYPE_ROWHEADERCELL:
case ::vcl::BBTYPE_ROWHEADERCELL:
// aRetText = "ROWHEADERCELL description";
break;
case ::svt::BBTYPE_COLUMNHEADERCELL:
case ::vcl::BBTYPE_COLUMNHEADERCELL:
// aRetText = "COLUMNHEADERCELL description";
break;
case ::svt::BBTYPE_CHECKBOXCELL:
case ::vcl::BBTYPE_CHECKBOXCELL:
break;
}
return aRetText;
@@ -319,12 +319,12 @@ OUString BrowseBox::GetColumnDescription( sal_uInt16 _nColumn ) const
void BrowseBox::FillAccessibleStateSet(
::utl::AccessibleStateSetHelper& rStateSet,
::svt::AccessibleBrowseBoxObjType eObjType ) const
::vcl::AccessibleBrowseBoxObjType eObjType ) const
{
switch( eObjType )
{
case ::svt::BBTYPE_BROWSEBOX:
case ::svt::BBTYPE_TABLE:
case ::vcl::BBTYPE_BROWSEBOX:
case ::vcl::BBTYPE_TABLE:
rStateSet.AddState( AccessibleStateType::FOCUSABLE );
if ( HasFocus() )
@@ -340,25 +340,25 @@ void BrowseBox::FillAccessibleStateSet(
}
if ( IsReallyVisible() )
rStateSet.AddState( AccessibleStateType::VISIBLE );
if ( eObjType == ::svt::BBTYPE_TABLE )
if ( eObjType == ::vcl::BBTYPE_TABLE )
rStateSet.AddState( AccessibleStateType::MANAGES_DESCENDANTS );
break;
case ::svt::BBTYPE_ROWHEADERBAR:
case ::vcl::BBTYPE_ROWHEADERBAR:
rStateSet.AddState( AccessibleStateType::FOCUSABLE );
rStateSet.AddState( AccessibleStateType::VISIBLE );
if ( GetSelectRowCount() )
rStateSet.AddState( AccessibleStateType::FOCUSED );
rStateSet.AddState( AccessibleStateType::MANAGES_DESCENDANTS );
break;
case ::svt::BBTYPE_COLUMNHEADERBAR:
case ::vcl::BBTYPE_COLUMNHEADERBAR:
rStateSet.AddState( AccessibleStateType::FOCUSABLE );
rStateSet.AddState( AccessibleStateType::VISIBLE );
if ( GetSelectColumnCount() )
rStateSet.AddState( AccessibleStateType::FOCUSED );
rStateSet.AddState( AccessibleStateType::MANAGES_DESCENDANTS );
break;
case ::svt::BBTYPE_TABLECELL:
case ::vcl::BBTYPE_TABLECELL:
{
sal_Int32 nRow = GetCurRow();
sal_uInt16 nColumn = GetCurColumnId();
@@ -369,9 +369,9 @@ void BrowseBox::FillAccessibleStateSet(
rStateSet.AddState( AccessibleStateType::TRANSIENT );
}
break;
case ::svt::BBTYPE_ROWHEADERCELL:
case ::svt::BBTYPE_COLUMNHEADERCELL:
case ::svt::BBTYPE_CHECKBOXCELL:
case ::vcl::BBTYPE_ROWHEADERCELL:
case ::vcl::BBTYPE_COLUMNHEADERCELL:
case ::vcl::BBTYPE_CHECKBOXCELL:
OSL_FAIL("Illegal call here!");
break;
}
@@ -410,7 +410,6 @@ void BrowseBox::commitHeaderBarEvent(sal_Int16 nEventId,
rNewValue, rOldValue, _bColumnHeaderBar );
}
void BrowseBox::commitTableEvent( sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue )
{
if ( isAccessibleAlive() )
@@ -423,13 +422,11 @@ void BrowseBox::commitBrowseBoxEvent( sal_Int16 _nEventId, const Any& _rNewValue
m_pImpl->m_pAccessible->commitEvent( _nEventId, _rNewValue, _rOldValue);
}
::svt::IAccessibleFactory& BrowseBox::getAccessibleFactory()
::vcl::IAccessibleFactory& BrowseBox::getAccessibleFactory()
{
return m_pImpl->m_aFactoryAccess.getFactory();
}
bool BrowseBox::isAccessibleAlive( ) const
{
return ( nullptr != m_pImpl->m_pAccessible ) && m_pImpl->m_pAccessible->isAlive();
diff --git a/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx
index e39c313..4e8fb88 100644
--- a/svtools/source/brwbox/brwimpl.hxx
+++ b/svtools/source/brwbox/brwimpl.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SVTOOLS_SOURCE_BRWBOX_BRWIMPL_HXX
#define INCLUDED_SVTOOLS_SOURCE_BRWBOX_BRWIMPL_HXX
#include <svtaccessiblefactory.hxx>
#include <vcl/svtaccessiblefactory.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <osl/diagnose.h>
@@ -52,8 +52,8 @@ namespace svt
};
public:
AccessibleFactoryAccess m_aFactoryAccess;
IAccessibleBrowseBox* m_pAccessible;
vcl::AccessibleFactoryAccess m_aFactoryAccess;
vcl::IAccessibleBrowseBox* m_pAccessible;
THeaderCellMap m_aColHeaderCellMap;
THeaderCellMap m_aRowHeaderCellMap;
@@ -65,7 +65,7 @@ namespace svt
/// @see AccessibleBrowseBox::getHeaderBar
css::uno::Reference< css::accessibility::XAccessible >
getAccessibleHeaderBar( AccessibleBrowseBoxObjType _eObjType );
getAccessibleHeaderBar( vcl::AccessibleBrowseBoxObjType _eObjType );
/// @see AccessibleBrowseBox::getTable
css::uno::Reference< css::accessibility::XAccessible >
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index 5a1fc3f..ece11a3 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -23,7 +23,7 @@
#include "editbrowseboximpl.hxx"
#include <comphelper/types.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <svtaccessiblefactory.hxx>
#include <vcl/svtaccessiblefactory.hxx>
#include <osl/diagnose.h>
namespace svt
@@ -44,7 +44,7 @@ Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(long _nRow,
if ( xAccContext.is() )
{
xReturn = getAccessibleFactory().createAccessibleCheckBoxCell(
xAccContext->getAccessibleChild( ::svt::BBINDEX_TABLE ),
xAccContext->getAccessibleChild( ::vcl::BBINDEX_TABLE ),
*this,
nullptr,
_nRow,
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 358cdc2b..0576ff8 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -26,14 +26,14 @@
#include <svtools/fileview.hxx>
#include <svtools/svtresid.hxx>
#include <svtools/imagemgr.hxx>
#include <svtools/headbar.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <vcl/svtabbx.hxx>
#include <svtools/strings.hrc>
#include <bitmaps.hlst>
#include <vcl/viewdataentry.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include "contentenumeration.hxx"
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/task/InteractionHandler.hpp>
@@ -187,7 +187,7 @@ private:
protected:
virtual bool DoubleClickHdl() override;
virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const override;
virtual OUString GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos = -1 ) const override;
public:
ViewTabListBox_Impl( vcl::Window* pParentWin, SvtFileView_Impl* pParent, FileViewFlags nFlags );
@@ -797,10 +797,10 @@ bool ViewTabListBox_Impl::DoubleClickHdl()
// who knows ...)
}
OUString ViewTabListBox_Impl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const
OUString ViewTabListBox_Impl::GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const
{
OUString sRet = SvHeaderTabListBox::GetAccessibleObjectDescription( _eType, _nPos );
if ( ::svt::BBTYPE_TABLECELL == _eType )
if ( ::vcl::BBTYPE_TABLECELL == _eType )
{
sal_Int32 nRow = -1;
const sal_uInt16 nColumnCount = GetColumnCount();
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index b3d9f43..cb2c4b4 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -27,7 +27,7 @@
#include <vcl/vclptr.hxx>
#include <vcl/seleng.hxx>
#include <tools/debug.hxx>
#include <svtaccessiblefactory.hxx>
#include <vcl/svtaccessiblefactory.hxx>
#include <limits.h>
@@ -187,7 +187,7 @@ class SvxIconChoiceCtrl_Impl
VclPtr<VirtualDevice> pEntryPaintDev;
SvxIconChoiceCtrlEntry* pAnchor; // for selection
LocalFocus aFocus; // Data for focusrect
::svt::AccessibleFactoryAccess aAccFactory;
::vcl::AccessibleFactoryAccess aAccFactory;
SvxIconChoiceCtrlEntry* pCurEditedEntry;
SvxIconChoiceCtrlTextMode eTextMode;
@@ -456,7 +456,7 @@ public:
void CallEventListeners( VclEventId nEvent, void* pData );
::svt::IAccessibleFactory& GetAccessibleFactory()
::vcl::IAccessibleFactory& GetAccessibleFactory()
{
return aAccFactory.getFactory();
}
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index f55ad89..ac7ff9e 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -30,7 +30,7 @@
#include <vcl/image.hxx>
#include <vcl/settings.hxx>
#include <vcl/commandevent.hxx>
#include <svtaccessiblefactory.hxx>
#include <vcl/svtaccessiblefactory.hxx>
#include <svtools/svtresid.hxx>
#include <svtools/strings.hrc>
#include <limits>
@@ -495,7 +495,7 @@ struct TabBar_Impl
ScopedVclPtr<TabBarEdit> mpEdit;
std::vector<std::unique_ptr<ImplTabBarItem>> mpItemList;
svt::AccessibleFactoryAccess maAccessibleFactory;
vcl::AccessibleFactoryAccess maAccessibleFactory;
sal_uInt16 getItemSize()
{
diff --git a/svtools/source/edit/textwindowpeer.cxx b/svtools/source/edit/textwindowpeer.cxx
index 5bfc39d..4075295 100644
--- a/svtools/source/edit/textwindowpeer.cxx
+++ b/svtools/source/edit/textwindowpeer.cxx
@@ -19,7 +19,7 @@
#include <sal/config.h>
#include <svtaccessiblefactory.hxx>
#include <vcl/svtaccessiblefactory.hxx>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/awt/XWindowPeer.hpp>
@@ -45,7 +45,7 @@ private:
TextEngine & m_rEngine;
TextView & m_rView;
svt::AccessibleFactoryAccess m_aFactoryAccess;
vcl::AccessibleFactoryAccess m_aFactoryAccess;
};
TextWindowPeer::TextWindowPeer(TextView & view):
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index b0e6641..89c02e1 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -295,25 +295,25 @@ namespace svt { namespace table
}
OUString TableControl::GetAccessibleObjectName( AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const
OUString TableControl::GetAccessibleObjectName( vcl::table::AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const
{
OUString aRetText;
//Window* pWin;
switch( eObjType )
{
case TCTYPE_GRIDCONTROL:
case vcl::table::TCTYPE_GRIDCONTROL:
aRetText = "Grid control";
break;
case TCTYPE_TABLE:
case vcl::table::TCTYPE_TABLE:
aRetText = "Grid control";
break;
case TCTYPE_ROWHEADERBAR:
case vcl::table::TCTYPE_ROWHEADERBAR:
aRetText = "RowHeaderBar";
break;
case TCTYPE_COLUMNHEADERBAR:
case vcl::table::TCTYPE_COLUMNHEADERBAR:
aRetText = "ColumnHeaderBar";
break;
case TCTYPE_TABLECELL:
case vcl::table::TCTYPE_TABLECELL:
//the name of the cell consists of column name and row name if defined
//if the name is equal to cell content, it'll be read twice
if(GetModel()->hasColumnHeaders())
@@ -326,10 +326,10 @@ namespace svt { namespace table
}
//aRetText = GetAccessibleCellText(_nRow, _nCol);
break;
case TCTYPE_ROWHEADERCELL:
case vcl::table::TCTYPE_ROWHEADERCELL:
aRetText = GetRowName(_nRow);
break;
case TCTYPE_COLUMNHEADERCELL:
case vcl::table::TCTYPE_COLUMNHEADERCELL:
aRetText = GetColumnName(_nCol);
break;
default:
@@ -339,24 +339,24 @@ namespace svt { namespace table
}
OUString TableControl::GetAccessibleObjectDescription( AccessibleTableControlObjType eObjType ) const
OUString TableControl::GetAccessibleObjectDescription( vcl::table::AccessibleTableControlObjType eObjType ) const
{
OUString aRetText;
switch( eObjType )
{
case TCTYPE_GRIDCONTROL:
case vcl::table::TCTYPE_GRIDCONTROL:
aRetText = "Grid control description";
break;
case TCTYPE_TABLE:
case vcl::table::TCTYPE_TABLE:
aRetText = "TABLE description";
break;
case TCTYPE_ROWHEADERBAR:
case vcl::table::TCTYPE_ROWHEADERBAR:
aRetText = "ROWHEADERBAR description";
break;
case TCTYPE_COLUMNHEADERBAR:
case vcl::table::TCTYPE_COLUMNHEADERBAR:
aRetText = "COLUMNHEADERBAR description";
break;
case TCTYPE_TABLECELL:
case vcl::table::TCTYPE_TABLECELL:
// the description of the cell consists of column name and row name if defined
// if the name is equal to cell content, it'll be read twice
if ( GetModel()->hasColumnHeaders() )
@@ -368,10 +368,10 @@ namespace svt { namespace table
aRetText += GetRowName( GetCurrentRow() );
}
break;
case TCTYPE_ROWHEADERCELL:
case vcl::table::TCTYPE_ROWHEADERCELL:
aRetText = "ROWHEADERCELL description";
break;
case TCTYPE_COLUMNHEADERCELL:
case vcl::table::TCTYPE_COLUMNHEADERCELL:
aRetText = "COLUMNHEADERCELL description";
break;
}
@@ -413,12 +413,12 @@ namespace svt { namespace table
void TableControl::FillAccessibleStateSet(
::utl::AccessibleStateSetHelper& rStateSet,
AccessibleTableControlObjType eObjType ) const
vcl::table::AccessibleTableControlObjType eObjType ) const
{
switch( eObjType )
{
case TCTYPE_GRIDCONTROL:
case TCTYPE_TABLE:
case vcl::table::TCTYPE_GRIDCONTROL:
case vcl::table::TCTYPE_TABLE:
rStateSet.AddState( AccessibleStateType::FOCUSABLE );
@@ -440,21 +440,21 @@ namespace svt { namespace table
if ( IsReallyVisible() )
rStateSet.AddState( AccessibleStateType::VISIBLE );
if ( eObjType == TCTYPE_TABLE )
if ( eObjType == vcl::table::TCTYPE_TABLE )
rStateSet.AddState( AccessibleStateType::MANAGES_DESCENDANTS );
break;
case TCTYPE_ROWHEADERBAR:
case vcl::table::TCTYPE_ROWHEADERBAR:
rStateSet.AddState( AccessibleStateType::VISIBLE );
rStateSet.AddState( AccessibleStateType::MANAGES_DESCENDANTS );
break;
case TCTYPE_COLUMNHEADERBAR:
case vcl::table::TCTYPE_COLUMNHEADERBAR:
rStateSet.AddState( AccessibleStateType::VISIBLE );
rStateSet.AddState( AccessibleStateType::MANAGES_DESCENDANTS );
break;
case TCTYPE_TABLECELL:
case vcl::table::TCTYPE_TABLECELL:
{
rStateSet.AddState( AccessibleStateType::FOCUSABLE );
if ( HasChildPathFocus() )
@@ -470,12 +470,12 @@ namespace svt { namespace table
}
break;
case TCTYPE_ROWHEADERCELL:
case vcl::table::TCTYPE_ROWHEADERCELL:
rStateSet.AddState( AccessibleStateType::VISIBLE );
rStateSet.AddState( AccessibleStateType::TRANSIENT );
break;
case TCTYPE_COLUMNHEADERCELL:
case vcl::table::TCTYPE_COLUMNHEADERCELL:
rStateSet.AddState( AccessibleStateType::VISIBLE );
break;
}
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 5105074..344fe0f 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -23,7 +23,7 @@
#include <svtools/table/tablemodel.hxx>
#include <table/tablecontrolinterface.hxx>
#include <svtaccessiblefactory.hxx>
#include <vcl/svtaccessiblefactory.hxx>
#include <vcl/seleng.hxx>
@@ -130,8 +130,8 @@ namespace svt { namespace table
RowPos m_nAnchor;
bool m_bUpdatingColWidths;
AccessibleFactoryAccess m_aFactoryAccess;
IAccessibleTableControl* m_pAccessibleTable;
vcl::AccessibleFactoryAccess m_aFactoryAccess;
vcl::table::IAccessibleTableControl* m_pAccessibleTable;
public:
void setModel( const PTableModel& _pModel );
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index e25009a..486695b 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -425,10 +425,8 @@
#include <svl/style.hxx>
#include <svl/svldllapi.h>
#include <svl/whiter.hxx>
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <svtools/colorcfg.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/headbar.hxx>
#include <svtools/svtdllapi.h>
#include <svtools/svtresid.hxx>
#include <svtools/toolboxcontroller.hxx>
@@ -589,6 +587,8 @@
#include <svx/xpoly.hxx>
#include <svx/xpool.hxx>
#include <svx/xtable.hxx>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
#include <vcl/headbar.hxx>
#include <vcl/transfer.hxx>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 8ad7499..8ab6df7 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1898,12 +1898,12 @@ namespace
}
// Object data and state
OUString FmGridControl::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const
OUString FmGridControl::GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const
{
OUString sRetText;
switch( _eObjType )
{
case ::svt::BBTYPE_BROWSEBOX:
case ::vcl::BBTYPE_BROWSEBOX:
if ( GetPeer() )
{
Reference<XPropertySet> xProp(GetPeer()->getColumns(),UNO_QUERY);
@@ -1911,7 +1911,7 @@ OUString FmGridControl::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjTy
xProp->getPropertyValue(FM_PROP_NAME) >>= sRetText;
}
break;
case ::svt::BBTYPE_COLUMNHEADERCELL:
case ::vcl::BBTYPE_COLUMNHEADERCELL:
sRetText = getColumnPropertyFromPeer(
GetPeer(),
GetModelColumnPos(
@@ -1924,12 +1924,12 @@ OUString FmGridControl::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjTy
return sRetText;
}
OUString FmGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const
OUString FmGridControl::GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const
{
OUString sRetText;
switch( _eObjType )
{
case ::svt::BBTYPE_BROWSEBOX:
case ::vcl::BBTYPE_BROWSEBOX:
if ( GetPeer() )
{
Reference<XPropertySet> xProp(GetPeer()->getColumns(),UNO_QUERY);
@@ -1941,7 +1941,7 @@ OUString FmGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseB
}
}
break;
case ::svt::BBTYPE_COLUMNHEADERCELL:
case ::vcl::BBTYPE_COLUMNHEADERCELL:
sRetText = getColumnPropertyFromPeer(
GetPeer(),
GetModelColumnPos(
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index a465dd9..9fb61c4 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -27,7 +27,7 @@
#include <com/sun/star/linguistic2/XConversionPropertyType.hpp>
#include <com/sun/star/util/XFlushable.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <vcl/svlbitm.hxx>
#include <vcl/treelistentry.hxx>
#include <vcl/settings.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 0f4f008..b303c94 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -584,19 +584,15 @@
#include <svl/urihelper.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <svtools/accessibleruler.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <svtools/colorcfg.hxx>
#include <svtools/ctrlbox.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/embedhlp.hxx>
#include <svtools/framestatuslistener.hxx>
#include <svtools/headbar.hxx>
#include <svtools/htmlcfg.hxx>
#include <svtools/miscopt.hxx>
#include <svtools/ruler.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/svtdllapi.h>
#include <svtools/svtresid.hxx>
#include <svtools/toolboxcontroller.hxx>
@@ -677,6 +673,10 @@
#include <unotools/syslocale.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <unotools/unotoolsdllapi.h>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <vcl/headbar.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/transfer.hxx>
#include <vcl/treelist.hxx>
#include <vcl/treelistbox.hxx>
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index 59c00d5..66ba6f6 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -44,57 +44,46 @@ const sal_uInt16 SwCondCollPage::m_aPageRg[] = {
0
};
// Warning! This table is indicated directly in code (0, 1, ...)
static long nTabs[] =
{
0, 100
};
SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet)
: SfxTabPage(pParent, "ConditionPage",
"modules/swriter/ui/conditionpage.ui", &rSet)
,
m_rSh(::GetActiveView()->GetWrtShell()),
m_pCmds( SwCondCollItem::GetCmds() ),
m_pFormat(nullptr),
m_bNewTemplate(false)
SwCondCollPage::SwCondCollPage(TabPageParent pParent, const SfxItemSet &rSet)
: SfxTabPage(pParent, "modules/swriter/ui/conditionpage.ui", "ConditionPage", &rSet)
, m_rSh(::GetActiveView()->GetWrtShell())
, m_pCmds(SwCondCollItem::GetCmds())
, m_pFormat(nullptr)
, m_bNewTemplate(false)
, m_xConditionCB(m_xBuilder->weld_check_button("condstyle"))
, m_xContextFT(m_xBuilder->weld_label("contextft"))
, m_xUsedFT(m_xBuilder->weld_label("usedft"))
, m_xTbLinks(m_xBuilder->weld_tree_view("links"))
, m_xStyleFT(m_xBuilder->weld_label("styleft"))
, m_xStyleLB(m_xBuilder->weld_tree_view("styles"))
, m_xFilterLB(m_xBuilder->weld_combo_box("filter"))
, m_xRemovePB(m_xBuilder->weld_button("remove"))
, m_xAssignPB(m_xBuilder->weld_button("apply"))
{
get(m_pConditionCB, "condstyle");
get(m_pContextFT, "contextft");
get(m_pUsedFT, "usedft");
get(m_pStyleFT, "styleft");
get(m_pTbLinks, "links");
get(m_pStyleLB, "styles");
m_pStyleLB->SetStyle(m_pStyleLB->GetStyle() | WB_SORT);
m_pStyleLB->SetDropDownLineCount(12);
m_pTbLinks->set_height_request(m_pStyleLB->GetOptimalSize().Height());
get(m_pFilterLB, "filter");
get(m_pRemovePB, "remove");
get(m_pAssignPB, "apply");
m_xStyleLB->make_sorted();
const auto nHeightRequest = m_xStyleLB->get_height_rows(12);
m_xStyleLB->set_size_request(-1, nHeightRequest);
m_xTbLinks->set_size_request(-1, nHeightRequest);
std::vector<int> aWidths;
aWidths.push_back(m_xTbLinks->get_approximate_digit_width() * 40);
m_xTbLinks->set_column_fixed_widths(aWidths);
const sal_Int32 nStrCount = m_pFilterLB->GetEntryCount();
const sal_Int32 nStrCount = m_xFilterLB->get_count();
for (sal_Int32 i = 0; i < nStrCount; ++i)
m_aStrArr.push_back(m_pFilterLB->GetEntry(i));
m_pFilterLB->Clear();
m_aStrArr.push_back(m_xFilterLB->get_text(i));
m_xFilterLB->clear();
SetExchangeSupport();
// Install handlers
m_pConditionCB->SetClickHdl( LINK(this, SwCondCollPage, OnOffHdl));
m_pTbLinks->SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveTreeListBoxHdl ));
m_pStyleLB->SetDoubleClickHdl( LINK(this, SwCondCollPage, AssignRemoveHdl ));
m_pRemovePB->SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveClickHdl ));
m_pAssignPB->SetClickHdl( LINK(this, SwCondCollPage, AssignRemoveClickHdl ));
m_pTbLinks->SetSelectHdl( LINK(this, SwCondCollPage, SelectTreeListBoxHdl));
m_pStyleLB->SetSelectHdl( LINK(this, SwCondCollPage, SelectListBoxHdl));
m_pFilterLB->SetSelectHdl( LINK(this, SwCondCollPage, SelectListBoxHdl));
m_pTbLinks->SetStyle(m_pTbLinks->GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN);
m_pTbLinks->SetSelectionMode( SelectionMode::Single );
m_pTbLinks->SetTabs( SAL_N_ELEMENTS(nTabs), nTabs );
m_pTbLinks->Resize(); // OS: Hack for the right selection
m_pTbLinks->SetSpaceBetweenEntries( 0 );
m_xConditionCB->connect_toggled(LINK(this, SwCondCollPage, OnOffHdl));
m_xTbLinks->connect_row_activated(LINK(this, SwCondCollPage, AssignRemoveTreeListBoxHdl));
m_xStyleLB->connect_row_activated(LINK(this, SwCondCollPage, AssignRemoveTreeListBoxHdl));
m_xRemovePB->connect_clicked(LINK(this, SwCondCollPage, AssignRemoveClickHdl));
m_xAssignPB->connect_clicked(LINK(this, SwCondCollPage, AssignRemoveClickHdl));
m_xTbLinks->connect_changed(LINK(this, SwCondCollPage, SelectTreeListBoxHdl));
m_xStyleLB->connect_changed(LINK(this, SwCondCollPage, SelectTreeListBoxHdl));
m_xFilterLB->connect_changed(LINK(this, SwCondCollPage, SelectListBoxHdl));
std::unique_ptr<SfxStyleFamilies> xFamilies(SW_MOD()->CreateStyleFamilies());
size_t nCount = xFamilies->size();
@@ -105,18 +94,13 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet)
{
const SfxStyleFilter& rFilterList = rFamilyItem.GetFilterList();
for (size_t i = 0; i < rFilterList.size(); ++i)
{
m_pFilterLB->InsertEntry(rFilterList[i].aName);
m_pFilterLB->SetEntryData(i, reinterpret_cast<void*>(sal_uInt16(rFilterList[i].nFlags)));
}
m_xFilterLB->append(OUString::number(int(rFilterList[i].nFlags)), rFilterList[i].aName);
break;
}
}
m_pFilterLB->SelectEntryPos(1);
m_pTbLinks->Show();
m_xFilterLB->set_active(1);
m_xTbLinks->show();
}
SwCondCollPage::~SwCondCollPage()
@@ -124,21 +108,6 @@ SwCondCollPage::~SwCondCollPage()
disposeOnce();
}
void SwCondCollPage::dispose()
{
m_pConditionCB.clear();
m_pContextFT.clear();
m_pUsedFT.clear();
m_pTbLinks.clear();
m_pStyleFT.clear();
m_pStyleLB.clear();
m_pFilterLB.clear();
m_pRemovePB.clear();
m_pAssignPB.clear();
SfxTabPage::dispose();
}
DeactivateRC SwCondCollPage::DeactivatePage(SfxItemSet * _pSet)
{
if( _pSet )
@@ -149,7 +118,7 @@ DeactivateRC SwCondCollPage::DeactivatePage(SfxItemSet * _pSet)
VclPtr<SfxTabPage> SwCondCollPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
{
return VclPtr<SwCondCollPage>::Create(pParent.pParent, *rSet);
return VclPtr<SwCondCollPage>::Create(pParent, *rSet);
}
bool SwCondCollPage::FillItemSet(SfxItemSet *rSet)
@@ -157,7 +126,7 @@ bool SwCondCollPage::FillItemSet(SfxItemSet *rSet)
SwCondCollItem aCondItem;
for (size_t i = 0; i < m_aStrArr.size(); ++i)
{
const OUString sEntry = m_pTbLinks->GetEntryText(i, 1);
const OUString sEntry = m_xTbLinks->get_text(i, 1);
aCondItem.SetStyle( &sEntry, i);
}
rSet->Put(aCondItem);
@@ -166,29 +135,29 @@ bool SwCondCollPage::FillItemSet(SfxItemSet *rSet)
void SwCondCollPage::Reset(const SfxItemSet *)
{
if(m_bNewTemplate)
m_pConditionCB->Enable();
if(RES_CONDTXTFMTCOLL == m_pFormat->Which())
m_pConditionCB->Check();
OnOffHdl(m_pConditionCB);
if (m_bNewTemplate)
m_xConditionCB->set_sensitive(true);
if (RES_CONDTXTFMTCOLL == m_pFormat->Which())
m_xConditionCB->set_active(true);
OnOffHdl(*m_xConditionCB);
m_pTbLinks->Clear();
m_xTbLinks->clear();
SfxStyleSheetBasePool* pPool = m_rSh.GetView().GetDocShell()->GetStyleSheetPool();
pPool->SetSearchMask(SfxStyleFamily::Para);
m_pStyleLB->Clear();
m_xStyleLB->clear();
const SfxStyleSheetBase* pBase = pPool->First();
while( pBase )
while (pBase)
{
if(!m_pFormat || pBase->GetName() != m_pFormat->GetName())
m_pStyleLB->InsertEntry(pBase->GetName());
if (!m_pFormat || pBase->GetName() != m_pFormat->GetName())
m_xStyleLB->append_text(pBase->GetName());
pBase = pPool->Next();
}
m_pStyleLB->SelectEntryPos(0);
m_xStyleLB->select(0);
for (size_t n = 0; n < m_aStrArr.size(); ++n)
{
OUString aEntry( m_aStrArr[n] + "\t" );
m_xTbLinks->append_text(m_aStrArr[n]);
const SwCollCondition* pCond = nullptr;
if( m_pFormat && RES_CONDTXTFMTCOLL == m_pFormat->Which() &&
@@ -196,115 +165,106 @@ void SwCondCollPage::Reset(const SfxItemSet *)
HasCondition( SwCollCondition( nullptr, m_pCmds[n].nCnd, m_pCmds[n].nSubCond ) ) )
&& pCond->GetTextFormatColl() )
{
aEntry += pCond->GetTextFormatColl()->GetName();
m_xTbLinks->set_text(n, pCond->GetTextFormatColl()->GetName(), 1);
}
SvTreeListEntry* pE = m_pTbLinks->InsertEntryToColumn( aEntry, n );
if(0 == n)
m_pTbLinks->Select(pE);
if (0 == n)
{
m_xTbLinks->select(0);
SelectTreeListBoxHdl(*m_xTbLinks);
}
}
}
IMPL_LINK( SwCondCollPage, OnOffHdl, Button*, pBox, void )
IMPL_LINK(SwCondCollPage, OnOffHdl, weld::ToggleButton&, rBox, void)
{
const bool bEnable = static_cast<CheckBox*>(pBox)->IsChecked();
m_pContextFT->Enable( bEnable );
m_pUsedFT->Enable( bEnable );
m_pTbLinks->EnableList( bEnable );
m_pStyleFT->Enable( bEnable );
m_pStyleLB->Enable( bEnable );
m_pFilterLB->Enable( bEnable );
m_pRemovePB->Enable( bEnable );
m_pAssignPB->Enable( bEnable );
if( bEnable )
const bool bEnable = rBox.get_active();
m_xContextFT->set_sensitive(bEnable);
m_xUsedFT->set_sensitive(bEnable);
m_xTbLinks->set_sensitive(bEnable);
m_xStyleFT->set_sensitive(bEnable);
m_xStyleLB->set_sensitive(bEnable);
m_xFilterLB->set_sensitive(bEnable);
m_xRemovePB->set_sensitive(bEnable);
m_xAssignPB->set_sensitive(bEnable);
if (bEnable)
SelectHdl(nullptr);
}
IMPL_LINK( SwCondCollPage, AssignRemoveClickHdl, Button*, pBtn, void)
IMPL_LINK(SwCondCollPage, AssignRemoveClickHdl, weld::Button&, rBtn, void)
{
AssignRemove(pBtn);
AssignRemove(&rBtn);
}
IMPL_LINK( SwCondCollPage, AssignRemoveTreeListBoxHdl, SvTreeListBox*, pBtn, bool)
IMPL_LINK(SwCondCollPage, AssignRemoveTreeListBoxHdl, weld::TreeView&, rBtn, void)
{
AssignRemove(pBtn);
return true; // signal more to be done
AssignRemove(&rBtn);
}
IMPL_LINK( SwCondCollPage, AssignRemoveHdl, ListBox&, rBox, void)
void SwCondCollPage::AssignRemove(const weld::Widget* pBtn)
{
AssignRemove(&rBox);
}
void SwCondCollPage::AssignRemove(void const * pBtn)
{
SvTreeListEntry* pE = m_pTbLinks->FirstSelected();
if (!pE)
{
OSL_ENSURE(false, "where's the empty entry from?");
return;
}
sal_uLong const nPos(m_pTbLinks->GetModel()->GetAbsPos(pE));
if (LISTBOX_ENTRY_NOTFOUND == nPos)
int nPos = m_xTbLinks->get_selected_index();
if (nPos == -1)
{
return;
}
OUString sSel = m_aStrArr[nPos] + "\t";
const bool bAssEnabled = pBtn != m_pRemovePB && m_pAssignPB->IsEnabled();
m_pAssignPB->Enable( !bAssEnabled );
m_pRemovePB->Enable( bAssEnabled );
if ( bAssEnabled )
sSel += m_pStyleLB->GetSelectedEntry();
m_pTbLinks->SetUpdateMode(false);
m_pTbLinks->GetModel()->Remove(pE);
pE = m_pTbLinks->InsertEntryToColumn(sSel, nPos);
m_pTbLinks->Select(pE);
m_pTbLinks->MakeVisible(pE);
m_pTbLinks->SetUpdateMode(true);
const bool bAssEnabled = pBtn != m_xRemovePB.get() && m_xAssignPB->get_sensitive();
m_xAssignPB->set_sensitive(!bAssEnabled);
m_xRemovePB->set_sensitive(bAssEnabled);
if (bAssEnabled)
m_xTbLinks->set_text(nPos, m_xStyleLB->get_selected_text(), 1);
else
m_xTbLinks->set_text(nPos, "", 1);
}
IMPL_LINK( SwCondCollPage, SelectTreeListBoxHdl, SvTreeListBox*, pBox, void)
{
SelectHdl(pBox);
}
IMPL_LINK( SwCondCollPage, SelectListBoxHdl, ListBox&, rBox, void)
IMPL_LINK(SwCondCollPage, SelectTreeListBoxHdl, weld::TreeView&, rBox, void)
{
SelectHdl(&rBox);
}
void SwCondCollPage::SelectHdl(void const * pBox)
IMPL_LINK(SwCondCollPage, SelectListBoxHdl, weld::ComboBox&, rBox, void)
{
if (pBox == m_pFilterLB)
SelectHdl(&rBox);
}
void SwCondCollPage::SelectHdl(const weld::Widget* pBox)
{
if (pBox == m_xFilterLB.get())
{
m_pStyleLB->Clear();
const sal_Int32 nSelPos = static_cast<ListBox const *>(pBox)->GetSelectedEntryPos();
const SfxStyleSearchBits nSearchFlags = static_cast<SfxStyleSearchBits>(reinterpret_cast<sal_IntPtr>(m_pFilterLB->GetEntryData(nSelPos)));
m_xStyleLB->clear();
const sal_Int32 nSelPos = m_xFilterLB->get_active();
const SfxStyleSearchBits nSearchFlags = static_cast<SfxStyleSearchBits>(m_xFilterLB->get_id(nSelPos).toInt32());
SfxStyleSheetBasePool* pPool = m_rSh.GetView().GetDocShell()->GetStyleSheetPool();
pPool->SetSearchMask(SfxStyleFamily::Para, nSearchFlags);
const SfxStyleSheetBase* pBase = pPool->First();
while( pBase )
bool bEmpty = true;
while (pBase)
{
if(!m_pFormat || pBase->GetName() != m_pFormat->GetName())
m_pStyleLB->InsertEntry(pBase->GetName());
if (!m_pFormat || pBase->GetName() != m_pFormat->GetName())
{
m_xStyleLB->append_text(pBase->GetName());
bEmpty = false;
}
pBase = pPool->Next();
}
m_pStyleLB->SelectEntryPos(0);
SelectHdl(m_pStyleLB);
if (!bEmpty)
m_xStyleLB->select(bEmpty ? -1 : 0);
SelectHdl(m_xStyleLB.get());
}
else
{
SvTreeListEntry* pE = m_pTbLinks->FirstSelected();
const OUString sTbEntry = pE
? m_pTbLinks->GetEntryText(pE).getToken(1, '\t')
int nSelected = m_xTbLinks->get_selected_index();
const OUString sTbEntry = nSelected != -1
? m_xTbLinks->get_text(nSelected, 1)
: OUString();
const OUString sStyle = m_pStyleLB->GetSelectedEntry();
const OUString sStyle = m_xStyleLB->get_selected_text();
m_pAssignPB->Enable( sStyle != sTbEntry && m_pConditionCB->IsChecked() );
m_xAssignPB->set_sensitive(sStyle != sTbEntry && m_xConditionCB->get_active());
if(pBox != m_pStyleLB)
m_pRemovePB->Enable( m_pConditionCB->IsChecked() && !sTbEntry.isEmpty() );
if (pBox != m_xStyleLB.get())
m_xRemovePB->set_sensitive(m_xConditionCB->get_active() && !sTbEntry.isEmpty());
}
}
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index ae4c5bc..caf1759 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -21,8 +21,8 @@
#include <swtypes.hxx>
#include <mailconfigpage.hxx>
#include <svtools/svmedit.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/headbar.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <mmconfigitem.hxx>
#include <mailmergehelper.hxx>
#include <cmdid.h>
diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx
index 5344092..9e94c7f 100644
--- a/sw/source/ui/dbui/addresslistdialog.hxx
+++ b/sw/source/ui/dbui/addresslistdialog.hxx
@@ -21,8 +21,8 @@
#include <sfx2/basedlgs.hxx>
#include <vcl/button.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/headbar.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <swdbdata.hxx>
#include <sharedconnection.hxx>
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index d671a90..3033f7e 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -27,7 +27,7 @@
#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
#include <svtools/svmedit.hxx>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <vcl/treelistbox.hxx>
#include <vcl/combobox.hxx>
#include <svl/lstner.hxx>
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index a26ee9f..01709ea 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -29,8 +29,8 @@
#include <sfx2/objsh.hxx>
#include <sfx2/basedlgs.hxx>
#include <svtools/simptabl.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/headbar.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <mailmergehelper.hxx>
class SwMailMergeWizard;
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index cb54e8ee..37eac60 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -21,7 +21,7 @@
#include <svl/stritem.hxx>
#include <vcl/weld.hxx>
#include <vcl/builderfactory.hxx>
#include <svtools/headbar.hxx>
#include <vcl/headbar.hxx>
#include <vcl/treelistentry.hxx>
#include <com/sun/star/text/XBookmarksSupplier.hpp>
diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx
index 216bae4..12b9ca2 100644
--- a/sw/source/uibase/inc/glosbib.hxx
+++ b/sw/source/uibase/inc/glosbib.hxx
@@ -24,7 +24,7 @@
#include <svx/stddlg.hxx>
#include <vcl/lstbox.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx
index e355c32..f8e2449 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.hxx
@@ -20,26 +20,13 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_SWUICCOLL_HXX
#include <sfx2/tabdlg.hxx>
#include <svtools/svtabbx.hxx>
#include <vcl/svtabbx.hxx>
class SwWrtShell;
class SwFormat;
class SwCondCollPage : public SfxTabPage
{
VclPtr<CheckBox> m_pConditionCB;
VclPtr<FixedText> m_pContextFT;
VclPtr<FixedText> m_pUsedFT;
VclPtr<SvTabListBox> m_pTbLinks;
VclPtr<FixedText> m_pStyleFT;
VclPtr<ListBox> m_pStyleLB;
VclPtr<ListBox> m_pFilterLB;
VclPtr<PushButton> m_pRemovePB;
VclPtr<PushButton> m_pAssignPB;
std::vector<OUString> m_aStrArr;
SwWrtShell &m_rSh;
@@ -48,19 +35,27 @@ class SwCondCollPage : public SfxTabPage
bool m_bNewTemplate;
std::unique_ptr<weld::CheckButton> m_xConditionCB;
std::unique_ptr<weld::Label> m_xContextFT;
std::unique_ptr<weld::Label> m_xUsedFT;
std::unique_ptr<weld::TreeView> m_xTbLinks;
std::unique_ptr<weld::Label> m_xStyleFT;
std::unique_ptr<weld::TreeView> m_xStyleLB;
std::unique_ptr<weld::ComboBox> m_xFilterLB;
std::unique_ptr<weld::Button> m_xRemovePB;
std::unique_ptr<weld::Button> m_xAssignPB;
virtual ~SwCondCollPage() override;
virtual void dispose() override;
virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override;
DECL_LINK( OnOffHdl, Button*, void );
DECL_LINK( AssignRemoveHdl, ListBox&, void);
DECL_LINK( AssignRemoveTreeListBoxHdl, SvTreeListBox*, bool);
DECL_LINK( AssignRemoveClickHdl, Button*, void);
DECL_LINK( SelectTreeListBoxHdl, SvTreeListBox*, void );
DECL_LINK( SelectListBoxHdl, ListBox&, void );
void AssignRemove(void const *);
void SelectHdl(void const *);
DECL_LINK(OnOffHdl, weld::ToggleButton&, void);
DECL_LINK(AssignRemoveTreeListBoxHdl, weld::TreeView&, void);
DECL_LINK(AssignRemoveClickHdl, weld::Button&, void);
DECL_LINK(SelectTreeListBoxHdl, weld::TreeView&, void);
DECL_LINK(SelectListBoxHdl, weld::ComboBox&, void);
void AssignRemove(const weld::Widget*);
void SelectHdl(const weld::Widget*);
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
@@ -68,7 +63,7 @@ class SwCondCollPage : public SfxTabPage
static const sal_uInt16 m_aPageRg[];
public:
SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet);
SwCondCollPage(TabPageParent pParent, const SfxItemSet &rSet);
static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
static const sal_uInt16* GetRanges() { return m_aPageRg; }
diff --git a/sw/uiconfig/swriter/ui/conditionpage.ui b/sw/uiconfig/swriter/ui/conditionpage.ui
index fc1bc0d..bce9a36 100644
--- a/sw/uiconfig/swriter/ui/conditionpage.ui
+++ b/sw/uiconfig/swriter/ui/conditionpage.ui
@@ -1,7 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
<object class="GtkTreeStore" id="liststore1">
<columns>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name text2 -->
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkTreeStore" id="liststore2">
<columns>
<!-- column-name text -->
<column type="gchararray"/>
<!-- column-name id -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkGrid" id="ConditionPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -45,14 +63,13 @@
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<accessibility>
<relation type="label-for" target="links:border"/>
<relation type="label-for" target="links"/>
</accessibility>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -66,8 +83,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -80,8 +95,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -91,33 +104,69 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="conditionpage|styleft">_Paragraph Styles</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">styles</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="svtlo-SvTabListBox" id="links:border">
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<accessibility>
<relation type="labelled-by" target="condstyle"/>
</accessibility>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Tab List-selection1"/>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="links">
<property name="width_request">-1</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore1</property>
<property name="headers_visible">False</property>
<property name="search_column">0</property>
<property name="show_expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library List-selection1"/>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn1">
<property name="resizable">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkCellRendererText" id="cellrenderer1"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn2">
<property name="resizable">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkCellRendererText" id="cellrenderer2"/>
<attributes>
<attribute name="text">1</attribute>
</attributes>
</child>
</object>
</child>
<accessibility>
<relation type="labelled-by" target="condstyle"/>
</accessibility>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -162,7 +211,6 @@
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">3</property>
<property name="height">1</property>
</packing>
</child>
<child>
@@ -172,15 +220,39 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkTreeView" id="styles:border">
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="show_expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="styles">
<property name="width_request">-1</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore2</property>
<property name="headers_visible">False</property>
<property name="search_column">0</property>
<property name="show_expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library List-selection2"/>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn3">
<property name="spacing">6</property>
<child>
<object class="GtkCellRendererText" id="cellrenderer4"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
</child>
</object>
</child>
</object>
<packing>
@@ -194,8 +266,6 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
<item translatable="yes" context="conditionpage|filter">Table Header</item>
<item translatable="yes" context="conditionpage|filter">Table</item>
@@ -237,8 +307,6 @@
<packing>
<property name="left_attach">2</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
@@ -259,8 +327,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 219433f..f50c8ff 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -6489,6 +6489,18 @@ css::uno::Reference< css::accessibility::XAccessibleContext > VCLXToolBox::Creat
return getAccessibleFactory().createAccessibleContext( this );
}
VCLXHeaderBar::VCLXHeaderBar()
{
}
VCLXHeaderBar::~VCLXHeaderBar()
{
}
css::uno::Reference< css::accessibility::XAccessibleContext > VCLXHeaderBar::CreateAccessibleContext()
{
return getAccessibleFactory().createAccessibleContext( this );
}
// class VCLXFrame
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index bc7ed5db..37f6ea9 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -112,6 +112,11 @@ namespace toolkit
return nullptr;
}
css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleContext( VCLXHeaderBar* /*_pXWindow*/ ) override
{
return nullptr;
}
css::uno::Reference< css::accessibility::XAccessibleContext >
createAccessibleContext( VCLXWindow* /*_pXWindow*/ ) override
{
return nullptr;
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index f838fa5..46bd223 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -96,6 +96,8 @@ static css::uno::Reference< css::awt::XWindowPeer > CreateXWindow( vcl::Window c
case WindowType::TOOLBOX: return new VCLXToolBox;
case WindowType::TABCONTROL: return new VCLXMultiPage;
case WindowType::HEADERBAR: return new VCLXHeaderBar;
// case WindowType::FIXEDLINE:
// case WindowType::FIXEDBITMAP:
// case WindowType::DATEBOX:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 855cf2df..4bd1469 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -230,10 +230,12 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/outdev/vclreferencebase \
vcl/source/outdev/nativecontrols \
vcl/source/outdev/map \
vcl/source/treelist/headbar \
vcl/source/treelist/imap \
vcl/source/treelist/imap2 \
vcl/source/treelist/imap3 \
vcl/source/treelist/inetimg \
vcl/source/treelist/svtabbx \
vcl/source/treelist/transfer \
vcl/source/treelist/transfer2 \
vcl/source/treelist/viewdataentry \
@@ -351,6 +353,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/helper/evntpost \
vcl/source/helper/lazydelete \
vcl/source/helper/strhelper \
vcl/source/helper/svtaccessiblefactory \
vcl/source/helper/threadex \
vcl/source/app/brand \
vcl/source/app/customweld \
diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc
index 79de52c..4b33177 100644
--- a/vcl/inc/strings.hrc
+++ b/vcl/inc/strings.hrc
@@ -139,6 +139,10 @@
#define STR_TEXTUNDO_INSERTCHARS NC_("STR_TEXTUNDO_INSERTCHARS", "insert '$1'")
#define STR_TEXTUNDO_REMOVECHARS NC_("STR_TEXTUNDO_REMOVECHARS", "delete '$1'")
// descriptions of accessible objects
#define STR_SVT_ACC_DESC_TABLISTBOX NC_("STR_SVT_ACC_DESC_TABLISTBOX", "Row: %1, Column: %2")
#define STR_SVT_ACC_EMPTY_FIELD NC_("STR_SVT_ACC_EMPTY_FIELD", "Empty Field")
#endif // INCLUDED_VCL_INC_STRINGS_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index ea574dd..248ea5b 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -45,9 +45,9 @@
#include <vcl/slider.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/svlbitm.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/treelistbox.hxx>
#include <vcl/treelistentry.hxx>
#include <vcl/toolkit/unowrap.hxx>
#include <vcl/weld.hxx>
@@ -1039,7 +1039,7 @@ public:
virtual int get_vscroll_width() const override
{
return m_xScrolledWindow->getVertScrollBar().GetSizePixel().Width();
return m_xScrolledWindow->getVertScrollBar().get_preferred_size().Width();
}
virtual void set_user_managed_scrolling() override
@@ -1764,14 +1764,14 @@ class SalInstanceTreeView : public SalInstanceContainer, public virtual weld::Tr
private:
// owner for UserData
std::vector<std::unique_ptr<OUString>> m_aUserData;
VclPtr<SvTreeListBox> m_xTreeView;
VclPtr<SvTabListBox> m_xTreeView;
DECL_LINK(SelectHdl, SvTreeListBox*, void);
DECL_LINK(DoubleClickHdl, SvTreeListBox*, bool);
DECL_LINK(ExpandingHdl, SvTreeListBox*, bool);
public:
SalInstanceTreeView(SvTreeListBox* pTreeView, bool bTakeOwnership)
SalInstanceTreeView(SvTabListBox* pTreeView, bool bTakeOwnership)
: SalInstanceContainer(pTreeView, bTakeOwnership)
, m_xTreeView(pTreeView)
{
@@ -1779,6 +1779,16 @@ public:
m_xTreeView->SetSelectHdl(LINK(this, SalInstanceTreeView, SelectHdl));
m_xTreeView->SetDoubleClickHdl(LINK(this, SalInstanceTreeView, DoubleClickHdl));
m_xTreeView->SetExpandingHdl(LINK(this, SalInstanceTreeView, ExpandingHdl));
const long aTabPositions[] = { 0 };
m_xTreeView->SetTabs(SAL_N_ELEMENTS(aTabPositions), aTabPositions);
}
virtual void set_column_fixed_widths(const std::vector<int>& rWidths) override
{
std::vector<long> aTabPositions;
aTabPositions.push_back(0);
aTabPositions.insert(aTabPositions.end(), rWidths.begin(), rWidths.end());
m_xTreeView->SetTabs(aTabPositions.size(), aTabPositions.data(), MapUnit::MapPixel);
}
virtual void insert(weld::TreeIter* pParent, int pos, const OUString& rStr, const OUString* pId,
@@ -1916,10 +1926,44 @@ public:
return aRows;
}
virtual OUString get_text(int pos) const override
virtual OUString get_text(int pos, int col) const override
{
SvTreeListEntry* pEntry = m_xTreeView->GetEntry(nullptr, pos);
return m_xTreeView->GetEntryText(pEntry);
if (col == -1)
return SvTabListBox::GetEntryText(pEntry, 0);
if (static_cast<size_t>(col) == pEntry->ItemCount())
return OUString();
assert(col >= 0 && static_cast<size_t>(col) < pEntry->ItemCount());
SvLBoxItem& rItem = pEntry->GetItem(col);
assert(dynamic_cast<SvLBoxString*>(&rItem));
return static_cast<SvLBoxString&>(rItem).GetText();
}
virtual void set_text(int pos, const OUString& rText, int col) override
{
SvTreeListEntry* pEntry = m_xTreeView->GetEntry(nullptr, pos);
if (col == -1)
{
m_xTreeView->SetEntryText(pEntry, rText);
return;
}
++col; //skip dummy/expander column
if (static_cast<size_t>(col) == pEntry->ItemCount())
{
pEntry->AddItem(o3tl::make_unique<SvLBoxString>(rText));
}
else
{
assert(col >= 0 && static_cast<size_t>(col) < pEntry->ItemCount());
SvLBoxItem& rItem = pEntry->GetItem(col);
assert(dynamic_cast<SvLBoxString*>(&rItem));
static_cast<SvLBoxString&>(rItem).SetText(rText);
}
m_xTreeView->ModelHasEntryInvalidated(pEntry);
}
const OUString* getEntryData(int index) const
@@ -2115,7 +2159,7 @@ public:
m_xTreeView->SetStyle(m_xTreeView->GetStyle() | WB_SORT);
}
SvTreeListBox& getTreeView()
SvTabListBox& getTreeView()
{
return *m_xTreeView;
}
@@ -3248,7 +3292,7 @@ public:
virtual std::unique_ptr<weld::TreeView> weld_tree_view(const OString &id, bool bTakeOwnership) override
{
SvTreeListBox* pTreeView = m_xBuilder->get<SvTreeListBox>(id);
SvTabListBox* pTreeView = m_xBuilder->get<SvTabListBox>(id);
return pTreeView ? o3tl::make_unique<SalInstanceTreeView>(pTreeView, bTakeOwnership) : nullptr;
}
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/vcl/source/helper/svtaccessiblefactory.cxx
similarity index 88%
rename from svtools/source/misc/svtaccessiblefactory.cxx
rename to vcl/source/helper/svtaccessiblefactory.cxx
index c8fe74f..2f14100 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/vcl/source/helper/svtaccessiblefactory.cxx
@@ -19,14 +19,14 @@
#include <config_features.h>
#include <svtaccessiblefactory.hxx>
#include <vcl/svtaccessiblefactory.hxx>
#include <tools/svlibrary.h>
#include <osl/module.h>
#include <osl/diagnose.h>
namespace svt
namespace vcl
{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
@@ -58,7 +58,7 @@ namespace svt
public:
// IAccessibleFactory
virtual IAccessibleTabListBox*
virtual vcl::IAccessibleTabListBox*
createAccessibleTabListBox(
const css::uno::Reference< css::accessibility::XAccessible >& /*rxParent*/,
SvHeaderTabListBox& /*rBox*/
@@ -67,10 +67,19 @@ namespace svt
return nullptr;
}
virtual IAccessibleBrowseBox*
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleTreeListBox(
SvTreeListBox& /*_rListBox*/,
const css::uno::Reference< css::accessibility::XAccessible >& /*_xParent*/
) const override
{
return nullptr;
}
virtual vcl::IAccessibleBrowseBox*
createAccessibleBrowseBox(
const css::uno::Reference< css::accessibility::XAccessible >& /*_rxParent*/,
IAccessibleTableProvider& /*_rBrowseBox*/
vcl::IAccessibleTableProvider& /*_rBrowseBox*/
) const override
{
return nullptr;
@@ -113,8 +122,8 @@ namespace svt
virtual css::uno::Reference< css::accessibility::XAccessible >
createAccessibleBrowseBoxHeaderBar(
const css::uno::Reference< css::accessibility::XAccessible >& /*rxParent*/,
IAccessibleTableProvider& /*_rOwningTable*/,
AccessibleBrowseBoxObjType /*_eObjType*/
vcl::IAccessibleTableProvider& /*_rOwningTable*/,
vcl::AccessibleBrowseBoxObjType /*_eObjType*/
) const override
{
return nullptr;
@@ -123,7 +132,7 @@ namespace svt
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*/,
@@ -137,9 +146,9 @@ namespace svt
createAccessibleBrowseBoxHeaderCell(
sal_Int32 /*_nColumnRowId*/,
const css::uno::Reference< css::accessibility::XAccessible >& /*rxParent*/,
IAccessibleTableProvider& /*_rBrowseBox*/,
vcl::IAccessibleTableProvider& /*_rBrowseBox*/,
const css::uno::Reference< css::awt::XWindow >& /*_xFocusWindow*/,
AccessibleBrowseBoxObjType /*_eObjType*/
vcl::AccessibleBrowseBoxObjType /*_eObjType*/
) const override
{
return nullptr;
@@ -148,7 +157,7 @@ namespace svt
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*/,
@@ -164,7 +173,7 @@ namespace svt
const css::uno::Reference< css::accessibility::XAccessible >& /*_rxParent*/,
const css::uno::Reference< css::accessibility::XAccessible >& /*_rxControlAccessible*/,
const css::uno::Reference< css::awt::XWindow >& /*_rxFocusWindow*/,
IAccessibleTableProvider& /*_rBrowseBox*/,
vcl::IAccessibleTableProvider& /*_rBrowseBox*/,
sal_Int32 /*_nRowPos*/,
sal_uInt16 /*_nColPos*/
) const override
@@ -256,7 +265,6 @@ namespace svt
return *s_pFactory;
}
} // namespace svt
} // namespace vcl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/headbar.cxx b/vcl/source/treelist/headbar.cxx
similarity index 98%
rename from svtools/source/control/headbar.cxx
rename to vcl/source/treelist/headbar.cxx
index e00a9bd..95d6584 100644
--- a/svtools/source/control/headbar.cxx
+++ b/vcl/source/treelist/headbar.cxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <svtools/headbar.hxx>
#include <vclxaccessibleheaderbar.hxx>
#include <vcl/headbar.hxx>
#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
@@ -96,10 +95,11 @@ void HeaderBar::ImplInit( WinBits nWinStyle )
ImplInitSettings( true, true, true );
}
HeaderBar::HeaderBar( vcl::Window* pParent, WinBits nWinStyle ) :
Window( pParent, nWinStyle & WB_3DLOOK )
HeaderBar::HeaderBar(vcl::Window* pParent, WinBits nWinStyle)
: Window(pParent, nWinStyle & WB_3DLOOK)
{
ImplInit( nWinStyle );
SetType(WindowType::HEADERBAR);
ImplInit(nWinStyle);
SetSizePixel( CalcWindowSizePixel() );
}
@@ -1351,17 +1351,4 @@ void HeaderBar::SetAccessible( const css::uno::Reference< css::accessibility::XA
mxAccessible = _xAccessible;
}
css::uno::Reference< css::awt::XWindowPeer > HeaderBar::GetComponentInterface( bool bCreate )
{
css::uno::Reference< css::awt::XWindowPeer > xPeer
(Window::GetComponentInterface(false));
if ( !xPeer.is() && bCreate )
{
css::awt::XWindowPeer* pPeer = new VCLXHeaderBar(this);
SetComponentInterface(pPeer);
return pPeer;
}
else
return xPeer;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/contnr/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
similarity index 95%
rename from svtools/source/contnr/svtabbx.cxx
rename to vcl/source/treelist/svtabbx.cxx
index 672fe54..72c7a8f 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -17,20 +17,20 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <memory>
#include <svtools/svtabbx.hxx>
#include <svtools/headbar.hxx>
#include <svtools/svtresid.hxx>
#include <vcl/svtaccessiblefactory.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/headbar.hxx>
#include <vcl/svlbitm.hxx>
#include <svtools/strings.hrc>
#include <vcl/treelistentry.hxx>
#include <vcl/builderfactory.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <svtaccessiblefactory.hxx>
#include <o3tl/make_unique.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
#include <strings.hrc>
#include <svdata.hxx>
#include <memory>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::accessibility;
@@ -90,6 +90,7 @@ void SvTabListBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr,
pEntry->AddItem(o3tl::make_unique<SvLBoxString>(aToken));
}
}
SvTabListBox::SvTabListBox( vcl::Window* pParent, WinBits nBits )
: SvTreeListBox( pParent, nBits )
{
@@ -388,7 +389,7 @@ OUString SvTabListBox::GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const
{
OUString sRet = static_cast<const SvLBoxString&>(rBoxItem).GetText();
if ( sRet.isEmpty() )
sRet = SvtResId( STR_SVT_ACC_EMPTY_FIELD );
sRet = VclResId( STR_SVT_ACC_EMPTY_FIELD );
return sRet;
}
--nCol;
@@ -468,7 +469,7 @@ long SvTabListBox::GetLogicTab( sal_uInt16 nTab )
return aTabs[ nTab ]->GetPos();
}
namespace svt
namespace vcl
{
struct SvHeaderTabListBoxImpl
{
@@ -482,7 +483,7 @@ namespace svt
SvHeaderTabListBox::SvHeaderTabListBox( vcl::Window* pParent, WinBits nWinStyle )
: SvTabListBox(pParent, nWinStyle)
, m_bFirstPaint(true)
, m_pImpl(new ::svt::SvHeaderTabListBoxImpl)
, m_pImpl(new ::vcl::SvHeaderTabListBoxImpl)
, m_pAccessible(nullptr)
{
}
@@ -598,7 +599,7 @@ IMPL_LINK_NOARG(SvHeaderTabListBox, CreateAccessibleHdl_Impl, HeaderBar*, void)
if ( xAccParent.is() )
{
Reference< XAccessible > xAccessible = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxHeaderBar(
xAccParent, *this, ::svt::BBTYPE_COLUMNHEADERBAR );
xAccParent, *this, ::vcl::BBTYPE_COLUMNHEADERBAR );
m_pImpl->m_pHeaderBar->SetAccessible( xAccessible );
}
}
@@ -879,13 +880,12 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleColumnHeader( sal_u
// no -> create new header cell
xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxHeaderCell(
_nColumn, m_pAccessible->getHeaderBar(),
*this, nullptr, ::svt::BBTYPE_COLUMNHEADERCELL
*this, nullptr, ::vcl::BBTYPE_COLUMNHEADERCELL
);
// insert into list
m_aAccessibleChildren[ _nColumn ] = xChild;
}
return xChild;
}
@@ -920,19 +920,19 @@ bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Point& )
return false;
}
OUString SvHeaderTabListBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const
OUString SvHeaderTabListBox::GetAccessibleObjectName( ::vcl::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const
{
OUString aRetText;
switch( _eType )
{
case ::svt::BBTYPE_BROWSEBOX:
case ::svt::BBTYPE_TABLE:
case ::svt::BBTYPE_COLUMNHEADERBAR:
case ::vcl::BBTYPE_BROWSEBOX:
case ::vcl::BBTYPE_TABLE:
case ::vcl::BBTYPE_COLUMNHEADERBAR:
// should be empty now (see #i63983)
aRetText.clear();
break;
case ::svt::BBTYPE_TABLECELL:
case ::vcl::BBTYPE_TABLECELL:
{
// here we need a valid pos, we can not handle -1
if ( _nPos >= 0 )
@@ -947,18 +947,18 @@ OUString SvHeaderTabListBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBox
}
break;
}
case ::svt::BBTYPE_CHECKBOXCELL:
case ::vcl::BBTYPE_CHECKBOXCELL:
{
break; // checkbox cells have no name
}
case ::svt::BBTYPE_COLUMNHEADERCELL:
case ::vcl::BBTYPE_COLUMNHEADERCELL:
{
aRetText = m_pImpl->m_pHeaderBar->GetItemText( m_pImpl->m_pHeaderBar->GetItemId( static_cast<sal_uInt16>(_nPos) ) );
break;
}
case ::svt::BBTYPE_ROWHEADERBAR:
case ::svt::BBTYPE_ROWHEADERCELL:
case ::vcl::BBTYPE_ROWHEADERBAR:
case ::vcl::BBTYPE_ROWHEADERCELL:
aRetText = "error";
break;
@@ -968,11 +968,11 @@ OUString SvHeaderTabListBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBox
return aRetText;
}
OUString SvHeaderTabListBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const
OUString SvHeaderTabListBox::GetAccessibleObjectDescription( ::vcl::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const
{
OUString aRetText;
if( _eType == ::svt::BBTYPE_TABLECELL && _nPos != -1 )
if( _eType == ::vcl::BBTYPE_TABLECELL && _nPos != -1 )
{
const OUString sVar1( "%1" );
const OUString sVar2( "%2" );
@@ -983,7 +983,7 @@ OUString SvHeaderTabListBox::GetAccessibleObjectDescription( ::svt::AccessibleBr
sal_Int32 nRow = _nPos / nColumnCount;
sal_uInt16 nColumn = static_cast< sal_uInt16 >( _nPos % nColumnCount );
OUString aText( SvtResId(STR_SVT_ACC_DESC_TABLISTBOX) );
OUString aText( VclResId(STR_SVT_ACC_DESC_TABLISTBOX) );
aText = aText.replaceFirst( sVar1, OUString::number( nRow ) );
OUString sColHeader = m_pImpl->m_pHeaderBar->GetItemText( m_pImpl->m_pHeaderBar->GetItemId( nColumn ) );
if ( sColHeader.isEmpty() )
@@ -996,12 +996,12 @@ OUString SvHeaderTabListBox::GetAccessibleObjectDescription( ::svt::AccessibleBr
return aRetText;
}
void SvHeaderTabListBox::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const
void SvHeaderTabListBox::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::vcl::AccessibleBrowseBoxObjType _eType ) const
{
switch( _eType )
{
case ::svt::BBTYPE_BROWSEBOX:
case ::svt::BBTYPE_TABLE:
case ::vcl::BBTYPE_BROWSEBOX:
case ::vcl::BBTYPE_TABLE:
{
_rStateSet.AddState( AccessibleStateType::FOCUSABLE );
if ( HasFocus() )
@@ -1015,7 +1015,7 @@ void SvHeaderTabListBox::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper
}
if ( IsReallyVisible() )
_rStateSet.AddState( AccessibleStateType::VISIBLE );
if ( _eType == ::svt::BBTYPE_TABLE )
if ( _eType == ::vcl::BBTYPE_TABLE )
{
if ( AreChildrenTransient() )
@@ -1025,7 +1025,7 @@ void SvHeaderTabListBox::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper
break;
}
case ::svt::BBTYPE_COLUMNHEADERBAR:
case ::vcl::BBTYPE_COLUMNHEADERBAR:
{
sal_Int32 nCurRow = GetCurrRow();
sal_uInt16 nCurColumn = GetCurrColumn();
@@ -1037,8 +1037,8 @@ void SvHeaderTabListBox::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper
break;
}
case ::svt::BBTYPE_ROWHEADERCELL:
case ::svt::BBTYPE_COLUMNHEADERCELL:
case ::vcl::BBTYPE_ROWHEADERCELL:
case ::vcl::BBTYPE_COLUMNHEADERCELL:
{
_rStateSet.AddState( AccessibleStateType::VISIBLE );
_rStateSet.AddState( AccessibleStateType::FOCUSABLE );
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index ec0244c..c1269b2 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -3587,12 +3587,23 @@ void SvTreeListBox::EnableContextMenuHandling()
pImpl->bContextMenuHandling = true;
}
void SvTreeListBox::EnableList( bool _bEnable )
css::uno::Reference< XAccessible > SvTreeListBox::CreateAccessible()
{
// call base class method
Window::Enable(_bEnable);
// then invalidate
Invalidate(tools::Rectangle(Point(), GetSizePixel()));
vcl::Window* pParent = GetAccessibleParentWindow();
DBG_ASSERT( pParent, "SvTreeListBox::CreateAccessible - accessible parent not found" );
css::uno::Reference< XAccessible > xAccessible;
if ( pParent )
{
css::uno::Reference< XAccessible > xAccParent = pParent->GetAccessible();
if ( xAccParent.is() )
{
// need to be done here to get the vclxwindow later on in the accessible
css::uno::Reference< css::awt::XWindowPeer > xTemp(GetComponentInterface());
xAccessible = pImpl->m_aFactoryAccess.getFactory().createAccessibleTreeListBox( *this, xAccParent );
}
}
return xAccessible;
}
void SvTreeListBox::FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 6e78233..acd8195 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -36,11 +36,11 @@
#include <vcl/prgsbar.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/svapp.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/throbber.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/treelistbox.hxx>
#include <vcl/treelistentry.hxx>
#include <vcl/vclmedit.hxx>
#include <vcl/settings.hxx>
@@ -518,7 +518,7 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr
vcl::Window* pTarget = get<vcl::Window>(elem.m_sID);
ListBox *pListBoxTarget = dynamic_cast<ListBox*>(pTarget);
ComboBox *pComboBoxTarget = dynamic_cast<ComboBox*>(pTarget);
SvTreeListBox *pTreeBoxTarget = dynamic_cast<SvTreeListBox*>(pTarget);
SvTabListBox *pTreeBoxTarget = dynamic_cast<SvTabListBox*>(pTarget);
// pStore may be empty
const ListStore *pStore = get_model_by_name(elem.m_sValue.toUtf8());
SAL_WARN_IF(!pListBoxTarget && !pComboBoxTarget && !pTreeBoxTarget, "vcl", "missing elements of combobox");
@@ -1872,10 +1872,10 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
else if (name == "GtkTreeView")
{
//To-Do
//a) make SvTreeListBox the default target for GtkTreeView
//a) make SvTabListBox the default target for GtkTreeView
//b) remove the non-drop down mode of ListBox and convert
// everything over to SvTreeListBox
//c) remove the users of makeSvTreeListBox
// everything over to SvTabListBox
//c) remove the users of makeSvTabListBox and makeSvTreeListBox
extractModel(id, rMap);
WinBits nWinStyle = WB_CLIPCHILDREN|WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
if (m_bLegacy)
@@ -1884,7 +1884,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
if (!sBorder.isEmpty())
nWinStyle |= WB_BORDER;
}
//ListBox/SvTreeListBox manages its own scrolling,
//ListBox/SvTabListBox manages its own scrolling,
vcl::Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle);
if (pRealParent != pParent)
nWinStyle |= WB_BORDER;
@@ -1892,7 +1892,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
xWindow = VclPtr<ListBox>::Create(pRealParent, nWinStyle);
else
{
VclPtrInstance<SvTreeListBox> xBox(pRealParent, nWinStyle | WB_HASBUTTONS | WB_HASBUTTONSATROOT);
VclPtrInstance<SvTabListBox> xBox(pRealParent, nWinStyle);
xBox->SetNoAutoCurEntry(true);
xBox->SetHighlightRange(); // select over the whole width
xWindow = xBox;
@@ -4081,7 +4081,7 @@ void VclBuilder::mungeModel(ListBox &rTarget, const ListStore &rStore, sal_uInt1
rTarget.SelectEntryPos(nActiveId);
}
void VclBuilder::mungeModel(SvTreeListBox &rTarget, const ListStore &rStore, sal_uInt16 nActiveId)
void VclBuilder::mungeModel(SvTabListBox &rTarget, const ListStore &rStore, sal_uInt16 nActiveId)
{
for (auto const& entry : rStore.m_aEntries)
{
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 8856693..c5b3d3e 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -4049,63 +4049,6 @@ namespace
return pixbuf;
}
void insert_row(GtkTreeStore* pTreeStore, GtkTreeIter& iter, GtkTreeIter* parent, int pos, const OUString* pId, const OUString& rText,
const OUString* pIconName, VirtualDevice* pDevice, const OUString* pExpanderName)
{
if (!pIconName && !pDevice)
{
gtk_tree_store_insert_with_values(pTreeStore, &iter, parent, pos,
0, OUStringToOString(rText, RTL_TEXTENCODING_UTF8).getStr(),
1, !pId ? nullptr : OUStringToOString(*pId, RTL_TEXTENCODING_UTF8).getStr(),
-1);
}
else
{
if (pIconName)
{
GdkPixbuf* pixbuf = getPixbuf(*pIconName);
gtk_tree_store_insert_with_values(pTreeStore, &iter, parent, pos,
0, OUStringToOString(rText, RTL_TEXTENCODING_UTF8).getStr(),
1, !pId ? nullptr : OUStringToOString(*pId, RTL_TEXTENCODING_UTF8).getStr(),
2, pixbuf,
-1);
if (pixbuf)
g_object_unref(pixbuf);
}
else
{
cairo_surface_t* surface = get_underlying_cairo_surface(*pDevice);
Size aSize(pDevice->GetOutputSizePixel());
cairo_surface_t* target = cairo_surface_create_similar(surface,
cairo_surface_get_content(surface),
aSize.Width(),
aSize.Height());
cairo_t* cr = cairo_create(target);
cairo_set_source_surface(cr, surface, 0, 0);
cairo_paint(cr);
cairo_destroy(cr);
gtk_tree_store_insert_with_values(pTreeStore, &iter, parent, pos,
0, OUStringToOString(rText, RTL_TEXTENCODING_UTF8).getStr(),
1, !pId ? nullptr : OUStringToOString(*pId, RTL_TEXTENCODING_UTF8).getStr(),
3, target,
-1);
cairo_surface_destroy(target);
}
}
if (pExpanderName)
{
GdkPixbuf* pixbuf = getPixbuf(*pExpanderName);
gtk_tree_store_set(pTreeStore, &iter, 4, pixbuf, -1);
if (pixbuf)
g_object_unref(pixbuf);
}
}
}
namespace
@@ -4143,6 +4086,10 @@ private:
GtkTreeView* m_pTreeView;
GtkTreeStore* m_pTreeStore;
std::unique_ptr<comphelper::string::NaturalStringSorter> m_xSorter;
gint m_nTextCol;
gint m_nImageCol;
gint m_nExpanderImageCol;
gint m_nIdCol;
gulong m_nChangedSignalId;
gulong m_nRowActivatedSignalId;
gulong m_nTestExpandRowSignalId;
@@ -4168,6 +4115,48 @@ private:
pThis->signal_row_activated();
}
void insert_row(GtkTreeIter& iter, GtkTreeIter* parent, int pos, const OUString* pId, const OUString& rText,
const OUString* pIconName, VirtualDevice* pDevice, const OUString* pExpanderName)
{
gtk_tree_store_insert_with_values(m_pTreeStore, &iter, parent, pos,
m_nTextCol, OUStringToOString(rText, RTL_TEXTENCODING_UTF8).getStr(),
m_nIdCol, !pId ? nullptr : OUStringToOString(*pId, RTL_TEXTENCODING_UTF8).getStr(),
-1);
if (pIconName)
{
GdkPixbuf* pixbuf = getPixbuf(*pIconName);
gtk_tree_store_set(m_pTreeStore, &iter, m_nImageCol, pixbuf, -1);
if (pixbuf)
g_object_unref(pixbuf);
}
else if (pDevice)
{
cairo_surface_t* surface = get_underlying_cairo_surface(*pDevice);
Size aSize(pDevice->GetOutputSizePixel());
cairo_surface_t* target = cairo_surface_create_similar(surface,
cairo_surface_get_content(surface),
aSize.Width(),
aSize.Height());
cairo_t* cr = cairo_create(target);
cairo_set_source_surface(cr, surface, 0, 0);
cairo_paint(cr);
cairo_destroy(cr);
gtk_tree_store_set(m_pTreeStore, &iter, m_nImageCol, target, -1);
cairo_surface_destroy(target);
}
if (pExpanderName)
{
GdkPixbuf* pixbuf = getPixbuf(*pExpanderName);
gtk_tree_store_set(m_pTreeStore, &iter, m_nExpanderImageCol, pixbuf, -1);
if (pixbuf)
g_object_unref(pixbuf);
}
}
OUString get(int pos, int col) const
{
OUString sRet;
@@ -4183,6 +4172,17 @@ private:
return sRet;
}
void set(int pos, int col, const OUString& rText)
{
GtkTreeModel *pModel = GTK_TREE_MODEL(m_pTreeStore);
GtkTreeIter iter;
if (gtk_tree_model_iter_nth_child(pModel, &iter, nullptr, pos))
{
OString aStr(OUStringToOString(rText, RTL_TEXTENCODING_UTF8));
gtk_tree_store_set(m_pTreeStore, &iter, col, aStr.getStr(), -1);
}
}
static gboolean signalTestExpandRow(GtkTreeView*, GtkTreeIter* iter, GtkTreePath*, gpointer widget)
{
GtkInstanceTreeView* pThis = static_cast<GtkInstanceTreeView*>(widget);
@@ -4215,7 +4215,7 @@ private:
if (!bRet && bPlaceHolder)
{
GtkTreeIter subiter;
insert_row(m_pTreeStore, subiter, &iter, -1, nullptr, "<dummy>", nullptr, nullptr, nullptr);
insert_row(subiter, &iter, -1, nullptr, "<dummy>", nullptr, nullptr, nullptr);
}
return bRet;
@@ -4226,11 +4226,53 @@ public:
: GtkInstanceContainer(GTK_CONTAINER(pTreeView), bTakeOwnership)
, m_pTreeView(pTreeView)
, m_pTreeStore(GTK_TREE_STORE(gtk_tree_view_get_model(m_pTreeView)))
, m_nTextCol(-1)
, m_nImageCol(-1)
, m_nExpanderImageCol(-1)
, m_nChangedSignalId(g_signal_connect(gtk_tree_view_get_selection(pTreeView), "changed",
G_CALLBACK(signalChanged), this))
, m_nRowActivatedSignalId(g_signal_connect(pTreeView, "row-activated", G_CALLBACK(signalRowActivated), this))
, m_nTestExpandRowSignalId(g_signal_connect(pTreeView, "test-expand-row", G_CALLBACK(signalTestExpandRow), this))
{
GList *pColumns = gtk_tree_view_get_columns(m_pTreeView);
int nIndex(0);
for (GList* pEntry = g_list_first(pColumns); pEntry; pEntry = g_list_next(pEntry))
{
GtkTreeViewColumn* pColumn = GTK_TREE_VIEW_COLUMN(pEntry->data);
GList *pRenderers = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(pColumn));
for (GList* pRenderer = g_list_first(pRenderers); pRenderer; pRenderer = g_list_next(pRenderer))
{
GtkCellRenderer* pCellRenderer = GTK_CELL_RENDERER(pRenderer->data);
if (m_nTextCol == -1 && GTK_IS_CELL_RENDERER_TEXT(pCellRenderer))
m_nTextCol = nIndex;
else if (GTK_IS_CELL_RENDERER_PIXBUF(pCellRenderer))
{
const bool bExpander = g_list_next(pRenderer) != nullptr;
if (bExpander && m_nExpanderImageCol == -1)
m_nExpanderImageCol = nIndex;
else if (m_nImageCol == -1)
m_nImageCol = nIndex;
}
++nIndex;
}
g_list_free(pRenderers);
}
g_list_free(pColumns);
m_nIdCol = nIndex;
}
virtual void set_column_fixed_widths(const std::vector<int>& rWidths) override
{
GList *pColumns = gtk_tree_view_get_columns(m_pTreeView);
GList* pEntry = g_list_first(pColumns);
for (auto nWidth : rWidths)
{
assert(pEntry && "wrong count");
GtkTreeViewColumn* pColumn = GTK_TREE_VIEW_COLUMN(pEntry->data);
gtk_tree_view_column_set_fixed_width(pColumn, nWidth);
pEntry = g_list_next(pEntry);
}
g_list_free(pColumns);
}
virtual void insert(weld::TreeIter* pParent, int pos, const OUString& rText, const OUString* pId, const OUString* pIconName,
@@ -4239,11 +4281,11 @@ public:
disable_notify_events();
GtkTreeIter iter;
GtkInstanceTreeIter* pGtkIter = static_cast<GtkInstanceTreeIter*>(pParent);
insert_row(m_pTreeStore, iter, pGtkIter ? &pGtkIter->iter : nullptr, pos, pId, rText, pIconName, pImageSurface, pExpanderName);
insert_row(iter, pGtkIter ? &pGtkIter->iter : nullptr, pos, pId, rText, pIconName, pImageSurface, pExpanderName);
if (bChildrenOnDemand)
{
GtkTreeIter subiter;
insert_row(m_pTreeStore, subiter, &iter, -1, nullptr, "<dummy>", nullptr, nullptr, nullptr);
insert_row(subiter, &iter, -1, nullptr, "<dummy>", nullptr, nullptr, nullptr);
}
enable_notify_events();
}
@@ -4253,7 +4295,7 @@ public:
GtkTreeIter iter;
gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(m_pTreeStore), &iter, nullptr, pos);
GdkRGBA aColor{rColor.GetRed()/255.0, rColor.GetGreen()/255.0, rColor.GetBlue()/255.0, 0};
gtk_tree_store_set(m_pTreeStore, &iter, 4, &aColor, -1);
gtk_tree_store_set(m_pTreeStore, &iter, m_nIdCol + 1, &aColor, -1);
}
virtual void remove(int pos) override
@@ -4274,7 +4316,7 @@ public:
virtual int find_id(const OUString& rId) const override
{
Search aSearch(rId, 1);
Search aSearch(rId, m_nIdCol);
gtk_tree_model_foreach(GTK_TREE_MODEL(m_pTreeStore), foreach_find, &aSearch);
return aSearch.index;
}
@@ -4317,8 +4359,8 @@ public:
::comphelper::getProcessComponentContext(),
Application::GetSettings().GetUILanguageTag().getLocale()));
GtkTreeSortable* pSortable = GTK_TREE_SORTABLE(m_pTreeStore);
gtk_tree_sortable_set_sort_func(pSortable, 0, sort_func, m_xSorter.get(), nullptr);
gtk_tree_sortable_set_sort_column_id(pSortable, 0, GTK_SORT_ASCENDING);
gtk_tree_sortable_set_sort_func(pSortable, m_nTextCol, sort_func, m_xSorter.get(), nullptr);
gtk_tree_sortable_set_sort_column_id(pSortable, m_nTextCol, GTK_SORT_ASCENDING);
}
virtual int n_children() const override
@@ -4377,14 +4419,23 @@ public:
return aRows;
}
virtual OUString get_text(int pos) const override
virtual OUString get_text(int pos, int col) const override
{
return get(pos, 0);
if (col == -1)
return get(pos, m_nTextCol);
return get(pos, col);
}
virtual void set_text(int pos, const OUString& rText, int col) override
{
if (col == -1)
return set(pos, m_nTextCol, rText);
return set(pos, col, rText);
}
virtual OUString get_id(int pos) const override
{
return get(pos, 1);
return get(pos, m_nIdCol);
}
virtual int get_selected_index() const override
@@ -4572,7 +4623,7 @@ public:
const GtkInstanceTreeIter& rGtkIter = static_cast<const GtkInstanceTreeIter&>(rIter);
GtkTreeModel *pModel = GTK_TREE_MODEL(m_pTreeStore);
gchar* pStr;
gtk_tree_model_get(pModel, const_cast<GtkTreeIter*>(&rGtkIter.iter), 0, &pStr, -1);
gtk_tree_model_get(pModel, const_cast<GtkTreeIter*>(&rGtkIter.iter), m_nTextCol, &pStr, -1);
OUString sRet(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8);
g_free(pStr);
return sRet;
@@ -4583,7 +4634,7 @@ public:
const GtkInstanceTreeIter& rGtkIter = static_cast<const GtkInstanceTreeIter&>(rIter);
GtkTreeModel *pModel = GTK_TREE_MODEL(m_pTreeStore);
gchar* pStr;
gtk_tree_model_get(pModel, const_cast<GtkTreeIter*>(&rGtkIter.iter), 1, &pStr, -1);
gtk_tree_model_get(pModel, const_cast<GtkTreeIter*>(&rGtkIter.iter), m_nIdCol, &pStr, -1);
OUString sRet(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8);
g_free(pStr);
return sRet;
@@ -4594,7 +4645,7 @@ public:
const GtkInstanceTreeIter& rGtkIter = static_cast<const GtkInstanceTreeIter&>(rIter);
disable_notify_events();
GdkPixbuf* pixbuf = getPixbuf(rExpanderName);
gtk_tree_store_set(m_pTreeStore, const_cast<GtkTreeIter*>(&rGtkIter.iter), 4, pixbuf, -1);
gtk_tree_store_set(m_pTreeStore, const_cast<GtkTreeIter*>(&rGtkIter.iter), m_nExpanderImageCol, pixbuf, -1);
if (pixbuf)
g_object_unref(pixbuf);
enable_notify_events();
@@ -4620,7 +4671,7 @@ public:
if (m_xSorter)
{
GtkTreeSortable* pSortable = GTK_TREE_SORTABLE(m_pTreeStore);
gtk_tree_sortable_set_sort_column_id(pSortable, 0, GTK_SORT_ASCENDING);
gtk_tree_sortable_set_sort_column_id(pSortable, m_nTextCol, GTK_SORT_ASCENDING);
}
gtk_tree_view_set_model(m_pTreeView, GTK_TREE_MODEL(m_pTreeStore));
GtkInstanceContainer::thaw();
diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
index 89a3467..81df67f 100644
--- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
@@ -303,10 +303,6 @@
#include <sot/formats.hxx>
#include <sot/sotdllapi.h>
#include <svl/sigstruct.hxx>
#include <svtools/AccessibleBrowseBoxObjType.hxx>
#include <svtools/accessibletableprovider.hxx>
#include <svtools/headbar.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/svtdllapi.h>
#include <tools/color.hxx>
#include <tools/contnr.hxx>
@@ -345,6 +341,10 @@
#include <unotools/resmgr.hxx>
#include <unotools/syslocale.hxx>
#include <unotools/unotoolsdllapi.h>
#include <vcl/AccessibleBrowseBoxObjType.hxx>
#include <vcl/accessibletableprovider.hxx>
#include <vcl/headbar.hxx>
#include <vcl/svtabbx.hxx>
#include <vcl/transfer.hxx>
#include <vcl/treelist.hxx>
#include <vcl/treelistbox.hxx>
