[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source

[Noel Grandin (via logerrit)]

 accessibility/inc/extended/textwindowaccessibility.hxx|   13 ---
 accessibility/inc/standard/vclxaccessiblebox.hxx  |6 +--
 accessibility/source/extended/textwindowaccessibility.cxx |   17 +++--
 accessibility/source/standard/vclxaccessiblebox.cxx   |   24 +++---
 4 files changed, 29 insertions(+), 31 deletions(-)

New commits:
commit 277c651875604a98032b70d6b0bd0f274cfe5d12
Author: Noel Grandin 
AuthorDate: Tue Sep 5 16:15:48 2023 +0200
Commit: Noel Grandin 
CommitDate: Tue Sep 5 22:00:15 2023 +0200

use more concrete type in VCLXAccessibleBox

and avoid some casting

Change-Id: I755caf9ba5a333862d1a89a054359781544930f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156570
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx 
b/accessibility/inc/standard/vclxaccessiblebox.hxx
index 6c86491a5422..3825be0d4f22 100644
--- a/accessibility/inc/standard/vclxaccessiblebox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblebox.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 
+class VCLXAccessibleList;
 
 /** Base class for list- and combo boxes.  This class manages the box'
 children.  The classed derived from this one have only to implement the
@@ -102,7 +103,7 @@ public:
 virtual css::uno::Any SAL_CALL getMinimumIncrement(  ) override;
 
 protected:
-virtual ~VCLXAccessibleBox() override = default;
+virtual ~VCLXAccessibleBox() override;
 
 /** Returns true when the object is valid.
 */
@@ -129,8 +130,7 @@ private:
 m_xText;
 
 /// The child that contains the items of this box.
-css::uno::Reference< css::accessibility::XAccessible>
-m_xList;
+rtl::Reference m_xList;
 
 /** This flag specifies whether an object has a text field as child
 regardless of whether that child being currently instantiated or
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx 
b/accessibility/source/standard/vclxaccessiblebox.cxx
index 4f4972a04477..cbc68fb2d19a 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -52,6 +52,8 @@ VCLXAccessibleBox::VCLXAccessibleBox (VCLXWindow* pVCLWindow, 
BoxType aType, boo
 m_bHasTextChild = true;
 }
 
+VCLXAccessibleBox::~VCLXAccessibleBox() {}
+
 void VCLXAccessibleBox::ProcessWindowChildEvent( const VclWindowEvent& 
rVclWindowEvent )
 {
 uno::Any aOldValue, aNewValue;
@@ -106,11 +108,11 @@ void VCLXAccessibleBox::ProcessWindowEvent (const 
VclWindowEvent& rVclWindowEven
 case VclEventId::ListboxSelect:
 {
 // Forward the call to the list child.
-VCLXAccessibleList* pList = 
static_cast(m_xList.get());
+VCLXAccessibleList* pList = m_xList.get();
 if ( pList == nullptr )
 {
 getAccessibleChild ( m_bHasTextChild ? 1 : 0 );
-pList = static_cast(m_xList.get());
+pList = m_xList.get();
 }
 if ( pList != nullptr )
 {
@@ -126,11 +128,11 @@ void VCLXAccessibleBox::ProcessWindowEvent (const 
VclWindowEvent& rVclWindowEven
 }
 case VclEventId::DropdownOpen:
 {
-VCLXAccessibleList* pList = 
static_cast(m_xList.get());
+VCLXAccessibleList* pList = m_xList.get();
 if ( pList == nullptr )
 {
 getAccessibleChild ( m_bHasTextChild ? 1 : 0 );
-pList = static_cast(m_xList.get());
+pList = m_xList.get();
 }
 if ( pList != nullptr )
 {
@@ -141,11 +143,11 @@ void VCLXAccessibleBox::ProcessWindowEvent (const 
VclWindowEvent& rVclWindowEven
 }
 case VclEventId::DropdownClose:
 {
-VCLXAccessibleList* pList = 
static_cast(m_xList.get());
+VCLXAccessibleList* pList = m_xList.get();
 if ( pList == nullptr )
 {
 getAccessibleChild ( m_bHasTextChild ? 1 : 0 );
-pList = static_cast(m_xList.get());
+pList = m_xList.get();
 }
 if ( pList != nullptr )
 {
@@ -162,7 +164,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const 
VclWindowEvent& rVclWindowEven
 }
 case VclEventId::ComboboxSelect:
 {
-VCLXAccessibleList* pList = 
static_cast(m_xList.get());
+VCLXAccessibleList* pList = m_xList.get();
 if (pList != nullptr && m_xText.is())
 {
 Reference xText 
(m_xText->getAccessibleContext(), UNO_QUERY);
@@ -191,11 +193,11 @@ void VCLXAccessibleBox::ProcessWindowEvent (const 
VclWindowEvent& rVclWindowEven
 case VclEventId::ComboboxItemRemoved:
 {
 // Forward the call to the list child.
-VCLXAccessibleList* pList = 
static_cast(m_xList.get());
+   

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source

[Noel Grandin (via logerrit)]

 accessibility/inc/extended/accessibletabbarpagelist.hxx   |9 
 accessibility/inc/standard/accessiblemenubasecomponent.hxx|5 
 accessibility/source/extended/accessibletabbarpagelist.cxx|   65 ++--
 accessibility/source/standard/accessiblemenubasecomponent.cxx |  140 +++---
 4 files changed, 85 insertions(+), 134 deletions(-)

New commits:
commit 89b6d1cd2ed3ea4633a8f4e90daf99001decef3e
Author: Noel Grandin 
AuthorDate: Wed Aug 30 15:28:46 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu Aug 31 10:34:20 2023 +0200

use concrete type for AccessibleTabBarPageList::m_aAccessibleChildren

avoid some unnecessary casting

Change-Id: Ib8bddff9fe91afd192584fa1ad2728d0701f425a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156316
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx 
b/accessibility/inc/extended/accessibletabbarpagelist.hxx
index 858a475d7669..d3f3d56f317d 100644
--- a/accessibility/inc/extended/accessibletabbarpagelist.hxx
+++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx
@@ -27,11 +27,9 @@
 
 #include 
 
-
 namespace accessibility
 {
-
-
+class AccessibleTabBarPage;
 
 
 class AccessibleTabBarPageList final : public cppu::ImplInheritanceHelper<
@@ -41,7 +39,7 @@ namespace accessibility
css::lang::XServiceInfo>
 {
 private:
-typedef std::vector< css::uno::Reference< 
css::accessibility::XAccessible > > AccessibleChildren;
+typedef std::vector< rtl::Reference< AccessibleTabBarPage > > 
AccessibleChildren;
 
 AccessibleChildren  m_aAccessibleChildren;
 sal_Int32   m_nIndexInParent;
@@ -105,6 +103,9 @@ namespace accessibility
 virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount(  ) 
override;
 virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
 virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nChildIndex ) 
override;
+
+private:
+rtl::Reference< AccessibleTabBarPage > getAccessibleChildImpl( 
sal_Int64 i );
 };
 
 
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx 
b/accessibility/source/extended/accessibletabbarpagelist.cxx
index 3eb8ab324c37..5faaed6846e2 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -52,20 +52,16 @@ namespace accessibility
 ,m_nIndexInParent( nIndexInParent )
 {
 if ( m_pTabBar )
-m_aAccessibleChildren.assign( m_pTabBar->GetPageCount(), 
Reference< XAccessible >() );
+m_aAccessibleChildren.assign( m_pTabBar->GetPageCount(), 
rtl::Reference< AccessibleTabBarPage >() );
 }
 
 
 void AccessibleTabBarPageList::UpdateShowing( bool bShowing )
 {
-for (const Reference& xChild : m_aAccessibleChildren)
+for (const rtl::Reference& xChild : 
m_aAccessibleChildren)
 {
 if ( xChild.is() )
-{
-AccessibleTabBarPage* pAccessibleTabBarPage = static_cast< 
AccessibleTabBarPage* >( xChild.get() );
-if ( pAccessibleTabBarPage )
-pAccessibleTabBarPage->SetShowing( bShowing );
-}
+xChild->SetShowing( bShowing );
 }
 }
 
@@ -76,13 +72,9 @@ namespace accessibility
 
 if ( i >= 0 && o3tl::make_unsigned(i) < m_aAccessibleChildren.size() )
 {
-Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
+rtl::Reference< AccessibleTabBarPage > xChild( 
m_aAccessibleChildren[i] );
 if ( xChild.is() )
-{
-AccessibleTabBarPage* pAccessibleTabBarPage = static_cast< 
AccessibleTabBarPage* >( xChild.get() );
-if ( pAccessibleTabBarPage )
-pAccessibleTabBarPage->SetSelected( bSelected );
-}
+xChild->SetSelected( bSelected );
 }
 }
 
@@ -92,11 +84,10 @@ namespace accessibility
 if ( i < 0 || o3tl::make_unsigned(i) >= m_aAccessibleChildren.size() )
 return;
 
-Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
-if ( xChild.is() )
+if ( m_pTabBar )
 {
-AccessibleTabBarPage* pAccessibleTabBarPage = static_cast< 
AccessibleTabBarPage* >( xChild.get() );
-if ( pAccessibleTabBarPage && m_pTabBar )
+rtl::Reference< AccessibleTabBarPage > pAccessibleTabBarPage( 
m_aAccessibleChildren[i] );
+if ( pAccessibleTabBarPage.is() )
 {
 OUString sPageText = m_pTabBar->GetPageText( 
m_pTabBar->GetPageId( static_cast(i) ) );
 pAccessibleTabBarPage->SetPageText( sPageText );
@@ -111,7 +102,7 @@ namespace accessibility
 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source

[Noel Grandin (via logerrit)]

 accessibility/inc/standard/vclxaccessibletabcontrol.hxx|4 
 accessibility/inc/standard/vclxaccessibletoolbox.hxx   |6 -
 accessibility/source/standard/vclxaccessibletabcontrol.cxx |   67 -
 accessibility/source/standard/vclxaccessibletoolbox.cxx|   33 ++
 4 files changed, 39 insertions(+), 71 deletions(-)

New commits:
commit a3f77a61c03340b79930e89d5c4045d814b93edf
Author: Noel Grandin 
AuthorDate: Wed Aug 30 14:43:18 2023 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 30 22:16:36 2023 +0200

use concrete type for VCLXAccessibleTabControl::m_aAccessibleChildren

avoid some unnecessary casting

Change-Id: I2f6ed71fbffbcdfad18ed03dd45c12ea1f52fff6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156291
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx 
b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
index dcf515775bd7..32565c6d80ad 100644
--- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
@@ -27,7 +27,7 @@
 
 #include 
 
-
+class VCLXAccessibleTabPage;
 
 
 class VCLXAccessibleTabControl final : public cppu::ImplInheritanceHelper<
@@ -35,7 +35,7 @@ class VCLXAccessibleTabControl final : public 
cppu::ImplInheritanceHelper<

css::accessibility::XAccessibleSelection>
 {
 private:
-typedef std::vector< css::uno::Reference< css::accessibility::XAccessible 
> > AccessibleChildren;
+typedef std::vector< rtl::Reference< VCLXAccessibleTabPage > > 
AccessibleChildren;
 
 AccessibleChildren  m_aAccessibleChildren;
 VclPtr  m_pTabControl;
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx 
b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 9963b51aef5f..0855b0f177aa 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -52,20 +52,16 @@ VCLXAccessibleTabControl::VCLXAccessibleTabControl( 
VCLXWindow* pVCLXWindow )
 m_pTabControl.clear();
 return;
 }
-m_aAccessibleChildren.assign( m_pTabControl->GetPageCount(), Reference< 
XAccessible >() );
+m_aAccessibleChildren.assign( m_pTabControl->GetPageCount(), 
rtl::Reference< VCLXAccessibleTabPage >() );
 }
 
 
 void VCLXAccessibleTabControl::UpdateFocused()
 {
-for (const Reference& xChild : m_aAccessibleChildren)
+for (const rtl::Reference& pVCLXAccessibleTabPage : 
m_aAccessibleChildren)
 {
-if ( xChild.is() )
-{
-VCLXAccessibleTabPage* pVCLXAccessibleTabPage = static_cast< 
VCLXAccessibleTabPage* >( xChild.get() );
-if ( pVCLXAccessibleTabPage )
-pVCLXAccessibleTabPage->SetFocused( 
pVCLXAccessibleTabPage->IsFocused() );
-}
+if ( pVCLXAccessibleTabPage )
+pVCLXAccessibleTabPage->SetFocused( 
pVCLXAccessibleTabPage->IsFocused() );
 }
 }
 
@@ -74,13 +70,9 @@ void VCLXAccessibleTabControl::UpdateSelected( sal_Int32 i, 
bool bSelected )
 {
 if ( i >= 0 && o3tl::make_unsigned(i) < m_aAccessibleChildren.size() )
 {
-Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
-if ( xChild.is() )
-{
-VCLXAccessibleTabPage* pVCLXAccessibleTabPage = static_cast< 
VCLXAccessibleTabPage* >( xChild.get() );
-if ( pVCLXAccessibleTabPage )
-pVCLXAccessibleTabPage->SetSelected( bSelected );
-}
+rtl::Reference< VCLXAccessibleTabPage > pVCLXAccessibleTabPage( 
m_aAccessibleChildren[i] );
+if ( pVCLXAccessibleTabPage )
+pVCLXAccessibleTabPage->SetSelected( bSelected );
 }
 }
 
@@ -89,13 +81,9 @@ void VCLXAccessibleTabControl::UpdatePageText( sal_Int32 i )
 {
 if ( i >= 0 && o3tl::make_unsigned(i) < m_aAccessibleChildren.size() )
 {
-Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
-if ( xChild.is() )
-{
-VCLXAccessibleTabPage* pVCLXAccessibleTabPage = static_cast< 
VCLXAccessibleTabPage* >( xChild.get() );
-if ( pVCLXAccessibleTabPage )
-pVCLXAccessibleTabPage->SetPageText( 
pVCLXAccessibleTabPage->GetPageText() );
-}
+rtl::Reference< VCLXAccessibleTabPage > pVCLXAccessibleTabPage( 
m_aAccessibleChildren[i] );
+if ( pVCLXAccessibleTabPage )
+pVCLXAccessibleTabPage->SetPageText( 
pVCLXAccessibleTabPage->GetPageText() );
 }
 }
 
@@ -104,13 +92,9 @@ void VCLXAccessibleTabControl::UpdateTabPage( sal_Int32 i, 
bool bNew )
 {
 if ( i >= 0 && o3tl::make_unsigned(i) < m_aAccessibleChildren.size() )
 {
-Reference< XAccessible > xChild( m_aAccessibleChildren[i] );
-if ( xChild.is() )
-{
-VCLXAccessibleTabPage* pVCLXAccessibleTabPage = static_cast< 
VCLXAccessibleTabPage* >( 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source include/vcl svtools/source toolkit/source vcl/source

[Noel Grandin (via logerrit)]

 accessibility/inc/extended/AccessibleBrowseBox.hxx   |   10 +-
 accessibility/inc/extended/AccessibleGridControl.hxx |   10 +-
 accessibility/source/helper/acc_factory.cxx  |8 
 include/vcl/accessiblefactory.hxx|5 +++--
 include/vcl/accessibletable.hxx  |   15 +++
 include/vcl/accessibletableprovider.hxx  |   16 +++-
 svtools/source/brwbox/brwbox3.cxx|8 ++--
 svtools/source/brwbox/brwimpl.hxx|4 ++--
 toolkit/source/controls/table/tablecontrol_impl.cxx  |   14 +-
 toolkit/source/controls/table/tablecontrol_impl.hxx  |6 ++
 vcl/source/helper/svtaccessiblefactory.cxx   |6 --
 11 files changed, 30 insertions(+), 72 deletions(-)

New commits:
commit 129e395935bf7330a1fe84986dd78502af36e07e
Author: Noel Grandin 
AuthorDate: Wed Aug 30 12:29:48 2023 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 30 17:49:35 2023 +0200

make IAccessibleBrowseBox extend cppu::WeakImplHelper

i.e. push this up from the implementation class
AccessibleBrowseBoxAccess to the interface class.

Which means we don't need the getMyself helper method, and make the
memory management simpler.

Change-Id: Icecb83834bb3f5304908bbd3682b3d2ea06dbfe0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156285
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx 
b/accessibility/inc/extended/AccessibleBrowseBox.hxx
index 6605ff02be8b..b7e912df6e92 100644
--- a/accessibility/inc/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx
@@ -21,7 +21,6 @@
 #pragma once
 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -192,9 +191,7 @@ private:
 The instance holds its XAccessibleContext with a hard reference, while
 the context holds this instance weak.
 */
-class AccessibleBrowseBoxAccess final :
-public cppu::WeakImplHelper,
-public ::vcl::IAccessibleBrowseBox
+class AccessibleBrowseBoxAccess final : public ::vcl::IAccessibleBrowseBox
 {
 private:
 std::mutex  m_aMutex;
@@ -221,11 +218,6 @@ private:
 SAL_CALL getAccessibleContext() override;
 
 // IAccessibleBrowseBox
-virtual css::uno::Reference< css::accessibility::XAccessible >
-getMyself() override
-{
-return this;
-}
 void dispose() override;
 virtual bool isAlive() const override
 {
diff --git a/accessibility/source/helper/acc_factory.cxx 
b/accessibility/source/helper/acc_factory.cxx
index 364c8a3c8211..fb0468fe6d65 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -122,7 +122,7 @@ public:
 SvHeaderTabListBox& rBox
 ) const override;
 
-virtual vcl::IAccessibleBrowseBox*
+virtual rtl::Reference
 createAccessibleBrowseBox(
 const css::uno::Reference< css::accessibility::XAccessible >& 
_rxParent,
 vcl::IAccessibleTableProvider& _rBrowseBox
@@ -374,7 +374,7 @@ vcl::IAccessibleTabListBox* 
AccessibleFactory::createAccessibleTabListBox(
 return new AccessibleTabListBox( rxParent, rBox );
 }
 
-vcl::IAccessibleBrowseBox* AccessibleFactory::createAccessibleBrowseBox(
+rtl::Reference 
AccessibleFactory::createAccessibleBrowseBox(
 const Reference< XAccessible >& _rxParent, vcl::IAccessibleTableProvider& 
_rBrowseBox ) const
 {
 return new AccessibleBrowseBoxAccess( _rxParent, _rBrowseBox );
diff --git a/include/vcl/accessiblefactory.hxx 
b/include/vcl/accessiblefactory.hxx
index fe29e3b034e8..fde375c79875 100644
--- a/include/vcl/accessiblefactory.hxx
+++ b/include/vcl/accessiblefactory.hxx
@@ -88,7 +88,7 @@ namespace vcl
 SvTreeListBox& _rListBox,
 const css::uno::Reference< css::accessibility::XAccessible >& 
_xParent
 ) const = 0;
-virtual vcl::IAccessibleBrowseBox*
+virtual rtl::Reference
 createAccessibleBrowseBox(
 const css::uno::Reference< css::accessibility::XAccessible >& 
_rxParent,
 vcl::IAccessibleTableProvider& _rBrowseBox
diff --git a/include/vcl/accessibletableprovider.hxx 
b/include/vcl/accessibletableprovider.hxx
index a58576031422..30eafea49646 100644
--- a/include/vcl/accessibletableprovider.hxx
+++ b/include/vcl/accessibletableprovider.hxx
@@ -22,8 +22,8 @@
 
 #include 
 #include 
-
-namespace com::sun::star::accessibility { class XAccessible; }
+#include 
+#include 
 
 namespace vcl
 {
@@ -158,19 +158,9 @@ protected:
 
 /** interface for an implementation of a browse box's Accessible component
 */
-class IAccessibleBrowseBox
+class IAccessibleBrowseBox : public 
cppu::WeakImplHelper
 {
 public:
-/** returns the XAccessible object itself
-
-The reference returned here can be used to 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source

[Michael Weghorn (via logerrit)]

 accessibility/inc/extended/AccessibleBrowseBoxBase.hxx |6 ++--
 accessibility/source/extended/AccessibleBrowseBox.cxx  |   25 ++---
 2 files changed, 13 insertions(+), 18 deletions(-)

New commits:
commit 16cf257554887aeb6dc426c54ceeb8d70a6aadd0
Author: Michael Weghorn 
AuthorDate: Wed Aug 23 17:02:04 2023 +0200
Commit: Michael Weghorn 
CommitDate: Wed Aug 23 22:21:51 2023 +0200

a11y: Simplify AccessibleBrowseBox::implGetHeaderBar

Use the `mxColumnHeaderBar` and `mxRowHeaderBar`
members directly instead of a pointer to an `rtl::Reference`
that can be either of them.

Change-Id: I620c7ba92a14fad50d9371b1762b5d5ad05fd7ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156011
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx 
b/accessibility/source/extended/AccessibleBrowseBox.cxx
index e8276958f0f1..056d2c1b5f1c 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -204,25 +204,20 @@ css::uno::Reference< css::accessibility::XAccessible > 
AccessibleBrowseBox::impl
 css::uno::Reference< css::accessibility::XAccessible >
 AccessibleBrowseBox::implGetHeaderBar(AccessibleBrowseBoxObjType eObjType)
 {
-css::uno::Reference< css::accessibility::XAccessible > xRet;
-rtl::Reference< AccessibleBrowseBoxHeaderBar >* pxMember = nullptr;
-
 if( eObjType == AccessibleBrowseBoxObjType::RowHeaderBar )
-pxMember = 
+{
+if (!mxRowHeaderBar.is())
+mxRowHeaderBar = new AccessibleBrowseBoxHeaderBar(m_aCreator, 
*mpBrowseBox, eObjType);
+return mxRowHeaderBar;
+}
 else if( eObjType == AccessibleBrowseBoxObjType::ColumnHeaderBar )
-pxMember = 
-
-if( pxMember )
 {
-if( !pxMember->is() )
-{
-rtl::Reference pHeaderBar = new 
AccessibleBrowseBoxHeaderBar(
-m_aCreator, *mpBrowseBox, eObjType );
-*pxMember = pHeaderBar;
-}
-xRet = pxMember->get();
+if (!mxColumnHeaderBar.is())
+mxColumnHeaderBar = new AccessibleBrowseBoxHeaderBar(m_aCreator, 
*mpBrowseBox, eObjType);
+return mxColumnHeaderBar;
 }
-return xRet;
+
+return css::uno::Reference();
 }
 
 css::uno::Reference< css::accessibility::XAccessible >
commit 9ba4b01ba57d059a04038823a1f0cf3bb2cb383c
Author: Michael Weghorn 
AuthorDate: Wed Aug 23 16:40:53 2023 +0200
Commit: Michael Weghorn 
CommitDate: Wed Aug 23 22:21:41 2023 +0200

a11y: Make AccessibleBrowseBoxBase's client ID private

The getter and setter are only used by the class itself, not
by any derived classes, and the client ID is an implementation
detail, so make the methods private instead of protected.

Change-Id: I380aa9848ae515b7b4ae1a727b3c5720b53250fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156010
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx 
b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index ef199ee2da5c..d4ea1aabc07f 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -270,9 +270,6 @@ protected:
 */
 AbsoluteScreenPixelRectangle getBoundingBoxOnScreen();
 
-::comphelper::AccessibleEventNotifier::TClientId getClientId() const { 
return m_aClientId; }
-void setClientId(::comphelper::AccessibleEventNotifier::TClientId 
_aNewClientId) { m_aClientId = _aNewClientId; }
-
 public:
 /** @return  The osl::Mutex member provided by the class BaseMutex. */
 ::osl::Mutex&getMutex( ) { return m_aMutex; }
@@ -294,6 +291,9 @@ protected:
 css::uno::Reference< css::awt::XWindow > m_xFocusWindow;
 
 private:
+::comphelper::AccessibleEventNotifier::TClientId getClientId() const { 
return m_aClientId; }
+void setClientId(::comphelper::AccessibleEventNotifier::TClientId 
_aNewClientId) { m_aClientId = _aNewClientId; }
+
 /** Localized name. */
 OUString maName;
 /** Localized description text. */

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source svtools/source

[Michael Weghorn (via logerrit)]

 accessibility/inc/extended/accessiblelistbox.hxx|1 -
 accessibility/source/extended/accessiblelistbox.cxx |   19 ---
 svtools/source/uno/popupwindowcontroller.cxx|1 +
 3 files changed, 1 insertion(+), 20 deletions(-)

New commits:
commit e8028cbc11661effbb38ecb6146b9a9557b650da
Author: Michael Weghorn 
AuthorDate: Thu Aug 17 14:12:56 2023 +0100
Commit: Michael Weghorn 
CommitDate: Fri Aug 18 06:05:40 2023 +0200

tdf#156561 svtools, a11y: Return created popup win for focus handling

Actually return the popup window created in
`PopupWindowController::createPopupWindow` instead of just
an empty reference.

With this in place, the popup window is initially announced
by NVDA on Windows for the "Borders" toolbar item when expanded
even after reverting

commit dc0706cabfe39ddb6ea23d60ccfb756f2b9e6efb
Author: Michael Weghorn 
Date:   Wed Mar 15 17:00:27 2023 +0100

tdf#140762 tdf#152671 Make dock win visible before showing popup

, because the focus event is now sent when focus is
set via `XWindow::setFocus` in
`framework::ToolBarManager::OnDropdownClick`
(s. frame 41 below), while the above commit previously
ensured that the window was already visible earlier and
thus the corresponding event would be
sent earlier already.
Related backtrace for the winaccessibility case:

1  AccObjectWinManager::NotifyAccEvent   
AccObjectWinManager.cxx   185  0x7fffaac46118
2  AccComponentEventListener::FireStateFocusedChange 
AccComponentEventListener.cxx 308  0x7fffaac4fddb
3  AccComponentEventListener::SetComponentState  
AccComponentEventListener.cxx 171  0x7fffaac50c14
4  AccEventListener::HandleStateChangedEvent 
AccEventListener.cxx  166  0x7fffaac4ea44
5  AccEventListener::notifyEvent 
AccEventListener.cxx  72   0x7fffaac4faaa
6  AccComponentEventListener::notifyEvent
AccComponentEventListener.cxx 82   0x7fffaac5123c
7  AccDescendantManagerEventListener::notifyEvent
AccDescendantManagerEventListener.cxx 70   0x7fffaac56686
8  AccListEventListener::notifyEvent 
AccListEventListener.cxx  66   0x7fffaac56ca2
9  ValueSetAcc::FireAccessibleEvent  valueacc.cxx   
   430  0x7fffbad4578d
10 ValueSetAcc::GetFocus valueacc.cxx   
   452  0x7fffbad458ed
11 ValueSet::GetFocusvalueset.cxx   
   271  0x7fffbad4f6b8
12 weld::CustomWeld::DoGetFocus  customweld.cxx 
   72   0x7fffaf12b2ed
13 weld::CustomWeld::LinkStubDoGetFocus  customweld.cxx 
   72   0x7fffaf12b726
14 Link::Call   link.hxx   
   111  0x7fffaf16be63
15 SalInstanceWidget::HandleEventListenersalvtables.cxx 
   736  0x7fffaf16f436
16 SalInstanceDrawingArea::HandleEventListener   salvtables.cxx 
   6167 0x7fffaf16f3c7
17 SalInstanceWidget::EventListener  salvtables.cxx 
   824  0x7fffaf16e805
18 SalInstanceWidget::LinkStubEventListener  salvtables.cxx 
   821  0x7fffaf170b86
19 Link::Call link.hxx   
   111  0x7fffaea625c3
20 vcl::Window::CallEventListeners   event.cxx  
   263  0x7fffaea62970
21 vcl::Window::PreNotifyevent.cxx  
   71   0x7fffaea649a3
22 vcl::Window::CompatPreNotify  window.cxx 
   3921 0x7fffaeb730e8
23 ImplCallPreNotify winproc.cxx
   70   0x7fffaeb8eb00
24 vcl::Window::ImplGrabFocusmouse.cxx  
   383  0x7fffaeacff8c
25 vcl::Window::ImplControlFocus dlgctrl.cxx
   560  0x7fffaea391b6
26 vcl::Window::EventNotify  event.cxx  
   210  0x7fffaea633a5
27 DockingWindow::EventNotifydockwin.cxx
   528  0x7fffaea58d21
28 vcl::Window::CompatNotify window.cxx 
   3929 0x7fffaeb73058
29 vcl::Window::GetFocus window.cxx 
   1852 0x7fffaeb75e94
30 InterimToolbarPopup::GetFocus toolbarmenu.cxx
   187  

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source chart2/source dbaccess/source desktop/source drawinglayer/source embeddedobj/source framework/source include/svtools

[Noel Grandin (via logerrit)]

 accessibility/inc/extended/AccessibleBrowseBox.hxx|2 
 accessibility/inc/extended/AccessibleBrowseBoxBase.hxx|4 
 accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx   |2 
 accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx  |2 
 accessibility/inc/extended/AccessibleBrowseBoxTable.hxx   |2 
 accessibility/inc/extended/AccessibleGridControl.hxx  |2 
 accessibility/inc/extended/AccessibleGridControlBase.hxx  |4 
 accessibility/inc/extended/AccessibleGridControlHeader.hxx|2 
 accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx|2 
 accessibility/inc/extended/AccessibleGridControlTable.hxx |2 
 accessibility/inc/extended/AccessibleGridControlTableCell.hxx |2 
 accessibility/inc/extended/accessiblebrowseboxcell.hxx|2 
 accessibility/inc/extended/accessibleiconchoicectrlentry.hxx  |4 
 accessibility/inc/helper/IComboListBoxHelper.hxx  |3 
 accessibility/inc/helper/listboxhelper.hxx|4 
 accessibility/source/extended/AccessibleBrowseBox.cxx |2 
 accessibility/source/extended/AccessibleBrowseBoxBase.cxx |4 
 accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx|4 
 accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx   |4 
 accessibility/source/extended/AccessibleBrowseBoxTable.cxx|4 
 accessibility/source/extended/AccessibleGridControl.cxx   |2 
 accessibility/source/extended/AccessibleGridControlBase.cxx   |4 
 accessibility/source/extended/AccessibleGridControlHeader.cxx |8 
 accessibility/source/extended/AccessibleGridControlHeaderCell.cxx |6 
 accessibility/source/extended/AccessibleGridControlTable.cxx  |4 
 accessibility/source/extended/AccessibleGridControlTableCell.cxx  |6 
 accessibility/source/extended/accessiblebrowseboxcell.cxx |4 
 accessibility/source/extended/accessibleiconchoicectrlentry.cxx   |   20 
 accessibility/source/extended/accessiblelistboxentry.cxx  |2 
 accessibility/source/extended/textwindowaccessibility.cxx |2 
 accessibility/source/standard/accessiblemenucomponent.cxx |4 
 accessibility/source/standard/accessiblemenuitemcomponent.cxx |2 
 accessibility/source/standard/vclxaccessiblelistitem.cxx  |2 
 chart2/source/controller/main/ChartController_Tools.cxx   |2 
 dbaccess/source/ui/querydesign/TableWindowAccess.cxx  |4 
 desktop/source/splash/splash.cxx  |4 
 drawinglayer/source/processor2d/vclhelperbufferdevice.cxx |2 
 embeddedobj/source/general/docholder.cxx  |2 
 framework/source/layoutmanager/layoutmanager.cxx  |2 
 include/svtools/brwbox.hxx|2 
 include/toolkit/helper/convert.hxx|4 
 include/tools/gen.hxx |  831 
+-
 include/vcl/accessibletable.hxx   |2 
 include/vcl/accessibletableprovider.hxx   |2 
 include/vcl/svapp.hxx |4 
 include/vcl/toolkit/floatwin.hxx  |   10 
 include/vcl/toolkit/svtabbx.hxx   |2 
 include/vcl/weld.hxx  |4 
 include/vcl/window.hxx|   12 
 sc/source/ui/Accessibility/AccessibleCell.cxx |6 
 sc/source/ui/Accessibility/AccessibleContextBase.cxx  |4 
 sc/source/ui/Accessibility/AccessibleDocument.cxx |6 
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx  |4 
 sc/source/ui/Accessibility/AccessibleEditObject.cxx   |   22 
 sc/source/ui/Accessibility/AccessiblePageHeader.cxx   |6 
 sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx   |8 
 sc/source/ui/Accessibility/AccessiblePreviewCell.cxx  |6 
 sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx|6 
 sc/source/ui/Accessibility/AccessiblePreviewTable.cxx |6 
 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx  |4 
 sc/source/ui/inc/AccessibleCell.hxx   |2 
 sc/source/ui/inc/AccessibleContextBase.hxx|3 
 sc/source/ui/inc/AccessibleDocument.hxx   |2 
 sc/source/ui/inc/AccessibleDocumentPagePreview.hxx|2 
 sc/source/ui/inc/AccessibleEditObject.hxx |4 
 sc/source/ui/inc/AccessiblePageHeader.hxx |2 
 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source include/vcl offapi/com toolkit/source vcl/source

[Michael Weghorn (via logerrit)]

 accessibility/inc/standard/accessiblemenubasecomponent.hxx|1 
 accessibility/source/standard/accessiblemenubasecomponent.cxx |   18 ++
 include/vcl/vclevent.hxx  |1 
 offapi/com/sun/star/accessibility/AccessibleEventId.idl   |5 ++
 toolkit/source/awt/vclxmenu.cxx   |1 
 vcl/source/window/menu.cxx|7 +++
 6 files changed, 33 insertions(+)

New commits:
commit 3121642fb1927c9cb1aa35c6b3e6afa818459117
Author: Michael Weghorn 
AuthorDate: Thu Jul 27 11:17:42 2023 +0200
Commit: Michael Weghorn 
CommitDate: Thu Jul 27 16:58:35 2023 +0200

a11y: Clarify AccessibleEventId::ROLE_CHANGED doc

Mention that old and new value don't need to be
set in this kind of event and how the new role
can be retrieved.

Change-Id: Iefde16a91b71af87feccb5ec2e6a32e682d60b4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154987
Reviewed-by: Colomban Wendling 
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/offapi/com/sun/star/accessibility/AccessibleEventId.idl 
b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
index 375d04085204..2c30cf8a6cd6 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventId.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
@@ -434,6 +434,11 @@ constants AccessibleEventId
 /** Constant used to indicate that the role of an accessible object has
 changed.
 
+AccessibleEventObject::OldValue and
+AccessibleEventObject::NewValue are empty.
+The new role can be retrieved via
+XAccessibleContext::getAccessibleRole.
+
 @since LibreOffice 4.3
 */
 const short ROLE_CHANGED =41;
commit ce0a48a1eb16d6309dba175e032a52eb5ede2542
Author: Michael Weghorn 
AuthorDate: Wed Jul 26 18:26:48 2023 +0200
Commit: Michael Weghorn 
CommitDate: Thu Jul 27 16:58:22 2023 +0200

tdf#155625 a11y: Notify about menu item role change

Send a `AccessibleEventId::ROLE_CHANGED` event
when the accessible role of a menu item changes
(s. how `VCLXAccessibleMenuItem::getAccessibleRole`
takes into account `MenuItemBits::RADIOCHECK` and
`MenuItemBits::CHECKABLE` to determine the accessible
role for the underlying menu entry).

This fixes the issue of obsolete values for roles being
used, which was uncovered by the upcoming
Change-Id I1a047864ce8dc1f1bc3056ad00159f7fd5e5b7d3
("vcl gtk3: Introduce AT-SPI2 tests for the GTK3 accessibility layer").

With this in place, the workaround for tdf#155625 in
the upcoming gtk3/AT-SPI tests is no longer necessary
and `make CppunitTest_vcl_gtk3_a11y` with
https://gerrit.libreoffice.org/c/core/+/153069 patch set 11
still passes after dropping the workaround:

diff --git a/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx 
b/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
index bbcd263fee0c..762401181bf4 100644
--- a/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
+++ b/vcl/qa/cppunit/a11y/atspi2/atspi2.cxx
@@ -264,9 +264,6 @@ void 
Atspi2TestTree::compareObjects(uno::Reference x
  * be represented with a round trip. */
 const auto nLORole = 
mapToAtspiRole(xLOContext->getAccessibleRole());
 auto nAtspiRole = pAtspiAccessible.getRole();
-// FIXME: workaround for 
https://bugs.documentfoundation.org/show_bug.cgi?id=155625
-if (nLORole == ATSPI_ROLE_CHECK_MENU_ITEM && nAtspiRole == 
ATSPI_ROLE_MENU_ITEM)
-nAtspiRole = nLORole;
 CPPUNIT_ASSERT_EQUAL(nLORole, nAtspiRole);
 /* name (no need to worry about debugging suffixes as 
AccessibilityTools::nameEquals does, as
  * that will also be part of the name sent to ATSPI) */

Change-Id: I0d88a7eda592f5ee9abf368ce1d5feb6611b9971
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154947
Reviewed-by: Colomban Wendling 
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx 
b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
index e56120f7fb38..6dd8ab8eb760 100644
--- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
@@ -73,6 +73,7 @@ protected:
 voidUpdateSelected( sal_Int32 i, bool bSelected );
 voidUpdateChecked( sal_Int32 i, bool bChecked );
 voidUpdateAccessibleName( sal_Int32 i );
+voidUpdateItemRole(sal_Int32 i);
 voidUpdateItemText( sal_Int32 i );
 
 sal_Int64   GetChildCount() const;
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx 
b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index e1ab9e326ebf..b66b019ca1b1 100644

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source include/svtools include/vcl sc/source sd/source sfx2/source svtools/source sw/source toolkit/inc toolkit/source vbahe

[Noel Grandin (via logerrit)]

 accessibility/inc/helper/IComboListBoxHelper.hxx  |2 
 accessibility/inc/helper/listboxhelper.hxx|6 +-
 accessibility/source/extended/AccessibleBrowseBox.cxx |4 -
 accessibility/source/extended/AccessibleGridControl.cxx   |4 -
 accessibility/source/extended/AccessibleGridControlHeader.cxx |4 -
 accessibility/source/extended/AccessibleGridControlHeaderCell.cxx |4 -
 accessibility/source/extended/AccessibleGridControlTable.cxx  |4 -
 accessibility/source/extended/AccessibleGridControlTableCell.cxx  |4 -
 accessibility/source/extended/accessibleiconchoicectrlentry.cxx   |2 
 accessibility/source/extended/accessiblelistboxentry.cxx  |2 
 accessibility/source/standard/accessiblemenucomponent.cxx |4 -
 accessibility/source/standard/accessiblemenuitemcomponent.cxx |2 
 accessibility/source/standard/vclxaccessiblelistitem.cxx  |2 
 include/svtools/brwbox.hxx|3 -
 include/vcl/accessibletable.hxx   |3 -
 include/vcl/accessibletableprovider.hxx   |3 -
 include/vcl/toolkit/svtabbx.hxx   |3 -
 include/vcl/window.hxx|8 +-
 sc/source/ui/Accessibility/AccessibleCell.cxx |4 -
 sc/source/ui/Accessibility/AccessibleDocument.cxx |6 +-
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx  |4 -
 sc/source/ui/Accessibility/AccessibleEditObject.cxx   |4 -
 sc/source/ui/Accessibility/AccessiblePageHeader.cxx   |4 -
 sc/source/ui/Accessibility/AccessiblePreviewCell.cxx  |2 
 sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx|2 
 sc/source/ui/Accessibility/AccessiblePreviewTable.cxx |2 
 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx  |4 -
 sc/source/ui/unoobj/viewuno.cxx   |2 
 sd/source/ui/accessibility/AccessibleViewForwarder.cxx|2 
 sd/source/ui/presenter/PresenterCanvas.cxx|4 -
 sd/source/ui/presenter/PresenterHelper.cxx|2 
 sd/source/ui/slidesorter/view/SlsToolTip.cxx  |2 
 sfx2/source/appl/newhelp.cxx  |2 
 svtools/source/brwbox/brwbox2.cxx |   21 
+--
 svtools/source/brwbox/brwbox3.cxx |9 ++-
 sw/source/core/access/accdoc.cxx  |   12 ++--
 toolkit/inc/controls/table/tablecontrol.hxx   |3 -
 toolkit/source/awt/vclxaccessiblecomponent.cxx|6 +-
 toolkit/source/controls/table/tablecontrol.cxx|9 ++-
 vbahelper/source/vbahelper/vbahelper.cxx  |4 -
 vcl/source/app/salvtables.cxx |2 
 vcl/source/control/combobox.cxx   |4 -
 vcl/source/control/ctrl.cxx   |2 
 vcl/source/control/listbox.cxx|4 -
 vcl/source/treelist/svtabbx.cxx   |   29 
+-
 vcl/source/window/menufloatingwindow.cxx  |2 
 vcl/source/window/window.cxx  |   25 
+++-
 47 files changed, 135 insertions(+), 107 deletions(-)

New commits:
commit 0e8b7dd7a013dffe080148baac926a698f36ad85
Author: Noel Grandin 
AuthorDate: Wed Jul 19 15:19:28 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu Jul 20 08:15:29 2023 +0200

split GetWindowExtentsRelative asunder

sometimes it returns a relative position, sometimes an absolute
position.

Rather have two different methods with names that match what
they return.

Change-Id: Ie1e73c6be1c797fd59934c96866d1fef1f972b35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154653
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/accessibility/inc/helper/IComboListBoxHelper.hxx 
b/accessibility/inc/helper/IComboListBoxHelper.hxx
index eed2a757c1e4..749a0c7b6f7c 100644
--- a/accessibility/inc/helper/IComboListBoxHelper.hxx
+++ b/accessibility/inc/helper/IComboListBoxHelper.hxx
@@ -41,7 +41,7 @@ namespace accessibility
 virtual OUStringGetEntry( sal_Int32  nPos ) const = 0;
 virtual tools::Rectangle   GetDropDownPosSizePixel( ) const = 0;
 virtual tools::Rectangle   GetBoundingRectangle( sal_uInt16 nItem 
) const = 0;
-virtual tools::Rectangle   GetWindowExtentsRelative() = 0;
+virtual tools::Rectangle   GetWindowExtentsAbsolute() = 0;
 virtual boolIsEnabled() const = 0;

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source

[Stephan Bergmann (via logerrit)]

 accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx|   18 ++
 accessibility/inc/standard/vclxaccessibletabcontrol.hxx   |   16 ++--
 accessibility/source/standard/vclxaccessiblestatusbaritem.cxx |   12 --
 accessibility/source/standard/vclxaccessibletabcontrol.cxx|   14 ---
 4 files changed, 10 insertions(+), 50 deletions(-)

New commits:
commit b1883a0ff9f8e62a83bdcc94f4ff0dd01b2a56d6
Author: Stephan Bergmann 
AuthorDate: Thu Jan 26 17:35:32 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Jan 27 11:47:10 2023 +

Use ImplInheritanceHelper in VCLXAccessibleTabControl

Change-Id: I9426bac6b26feaa555842142dd3ce62bbe5f4a69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146237
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx 
b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
index 9827f9ba6b67..dcf515775bd7 100644
--- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
@@ -21,7 +21,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -30,11 +30,9 @@
 
 
 
-typedef ::cppu::ImplHelper1 <
-css::accessibility::XAccessibleSelection > VCLXAccessibleTabControl_BASE;
-
-class VCLXAccessibleTabControl final : public VCLXAccessibleComponent,
-public VCLXAccessibleTabControl_BASE
+class VCLXAccessibleTabControl final : public cppu::ImplInheritanceHelper<
+   VCLXAccessibleComponent,
+   
css::accessibility::XAccessibleSelection>
 {
 private:
 typedef std::vector< css::uno::Reference< css::accessibility::XAccessible 
> > AccessibleChildren;
@@ -64,12 +62,6 @@ private:
 public:
 VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow );
 
-// XInterface
-DECLARE_XINTERFACE()
-
-// XTypeProvider
-DECLARE_XTYPEPROVIDER()
-
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
 virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
override;
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx 
b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index a3c9eb03c476..9963b51aef5f 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -42,7 +42,7 @@ using namespace ::comphelper;
 
 
 VCLXAccessibleTabControl::VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow )
-:VCLXAccessibleComponent( pVCLXWindow )
+:ImplInheritanceHelper( pVCLXWindow )
 {
 m_pTabControl = GetAs();
 if (!m_pTabControl)
@@ -291,18 +291,6 @@ void VCLXAccessibleTabControl::FillAccessibleStateSet( 
sal_Int64& rStateSet )
 }
 
 
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleTabControl, 
VCLXAccessibleComponent, VCLXAccessibleTabControl_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTabControl, 
VCLXAccessibleComponent, VCLXAccessibleTabControl_BASE )
-
-
 // XComponent
 
 
commit 90a64d3ca1fdf75df1dcebebbd250e09b21cc7bf
Author: Stephan Bergmann 
AuthorDate: Thu Jan 26 17:31:28 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Jan 27 11:47:01 2023 +

Use ImplInheritanceHelper in VCLXAccessibleStatusBarItem

Change-Id: I7ec38650b0ef44b59b57bd64ba74fcac918f8b6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146236
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx 
b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
index 0e82ed4b3ab7..8bcf8e33024b 100644
--- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
@@ -23,7 +23,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -32,12 +32,10 @@
 
 typedef ::comphelper::OAccessibleTextHelper AccessibleTextHelper_BASE;
 
-typedef ::cppu::ImplHelper2<
-css::accessibility::XAccessible,
-css::lang::XServiceInfo > VCLXAccessibleStatusBarItem_BASE;
-
-class VCLXAccessibleStatusBarItem final : public AccessibleTextHelper_BASE,
-  public 
VCLXAccessibleStatusBarItem_BASE
+class VCLXAccessibleStatusBarItem final : public cppu::ImplInheritanceHelper<
+  AccessibleTextHelper_BASE,
+  css::accessibility::XAccessible,
+  css::lang::XServiceInfo>
 {
 friend class VCLXAccessibleStatusBar;
 
@@ -72,12 +70,6 @@ private:
 public:
 VCLXAccessibleStatusBarItem( StatusBar* pStatusBar, sal_uInt16 nItemId );
 
-// XInterface
-DECLARE_XINTERFACE()
-
-// XTypeProvider
-DECLARE_XTYPEPROVIDER()

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source

[Stephan Bergmann (via logerrit)]

 accessibility/inc/standard/vclxaccessiblemenu.hxx|   19 
 accessibility/inc/standard/vclxaccessiblemenuitem.hxx|   22 ---
 accessibility/source/standard/vclxaccessiblemenu.cxx |   12 
 accessibility/source/standard/vclxaccessiblemenuitem.cxx |   14 -
 4 files changed, 14 insertions(+), 53 deletions(-)

New commits:
commit 2f7dee3a2dd6c8696fc2929275fb6ab05b44a30d
Author: Stephan Bergmann 
AuthorDate: Thu Jan 26 17:24:43 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Jan 27 08:32:21 2023 +

Use ImplInheritanceHelper in VCLXAccessibleMenu

Change-Id: Ia086713b06cd9525e5bb03e74a1908bdd6058b18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146233
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/standard/vclxaccessiblemenu.hxx 
b/accessibility/inc/standard/vclxaccessiblemenu.hxx
index e866a53a3d8a..ce7b3f0580de 100644
--- a/accessibility/inc/standard/vclxaccessiblemenu.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenu.hxx
@@ -22,29 +22,22 @@
 #include 
 #include 
 
-#include 
+#include 
 
 
 
 
-typedef ::cppu::ImplHelper1 <
-css::accessibility::XAccessibleSelection > VCLXAccessibleMenu_BASE;
-
-class VCLXAccessibleMenu final : public VCLXAccessibleMenuItem,
-public VCLXAccessibleMenu_BASE
+class VCLXAccessibleMenu final :
+public cppu::ImplInheritanceHelper<
+VCLXAccessibleMenuItem, css::accessibility::XAccessibleSelection>
 {
 virtual boolIsFocused() override;
 virtual boolIsPopupMenuOpen() override;
 sal_Int64   implGetSelectedAccessibleChildCount();
 
 public:
-using VCLXAccessibleMenuItem::VCLXAccessibleMenuItem;
-
-// XInterface
-DECLARE_XINTERFACE()
-
-// XTypeProvider
-DECLARE_XTYPEPROVIDER()
+VCLXAccessibleMenu( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = 
nullptr ):
+ImplInheritanceHelper(pParent, nItemPos, pMenu) {}
 
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx 
b/accessibility/source/standard/vclxaccessiblemenu.cxx
index e3ad7c118014..5d1d54e4009f 100644
--- a/accessibility/source/standard/vclxaccessiblemenu.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenu.cxx
@@ -61,18 +61,6 @@ bool VCLXAccessibleMenu::IsPopupMenuOpen()
 }
 
 
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleMenu, VCLXAccessibleMenuItem, 
VCLXAccessibleMenu_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenu, VCLXAccessibleMenuItem, 
VCLXAccessibleMenu_BASE )
-
-
 // XServiceInfo
 
 
commit 969b3f1e5416bfbec8d8bf2871a8176393ddaa22
Author: Stephan Bergmann 
AuthorDate: Thu Jan 26 17:22:50 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Jan 27 08:32:11 2023 +

Use ImplInheritanceHelper in VCLXAccessibleMenuItem

Change-Id: I0eca36225c2a43e2ba90253c013fefe43b2f29a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146232
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx 
b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
index e67be7f09e53..ddc50a8f3577 100644
--- a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
@@ -25,20 +25,18 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 
 
 
 
-typedef ::cppu::ImplHelper3<
-css::accessibility::XAccessibleText,
-css::accessibility::XAccessibleAction,
-css::accessibility::XAccessibleValue > VCLXAccessibleMenuItem_BASE;
-
-class VCLXAccessibleMenuItem :  public OAccessibleMenuItemComponent,
-public ::comphelper::OCommonAccessibleText,
-public VCLXAccessibleMenuItem_BASE
+class VCLXAccessibleMenuItem :  public cppu::ImplInheritanceHelper<
+OAccessibleMenuItemComponent,
+css::accessibility::XAccessibleText,
+css::accessibility::XAccessibleAction,
+css::accessibility::XAccessibleValue>,
+public ::comphelper::OCommonAccessibleText
 {
 protected:
 virtual boolIsFocused() override;
@@ -57,12 +55,6 @@ protected:
 public:
 VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = 
nullptr );
 
-// XInterface
-DECLARE_XINTERFACE()
-
-// XTypeProvider
-DECLARE_XTYPEPROVIDER()
-
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
 virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
override;
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx 
b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source

[Stephan Bergmann (via logerrit)]

 accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx|   18 ++---
 accessibility/inc/standard/vclxaccessiblelist.hxx |   19 ++
 accessibility/source/standard/vclxaccessibleheaderbaritem.cxx |   12 --
 accessibility/source/standard/vclxaccessiblelist.cxx  |6 ---
 4 files changed, 11 insertions(+), 44 deletions(-)

New commits:
commit 4986d195c3100655ec2770e8f9d2e2c642d9b371
Author: Stephan Bergmann 
AuthorDate: Thu Jan 26 13:53:45 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Jan 26 19:55:55 2023 +

Use ImplInheritanceHelper in VCLXAccessibleList

Change-Id: I2412ef089b5b299b131916d21afa5c5d4fd74c39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146190
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx 
b/accessibility/inc/standard/vclxaccessiblelist.hxx
index 74f6d5755d17..bab8b649fa07 100644
--- a/accessibility/inc/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelist.hxx
@@ -22,14 +22,9 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
-typedef ::cppu::ImplHelper2<
-css::accessibility::XAccessible,
-css::accessibility::XAccessibleSelection
-> VCLXAccessibleList_BASE;
-
 typedef std::vector< css::uno::WeakReference< css::accessibility::XAccessible 
> >
 ListItems;
 
@@ -45,8 +40,10 @@ namespace accessibility
 classes for selection.
 */
 class VCLXAccessibleList final
-: public VCLXAccessibleComponent,
-  public VCLXAccessibleList_BASE
+: public cppu::ImplInheritanceHelper<
+  VCLXAccessibleComponent,
+  css::accessibility::XAccessible,
+  css::accessibility::XAccessibleSelection>
 {
 public:
 enum BoxType {COMBOBOX, LISTBOX};
@@ -76,12 +73,6 @@ public:
 */
 void UpdateSelection (std::u16string_view sTextOfSelectedItem);
 
-// XInterface
-DECLARE_XINTERFACE()
-
-// XTypeProvider
-DECLARE_XTYPEPROVIDER()
-
 // XAccessible
 virtual css::uno::Reference< css::accessibility::XAccessibleContext> 
SAL_CALL
 getAccessibleContext() override;
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx 
b/accessibility/source/standard/vclxaccessiblelist.cxx
index 66cb69f97ebf..c38240e3b4e7 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -54,7 +54,7 @@ namespace
 
 VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType 
aBoxType,
 const Reference< XAccessible >& 
_xParent)
-: VCLXAccessibleComponent   (pVCLWindow),
+: ImplInheritanceHelper (pVCLWindow),
   m_aBoxType(aBoxType),
   m_nVisibleLineCount   (0),
   m_nIndexInParent  (DEFAULT_INDEX_IN_PARENT),
@@ -505,10 +505,6 @@ void VCLXAccessibleList::HandleChangedItemList()
 Any(), Any());
 }
 
-
-IMPLEMENT_FORWARD_XINTERFACE2(VCLXAccessibleList, VCLXAccessibleComponent, 
VCLXAccessibleList_BASE)
-IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleList, VCLXAccessibleComponent, 
VCLXAccessibleList_BASE)
-
 // XAccessible
 
 Reference SAL_CALL
commit 57f103f15895ecd6e1882652206add0c1ed6a3c9
Author: Stephan Bergmann 
AuthorDate: Thu Jan 26 13:52:04 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Jan 26 19:55:47 2023 +

Use ImplInheritanceHelper in VCLXAccessibleHeaderBarItem

Change-Id: I18b54a3cd689aaf4870c073db8d76d41661a05c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146189
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx 
b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
index e78950bded6f..563e86ff5252 100644
--- a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
+++ b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
@@ -21,7 +21,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 
@@ -34,12 +34,10 @@ class VclWindowEvent;
 //class VCLXAccessibleHeaderBarItem
 //
 
-typedef ::cppu::ImplHelper2<
-css::accessibility::XAccessible,
-css::lang::XServiceInfo > VCLXAccessibleHeaderBarItem_BASE;
-
-class VCLXAccessibleHeaderBarItem final : public 
comphelper::OAccessibleExtendedComponentHelper,
-public VCLXAccessibleHeaderBarItem_BASE
+class VCLXAccessibleHeaderBarItem final : public cppu::ImplInheritanceHelper<
+  
comphelper::OAccessibleExtendedComponentHelper,
+  css::accessibility::XAccessible,
+  css::lang::XServiceInfo>
 {
 private:
 VclPtrm_pHeadBar;
@@ -54,12 +52,6 @@ public:
 VCLXAccessibleHeaderBarItem( HeaderBar*pHeadBar, sal_Int32 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source

[Stephan Bergmann (via logerrit)]

 accessibility/inc/standard/vclxaccessiblebutton.hxx  |   20 ---
 accessibility/inc/standard/vclxaccessiblecheckbox.hxx|   18 +++--
 accessibility/source/standard/vclxaccessiblebutton.cxx   |   12 -
 accessibility/source/standard/vclxaccessiblecheckbox.cxx |   14 --
 4 files changed, 12 insertions(+), 52 deletions(-)

New commits:
commit df4f438e74c444539dcb6dea2ab6c286af155fbf
Author: Stephan Bergmann 
AuthorDate: Thu Jan 26 13:50:05 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Jan 26 19:55:32 2023 +

Use ImplInheritanceHelper in VCLXAccessibleCheckBox

Change-Id: I6cb7926db61590a356db7c55eeda94053dbf189f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146188
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx 
b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
index 81e36cd42403..dc7b0d3c353e 100644
--- a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx
@@ -24,17 +24,15 @@
 #include 
 #include 
 
-#include 
+#include 
 
 
 
 
-typedef ::cppu::ImplHelper2<
-css::accessibility::XAccessibleAction,
-css::accessibility::XAccessibleValue > VCLXAccessibleCheckBox_BASE;
-
-class VCLXAccessibleCheckBox final : public VCLXAccessibleTextComponent,
-   public VCLXAccessibleCheckBox_BASE
+class VCLXAccessibleCheckBox final : public cppu::ImplInheritanceHelper<
+ VCLXAccessibleTextComponent,
+ css::accessibility::XAccessibleAction,
+ css::accessibility::XAccessibleValue>
 {
 private:
 boolm_bChecked;
@@ -56,12 +54,6 @@ private:
 public:
 VCLXAccessibleCheckBox( VCLXWindow* pVCLXindow );
 
-// XInterface
-DECLARE_XINTERFACE()
-
-// XTypeProvider
-DECLARE_XTYPEPROVIDER()
-
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
 virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
override;
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx 
b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index 27da7e6bfbe5..8a0ea492911e 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -46,7 +46,7 @@ using namespace ::comphelper;
 
 
 VCLXAccessibleCheckBox::VCLXAccessibleCheckBox( VCLXWindow* pVCLWindow )
-:VCLXAccessibleTextComponent( pVCLWindow )
+:ImplInheritanceHelper( pVCLWindow )
 {
 m_bChecked = IsChecked();
 m_bIndeterminate = IsIndeterminate();
@@ -137,18 +137,6 @@ void VCLXAccessibleCheckBox::FillAccessibleStateSet( 
sal_Int64& rStateSet )
 }
 
 
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleCheckBox, 
VCLXAccessibleTextComponent, VCLXAccessibleCheckBox_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleCheckBox, 
VCLXAccessibleTextComponent, VCLXAccessibleCheckBox_BASE )
-
-
 // XServiceInfo
 
 
commit 7c63d968bb0c4e1df25bc39e64574326cf83d4ec
Author: Stephan Bergmann 
AuthorDate: Thu Jan 26 13:46:58 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Jan 26 19:55:22 2023 +

Use ImplInheritanceHelper in VCLXAccessibleButton

Change-Id: Ia5c384e7ae4b78e008836fafc5433accd8489f07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146187
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/standard/vclxaccessiblebutton.hxx 
b/accessibility/inc/standard/vclxaccessiblebutton.hxx
index 282e7ed7e817..460c90c67c41 100644
--- a/accessibility/inc/standard/vclxaccessiblebutton.hxx
+++ b/accessibility/inc/standard/vclxaccessiblebutton.hxx
@@ -24,17 +24,15 @@
 #include 
 #include 
 
-#include 
+#include 
 
 
 
 
-typedef ::cppu::ImplHelper2<
-css::accessibility::XAccessibleAction,
-css::accessibility::XAccessibleValue > VCLXAccessibleButton_BASE;
-
-class VCLXAccessibleButton final : public VCLXAccessibleTextComponent,
- public VCLXAccessibleButton_BASE
+class VCLXAccessibleButton final : public cppu::ImplInheritanceHelper<
+   VCLXAccessibleTextComponent,
+   css::accessibility::XAccessibleAction,
+   css::accessibility::XAccessibleValue>
 {
 virtual ~VCLXAccessibleButton() override = default;
 
@@ -42,13 +40,7 @@ class VCLXAccessibleButton final : public 
VCLXAccessibleTextComponent,
 virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override;
 
 public:
-using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent;
-
-// XInterface
-DECLARE_XINTERFACE()
-
-// XTypeProvider
-DECLARE_XTYPEPROVIDER()
+VCLXAccessibleButton( VCLXWindow* pVCLXWindow 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source

[Stephan Bergmann (via logerrit)]

 accessibility/inc/standard/vclxaccessibleedit.hxx |   18 ++
 accessibility/inc/standard/vclxaccessibletextcomponent.hxx|   18 ++
 accessibility/source/standard/vclxaccessibleedit.cxx  |   14 ---
 accessibility/source/standard/vclxaccessibletextcomponent.cxx |   14 ---
 4 files changed, 12 insertions(+), 52 deletions(-)

New commits:
commit fd92a175b5bbb5cb1e0a5188630d9872276a545a
Author: Stephan Bergmann 
AuthorDate: Thu Jan 26 12:12:23 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Jan 26 19:01:58 2023 +

Use ImplInheritanceHelper in VCLXAccessibleEdit

Change-Id: Ia81117c1819b4d3b5791a0d8ca66d79a26a3c9a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146184
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx 
b/accessibility/inc/standard/vclxaccessibleedit.hxx
index 267f71e19632..e10e8cecd6ff 100644
--- a/accessibility/inc/standard/vclxaccessibleedit.hxx
+++ b/accessibility/inc/standard/vclxaccessibleedit.hxx
@@ -24,17 +24,15 @@
 #include 
 #include 
 
-#include 
+#include 
 
 
 
 
-typedef ::cppu::ImplHelper2<
-css::accessibility::XAccessibleAction,
-css::accessibility::XAccessibleEditableText > VCLXAccessibleEdit_BASE;
-
-class VCLXAccessibleEdit : public VCLXAccessibleTextComponent,
-   public VCLXAccessibleEdit_BASE
+class VCLXAccessibleEdit : public cppu::ImplInheritanceHelper<
+   VCLXAccessibleTextComponent,
+   css::accessibility::XAccessibleAction,
+   css::accessibility::XAccessibleEditableText>
 {
 friend class VCLXAccessibleBox;
 
@@ -55,12 +53,6 @@ protected:
 public:
 VCLXAccessibleEdit( VCLXWindow* pVCLXindow );
 
-// XInterface
-DECLARE_XINTERFACE()
-
-// XTypeProvider
-DECLARE_XTYPEPROVIDER()
-
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
 virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
override;
diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx 
b/accessibility/source/standard/vclxaccessibleedit.cxx
index ea7c5c91b5bf..96a8d6986cf8 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -56,7 +56,7 @@ using namespace ::comphelper;
 
 
 VCLXAccessibleEdit::VCLXAccessibleEdit( VCLXWindow* pVCLWindow )
-:VCLXAccessibleTextComponent( pVCLWindow )
+:ImplInheritanceHelper( pVCLWindow )
 {
 m_nCaretPosition = getCaretPosition();
 }
@@ -158,18 +158,6 @@ void VCLXAccessibleEdit::implGetSelection( sal_Int32& 
nStartIndex, sal_Int32& nE
 }
 
 
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleEdit, 
VCLXAccessibleTextComponent, VCLXAccessibleEdit_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleEdit, 
VCLXAccessibleTextComponent, VCLXAccessibleEdit_BASE )
-
-
 // XServiceInfo
 
 
commit b50d9685e8bbb9549e68e3ff0a1b625fa44e6907
Author: Stephan Bergmann 
AuthorDate: Thu Jan 26 12:09:44 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Jan 26 19:01:45 2023 +

Use ImplInheritanceHelper in VCLXAccessibleTextComponent

Change-Id: Iad1ae727e31908949d61d32b3828a67ac74398e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146183
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx 
b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
index 7bc47ac79679..cb2e20694663 100644
--- a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
+++ b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
@@ -22,17 +22,15 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 
 
 
-typedef ::cppu::ImplHelper1 <
-css::accessibility::XAccessibleText >  VCLXAccessibleTextComponent_BASE;
-
-class VCLXAccessibleTextComponent : public VCLXAccessibleComponent,
-public ::comphelper::OCommonAccessibleText,
-public VCLXAccessibleTextComponent_BASE
+class VCLXAccessibleTextComponent : public cppu::ImplInheritanceHelper<
+VCLXAccessibleComponent,
+css::accessibility::XAccessibleText>,
+public ::comphelper::OCommonAccessibleText
 {
 OUStringm_sText;
 
@@ -52,12 +50,6 @@ protected:
 public:
 VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindow );
 
-// XInterface
-DECLARE_XINTERFACE()
-
-// XTypeProvider
-DECLARE_XTYPEPROVIDER()
-
 // XAccessibleText
 virtual sal_Int32 SAL_CALL getCaretPosition() override;
 virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override;
diff --git 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source

[Stephan Bergmann (via logerrit)]

 accessibility/inc/standard/accessiblemenubasecomponent.hxx|   18 ++
 accessibility/inc/standard/accessiblemenucomponent.hxx|   18 ++
 accessibility/source/standard/accessiblemenubasecomponent.cxx |   12 --
 accessibility/source/standard/accessiblemenucomponent.cxx |   12 --
 4 files changed, 10 insertions(+), 50 deletions(-)

New commits:
commit fc2f4eb5ca457860605d0d93baa0d2198800bcbf
Author: Stephan Bergmann 
AuthorDate: Thu Jan 26 11:51:42 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Jan 26 19:01:24 2023 +

Use ImplInheritanceHelper in OAccessibleMenuComponent

Change-Id: I7399a7e707d4a5915925d2e1b606ed7f6a364337
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146182
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/standard/accessiblemenucomponent.hxx 
b/accessibility/inc/standard/accessiblemenucomponent.hxx
index 1e3feb81cb29..90c89922654a 100644
--- a/accessibility/inc/standard/accessiblemenucomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenucomponent.hxx
@@ -21,15 +21,13 @@
 
 #include 
 #include 
-#include 
+#include 
 
 
 
-typedef ::cppu::ImplHelper1<
-css::accessibility::XAccessibleSelection > OAccessibleMenuComponent_BASE;
-
-class OAccessibleMenuComponent : public OAccessibleMenuBaseComponent,
- public OAccessibleMenuComponent_BASE
+class OAccessibleMenuComponent : public cppu::ImplInheritanceHelper<
+ OAccessibleMenuBaseComponent,
+ css::accessibility::XAccessibleSelection>
 {
 protected:
 virtual boolIsEnabled() override;
@@ -40,15 +38,9 @@ protected:
 // OCommonAccessibleComponent
 virtual css::awt::Rectangle implGetBounds(  ) override;
 
-using OAccessibleMenuBaseComponent::OAccessibleMenuBaseComponent;
-
 public:
 
-// XInterface
-DECLARE_XINTERFACE()
-
-// XTypeProvider
-DECLARE_XTYPEPROVIDER()
+OAccessibleMenuComponent( Menu* pMenu ): ImplInheritanceHelper(pMenu) {}
 
 // XAccessibleContext
 virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx 
b/accessibility/source/standard/accessiblemenucomponent.cxx
index 4b6323126252..92718c9b52ba 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -121,18 +121,6 @@ awt::Rectangle OAccessibleMenuComponent::implGetBounds()
 }
 
 
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleMenuComponent, 
OAccessibleMenuBaseComponent, OAccessibleMenuComponent_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuComponent, 
OAccessibleMenuBaseComponent, OAccessibleMenuComponent_BASE )
-
-
 // XAccessibleContext
 
 
commit ce1fbb09746bbc007c6286ead29e351ec5c06c0e
Author: Stephan Bergmann 
AuthorDate: Thu Jan 26 11:40:54 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Jan 26 19:01:09 2023 +

Use ImplInheritanceHelper in OAccessibleMenuBaseComponent

Change-Id: I9527ea68c3fbb1637ea08cea6340b49bab9eac6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146181
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx 
b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
index 4bb176b8fcc1..e56120f7fb38 100644
--- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
@@ -23,7 +23,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -34,12 +34,10 @@ class VclSimpleEvent;
 class VclMenuEvent;
 
 
-typedef ::cppu::ImplHelper2<
-css::accessibility::XAccessible,
-css::lang::XServiceInfo > OAccessibleMenuBaseComponent_BASE;
-
-class OAccessibleMenuBaseComponent : public 
comphelper::OAccessibleExtendedComponentHelper,
- public OAccessibleMenuBaseComponent_BASE
+class OAccessibleMenuBaseComponent : public cppu::ImplInheritanceHelper<
+ 
comphelper::OAccessibleExtendedComponentHelper,
+ css::accessibility::XAccessible,
+ css::lang::XServiceInfo>
 {
 friend class OAccessibleMenuItemComponent;
 friend class VCLXAccessibleMenuItem;
@@ -112,12 +110,6 @@ public:
 
 voidSetStates();
 
-// XInterface
-DECLARE_XINTERFACE()
-
-// XTypeProvider
-DECLARE_XTYPEPROVIDER()
-
 // XServiceInfo
 virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) 
override;
 
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx 
b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index d288dfb30ceb..e1ab9e326ebf 100644

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source

[Stephan Bergmann (via logerrit)]

 accessibility/inc/extended/accessibletabbarpage.hxx|   18 +++
 accessibility/inc/extended/accessibletabbarpagelist.hxx|   20 +++--
 accessibility/source/extended/accessibletabbarpage.cxx |   14 -
 accessibility/source/extended/accessibletabbarpagelist.cxx |   14 -
 4 files changed, 13 insertions(+), 53 deletions(-)

New commits:
commit 4e0858dd9e1b4831eb117640d5d42f7e1e92fdb8
Author: Stephan Bergmann 
AuthorDate: Mon Jan 23 16:02:54 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 25 18:56:17 2023 +

Use ImplInheritanceHelper in AccessibleTabBarPageList

Change-Id: I1f03912046d94bd0e14f65310d93ec4f539fa304
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146115
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx 
b/accessibility/inc/extended/accessibletabbarpagelist.hxx
index 2c7bc2fced93..858a475d7669 100644
--- a/accessibility/inc/extended/accessibletabbarpagelist.hxx
+++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx
@@ -22,7 +22,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #include 
@@ -34,13 +34,11 @@ namespace accessibility
 
 
 
-typedef ::cppu::ImplHelper3<
-css::accessibility::XAccessible,
-css::accessibility::XAccessibleSelection,
-css::lang::XServiceInfo > AccessibleTabBarPageList_BASE;
-
-class AccessibleTabBarPageList final : public AccessibleTabBarBase,
-   public AccessibleTabBarPageList_BASE
+class AccessibleTabBarPageList final : public cppu::ImplInheritanceHelper<
+   AccessibleTabBarBase,
+   css::accessibility::XAccessible,
+   
css::accessibility::XAccessibleSelection,
+   css::lang::XServiceInfo>
 {
 private:
 typedef std::vector< css::uno::Reference< 
css::accessibility::XAccessible > > AccessibleChildren;
@@ -68,12 +66,6 @@ namespace accessibility
 public:
 AccessibleTabBarPageList( TabBar* pTabBar, sal_Int32 nIndexInParent );
 
-// XInterface
-DECLARE_XINTERFACE()
-
-// XTypeProvider
-DECLARE_XTYPEPROVIDER()
-
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
 virtual sal_Bool SAL_CALL supportsService( const OUString& 
rServiceName ) override;
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx 
b/accessibility/source/extended/accessibletabbarpagelist.cxx
index f09d43fd23db..3eb8ab324c37 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -48,7 +48,7 @@ namespace accessibility
 
 
 AccessibleTabBarPageList::AccessibleTabBarPageList( TabBar* pTabBar, 
sal_Int32 nIndexInParent )
-:AccessibleTabBarBase( pTabBar )
+:ImplInheritanceHelper( pTabBar )
 ,m_nIndexInParent( nIndexInParent )
 {
 if ( m_pTabBar )
@@ -326,18 +326,6 @@ namespace accessibility
 }
 
 
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBarPageList, 
OAccessibleExtendedComponentHelper, AccessibleTabBarPageList_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBarPageList, 
OAccessibleExtendedComponentHelper, AccessibleTabBarPageList_BASE )
-
-
 // XComponent
 
 
commit 02fbe937dc85772c463e40589a179d4a01770562
Author: Stephan Bergmann 
AuthorDate: Mon Jan 23 16:01:48 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 25 18:56:06 2023 +

Use ImplInheritanceHelper in AccessibleTabBarPage

Change-Id: I25092aa7307d9f1d69fbb29eb9a2db74071f760f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146114
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx 
b/accessibility/inc/extended/accessibletabbarpage.hxx
index 75f105ae72f3..5fd91f19b538 100644
--- a/accessibility/inc/extended/accessibletabbarpage.hxx
+++ b/accessibility/inc/extended/accessibletabbarpage.hxx
@@ -21,7 +21,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 
@@ -31,12 +31,10 @@ namespace accessibility
 
 
 
-typedef ::cppu::ImplHelper2<
-css::accessibility::XAccessible,
-css::lang::XServiceInfo > AccessibleTabBarPage_BASE;
-
-class AccessibleTabBarPage final : public AccessibleTabBarBase,
-   public AccessibleTabBarPage_BASE
+class AccessibleTabBarPage final : public cppu::ImplInheritanceHelper<
+   AccessibleTabBarBase,
+   css::accessibility::XAccessible,
+   css::lang::XServiceInfo>
  

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source

[Stephan Bergmann (via logerrit)]

 accessibility/inc/extended/accessibleiconchoicectrl.hxx|   18 -
 accessibility/inc/extended/accessiblelistbox.hxx   |   14 ++
 accessibility/source/extended/accessibleiconchoicectrl.cxx |8 +
 accessibility/source/extended/accessiblelistbox.cxx|4 --
 4 files changed, 13 insertions(+), 31 deletions(-)

New commits:
commit 7af63ddd93265f6d66aeaa103ba0c5810ea1b158
Author: Stephan Bergmann 
AuthorDate: Mon Jan 23 15:58:18 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 25 18:55:36 2023 +

Use ImplInheritanceHelper in AccessibleListBox

Change-Id: I7fd3c43a991300a6180094ef9ac44e0dc3c56764
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146112
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/extended/accessiblelistbox.hxx 
b/accessibility/inc/extended/accessiblelistbox.hxx
index 339e32f3b0b7..ffb03ad6bd9f 100644
--- a/accessibility/inc/extended/accessiblelistbox.hxx
+++ b/accessibility/inc/extended/accessiblelistbox.hxx
@@ -20,7 +20,7 @@
 #pragma once
 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -38,10 +38,10 @@ namespace accessibility
 /** the class OAccessibleListBoxEntry represents the base class for an 
accessible object of a listbox entry
 */
 class AccessibleListBox :
-public cppu::ImplHelper2<
+public cppu::ImplInheritanceHelper<
+VCLXAccessibleComponent,
 css::accessibility::XAccessible,
-css::accessibility::XAccessibleSelection>,
-public VCLXAccessibleComponent
+css::accessibility::XAccessibleSelection>
 {
 
 css::uno::Reference< css::accessibility::XAccessible > m_xParent;
@@ -76,12 +76,6 @@ namespace accessibility
 
 rtl::Reference 
implGetAccessible(SvTreeListEntry & rEntry);
 
-// XTypeProvider
-DECLARE_XTYPEPROVIDER()
-
-// XInterface
-DECLARE_XINTERFACE()
-
 // XServiceInfo
 virtual OUString SAL_CALL getImplementationName() override;
 virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName 
) override;
diff --git a/accessibility/source/extended/accessiblelistbox.cxx 
b/accessibility/source/extended/accessiblelistbox.cxx
index d9507fefd4b3..5561fa232dfc 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -45,7 +45,7 @@ namespace accessibility
 
 AccessibleListBox::AccessibleListBox( SvTreeListBox const & _rListBox, 
const Reference< XAccessible >& _xParent ) :
 
-VCLXAccessibleComponent( _rListBox.GetWindowPeer() ),
+ImplInheritanceHelper( _rListBox.GetWindowPeer() ),
 m_xParent( _xParent )
 {
 }
@@ -59,8 +59,6 @@ namespace accessibility
 dispose();
 }
 }
-IMPLEMENT_FORWARD_XINTERFACE2(AccessibleListBox, VCLXAccessibleComponent, 
ImplHelper2)
-IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleListBox, 
VCLXAccessibleComponent, ImplHelper2)
 
 void AccessibleListBox::ProcessWindowEvent( const VclWindowEvent& 
rVclWindowEvent )
 {
commit 4bde82182c82bdc3d6bc0f4851a5e100fba47c30
Author: Stephan Bergmann 
AuthorDate: Mon Jan 23 15:58:12 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 25 18:55:21 2023 +

Use ImplInheritanceHelper in AccessibleIconChoiceCtrl

Change-Id: Id5dec3b807509a073fcd2383ec37d2712cf24e9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146111
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx 
b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
index cd27fcb7da3f..5ead84ee3466 100644
--- a/accessibility/inc/extended/accessibleiconchoicectrl.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
@@ -20,7 +20,7 @@
 #pragma once
 
 #include 
-#include 
+#include 
 #include 
 #include 
 
@@ -30,13 +30,13 @@ class SvtIconChoiceCtrl;
 
 namespace accessibility
 {
-typedef ::cppu::ImplHelper2<  css::accessibility::XAccessible
-, css::accessibility::XAccessibleSelection> 
AccessibleIconChoiceCtrl_BASE;
-
 /** the class OAccessibleListBoxEntry represents the base class for an 
accessible object of a listbox entry
 */
-class AccessibleIconChoiceCtrl final : public AccessibleIconChoiceCtrl_BASE
-  ,public VCLXAccessibleComponent
+class AccessibleIconChoiceCtrl final :
+public cppu::ImplInheritanceHelper<
+VCLXAccessibleComponent,
+css::accessibility::XAccessible,
+css::accessibility::XAccessibleSelection>
 {
 css::uno::Reference< css::accessibility::XAccessible > m_xParent;
 
@@ -60,12 +60,6 @@ namespace accessibility
 AccessibleIconChoiceCtrl( SvtIconChoiceCtrl const & _rIconCtrl,
   const css::uno::Reference< 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source

[Michael Weghorn (via logerrit)]

 accessibility/inc/extended/AccessibleGridControl.hxx |3 --
 accessibility/inc/extended/AccessibleGridControlTable.hxx|3 ++
 accessibility/source/extended/AccessibleGridControl.cxx  |9 +--
 accessibility/source/extended/AccessibleGridControlTable.cxx |   14 +++
 4 files changed, 19 insertions(+), 10 deletions(-)

New commits:
commit 4e641d9240a981216d6724141b9b7a9e4c63c82a
Author: Michael Weghorn 
AuthorDate: Wed Mar 9 11:51:45 2022 +0100
Commit: Michael Weghorn 
CommitDate: Wed Mar 9 17:47:10 2022 +0100

Related: tdf#147742 a11y: Dispose table cells as well

When disposing `AccessibleGridControlTable` (which
is done in `AccessibleGridControl::disposing`),
also dispose its cells and clear the references.

Without this in place, a crash sometimes occured
when running the macro in the sample doc from
tdf#147742 several times and clicking around in the
table, with the Orca screen reader active.

This was because a reference to one of
the `AccessibleGridControlTableCell`s was still
around after the `AccessibleGridControlTable`
had already been disposed, and when trying
to get its accessible name, the call to
`IAccessibleTable::GetAccessibleObjectName` in
`AccessibleGridControlCell::getAccessibleName`
would fail because the object that the
`m_aTable` reference was referring to had already
been deleted.

With the cell being disposed as well, the
`ensureIsAlive()` check at the beginning of
`AccessibleGridControlCell::getAccessibleName`
will throw a `DisposedException`, that is then
handled properly in the calling code.

Backtrace (with master as of commit
2598c35dbac8dc4492ad1fc79925c5347e683af0):

#0  0x7fffd9152ed3 in 
accessibility::AccessibleGridControlCell::getAccessibleName() 
(this=0x5bbcdb70) at 
/home/michi/development/git/libreoffice/accessibility/source/extended/AccessibleGridControlTableCell.cxx:79
#1  0x7fffe45e864a in wrapper_get_name(AtkObject*) 
(atk_obj=0x5bbcef60) at 
/home/michi/development/git/libreoffice/vcl/unx/gtk3/a11y/atkwrapper.cxx:369
#2  0x7fffe3a87e5c in  () at 
/lib/x86_64-linux-gnu/libatk-bridge-2.0.so.0
#3  0x7fffe3a947de in  () at 
/lib/x86_64-linux-gnu/libatk-bridge-2.0.so.0
#4  0x7fffe3a94caf in  () at 
/lib/x86_64-linux-gnu/libatk-bridge-2.0.so.0
#5  0x775feff0 in  () at /lib/x86_64-linux-gnu/libdbus-1.so.3
#6  0x775eea1c in dbus_connection_dispatch () at 
/lib/x86_64-linux-gnu/libdbus-1.so.3
#7  0x7fffe36d74a5 in  () at /lib/x86_64-linux-gnu/libatspi.so.0
#8  0x7fffe9ab8cdb in g_main_context_dispatch () at 
/lib/x86_64-linux-gnu/libglib-2.0.so.0
#9  0x7fffe9ab8f88 in  () at /lib/x86_64-linux-gnu/libglib-2.0.so.0
#10 0x7fffe9ab903f in g_main_context_iteration () at 
/lib/x86_64-linux-gnu/libglib-2.0.so.0
#11 0x7fffe460f546 in GtkSalData::Yield(bool, bool) 
(this=0x5567c750, bWait=true, bHandleAllCurrentEvents=false) at 
/home/michi/development/git/libreoffice/vcl/unx/gtk3/gtkdata.cxx:405
#12 0x7fffe461402a in GtkInstance::DoYield(bool, bool) 
(this=0x5567c5d0, bWait=true, bHandleAllCurrentEvents=false) at 
/home/michi/development/git/libreoffice/vcl/unx/gtk3/gtkinst.cxx:427
#13 0x7fffef7ab4be in ImplYield(bool, bool) (i_bWait=true, 
i_bAllEvents=false) at 
/home/michi/development/git/libreoffice/vcl/source/app/svapp.cxx:474
#14 0x7fffef7ac0b0 in Application::Yield() () at 
/home/michi/development/git/libreoffice/vcl/source/app/svapp.cxx:558
#15 0x7fffef7ab18e in Application::Execute() () at 
/home/michi/development/git/libreoffice/vcl/source/app/svapp.cxx:452
#16 0x77c309af in desktop::Desktop::Main() 
(this=0x7fffd780) at 
/home/michi/development/git/libreoffice/desktop/source/app/app.cxx:1604
#17 0x7fffef7c9d75 in ImplSVMain() () at 
/home/michi/development/git/libreoffice/vcl/source/app/svmain.cxx:202
#18 0x7fffef7c9e96 in SVMain() () at 
/home/michi/development/git/libreoffice/vcl/source/app/svmain.cxx:234
#19 0x77c947c9 in soffice_main() () at 
/home/michi/development/git/libreoffice/desktop/source/app/sofficemain.cxx:98
#20 0x49f4 in sal_main () at 
/home/michi/development/git/libreoffice/desktop/source/app/main.c:51
#21 0x49da in main (argc=4, argv=0x7fffdaf8) at 
/home/michi/development/git/libreoffice/desktop/source/app/main.c:49

Change-Id: Idffa76809cbfad746f27d18191fdfc905b64ee0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131247
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx 
b/accessibility/inc/extended/AccessibleGridControlTable.hxx
index bada75124257..602365468505 100644
--- 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source

[Michael Weghorn (via logerrit)]

 accessibility/inc/extended/AccessibleGridControlBase.hxx |6 --
 accessibility/inc/extended/AccessibleGridControlTable.hxx|3 +
 accessibility/source/extended/AccessibleGridControl.cxx  |   33 ---
 accessibility/source/extended/AccessibleGridControlTable.cxx |   30 ++
 4 files changed, 37 insertions(+), 35 deletions(-)

New commits:
commit 5977d6b981dcde556450589199c06204009a4a1a
Author: Michael Weghorn 
AuthorDate: Wed Mar 9 11:23:35 2022 +0100
Commit: Michael Weghorn 
CommitDate: Wed Mar 9 17:46:42 2022 +0100

a11y: Let AccessibleGridControlTable calculate child index

Just call `AccessibleGridControlTable::getAccessibleCellAt`,
which already takes care of calculating the proper child index from
row and column index.

Change-Id: Id463c14108158c5833231f95cf16847764f5b646
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131245
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/accessibility/source/extended/AccessibleGridControl.cxx 
b/accessibility/source/extended/AccessibleGridControl.cxx
index 09d43f816359..5d4ed3bc767c 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -305,10 +305,8 @@ void AccessibleGridControl::commitTableEvent(sal_Int16 
_nEventId,const Any& _rNe
 const sal_Int32 nCurrentCol = m_aTable.GetCurrentColumn();
 css::uno::Reference< css::accessibility::XAccessible > xChild;
 if (nCurrentRow > -1 && nCurrentCol > -1)
-{
-sal_Int32 nColumnCount = m_aTable.GetColumnCount();
-xChild = m_xTable->getAccessibleChild(nCurrentRow * nColumnCount + 
nCurrentCol);
-}
+xChild = m_xTable->getAccessibleCellAt(nCurrentRow, nCurrentCol);
+
 m_xTable->commitEvent(_nEventId, Any(xChild),_rOldValue);
 }
 else
commit 319a5b5b457c46c8a036b99d6f024517bc87be42
Author: Michael Weghorn 
AuthorDate: Wed Mar 9 11:07:55 2022 +0100
Commit: Michael Weghorn 
CommitDate: Wed Mar 9 17:46:28 2022 +0100

a11y: Move TABLE_MODEL_CHANGED handling to table

Move the handling for the
`AccessibleEventId::TABLE_MODEL_CHANGED` event of
type `AccessibleTableModelChangeType::DELETE`
from `AccessibleGridControl` into
`AccessibleGridControlTable`.

To do so, make `AccessibleGridControlBase::commitEvent`
virtual and override it in `AccessibleGridControlTable`.
The method already gets called from 
`AccessibleGridControl::commitTableEvent`
where the event was handled previously.

Handling the details of how cells are internally
organized in a vector only in the class itself
rather than in different places seems to make sense.

There are currently more cases where `AccessibleGridControl`
deals with the cell vector directly that will be
addressed in following commits.

Change-Id: I26a7737432ecb198eac00279a8242d22e3c661d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131244
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx 
b/accessibility/inc/extended/AccessibleGridControlBase.hxx
index 7da777d8dac2..f1b2d4b1c85f 100644
--- a/accessibility/inc/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx
@@ -188,10 +188,8 @@ public:
 inline ::vcl::table::AccessibleTableControlObjType getType() const;
 
 /** Commits an event to all listeners. */
-void commitEvent(
-sal_Int16 nEventId,
-const css::uno::Any& rNewValue,
-const css::uno::Any& rOldValue );
+virtual void commitEvent(sal_Int16 nEventId, const css::uno::Any& 
rNewValue,
+ const css::uno::Any& rOldValue);
 /** @return  TRUE, if the object is not disposed or disposing. */
 bool isAlive() const;
 
diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx 
b/accessibility/inc/extended/AccessibleGridControlTable.hxx
index 73c4f6a19050..bada75124257 100644
--- a/accessibility/inc/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx
@@ -142,6 +142,9 @@ public:
 /**@return m_pCellVector*/
 std::vector< rtl::Reference >& 
getCellVector() { return m_aCellVector;}
 
+virtual void commitEvent(sal_Int16 nEventId, const css::uno::Any& 
rNewValue,
+ const css::uno::Any& rOldValue) override;
+
 private:
 // internal virtual methods
 
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx 
b/accessibility/source/extended/AccessibleGridControl.cxx
index c90cc0384b46..09d43f816359 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -22,8 +22,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source comphelper/source connectivity/source editeng/source extensions/source filter/source include/editeng include/svtools

[Noel Grandin (via logerrit)]

 UnoControls/inc/basecontrol.hxx   |9 -
 UnoControls/source/base/basecontrol.cxx   |3 
 accessibility/inc/extended/AccessibleBrowseBox.hxx|3 
 accessibility/source/extended/AccessibleBrowseBox.cxx |4 
 comphelper/source/officeinstdir/officeinstallationdirectories.hxx |8 -
 connectivity/source/drivers/postgresql/pq_driver.hxx  |6 -
 editeng/source/accessibility/AccessibleContextBase.cxx|   10 +-
 extensions/source/config/ldap/ldapuserprofilebe.cxx   |3 
 extensions/source/config/ldap/ldapuserprofilebe.hxx   |4 
 filter/source/config/cache/basecontainer.cxx  |   31 +++---
 filter/source/config/cache/basecontainer.hxx  |2 
 filter/source/config/cache/cacheitem.hxx  |   13 --
 filter/source/config/cache/cacheupdatelistener.cxx|   11 +-
 filter/source/config/cache/cacheupdatelistener.hxx|2 
 filter/source/config/cache/configflush.cxx|3 
 filter/source/config/cache/configflush.hxx|3 
 filter/source/config/cache/contenthandlerfactory.cxx  |2 
 filter/source/config/cache/filtercache.cxx|   49 
--
 filter/source/config/cache/filtercache.hxx|3 
 filter/source/config/cache/filterfactory.cxx  |   12 +-
 filter/source/config/cache/frameloaderfactory.cxx |2 
 filter/source/config/cache/typedetection.cxx  |   26 ++---
 include/editeng/AccessibleContextBase.hxx |5 -
 include/svtools/acceleratorexecute.hxx|9 -
 include/vcl/unohelp2.hxx  |8 -
 javaunohelper/source/vm.cxx   |9 -
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |   12 +-
 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |2 
 sfx2/inc/preventduplicateinteraction.hxx  |   11 --
 sfx2/source/appl/preventduplicateinteraction.cxx  |3 
 svtools/source/misc/acceleratorexecute.cxx|1 
 svx/inc/AccessibleTableShape.hxx  |2 
 svx/source/accessibility/AccessibleControlShape.cxx   |4 
 svx/source/accessibility/AccessibleShape.cxx  |   12 +-
 svx/source/accessibility/ChildrenManagerImpl.cxx  |2 
 svx/source/accessibility/ChildrenManagerImpl.hxx  |2 
 svx/source/table/accessiblecell.cxx   |   10 +-
 ucb/source/ucp/expand/ucpexpand.cxx   |   10 --
 vcl/inc/dndlistenercontainer.hxx  |5 -
 vcl/source/window/dndlistenercontainer.cxx|2 
 vcl/win/dtrans/globals.hxx|5 -
 vcl/win/dtrans/source.cxx |2 
 vcl/win/dtrans/source.hxx |3 
 vcl/win/dtrans/sourcecontext.cxx  |2 
 vcl/win/dtrans/sourcecontext.hxx  |3 
 vcl/win/dtrans/target.cxx |4 
 vcl/win/dtrans/target.hxx |3 
 47 files changed, 142 insertions(+), 198 deletions(-)

New commits:
commit fd1fda8feacd1d006960e4505ad21dea213f1ec1
Author: Noel Grandin 
AuthorDate: Fri Dec 17 18:49:14 2021 +0200
Commit: Noel Grandin 
CommitDate: Sun Dec 19 11:19:20 2021 +0100

osl::Mutex->std::mutex in AccessibleBrowseBoxAccess

Change-Id: Idc6e32b81190b3940a42ddb4bb30f1eff35b59fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127070
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx 
b/accessibility/inc/extended/AccessibleBrowseBox.hxx
index f6109299e333..e2d5de3f2600 100644
--- a/accessibility/inc/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace accessibility {
 
@@ -196,7 +197,7 @@ class AccessibleBrowseBoxAccess final :
 public ::vcl::IAccessibleBrowseBox
 {
 private:
-::osl::Mutexm_aMutex;
+std::mutex  m_aMutex;
 css::uno::Reference< css::accessibility::XAccessible >
 m_xParent;
 ::vcl::IAccessibleTableProvider&m_rBrowseBox;
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx 
b/accessibility/source/extended/AccessibleBrowseBox.cxx
index 7dd780508816..8c620b98260b 100644
--- 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source avmedia/source basctl/source dbaccess/source extensions/source forms/source framework/inc framework/source include/av

[Noel (via logerrit)]

 accessibility/inc/standard/vclxaccessibletoolboxitem.hxx |2 
 accessibility/source/standard/vclxaccessibletoolbox.cxx  |   26 +-
 accessibility/source/standard/vclxaccessibletoolboxitem.cxx  |4 
 avmedia/source/framework/mediatoolbox.cxx|2 
 basctl/source/basicide/IDEComboBox.cxx   |4 
 basctl/source/inc/IDEComboBox.hxx|4 
 dbaccess/source/ui/browser/unodatbr.cxx  |4 
 extensions/source/bibliography/toolbar.cxx   |   18 -
 extensions/source/bibliography/toolbar.hxx   |   28 +-
 forms/source/solar/control/navtoolbar.cxx|   61 ++--
 framework/inc/uielement/FixedImageToolbarController.hxx  |2 
 framework/inc/uielement/FixedTextToolbarController.hxx   |2 
 framework/inc/uielement/comboboxtoolbarcontroller.hxx|2 
 framework/inc/uielement/commandinfo.hxx  |5 
 framework/inc/uielement/complextoolbarcontroller.hxx |4 
 framework/inc/uielement/dropdownboxtoolbarcontroller.hxx |2 
 framework/inc/uielement/edittoolbarcontroller.hxx|2 
 framework/inc/uielement/imagebuttontoolbarcontroller.hxx |2 
 framework/inc/uielement/spinfieldtoolbarcontroller.hxx   |2 
 framework/inc/uielement/togglebuttontoolbarcontroller.hxx|2 
 framework/inc/uielement/toolbarmanager.hxx   |3 
 framework/inc/uielement/toolbarmerger.hxx|   12 
 framework/source/fwe/classes/sfxhelperfunctions.cxx  |2 
 framework/source/layoutmanager/toolbarlayoutmanager.cxx  |4 
 framework/source/uielement/FixedImageToolbarController.cxx   |2 
 framework/source/uielement/FixedTextToolbarController.cxx|2 
 framework/source/uielement/comboboxtoolbarcontroller.cxx |2 
 framework/source/uielement/complextoolbarcontroller.cxx  |4 
 framework/source/uielement/dropdownboxtoolbarcontroller.cxx  |2 
 framework/source/uielement/edittoolbarcontroller.cxx |2 
 framework/source/uielement/generictoolbarcontroller.cxx  |6 
 framework/source/uielement/imagebuttontoolbarcontroller.cxx  |2 
 framework/source/uielement/popuptoolbarcontroller.cxx|   14 -
 framework/source/uielement/spinfieldtoolbarcontroller.cxx|2 
 framework/source/uielement/styletoolbarcontroller.cxx|2 
 framework/source/uielement/subtoolbarcontroller.cxx  |8 
 framework/source/uielement/togglebuttontoolbarcontroller.cxx |2 
 framework/source/uielement/toolbarmanager.cxx|   36 +-
 framework/source/uielement/toolbarmerger.cxx |   16 -
 include/avmedia/mediatoolbox.hxx |2 
 include/framework/generictoolbarcontroller.hxx   |4 
 include/framework/sfxhelperfunctions.hxx |5 
 include/sfx2/strings.hrc |2 
 include/sfx2/tbxctrl.hxx |   16 -
 include/svtools/toolboxcontroller.hxx|5 
 include/svx/ParaSpacingControl.hxx   |   14 -
 include/svx/clipboardctl.hxx |2 
 include/svx/colorwindow.hxx  |4 
 include/svx/fillctrl.hxx |2 
 include/svx/formatpaintbrushctrl.hxx |2 
 include/svx/grafctrl.hxx |   18 -
 include/svx/linectrl.hxx |2 
 include/svx/tbxctl.hxx   |2 
 include/vcl/builder.hxx  |3 
 include/vcl/toolbox.hxx  |  128 +
 sc/inc/NumberFormatControl.hxx   |2 
 sc/inc/sc.hrc|6 
 sc/source/ui/app/inputwin.cxx|  143 +--
 sc/source/ui/cctrl/tbzoomsliderctrl.cxx  |4 
 sc/source/ui/inc/tbzoomsliderctrl.hxx|2 
 sc/source/ui/sidebar/NumberFormatControl.cxx |4 
 sd/source/ui/controller/displaymodecontroller.cxx|4 
 sd/source/ui/controller/slidelayoutcontroller.cxx|2 
 sd/source/ui/dlg/diactrl.cxx |2 
 sd/source/ui/dlg/gluectrl.cxx|2 
 sd/source/ui/inc/diactrl.hxx |2 
 sd/source/ui/inc/gluectrl.hxx|2 
 sfx2/inc/inettbc.hxx |2 
 sfx2/inc/sidebar/ControllerFactory.hxx   |3 
 sfx2/inc/sidebar/SidebarToolBox.hxx  |6 
 sfx2/source/appl/linkmgr2.cxx

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source basctl/source

[Noel Grandin (via logerrit)]

 accessibility/inc/extended/accessibleiconchoicectrl.hxx   |2 +-
 accessibility/inc/extended/accessiblelistbox.hxx  |2 +-
 accessibility/inc/extended/accessiblelistboxentry.hxx |2 +-
 accessibility/inc/extended/accessibletabbarpage.hxx   |4 ++--
 accessibility/inc/extended/textwindowaccessibility.hxx|2 +-
 accessibility/inc/standard/accessiblemenubasecomponent.hxx|2 +-
 accessibility/inc/standard/vclxaccessiblecheckbox.hxx |4 ++--
 accessibility/inc/standard/vclxaccessiblelist.hxx |2 +-
 accessibility/inc/standard/vclxaccessibletabpage.hxx  |4 ++--
 accessibility/source/extended/accessibleiconchoicectrl.cxx|2 +-
 accessibility/source/extended/accessiblelistbox.cxx   |2 +-
 accessibility/source/extended/accessiblelistboxentry.cxx  |2 +-
 accessibility/source/extended/accessibletabbarpage.cxx|4 ++--
 accessibility/source/standard/accessiblemenubasecomponent.cxx |2 +-
 accessibility/source/standard/vclxaccessiblecheckbox.cxx  |4 ++--
 accessibility/source/standard/vclxaccessiblelist.cxx  |2 +-
 accessibility/source/standard/vclxaccessibletabpage.cxx   |4 ++--
 basctl/source/accessibility/accessibledialogcontrolshape.cxx  |6 +++---
 basctl/source/basicide/basicrenderable.cxx|6 +++---
 basctl/source/basicide/basicrenderable.hxx|6 +++---
 basctl/source/basicide/baside2.hxx|2 +-
 basctl/source/basicide/baside2b.cxx   |2 +-
 basctl/source/basicide/linenumberwindow.hxx   |2 +-
 basctl/source/basicide/moduldl2.cxx   |2 +-
 basctl/source/inc/accessibledialogcontrolshape.hxx|6 +++---
 basctl/source/inc/bastype2.hxx|6 +++---
 basctl/source/inc/bastypes.hxx|2 +-
 basctl/source/inc/localizationmgr.hxx |2 +-
 28 files changed, 44 insertions(+), 44 deletions(-)

New commits:
commit 8bf1542f856bd2b8617d7a0870824a3a2ada4b6c
Author: Noel Grandin 
AuthorDate: Wed Aug 21 17:11:45 2019 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 21 19:47:52 2019 +0200

loplugin:constmethod in basctl

Change-Id: Ib4d7a6690aea4e6f009162cd5b6407906deaaa75
Reviewed-on: https://gerrit.libreoffice.org/77925
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx 
b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index 1d725842fdf0..759dd69dfab9 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -73,7 +73,7 @@ AccessibleDialogControlShape::~AccessibleDialogControlShape()
 }
 
 
-bool AccessibleDialogControlShape::IsFocused()
+bool AccessibleDialogControlShape::IsFocused() const
 {
 bool bFocused = false;
 if ( m_pDialogWindow )
@@ -87,7 +87,7 @@ bool AccessibleDialogControlShape::IsFocused()
 }
 
 
-bool AccessibleDialogControlShape::IsSelected()
+bool AccessibleDialogControlShape::IsSelected() const
 {
 if ( m_pDialogWindow )
 return m_pDialogWindow->GetView().IsObjMarked(m_pDlgEdObj);
@@ -125,7 +125,7 @@ void AccessibleDialogControlShape::SetSelected( bool 
bSelected )
 }
 
 
-awt::Rectangle AccessibleDialogControlShape::GetBounds()
+awt::Rectangle AccessibleDialogControlShape::GetBounds() const
 {
 awt::Rectangle aBounds( 0, 0, 0, 0 );
 if ( m_pDlgEdObj )
diff --git a/basctl/source/basicide/basicrenderable.cxx 
b/basctl/source/basicide/basicrenderable.cxx
index b32925317547..ce4f7005f124 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -75,7 +75,7 @@ Renderable::~Renderable()
 {
 }
 
-VclPtr< Printer > Renderable::getPrinter()
+VclPtr< Printer > Renderable::getPrinter() const
 {
 VclPtr< Printer > pPrinter;
 Any aValue( getValue( "RenderDevice" ) );
@@ -90,13 +90,13 @@ VclPtr< Printer > Renderable::getPrinter()
 return pPrinter;
 }
 
-bool Renderable::isPrintOddPages()
+bool Renderable::isPrintOddPages() const
 {
 sal_Int64 nContent = getIntValue( "PrintContent", -1 );
 return nContent != 2;
 }
 
-bool Renderable::isPrintEvenPages()
+bool Renderable::isPrintEvenPages() const
 {
 sal_Int64 nContent = getIntValue( "PrintContent", -1 );
 return nContent != 3;
diff --git a/basctl/source/basicide/basicrenderable.hxx 
b/basctl/source/basicide/basicrenderable.hxx
index 6f5bd29396bf..2618e5faa9d2 100644
--- a/basctl/source/basicide/basicrenderable.hxx
+++ b/basctl/source/basicide/basicrenderable.hxx
@@ -37,9 +37,9 @@ class Renderable :
 osl::Mutex  maMutex;
 std::vector  maValidPages;
 
-VclPtr getPrinter();
-bool isPrintOddPages();
-bool isPrintEvenPages();
+   

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source basctl/source chart2/source comphelper/source cppcanvas/source dbaccess/source include/comphelper include/oox oox/sou

[Libreoffice Gerrit user]

 accessibility/inc/standard/vclxaccessiblelistitem.hxx   |1 
 accessibility/source/standard/vclxaccessiblelistitem.cxx|2 
-
 basctl/source/basicide/baside3.cxx  |4 
--
 basctl/source/inc/baside3.hxx   |2 
-
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx |   17 
+-
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx |6 
---
 comphelper/source/misc/SelectionMultiplex.cxx   |   10 
-
 cppcanvas/source/inc/canvasgraphichelper.hxx|1 
 cppcanvas/source/tools/canvasgraphichelper.cxx  |9 
-
 dbaccess/source/core/api/RowSet.cxx |1 
 dbaccess/source/core/api/RowSetBase.cxx |4 
--
 dbaccess/source/core/api/RowSetCacheIterator.cxx|5 
--
 dbaccess/source/core/api/RowSetCacheIterator.hxx|3 
-
 dbaccess/source/core/misc/dsntypes.cxx  |1 
 dbaccess/source/inc/dsntypes.hxx|1 
 dbaccess/source/ui/app/AppIconControl.cxx   |1 
 dbaccess/source/ui/app/AppIconControl.hxx   |1 
 dbaccess/source/ui/browser/dbloader.cxx |4 
--
 dbaccess/source/ui/dlg/RelationDlg.cxx  |2 
-
 dbaccess/source/ui/dlg/dbwizsetup.cxx   |6 
+--
 dbaccess/source/ui/dlg/generalpage.cxx  |   16 
++---
 dbaccess/source/ui/dlg/generalpage.hxx  |   10 
+
 dbaccess/source/ui/inc/DExport.hxx  |1 
 dbaccess/source/ui/inc/FieldDescriptions.hxx|1 
 dbaccess/source/ui/inc/RelationDlg.hxx  |1 
 dbaccess/source/ui/inc/TokenWriter.hxx  |1 
 dbaccess/source/ui/inc/TypeInfo.hxx |2 
-
 dbaccess/source/ui/misc/DExport.cxx |7 
+---
 dbaccess/source/ui/misc/HtmlReader.cxx  |3 
-
 dbaccess/source/ui/misc/TokenWriter.cxx |   17 
--
 dbaccess/source/ui/misc/UITools.cxx |6 
+--
 dbaccess/source/ui/tabledesign/FieldDescriptions.cxx|5 
--
 include/comphelper/SelectionMultiplex.hxx   |   10 
-
 include/oox/drawingml/shapegroupcontext.hxx |2 
-
 oox/source/drawingml/shapegroupcontext.cxx  |5 
+-
 reportdesign/source/ui/dlg/Navigator.cxx|2 
-
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx   |1 
 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx   |3 
-
 38 files changed, 23 insertions(+), 151 deletions(-)

New commits:
commit 970ca8de0be4c4cd9485170f3c56a34b4069eec2
Author: Noel Grandin 
AuthorDate: Sun Feb 24 09:15:32 2019 +0200
Commit: Noel Grandin 
CommitDate: Mon Feb 25 08:06:15 2019 +0100

loplugin:unusedfields in various

Change-Id: I31d0e6c3559af2e322fb474b97f3bbf4d5064831
Reviewed-on: https://gerrit.libreoffice.org/68280
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx 
b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
index 02eb11641755..d6fdb6f762bc 100644
--- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -66,7 +66,6 @@ private:
 sal_uInt32  m_nClientId;
 
 rtl::Reference< VCLXAccessibleList > m_xParent;
-css::uno::Reference< css::accessibility::XAccessibleContext > 
m_xParentContext;
 
 virtual ~VCLXAccessibleListItem() override = default;
 /** this function is called upon disposing the component
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx 
b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index b406725f519c..e674cd26e466 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -72,7 +72,6 @@ VCLXAccessibleListItem::VCLXAccessibleListItem(sal_Int32 
_nIndexInParent, const
 , m_xParent(_xParent)
 {
 assert(m_xParent.is());
-m_xParentContext = m_xParent->getAccessibleContext();
 ::accessibility::IComboListBoxHelper* pListBoxHelper = 
m_xParent->getListBoxHelper();
 if (pListBoxHelper)
 m_sEntryText = 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source chart2/source compilerplugins/clang connectivity/source cppcanvas/source editeng/source emfio/source filter/source in

[Libreoffice Gerrit user]

 accessibility/inc/standard/vclxaccessiblebox.hxx   |6 
 accessibility/source/standard/vclxaccessiblebox.cxx|   11 
 chart2/source/controller/dialogs/dlg_CreationWizard.cxx|9 
 chart2/source/controller/inc/SeriesOptionsItemConverter.hxx|1 
 chart2/source/controller/inc/dlg_CreationWizard.hxx|2 
 chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx |3 
 chart2/source/view/charttypes/BubbleChart.cxx  |3 
 chart2/source/view/charttypes/BubbleChart.hxx  |2 
 compilerplugins/clang/singlevalfields.cxx  |   37 +
 compilerplugins/clang/singlevalfields.results  |  333 
--
 compilerplugins/clang/staticvar.cxx|  204 
++
 compilerplugins/clang/test/staticvar.cxx   |   80 
++
 compilerplugins/clang/unusedfields.cxx |2 
 connectivity/source/drivers/mork/MConnection.cxx   |   10 
 connectivity/source/drivers/mork/MErrorResource.hxx|6 
 cppcanvas/source/mtfrenderer/emfpregion.cxx|4 
 cppcanvas/source/mtfrenderer/emfpregion.hxx|1 
 editeng/source/misc/svxacorr.cxx   |   16 
 emfio/source/reader/mtftools.cxx   |3 
 filter/source/graphicfilter/icgm/cgm.cxx   |   19 
 filter/source/graphicfilter/icgm/cgm.hxx   |2 
 filter/source/graphicfilter/icgm/class1.cxx|   12 
 filter/source/graphicfilter/icgm/elements.cxx  |2 
 filter/source/graphicfilter/icgm/elements.hxx  |1 
 filter/source/graphicfilter/idxf/dxf2mtf.cxx   |3 
 filter/source/graphicfilter/idxf/dxfvec.cxx|2 
 filter/source/graphicfilter/idxf/dxfvec.hxx|2 
 include/editeng/svxacorr.hxx   |3 
 include/svtools/ctrlbox.hxx|   13 
 include/tools/b3dtrans.hxx |4 
 linguistic/source/dlistimp.cxx |   13 
 sc/source/filter/excel/excform.cxx |   12 
 sc/source/filter/excel/excform8.cxx|   18 
 sc/source/filter/excel/frmbase.cxx |4 
 sc/source/filter/inc/formel.hxx|1 
 sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx  |   16 
 sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx  |1 
 solenv/CompilerTest_compilerplugins_clang.mk   |1 
 svtools/source/control/ctrlbox.cxx |  136 

 sw/inc/printdata.hxx   |9 
 tools/source/generic/b3dtrans.cxx  |   13 
 tools/source/generic/config.cxx|   21 
 ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx   |   10 
 ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx   |1 
 writerfilter/source/dmapper/GraphicImport.cxx  |6 
 writerfilter/source/dmapper/PropertyMap.cxx|5 
 writerfilter/source/dmapper/PropertyMap.hxx|1 
 47 files changed, 671 insertions(+), 393 deletions(-)

New commits:
commit 6ee4375763854e43e549aee5a35520def2e215a2
Author: Noel Grandin 
AuthorDate: Tue Oct 16 10:40:16 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 17 08:25:17 2018 +0200

new loplugin staticvar

looks for variables that can be declared const and static i.e. they can
be stored in the read-only linker segment and shared between different
processes

Change-Id: I577fb2070604003e56fb44f8a02c9684070311cf
Reviewed-on: https://gerrit.libreoffice.org/61817
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/staticvar.cxx 
b/compilerplugins/clang/staticvar.cxx
new file mode 100644
index ..a9db2f4dda04
--- /dev/null
+++ b/compilerplugins/clang/staticvar.cxx
@@ -0,0 +1,204 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source compilerplugins/clang editeng/source forms/source include/editeng include/svx svx/source sw/source unotools/source

[Stephan Bergmann]

 accessibility/inc/standard/vclxaccessiblelistitem.hxx|1 
 accessibility/source/standard/vclxaccessiblelistitem.cxx |5 -
 compilerplugins/clang/unnecessaryoverride.cxx|   62 +--
 editeng/source/uno/unopracc.cxx  |6 -
 forms/source/component/Currency.cxx  |6 -
 forms/source/component/Currency.hxx  |3 
 forms/source/component/Numeric.cxx   |7 -
 forms/source/component/Numeric.hxx   |3 
 forms/source/component/Pattern.cxx   |7 -
 forms/source/component/Pattern.hxx   |3 
 include/editeng/unopracc.hxx |1 
 include/svx/fmdpage.hxx  |3 
 include/svx/unoshape.hxx |   23 -
 svx/source/form/fmdpage.cxx  |7 -
 svx/source/unodraw/unoshap2.cxx  |   54 -
 svx/source/unodraw/unoshap3.cxx  |7 -
 sw/source/uibase/uno/unotxdoc.cxx|9 --
 unotools/source/ucbhelper/XTempFile.hxx  |2 
 unotools/source/ucbhelper/xtempfile.cxx  |5 -
 19 files changed, 58 insertions(+), 156 deletions(-)

New commits:
commit 018e89337d18e5aa153faae5b3df41188d1c174c
Author: Stephan Bergmann 
Date:   Fri Jul 15 12:26:27 2016 +0200

Improve loplugin:unnecessaryoverride

 thorsten, remember what that "TODO" in
 SvxAccessibleTextPropertySet::getSupportedServiceNames was to be about 
exactly,
 in a909acb7009acadffa53e74ea05ddb88803490f1 ?
 sberg: that's a nonsense, prolly copy'n'pasted, or a 'please 
review
 me'
 thorsten, OK, thanks (that override will eventually go away with
 loplugin:unnecessaryoverride, and the TODO comment be lost)

Change-Id: Iba964c61768459aac4067bbd4e1f7d4f78f6adac
Reviewed-on: https://gerrit.libreoffice.org/27232
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx 
b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
index 1fa8074..0e19c3c 100644
--- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -108,7 +108,6 @@ public:
 virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType 
) throw(css::uno::RuntimeException, std::exception) override;
 
 // XTypeProvider
-virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw 
(css::uno::RuntimeException, std::exception) override;
 virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() 
throw (css::uno::RuntimeException, std::exception) override;
 
 // XServiceInfo
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx 
b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 1cc7b37..52724e64 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -153,11 +153,6 @@ Any SAL_CALL VCLXAccessibleListItem::queryInterface( Type 
const & rType ) throw
 
 // XTypeProvider
 
-Sequence< Type > SAL_CALL VCLXAccessibleListItem::getTypes(  ) throw 
(RuntimeException, std::exception)
-{
-return VCLXAccessibleListItem_BASE::getTypes();
-}
-
 Sequence< sal_Int8 > VCLXAccessibleListItem::getImplementationId() throw 
(RuntimeException, std::exception)
 {
 return css::uno::Sequence();
diff --git a/compilerplugins/clang/unnecessaryoverride.cxx 
b/compilerplugins/clang/unnecessaryoverride.cxx
index 8a882af..06a468c 100644
--- a/compilerplugins/clang/unnecessaryoverride.cxx
+++ b/compilerplugins/clang/unnecessaryoverride.cxx
@@ -12,6 +12,8 @@
 #include 
 #include 
 #include 
+
+#include "compat.hxx"
 #include "plugin.hxx"
 
 /**
@@ -67,16 +69,61 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const 
CXXMethodDecl* methodDecl)
 
 const CXXMethodDecl* overriddenMethodDecl = 
*methodDecl->begin_overridden_methods();
 
+if (compat::getReturnType(*methodDecl).getCanonicalType()
+!= compat::getReturnType(*overriddenMethodDecl).getCanonicalType())
+{
+return true;
+}
+//TODO: check for identical exception specifications
+
 const CompoundStmt* compoundStmt = 
dyn_cast(methodDecl->getBody());
 if (!compoundStmt || compoundStmt->size() != 1)
 return true;
-const Stmt* firstStmt = compoundStmt->body_front();
-if (const ReturnStmt* returnStmt = dyn_cast(firstStmt)) {
-firstStmt = returnStmt->getRetValue();
+auto returnStmt = dyn_cast(compoundStmt->body_front());
+if (returnStmt == nullptr) {
+return true;
 }
-if (!firstStmt)
+auto returnExpr = returnStmt->getRetValue();
+if (returnExpr == nullptr) {
 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source basic/source binaryurp/CppunitTest_binaryurp_test-cache.mk binaryurp/CppunitTest_binaryurp_test-unmarshal.mk binaryur

[Caolán McNamara]

 accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx   
|6 
 accessibility/inc/accessibility/extended/AccessibleGridControl.hxx 
|6 
 accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx   
|4 
 accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx 
|4 
 accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx 
|4 
 accessibility/inc/accessibility/extended/textwindowaccessibility.hxx   
|4 
 accessibility/source/extended/AccessibleBrowseBox.cxx  
|   54 
 accessibility/source/extended/AccessibleGridControl.cxx
|  104 -
 accessibility/source/extended/AccessibleToolPanelDeck.cxx  
|   42 
 accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
|   54 
 accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx
|   60 
 basic/source/runtime/basrdll.cxx   
|   20 
 binaryurp/CppunitTest_binaryurp_test-cache.mk  
|2 
 binaryurp/CppunitTest_binaryurp_test-unmarshal.mk  
|2 
 binaryurp/Library_binaryurp.mk 
|2 
 binaryurp/source/bridge.cxx
|   15 
 binaryurp/source/bridge.hxx
|7 
 binaryurp/source/bridgefactory.hxx 
|8 
 binaryurp/source/cache.hxx 
|6 
 binaryurp/source/incomingreply.hxx 
|8 
 binaryurp/source/incomingrequest.cxx   
|1 
 binaryurp/source/incomingrequest.hxx   
|6 
 binaryurp/source/marshal.cxx   
|1 
 binaryurp/source/marshal.hxx   
|6 
 binaryurp/source/outgoingrequests.hxx  
|6 
 binaryurp/source/proxy.hxx 
|6 
 binaryurp/source/reader.cxx
|3 
 binaryurp/source/readerstate.hxx   
|   11 
 binaryurp/source/unmarshal.cxx 
|1 
 binaryurp/source/unmarshal.hxx 
|6 
 binaryurp/source/writerstate.hxx   
|7 
 comphelper/inc/pch/precompiled_comphelper.hxx  
|1 
 comphelper/source/misc/asyncnotification.cxx   
|   42 
 comphelper/source/misc/storagehelper.cxx   
|   10 
 comphelper/source/property/ChainablePropertySet.cxx
|   18 
 comphelper/source/property/MasterPropertySet.cxx   
|   48 
 configmgr/CppunitTest_configmgr_unit.mk
|1 
 configmgr/Library_configmgr.mk 
|2 
 configmgr/inc/pch/precompiled_configmgr.hxx
|3 
 configmgr/source/access.hxx
|   11 
 configmgr/source/broadcaster.hxx   
|8 
 configmgr/source/childaccess.hxx   
|7 
 configmgr/source/components.cxx
|2 
 configmgr/source/components.hxx
|   10 
 configmgr/source/configurationprovider.cxx 
|   15 
 configmgr/source/configurationregistry.cxx 
|   13 
 configmgr/source/data.hxx  
|6 
 configmgr/source/lock.cxx  
|4 
 configmgr/source/lock.hxx  
|4 
 configmgr/source/modifications.hxx 
|   10 
 configmgr/source/partial.hxx   
|   11 
 configmgr/source/readonlyaccess.cxx
|7 
 configmgr/source/readwriteaccess.cxx   
|7 
 configmgr/source/rootaccess.hxx
|4 
 configmgr/source/update.cxx
|   11 
 configmgr/source/valueparser.hxx   
|6 
 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source framework/source

[Caolán McNamara]

 accessibility/inc/accessibility/extended/accessiblelistbox.hxx |2 
 accessibility/source/helper/acc_factory.cxx|4 
 framework/source/services/substitutepathvars.cxx   |  313 
--
 3 files changed, 147 insertions(+), 172 deletions(-)

New commits:
commit 0be44f7d15009bffd6c03cc3ad81fa54aace40e6
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Feb 4 14:57:16 2014 +

fix ambiguities

Change-Id: Ice46cfbe8a21c5e641e09070128b8f412411c9d9

diff --git a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx 
b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
index 58d22a5..78a1765 100644
--- a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
+++ b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
@@ -121,7 +121,7 @@ private:
 
 ::com::sun::star::uno::Reference 
::com::sun::star::accessibility::XAccessible  m_xFocusedChild;
 
-accessibility::AccessibleListBoxEntry* GetCurEventEntry( const 
VclWindowEvent rVclWindowEvent );
+::accessibility::AccessibleListBoxEntry* GetCurEventEntry( const 
VclWindowEvent rVclWindowEvent );
 
 };
 
diff --git a/accessibility/source/helper/acc_factory.cxx 
b/accessibility/source/helper/acc_factory.cxx
index 640c2d5..4e4 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -398,11 +398,11 @@ inline bool hasFloatingChild(Window *pWindow)
 }
 else if ( ( nType == WINDOW_HELPTEXTWINDOW ) || ( nType == 
WINDOW_FIXEDLINE ) )
 {
-   xContext = (accessibility::XAccessibleContext*) new 
VCLXAccessibleFixedText( _pXWindow );
+   xContext = (::accessibility::XAccessibleContext*) new 
VCLXAccessibleFixedText( _pXWindow );
 }
 else
 {
-   xContext = (accessibility::XAccessibleContext*) new 
VCLXAccessibleComponent( _pXWindow );
+   xContext = (::accessibility::XAccessibleContext*) new 
VCLXAccessibleComponent( _pXWindow );
 }
 }
 
commit e1b606e0718928f648aae3cf46f2c780eb0a9277
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Feb 4 14:50:53 2014 +

nPrio is always 0

Change-Id: Idc5bd213562de95c83752dc089ff6a928e9085d3

diff --git a/framework/source/services/substitutepathvars.cxx 
b/framework/source/services/substitutepathvars.cxx
index ccf31ab..517aed8 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -1264,180 +1264,155 @@ throw ( NoSuchElementException, RuntimeException )
 }
 
 namespace {
-const char* GetLang( LanguageType nType, sal_uInt16 nPrio )
+const char* GetLang(LanguageType nType)
 {
 if ( nType == LANGUAGE_SYSTEM || nType == LANGUAGE_DONTKNOW )
 nType = MsLangId::getSystemUILanguage();
 
-if ( nPrio == 0 )
+switch ( nType )
 {
-switch ( nType )
-{
-case LANGUAGE_DANISH:
-return 45;
-
-case LANGUAGE_DUTCH:
-case LANGUAGE_DUTCH_BELGIAN:
-return 31;
-
-case LANGUAGE_ENGLISH:
-case LANGUAGE_ENGLISH_UK:
-case LANGUAGE_ENGLISH_EIRE:
-case LANGUAGE_ENGLISH_SAFRICA:
-case LANGUAGE_ENGLISH_JAMAICA:
-case LANGUAGE_ENGLISH_BELIZE:
-case LANGUAGE_ENGLISH_TRINIDAD:
-case LANGUAGE_ENGLISH_ZIMBABWE:
-case LANGUAGE_ENGLISH_PHILIPPINES:
-return 44;
-
-case LANGUAGE_ENGLISH_US:
-case LANGUAGE_ENGLISH_CAN:
-return 01;
-
-case LANGUAGE_ENGLISH_AUS:
-case LANGUAGE_ENGLISH_NZ:
-return 61;
-case LANGUAGE_ESTONIAN:
-return 77;
-
-
-case LANGUAGE_FINNISH:
-return 35;
-
-case LANGUAGE_FRENCH_CANADIAN:
-return 02;
-
-case LANGUAGE_FRENCH:
-case LANGUAGE_FRENCH_BELGIAN:
-case LANGUAGE_FRENCH_SWISS:
-case LANGUAGE_FRENCH_LUXEMBOURG:
-case LANGUAGE_FRENCH_MONACO:
-return 33;
-
-case LANGUAGE_GERMAN:
-case LANGUAGE_GERMAN_SWISS:
-case LANGUAGE_GERMAN_AUSTRIAN:
-case LANGUAGE_GERMAN_LUXEMBOURG:
-case LANGUAGE_GERMAN_LIECHTENSTEIN:
-return 49;
-
-case LANGUAGE_ITALIAN:
-case LANGUAGE_ITALIAN_SWISS:
-return 39;
-
-case LANGUAGE_NORWEGIAN:
-case LANGUAGE_NORWEGIAN_BOKMAL:
-return 47;
-
-case LANGUAGE_PORTUGUESE:
-return 03;
-
-case LANGUAGE_PORTUGUESE_BRAZILIAN:
-return 55;
-
-case LANGUAGE_SPANISH_DATED:
-case LANGUAGE_SPANISH_MEXICAN:
-case LANGUAGE_SPANISH_MODERN:
-case 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source include/svtools svtools/source unoidl/source

[Stephan Bergmann]

 accessibility/inc/accessibility/extended/textwindowaccessibility.hxx |2 
 accessibility/source/extended/textwindowaccessibility.cxx|2 
 accessibility/source/helper/acc_factory.cxx  |6 -
 include/svtools/accessiblefactory.hxx|2 
 include/svtools/textwindowpeer.hxx   |3 
 svtools/source/edit/textwindowpeer.cxx   |6 -
 svtools/source/misc/svtaccessiblefactory.cxx |2 
 unoidl/source/sourceprovider-parser.y|   56 
--
 8 files changed, 56 insertions(+), 23 deletions(-)

New commits:
commit 62fcdfa34aa302aa9051e90e75b94eb442fa1db7
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Nov 26 15:54:26 2013 +0100

-Werror,-Wunused-private-field

...fixed more thoroughly than 49c1964b427c9f2f169ba4d826d346adc7555ae0 WaE:
private field 'm_bCompoundControlChild' is not used.

Change-Id: Ief1093c054fe272b82da78ab103e8ca3feb72b90

diff --git 
a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx 
b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index befe02a..20433be 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -396,7 +396,7 @@ class Document: public ::VCLXAccessibleComponent, public 
::SfxListener
 {
 public:
 Document(::VCLXWindow * pVclXWindow, ::TextEngine  rEngine,
- ::TextView  rView, bool bCompoundControlChild);
+ ::TextView  rView);
 
 inline css::uno::Reference css::accessibility::XAccessible 
 getAccessible() { return m_xAccessible; }
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx 
b/accessibility/source/extended/textwindowaccessibility.cxx
index f969bcb..002326f 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -770,7 +770,7 @@ void ParagraphImpl::checkDisposed()
 }
 
 Document::Document(::VCLXWindow * pVclXWindow, ::TextEngine  rEngine,
-   ::TextView  rView, bool /* bCompoundControlChild */):
+   ::TextView  rView):
 VCLXAccessibleComponent(pVclXWindow),
 m_xAccessible(pVclXWindow),
 m_rEngine(rEngine),
diff --git a/accessibility/source/helper/acc_factory.cxx 
b/accessibility/source/helper/acc_factory.cxx
index 93f6bf5..640c2d5 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -158,7 +158,7 @@ inline bool hasFloatingChild(Window *pWindow)
 
 virtual ::com::sun::star::uno::Reference 
::com::sun::star::accessibility::XAccessibleContext 
 createAccessibleTextWindowContext(
-VCLXWindow* pVclXWindow, TextEngine rEngine, TextView rView, 
bool bCompoundControlChild
+VCLXWindow* pVclXWindow, TextEngine rEngine, TextView rView
 ) const;
 
 virtual ::com::sun::star::uno::Reference 
::com::sun::star::accessibility::XAccessible 
@@ -451,9 +451,9 @@ inline bool hasFloatingChild(Window *pWindow)
 
 //
 Reference XAccessibleContext  
AccessibleFactory::createAccessibleTextWindowContext(
-VCLXWindow* pVclXWindow, TextEngine rEngine, TextView rView, bool 
bCompoundControlChild ) const
+VCLXWindow* pVclXWindow, TextEngine rEngine, TextView rView ) const
 {
-return new Document( pVclXWindow, rEngine, rView, 
bCompoundControlChild );
+return new Document( pVclXWindow, rEngine, rView );
 }
 
 //
diff --git a/include/svtools/accessiblefactory.hxx 
b/include/svtools/accessiblefactory.hxx
index 18eec03..cd8a654 100644
--- a/include/svtools/accessiblefactory.hxx
+++ b/include/svtools/accessiblefactory.hxx
@@ -103,7 +103,7 @@ namespace svt
 
 virtual ::com::sun::star::uno::Reference 
::com::sun::star::accessibility::XAccessibleContext 
 createAccessibleTextWindowContext(
-VCLXWindow* pVclXWindow, TextEngine rEngine, TextView rView, 
bool bCompoundControlChild
+VCLXWindow* pVclXWindow, TextEngine rEngine, TextView rView
 ) const = 0;
 
 virtual ::com::sun::star::uno::Reference 
::com::sun::star::accessibility::XAccessible 
diff --git a/include/svtools/textwindowpeer.hxx 
b/include/svtools/textwindowpeer.hxx
index cdcc6f8..14ef753 100644
--- a/include/svtools/textwindowpeer.hxx
+++ b/include/svtools/textwindowpeer.hxx
@@ -35,7 +35,7 @@ namespace svt
 class TextWindowPeer: public ::VCLXWindow
 {
 public:
-SVT_DLLPUBLIC TextWindowPeer(::TextView  rView, bool 
bCompoundControlChild = false);
+SVT_DLLPUBLIC TextWindowPeer(::TextView  rView);
 
 virtual 

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source include/toolkit toolkit/source

[Stephan Bergmann]

 accessibility/inc/accessibility/helper/accresmgr.hxx |5 +
 accessibility/source/helper/accresmgr.cxx|2 
 include/toolkit/helper/tkresmgr.hxx  |   39 +--
 toolkit/source/awt/vclxtabpagecontainer.cxx  |1 
 toolkit/source/helper/tkresmgr.cxx   |   48 ---
 5 files changed, 10 insertions(+), 85 deletions(-)

New commits:
commit cef6dad4f6539c2fab0e02b24b71a15537f69034
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 15 10:30:56 2013 +0100

Remove unused parts of TkResMgr

Change-Id: I33f6bb8756a3bab054068a73c8e3d71b414ddfe0

diff --git a/include/toolkit/helper/tkresmgr.hxx 
b/include/toolkit/helper/tkresmgr.hxx
index 6e8a170..668a1bd 100644
--- a/include/toolkit/helper/tkresmgr.hxx
+++ b/include/toolkit/helper/tkresmgr.hxx
@@ -21,45 +21,12 @@
 #define INCLUDED_TOOLKIT_HELPER_TKRESMGR_HXX
 
 #include rtl/ustring.hxx
-#include vcl/image.hxx
 
-class SimpleResMgr;
-class ResMgr;
+class Image;
 
-#define TK_RES_STRING(id)   TkResMgr::loadString(id)
-
-// 
-
-// TkResMgr
-// 
-
-
-class TkResMgr
+namespace TkResMgr
 {
-static SimpleResMgr* m_pSimpleResMgr;
-static ResMgr* m_pResMgr;
-
-private:
-// no instantiation allowed
-TkResMgr() { }
-~TkResMgr() { }
-
-// we'll instantiate one static member of the following class,
-// which in it's dtor ensures that m_pSimpleResMgr will be deleted
-class EnsureDelete
-{
-public:
-EnsureDelete() { }
-~EnsureDelete();
-};
-friend class EnsureDelete;
-
-protected:
-static void ensureImplExists();
-
-public:
-// loads the string with the specified resource id
-static OUString loadString( sal_uInt16 nResId );
-
-static Image getImageFromURL( const OUString i_rImageURL );
+Image getImageFromURL( const OUString i_rImageURL );
 };
 
 
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 928b4bd..47447d4 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -20,6 +20,7 @@
 #include toolkit/awt/vclxtabpagecontainer.hxx
 #include com/sun/star/awt/tab/XTabPageModel.hpp
 #include com/sun/star/awt/XControl.hpp
+#include vcl/image.hxx
 #include vcl/tabpage.hxx
 #include vcl/tabctrl.hxx
 #include vcl/svapp.hxx
diff --git a/toolkit/source/helper/tkresmgr.cxx 
b/toolkit/source/helper/tkresmgr.cxx
index 5b9fbce..06d14c8 100644
--- a/toolkit/source/helper/tkresmgr.cxx
+++ b/toolkit/source/helper/tkresmgr.cxx
@@ -18,65 +18,19 @@
  */
 
 #include toolkit/helper/tkresmgr.hxx
-#include tools/simplerm.hxx
 #include comphelper/processfactory.hxx
 #include comphelper/namedvaluecollection.hxx
 #include com/sun/star/graphic/GraphicProvider.hpp
 #include com/sun/star/graphic/XGraphicProvider.hpp
-#include tools/resmgr.hxx
 #include tools/diagnose_ex.h
 
-#include vcl/svapp.hxx
+#include vcl/image.hxx
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::graphic::XGraphic;
 using ::com::sun::star::graphic::XGraphicProvider;
 using namespace ::com::sun::star;
-// 
-
-// TkResMgr
-// 
-
 
-SimpleResMgr*   TkResMgr::m_pSimpleResMgr = NULL;
-ResMgr* TkResMgr::m_pResMgr = NULL;
-
-// 
-
-
-TkResMgr::EnsureDelete::~EnsureDelete()
-{
-delete TkResMgr::m_pSimpleResMgr;
-//delete TkResMgr::m_pResMgr;
-}
-
-// 
-
-
-void TkResMgr::ensureImplExists()
-{
-if (m_pSimpleResMgr)
-return;
-
-m_pSimpleResMgr = SimpleResMgr::Create( tk, 
Application::GetSettings().GetUILanguageTag() );
-m_pResMgr = ResMgr::CreateResMgr( tk );
-
-if (m_pSimpleResMgr)
-{
-// now that we have a impl class, make sure it's deleted on unloading 
the library
-static TkResMgr::EnsureDelete s_aDeleteTheImplClass;
-}
-}
-
-// 
-
-OUString TkResMgr::loadString( sal_uInt16 nResId )
-{
-OUString sReturn;
-
-ensureImplExists();
-if ( m_pSimpleResMgr )
-sReturn = m_pSimpleResMgr-ReadString( nResId );
-
-return sReturn;
-}
-
-// 
-
 Image TkResMgr::getImageFromURL( const OUString i_rImageURL )
 {
 if ( i_rImageURL.isEmpty() )
commit 2549be5a75ef2a17e56d5392f6c1592275abf65e
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Thu Nov 14 16:33:23 2013 +

Add namespace to accessbility's TkResMgr.

Previously this conflicted with