[Libreoffice-commits] core.git: sdext/inc sdext/source
Takeshi Abe
tabe at fixedpoint.jp
Tue Sep 1 01:00:16 PDT 2015
sdext/inc/pch/precompiled_PresenterScreen.hxx | 6 ++----
sdext/source/minimizer/informationdialog.hxx | 3 ++-
sdext/source/minimizer/optimizerdialog.hxx | 13 +++++++------
sdext/source/minimizer/pppoptimizer.hxx | 4 ++--
sdext/source/minimizer/pppoptimizerdialog.hxx | 4 ++--
sdext/source/minimizer/unodialog.hxx | 3 ---
sdext/source/pdfimport/misc/pwdinteract.cxx | 7 +++----
sdext/source/pdfimport/sax/saxattrlist.cxx | 2 +-
sdext/source/pdfimport/sax/saxattrlist.hxx | 4 ++--
sdext/source/pdfimport/test/outputwrap.hxx | 4 ++--
sdext/source/pdfimport/tree/imagecontainer.cxx | 1 -
sdext/source/presenter/PresenterAccessibility.cxx | 13 ++++++-------
sdext/source/presenter/PresenterAccessibility.hxx | 4 ++--
sdext/source/presenter/PresenterButton.hxx | 4 ++--
sdext/source/presenter/PresenterController.hxx | 4 ++--
sdext/source/presenter/PresenterCurrentSlideObserver.hxx | 4 ++--
sdext/source/presenter/PresenterFrameworkObserver.hxx | 4 ++--
sdext/source/presenter/PresenterHelpView.hxx | 4 ++--
sdext/source/presenter/PresenterNotesView.hxx | 4 ++--
sdext/source/presenter/PresenterPaneBase.hxx | 4 ++--
sdext/source/presenter/PresenterPaneBorderManager.cxx | 1 -
sdext/source/presenter/PresenterPaneBorderManager.hxx | 4 ++--
sdext/source/presenter/PresenterPaneBorderPainter.hxx | 4 ++--
sdext/source/presenter/PresenterPaneContainer.hxx | 4 ++--
sdext/source/presenter/PresenterPaneFactory.hxx | 4 ++--
sdext/source/presenter/PresenterProtocolHandler.cxx | 4 ++--
sdext/source/presenter/PresenterScreen.cxx | 3 ++-
sdext/source/presenter/PresenterScreen.hxx | 6 +++---
sdext/source/presenter/PresenterScrollBar.hxx | 4 ++--
sdext/source/presenter/PresenterSlidePreview.hxx | 4 ++--
sdext/source/presenter/PresenterSlideShowView.hxx | 4 ++--
sdext/source/presenter/PresenterSlideSorter.hxx | 4 ++--
sdext/source/presenter/PresenterSpritePane.hxx | 1 -
sdext/source/presenter/PresenterTextView.hxx | 1 -
sdext/source/presenter/PresenterTimer.hxx | 4 ++--
sdext/source/presenter/PresenterToolBar.cxx | 4 ++--
sdext/source/presenter/PresenterToolBar.hxx | 7 +++----
sdext/source/presenter/PresenterViewFactory.cxx | 1 -
sdext/source/presenter/PresenterViewFactory.hxx | 4 ++--
sdext/source/presenter/PresenterWindowManager.hxx | 4 ++--
40 files changed, 79 insertions(+), 89 deletions(-)
New commits:
commit e15d4b8ee959ce51ebc78fe059c1c769bbc9e6ff
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Sep 1 07:27:20 2015 +0900
sdext: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I663029b736489b81ed4ccb5f7bd657fbaf091bdf
Reviewed-on: https://gerrit.libreoffice.org/18206
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/sdext/inc/pch/precompiled_PresenterScreen.hxx b/sdext/inc/pch/precompiled_PresenterScreen.hxx
index 7183265..31d2592 100644
--- a/sdext/inc/pch/precompiled_PresenterScreen.hxx
+++ b/sdext/inc/pch/precompiled_PresenterScreen.hxx
@@ -129,10 +129,8 @@
#include <com/sun/star/util/XChangesBatch.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <cppuhelper/compbase1.hxx>
-#include <cppuhelper/compbase2.hxx>
-#include <cppuhelper/compbase5.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
#include <iterator>
#include <map>
#include <math.h>
diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx
index beafc65..0e824f0 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -38,6 +38,7 @@
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/awt/PushButtonType.hpp>
#include <com/sun/star/io/XStream.hpp>
+#include <cppuhelper/implbase.hxx>
// - InformationDialog -
@@ -69,7 +70,7 @@ private:
const OUString& maSaveAsURL;
};
-class OKActionListener : public ::cppu::WeakImplHelper1< css::awt::XActionListener >
+class OKActionListener : public ::cppu::WeakImplHelper< css::awt::XActionListener >
{
public:
OKActionListener( InformationDialog& rInformationDialog ) : mrInformationDialog( rInformationDialog ){};
diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx
index e236b62..acd1b8a 100644
--- a/sdext/source/minimizer/optimizerdialog.hxx
+++ b/sdext/source/minimizer/optimizerdialog.hxx
@@ -41,6 +41,7 @@
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/awt/PushButtonType.hpp>
+#include <cppuhelper/implbase.hxx>
#define MAX_STEP 4
#define OD_DIALOG_WIDTH 330
@@ -127,7 +128,7 @@ public:
-class ItemListener : public ::cppu::WeakImplHelper1< css::awt::XItemListener >
+class ItemListener : public ::cppu::WeakImplHelper< css::awt::XItemListener >
{
public:
ItemListener( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){};
@@ -141,7 +142,7 @@ private:
-class ActionListener : public ::cppu::WeakImplHelper1< css::awt::XActionListener >
+class ActionListener : public ::cppu::WeakImplHelper< css::awt::XActionListener >
{
public:
ActionListener( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){};
@@ -155,7 +156,7 @@ private:
-class ActionListenerListBox0Pg0 : public ::cppu::WeakImplHelper1< css::awt::XActionListener >
+class ActionListenerListBox0Pg0 : public ::cppu::WeakImplHelper< css::awt::XActionListener >
{
public:
ActionListenerListBox0Pg0( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){};
@@ -169,7 +170,7 @@ private:
-class TextListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper1< css::awt::XTextListener >
+class TextListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper< css::awt::XTextListener >
{
public:
TextListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){};
@@ -183,7 +184,7 @@ private:
-class TextListenerComboBox0Pg1 : public ::cppu::WeakImplHelper1< css::awt::XTextListener >
+class TextListenerComboBox0Pg1 : public ::cppu::WeakImplHelper< css::awt::XTextListener >
{
public:
TextListenerComboBox0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){};
@@ -197,7 +198,7 @@ private:
-class SpinListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper1< css::awt::XSpinListener >
+class SpinListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper< css::awt::XSpinListener >
{
public:
SpinListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){};
diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx
index 0b92962..efda671 100644
--- a/sdext/source/minimizer/pppoptimizer.hxx
+++ b/sdext/source/minimizer/pppoptimizer.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SDEXT_SOURCE_MINIMIZER_PPPOPTIMIZER_HXX
#define INCLUDED_SDEXT_SOURCE_MINIMIZER_PPPOPTIMIZER_HXX
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
@@ -31,7 +31,7 @@
// - PPPOptimizer -
-class PPPOptimizer : public cppu::WeakImplHelper2<
+class PPPOptimizer : public cppu::WeakImplHelper<
css::frame::XDispatchProvider,
css::frame::XDispatch >
{
diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx
index 503b553..a4594b5 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.hxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.hxx
@@ -32,14 +32,14 @@
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
// - PPPOptimizerDialog -
class OptimizerDialog;
-class PPPOptimizerDialog : public ::cppu::WeakImplHelper4<
+class PPPOptimizerDialog : public ::cppu::WeakImplHelper<
css::lang::XInitialization,
css::lang::XServiceInfo,
css::frame::XDispatchProvider,
diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx
index 7f1e5cf..a86547e 100644
--- a/sdext/source/minimizer/unodialog.hxx
+++ b/sdext/source/minimizer/unodialog.hxx
@@ -48,9 +48,6 @@
#include <com/sun/star/awt/XReschedule.hpp>
#include <com/sun/star/awt/XDialog.hpp>
#include <com/sun/star/awt/Size.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
// - UnoDialog -
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx
index 896f5b6..b06c8c3 100644
--- a/sdext/source/pdfimport/misc/pwdinteract.cxx
+++ b/sdext/source/pdfimport/misc/pwdinteract.cxx
@@ -31,8 +31,7 @@
#include <com/sun/star/task/DocumentPasswordRequest.hpp>
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/mutex.hxx>
#include <osl/diagnose.h>
#include <rtl/ref.hxx>
@@ -44,7 +43,7 @@ namespace
{
class PDFPasswordRequest:
- public cppu::WeakImplHelper2<
+ public cppu::WeakImplHelper<
task::XInteractionRequest, task::XInteractionPassword >,
private boost::noncopyable
{
@@ -121,7 +120,7 @@ void PDFPasswordRequest::select() throw (uno::RuntimeException, std::exception)
}
class UnsupportedEncryptionFormatRequest:
- public cppu::WeakImplHelper1< task::XInteractionRequest >,
+ public cppu::WeakImplHelper< task::XInteractionRequest >,
private boost::noncopyable
{
public:
diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx
index 9d6d900..7a3d4fd 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.cxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.cxx
@@ -37,7 +37,7 @@ SaxAttrList::SaxAttrList( const std::unordered_map< OUString, OUString, OUString
}
SaxAttrList::SaxAttrList( const SaxAttrList& rClone ) :
- cppu::WeakImplHelper2<com::sun::star::xml::sax::XAttributeList, com::sun::star::util::XCloneable>(rClone),
+ cppu::WeakImplHelper<com::sun::star::xml::sax::XAttributeList, com::sun::star::util::XCloneable>(rClone),
m_aAttributes( rClone.m_aAttributes ),
m_aIndexMap( rClone.m_aIndexMap )
{
diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx
index 65def21..e46d7c4 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.hxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.hxx
@@ -23,14 +23,14 @@
#include <rtl/ustring.hxx>
#include <unordered_map>
#include <vector>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
namespace pdfi
{
- class SaxAttrList : public ::cppu::WeakImplHelper2<
+ class SaxAttrList : public ::cppu::WeakImplHelper<
css::xml::sax::XAttributeList,
css::util::XCloneable
>
diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx
index 2f4ccd1..ad166af 100644
--- a/sdext/source/pdfimport/test/outputwrap.hxx
+++ b/sdext/source/pdfimport/test/outputwrap.hxx
@@ -22,14 +22,14 @@
#define INCLUDED_SDEXT_SOURCE_PDFIMPORT_TEST_OUTPUTWRAP_HXX
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/io/XOutputStream.hpp>
#include <osl/file.hxx>
namespace pdfi
{
-typedef ::cppu::WeakComponentImplHelper1<
+typedef ::cppu::WeakComponentImplHelper<
css::io::XOutputStream > OutputWrapBase;
class OutputWrap : private cppu::BaseMutex, public OutputWrapBase
diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx
index b8b9e18..a3cd15a 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.cxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.cxx
@@ -30,7 +30,6 @@
#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <cppuhelper/implbase1.hxx>
#include <comphelper/stl_types.hxx>
#include <boost/bind.hpp>
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 94d002c..d94a3fc 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -37,9 +37,8 @@
#include <com/sun/star/drawing/framework/ResourceId.hpp>
#include <com/sun/star/drawing/framework/XPane.hpp>
#include <com/sun/star/drawing/framework/XView.hpp>
-#include <cppuhelper/compbase1.hxx>
-#include <cppuhelper/compbase5.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
#include <boost/bind.hpp>
using namespace ::com::sun::star;
@@ -52,7 +51,7 @@ using namespace ::com::sun::star::drawing::framework;
namespace sdext { namespace presenter {
namespace {
- typedef ::cppu::WeakComponentImplHelper5 <
+ typedef ::cppu::WeakComponentImplHelper <
css::accessibility::XAccessible,
css::accessibility::XAccessibleContext,
css::accessibility::XAccessibleComponent,
@@ -226,7 +225,7 @@ protected:
//===== AccessibleStateSet ====================================================
namespace {
-typedef ::cppu::WeakComponentImplHelper1 <
+typedef ::cppu::WeakComponentImplHelper <
css::accessibility::XAccessibleStateSet
> AccessibleStateSetInterfaceBase;
}
@@ -262,7 +261,7 @@ private:
//===== AccessibleRelationSet =================================================
namespace {
-typedef ::cppu::WeakComponentImplHelper1 <
+typedef ::cppu::WeakComponentImplHelper <
css::accessibility::XAccessibleRelationSet
> AccessibleRelationSetInterfaceBase;
}
@@ -300,7 +299,7 @@ private:
//===== PresenterAccessibleParagraph ==========================================
namespace {
-typedef ::cppu::ImplInheritanceHelper1 <
+typedef ::cppu::ImplInheritanceHelper <
PresenterAccessible::AccessibleObject,
css::accessibility::XAccessibleText
> PresenterAccessibleParagraphInterfaceBase;
diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx
index ad4f88b..fb5eac8 100644
--- a/sdext/source/presenter/PresenterAccessibility.hxx
+++ b/sdext/source/presenter/PresenterAccessibility.hxx
@@ -34,7 +34,7 @@
#include <com/sun/star/drawing/framework/XPane2.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <rtl/ref.hxx>
#include <boost/shared_ptr.hpp>
@@ -46,7 +46,7 @@ class PresenterController;
class PresenterTextView;
namespace {
- typedef ::cppu::WeakComponentImplHelper3 <
+ typedef ::cppu::WeakComponentImplHelper <
css::accessibility::XAccessible,
css::lang::XInitialization,
css::awt::XFocusListener
diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx
index 5af8328..2ec4cc4 100644
--- a/sdext/source/presenter/PresenterButton.hxx
+++ b/sdext/source/presenter/PresenterButton.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/rendering/XBitmap.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <boost/noncopyable.hpp>
#include <rtl/ref.hxx>
@@ -40,7 +40,7 @@ namespace sdext { namespace presenter {
class PresenterController;
namespace {
- typedef ::cppu::WeakComponentImplHelper4 <
+ typedef ::cppu::WeakComponentImplHelper <
css::awt::XWindowListener,
css::awt::XPaintListener,
css::awt::XMouseListener,
diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx
index ad1356e..9f9a944 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -24,7 +24,7 @@
#include "PresenterPaneContainer.hxx"
#include "PresenterTheme.hxx"
#include "PresenterSprite.hxx"
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/awt/XFocusListener.hpp>
@@ -58,7 +58,7 @@ class PresenterTheme;
class PresenterWindowManager;
namespace {
- typedef ::cppu::WeakComponentImplHelper6 <
+ typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XConfigurationChangeListener,
css::frame::XFrameActionListener,
css::awt::XKeyListener,
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
index 1e98482..57c0c90 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/presentation/XSlideShow.hpp>
#include <com/sun/star/presentation/XSlideShowController.hpp>
#include <com/sun/star/frame/XController.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <rtl/ref.hxx>
#include <salhelper/timer.hxx>
@@ -32,7 +32,7 @@
namespace sdext { namespace presenter {
namespace {
- typedef ::cppu::WeakComponentImplHelper1 <
+ typedef ::cppu::WeakComponentImplHelper <
css::presentation::XSlideShowListener
> PresenterCurrentSlideObserverInterfaceBase;
}
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx
index edc9481..64e4e71 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.hxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <boost/noncopyable.hpp>
@@ -31,7 +31,7 @@
namespace sdext { namespace presenter {
-typedef ::cppu::WeakComponentImplHelper1 <
+typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XConfigurationChangeListener
> PresenterFrameworkObserverInterfaceBase;
diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx
index 7792d79..d2cc595 100644
--- a/sdext/source/presenter/PresenterHelpView.hxx
+++ b/sdext/source/presenter/PresenterHelpView.hxx
@@ -22,7 +22,7 @@
#include "PresenterController.hxx"
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/awt/XPaintListener.hpp>
#include <com/sun/star/awt/XWindowListener.hpp>
#include <com/sun/star/drawing/framework/XView.hpp>
@@ -32,7 +32,7 @@
#include <boost/scoped_ptr.hpp>
namespace {
- typedef cppu::WeakComponentImplHelper3<
+ typedef cppu::WeakComponentImplHelper<
css::drawing::framework::XView,
css::awt::XWindowListener,
css::awt::XPaintListener
diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx
index 322dbfa..057a18e 100644
--- a/sdext/source/presenter/PresenterNotesView.hxx
+++ b/sdext/source/presenter/PresenterNotesView.hxx
@@ -24,7 +24,7 @@
#include "PresenterToolBar.hxx"
#include "PresenterViewFactory.hxx"
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/awt/ActionEvent.hpp>
#include <com/sun/star/awt/XActionListener.hpp>
#include <com/sun/star/awt/XButton.hpp>
@@ -40,7 +40,7 @@
#include <boost/shared_ptr.hpp>
namespace {
- typedef cppu::WeakComponentImplHelper5<
+ typedef cppu::WeakComponentImplHelper<
css::awt::XWindowListener,
css::awt::XPaintListener,
css::drawing::framework::XView,
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index 700c440..f93d6c1 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sdext/source/presenter/PresenterPaneBase.hxx
@@ -22,7 +22,7 @@
#include "PresenterTheme.hxx"
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/XMouseListener.hpp>
#include <com/sun/star/awt/XMouseMotionListener.hpp>
@@ -44,7 +44,7 @@ namespace sdext { namespace presenter {
class PresenterController;
namespace {
- typedef ::cppu::WeakComponentImplHelper4 <
+ typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XPane,
css::lang::XInitialization,
css::awt::XWindowListener,
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx
index b5a0979..f8d8c3f 100644
--- a/sdext/source/presenter/PresenterPaneBorderManager.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx
@@ -33,7 +33,6 @@
#include <com/sun/star/awt/XWindow2.hpp>
#include <com/sun/star/awt/XWindowPeer.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <cppuhelper/compbase1.hxx>
#include <osl/mutex.hxx>
using namespace ::com::sun::star;
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx b/sdext/source/presenter/PresenterPaneBorderManager.hxx
index d69cbc1..6d81840 100644
--- a/sdext/source/presenter/PresenterPaneBorderManager.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderManager.hxx
@@ -26,7 +26,7 @@
#ifdef ENABLE_PANE_RESIZING
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/awt/XGraphics.hpp>
@@ -48,7 +48,7 @@ namespace sdext { namespace presenter {
class PresenterController;
namespace {
- typedef ::cppu::WeakComponentImplHelper3 <
+ typedef ::cppu::WeakComponentImplHelper <
css::lang::XInitialization,
css::awt::XMouseListener,
css::awt::XMouseMotionListener
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
index 79d4a3d..f7c74d6 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/util/XMacroExpander.hpp>
#include <com/sun/star/awt/XGraphics.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
@@ -39,7 +39,7 @@ class PresenterPane;
class PresenterTheme;
namespace {
- typedef ::cppu::WeakComponentImplHelper1<
+ typedef ::cppu::WeakComponentImplHelper<
css::drawing::framework::XPaneBorderPainter
> PresenterPaneBorderPainterInterfaceBase;
}
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
index 03704b9..ced20ba 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/Color.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <rtl/ref.hxx>
#include <boost/noncopyable.hpp>
@@ -46,7 +46,7 @@ class PresenterPaneBase;
class PresenterSprite;
namespace {
- typedef ::cppu::WeakComponentImplHelper1 <
+ typedef ::cppu::WeakComponentImplHelper <
css::lang::XEventListener
> PresenterPaneContainerInterfaceBase;
}
diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx
index 98bf788..ec53e01 100644
--- a/sdext/source/presenter/PresenterPaneFactory.hxx
+++ b/sdext/source/presenter/PresenterPaneFactory.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANEFACTORY_HXX
#define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANEFACTORY_HXX
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -38,7 +38,7 @@ namespace sdext { namespace presenter {
class PresenterController;
namespace {
- typedef ::cppu::WeakComponentImplHelper1 <
+ typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XResourceFactory
> PresenterPaneFactoryInterfaceBase;
}
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index 8d5d3be..fa5a535 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -35,7 +35,7 @@
#include <com/sun/star/presentation/XSlideShow.hpp>
#include <com/sun/star/presentation/XSlideShowView.hpp>
#include <com/sun/star/presentation/XPresentationSupplier.hpp>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
using namespace ::com::sun::star;
@@ -165,7 +165,7 @@ namespace {
} // end of anonymous namespace
namespace {
- typedef ::cppu::WeakComponentImplHelper2 <
+ typedef ::cppu::WeakComponentImplHelper <
css::frame::XDispatch,
css::document::XEventListener
> PresenterDispatchInterfaceBase;
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 110b351..075764d 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -38,6 +38,7 @@
#include <com/sun/star/document/XEventBroadcaster.hpp>
#include <boost/bind.hpp>
#include <boost/noncopyable.hpp>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <vcl/svapp.hxx>
@@ -51,7 +52,7 @@ using namespace ::com::sun::star::drawing::framework;
namespace sdext { namespace presenter {
namespace {
- typedef ::cppu::WeakComponentImplHelper1 <
+ typedef ::cppu::WeakComponentImplHelper <
css::document::XEventListener
> PresenterScreenListenerInterfaceBase;
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx
index 44931fb..b523c22 100644
--- a/sdext/source/presenter/PresenterScreen.hxx
+++ b/sdext/source/presenter/PresenterScreen.hxx
@@ -22,7 +22,7 @@
#include "PresenterConfigurationAccess.hxx"
#include "PresenterPaneContainer.hxx"
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/frame/XController.hpp>
@@ -41,10 +41,10 @@ namespace sdext { namespace presenter {
class PresenterController;
namespace {
- typedef ::cppu::WeakComponentImplHelper1 <
+ typedef ::cppu::WeakComponentImplHelper <
css::task::XJob
> PresenterScreenJobInterfaceBase;
- typedef ::cppu::WeakComponentImplHelper1 <
+ typedef ::cppu::WeakComponentImplHelper <
css::lang::XEventListener
> PresenterScreenInterfaceBase;
}
diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx
index 5e91d20..5a7389f 100644
--- a/sdext/source/presenter/PresenterScrollBar.hxx
+++ b/sdext/source/presenter/PresenterScrollBar.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>
@@ -41,7 +41,7 @@ class PresenterCanvasHelper;
class PresenterPaintManager;
namespace {
- typedef ::cppu::WeakComponentImplHelper4 <
+ typedef ::cppu::WeakComponentImplHelper <
css::awt::XWindowListener,
css::awt::XPaintListener,
css::awt::XMouseListener,
diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx
index f3b2c84..afe809d 100644
--- a/sdext/source/presenter/PresenterSlidePreview.hxx
+++ b/sdext/source/presenter/PresenterSlidePreview.hxx
@@ -35,13 +35,13 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <rtl/ref.hxx>
namespace sdext { namespace presenter {
namespace {
- typedef ::cppu::WeakComponentImplHelper4 <
+ typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XView,
css::drawing::XDrawView,
css::awt::XPaintListener,
diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx
index bce135e..05c3352b 100644
--- a/sdext/source/presenter/PresenterSlideShowView.hxx
+++ b/sdext/source/presenter/PresenterSlideShowView.hxx
@@ -36,7 +36,7 @@
#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/Color.hpp>
-#include <cppuhelper/compbase7.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/basemutex.hxx>
#include <boost/noncopyable.hpp>
@@ -44,7 +44,7 @@
namespace sdext { namespace presenter {
namespace {
- typedef cppu::WeakComponentImplHelper7<
+ typedef cppu::WeakComponentImplHelper<
css::presentation::XSlideShowView,
css::awt::XPaintListener,
css::awt::XMouseListener,
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx
index abbe11c..1097787 100644
--- a/sdext/source/presenter/PresenterSlideSorter.hxx
+++ b/sdext/source/presenter/PresenterSlideSorter.hxx
@@ -24,7 +24,7 @@
#include "PresenterPaneContainer.hxx"
#include "PresenterViewFactory.hxx"
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase8.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/awt/XPaintListener.hpp>
#include <com/sun/star/awt/XWindowListener.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp>
@@ -39,7 +39,7 @@
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
namespace {
- typedef cppu::WeakComponentImplHelper8<
+ typedef cppu::WeakComponentImplHelper<
css::drawing::framework::XView,
css::awt::XWindowListener,
css::awt::XPaintListener,
diff --git a/sdext/source/presenter/PresenterSpritePane.hxx b/sdext/source/presenter/PresenterSpritePane.hxx
index 64c9a9e..6174e449 100644
--- a/sdext/source/presenter/PresenterSpritePane.hxx
+++ b/sdext/source/presenter/PresenterSpritePane.hxx
@@ -35,7 +35,6 @@
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
#include <rtl/ref.hxx>
#include <boost/shared_ptr.hpp>
diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx
index 3b5fea7..e9acc43 100644
--- a/sdext/source/presenter/PresenterTextView.hxx
+++ b/sdext/source/presenter/PresenterTextView.hxx
@@ -31,7 +31,6 @@
#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx>
#include <functional>
diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx
index e7bd616..9b1249b 100644
--- a/sdext/source/presenter/PresenterTimer.hxx
+++ b/sdext/source/presenter/PresenterTimer.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/awt/XCallback.hpp>
#include <com/sun/star/awt/XRequestCallback.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <osl/mutex.hxx>
#include <osl/time.h>
#include <rtl/ref.hxx>
@@ -65,7 +65,7 @@ public:
static void CancelTask (const sal_Int32 nTaskId);
};
-typedef cppu::WeakComponentImplHelper1<
+typedef cppu::WeakComponentImplHelper<
css::awt::XCallback
> PresenterClockTimerInterfaceBase;
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index d1da37e..406c94a 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -30,7 +30,7 @@
#include "PresenterTimer.hxx"
#include "PresenterWindowManager.hxx"
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/awt/PosSize.hpp>
#include <com/sun/star/awt/XWindowPeer.hpp>
@@ -121,7 +121,7 @@ public:
//===== PresenterToolBar::Element =============================================
namespace {
- typedef cppu::WeakComponentImplHelper2<
+ typedef cppu::WeakComponentImplHelper<
css::document::XEventListener,
css::frame::XStatusListener
> ElementInterfaceBase;
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index a249d01..c76a62b 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -24,8 +24,7 @@
#include "PresenterViewFactory.hxx"
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase3.hxx>
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
#include <com/sun/star/awt/ActionEvent.hpp>
#include <com/sun/star/awt/XActionListener.hpp>
#include <com/sun/star/awt/XButton.hpp>
@@ -49,7 +48,7 @@
#include <functional>
namespace {
- typedef cppu::WeakComponentImplHelper5<
+ typedef cppu::WeakComponentImplHelper<
css::awt::XWindowListener,
css::awt::XPaintListener,
css::awt::XMouseListener,
@@ -57,7 +56,7 @@ namespace {
css::drawing::XDrawView
> PresenterToolBarInterfaceBase;
- typedef cppu::WeakComponentImplHelper3<
+ typedef cppu::WeakComponentImplHelper<
css::awt::XPaintListener,
css::drawing::framework::XView,
css::drawing::XDrawView
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index ab88497..d767710 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -35,7 +35,6 @@
#include <com/sun/star/drawing/XSlideSorterBase.hpp>
#include <com/sun/star/presentation/XSlideShow.hpp>
#include <com/sun/star/presentation/XSlideShowView.hpp>
-#include <cppuhelper/compbase1.hxx>
#include <boost/bind.hpp>
using namespace ::com::sun::star;
diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx
index b752364..48a369e 100644
--- a/sdext/source/presenter/PresenterViewFactory.hxx
+++ b/sdext/source/presenter/PresenterViewFactory.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERVIEWFACTORY_HXX
#include "PresenterController.hxx"
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
@@ -35,7 +35,7 @@
namespace sdext { namespace presenter {
namespace {
- typedef ::cppu::WeakComponentImplHelper1 <
+ typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XResourceFactory
> PresenterViewFactoryInterfaceBase;
}
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx
index 9f25fbb..22d8401 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -37,7 +37,7 @@
#include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
#include <rtl/ref.hxx>
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
@@ -49,7 +49,7 @@ class PresenterPaneBorderPainter;
class PresenterTheme;
namespace {
- typedef ::cppu::WeakComponentImplHelper4<
+ typedef ::cppu::WeakComponentImplHelper<
css::awt::XWindowListener,
css::awt::XPaintListener,
css::awt::XMouseListener,
More information about the Libreoffice-commits
mailing list