diff options
22 files changed, 41 insertions, 45 deletions
diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index 851c041b5b3d..39cc8ccba403 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -251,12 +251,11 @@ #include <config_features.h> #include <config_folders.h> #include <config_oauth2.h> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/factory.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase4.hxx> -#include <cppuhelper/implbase5.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/queryinterface.hxx> diff --git a/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx index e1363a5aa52d..face787d8a62 100644 --- a/svtools/source/config/itemholder2.hxx +++ b/svtools/source/config/itemholder2.hxx @@ -21,14 +21,14 @@ #define INCLUDED_SVTOOLS_ITEMHOLDER2_HXX_ #include <unotools/itemholderbase.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XEventListener.hpp> namespace svtools { class ItemHolder2 : private ItemHolderMutexBase - , public ::cppu::WeakImplHelper1< css::lang::XEventListener > + , public ::cppu::WeakImplHelper< css::lang::XEventListener > { // member diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index 5e5bf883ad9d..54a5bd7c9761 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -24,8 +24,7 @@ #include <vcl/image.hxx> #include <vcl/menu.hxx> -#include <cppuhelper/compbase4.hxx> -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/broadcasthelper.hxx> #include <com/sun/star/frame/XFrame.hpp> @@ -104,7 +103,7 @@ public: // - ToolbarMenuAcc - -typedef ::cppu::WeakComponentImplHelper5< +typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, ::com::sun::star::accessibility::XAccessibleContext, @@ -192,7 +191,7 @@ private: // - ToolbarMenuEntryAcc - -typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::accessibility::XAccessible, +typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, ::com::sun::star::accessibility::XAccessibleContext, ::com::sun::star::accessibility::XAccessibleComponent > ToolbarMenuEntryAccBase; diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index bf729b3732b7..43f056cbc66c 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -23,8 +23,8 @@ #include <osl/mutex.hxx> #include <tools/color.hxx> #include <vcl/image.hxx> -#include <cppuhelper/implbase5.hxx> -#include <cppuhelper/compbase6.hxx> +#include <cppuhelper/implbase.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/broadcasthelper.hxx> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> @@ -68,7 +68,7 @@ struct ValueSetItem GetAccessible( bool bIsTransientChildrenDisabled ); }; -typedef ::cppu::WeakComponentImplHelper6< +typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, ::com::sun::star::accessibility::XAccessibleContext, @@ -192,7 +192,7 @@ private: bool HasNoneField() const; }; -class ValueItemAcc : public ::cppu::WeakImplHelper5< ::com::sun::star::accessibility::XAccessible, +class ValueItemAcc : public ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, ::com::sun::star::accessibility::XAccessibleContext, ::com::sun::star::accessibility::XAccessibleComponent, diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index f4cc8e94fc4e..8c054a52ad79 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <unotools/syslocale.hxx> #include <comphelper/processfactory.hxx> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <boost/scoped_ptr.hpp> @@ -52,7 +52,7 @@ using namespace ::com::sun::star; namespace { -class SvFilterOptionsDialog : public cppu::WeakImplHelper5 +class SvFilterOptionsDialog : public cppu::WeakImplHelper < document::XExporter, ui::dialogs::XExecutableDialog, diff --git a/svtools/source/graphic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx index e195cbec74c0..961deb3a56ed 100644 --- a/svtools/source/graphic/graphicunofactory.cxx +++ b/svtools/source/graphic/graphicunofactory.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/graphic/XGraphicObject.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> @@ -30,7 +30,7 @@ using namespace com::sun::star; namespace { -typedef ::cppu::WeakImplHelper2< graphic::XGraphicObject, css::lang::XServiceInfo > GObjectAccess_BASE; +typedef ::cppu::WeakImplHelper< graphic::XGraphicObject, css::lang::XServiceInfo > GObjectAccess_BASE; // Simple uno wrapper around the GraphicObject class to allow basic // access. ( and solves a horrible cyclic link problem between // goodies/toolkit/extensions ) diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index 2629362905d4..78bdf83b7b01 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/awt/XVclWindowPeer.hpp> #include <comphelper/processfactory.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/supportsservice.hxx> #include <osl/mutex.hxx> @@ -44,7 +44,7 @@ namespace { // the service is implemented as a wrapper to be able to die by refcount // the disposing mechanics is required for java related scenarios -class ODocumentCloser : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XComponent, +class ODocumentCloser : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XComponent, ::com::sun::star::lang::XServiceInfo > { ::osl::Mutex m_aMutex; diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx index d31c989cefa0..62c4c78405ad 100644 --- a/svtools/source/hatchwindow/hatchwindowfactory.cxx +++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx @@ -20,7 +20,7 @@ #include <com/sun/star/embed/XHatchWindowFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/ref.hxx> #include <vcl/svapp.hxx> @@ -31,7 +31,7 @@ using namespace ::com::sun::star; namespace { -class OHatchWindowFactory : public ::cppu::WeakImplHelper2< +class OHatchWindowFactory : public ::cppu::WeakImplHelper< embed::XHatchWindowFactory, lang::XServiceInfo > { diff --git a/svtools/source/inc/provider.hxx b/svtools/source/inc/provider.hxx index 69ab382630cd..f8b00dac69d3 100644 --- a/svtools/source/inc/provider.hxx +++ b/svtools/source/inc/provider.hxx @@ -20,14 +20,14 @@ #ifndef INCLUDED_SVTOOLS_SOURCE_INC_PROVIDER_HXX #define INCLUDED_SVTOOLS_SOURCE_INC_PROVIDER_HXX -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/awt/XBitmap.hpp> namespace { -class GraphicProvider : public ::cppu::WeakImplHelper2< ::com::sun::star::graphic::XGraphicProvider, +class GraphicProvider : public ::cppu::WeakImplHelper< ::com::sun::star::graphic::XGraphicProvider, ::com::sun::star::lang::XServiceInfo > { public: diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index a96624ebc5dc..b37f5d91549d 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -34,8 +34,7 @@ #include <comphelper/uno3.hxx> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/awt/XItemEventBroadcaster.hpp> @@ -232,7 +231,7 @@ struct RMItemData OUString Label; }; -typedef ::cppu::ImplInheritanceHelper3 < VCLXGraphicControl +typedef ::cppu::ImplInheritanceHelper < VCLXGraphicControl , ::com::sun::star::container::XContainerListener , ::com::sun::star::beans::XPropertyChangeListener , ::com::sun::star::awt::XItemEventBroadcaster diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index a6e6a71adf77..b25c98848090 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -47,7 +47,7 @@ #include <com/sun/star/embed/XLinkageSupport.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/chart2/XDefaultSizeTransmitter.hpp> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include <boost/scoped_ptr.hpp> @@ -56,7 +56,7 @@ using namespace com::sun::star; namespace svt { -class EmbedEventListener_Impl : public ::cppu::WeakImplHelper4 < embed::XStateChangeListener, +class EmbedEventListener_Impl : public ::cppu::WeakImplHelper < embed::XStateChangeListener, document::XEventListener, util::XModifyListener, util::XCloseListener > diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index 30d96fdd4b2e..9ecd0bf0f00a 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -29,7 +29,7 @@ #include <unotools/ucbstreamhelper.hxx> #include <tools/stream.hxx> #include <unotools/streamwrap.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <comphelper/processfactory.hxx> @@ -47,7 +47,7 @@ namespace svt //= StreamSupplier - typedef ::cppu::WeakImplHelper2 < XStream + typedef ::cppu::WeakImplHelper < XStream , XSeekable > StreamSupplier_Base; class StreamSupplier : public StreamSupplier_Base diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index cc04d4de0919..617024251dcc 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -38,7 +38,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/servicehelper.hxx> #include <sot/filelist.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <comphelper/seqstream.hxx> #include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp> @@ -1125,7 +1125,7 @@ const Sequence< sal_Int8 >& TransferableHelper::getUnoTunnelId() // - TransferableClipboardNotifier - -class TransferableClipboardNotifier : public ::cppu::WeakImplHelper1< XClipboardListener > +class TransferableClipboardNotifier : public ::cppu::WeakImplHelper< XClipboardListener > { private: ::osl::Mutex& mrMutex; diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx index eae8f131b22c..aa2e54cdec53 100644 --- a/svtools/source/uno/svtxgridcontrol.hxx +++ b/svtools/source/uno/svtxgridcontrol.hxx @@ -34,7 +34,7 @@ #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/awt/vclxwindows.hxx> #include <cppuhelper/typeprovider.hxx> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <toolkit/helper/listenermultiplexer.hxx> @@ -42,7 +42,7 @@ namespace svt { namespace table { class TableControl; } } -typedef ::cppu::ImplInheritanceHelper4 < VCLXWindow +typedef ::cppu::ImplInheritanceHelper < VCLXWindow , ::com::sun::star::awt::grid::XGridControl , ::com::sun::star::awt::grid::XGridRowSelection , ::com::sun::star::awt::grid::XGridDataListener diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 848222d4a60b..5e11c720454d 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -29,6 +29,7 @@ #include "treecontrolpeer.hxx" #include <comphelper/processfactory.hxx> +#include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> #include <vcl/graph.hxx> #include <vcl/svapp.hxx> @@ -611,7 +612,7 @@ sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException, -class TreeSelectionEnumeration : public ::cppu::WeakImplHelper1< XEnumeration > +class TreeSelectionEnumeration : public ::cppu::WeakImplHelper< XEnumeration > { public: explicit TreeSelectionEnumeration( std::list< Any >& rSelection ); diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx index 13424293d87e..7e8626fa5aea 100644 --- a/svtools/source/uno/treecontrolpeer.hxx +++ b/svtools/source/uno/treecontrolpeer.hxx @@ -29,7 +29,7 @@ #include <vcl/image.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <tools/contnr.hxx> @@ -45,7 +45,7 @@ class UnoTreeListEntry; class TreeControlPeer; class UnoTreeListBoxImpl; -class TreeControlPeer : public ::cppu::ImplInheritanceHelper2< VCLXWindow, ::com::sun::star::awt::tree::XTreeControl, ::com::sun::star::awt::tree::XTreeDataModelListener > +class TreeControlPeer : public ::cppu::ImplInheritanceHelper< VCLXWindow, ::com::sun::star::awt::tree::XTreeControl, ::com::sun::star::awt::tree::XTreeDataModelListener > { typedef std::map<com::sun::star::uno::Reference<com::sun::star::awt::tree::XTreeNode>, UnoTreeListEntry*> TreeNodeMap; diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx index 50610a02793a..229c7e0a1e9a 100644 --- a/svtools/source/uno/unocontroltablemodel.hxx +++ b/svtools/source/uno/unocontroltablemodel.hxx @@ -32,7 +32,6 @@ #include <com/sun/star/util/Color.hpp> #include <com/sun/star/style/VerticalAlignment.hpp> -#include <cppuhelper/implbase2.hxx> #include <rtl/ref.hxx> #include <boost/noncopyable.hpp> diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx index 842a07331cfd..6d9cb1f3cfbb 100644 --- a/svtools/source/uno/unoevent.cxx +++ b/svtools/source/uno/unoevent.cxx @@ -34,7 +34,6 @@ using ::com::sun::star::lang::IllegalArgumentException; using ::com::sun::star::lang::WrappedTargetException; using ::com::sun::star::lang::XServiceInfo; using ::com::sun::star::beans::PropertyValue; -using ::cppu::WeakImplHelper2; const sal_Char sAPI_ServiceName[] = "com.sun.star.container.XNameReplace"; diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx index b0a3e7d7172a..7e19c7baa6d7 100644 --- a/svtools/source/uno/unogridcolumnfacade.cxx +++ b/svtools/source/uno/unogridcolumnfacade.cxx @@ -32,6 +32,7 @@ #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> +#include <cppuhelper/implbase.hxx> #include <boost/noncopyable.hpp> @@ -90,7 +91,7 @@ namespace svt { namespace table //= ColumnChangeMultiplexer - typedef ::cppu::WeakImplHelper1 < XGridColumnListener + typedef ::cppu::WeakImplHelper < XGridColumnListener > ColumnChangeMultiplexer_Base; class ColumnChangeMultiplexer :public ColumnChangeMultiplexer_Base ,public ::boost::noncopyable diff --git a/svtools/source/uno/unogridcolumnfacade.hxx b/svtools/source/uno/unogridcolumnfacade.hxx index fbf27481ee0d..6761e4bbbaf4 100644 --- a/svtools/source/uno/unogridcolumnfacade.hxx +++ b/svtools/source/uno/unogridcolumnfacade.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/style/VerticalAlignment.hpp> #include <com/sun/star/style/HorizontalAlignment.hpp> -#include <cppuhelper/implbase2.hxx> #include <rtl/ref.hxx> #include <boost/noncopyable.hpp> diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index a0e9f2c12099..3e3aceb5d15c 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -30,7 +30,7 @@ #include <comphelper/propertysethelper.hxx> #include <comphelper/propertysetinfo.hxx> #include <cppuhelper/weakagg.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <list> #include <osl/mutex.hxx> @@ -519,7 +519,7 @@ Reference< XNameReplace > SAL_CALL SvUnoImageMapObject::getEvents() -class SvUnoImageMap : public WeakImplHelper3< XIndexContainer, XServiceInfo, XUnoTunnel > +class SvUnoImageMap : public WeakImplHelper< XIndexContainer, XServiceInfo, XUnoTunnel > { public: explicit SvUnoImageMap( const SvEventDescription* pSupportedMacroItems ); diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index 308d5c6379dc..d5efdb4df893 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -28,7 +28,7 @@ #include <com/sun/star/ui/dialogs/XWizardController.hpp> #include <com/sun/star/ui/dialogs/WizardButton.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <svtools/genericunodialog.hxx> #include <tools/diagnose_ex.h> #include <rtl/ref.hxx> @@ -88,7 +88,7 @@ namespace { } } - typedef ::cppu::ImplInheritanceHelper1 < ::svt::OGenericUnoDialog + typedef ::cppu::ImplInheritanceHelper < ::svt::OGenericUnoDialog , ui::dialogs::XWizard > Wizard_Base; class Wizard; |