accessibility/inc/standard/vclxaccessibletextcomponent.hxx | 1
comphelper/source/misc/accessibleselectionhelper.cxx | 5 --
comphelper/source/misc/accessibletexthelper.cxx | 12 ------
include/comphelper/accessibleselectionhelper.hxx | 19 ++++------
include/comphelper/accessibletexthelper.hxx | 24 +++++--------
svx/source/inc/charmapacc.hxx | 1
svx/source/inc/svxpixelctlaccessiblecontext.hxx | 1
svx/source/inc/svxrectctaccessiblecontext.hxx | 1
8 files changed, 24 insertions(+), 40 deletions(-)
New commits:
commit 63ef3cf5bfa8b58e5ac9a645aea2f043599dc6d4
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Jan 23 19:16:22 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jan 25 15:40:16 2023 +0000
Use ImplInheritanceHelper in OAccessibleTextHelper
(Explicitly deleting the special member functions is needed to avoid MSVC
> include\cppuhelper/implbase.hxx(152): error C2280:
'comphelper::OAccessibleExtendedComponentHelper::OAccessibleExtendedComponentHelper(comphelper::OAccessibleExtendedComponentHelper
&&)': attempting to reference a deleted function
> include\comphelper/accessiblecomponenthelper.hxx(220): note: see
declaration of
'comphelper::OAccessibleExtendedComponentHelper::OAccessibleExtendedComponentHelper'
> include\comphelper/accessiblecomponenthelper.hxx(220): note:
'comphelper::OAccessibleExtendedComponentHelper::OAccessibleExtendedComponentHelper(comphelper::OAccessibleExtendedComponentHelper
&&)': function was explicitly deleted
> include\comphelper/accessibletexthelper.hxx(133): note: see reference to
function template instantiation
'cppu::ImplInheritanceHelper<comphelper::OAccessibleExtendedComponentHelper,com::sun::star::accessibility::XAccessibleText>::ImplInheritanceHelper<cppu::ImplInheritanceHelper<comphelper::OAccessibleExtendedComponentHelper,com::sun::star::accessibility::XAccessibleText>>(cppu::ImplInheritanceHelper<comphelper::OAccessibleExtendedComponentHelper,com::sun::star::accessibility::XAccessibleText>
&&)' being compiled
> include\comphelper/accessibletexthelper.hxx(133): note: see reference to
function template instantiation
'cppu::ImplInheritanceHelper<comphelper::OAccessibleExtendedComponentHelper,com::sun::star::accessibility::XAccessibleText>::ImplInheritanceHelper<cppu::ImplInheritanceHelper<comphelper::OAccessibleExtendedComponentHelper,com::sun::star::accessibility::XAccessibleText>>(cppu::ImplInheritanceHelper<comphelper::OAccessibleExtendedComponentHelper,com::sun::star::accessibility::XAccessibleText>
&&)' being compiled
)
Change-Id: I00377be4a5fb44b2ef2b5001823ca0d89ead026b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146109
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
index 205af38d5660..7bc47ac79679 100644
--- a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
+++ b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx
@@ -22,6 +22,7 @@
#include <com/sun/star/accessibility/AccessibleScrollType.hpp>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
#include <comphelper/accessibletexthelper.hxx>
+#include <cppuhelper/implbase1.hxx>
diff --git a/comphelper/source/misc/accessibletexthelper.cxx
b/comphelper/source/misc/accessibletexthelper.cxx
index cc7fa4cd3d15..da39ac1ce252 100644
--- a/comphelper/source/misc/accessibletexthelper.cxx
+++ b/comphelper/source/misc/accessibletexthelper.cxx
@@ -732,18 +732,6 @@ namespace comphelper
}
- // XInterface
-
-
- IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleTextHelper,
OAccessibleExtendedComponentHelper, OAccessibleTextHelper_Base )
-
-
- // XTypeProvider
-
-
- IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleTextHelper,
OAccessibleExtendedComponentHelper, OAccessibleTextHelper_Base )
-
-
// XAccessibleText
diff --git a/include/comphelper/accessibletexthelper.hxx
b/include/comphelper/accessibletexthelper.hxx
index 607004aee30f..30730469be91 100644
--- a/include/comphelper/accessibletexthelper.hxx
+++ b/include/comphelper/accessibletexthelper.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/accessibility/XAccessibleText.hpp>
#include <com/sun/star/accessibility/TextSegment.hpp>
#include <comphelper/accessiblecomponenthelper.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/comphelperdllapi.h>
namespace com::sun::star::i18n { class XBreakIterator; }
@@ -111,26 +111,24 @@ namespace comphelper
// OAccessibleTextHelper
- typedef ::cppu::ImplHelper1 < css::accessibility::XAccessibleText
- > OAccessibleTextHelper_Base;
-
/** a helper class for implementing an AccessibleExtendedComponent which
at the same time
supports an XAccessibleText interface
*/
- class COMPHELPER_DLLPUBLIC OAccessibleTextHelper : public
OAccessibleExtendedComponentHelper,
- public OCommonAccessibleText,
- public OAccessibleTextHelper_Base
+ class COMPHELPER_DLLPUBLIC OAccessibleTextHelper : public
cppu::ImplInheritanceHelper<
+
OAccessibleExtendedComponentHelper,
+
css::accessibility::XAccessibleText>,
+ public OCommonAccessibleText
{
+ private:
+ OAccessibleTextHelper(OAccessibleTextHelper const &) = delete;
+ OAccessibleTextHelper(OAccessibleTextHelper &&) = delete;
+ void operator =(OAccessibleTextHelper const &) = delete;
+ void operator =(OAccessibleTextHelper &&) = delete;
+
protected:
OAccessibleTextHelper();
public:
- // XInterface
- DECLARE_XINTERFACE( )
-
- // XTypeProvider
- DECLARE_XTYPEPROVIDER( )
-
// XAccessibleText
virtual OUString SAL_CALL getSelectedText() override;
virtual sal_Int32 SAL_CALL getSelectionStart() override;
commit cbfbf11952374c49274938600c350d2f1f27bb32
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Jan 23 19:10:42 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jan 25 15:40:02 2023 +0000
Use ImplInheritanceHelper in OAccessibleSelectionHelper
(Explicitly deleting the special member functions is needed to avoid MSVC
> include\cppuhelper/implbase.hxx(152): error C2280:
'comphelper::OAccessibleComponentHelper::OAccessibleComponentHelper(comphelper::OAccessibleComponentHelper
&&)': attempting to reference a deleted function
> include\comphelper/accessiblecomponenthelper.hxx(191): note: see
declaration of
'comphelper::OAccessibleComponentHelper::OAccessibleComponentHelper'
> include\comphelper/accessibleselectionhelper.hxx(120): note: see
reference to function template instantiation
'cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,com::sun::star::accessibility::XAccessibleSelection>::ImplInheritanceHelper<cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,com::sun::star::accessibility::XAccessibleSelection>>(cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,com::sun::star::accessibility::XAccessibleSelection>
&&)' being compiled
> include\comphelper/accessibleselectionhelper.hxx(120): note: see
reference to function template instantiation
'cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,com::sun::star::accessibility::XAccessibleSelection>::ImplInheritanceHelper<cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,com::sun::star::accessibility::XAccessibleSelection>>(cppu::ImplInheritanceHelper<comphelper::OAccessibleComponentHelper,com::sun::star::accessibility::XAccessibleSelection>
&&)' being compiled
> include\cppuhelper/implbase.hxx(151): error C2248:
'comphelper::OAccessibleComponentHelper::OAccessibleComponentHelper': cannot
access private member declared in class 'comphelper::OAccessibleComponentHelper'
> include\comphelper/accessiblecomponenthelper.hxx(191): note: see
declaration of
'comphelper::OAccessibleComponentHelper::OAccessibleComponentHelper'
> include\comphelper/accessiblecomponenthelper.hxx(185): note: see
declaration of 'comphelper::OAccessibleComponentHelper'
)
Change-Id: I2414d9f777de42b62c33492a90299aa9a9d53699
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146108
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx
b/comphelper/source/misc/accessibleselectionhelper.cxx
index 435655e85e1d..67ce5aadd1ba 100644
--- a/comphelper/source/misc/accessibleselectionhelper.cxx
+++ b/comphelper/source/misc/accessibleselectionhelper.cxx
@@ -107,11 +107,6 @@ namespace comphelper
}
- IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleSelectionHelper,
OAccessibleComponentHelper, OAccessibleSelectionHelper_Base )
- IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleSelectionHelper,
OAccessibleComponentHelper, OAccessibleSelectionHelper_Base )
- // (order matters: the first is the class name, the second is the class
doing the ref counting)
-
-
Reference< XAccessibleContext >
OAccessibleSelectionHelper::implGetAccessibleContext()
{
return this;
diff --git a/include/comphelper/accessibleselectionhelper.hxx
b/include/comphelper/accessibleselectionhelper.hxx
index 9dd339bba827..033802e94673 100644
--- a/include/comphelper/accessibleselectionhelper.hxx
+++ b/include/comphelper/accessibleselectionhelper.hxx
@@ -23,7 +23,7 @@
#include <config_options.h>
#include <comphelper/uno3.hxx>
#include <comphelper/accessiblecomponenthelper.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <comphelper/comphelperdllapi.h>
@@ -94,15 +94,18 @@ namespace comphelper
//= OAccessibleSelectionHelper
- typedef ::cppu::ImplHelper1< css::accessibility::XAccessibleSelection >
OAccessibleSelectionHelper_Base;
-
/** a helper class for implementing an AccessibleSelection which at the
same time
supports an XAccessibleSelection interface.
*/
- class UNLESS_MERGELIBS(COMPHELPER_DLLPUBLIC) OAccessibleSelectionHelper :
public OAccessibleComponentHelper,
- public OCommonAccessibleSelection,
- public OAccessibleSelectionHelper_Base
+ class UNLESS_MERGELIBS(COMPHELPER_DLLPUBLIC) OAccessibleSelectionHelper :
public cppu::ImplInheritanceHelper<OAccessibleComponentHelper,
css::accessibility::XAccessibleSelection>,
+ public OCommonAccessibleSelection
{
+ private:
+ OAccessibleSelectionHelper(OAccessibleSelectionHelper const &) =
delete;
+ OAccessibleSelectionHelper(OAccessibleSelectionHelper &&) = delete;
+ void operator =(OAccessibleSelectionHelper const &) = delete;
+ void operator =(OAccessibleSelectionHelper &&) = delete;
+
protected:
OAccessibleSelectionHelper();
@@ -112,10 +115,6 @@ namespace comphelper
public:
- // XInterface
- DECLARE_XINTERFACE( )
- DECLARE_XTYPEPROVIDER( )
-
// XAccessibleSelection - default implementations
virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex )
override;
virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64
nChildIndex ) override;
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 201f53db3f37..e94567e8c32d 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -23,6 +23,7 @@
#include <comphelper/accessibleselectionhelper.hxx>
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
+#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <tools/gen.hxx>
#include <rtl/ref.hxx>
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index 20b9b9d0b251..fb14ac4720e7 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -24,6 +24,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <comphelper/accessibleselectionhelper.hxx>
+#include <cppuhelper/implbase1.hxx>
#include <rtl/ref.hxx>
#include <tools/gen.hxx>
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx
b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 2d6967e22784..d25805e4ad53 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -26,6 +26,7 @@
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
#include <com/sun/star/uno/Reference.hxx>
+#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase3.hxx>
#include <comphelper/accessibleselectionhelper.hxx>
#include <rtl/ref.hxx>
