mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#88206: replace cppu::WeakImplHelper* and cppu::WeakComponentImplHelper*

Browse Source 
with variadic variants, and drop unused #includes, in accessibility.

Change-Id: Iddbe0f7932108319a5105448a74c570265d601ce
Reviewed-on: https://gerrit.libreoffice.org/16639
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Takeshi Abe 2015-07-01 14:42:39 +09:00 committed by Noel Grandin
parent 15c0fba5c2
commit 00daf98edd
11 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
View File

@ -22,6 +22,7 @@
#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOX_HXX #define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLEBROWSEBOX_HXX
#include <accessibility/extended/AccessibleBrowseBoxBase.hxx> #include <accessibility/extended/AccessibleBrowseBoxBase.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx> #include <cppuhelper/weakref.hxx>
#include <svtools/accessibletableprovider.hxx> #include <svtools/accessibletableprovider.hxx>
#include <memory> #include <memory>
@ -192,8 +193,8 @@ private:
<p>The instance holds its XAccessibleContext with a hard reference, while <p>The instance holds its XAccessibleContext with a hard reference, while
the contxt holds this instance weak.</p> the contxt holds this instance weak.</p>
*/ */
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::accessibility::XAccessible typedef ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessible
> AccessibleBrowseBoxAccess_Base; > AccessibleBrowseBoxAccess_Base;
class AccessibleBrowseBoxAccess :public AccessibleBrowseBoxAccess_Base class AccessibleBrowseBoxAccess :public AccessibleBrowseBoxAccess_Base
,public ::svt::IAccessibleBrowseBox ,public ::svt::IAccessibleBrowseBox

3
accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
View File

@ -22,6 +22,7 @@
#include <accessibility/extended/AccessibleGridControlBase.hxx> #include <accessibility/extended/AccessibleGridControlBase.hxx>
#include <accessibility/extended/AccessibleGridControlTable.hxx> #include <accessibility/extended/AccessibleGridControlTable.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx> #include <cppuhelper/weakref.hxx>
#include <svtools/accessibletable.hxx> #include <svtools/accessibletable.hxx>
#include <memory> #include <memory>
@ -180,7 +181,7 @@ private:
<p>The instance holds its XAccessibleContext with a hard reference, while <p>The instance holds its XAccessibleContext with a hard reference, while
the contxt holds this instance weak.</p> 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 class AccessibleGridControlAccess :public AccessibleGridControlAccess_Base
,public ::svt::table::IAccessibleTableControl ,public ::svt::table::IAccessibleTableControl

1
accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
View File

@ -20,7 +20,6 @@
#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETOOLPANELDECK_HXX #ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETOOLPANELDECK_HXX
#define 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 <toolkit/awt/vclxaccessiblecomponent.hxx>
#include <memory> #include <memory>

1
accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
View File

@ -20,7 +20,6 @@
#ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETOOLPANELDECKTABBAR_HXX #ifndef INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETOOLPANELDECKTABBAR_HXX
#define 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 <toolkit/awt/vclxaccessiblecomponent.hxx>
#include <memory> #include <memory>

1
accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
View File

@ -21,7 +21,6 @@
#define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETOOLPANELDECKTABBARITEM_HXX #define INCLUDED_ACCESSIBILITY_INC_ACCESSIBILITY_EXTENDED_ACCESSIBLETOOLPANELDECKTABBARITEM_HXX
#include <comphelper/accessiblecomponenthelper.hxx> #include <comphelper/accessiblecomponenthelper.hxx>
#include <cppuhelper/implbase1.hxx>
#include <memory> #include <memory>

7
accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
View File

@ -25,8 +25,7 @@
#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <com/sun/star/accessibility/XAccessibleValue.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/compbase1.hxx>
#include <comphelper/accessiblewrapper.hxx> #include <comphelper/accessiblewrapper.hxx>
namespace accessibility namespace accessibility
@ -95,8 +94,8 @@ namespace accessibility
// = EditBrowseBoxTableCell // = EditBrowseBoxTableCell
typedef ::cppu::WeakComponentImplHelper1 < ::com::sun::star::accessibility::XAccessible typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::accessibility::XAccessible
> EditBrowseBoxTableCellAccess_Base; > EditBrowseBoxTableCellAccess_Base;
// XAccessible providing an EditBrowseBoxTableCell // XAccessible providing an EditBrowseBoxTableCell
class EditBrowseBoxTableCellAccess class EditBrowseBoxTableCellAccess
:public ::comphelper::OBaseMutex :public ::comphelper::OBaseMutex

1
accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
View File

@ -23,7 +23,6 @@
#include <map> #include <map>
#include <accessibility/standard/vclxaccessiblebox.hxx> #include <accessibility/standard/vclxaccessiblebox.hxx>
#include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <cppuhelper/implbase1.hxx>
/** The accessible combobox has two children. The first is the text field /** The accessible combobox has two children. The first is the text field

4
accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
View File

@ -24,10 +24,6 @@
#include <accessibility/standard/vclxaccessibleedit.hxx> #include <accessibility/standard/vclxaccessibleedit.hxx>
#include <com/sun/star/accessibility/XAccessibleAction.hpp> #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 /** The accessible drop down combobox has two children. The first is the
text field represented by an object of the text field represented by an object of the
<type>VCLXAccessibleEdit</type> class. The second is the list <type>VCLXAccessibleEdit</type> class. The second is the list

4
accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx
View File

@ -23,10 +23,6 @@
#include <accessibility/standard/vclxaccessiblebox.hxx> #include <accessibility/standard/vclxaccessiblebox.hxx>
#include <com/sun/star/accessibility/XAccessibleAction.hpp> #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 /** The accessible drop down combobox has two children. The first is the
text field represented by an object of the text field represented by an object of the
<type>VCLXAccessibleTextField</type> class which can not be edited. The <type>VCLXAccessibleTextField</type> class which can not be edited. The

3
accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
View File

@ -27,6 +27,7 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/DisposedException.hpp>
#include <cppuhelper/implbase.hxx>
#include <svtools/toolpanel/toolpaneldeck.hxx> #include <svtools/toolpanel/toolpaneldeck.hxx>
#include <svtools/toolpanel/paneltabbar.hxx> #include <svtools/toolpanel/paneltabbar.hxx>
#include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblestatesethelper.hxx>
@ -64,7 +65,7 @@ namespace accessibility
typedef ::com::sun::star::awt::Point UnoPoint; typedef ::com::sun::star::awt::Point UnoPoint;
// AccessibleWrapper // AccessibleWrapper
typedef ::cppu::WeakImplHelper1< XAccessible > AccessibleWrapper_Base; typedef ::cppu::WeakImplHelper< XAccessible > AccessibleWrapper_Base;
class AccessibleWrapper : public AccessibleWrapper_Base class AccessibleWrapper : public AccessibleWrapper_Base
{ {
public: public:

1
accessibility/source/helper/acc_factory.cxx
View File

@ -61,7 +61,6 @@
#include <accessibility/extended/AccessibleGridControl.hxx> #include <accessibility/extended/AccessibleGridControl.hxx>
#include <svtools/accessibletable.hxx> #include <svtools/accessibletable.hxx>
#include <vcl/popupmenuwindow.hxx> #include <vcl/popupmenuwindow.hxx>
#include <cppuhelper/implbase1.hxx>
#include "floatingwindowaccessible.hxx" #include "floatingwindowaccessible.hxx"