accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
| 5 +++--
accessibility/inc/accessibility/extended/AccessibleGridControl.hxx
| 3 ++-
accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx
| 1 -
accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx
| 1 -
accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx
| 1 -
accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx
| 7 +++----
accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx
| 1 -
accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx
| 4 ----
accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx
| 4 ----
accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
| 3 ++-
accessibility/source/helper/acc_factory.cxx
| 1 -
11 files changed, 10 insertions(+), 21 deletions(-)
New commits:
commit 00daf98eddf2f2b27136282de1f3b47d4677b087
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Wed Jul 1 14:42:39 2015 +0900
tdf#88206: replace cppu::WeakImplHelper* and cppu::WeakComponentImplHelper*
with variadic variants, and drop unused #includes, in accessibility.
Change-Id: Iddbe0f7932108319a5105448a74c570265d601ce
Reviewed-on: https://gerrit.libreoffice.org/16639
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx
index faef86e..2800887 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 db50af9..f3caab6 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 32f5837..ef935a3 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 262c7c3..b5cb2c3 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 b488011..04e0125 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 a8dde90..64d4f7a 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 cfc705e..994f13f 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 7499987..78f0e19 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 ac34023..abefb9b 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
diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
index 11dc730..4d3c320 100644
--- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
+++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx
@@ -27,6 +27,7 @@
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
+#include <cppuhelper/implbase.hxx>
#include <svtools/toolpanel/toolpaneldeck.hxx>
#include <svtools/toolpanel/paneltabbar.hxx>
#include <unotools/accessiblestatesethelper.hxx>
@@ -64,7 +65,7 @@ namespace accessibility
typedef ::com::sun::star::awt::Point UnoPoint;
// AccessibleWrapper
- typedef ::cppu::WeakImplHelper1< XAccessible > AccessibleWrapper_Base;
+ typedef ::cppu::WeakImplHelper< XAccessible > AccessibleWrapper_Base;
class AccessibleWrapper : public AccessibleWrapper_Base
{
public:
diff --git a/accessibility/source/helper/acc_factory.cxx
b/accessibility/source/helper/acc_factory.cxx
index b7ff430..a3161b4 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -61,7 +61,6 @@
#include <accessibility/extended/AccessibleGridControl.hxx>
#include <svtools/accessibletable.hxx>
#include <vcl/popupmenuwindow.hxx>
-#include <cppuhelper/implbase1.hxx>
#include "floatingwindowaccessible.hxx"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
