mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sdext: tdf#88206 replace cppu::WeakImplHelper* etc.

Browse Source 
with the variadic variants.

Change-Id: I663029b736489b81ed4ccb5f7bd657fbaf091bdf
Reviewed-on: https://gerrit.libreoffice.org/18206
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Takeshi Abe
2015-09-01 07:27:20 +09:00
committed by Noel Grandin
parent ed33646cde
commit e15d4b8ee9
40 changed files with 79 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sdext/inc/pch/precompiled_PresenterScreen.hxx
View File

@@ -129,10 +129,8 @@
#include <com/sun/star/util/XChangesBatch.hpp> #include <com/sun/star/util/XChangesBatch.hpp>
#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp>
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/compbase2.hxx> #include <cppuhelper/implbase.hxx>
#include <cppuhelper/compbase5.hxx>
#include <cppuhelper/implbase1.hxx>
#include <iterator> #include <iterator>
#include <map> #include <map>
#include <math.h> #include <math.h>

3
sdext/source/minimizer/informationdialog.hxx
View File

@@ -38,6 +38,7 @@
#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/awt/PushButtonType.hpp> #include <com/sun/star/awt/PushButtonType.hpp>
#include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XStream.hpp>
#include <cppuhelper/implbase.hxx>
// - InformationDialog - // - InformationDialog -
@@ -69,7 +70,7 @@ private:
const OUString& maSaveAsURL; const OUString& maSaveAsURL;
}; };
class OKActionListener : public ::cppu::WeakImplHelper1< css::awt::XActionListener > class OKActionListener : public ::cppu::WeakImplHelper< css::awt::XActionListener >
{ {
public: public:
OKActionListener( InformationDialog& rInformationDialog ) : mrInformationDialog( rInformationDialog ){}; OKActionListener( InformationDialog& rInformationDialog ) : mrInformationDialog( rInformationDialog ){};

13
sdext/source/minimizer/optimizerdialog.hxx
View File

@@ -41,6 +41,7 @@
#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/awt/PushButtonType.hpp> #include <com/sun/star/awt/PushButtonType.hpp>
#include <cppuhelper/implbase.hxx>
#define MAX_STEP 4 #define MAX_STEP 4
#define OD_DIALOG_WIDTH 330 #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: public:
ItemListener( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; 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: public:
ActionListener( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; 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: public:
ActionListenerListBox0Pg0( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; 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: public:
TextListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; 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: public:
TextListenerComboBox0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; 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: public:
SpinListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){}; SpinListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){};

4
sdext/source/minimizer/pppoptimizer.hxx
View File

@@ -20,7 +20,7 @@
#ifndef INCLUDED_SDEXT_SOURCE_MINIMIZER_PPPOPTIMIZER_HXX #ifndef INCLUDED_SDEXT_SOURCE_MINIMIZER_PPPOPTIMIZER_HXX
#define 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/XDispatch.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp>
@@ -31,7 +31,7 @@
// - PPPOptimizer - // - PPPOptimizer -
class PPPOptimizer : public cppu::WeakImplHelper2< class PPPOptimizer : public cppu::WeakImplHelper<
css::frame::XDispatchProvider, css::frame::XDispatchProvider,
css::frame::XDispatch > css::frame::XDispatch >
{ {

4
sdext/source/minimizer/pppoptimizerdialog.hxx
View File

@@ -32,14 +32,14 @@
#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp>
#include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase.hxx>
// - PPPOptimizerDialog - // - PPPOptimizerDialog -
class OptimizerDialog; class OptimizerDialog;
class PPPOptimizerDialog : public ::cppu::WeakImplHelper4< class PPPOptimizerDialog : public ::cppu::WeakImplHelper<
css::lang::XInitialization, css::lang::XInitialization,
css::lang::XServiceInfo, css::lang::XServiceInfo,
css::frame::XDispatchProvider, css::frame::XDispatchProvider,

3
sdext/source/minimizer/unodialog.hxx
View File

@@ -48,9 +48,6 @@
#include <com/sun/star/awt/XReschedule.hpp> #include <com/sun/star/awt/XReschedule.hpp>
#include <com/sun/star/awt/XDialog.hpp> #include <com/sun/star/awt/XDialog.hpp>
#include <com/sun/star/awt/Size.hpp> #include <com/sun/star/awt/Size.hpp>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase3.hxx>
// - UnoDialog - // - UnoDialog -

7
sdext/source/pdfimport/misc/pwdinteract.cxx
View File

@@ -31,8 +31,7 @@
#include <com/sun/star/task/DocumentPasswordRequest.hpp> #include <com/sun/star/task/DocumentPasswordRequest.hpp>
#include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase2.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
@@ -44,7 +43,7 @@ namespace
{ {
class PDFPasswordRequest: class PDFPasswordRequest:
public cppu::WeakImplHelper2< public cppu::WeakImplHelper<
task::XInteractionRequest, task::XInteractionPassword >, task::XInteractionRequest, task::XInteractionPassword >,
private boost::noncopyable private boost::noncopyable
{ {
@@ -121,7 +120,7 @@ void PDFPasswordRequest::select() throw (uno::RuntimeException, std::exception)
} }
class UnsupportedEncryptionFormatRequest: class UnsupportedEncryptionFormatRequest:
public cppu::WeakImplHelper1< task::XInteractionRequest >, public cppu::WeakImplHelper< task::XInteractionRequest >,
private boost::noncopyable private boost::noncopyable
{ {
public: public:

2
sdext/source/pdfimport/sax/saxattrlist.cxx
View File

@@ -37,7 +37,7 @@ SaxAttrList::SaxAttrList( const std::unordered_map< OUString, OUString, OUString
} }
SaxAttrList::SaxAttrList( const SaxAttrList& rClone ) : 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_aAttributes( rClone.m_aAttributes ),
m_aIndexMap( rClone.m_aIndexMap ) m_aIndexMap( rClone.m_aIndexMap )
{ {

4
sdext/source/pdfimport/sax/saxattrlist.hxx
View File

@@ -23,14 +23,14 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
#include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp>
namespace pdfi namespace pdfi
{ {
class SaxAttrList : public ::cppu::WeakImplHelper2< class SaxAttrList : public ::cppu::WeakImplHelper<
css::xml::sax::XAttributeList, css::xml::sax::XAttributeList,
css::util::XCloneable css::util::XCloneable
> >

4
sdext/source/pdfimport/test/outputwrap.hxx
View File

@@ -22,14 +22,14 @@
#define INCLUDED_SDEXT_SOURCE_PDFIMPORT_TEST_OUTPUTWRAP_HXX #define INCLUDED_SDEXT_SOURCE_PDFIMPORT_TEST_OUTPUTWRAP_HXX
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase.hxx>
#include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp>
#include <osl/file.hxx> #include <osl/file.hxx>
namespace pdfi namespace pdfi
{ {
typedef ::cppu::WeakComponentImplHelper1< typedef ::cppu::WeakComponentImplHelper<
css::io::XOutputStream > OutputWrapBase; css::io::XOutputStream > OutputWrapBase;
class OutputWrap : private cppu::BaseMutex, public OutputWrapBase class OutputWrap : private cppu::BaseMutex, public OutputWrapBase

1
sdext/source/pdfimport/tree/imagecontainer.cxx
View File

@@ -30,7 +30,6 @@
#include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/stl_types.hxx> #include <comphelper/stl_types.hxx>
#include <boost/bind.hpp> #include <boost/bind.hpp>

13
sdext/source/presenter/PresenterAccessibility.cxx
View File

@@ -37,9 +37,8 @@
#include <com/sun/star/drawing/framework/ResourceId.hpp> #include <com/sun/star/drawing/framework/ResourceId.hpp>
#include <com/sun/star/drawing/framework/XPane.hpp> #include <com/sun/star/drawing/framework/XPane.hpp>
#include <com/sun/star/drawing/framework/XView.hpp> #include <com/sun/star/drawing/framework/XView.hpp>
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/compbase5.hxx> #include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <boost/bind.hpp> #include <boost/bind.hpp>
using namespace ::com::sun::star; using namespace ::com::sun::star;
@@ -52,7 +51,7 @@ using namespace ::com::sun::star::drawing::framework;
namespace sdext { namespace presenter { namespace sdext { namespace presenter {
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper5 < typedef ::cppu::WeakComponentImplHelper <
css::accessibility::XAccessible, css::accessibility::XAccessible,
css::accessibility::XAccessibleContext, css::accessibility::XAccessibleContext,
css::accessibility::XAccessibleComponent, css::accessibility::XAccessibleComponent,
@@ -226,7 +225,7 @@ protected:
//===== AccessibleStateSet ==================================================== //===== AccessibleStateSet ====================================================
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper1 < typedef ::cppu::WeakComponentImplHelper <
css::accessibility::XAccessibleStateSet css::accessibility::XAccessibleStateSet
> AccessibleStateSetInterfaceBase; > AccessibleStateSetInterfaceBase;
} }
@@ -262,7 +261,7 @@ private:
//===== AccessibleRelationSet ================================================= //===== AccessibleRelationSet =================================================
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper1 < typedef ::cppu::WeakComponentImplHelper <
css::accessibility::XAccessibleRelationSet css::accessibility::XAccessibleRelationSet
> AccessibleRelationSetInterfaceBase; > AccessibleRelationSetInterfaceBase;
} }
@@ -300,7 +299,7 @@ private:
//===== PresenterAccessibleParagraph ========================================== //===== PresenterAccessibleParagraph ==========================================
namespace { namespace {
typedef ::cppu::ImplInheritanceHelper1 < typedef ::cppu::ImplInheritanceHelper <
PresenterAccessible::AccessibleObject, PresenterAccessible::AccessibleObject,
css::accessibility::XAccessibleText css::accessibility::XAccessibleText
> PresenterAccessibleParagraphInterfaceBase; > PresenterAccessibleParagraphInterfaceBase;

4
sdext/source/presenter/PresenterAccessibility.hxx
View File

@@ -34,7 +34,7 @@
#include <com/sun/star/drawing/framework/XPane2.hpp> #include <com/sun/star/drawing/framework/XPane2.hpp>
#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/compbase3.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
@@ -46,7 +46,7 @@ class PresenterController;
class PresenterTextView; class PresenterTextView;
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper3 < typedef ::cppu::WeakComponentImplHelper <
css::accessibility::XAccessible, css::accessibility::XAccessible,
css::lang::XInitialization, css::lang::XInitialization,
css::awt::XFocusListener css::awt::XFocusListener

4
sdext/source/presenter/PresenterButton.hxx
View File

@@ -31,7 +31,7 @@
#include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/rendering/XBitmap.hpp> #include <com/sun/star/rendering/XBitmap.hpp>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase4.hxx> #include <cppuhelper/compbase.hxx>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
@@ -40,7 +40,7 @@ namespace sdext { namespace presenter {
class PresenterController; class PresenterController;
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper4 < typedef ::cppu::WeakComponentImplHelper <
css::awt::XWindowListener, css::awt::XWindowListener,
css::awt::XPaintListener, css::awt::XPaintListener,
css::awt::XMouseListener, css::awt::XMouseListener,

4
sdext/source/presenter/PresenterController.hxx
View File

@@ -24,7 +24,7 @@
#include "PresenterPaneContainer.hxx" #include "PresenterPaneContainer.hxx"
#include "PresenterTheme.hxx" #include "PresenterTheme.hxx"
#include "PresenterSprite.hxx" #include "PresenterSprite.hxx"
#include <cppuhelper/compbase6.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/awt/XFocusListener.hpp> #include <com/sun/star/awt/XFocusListener.hpp>
@@ -58,7 +58,7 @@ class PresenterTheme;
class PresenterWindowManager; class PresenterWindowManager;
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper6 < typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XConfigurationChangeListener, css::drawing::framework::XConfigurationChangeListener,
css::frame::XFrameActionListener, css::frame::XFrameActionListener,
css::awt::XKeyListener, css::awt::XKeyListener,

4
sdext/source/presenter/PresenterCurrentSlideObserver.hxx
View File

@@ -24,7 +24,7 @@
#include <com/sun/star/presentation/XSlideShow.hpp> #include <com/sun/star/presentation/XSlideShow.hpp>
#include <com/sun/star/presentation/XSlideShowController.hpp> #include <com/sun/star/presentation/XSlideShowController.hpp>
#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XController.hpp>
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <salhelper/timer.hxx> #include <salhelper/timer.hxx>
@@ -32,7 +32,7 @@
namespace sdext { namespace presenter { namespace sdext { namespace presenter {
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper1 < typedef ::cppu::WeakComponentImplHelper <
css::presentation::XSlideShowListener css::presentation::XSlideShowListener
> PresenterCurrentSlideObserverInterfaceBase; > PresenterCurrentSlideObserverInterfaceBase;
} }

4
sdext/source/presenter/PresenterFrameworkObserver.hxx
View File

@@ -23,7 +23,7 @@
#include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp> #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
#include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase.hxx>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
@@ -31,7 +31,7 @@
namespace sdext { namespace presenter { namespace sdext { namespace presenter {
typedef ::cppu::WeakComponentImplHelper1 < typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XConfigurationChangeListener css::drawing::framework::XConfigurationChangeListener
> PresenterFrameworkObserverInterfaceBase; > PresenterFrameworkObserverInterfaceBase;

4
sdext/source/presenter/PresenterHelpView.hxx
View File

@@ -22,7 +22,7 @@
#include "PresenterController.hxx" #include "PresenterController.hxx"
#include <cppuhelper/basemutex.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/XPaintListener.hpp>
#include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/awt/XWindowListener.hpp>
#include <com/sun/star/drawing/framework/XView.hpp> #include <com/sun/star/drawing/framework/XView.hpp>
@@ -32,7 +32,7 @@
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
namespace { namespace {
typedef cppu::WeakComponentImplHelper3< typedef cppu::WeakComponentImplHelper<
css::drawing::framework::XView, css::drawing::framework::XView,
css::awt::XWindowListener, css::awt::XWindowListener,
css::awt::XPaintListener css::awt::XPaintListener

4
sdext/source/presenter/PresenterNotesView.hxx
View File

@@ -24,7 +24,7 @@
#include "PresenterToolBar.hxx" #include "PresenterToolBar.hxx"
#include "PresenterViewFactory.hxx" #include "PresenterViewFactory.hxx"
#include <cppuhelper/basemutex.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/ActionEvent.hpp>
#include <com/sun/star/awt/XActionListener.hpp> #include <com/sun/star/awt/XActionListener.hpp>
#include <com/sun/star/awt/XButton.hpp> #include <com/sun/star/awt/XButton.hpp>
@@ -40,7 +40,7 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
namespace { namespace {
typedef cppu::WeakComponentImplHelper5< typedef cppu::WeakComponentImplHelper<
css::awt::XWindowListener, css::awt::XWindowListener,
css::awt::XPaintListener, css::awt::XPaintListener,
css::drawing::framework::XView, css::drawing::framework::XView,

4
sdext/source/presenter/PresenterPaneBase.hxx
View File

@@ -22,7 +22,7 @@
#include "PresenterTheme.hxx" #include "PresenterTheme.hxx"
#include <cppuhelper/basemutex.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/Point.hpp>
#include <com/sun/star/awt/XMouseListener.hpp> #include <com/sun/star/awt/XMouseListener.hpp>
#include <com/sun/star/awt/XMouseMotionListener.hpp> #include <com/sun/star/awt/XMouseMotionListener.hpp>
@@ -44,7 +44,7 @@ namespace sdext { namespace presenter {
class PresenterController; class PresenterController;
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper4 < typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XPane, css::drawing::framework::XPane,
css::lang::XInitialization, css::lang::XInitialization,
css::awt::XWindowListener, css::awt::XWindowListener,

1
sdext/source/presenter/PresenterPaneBorderManager.cxx
View File

@@ -33,7 +33,6 @@
#include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/awt/XWindow2.hpp>
#include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/awt/XWindowPeer.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp>
#include <cppuhelper/compbase1.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
using namespace ::com::sun::star; using namespace ::com::sun::star;

4
sdext/source/presenter/PresenterPaneBorderManager.hxx
View File

@@ -26,7 +26,7 @@
#ifdef ENABLE_PANE_RESIZING #ifdef ENABLE_PANE_RESIZING
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase3.hxx> #include <cppuhelper/compbase.hxx>
#include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/Size.hpp> #include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/awt/XGraphics.hpp> #include <com/sun/star/awt/XGraphics.hpp>
@@ -48,7 +48,7 @@ namespace sdext { namespace presenter {
class PresenterController; class PresenterController;
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper3 < typedef ::cppu::WeakComponentImplHelper <
css::lang::XInitialization, css::lang::XInitialization,
css::awt::XMouseListener, css::awt::XMouseListener,
css::awt::XMouseMotionListener css::awt::XMouseMotionListener

4
sdext/source/presenter/PresenterPaneBorderPainter.hxx
View File

@@ -28,7 +28,7 @@
#include <com/sun/star/util/XMacroExpander.hpp> #include <com/sun/star/util/XMacroExpander.hpp>
#include <com/sun/star/awt/XGraphics.hpp> #include <com/sun/star/awt/XGraphics.hpp>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase.hxx>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
@@ -39,7 +39,7 @@ class PresenterPane;
class PresenterTheme; class PresenterTheme;
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper1< typedef ::cppu::WeakComponentImplHelper<
css::drawing::framework::XPaneBorderPainter css::drawing::framework::XPaneBorderPainter
> PresenterPaneBorderPainterInterfaceBase; > PresenterPaneBorderPainterInterfaceBase;
} }

4
sdext/source/presenter/PresenterPaneContainer.hxx
View File

@@ -31,7 +31,7 @@
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/Color.hpp> #include <com/sun/star/util/Color.hpp>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase.hxx>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
@@ -46,7 +46,7 @@ class PresenterPaneBase;
class PresenterSprite; class PresenterSprite;
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper1 < typedef ::cppu::WeakComponentImplHelper <
css::lang::XEventListener css::lang::XEventListener
> PresenterPaneContainerInterfaceBase; > PresenterPaneContainerInterfaceBase;
} }

4
sdext/source/presenter/PresenterPaneFactory.hxx
View File

@@ -20,7 +20,7 @@
#ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANEFACTORY_HXX #ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANEFACTORY_HXX
#define 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 <cppuhelper/basemutex.hxx>
#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XInitialization.hpp>
@@ -38,7 +38,7 @@ namespace sdext { namespace presenter {
class PresenterController; class PresenterController;
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper1 < typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XResourceFactory css::drawing::framework::XResourceFactory
> PresenterPaneFactoryInterfaceBase; > PresenterPaneFactoryInterfaceBase;
} }

4
sdext/source/presenter/PresenterProtocolHandler.cxx
View File

@@ -35,7 +35,7 @@
#include <com/sun/star/presentation/XSlideShow.hpp> #include <com/sun/star/presentation/XSlideShow.hpp>
#include <com/sun/star/presentation/XSlideShowView.hpp> #include <com/sun/star/presentation/XSlideShowView.hpp>
#include <com/sun/star/presentation/XPresentationSupplier.hpp> #include <com/sun/star/presentation/XPresentationSupplier.hpp>
#include <cppuhelper/compbase2.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>
using namespace ::com::sun::star; using namespace ::com::sun::star;
@@ -165,7 +165,7 @@ namespace {
} // end of anonymous namespace } // end of anonymous namespace
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper2 < typedef ::cppu::WeakComponentImplHelper <
css::frame::XDispatch, css::frame::XDispatch,
css::document::XEventListener css::document::XEventListener
> PresenterDispatchInterfaceBase; > PresenterDispatchInterfaceBase;

3
sdext/source/presenter/PresenterScreen.cxx
View File

@@ -38,6 +38,7 @@
#include <com/sun/star/document/XEventBroadcaster.hpp> #include <com/sun/star/document/XEventBroadcaster.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <cppuhelper/compbase.hxx>
#include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
@@ -51,7 +52,7 @@ using namespace ::com::sun::star::drawing::framework;
namespace sdext { namespace presenter { namespace sdext { namespace presenter {
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper1 < typedef ::cppu::WeakComponentImplHelper <
css::document::XEventListener css::document::XEventListener
> PresenterScreenListenerInterfaceBase; > PresenterScreenListenerInterfaceBase;

6
sdext/source/presenter/PresenterScreen.hxx
View File

@@ -22,7 +22,7 @@
#include "PresenterConfigurationAccess.hxx" #include "PresenterConfigurationAccess.hxx"
#include "PresenterPaneContainer.hxx" #include "PresenterPaneContainer.hxx"
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XController.hpp>
@@ -41,10 +41,10 @@ namespace sdext { namespace presenter {
class PresenterController; class PresenterController;
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper1 < typedef ::cppu::WeakComponentImplHelper <
css::task::XJob css::task::XJob
> PresenterScreenJobInterfaceBase; > PresenterScreenJobInterfaceBase;
typedef ::cppu::WeakComponentImplHelper1 < typedef ::cppu::WeakComponentImplHelper <
css::lang::XEventListener css::lang::XEventListener
> PresenterScreenInterfaceBase; > PresenterScreenInterfaceBase;
} }

4
sdext/source/presenter/PresenterScrollBar.hxx
View File

@@ -27,7 +27,7 @@
#include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase4.hxx> #include <cppuhelper/compbase.hxx>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
@@ -41,7 +41,7 @@ class PresenterCanvasHelper;
class PresenterPaintManager; class PresenterPaintManager;
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper4 < typedef ::cppu::WeakComponentImplHelper <
css::awt::XWindowListener, css::awt::XWindowListener,
css::awt::XPaintListener, css::awt::XPaintListener,
css::awt::XMouseListener, css::awt::XMouseListener,

4
sdext/source/presenter/PresenterSlidePreview.hxx
View File

@@ -35,13 +35,13 @@
#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase4.hxx> #include <cppuhelper/compbase.hxx>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
namespace sdext { namespace presenter { namespace sdext { namespace presenter {
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper4 < typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XView, css::drawing::framework::XView,
css::drawing::XDrawView, css::drawing::XDrawView,
css::awt::XPaintListener, css::awt::XPaintListener,

4
sdext/source/presenter/PresenterSlideShowView.hxx
View File

@@ -36,7 +36,7 @@
#include <com/sun/star/rendering/XPolyPolygon2D.hpp> #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/Color.hpp> #include <com/sun/star/util/Color.hpp>
#include <cppuhelper/compbase7.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
@@ -44,7 +44,7 @@
namespace sdext { namespace presenter { namespace sdext { namespace presenter {
namespace { namespace {
typedef cppu::WeakComponentImplHelper7< typedef cppu::WeakComponentImplHelper<
css::presentation::XSlideShowView, css::presentation::XSlideShowView,
css::awt::XPaintListener, css::awt::XPaintListener,
css::awt::XMouseListener, css::awt::XMouseListener,

4
sdext/source/presenter/PresenterSlideSorter.hxx
View File

@@ -24,7 +24,7 @@
#include "PresenterPaneContainer.hxx" #include "PresenterPaneContainer.hxx"
#include "PresenterViewFactory.hxx" #include "PresenterViewFactory.hxx"
#include <cppuhelper/basemutex.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/XPaintListener.hpp>
#include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/awt/XWindowListener.hpp>
#include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp>
@@ -39,7 +39,7 @@
#include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <com/sun/star/rendering/XSpriteCanvas.hpp>
namespace { namespace {
typedef cppu::WeakComponentImplHelper8< typedef cppu::WeakComponentImplHelper<
css::drawing::framework::XView, css::drawing::framework::XView,
css::awt::XWindowListener, css::awt::XWindowListener,
css::awt::XPaintListener, css::awt::XPaintListener,

1
sdext/source/presenter/PresenterSpritePane.hxx
View File

@@ -35,7 +35,6 @@
#include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase1.hxx>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>

1
sdext/source/presenter/PresenterTextView.hxx
View File

@@ -31,7 +31,6 @@
#include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/XText.hpp>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <functional> #include <functional>

4
sdext/source/presenter/PresenterTimer.hxx
View File

@@ -23,7 +23,7 @@
#include <com/sun/star/awt/XCallback.hpp> #include <com/sun/star/awt/XCallback.hpp>
#include <com/sun/star/awt/XRequestCallback.hpp> #include <com/sun/star/awt/XRequestCallback.hpp>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <osl/time.h> #include <osl/time.h>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
@@ -65,7 +65,7 @@ public:
static void CancelTask (const sal_Int32 nTaskId); static void CancelTask (const sal_Int32 nTaskId);
}; };
typedef cppu::WeakComponentImplHelper1< typedef cppu::WeakComponentImplHelper<
css::awt::XCallback css::awt::XCallback
> PresenterClockTimerInterfaceBase; > PresenterClockTimerInterfaceBase;

4
sdext/source/presenter/PresenterToolBar.cxx
View File

@@ -30,7 +30,7 @@
#include "PresenterTimer.hxx" #include "PresenterTimer.hxx"
#include "PresenterWindowManager.hxx" #include "PresenterWindowManager.hxx"
#include <cppuhelper/compbase2.hxx> #include <cppuhelper/compbase.hxx>
#include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/PosSize.hpp>
#include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/awt/XWindowPeer.hpp>
@@ -121,7 +121,7 @@ public:
//===== PresenterToolBar::Element ============================================= //===== PresenterToolBar::Element =============================================
namespace { namespace {
typedef cppu::WeakComponentImplHelper2< typedef cppu::WeakComponentImplHelper<
css::document::XEventListener, css::document::XEventListener,
css::frame::XStatusListener css::frame::XStatusListener
> ElementInterfaceBase; > ElementInterfaceBase;

7
sdext/source/presenter/PresenterToolBar.hxx
View File

@@ -24,8 +24,7 @@
#include "PresenterViewFactory.hxx" #include "PresenterViewFactory.hxx"
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase3.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/compbase5.hxx>
#include <com/sun/star/awt/ActionEvent.hpp> #include <com/sun/star/awt/ActionEvent.hpp>
#include <com/sun/star/awt/XActionListener.hpp> #include <com/sun/star/awt/XActionListener.hpp>
#include <com/sun/star/awt/XButton.hpp> #include <com/sun/star/awt/XButton.hpp>
@@ -49,7 +48,7 @@
#include <functional> #include <functional>
namespace { namespace {
typedef cppu::WeakComponentImplHelper5< typedef cppu::WeakComponentImplHelper<
css::awt::XWindowListener, css::awt::XWindowListener,
css::awt::XPaintListener, css::awt::XPaintListener,
css::awt::XMouseListener, css::awt::XMouseListener,
@@ -57,7 +56,7 @@ namespace {
css::drawing::XDrawView css::drawing::XDrawView
> PresenterToolBarInterfaceBase; > PresenterToolBarInterfaceBase;
typedef cppu::WeakComponentImplHelper3< typedef cppu::WeakComponentImplHelper<
css::awt::XPaintListener, css::awt::XPaintListener,
css::drawing::framework::XView, css::drawing::framework::XView,
css::drawing::XDrawView css::drawing::XDrawView

1
sdext/source/presenter/PresenterViewFactory.cxx
View File

@@ -35,7 +35,6 @@
#include <com/sun/star/drawing/XSlideSorterBase.hpp> #include <com/sun/star/drawing/XSlideSorterBase.hpp>
#include <com/sun/star/presentation/XSlideShow.hpp> #include <com/sun/star/presentation/XSlideShow.hpp>
#include <com/sun/star/presentation/XSlideShowView.hpp> #include <com/sun/star/presentation/XSlideShowView.hpp>
#include <cppuhelper/compbase1.hxx>
#include <boost/bind.hpp> #include <boost/bind.hpp>
using namespace ::com::sun::star; using namespace ::com::sun::star;

4
sdext/source/presenter/PresenterViewFactory.hxx
View File

@@ -21,7 +21,7 @@
#define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERVIEWFACTORY_HXX #define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERVIEWFACTORY_HXX
#include "PresenterController.hxx" #include "PresenterController.hxx"
#include <cppuhelper/compbase1.hxx> #include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp>
@@ -35,7 +35,7 @@
namespace sdext { namespace presenter { namespace sdext { namespace presenter {
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper1 < typedef ::cppu::WeakComponentImplHelper <
css::drawing::framework::XResourceFactory css::drawing::framework::XResourceFactory
> PresenterViewFactoryInterfaceBase; > PresenterViewFactoryInterfaceBase;
} }

4
sdext/source/presenter/PresenterWindowManager.hxx
View File

@@ -37,7 +37,7 @@
#include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <com/sun/star/rendering/XSpriteCanvas.hpp>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase4.hxx> #include <cppuhelper/compbase.hxx>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
@@ -49,7 +49,7 @@ class PresenterPaneBorderPainter;
class PresenterTheme; class PresenterTheme;
namespace { namespace {
typedef ::cppu::WeakComponentImplHelper4< typedef ::cppu::WeakComponentImplHelper<
css::awt::XWindowListener, css::awt::XWindowListener,
css::awt::XPaintListener, css::awt::XPaintListener,
css::awt::XMouseListener, css::awt::XMouseListener,