8 files changed, 16 insertions, 17 deletions
diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx
index aea7d49db079..3569ff506439 100644
--- a/extensions/source/bibliography/bibbeam.hxx
+++ b/extensions/source/bibliography/bibbeam.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/form/XForm.hpp>
 // #100312# -----------------
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
-#include <cppuhelper/implbase1.hxx>
 #include <vcl/splitwin.hxx>
 #include "toolbar.hxx"
 #include "formcontrolcontainer.hxx"
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 229b3284c25e..6aafbc4e7ad9 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -60,7 +60,7 @@
 #include "framectr.hxx"
 #include "datman.hxx"
 #include <bibconfig.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -72,7 +72,7 @@ using namespace ::com::sun::star::form;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::frame;
 
-class BibliographyLoader : public cppu::WeakImplHelper4
+class BibliographyLoader : public cppu::WeakImplHelper
                             < XServiceInfo, XNameAccess, XPropertySet, XFrameLoader >
 {
     HdlBibModul                                     m_pBibMod;
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index fb5db53f5a28..854820f34fda 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -25,14 +25,14 @@
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 #include <com/sun/star/form/runtime/XFormController.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <com/sun/star/form/XLoadable.hpp>
 #include <comphelper/broadcasthelper.hxx>
 // #100312# --------------------
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <vcl/vclptr.hxx>
 
 namespace vcl { class Window; }
@@ -50,7 +50,7 @@ struct BibDBDescriptor;
 
 // #100312# ---------------------
 class BibInterceptorHelper
-    :public cppu::WeakImplHelper1< ::com::sun::star::frame::XDispatchProviderInterceptor >
+    :public cppu::WeakImplHelper< ::com::sun::star::frame::XDispatchProviderInterceptor >
 {
 private:
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > xMasterDispatchProvider;
@@ -76,7 +76,7 @@ public:
     virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewMasterDispatchProvider ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-typedef cppu::WeakComponentImplHelper2  <   ::com::sun::star::beans::XPropertyChangeListener
+typedef cppu::WeakComponentImplHelper  <   ::com::sun::star::beans::XPropertyChangeListener
                                         ,   ::com::sun::star::form::XLoadable
                                         >   BibDataManager_Base;
 class BibDataManager
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index c3016be45a6c..790b32ec8521 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -30,7 +30,7 @@
 #include "bib.hrc"
 #include <toolkit/helper/vclunohelper.hxx>
 #include "bibconfig.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <vcl/svapp.hxx>
 #include "bibliography.hrc"
 #include <comphelper/processfactory.hxx>
@@ -130,7 +130,7 @@ const CmdToInfoCache& GetCommandToInfoCache()
 }
 
 
-class BibFrameCtrl_Impl : public cppu::WeakImplHelper1 < XFrameActionListener >
+class BibFrameCtrl_Impl : public cppu::WeakImplHelper < XFrameActionListener >
 {
 public:
     Mutex                               aMutex;
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 60d7d45222f5..ce93e27782e4 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/form/XLoadable.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/frame/XDispatchInformationProvider.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <boost/ptr_container/ptr_vector.hpp>
 
 #include "bibmod.hxx"
@@ -50,7 +50,7 @@ public:
 
 typedef boost::ptr_vector<BibStatusDispatch> BibStatusDispatchArr;
 
-class BibFrameController_Impl : public cppu::WeakImplHelper5 <
+class BibFrameController_Impl : public cppu::WeakImplHelper <
     ::com::sun::star::lang::XServiceInfo,
     ::com::sun::star::frame::XController,
     ::com::sun::star::frame::XDispatch,
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 19e816894993..bab2494a6cb2 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <vcl/builder.hxx>
 #include <vcl/settings.hxx>
 #include "general.hxx"
@@ -68,7 +68,7 @@ static OUString lcl_GetColumnName( const Mapping* pMapping, sal_uInt16 nIndexPos
     return sRet;
 }
 
-class BibPosListener    :public cppu::WeakImplHelper1 <sdbc::XRowSetListener>
+class BibPosListener    :public cppu::WeakImplHelper <sdbc::XRowSetListener>
 {
     VclPtr<BibGeneralPage>     pParentPage;
 public:
diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx
index e6347cf3568f..8bd3346d3853 100644
--- a/extensions/source/bibliography/loadlisteneradapter.hxx
+++ b/extensions/source/bibliography/loadlisteneradapter.hxx
@@ -22,7 +22,7 @@
 
 #include <osl/mutex.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/form/XLoadable.hpp>
 
 
@@ -120,7 +120,7 @@ namespace bib
         virtual void _reloaded( const ::com::sun::star::lang::EventObject& aEvent ) = 0;
     };
 
-    typedef ::cppu::WeakImplHelper1< ::com::sun::star::form::XLoadListener >    OLoadListenerAdapter_Base;
+    typedef ::cppu::WeakImplHelper< ::com::sun::star::form::XLoadListener >    OLoadListenerAdapter_Base;
     class OLoadListenerAdapter
         :public OLoadListenerAdapter_Base
         ,public OComponentAdapterBase
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index efa5b2c70e99..6c79ce1d2919 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -29,13 +29,13 @@
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/timer.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <boost/ptr_container/ptr_vector.hpp>
 
 class BibDataManager;
 class BibToolBar;
 
-class BibToolBarListener: public cppu::WeakImplHelper1 < ::com::sun::star::frame::XStatusListener>
+class BibToolBarListener: public cppu::WeakImplHelper < ::com::sun::star::frame::XStatusListener>
 {
 private: