vbahelper/inc/pch/precompiled_msforms.hxx | 2 +- vbahelper/inc/pch/precompiled_vbahelper.hxx | 3 +-- vbahelper/source/msforms/vbabutton.hxx | 4 ++-- vbahelper/source/msforms/vbacheckbox.hxx | 4 ++-- vbahelper/source/msforms/vbacombobox.hxx | 4 ++-- vbahelper/source/msforms/vbacontrol.cxx | 5 +++-- vbahelper/source/msforms/vbacontrol.hxx | 3 --- vbahelper/source/msforms/vbacontrols.cxx | 4 ++-- vbahelper/source/msforms/vbacontrols.hxx | 1 - vbahelper/source/msforms/vbaframe.hxx | 4 ++-- vbahelper/source/msforms/vbaimage.hxx | 4 ++-- vbahelper/source/msforms/vbalabel.hxx | 5 ++--- vbahelper/source/msforms/vbalistbox.hxx | 4 ++-- vbahelper/source/msforms/vbamultipage.cxx | 3 ++- vbahelper/source/msforms/vbamultipage.hxx | 4 ++-- vbahelper/source/msforms/vbanewfont.hxx | 4 ++-- vbahelper/source/msforms/vbapages.hxx | 2 -- vbahelper/source/msforms/vbaprogressbar.hxx | 5 ++--- vbahelper/source/msforms/vbaradiobutton.hxx | 4 ++-- vbahelper/source/msforms/vbascrollbar.hxx | 4 ++-- vbahelper/source/msforms/vbaspinbutton.hxx | 4 ++-- vbahelper/source/msforms/vbasystemaxcontrol.hxx | 4 ++-- vbahelper/source/msforms/vbatextbox.hxx | 4 ++-- vbahelper/source/msforms/vbatogglebutton.hxx | 4 ++-- vbahelper/source/msforms/vbauserform.hxx | 4 ++-- vbahelper/source/vbahelper/vbacommandbarcontrol.hxx | 6 +++--- vbahelper/source/vbahelper/vbacommandbarcontrols.cxx | 4 ++-- vbahelper/source/vbahelper/vbacommandbars.cxx | 3 ++- vbahelper/source/vbahelper/vbacommandbars.hxx | 1 - vbahelper/source/vbahelper/vbadocumentsbase.cxx | 7 +++---- 30 files changed, 53 insertions(+), 61 deletions(-)
New commits: commit e50bcf0a2267bf3c80a5d99442bfe08681241836 Author: Takeshi Abe <[email protected]> Date: Thu Sep 10 12:51:10 2015 +0900 vbahelper: tdf#88206 replace cppu::WeakImplHelper* etc. with the variadic variants. Change-Id: I8a7f7c81a876b5f1ac987375f8c43bbef89dc087 Reviewed-on: https://gerrit.libreoffice.org/18461 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Michael Stahl <[email protected]> diff --git a/vbahelper/inc/pch/precompiled_msforms.hxx b/vbahelper/inc/pch/precompiled_msforms.hxx index 0987ada..db48e28 100644 --- a/vbahelper/inc/pch/precompiled_msforms.hxx +++ b/vbahelper/inc/pch/precompiled_msforms.hxx @@ -56,7 +56,7 @@ #include <com/sun/star/util/MeasureUnit.hpp> #include <com/sun/star/view/XControlAccess.hpp> #include <comphelper/anytostring.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <filter/msfilter/msvbahelper.hxx> #include <ooo/vba/XCollection.hpp> #include <ooo/vba/XControlProvider.hpp> diff --git a/vbahelper/inc/pch/precompiled_vbahelper.hxx b/vbahelper/inc/pch/precompiled_vbahelper.hxx index 9cf0d5a..5cef348 100644 --- a/vbahelper/inc/pch/precompiled_vbahelper.hxx +++ b/vbahelper/inc/pch/precompiled_vbahelper.hxx @@ -120,8 +120,7 @@ #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/component_context.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <filter/msfilter/msvbahelper.hxx> #include <map> #include <math.h> diff --git a/vbahelper/source/msforms/vbabutton.hxx b/vbahelper/source/msforms/vbabutton.hxx index 404a342..55da67f 100644 --- a/vbahelper/source/msforms/vbabutton.hxx +++ b/vbahelper/source/msforms/vbabutton.hxx @@ -18,13 +18,13 @@ */ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBABUTTON_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBABUTTON_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/msforms/XCommandButton.hpp> #include "vbacontrol.hxx" #include <vbahelper/vbahelper.hxx> -typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XCommandButton > ButtonImpl_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XCommandButton > ButtonImpl_BASE; class VbaButton : public ButtonImpl_BASE { diff --git a/vbahelper/source/msforms/vbacheckbox.hxx b/vbahelper/source/msforms/vbacheckbox.hxx index 9834307..917257d 100644 --- a/vbahelper/source/msforms/vbacheckbox.hxx +++ b/vbahelper/source/msforms/vbacheckbox.hxx @@ -18,13 +18,13 @@ */ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBACHECKBOX_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBACHECKBOX_HXX -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/msforms/XCheckBox.hpp> #include "vbacontrol.hxx" #include <vbahelper/vbahelper.hxx> -typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XCheckBox, css::script::XDefaultProperty > CheckBoxImpl_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XCheckBox, css::script::XDefaultProperty > CheckBoxImpl_BASE; class ScVbaCheckbox : public CheckBoxImpl_BASE { diff --git a/vbahelper/source/msforms/vbacombobox.hxx b/vbahelper/source/msforms/vbacombobox.hxx index 10a837f..85246a2 100644 --- a/vbahelper/source/msforms/vbacombobox.hxx +++ b/vbahelper/source/msforms/vbacombobox.hxx @@ -18,7 +18,7 @@ */ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBACOMBOBOX_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBACOMBOBOX_HXX -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/script/XDefaultProperty.hpp> @@ -31,7 +31,7 @@ #include "vbalistcontrolhelper.hxx" #include <vbahelper/vbahelper.hxx> -typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XComboBox, css::script::XDefaultProperty > ComboBoxImpl_BASE; +typedef cppu::ImplInheritanceHelper<ScVbaControl, ov::msforms::XComboBox, css::script::XDefaultProperty > ComboBoxImpl_BASE; class ScVbaComboBox : public ComboBoxImpl_BASE { std::unique_ptr< ListControlHelper > mpListHelper; diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx index 910829b..d228be7 100644 --- a/vbahelper/source/msforms/vbacontrol.cxx +++ b/vbahelper/source/msforms/vbacontrol.cxx @@ -59,6 +59,7 @@ #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/form/XFormsSupplier.hpp> #include <svx/svdobj.hxx> +#include <cppuhelper/implbase.hxx> using namespace com::sun::star; using namespace ooo::vba; @@ -94,7 +95,7 @@ ScVbaControl::getWindowPeer() throw (uno::RuntimeException) } //ScVbaControlListener -class ScVbaControlListener: public cppu::WeakImplHelper1< lang::XEventListener > +class ScVbaControlListener: public cppu::WeakImplHelper< lang::XEventListener > { private: ScVbaControl *pControl; @@ -765,7 +766,7 @@ void ScVbaControl::setLocked( bool bLocked ) throw (uno::RuntimeException) m_xProps->setPropertyValue( "ReadOnly" , uno::makeAny( bLocked ) ); } -class ControlProviderImpl : public cppu::WeakImplHelper1< XControlProvider > +class ControlProviderImpl : public cppu::WeakImplHelper< XControlProvider > { uno::Reference< uno::XComponentContext > m_xCtx; public: diff --git a/vbahelper/source/msforms/vbacontrol.hxx b/vbahelper/source/msforms/vbacontrol.hxx index 4a3f4ef..b2528ec 100644 --- a/vbahelper/source/msforms/vbacontrol.hxx +++ b/vbahelper/source/msforms/vbacontrol.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBACONTROL_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBACONTROL_HXX -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/script/XDefaultProperty.hpp> @@ -33,8 +32,6 @@ #include <vbahelper/vbahelperinterface.hxx> #include <memory> -//typedef ::cppu::WeakImplHelper1< ov::msforms::XControl > ControlImpl_BASE; -//template SAL_DLLPUBLIC_IMPORT InheritedHelperInterfaceImpl1< ov::msforms::XControl >; typedef InheritedHelperInterfaceImpl1< ov::msforms::XControl > ControlImpl_BASE; class ScVbaControl : public ControlImpl_BASE diff --git a/vbahelper/source/msforms/vbacontrols.cxx b/vbahelper/source/msforms/vbacontrols.cxx index 5c75aa4..acc8078 100644 --- a/vbahelper/source/msforms/vbacontrols.cxx +++ b/vbahelper/source/msforms/vbacontrols.cxx @@ -30,7 +30,7 @@ #include "vbacontrols.hxx" #include "vbacontrol.hxx" -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/XControlProvider.hpp> #include <unordered_map> @@ -42,7 +42,7 @@ typedef std::unordered_map< OUString, sal_Int32, OUStringHash, std::equal_to< OUString > > ControlIndexMap; typedef std::vector< uno::Reference< awt::XControl > > ControlVec; -class ControlArrayWrapper : public ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > +class ControlArrayWrapper : public ::cppu::WeakImplHelper< container::XNameAccess, container::XIndexAccess > { uno::Reference< awt::XControlContainer > mxDialog; uno::Sequence< OUString > msNames; diff --git a/vbahelper/source/msforms/vbacontrols.hxx b/vbahelper/source/msforms/vbacontrols.hxx index fcb88ff..6c6c4a0 100644 --- a/vbahelper/source/msforms/vbacontrols.hxx +++ b/vbahelper/source/msforms/vbacontrols.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBACONTROLS_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBACONTROLS_HXX -#include <cppuhelper/implbase1.hxx> #include <ooo/vba/msforms/XControls.hpp> #include <com/sun/star/awt/XControl.hpp> diff --git a/vbahelper/source/msforms/vbaframe.hxx b/vbahelper/source/msforms/vbaframe.hxx index b0a69fe..50d6ae3 100644 --- a/vbahelper/source/msforms/vbaframe.hxx +++ b/vbahelper/source/msforms/vbaframe.hxx @@ -20,13 +20,13 @@ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBAFRAME_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBAFRAME_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/msforms/XFrame.hpp> #include "vbacontrol.hxx" #include <vbahelper/vbahelper.hxx> -typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XFrame > FrameImpl_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XFrame > FrameImpl_BASE; class ScVbaFrame : public FrameImpl_BASE { diff --git a/vbahelper/source/msforms/vbaimage.hxx b/vbahelper/source/msforms/vbaimage.hxx index 3debc1e..f2d6017 100644 --- a/vbahelper/source/msforms/vbaimage.hxx +++ b/vbahelper/source/msforms/vbaimage.hxx @@ -18,13 +18,13 @@ */ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBAIMAGE_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBAIMAGE_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/msforms/XImage.hpp> #include "vbacontrol.hxx" #include <vbahelper/vbahelper.hxx> -typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XImage > ImageImpl_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XImage > ImageImpl_BASE; class ScVbaImage : public ImageImpl_BASE { diff --git a/vbahelper/source/msforms/vbalabel.hxx b/vbahelper/source/msforms/vbalabel.hxx index 4f6c3ef..28c0e2c 100644 --- a/vbahelper/source/msforms/vbalabel.hxx +++ b/vbahelper/source/msforms/vbalabel.hxx @@ -18,14 +18,13 @@ */ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBALABEL_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBALABEL_HXX -#include <cppuhelper/implbase1.hxx> #include <ooo/vba/msforms/XLabel.hpp> #include "vbacontrol.hxx" #include <vbahelper/vbahelper.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> -typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XLabel, css::script::XDefaultProperty > LabelImpl_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XLabel, css::script::XDefaultProperty > LabelImpl_BASE; class ScVbaLabel : public LabelImpl_BASE { diff --git a/vbahelper/source/msforms/vbalistbox.hxx b/vbahelper/source/msforms/vbalistbox.hxx index 1a6837e..b49a688 100644 --- a/vbahelper/source/msforms/vbalistbox.hxx +++ b/vbahelper/source/msforms/vbalistbox.hxx @@ -18,7 +18,7 @@ */ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBALISTBOX_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBALISTBOX_HXX -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/script/XDefaultProperty.hpp> #include <ooo/vba/msforms/XListBox.hpp> @@ -29,7 +29,7 @@ #include "vbalistcontrolhelper.hxx" #include <vbahelper/vbahelper.hxx> -typedef cppu::ImplInheritanceHelper2<ScVbaControl, ov::msforms::XListBox, css::script::XDefaultProperty > ListBoxImpl_BASE; +typedef cppu::ImplInheritanceHelper<ScVbaControl, ov::msforms::XListBox, css::script::XDefaultProperty > ListBoxImpl_BASE; class ScVbaListBox : public ListBoxImpl_BASE ,public PropListener { diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx index 057464f..088ef09 100644 --- a/vbahelper/source/msforms/vbamultipage.cxx +++ b/vbahelper/source/msforms/vbamultipage.cxx @@ -20,13 +20,14 @@ #include <ooo/vba/XCollection.hpp> #include "vbapages.hxx" #include <com/sun/star/container/XNameContainer.hpp> +#include <cppuhelper/implbase.hxx> using namespace com::sun::star; using namespace ooo::vba; const OUString SVALUE( "MultiPageValue" ); -class PagesImpl : public cppu::WeakImplHelper1< container::XIndexAccess > +class PagesImpl : public cppu::WeakImplHelper< container::XIndexAccess > { sal_Int32 mnPages; public: diff --git a/vbahelper/source/msforms/vbamultipage.hxx b/vbahelper/source/msforms/vbamultipage.hxx index a7a19fb..f5b487f 100644 --- a/vbahelper/source/msforms/vbamultipage.hxx +++ b/vbahelper/source/msforms/vbamultipage.hxx @@ -20,14 +20,14 @@ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBAMULTIPAGE_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBAMULTIPAGE_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/msforms/XMultiPage.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include "vbacontrol.hxx" #include <vbahelper/vbahelper.hxx> -typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XMultiPage > MultiPageImpl_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XMultiPage > MultiPageImpl_BASE; class ScVbaMultiPage : public MultiPageImpl_BASE { diff --git a/vbahelper/source/msforms/vbanewfont.hxx b/vbahelper/source/msforms/vbanewfont.hxx index 5afea01..15d648d 100644 --- a/vbahelper/source/msforms/vbanewfont.hxx +++ b/vbahelper/source/msforms/vbanewfont.hxx @@ -22,10 +22,10 @@ #include <ooo/vba/msforms/XNewFont.hpp> #include <vbahelper/vbahelperinterface.hxx> +#include <cppuhelper/implbase.hxx> - -typedef cppu::WeakImplHelper1< ov::msforms::XNewFont > VbaNewFont_BASE; +typedef cppu::WeakImplHelper< ov::msforms::XNewFont > VbaNewFont_BASE; class VbaNewFont : public VbaNewFont_BASE { diff --git a/vbahelper/source/msforms/vbapages.hxx b/vbahelper/source/msforms/vbapages.hxx index 4e6aaf7..e738e8a 100644 --- a/vbahelper/source/msforms/vbapages.hxx +++ b/vbahelper/source/msforms/vbapages.hxx @@ -23,8 +23,6 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <ooo/vba/msforms/XPages.hpp> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase1.hxx> #include <vbahelper/vbacollectionimpl.hxx> typedef CollTestImplHelper< diff --git a/vbahelper/source/msforms/vbaprogressbar.hxx b/vbahelper/source/msforms/vbaprogressbar.hxx index dea5a0a..b0b70a5 100644 --- a/vbahelper/source/msforms/vbaprogressbar.hxx +++ b/vbahelper/source/msforms/vbaprogressbar.hxx @@ -20,14 +20,13 @@ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBAPROGRESSBAR_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBAPROGRESSBAR_HXX -#include <cppuhelper/implbase1.hxx> #include <ooo/vba/msforms/XProgressBar.hpp> #include "vbacontrol.hxx" #include <vbahelper/vbahelper.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> -typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XProgressBar, css::script::XDefaultProperty > ProgressBarImpl_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XProgressBar, css::script::XDefaultProperty > ProgressBarImpl_BASE; class ScVbaProgressBar : public ProgressBarImpl_BASE { diff --git a/vbahelper/source/msforms/vbaradiobutton.hxx b/vbahelper/source/msforms/vbaradiobutton.hxx index a6ab610..c65615b 100644 --- a/vbahelper/source/msforms/vbaradiobutton.hxx +++ b/vbahelper/source/msforms/vbaradiobutton.hxx @@ -21,9 +21,9 @@ #include <ooo/vba/msforms/XRadioButton.hpp> #include "vbacontrol.hxx" #include <vbahelper/vbahelper.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> -typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XRadioButton, css::script::XDefaultProperty > RadioButtonImpl_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XRadioButton, css::script::XDefaultProperty > RadioButtonImpl_BASE; class ScVbaRadioButton : public RadioButtonImpl_BASE { diff --git a/vbahelper/source/msforms/vbascrollbar.hxx b/vbahelper/source/msforms/vbascrollbar.hxx index 0b3723c..4deb350 100644 --- a/vbahelper/source/msforms/vbascrollbar.hxx +++ b/vbahelper/source/msforms/vbascrollbar.hxx @@ -20,13 +20,13 @@ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBASCROLLBAR_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBASCROLLBAR_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/msforms/XScrollBar.hpp> #include "vbacontrol.hxx" #include <vbahelper/vbahelper.hxx> -typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XScrollBar > ScrollBarImpl_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XScrollBar > ScrollBarImpl_BASE; class ScVbaScrollBar : public ScrollBarImpl_BASE { diff --git a/vbahelper/source/msforms/vbaspinbutton.hxx b/vbahelper/source/msforms/vbaspinbutton.hxx index a444f14..7e06bf7 100644 --- a/vbahelper/source/msforms/vbaspinbutton.hxx +++ b/vbahelper/source/msforms/vbaspinbutton.hxx @@ -18,13 +18,13 @@ */ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBASPINBUTTON_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBASPINBUTTON_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/msforms/XSpinButton.hpp> #include "vbacontrol.hxx" #include <vbahelper/vbahelper.hxx> -typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XSpinButton > SpinButtonImpl_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XSpinButton > SpinButtonImpl_BASE; class ScVbaSpinButton : public SpinButtonImpl_BASE { diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.hxx b/vbahelper/source/msforms/vbasystemaxcontrol.hxx index e6fcdae..c3d56d3 100644 --- a/vbahelper/source/msforms/vbasystemaxcontrol.hxx +++ b/vbahelper/source/msforms/vbasystemaxcontrol.hxx @@ -19,13 +19,13 @@ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBASYSTEMAXCONTROL_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBASYSTEMAXCONTROL_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/script/XInvocation.hpp> #include "vbacontrol.hxx" #include <vbahelper/vbahelper.hxx> -typedef cppu::ImplInheritanceHelper1< ScVbaControl, css::script::XInvocation > SystemAXControlImpl_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaControl, css::script::XInvocation > SystemAXControlImpl_BASE; class VbaSystemAXControl : public SystemAXControlImpl_BASE { diff --git a/vbahelper/source/msforms/vbatextbox.hxx b/vbahelper/source/msforms/vbatextbox.hxx index bef905b..efbbdc9 100644 --- a/vbahelper/source/msforms/vbatextbox.hxx +++ b/vbahelper/source/msforms/vbatextbox.hxx @@ -20,12 +20,12 @@ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBATEXTBOX_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBATEXTBOX_HXX -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/msforms/XTextBox.hpp> #include "vbacontrol.hxx" #include <vbahelper/vbahelper.hxx> -typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XTextBox, css::script::XDefaultProperty > TextBoxImpl_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XTextBox, css::script::XDefaultProperty > TextBoxImpl_BASE; class ScVbaTextBox : public TextBoxImpl_BASE { diff --git a/vbahelper/source/msforms/vbatogglebutton.hxx b/vbahelper/source/msforms/vbatogglebutton.hxx index 012f190..8d7b2d5 100644 --- a/vbahelper/source/msforms/vbatogglebutton.hxx +++ b/vbahelper/source/msforms/vbatogglebutton.hxx @@ -18,13 +18,13 @@ */ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBATOGGLEBUTTON_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBATOGGLEBUTTON_HXX -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/msforms/XToggleButton.hpp> #include "vbacontrol.hxx" #include <vbahelper/vbahelper.hxx> -typedef cppu::ImplInheritanceHelper2< ScVbaControl, ov::msforms::XToggleButton, css::script::XDefaultProperty > ToggleButtonImpl_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XToggleButton, css::script::XDefaultProperty > ToggleButtonImpl_BASE; class ScVbaToggleButton : public ToggleButtonImpl_BASE { diff --git a/vbahelper/source/msforms/vbauserform.hxx b/vbahelper/source/msforms/vbauserform.hxx index 52bf4d9..d2ab14e 100644 --- a/vbahelper/source/msforms/vbauserform.hxx +++ b/vbahelper/source/msforms/vbauserform.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBAUSERFORM_HXX #define INCLUDED_VBAHELPER_SOURCE_MSFORMS_VBAUSERFORM_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/msforms/XUserForm.hpp> #include <com/sun/star/awt/XDialog.hpp> #include <com/sun/star/awt/XControlContainer.hpp> @@ -29,7 +29,7 @@ #include "vbacontrol.hxx" //typedef InheritedHelperInterfaceImpl1< ov::msforms::XUserForm > ScVbaUserForm_BASE; -typedef cppu::ImplInheritanceHelper1< ScVbaControl, ov::msforms::XUserForm > ScVbaUserForm_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XUserForm > ScVbaUserForm_BASE; class ScVbaUserForm : public ScVbaUserForm_BASE { diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx index 72c21f8..196ef49 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrol.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/awt/XMenu.hpp> #include <vbahelper/vbahelperinterface.hxx> #include "vbacommandbarhelper.hxx" -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> typedef InheritedHelperInterfaceImpl1< ov::XCommandBarControl > CommandBarControl_BASE; @@ -73,7 +73,7 @@ public: virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; -typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarPopup > CommandBarPopup_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaCommandBarControl, ov::XCommandBarPopup > CommandBarPopup_BASE; class ScVbaCommandBarPopup : public CommandBarPopup_BASE { public: @@ -88,7 +88,7 @@ public: virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; -typedef cppu::ImplInheritanceHelper1< ScVbaCommandBarControl, ov::XCommandBarButton > CommandBarButton_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaCommandBarControl, ov::XCommandBarButton > CommandBarButton_BASE; class ScVbaCommandBarButton : public CommandBarButton_BASE { public: diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx index 331c989..607270f 100644 --- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx @@ -22,7 +22,7 @@ using namespace com::sun::star; using namespace ooo::vba; -class CommandBarControlEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration > +class CommandBarControlEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration > { //uno::Reference< uno::XComponentContext > m_xContext; CommandBarControls_BASE* m_pCommandBarControls; @@ -254,7 +254,7 @@ ScVbaCommandBarControls::getServiceNames() -class VbaDummyIndexAccess : public ::cppu::WeakImplHelper1< container::XIndexAccess > +class VbaDummyIndexAccess : public ::cppu::WeakImplHelper< container::XIndexAccess > { public: inline VbaDummyIndexAccess() {} diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx index ad32100..50d6532 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.cxx +++ b/vbahelper/source/vbahelper/vbacommandbars.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/ui/XModuleUIConfigurationManager.hpp> #include <com/sun/star/ui/XUIConfigurationPersistence.hpp> #include <ooo/vba/office/MsoBarType.hpp> +#include <cppuhelper/implbase.hxx> #include "vbacommandbars.hxx" #include "vbacommandbar.hxx" @@ -32,7 +33,7 @@ using namespace com::sun::star; using namespace ooo::vba; -class CommandBarEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration > +class CommandBarEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration > { uno::Reference< XHelperInterface > m_xParent; uno::Reference< uno::XComponentContext > m_xContext; diff --git a/vbahelper/source/vbahelper/vbacommandbars.hxx b/vbahelper/source/vbahelper/vbacommandbars.hxx index 4f1e557..3d4f192 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.hxx +++ b/vbahelper/source/vbahelper/vbacommandbars.hxx @@ -22,7 +22,6 @@ #include <ooo/vba/XCommandBar.hpp> #include <ooo/vba/XCommandBars.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <cppuhelper/implbase1.hxx> #include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbacollectionimpl.hxx> #include "vbacommandbarhelper.hxx" diff --git a/vbahelper/source/vbahelper/vbadocumentsbase.cxx b/vbahelper/source/vbahelper/vbadocumentsbase.cxx index 7f830d6..079f621 100644 --- a/vbahelper/source/vbahelper/vbadocumentsbase.cxx +++ b/vbahelper/source/vbahelper/vbadocumentsbase.cxx @@ -21,8 +21,7 @@ #include <unotools/mediadescriptor.hxx> #include <comphelper/processfactory.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> @@ -67,7 +66,7 @@ typedef std::vector < uno::Reference< frame::XModel > > Documents; // #FIXME clearly this is a candidate for some sort of helper base class as // this is a copy of SelectedSheetsEnum ( vbawindow.cxx ) -class DocumentsEnumImpl : public ::cppu::WeakImplHelper1< container::XEnumeration > +class DocumentsEnumImpl : public ::cppu::WeakImplHelper< container::XEnumeration > { uno::Reference< uno::XComponentContext > m_xContext; Documents m_documents; @@ -112,7 +111,7 @@ public: // and vector only, and the sub-class does everything else // => ctor, createEnumeration & factory method need be defined ( to be called // by getByIndex, getByName ) -typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess +typedef ::cppu::WeakImplHelper< container::XEnumerationAccess , com::sun::star::container::XIndexAccess , com::sun::star::container::XNameAccess > DocumentsAccessImpl_BASE; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
