diff options
Diffstat (limited to 'accessibility/inc/accessibility')
9 files changed, 8 insertions, 19 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx index faef86e00e6b..2800887e9f11 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx @@ -22,6 +22,7 @@ #define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOX_HXX #include <accessibility/extended/AccessibleBrowseBoxBase.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> #include <svtools/accessibletableprovider.hxx> #include <memory> @@ -192,8 +193,8 @@ private: <p>The instance holds its XAccessibleContext with a hard reference, while the contxt holds this instance weak.</p> */ -typedef ::cppu::WeakImplHelper1 < ::com::sun::star::accessibility::XAccessible - > AccessibleBrowseBoxAccess_Base; +typedef ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessible + > AccessibleBrowseBoxAccess_Base; class AccessibleBrowseBoxAccess :public AccessibleBrowseBoxAccess_Base ,public ::svt::IAccessibleBrowseBox diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx index db50af9ee0a5..f3caab6cf5a6 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx @@ -22,6 +22,7 @@ #include <accessibility/extended/AccessibleGridControlBase.hxx> #include <accessibility/extended/AccessibleGridControlTable.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> #include <svtools/accessibletable.hxx> #include <memory> @@ -180,7 +181,7 @@ private: <p>The instance holds its XAccessibleContext with a hard reference, while the contxt holds this instance weak.</p> */ -typedef ::cppu::WeakImplHelper1 < ::com::sun::star::accessibility::XAccessible > AccessibleGridControlAccess_Base; +typedef ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessible > AccessibleGridControlAccess_Base; class AccessibleGridControlAccess :public AccessibleGridControlAccess_Base ,public ::svt::table::IAccessibleTableControl diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx index 32f583724988..ef935a3ecfd4 100644 --- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETOOLPANELDECK_HXX #define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETOOLPANELDECK_HXX -#include <cppuhelper/implbase1.hxx> #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <memory> diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx index 262c7c37c7e7..b5cb2c3a0305 100644 --- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETOOLPANELDECKTABBAR_HXX #define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETOOLPANELDECKTABBAR_HXX -#include <cppuhelper/implbase1.hxx> #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <memory> diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx index b488011c898b..04e0125cc391 100644 --- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx @@ -21,7 +21,6 @@ #define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETOOLPANELDECKTABBARITEM_HXX #include <comphelper/accessiblecomponenthelper.hxx> -#include <cppuhelper/implbase1.hxx> #include <memory> diff --git a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx index a8dde9057133..64d4f7a2d9e1 100644 --- a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx +++ b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx @@ -25,8 +25,7 @@ #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/accessiblewrapper.hxx> namespace accessibility @@ -95,8 +94,8 @@ namespace accessibility // = EditBrowseBoxTableCell - typedef ::cppu::WeakComponentImplHelper1 < ::com::sun::star::accessibility::XAccessible - > EditBrowseBoxTableCellAccess_Base; + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::accessibility::XAccessible + > EditBrowseBoxTableCellAccess_Base; // XAccessible providing an EditBrowseBoxTableCell class EditBrowseBoxTableCellAccess :public ::comphelper::OBaseMutex diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx index cfc705e02223..994f13f13832 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx @@ -23,7 +23,6 @@ #include <map> #include <accessibility/standard/vclxaccessiblebox.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> -#include <cppuhelper/implbase1.hxx> /** The accessible combobox has two children. The first is the text field diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx index 7499987b16eb..78f0e199c62d 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx @@ -24,10 +24,6 @@ #include <accessibility/standard/vclxaccessibleedit.hxx> #include <com/sun/star/accessibility/XAccessibleAction.hpp> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/weakref.hxx> - - /** The accessible drop down combobox has two children. The first is the text field represented by an object of the <type>VCLXAccessibleEdit</type> class. The second is the list diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx index ac34023534d4..abefb9b65916 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx @@ -23,10 +23,6 @@ #include <accessibility/standard/vclxaccessiblebox.hxx> #include <com/sun/star/accessibility/XAccessibleAction.hpp> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/weakref.hxx> - - /** The accessible drop down combobox has two children. The first is the text field represented by an object of the <type>VCLXAccessibleTextField</type> class which can not be edited. The |