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

comphelper::OBaseMutex -> cppu::BaseMutex

Browse Source 
convert usage of deprecated class, and remove the old class

Change-Id: I19fb9271090d19e5531622b58492e1a848d306e2
Reviewed-on: https://gerrit.libreoffice.org/26843
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin 2016-07-01 09:46:23 +02:00 committed by Noel Grandin
parent 70bfe5f71c
commit cd71034b26
114 changed files with 215 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
View File

@ -28,7 +28,7 @@
#include <tools/gen.hxx>
#include <vcl/svapp.hxx>
#include <cppuhelper/compbase5.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <toolkit/helper/convert.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@ -69,7 +69,7 @@ typedef ::cppu::WeakAggComponentImplHelper5<
implements basic functionality for various Accessibility interfaces and
the event broadcaster and contains the osl::Mutex. */
class AccessibleBrowseBoxBase :
public ::comphelper::OBaseMutex,
public ::cppu::BaseMutex,
public AccessibleBrowseBoxImplHelper
{
public:
@ -286,7 +286,7 @@ protected:
void ensureIsAlive() const
throw ( css::lang::DisposedException );
/** @return The osl::Mutex member provided by the class OBaseMutex. */
/** @return The osl::Mutex member provided by the class BaseMutex. */
inline ::osl::Mutex& getOslMutex();
/** Changes the name of the object (flat assignment, no notify).

4
accessibility/inc/extended/AccessibleGridControlBase.hxx
View File

@ -26,7 +26,7 @@
#include <tools/gen.hxx>
#include <vcl/svapp.hxx>
#include <cppuhelper/compbase4.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <toolkit/helper/convert.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@ -62,7 +62,7 @@ typedef ::cppu::WeakAggComponentImplHelper4<
implements basic functionality for various Accessibility interfaces and
the event broadcaster and contains the osl::Mutex. */
class AccessibleGridControlBase :
public ::comphelper::OBaseMutex,
public ::cppu::BaseMutex,
public AccessibleGridControlImplHelper
{
public:

2
accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
View File

@ -96,7 +96,7 @@ namespace accessibility
// XAccessible providing an EditBrowseBoxTableCell
class EditBrowseBoxTableCellAccess:
public comphelper::OBaseMutex,
public cppu::BaseMutex,
public cppu::WeakComponentImplHelper<css::accessibility::XAccessible>
{
protected:

4
accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
View File

@ -32,7 +32,7 @@
#include <com/sun/star/lang/XEventListener.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/compbase8.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/accessibletexthelper.hxx>
#include <tools/gen.hxx>
#include <vcl/vclptr.hxx>
@ -57,7 +57,7 @@ namespace accessibility
, css::lang::XEventListener > AccessibleIconChoiceCtrlEntry_BASE;
/** the class AccessibleListBoxEntry represents the class for an accessible object of a listbox entry */
class AccessibleIconChoiceCtrlEntry : public ::comphelper::OBaseMutex,
class AccessibleIconChoiceCtrlEntry : public ::cppu::BaseMutex,
public AccessibleIconChoiceCtrlEntry_BASE,
public ::comphelper::OCommonAccessibleText
{

4
accessibility/inc/extended/accessiblelistboxentry.hxx
View File

@ -33,7 +33,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
#include <cppuhelper/compbase9.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/accessibletexthelper.hxx>
#include <svtools/treelistentry.hxx>
#include <tools/gen.hxx>
@ -68,7 +68,7 @@ namespace accessibility
, css::lang::XServiceInfo > AccessibleListBoxEntry_BASE;
/** the class AccessibleListBoxEntry represents the class for an accessible object of a listbox entry */
class AccessibleListBoxEntry:public ::comphelper::OBaseMutex
class AccessibleListBoxEntry:public ::cppu::BaseMutex
,public AccessibleListBoxEntry_BASE
,public ::comphelper::OCommonAccessibleText
,public ListBoxAccessibleBase

4
accessibility/inc/standard/vclxaccessiblelistitem.hxx
View File

@ -28,7 +28,7 @@
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/compbase6.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/accessibletexthelper.hxx>
// forward ---------------------------------------------------------------
@ -56,7 +56,7 @@ typedef ::cppu::WeakAggComponentImplHelper6< css::accessibility::XAccessible
/** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry
*/
class VCLXAccessibleListItem : public ::comphelper::OBaseMutex,
class VCLXAccessibleListItem : public ::cppu::BaseMutex,
public ::comphelper::OCommonAccessibleText,
public VCLXAccessibleListItem_BASE
{

4
canvas/source/cairo/cairo_canvasfont.hxx
View File

@ -21,7 +21,7 @@
#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_CANVASFONT_HXX
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/geometry/Matrix2D.hpp>
@ -43,7 +43,7 @@ namespace cairocanvas
typedef ::cppu::WeakComponentImplHelper< css::rendering::XCanvasFont,
css::lang::XServiceInfo > CanvasFont_Base;
class CanvasFont : public ::comphelper::OBaseMutex,
class CanvasFont : public ::cppu::BaseMutex,
public CanvasFont_Base
{
public:

4
canvas/source/cairo/cairo_textlayout.hxx
View File

@ -21,7 +21,7 @@
#define INCLUDED_CANVAS_SOURCE_CAIRO_CAIRO_TEXTLAYOUT_HXX
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/rendering/XTextLayout.hpp>
@ -41,7 +41,7 @@ namespace cairocanvas
typedef ::cppu::WeakComponentImplHelper< css::rendering::XTextLayout,
css::lang::XServiceInfo > TextLayout_Base;
class TextLayout : public ::comphelper::OBaseMutex,
class TextLayout : public ::cppu::BaseMutex,
public TextLayout_Base
{
public:

4
canvas/source/directx/dx_canvasfont.hxx
View File

@ -21,7 +21,7 @@
#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_CANVASFONT_HXX
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/rendering/XCanvas.hpp>
@ -45,7 +45,7 @@ namespace dxcanvas
typedef ::cppu::WeakComponentImplHelper< css::rendering::XCanvasFont,
css::lang::XServiceInfo > CanvasFont_Base;
class CanvasFont : public ::comphelper::OBaseMutex,
class CanvasFont : public ::cppu::BaseMutex,
public CanvasFont_Base
{
public:

4
canvas/source/directx/dx_textlayout.hxx
View File

@ -21,7 +21,7 @@
#define INCLUDED_CANVAS_SOURCE_DIRECTX_DX_TEXTLAYOUT_HXX
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@ -41,7 +41,7 @@ namespace dxcanvas
typedef ::cppu::WeakComponentImplHelper< css::rendering::XTextLayout,
css::lang::XServiceInfo > TextLayout_Base;
class TextLayout : public ::comphelper::OBaseMutex,
class TextLayout : public ::cppu::BaseMutex,
public TextLayout_Base
{
public:

4
canvas/source/opengl/ogl_canvasfont.hxx
View File

@ -11,7 +11,7 @@
#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_CANVASFONT_HXX
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/rendering/XCanvas.hpp>
#include <com/sun/star/rendering/XCanvasFont.hpp>
@ -27,7 +27,7 @@ namespace oglcanvas
typedef ::cppu::WeakComponentImplHelper< css::rendering::XCanvasFont > CanvasFontBaseT;
class CanvasFont : public ::comphelper::OBaseMutex,
class CanvasFont : public ::cppu::BaseMutex,
public CanvasFontBaseT
{
public:

4
canvas/source/opengl/ogl_textlayout.hxx
View File

@ -11,7 +11,7 @@
#define INCLUDED_CANVAS_SOURCE_OPENGL_OGL_TEXTLAYOUT_HXX
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/rendering/XTextLayout.hpp>
@ -26,7 +26,7 @@ namespace oglcanvas
{
typedef ::cppu::WeakComponentImplHelper< css::rendering::XTextLayout > TextLayoutBaseT;
class TextLayout : public ::comphelper::OBaseMutex,
class TextLayout : public ::cppu::BaseMutex,
public TextLayoutBaseT
{
public:

4
canvas/source/vcl/canvasfont.hxx
View File

@ -21,7 +21,7 @@
#define INCLUDED_CANVAS_SOURCE_VCL_CANVASFONT_HXX
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/geometry/Matrix2D.hpp>
@ -44,7 +44,7 @@ namespace vclcanvas
typedef ::cppu::WeakComponentImplHelper< css::rendering::XCanvasFont,
css::lang::XServiceInfo > CanvasFont_Base;
class CanvasFont : public ::comphelper::OBaseMutex,
class CanvasFont : public ::cppu::BaseMutex,
public CanvasFont_Base
{
public:

4
canvas/source/vcl/textlayout.hxx
View File

@ -21,7 +21,7 @@
#define INCLUDED_CANVAS_SOURCE_VCL_TEXTLAYOUT_HXX
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/rendering/StringContext.hpp>
@ -40,7 +40,7 @@ namespace vclcanvas
typedef ::cppu::WeakComponentImplHelper< css::rendering::XTextLayout,
css::lang::XServiceInfo > TextLayout_Base;
class TextLayout : public ::comphelper::OBaseMutex,
class TextLayout : public ::cppu::BaseMutex,
public TextLayout_Base
{
public:

4
connectivity/source/cpool/ZConnectionWrapper.hxx
View File

@ -21,8 +21,8 @@
#define INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZCONNECTIONWRAPPER_HXX
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/ConnectionWrapper.hxx>
@ -35,7 +35,7 @@ namespace connectivity
typedef ::cppu::WeakComponentImplHelper< css::sdbc::XConnection > OConnectionWeakWrapper_BASE;
class OConnectionWeakWrapper : public ::comphelper::OBaseMutex
class OConnectionWeakWrapper : public ::cppu::BaseMutex
, public OConnectionWeakWrapper_BASE
, public OConnectionWrapper
{

4
connectivity/source/cpool/ZPooledConnection.hxx
View File

@ -20,9 +20,9 @@
#define INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZPOOLEDCONNECTION_HXX
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/sdbc/XPooledConnection.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <com/sun/star/reflection/XProxyFactory.hpp>
@ -35,7 +35,7 @@ namespace connectivity
typedef ::cppu::WeakComponentImplHelper< css::sdbc::XPooledConnection
,css::lang::XEventListener> OPooledConnection_Base;
class OPooledConnection : public ::comphelper::OBaseMutex
class OPooledConnection : public ::cppu::BaseMutex
,public OPooledConnection_Base
{
css::uno::Reference< css::sdbc::XConnection > m_xRealConnection; // the connection fom driver

2
connectivity/source/drivers/evoab2/NResultSet.hxx
View File

@ -74,7 +74,7 @@ namespace connectivity
> OResultSet_BASE;
class OEvoabResultSet :public comphelper::OBaseMutex
class OEvoabResultSet :public cppu::BaseMutex
,public OResultSet_BASE
,public ::comphelper::OPropertyContainer
,public ::comphelper::OPropertyArrayUsageHelper<OEvoabResultSet>

4
connectivity/source/drivers/evoab2/NStatement.hxx
View File

@ -27,10 +27,10 @@
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <comphelper/proparrhlp.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <connectivity/sqliterator.hxx>
#include <connectivity/sqlparse.hxx>
#include <connectivity/FValue.hxx>
@ -137,7 +137,7 @@ namespace connectivity
class OCommonStatement;
typedef OSubComponent< OCommonStatement, OCommonStatement_IBase > OStatement_CBase;
class OCommonStatement :public comphelper::OBaseMutex
class OCommonStatement :public cppu::BaseMutex
,public OCommonStatement_IBase
,public ::comphelper::OPropertyContainer
,public ::comphelper::OPropertyArrayUsageHelper< OCommonStatement >

4
connectivity/source/drivers/kab/KConnection.hxx
View File

@ -28,7 +28,7 @@
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
#include <shell/kde_headers.h>
@ -54,7 +54,7 @@ namespace connectivity
typedef OMetaConnection_BASE KabConnection_BASE; // implements basics and text encoding
typedef std::vector< css::uno::WeakReferenceHelper > OWeakRefArray;
class KabConnection : public comphelper::OBaseMutex,
class KabConnection : public cppu::BaseMutex,
public KabConnection_BASE,
public OSubComponent<KabConnection, KabConnection_BASE>
{

2
connectivity/source/drivers/kab/KResultSet.hxx
View File

@ -52,7 +52,7 @@ namespace connectivity
css::sdbc::XColumnLocate,
css::lang::XServiceInfo> KabResultSet_BASE;
class KabResultSet : public comphelper::OBaseMutex,
class KabResultSet : public cppu::BaseMutex,
public KabResultSet_BASE,
public ::cppu::OPropertySetHelper,
public comphelper::OPropertyArrayUsageHelper<KabResultSet>

2
connectivity/source/drivers/kab/KStatement.hxx
View File

@ -43,7 +43,7 @@ namespace connectivity
// Class KabCommonStatement
// is a base class for the normal statement and for the prepared statement
class KabCommonStatement : public comphelper::OBaseMutex,
class KabCommonStatement : public cppu::BaseMutex,
public KabCommonStatement_BASE,
public ::cppu::OPropertySetHelper,
public comphelper::OPropertyArrayUsageHelper<KabCommonStatement>

3
connectivity/source/drivers/macab/MacabResultSet.hxx
View File

@ -30,6 +30,7 @@
#include <com/sun/star/sdbcx/XRowLocate.hpp>
#include <com/sun/star/sdbcx/XDeleteRows.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
namespace connectivity
{
@ -52,7 +53,7 @@ namespace connectivity
css::lang::XServiceInfo> MacabResultSet_BASE;
class MacabRecords;
class MacabResultSet : public comphelper::OBaseMutex,
class MacabResultSet : public cppu::BaseMutex,
public MacabResultSet_BASE,
public ::cppu::OPropertySetHelper,
public comphelper::OPropertyArrayUsageHelper<MacabResultSet>

3
connectivity/source/drivers/macab/MacabStatement.hxx
View File

@ -29,6 +29,7 @@
#include <com/sun/star/util/XCancellable.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/proparrhlp.hxx>
namespace connectivity
@ -44,7 +45,7 @@ namespace connectivity
// Class MacabCommonStatement
// is a base class for the normal statement and for the prepared statement
class MacabCommonStatement : public comphelper::OBaseMutex,
class MacabCommonStatement : public cppu::BaseMutex,
public MacabCommonStatement_BASE,
public ::cppu::OPropertySetHelper,
public comphelper::OPropertyArrayUsageHelper<MacabCommonStatement>

2
connectivity/source/drivers/mork/MResultSet.hxx
View File

@ -67,7 +67,7 @@ namespace connectivity
typedef ::std::allocator< TVoidPtr > TVoidAlloc;
typedef ::std::vector<TVoidPtr> TVoidVector;
class OResultSet : public comphelper::OBaseMutex,
class OResultSet : public cppu::BaseMutex,
public OResultSet_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OResultSet>

2
connectivity/source/drivers/mork/MStatement.hxx
View File

@ -45,7 +45,7 @@ namespace connectivity
class OCommonStatement;
typedef ::connectivity::OSubComponent< OCommonStatement, OCommonStatement_IBASE > OCommonStatement_SBASE;
class OCommonStatement :public comphelper::OBaseMutex
class OCommonStatement :public cppu::BaseMutex
,public OCommonStatement_IBASE
,public ::cppu::OPropertySetHelper
,public ::comphelper::OPropertyArrayUsageHelper< OCommonStatement >

4
connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
View File

@ -36,12 +36,12 @@
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <com/sun/star/sdbc/XRowUpdate.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/proparrhlp.hxx>
#include <connectivity/CommonTools.hxx>
#include <comphelper/propertycontainer.hxx>
#include <connectivity/FValue.hxx>
#include <connectivity/dbtoolsdllapi.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <salhelper/simplereferenceobject.hxx>
namespace connectivity
@ -60,7 +60,7 @@ namespace connectivity
// typedef ORefVector<ORow> ORows;
class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSet :
public comphelper::OBaseMutex,
public cppu::BaseMutex,
public ODatabaseMetaDataResultSet_BASE,
public ::comphelper::OPropertyContainer,
public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>

4
connectivity/source/inc/TDatabaseMetaDataBase.hxx
View File

@ -22,7 +22,7 @@
#include <com/sun/star/sdbc/XDatabaseMetaData2.hpp>
#include <cppuhelper/implbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XEventListener.hpp>
#include "FDatabaseMetaDataResultSet.hxx"
#include <functional>
@ -31,7 +31,7 @@
namespace connectivity
{
class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataBase :
public comphelper::OBaseMutex,
public cppu::BaseMutex,
public ::cppu::WeakImplHelper< css::sdbc::XDatabaseMetaData2,
css::lang::XEventListener>
{

4
connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
View File

@ -30,9 +30,9 @@
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <com/sun/star/sdbc/XRowUpdate.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/proparrhlp.hxx>
#include "ado/AStatement.hxx"
#include <comphelper/broadcasthelper.hxx>
#include <connectivity/StdTypeDefs.hxx>
namespace connectivity
@ -50,7 +50,7 @@ namespace connectivity
css::sdbc::XCloseable,
css::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE;
class ODatabaseMetaDataResultSet : public comphelper::OBaseMutex,
class ODatabaseMetaDataResultSet : public cppu::BaseMutex,
public ODatabaseMetaDataResultSet_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>

4
connectivity/source/inc/ado/AResultSet.hxx
View File

@ -34,7 +34,7 @@
#include <cppuhelper/compbase.hxx>
#include <comphelper/proparrhlp.hxx>
#include "ado/AStatement.hxx"
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
namespace connectivity
@ -57,7 +57,7 @@ namespace connectivity
css::sdbcx::XDeleteRows,
css::lang::XServiceInfo> OResultSet_BASE;
class OResultSet : public comphelper::OBaseMutex,
class OResultSet : public cppu::BaseMutex,
public OResultSet_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OResultSet>

4
connectivity/source/inc/ado/AStatement.hxx
View File

@ -28,9 +28,9 @@
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <com/sun/star/util/XCancellable.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/uno3.hxx>
#include <comphelper/broadcasthelper.hxx>
#include "ado/AConnection.hxx"
#include <list>
#include "ado/Awrapado.hxx"
@ -49,7 +49,7 @@ namespace connectivity
//************ Class: java.sql.Statement
class OStatement_Base : public comphelper::OBaseMutex,
class OStatement_Base : public cppu::BaseMutex,
public OStatement_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>,

4
connectivity/source/inc/file/FResultSet.hxx
View File

@ -30,6 +30,7 @@
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <com/sun/star/sdbc/XRowUpdate.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/proparrhlp.hxx>
#include "file/FStatement.hxx"
#include <connectivity/CommonTools.hxx>
@ -37,7 +38,6 @@
#include "file/fanalyzer.hxx"
#include "file/FTable.hxx"
#include "file/filedllapi.hxx"
#include <comphelper/broadcasthelper.hxx>
#include <connectivity/StdTypeDefs.hxx>
#include "TSortIndex.hxx"
#include "TSkipDeletedSet.hxx"
@ -61,7 +61,7 @@ namespace connectivity
css::lang::XUnoTunnel> OResultSet_BASE;
class OOO_DLLPUBLIC_FILE OResultSet :
public comphelper::OBaseMutex,
public cppu::BaseMutex,
public ::connectivity::IResultSetHelper,
public OResultSet_BASE,
public ::comphelper::OPropertyContainer,

4
connectivity/source/inc/file/FStatement.hxx
View File

@ -30,6 +30,7 @@
#include <comphelper/proparrhlp.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
#include "file/FConnection.hxx"
@ -38,7 +39,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/propertycontainer.hxx>
#include "file/fanalyzer.hxx"
#include <comphelper/broadcasthelper.hxx>
#include "TSortIndex.hxx"
namespace connectivity
@ -55,7 +55,7 @@ namespace connectivity
//************ Class: java.sql.Statement
class OOO_DLLPUBLIC_FILE OStatement_Base :
public comphelper::OBaseMutex,
public cppu::BaseMutex,
public OStatement_BASE,
public ::comphelper::OPropertyContainer,
public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>

3
connectivity/source/inc/hsqldb/HConnection.hxx
View File

@ -26,6 +26,7 @@
#include <com/sun/star/sdb/application/XTableUIProvider.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
#include <comphelper/interfacecontainer2.hxx>
@ -51,7 +52,7 @@ namespace connectivity
, css::sdb::application::XTableUIProvider
> OHsqlConnection_BASE;
class OHsqlConnection :public ::comphelper::OBaseMutex
class OHsqlConnection :public cppu::BaseMutex
,public OHsqlConnection_BASE
,public OConnectionWrapper
,public IMethodGuardAccess

4
connectivity/source/inc/hsqldb/HDriver.hxx
View File

@ -27,8 +27,8 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <connectivity/CommonTools.hxx>
@ -57,7 +57,7 @@ namespace connectivity
/** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer.
*/
class ODriverDelegator : public ::comphelper::OBaseMutex
class ODriverDelegator : public ::cppu::BaseMutex
,public ODriverDelegator_BASE
{
TWeakPairVector m_aConnections; // vector containing a list

4
connectivity/source/inc/java/sql/JStatement.hxx
View File

@ -29,11 +29,11 @@
#include <com/sun/star/sdbc/XGeneratedResultSet.hpp>
#include <comphelper/proparrhlp.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
#include <connectivity/OSubComponent.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <java/sql/Connection.hxx>
#include "java/sql/ConnectionLog.hxx"
@ -50,7 +50,7 @@ namespace connectivity
//************ Class: java.sql.Statement
class java_sql_Statement_Base : public comphelper::OBaseMutex,
class java_sql_Statement_Base : public cppu::BaseMutex,
public java_sql_Statement_BASE,
public java_lang_Object,
public ::cppu::OPropertySetHelper,

2
connectivity/source/inc/java/sql/ResultSet.hxx
View File

@ -54,7 +54,7 @@ namespace connectivity
css::lang::XServiceInfo> java_sql_ResultSet_BASE;
class java_sql_Connection;
class java_sql_ResultSet : public comphelper::OBaseMutex,
class java_sql_ResultSet : public cppu::BaseMutex,
public java_sql_ResultSet_BASE,
public java_lang_Object,
public ::cppu::OPropertySetHelper,

4
connectivity/source/inc/mysql/YDriver.hxx
View File

@ -29,8 +29,8 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <connectivity/CommonTools.hxx>
@ -57,7 +57,7 @@ namespace connectivity
/** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer.
*/
class ODriverDelegator : public ::comphelper::OBaseMutex
class ODriverDelegator : public ::cppu::BaseMutex
,public ODriverDelegator_BASE
{
TJDBCDrivers m_aJdbcDrivers; // all jdbc drivers

4
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
View File

@ -33,11 +33,11 @@
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <com/sun/star/sdbc/XRowUpdate.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/proparrhlp.hxx>
#include "odbc/OStatement.hxx"
#include "odbc/ODatabaseMetaData.hxx"
#include "odbc/odbcbasedllapi.hxx"
#include <comphelper/broadcasthelper.hxx>
#include <connectivity/StdTypeDefs.hxx>
namespace connectivity
@ -56,7 +56,7 @@ namespace connectivity
css::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE;
class OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaDataResultSet :
public comphelper::OBaseMutex,
public cppu::BaseMutex,
public ODatabaseMetaDataResultSet_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet>

2
connectivity/source/inc/odbc/OResultSet.hxx
View File

@ -105,7 +105,7 @@ namespace connectivity
typedef ::std::map< css::uno::Sequence<sal_Int8>, sal_Int32,TBookmarkPosMapCompare > TBookmarkPosMap;
class OOO_DLLPUBLIC_ODBCBASE OResultSet :
public comphelper::OBaseMutex,
public cppu::BaseMutex,
public ::connectivity::IResultSetHelper,
public OResultSet_BASE,
public ::cppu::OPropertySetHelper,

4
connectivity/source/inc/odbc/OStatement.hxx
View File

@ -30,6 +30,7 @@
#include <com/sun/star/util/XCancellable.hpp>
#include <comphelper/proparrhlp.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/CommonTools.hxx>
#include "odbc/OFunctions.hxx"
@ -37,7 +38,6 @@
#include "odbc/odbcbasedllapi.hxx"
#include <list>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/broadcasthelper.hxx>
namespace connectivity
{
@ -56,7 +56,7 @@ namespace connectivity
//************ Class: java.sql.Statement
class OOO_DLLPUBLIC_ODBCBASE OStatement_Base :
public comphelper::OBaseMutex,
public cppu::BaseMutex,
public OStatement_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base>

2
connectivity/workben/skeleton/SResultSet.hxx
View File

@ -62,7 +62,7 @@ namespace connectivity
typedef ::std::allocator< TVoidPtr > TVoidAlloc;
typedef ::std::vector<TVoidPtr> TVoidVector;
class OResultSet : public comphelper::OBaseMutex,
class OResultSet : public cppu::BaseMutex,
public OResultSet_BASE,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper<OResultSet>

4
cui/source/dialogs/colorpicker.cxx
View File

@ -27,7 +27,7 @@
#include <com/sun/star/awt/XWindow.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
@ -1403,7 +1403,7 @@ void ColorPickerDialog::setColorComponent( sal_uInt16 nComp, double dValue )
typedef ::cppu::WeakComponentImplHelper< XServiceInfo, XExecutableDialog, XInitialization, XPropertyAccess > ColorPickerBase;
class ColorPicker : protected ::comphelper::OBaseMutex, // Struct for right initialization of mutex member! Must be first of baseclasses.
class ColorPicker : protected ::cppu::BaseMutex, // Struct for right initialization of mutex member! Must be first of baseclasses.
public ColorPickerBase
{
public:

5
dbaccess/source/core/api/RowSet.hxx
View File

@ -42,6 +42,7 @@
#include <com/sun/star/sdb/XRowsChangeBroadcaster.hpp>
#include <cppuhelper/compbase12.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <connectivity/paramwrapper.hxx>
#include <connectivity/FValue.hxx>
@ -64,7 +65,7 @@ namespace dbaccess
> ORowSet_BASE1;
class OTableContainer;
class ORowSet : public comphelper::OBaseMutex
class ORowSet : public cppu::BaseMutex
, public ORowSet_BASE1
, public ORowSetBase
, public ::comphelper::OPropertyArrayUsageHelper<ORowSet>
@ -444,7 +445,7 @@ namespace dbaccess
// ORowSetClone
class ORowSetClone : public comphelper::OBaseMutex
class ORowSetClone : public cppu::BaseMutex
,public OSubComponent
,public ORowSetBase
,public ::comphelper::OPropertyArrayUsageHelper < ORowSetClone >

4
dbaccess/source/core/api/resultset.hxx
View File

@ -40,7 +40,7 @@
#include <comphelper/proparrhlp.hxx>
#include <osl/diagnose.h>
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
namespace dbaccess
{
@ -58,7 +58,7 @@ namespace dbaccess
// OResultSet
class OResultSet : public comphelper::OBaseMutex,
class OResultSet : public cppu::BaseMutex,
public OResultSetBase,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper < OResultSet >

3
dbaccess/source/core/dataaccess/SharedConnection.hxx
View File

@ -23,6 +23,7 @@
#include <cppuhelper/component.hxx>
#include <connectivity/CommonTools.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
#include <com/sun/star/sdbc/SQLWarning.hpp>
@ -44,7 +45,7 @@ namespace dbaccess
> OSharedConnection_BASE;
typedef ::connectivity::OConnectionWrapper OSharedConnection_BASE2;
class OSharedConnection : public ::comphelper::OBaseMutex
class OSharedConnection : public ::cppu::BaseMutex
, public OSharedConnection_BASE
, public OSharedConnection_BASE2
{

2
dbaccess/source/core/dataaccess/connection.hxx
View File

@ -68,7 +68,7 @@ typedef cppu::ImplHelper13 < css::container::XChild
class ODatabaseSource;
// OConnection
class OConnection :public ::comphelper::OBaseMutex
class OConnection :public ::cppu::BaseMutex
,public OSubComponent
,public ::connectivity::OConnectionWrapper
,public OConnection_Base

2
dbaccess/source/core/dataaccess/documentdefinition.cxx
View File

@ -159,7 +159,7 @@ namespace dbaccess
// OEmbedObjectHolder
typedef ::cppu::WeakComponentImplHelper< embed::XStateChangeListener > TEmbedObjectHolder;
class OEmbedObjectHolder : public ::comphelper::OBaseMutex
class OEmbedObjectHolder : public ::cppu::BaseMutex
,public TEmbedObjectHolder
{
Reference< XEmbeddedObject > m_xBroadCaster;

4
dbaccess/source/core/inc/ContainerMediator.hxx
View File

@ -24,7 +24,7 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
@ -35,7 +35,7 @@ namespace dbaccess
class OPropertyForward;
class OContainerMediator : public ::comphelper::OBaseMutex
class OContainerMediator : public ::cppu::BaseMutex
,public ::cppu::WeakImplHelper< css::container::XContainerListener >
{
private:

4
dbaccess/source/core/inc/ContentHelper.hxx
View File

@ -32,8 +32,8 @@
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/container/XChild.hpp>
@ -80,7 +80,7 @@ namespace dbaccess
typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
PropertyChangeListenerContainer;
typedef ::comphelper::OBaseMutex OContentHelper_MBASE;
typedef ::cppu::BaseMutex OContentHelper_MBASE;
typedef ::cppu::WeakComponentImplHelper< css::ucb::XContent
, css::ucb::XCommandProcessor
, css::lang::XServiceInfo

3
dbaccess/source/core/inc/PropertyForward.hxx
View File

@ -24,6 +24,7 @@
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <vector>
@ -34,7 +35,7 @@ namespace dbaccess
// OPropertyForward
typedef ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener
> OPropertyForward_Base;
class OPropertyForward :public ::comphelper::OBaseMutex
class OPropertyForward :public ::cppu::BaseMutex
,public OPropertyForward_Base
{
css::uno::Reference< css::beans::XPropertySet > m_xSource;

2
dbaccess/source/core/inc/TableDeco.hxx
View File

@ -55,7 +55,7 @@ namespace dbaccess
class ODBTableDecorator;
typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTableDecorator > ODBTableDecorator_PROP;
class ODBTableDecorator :public comphelper::OBaseMutex
class ODBTableDecorator :public cppu::BaseMutex
,public OTableDescriptor_BASE
,public ODataSettings //ODataSettings_Base
,public IColumnFactory

4
dbaccess/source/core/inc/column.hxx
View File

@ -39,13 +39,13 @@
#include <com/sun/star/sdbcx/XDrop.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/propertycontainer.hxx>
#include <connectivity/CommonTools.hxx>
#include <connectivity/FValue.hxx>
#include <connectivity/TColumnsHelper.hxx>
#include <connectivity/sdbcx/IRefreshable.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/propshlp.hxx>
@ -61,7 +61,7 @@ namespace dbaccess
css::container::XNamed
> OColumnBase;
class OColumn :public comphelper::OBaseMutex
class OColumn :public cppu::BaseMutex
,public OColumnBase
,public ::comphelper::OPropertyContainer
,public IPropertyContainer // convenience for the derived class which also derive from OColumnSettings

4
dbaccess/source/core/inc/querycomposer.hxx
View File

@ -27,10 +27,10 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/script/XTypeConverter.hpp>
#include <cppuhelper/implbase5.hxx>
#include <cppuhelper/basemutex.hxx>
#include <connectivity/sqliterator.hxx>
#include <connectivity/sqlparse.hxx>
#include "apitools.hxx"
#include <comphelper/broadcasthelper.hxx>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
@ -42,7 +42,7 @@ namespace dbaccess
css::sdbcx::XColumnsSupplier,
css::lang::XServiceInfo > OQueryComposer_BASE;
class OQueryComposer : public ::comphelper::OBaseMutex,
class OQueryComposer : public ::cppu::BaseMutex,
public OSubComponent,
public OQueryComposer_BASE
{

7
dbaccess/source/core/inc/statement.hxx
View File

@ -32,15 +32,14 @@
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
#include <cppuhelper/propshlp.hxx>
#include <comphelper/proparrhlp.hxx>
#include "apitools.hxx"
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase3.hxx>
#include "apitools.hxx"
// OStatementBase
class OStatementBase : public comphelper::OBaseMutex,
class OStatementBase : public cppu::BaseMutex,
public OSubComponent,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper < OStatementBase >,

4
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
View File

@ -29,7 +29,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <tools/stream.hxx>
#include <vcl/timer.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <vcl/lazydelete.hxx>
#include <vcl/dibtools.hxx>
@ -40,7 +40,7 @@ namespace
{
typedef ::std::vector< VclPtr<VirtualDevice> > aBuffers;
class VDevBuffer : public Timer, protected comphelper::OBaseMutex
class VDevBuffer : public Timer, protected cppu::BaseMutex
{
private:
// available buffers

1
extensions/source/bibliography/formcontrolcontainer.cxx
View File

@ -19,6 +19,7 @@
#include "formcontrolcontainer.hxx"
#include <tools/debug.hxx>
#include <osl/diagnose.h>
#include <algorithm>
#include <functional>

4
extensions/source/bibliography/formcontrolcontainer.hxx
View File

@ -20,7 +20,7 @@
#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_FORMCONTROLCONTAINER_HXX
#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_FORMCONTROLCONTAINER_HXX
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include "loadlisteneradapter.hxx"
#include <com/sun/star/awt/XControlContainer.hpp>
@ -29,7 +29,7 @@ namespace bib
{
class FormControlContainer
:public ::comphelper::OBaseMutex
:public ::cppu::BaseMutex
,public ::bib::OLoadListener
{
private:

4
extensions/source/propctrlr/commoncontrol.hxx
View File

@ -23,7 +23,7 @@
#include <com/sun/star/inspection/XPropertyControl.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <tools/link.hxx>
#include <vcl/window.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@ -107,7 +107,7 @@ namespace pcr
a class which is derived from vcl::Window
*/
template < class TControlInterface, class TControlWindow >
class CommonBehaviourControl :public ::comphelper::OBaseMutex
class CommonBehaviourControl :public ::cppu::BaseMutex
,public ::cppu::WeakComponentImplHelper< TControlInterface >
,public CommonBehaviourControlHelper
{

4
extensions/source/propctrlr/propertycomposer.hxx
View File

@ -30,7 +30,7 @@
#include <com/sun/star/beans/UnknownPropertyException.hpp>
#include <com/sun/star/beans/PropertyVetoException.hpp>
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/listenernotification.hxx>
#include <vector>
@ -49,7 +49,7 @@ namespace pcr
/** implements an <type>XPropertyHandler</type> which composes its information
from a set of other property handlers
*/
class PropertyComposer :public ::comphelper::OBaseMutex
class PropertyComposer :public ::cppu::BaseMutex
,public PropertyComposer_Base
,public IPropertyExistenceCheck
{

4
forms/source/component/Columns.hxx
View File

@ -28,10 +28,10 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/util/XCloneable.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/propagg.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase2.hxx>
#include <cppuhelper/component.hxx>
@ -43,7 +43,7 @@ namespace frm
typedef ::cppu::WeakAggComponentImplHelper2 < css::lang::XUnoTunnel
, css::util::XCloneable > OGridColumn_BASE;
class OGridColumn :public ::comphelper::OBaseMutex
class OGridColumn :public ::cppu::BaseMutex
,public OGridColumn_BASE
,public OPropertySetAggregationHelper
,public OCloneableAggregation

4
forms/source/richtext/featuredispatcher.hxx
View File

@ -24,7 +24,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <comphelper/interfacecontainer2.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
class EditView;
@ -34,7 +34,7 @@ namespace frm
typedef ::cppu::WeakImplHelper < css::frame::XDispatch
> ORichTextFeatureDispatcher_Base;
class ORichTextFeatureDispatcher :public ::comphelper::OBaseMutex
class ORichTextFeatureDispatcher :public ::cppu::BaseMutex
,public ORichTextFeatureDispatcher_Base
{
private:

4
fpicker/source/office/commonpicker.hxx
View File

@ -21,6 +21,7 @@
#define INCLUDED_FPICKER_SOURCE_OFFICE_COMMONPICKER_HXX
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/ui/dialogs/XControlInformation.hpp>
#include <com/sun/star/ui/dialogs/XControlAccess.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@ -28,7 +29,6 @@
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/util/XCancellable.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/propertycontainer.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/uno3.hxx>
@ -52,7 +52,7 @@ namespace svt
/** implements common functionality for the 2 UNO picker components
*/
class OCommonPicker
:public ::comphelper::OBaseMutex
:public ::cppu::BaseMutex
,public OCommonPicker_Base
,public ::comphelper::OPropertyContainer
,public ::comphelper::OPropertyArrayUsageHelper< OCommonPicker >

4
framework/inc/uielement/buttontoolbarcontroller.hxx
View File

@ -32,7 +32,7 @@
#include <com/sun/star/frame/XToolbarController.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/weak.hxx>
#include <vcl/vclptr.hxx>
@ -46,7 +46,7 @@ class ButtonToolbarController : public css::frame::XStatusListener,
public css::lang::XInitialization,
public css::util::XUpdatable,
public css::lang::XComponent,
public ::comphelper::OBaseMutex,
public ::cppu::BaseMutex,
public ::cppu::OWeakObject
{
public:

2
include/canvas/base/bitmapcanvasbase.hxx
View File

@ -44,7 +44,7 @@ namespace canvas
@tpl Mutex
Lock strategy to use. Defaults to using the
OBaseMutex-provided lock. Every time one of the methods is
BaseMutex-provided lock. Every time one of the methods is
entered, an object of type Mutex is created with m_aMutex as
the sole parameter, and destroyed again when the method scope
is left.

2
include/canvas/base/bufferedgraphicdevicebase.hxx
View File

@ -59,7 +59,7 @@ namespace canvas
@tpl Mutex
Lock strategy to use. Defaults to using the
OBaseMutex-provided lock. Every time one of the methods is
BaseMutex-provided lock. Every time one of the methods is
entered, an object of type Mutex is created with m_aMutex as
the sole parameter, and destroyed again when the method scope
is left.

4
include/canvas/base/cachedprimitivebase.hxx
View File

@ -26,7 +26,7 @@
#include <com/sun/star/rendering/XCachedPrimitive.hpp>
#include <com/sun/star/rendering/ViewState.hpp>
#include <cppuhelper/compbase2.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <canvas/canvastoolsdllapi.h>
@ -41,7 +41,7 @@ namespace canvas
the XCachedPrimitive interface.
*/
class CANVASTOOLS_DLLPUBLIC CachedPrimitiveBase:
public comphelper::OBaseMutex, public CachedPrimitiveBase_Base
public cppu::BaseMutex, public CachedPrimitiveBase_Base
{
public:

2
include/canvas/base/canvasbase.hxx
View File

@ -80,7 +80,7 @@ namespace canvas
@tpl Mutex
Lock strategy to use. Defaults to using the
OBaseMutex-provided lock. Every time one of the methods is
BaseMutex-provided lock. Every time one of the methods is
entered, an object of type Mutex is created with m_aMutex as
the sole parameter, and destroyed again when the method scope
is left.

2
include/canvas/base/canvascustomspritebase.hxx
View File

@ -53,7 +53,7 @@ namespace canvas
@tpl Mutex
Lock strategy to use. Defaults to using the
OBaseMutex-provided lock. Every time one of the methods is
BaseMutex-provided lock. Every time one of the methods is
entered, an object of type Mutex is created with m_aMutex as
the sole parameter, and destroyed again when the method scope
is left.

2
include/canvas/base/spritecanvasbase.hxx
View File

@ -48,7 +48,7 @@ namespace canvas
@tpl Mutex
Lock strategy to use. Defaults to using the
OBaseMutex-provided lock. Every time one of the methods is
BaseMutex-provided lock. Every time one of the methods is
entered, an object of type Mutex is created with m_aMutex as
the sole parameter, and destroyed again when the method scope
is left.

4
include/canvas/parametricpolypolygon.hxx
View File

@ -24,7 +24,7 @@
#include <com/sun/star/rendering/XGraphicDevice.hpp>
#include <com/sun/star/rendering/XParametricPolyPolygon2D.hpp>
#include <cppuhelper/compbase2.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <canvas/canvastoolsdllapi.h>
@ -43,7 +43,7 @@ namespace canvas
typedef ::cppu::WeakComponentImplHelper2< css::rendering::XParametricPolyPolygon2D,
css::lang::XServiceInfo > ParametricPolyPolygon_Base;
class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon : public ::comphelper::OBaseMutex,
class CANVASTOOLS_DLLPUBLIC ParametricPolyPolygon : public ::cppu::BaseMutex,
public ParametricPolyPolygon_Base
{
public:

4
include/comphelper/accessiblecontexthelper.hxx
View File

@ -21,10 +21,10 @@
#define INCLUDED_COMPHELPER_ACCESSIBLECONTEXTHELPER_HXX
#include <cppuhelper/compbase2.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/comphelperdllapi.h>
#include <memory>
@ -83,7 +83,7 @@ namespace comphelper
/** helper class for implementing an AccessibleContext
*/
class COMPHELPER_DLLPUBLIC OAccessibleContextHelper
:public ::comphelper::OBaseMutex
:public ::cppu::BaseMutex
,public OAccessibleContextHelper_Base
{
private:

4
include/comphelper/accessiblewrapper.hxx
View File

@ -33,10 +33,10 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/uno3.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/accessibleeventnotifier.hxx>
#include <comphelper/stl_types.hxx>
#include <comphelper/comphelperdllapi.h>
@ -238,7 +238,7 @@ namespace comphelper
> OAccessibleContextWrapper_CBase;
class COMPHELPER_DLLPUBLIC OAccessibleContextWrapper
:public OBaseMutex
:public cppu::BaseMutex
,public OAccessibleContextWrapper_CBase
,public OAccessibleContextWrapperHelper
{

9
include/comphelper/broadcasthelper.hxx
View File

@ -44,15 +44,6 @@ namespace comphelper
const ::cppu::OBroadcastHelper& GetBroadcastHelper() const { return m_aBHelper; }
};
// base class for all classes who are derived from OPropertySet and from OComponent
// @deprecated, you should use cppu::BaseMutex instead (cppuhelper/basemutex.hxx)
class OBaseMutex
{
protected:
mutable ::osl::Mutex m_aMutex;
};
}
#endif // INCLUDED_COMPHELPER_BROADCASTHELPER_HXX

4
include/comphelper/proxyaggregation.hxx
View File

@ -25,8 +25,8 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/compbase_ex.hxx>
#include <comphelper/comphelperdllapi.h>
@ -176,7 +176,7 @@ namespace comphelper
//= OComponentProxyAggregation
class COMPHELPER_DLLPUBLIC OComponentProxyAggregation :public OBaseMutex
class COMPHELPER_DLLPUBLIC OComponentProxyAggregation : public cppu::BaseMutex
,public cppu::WeakComponentImplHelperBase
,public OComponentProxyAggregationHelper
{

4
include/comphelper/weakeventlistener.hxx
View File

@ -21,10 +21,10 @@
#define INCLUDED_COMPHELPER_WEAKEVENTLISTENER_HXX
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/uno/XWeak.hpp>
#include <cppuhelper/weakref.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/comphelperdllapi.h>
@ -41,7 +41,7 @@ namespace comphelper
holds it's listener hard. The adapter itself knows the real listener as weak reference,
thus not affecting its life time.</p>
*/
class OWeakListenerAdapterBase : public OBaseMutex
class OWeakListenerAdapterBase : public cppu::BaseMutex
{
private:
css::uno::WeakReference< css::uno::XInterface >

4
include/connectivity/sdbcx/VColumn.hxx
View File

@ -25,7 +25,7 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <connectivity/CommonTools.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <connectivity/sdbcx/VDescriptor.hxx>
#include <connectivity/dbtoolsdllapi.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@ -43,7 +43,7 @@ namespace connectivity
class OOO_DLLPUBLIC_DBTOOLS OColumn :
public comphelper::OBaseMutex,
public cppu::BaseMutex,
public OColumn_BASE,
public OColumnDescriptor_BASE,
public OColumn_PROP,

4
include/connectivity/sdbcx/VGroup.hxx
View File

@ -28,7 +28,7 @@
#include <com/sun/star/container/XNamed.hpp>
#include <comphelper/proparrhlp.hxx>
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <connectivity/sdbcx/VCollection.hxx>
#include <comphelper/propertycontainer.hxx>
#include <connectivity/sdbcx/IRefreshable.hxx>
@ -48,7 +48,7 @@ namespace connectivity
css::lang::XServiceInfo> OGroup_BASE;
class OOO_DLLPUBLIC_DBTOOLS OGroup :
public comphelper::OBaseMutex,
public cppu::BaseMutex,
public OGroup_BASE,
public IRefreshableUsers,
public ::comphelper::OPropertyArrayUsageHelper<OGroup>,

4
include/connectivity/sdbcx/VIndex.hxx
View File

@ -25,8 +25,8 @@
#include <com/sun/star/container/XNamed.hpp>
#include <comphelper/IdPropArrayHelper.hxx>
#include <cppuhelper/compbase2.hxx>
#include <cppuhelper/basemutex.hxx>
#include <connectivity/CommonTools.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <connectivity/sdbcx/VTypeDef.hxx>
#include <connectivity/sdbcx/IRefreshable.hxx>
#include <connectivity/sdbcx/VDescriptor.hxx>
@ -44,7 +44,7 @@ namespace connectivity
typedef ::comphelper::OIdPropertyArrayUsageHelper<OIndex> OIndex_PROP;
class OOO_DLLPUBLIC_DBTOOLS OIndex :
public comphelper::OBaseMutex,
public cppu::BaseMutex,
public ODescriptor_BASE,
public IRefreshableColumns,
public OIndex_PROP,

4
include/connectivity/sdbcx/VKey.hxx
View File

@ -23,13 +23,13 @@
#include <comphelper/IdPropArrayHelper.hxx>
#include <connectivity/CommonTools.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <connectivity/sdbcx/VTypeDef.hxx>
#include <com/sun/star/container/XNamed.hpp>
#include <connectivity/sdbcx/IRefreshable.hxx>
#include <connectivity/sdbcx/VDescriptor.hxx>
#include <connectivity/dbtoolsdllapi.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
#include <memory>
@ -60,7 +60,7 @@ namespace connectivity
class OCollection;
class OOO_DLLPUBLIC_DBTOOLS OKey :
public comphelper::OBaseMutex,
public cppu::BaseMutex,
public ODescriptor_BASE,
public IRefreshableColumns,
public ::comphelper::OIdPropertyArrayUsageHelper<OKey>,

4
include/connectivity/sdbcx/VTable.hxx
View File

@ -29,7 +29,7 @@
#include <comphelper/IdPropArrayHelper.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase4.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/container/XNamed.hpp>
#include <connectivity/sdbcx/IRefreshable.hxx>
#include <connectivity/sdbcx/VDescriptor.hxx>
@ -59,7 +59,7 @@ namespace connectivity
class OOO_DLLPUBLIC_DBTOOLS OTable :
public comphelper::OBaseMutex,
public cppu::BaseMutex,
public OTable_BASE,
public OTableDescriptor_BASE,
public IRefreshableColumns,

4
include/connectivity/sdbcx/VUser.hxx
View File

@ -25,8 +25,8 @@
#include <com/sun/star/sdbcx/XGroupsSupplier.hpp>
#include <comphelper/proparrhlp.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <connectivity/CommonTools.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <connectivity/sdbcx/VCollection.hxx>
#include <com/sun/star/container/XNamed.hpp>
#include <connectivity/sdbcx/IRefreshable.hxx>
@ -45,7 +45,7 @@ namespace connectivity
css::lang::XServiceInfo> OUser_BASE;
class OOO_DLLPUBLIC_DBTOOLS OUser :
public comphelper::OBaseMutex,
public cppu::BaseMutex,
public OUser_BASE,
public IRefreshableGroups,
public ::comphelper::OPropertyArrayUsageHelper<OUser>,

6
include/drawinglayer/primitive2d/baseprimitive2d.hxx
View File

@ -24,7 +24,7 @@
#include <cppuhelper/compbase1.hxx>
#include <com/sun/star/graphic/XPrimitive2D.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <basegfx/range/b2drange.hxx>
@ -95,7 +95,7 @@ namespace drawinglayer
instance and copying or changing values is not intended. The idea is to hold all data
needed for visualisation of this primitive in unchangeable form.
It is derived from comphelper::OBaseMutex to have a Mutex at hand; in a base
It is derived from cppu::BaseMutex to have a Mutex at hand; in a base
implementation this may not be needed, but e.g. when buffering at last decomposition
in a local member, multiple threads may try to decompose at the same time, so locking
is needed to avoid race conditions seen from the UNO object implementation.
@ -157,7 +157,7 @@ namespace drawinglayer
in their get2DDecomposition/getB2DRange implementations.
*/
class DRAWINGLAYER_DLLPUBLIC BasePrimitive2D
: protected comphelper::OBaseMutex,
: protected cppu::BaseMutex,
public BasePrimitive2DImplBase
{
BasePrimitive2D(const BasePrimitive2D&) = delete;

4
include/drawinglayer/primitive3d/baseprimitive3d.hxx
View File

@ -23,8 +23,8 @@
#include <drawinglayer/drawinglayerdllapi.h>
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/graphic/XPrimitive3D.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <basegfx/range/b3drange.hxx>
@ -93,7 +93,7 @@ namespace drawinglayer
That's all for 3D!
*/
class DRAWINGLAYER_DLLPUBLIC BasePrimitive3D
: protected comphelper::OBaseMutex,
: protected cppu::BaseMutex,
public BasePrimitive3DImplBase
{
BasePrimitive3D(const BasePrimitive3D&) = delete;

4
include/editeng/AccessibleEditableTextPara.hxx
View File

@ -24,6 +24,7 @@
#include <tools/gen.hxx>
#include <cppuhelper/weakref.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/interfacecontainer.hxx>
@ -38,7 +39,6 @@
#include <com/sun/star/accessibility/XAccessibleMultiLineText.hpp>
#include <comphelper/accessibletexthelper.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <editeng/AccessibleParaManager.hxx>
#include <editeng/AccessibleImageBullet.hxx>
#include <editeng/unoedprx.hxx>
@ -58,7 +58,7 @@ namespace accessibility
/** This class implements the actual text paragraphs for the EditEngine/Outliner UAA
*/
class EDITENG_DLLPUBLIC AccessibleEditableTextPara : public ::comphelper::OBaseMutex, public AccessibleTextParaInterfaceBase, public ::comphelper::OCommonAccessibleText
class EDITENG_DLLPUBLIC AccessibleEditableTextPara : public ::cppu::BaseMutex, public AccessibleTextParaInterfaceBase, public ::comphelper::OCommonAccessibleText
{
protected:

4
include/svtools/accessibleruler.hxx
View File

@ -35,7 +35,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <cppuhelper/interfacecontainer.h>
#include <cppuhelper/compbase5.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase5.hxx>
#include <comphelper/servicehelper.hxx>
#include <vcl/vclptr.hxx>
@ -60,7 +60,7 @@ typedef ::cppu::WeakAggComponentImplHelper5<
css::lang::XServiceInfo >
SvtRulerAccessible_Base;
class SvtRulerAccessible : public ::comphelper::OBaseMutex, public SvtRulerAccessible_Base
class SvtRulerAccessible : public ::cppu::BaseMutex, public SvtRulerAccessible_Base
{
public:
//===== internal ========================================================

4
include/svtools/framestatuslistener.hxx
View File

@ -29,7 +29,7 @@
#include <com/sun/star/frame/XStatusListener.hpp>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <unordered_map>
@ -39,7 +39,7 @@ namespace svt
class SVT_DLLPUBLIC FrameStatusListener : public css::frame::XStatusListener,
public css::frame::XFrameActionListener,
public css::lang::XComponent,
public ::comphelper::OBaseMutex,
public ::cppu::BaseMutex,
public ::cppu::OWeakObject
{
public:

4
include/svtools/popupmenucontrollerbase.hxx
View File

@ -38,7 +38,7 @@
#include <toolkit/awt/vclxmenu.hxx>
#include <cppuhelper/compbase7.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/weak.hxx>
#include <rtl/ustring.hxx>
@ -55,7 +55,7 @@ namespace svt
css::frame::XDispatchProvider ,
css::frame::XDispatch > PopupMenuControllerBaseType;
class SVT_DLLPUBLIC PopupMenuControllerBase : protected ::comphelper::OBaseMutex, // Struct for right initialization of mutex member! Must be first of baseclasses.
class SVT_DLLPUBLIC PopupMenuControllerBase : protected ::cppu::BaseMutex, // Struct for right initialization of mutex member! Must be first of baseclasses.
public PopupMenuControllerBaseType
{
public:

4
include/svtools/statusbarcontroller.hxx
View File

@ -30,7 +30,7 @@
#include <com/sun/star/util/XURLTransformer.hpp>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <tools/gen.hxx>
#include <unordered_map>
@ -39,7 +39,7 @@ namespace svt
class SVT_DLLPUBLIC StatusbarController :
public css::frame::XStatusbarController,
public ::comphelper::OBaseMutex,
public ::cppu::BaseMutex,
public ::cppu::OWeakObject
{
public:

4
reportdesign/source/core/inc/FixedLine.hxx
View File

@ -23,7 +23,7 @@
#include <com/sun/star/report/XFixedLine.hpp>
#include "ReportControlModel.hxx"
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include "ReportHelperDefines.hxx"
@ -38,7 +38,7 @@ namespace reportdesign
* \ingroup reportdesign_api
*
*/
class OFixedLine : public comphelper::OBaseMutex,
class OFixedLine : public cppu::BaseMutex,
public FixedLineBase,
public FixedLinePropertySet
{

4
reportdesign/source/core/inc/FixedText.hxx
View File

@ -24,7 +24,7 @@
#include <com/sun/star/report/XFixedText.hpp>
#include "ReportControlModel.hxx"
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include "ReportHelperDefines.hxx"
@ -39,7 +39,7 @@ namespace reportdesign
* \ingroup reportdesign_api
*
*/
class OFixedText : public comphelper::OBaseMutex,
class OFixedText : public cppu::BaseMutex,
public FixedTextBase,
public FixedTextPropertySet
{

4
reportdesign/source/core/inc/FormatCondition.hxx
View File

@ -23,7 +23,7 @@
#include <com/sun/star/report/XFormatCondition.hpp>
#include "ReportControlModel.hxx"
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include "ReportHelperDefines.hxx"
@ -37,7 +37,7 @@ namespace reportdesign
* \ingroup reportdesign_api
*
*/
class OFormatCondition : public comphelper::OBaseMutex,
class OFormatCondition : public cppu::BaseMutex,
public FormatConditionBase,
public FormatConditionPropertySet
{

6
reportdesign/source/core/inc/FormattedField.hxx
View File

@ -24,9 +24,11 @@
#include <com/sun/star/report/Function.hpp>
#include "ReportControlModel.hxx"
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include "ReportHelperDefines.hxx"
namespace reportdesign
{
typedef ::cppu::PropertySetMixin< css::report::XFormattedField > FormattedFieldPropertySet;
@ -37,7 +39,7 @@ namespace reportdesign
* \ingroup reportdesign_api
*
*/
class OFormattedField : public comphelper::OBaseMutex,
class OFormattedField : public cppu::BaseMutex,
public FormattedFieldBase,
public FormattedFieldPropertySet
{

4
reportdesign/source/core/inc/Functions.hxx
View File

@ -23,7 +23,7 @@
#include <com/sun/star/report/XFunctionsSupplier.hpp>
#include <cppuhelper/compbase.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <list>
@ -35,7 +35,7 @@ namespace reportdesign
* \ingroup reportdesign_api
*
*/
class OFunctions : public comphelper::OBaseMutex,
class OFunctions : public cppu::BaseMutex,
public FunctionsBase
{
typedef ::std::list< css::uno::Reference< css::report::XFunction > > TFunctions;

4
reportdesign/source/core/inc/Groups.hxx
View File

@ -21,8 +21,8 @@
#include <com/sun/star/report/XGroups.hpp>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <list>
@ -34,7 +34,7 @@ namespace reportdesign
* \ingroup reportdesign_api
*
*/
class OGroups : public comphelper::OBaseMutex,
class OGroups : public cppu::BaseMutex,
public GroupsBase
{
typedef ::std::list< css::uno::Reference< css::report::XGroup > > TGroups;

4
reportdesign/source/core/inc/ImageControl.hxx
View File

@ -23,7 +23,7 @@
#include <com/sun/star/report/XImageControl.hpp>
#include "ReportControlModel.hxx"
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include "ReportHelperDefines.hxx"
@ -37,7 +37,7 @@ namespace reportdesign
* \ingroup reportdesign_api
*
*/
class OImageControl : public comphelper::OBaseMutex,
class OImageControl : public cppu::BaseMutex,
public ImageControlBase,
public ImageControlPropertySet
{

4
reportdesign/source/core/inc/Shape.hxx
View File

@ -23,7 +23,7 @@
#include <com/sun/star/report/XShape.hpp>
#include "ReportControlModel.hxx"
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include "ReportHelperDefines.hxx"
#include <comphelper/propagg.hxx>
@ -39,7 +39,7 @@ namespace reportdesign
* \ingroup reportdesign_api
*
*/
class OShape : public comphelper::OBaseMutex,
class OShape : public cppu::BaseMutex,
public ShapeBase,
public ShapePropertySet
{

2
sc/inc/chartuno.hxx
View File

@ -113,7 +113,7 @@ typedef ::cppu::WeakComponentImplHelper<
typedef ::comphelper::OPropertyContainer ScChartObj_PBase;
typedef ::comphelper::OPropertyArrayUsageHelper< ScChartObj > ScChartObj_PABase;
class ScChartObj : public ::comphelper::OBaseMutex
class ScChartObj : public ::cppu::BaseMutex
,public ScChartObj_Base
,public ScChartObj_PBase
,public ScChartObj_PABase

4
sc/source/ui/inc/AccessibleContextBase.hxx
View File

@ -36,10 +36,10 @@
#include <cppuhelper/interfacecontainer.h>
#include <svl/lstner.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase5.hxx>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/servicehelper.hxx>
#include <comphelper/broadcasthelper.hxx>
class Rectangle;
@ -61,7 +61,7 @@ typedef cppu::ImplHelper1<
> ScAccessibleContextBaseImplEvent;
class ScAccessibleContextBase
: public comphelper::OBaseMutex,
: public cppu::BaseMutex,
public ScAccessibleContextBaseWeakImpl,
public ScAccessibleContextBaseImplEvent,
public SfxListener

4
sc/source/ui/inc/ChartRangeSelectionListener.hxx
View File

@ -20,7 +20,7 @@
#define INCLUDED_SC_SOURCE_UI_INC_CHARTRANGESELECTIONLISTENER_HXX
#include <cppuhelper/compbase.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/view/XSelectionChangeListener.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@ -32,7 +32,7 @@ typedef ::cppu::WeakComponentImplHelper<
ScChartRangeSelectionListener_Base;
class ScChartRangeSelectionListener :
public comphelper::OBaseMutex,
public cppu::BaseMutex,
public ScChartRangeSelectionListener_Base
{
public:

4
sc/source/ui/unoobj/celllistsource.hxx
View File

@ -22,10 +22,10 @@
#include <com/sun/star/form/binding/XListEntrySource.hpp>
#include <cppuhelper/compbase4.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <comphelper/propertycontainer.hxx>
#include <comphelper/uno3.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/proparrhlp.hxx>
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
@ -53,7 +53,7 @@ namespace calc
typedef ::comphelper::OPropertyArrayUsageHelper< OCellListSource >
OCellListSource_PABase;
class OCellListSource :public ::comphelper::OBaseMutex
class OCellListSource :public ::cppu::BaseMutex
,public OCellListSource_Base // order matters! before OCellListSource_PBase, so rBHelper gets initialized
,public OCellListSource_PBase
,public OCellListSource_PABase

Some files were not shown because too many files have changed in this diff Show More