cppuhelper/source/component.cxx | 32 +++++++++++-----------
forms/source/component/ComboBox.cxx | 6 ++--
forms/source/component/DatabaseForm.cxx | 4 +-
forms/source/component/Edit.cxx | 4 +-
forms/source/component/File.cxx | 2 -
forms/source/component/FormComponent.cxx | 6 ++--
forms/source/component/FormattedField.cxx | 6 ++--
forms/source/component/FormsCollection.cxx | 2 -
forms/source/component/Grid.cxx | 6 ++--
forms/source/component/ImageControl.cxx | 2 -
forms/source/component/ListBox.cxx | 10 +++---
forms/source/component/clickableimage.cxx | 4 +-
forms/source/component/navigationbar.cxx | 2 -
forms/source/inc/FormComponent.hxx | 2 -
forms/source/misc/InterfaceContainer.cxx | 2 -
forms/source/richtext/richtextmodel.cxx | 2 -
include/cppuhelper/component.hxx | 2 -
svx/source/fmcomp/gridcell.cxx | 42 ++++++++++++++---------------
18 files changed, 68 insertions(+), 68 deletions(-)
New commits:
commit 9e86101902805f025de9b8210a59e70338c8e08d
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Mon Aug 18 11:33:37 2025 -0400
Commit: Henry Castro <hcas...@collabora.com>
CommitDate: Tue Aug 19 13:25:54 2025 +0200
cppuhelper: add 'm_' prefix to OComponentHelper class members
Change-Id: I02a3ce12eb1d02dd28a2eec9beeb9633292975ce
Signed-off-by: Henry Castro <hcas...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189882
Tested-by: Jenkins
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index f0f24addeb6b..af29f46d70be 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -37,7 +37,7 @@ namespace cppu
OComponentHelper::OComponentHelper( Mutex & rMutex )
- : rBHelper( rMutex )
+ : m_rBHelper( rMutex )
{
}
OComponentHelper::~OComponentHelper()
@@ -74,7 +74,7 @@ void OComponentHelper::release() noexcept
{
if (osl_atomic_decrement( &m_refCount ) == 0)
{
- if (! rBHelper.bDisposed)
+ if (! m_rBHelper.bDisposed)
{
// *before* again incrementing our ref count, ensure that our
weak connection point
// will not create references to us anymore (via
XAdapter::queryAdapted)
@@ -132,11 +132,11 @@ void OComponentHelper::dispose()
// Remark: It is an error to call dispose more than once
bool bDoDispose = false;
{
- MutexGuard aGuard( rBHelper.rMutex );
- if( !rBHelper.bDisposed && !rBHelper.bInDispose )
+ MutexGuard aGuard( m_rBHelper.rMutex );
+ if( !m_rBHelper.bDisposed && !m_rBHelper.bInDispose )
{
// only one call go into this section
- rBHelper.bInDispose = true;
+ m_rBHelper.bInDispose = true;
bDoDispose = true;
}
}
@@ -153,22 +153,22 @@ void OComponentHelper::dispose()
aEvt.Source = Reference<XInterface >::query(
static_cast<XComponent *>(this) );
// inform all listeners to release this object
// The listener container are automatically cleared
- rBHelper.aLC.disposeAndClear( aEvt );
+ m_rBHelper.aLC.disposeAndClear( aEvt );
// notify subclasses to do their dispose
disposing();
}
catch (...)
{
- MutexGuard aGuard( rBHelper.rMutex );
+ MutexGuard aGuard( m_rBHelper.rMutex );
// bDispose and bInDisposing must be set in this order:
- rBHelper.bDisposed = true;
- rBHelper.bInDispose = false;
+ m_rBHelper.bDisposed = true;
+ m_rBHelper.bInDispose = false;
throw;
}
- MutexGuard aGuard( rBHelper.rMutex );
+ MutexGuard aGuard( m_rBHelper.rMutex );
// bDispose and bInDisposing must be set in this order:
- rBHelper.bDisposed = true;
- rBHelper.bInDispose = false;
+ m_rBHelper.bDisposed = true;
+ m_rBHelper.bInDispose = false;
}
catch (RuntimeException &)
{
@@ -195,8 +195,8 @@ void OComponentHelper::dispose()
void OComponentHelper::addEventListener(
const Reference<XEventListener > & rxListener )
{
- ClearableMutexGuard aGuard( rBHelper.rMutex );
- if (rBHelper.bDisposed || rBHelper.bInDispose)
+ ClearableMutexGuard aGuard( m_rBHelper.rMutex );
+ if (m_rBHelper.bDisposed || m_rBHelper.bInDispose)
{
aGuard.clear();
Reference< XInterface > x( static_cast<XComponent *>(this), UNO_QUERY
);
@@ -204,7 +204,7 @@ void OComponentHelper::addEventListener(
}
else
{
- rBHelper.addListener( cppu::UnoType<decltype(rxListener)>::get(),
rxListener );
+ m_rBHelper.addListener( cppu::UnoType<decltype(rxListener)>::get(),
rxListener );
}
}
@@ -212,7 +212,7 @@ void OComponentHelper::addEventListener(
void OComponentHelper::removeEventListener(
const Reference<XEventListener > & rxListener )
{
- rBHelper.removeListener( cppu::UnoType<decltype(rxListener)>::get(),
rxListener );
+ m_rBHelper.removeListener( cppu::UnoType<decltype(rxListener)>::get(),
rxListener );
}
}
diff --git a/forms/source/component/ComboBox.cxx
b/forms/source/component/ComboBox.cxx
index f49d8bba1dd5..e8e8e929312d 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -109,7 +109,7 @@ OComboBoxModel::OComboBoxModel(const
Reference<XComponentContext>& _rxFactory)
:OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_COMBOBOX,
FRM_SUN_CONTROL_COMBOBOX, true, true, true )
// use the old control name for compatibility reasons
,OEntryListHelper( static_cast<OControlModel&>(*this) )
- ,OErrorBroadcaster( OComponentHelper::rBHelper )
+ ,OErrorBroadcaster( OComponentHelper::m_rBHelper )
,m_eListSourceType(ListSourceType_TABLE)
,m_bEmptyIsNull(true)
{
@@ -121,7 +121,7 @@ OComboBoxModel::OComboBoxModel(const
Reference<XComponentContext>& _rxFactory)
OComboBoxModel::OComboBoxModel( const OComboBoxModel* _pOriginal, const
Reference<XComponentContext>& _rxFactory )
:OBoundControlModel( _pOriginal, _rxFactory )
,OEntryListHelper( *_pOriginal, static_cast<OControlModel&>(*this) )
- ,OErrorBroadcaster( OComponentHelper::rBHelper )
+ ,OErrorBroadcaster( OComponentHelper::m_rBHelper )
,m_aListSource( _pOriginal->m_aListSource )
,m_aDefaultText( _pOriginal->m_aDefaultText )
,m_eListSourceType( _pOriginal->m_eListSourceType )
@@ -132,7 +132,7 @@ OComboBoxModel::OComboBoxModel( const OComboBoxModel*
_pOriginal, const Referenc
OComboBoxModel::~OComboBoxModel()
{
- if (!OComponentHelper::rBHelper.bDisposed)
+ if (!OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
diff --git a/forms/source/component/DatabaseForm.cxx
b/forms/source/component/DatabaseForm.cxx
index 2ebab406beac..28a238f720a0 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -228,7 +228,7 @@ Any SAL_CALL ODatabaseForm::queryAggregation(const Type&
_rType)
ODatabaseForm::ODatabaseForm(const Reference<XComponentContext>& _rxContext)
:OFormComponents(_rxContext)
- ,OPropertySetAggregationHelper(OComponentHelper::rBHelper)
+ ,OPropertySetAggregationHelper(OComponentHelper::m_rBHelper)
,OPropertyChangeListener()
,m_aLoadListeners(m_aMutex)
,m_aRowSetApproveListeners(m_aMutex)
@@ -258,7 +258,7 @@ ODatabaseForm::ODatabaseForm(const
Reference<XComponentContext>& _rxContext)
ODatabaseForm::ODatabaseForm( const ODatabaseForm& _cloneSource )
:OFormComponents( _cloneSource )
- ,OPropertySetAggregationHelper( OComponentHelper::rBHelper )
+ ,OPropertySetAggregationHelper( OComponentHelper::m_rBHelper )
,OPropertyChangeListener()
,ODatabaseForm_BASE1()
,ODatabaseForm_BASE2()
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index c474c168fed0..2f431a24ffcd 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -98,7 +98,7 @@ OEditControl::~OEditControl()
if( m_nKeyEvent )
Application::RemoveUserEvent( m_nKeyEvent );
- if (!OComponentHelper::rBHelper.bDisposed)
+ if (!OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
@@ -279,7 +279,7 @@ OEditModel::OEditModel( const OEditModel* _pOriginal, const
Reference<XComponent
OEditModel::~OEditModel()
{
- if (!OComponentHelper::rBHelper.bDisposed)
+ if (!OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index ac7c2816da68..02852876f1cb 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -86,7 +86,7 @@ OFileControlModel::OFileControlModel( const
OFileControlModel* _pOriginal, const
OFileControlModel::~OFileControlModel()
{
- if (!OComponentHelper::rBHelper.bDisposed)
+ if (!OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
diff --git a/forms/source/component/FormComponent.cxx
b/forms/source/component/FormComponent.cxx
index a1724092f92b..97ac1280bd91 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -481,7 +481,7 @@ OControlModel::OControlModel(
const OUString& _rUnoControlModelTypeName,
const OUString& rDefault, const bool _bSetDelegator)
:OComponentHelper(m_aMutex)
- ,OPropertySetAggregationHelper(OComponentHelper::rBHelper)
+ ,OPropertySetAggregationHelper(OComponentHelper::m_rBHelper)
,m_xContext( _rxContext )
,m_lockCount( 0 )
,m_aPropertyBagHelper( *this )
@@ -526,7 +526,7 @@ OControlModel::OControlModel(
OControlModel::OControlModel( const OControlModel* _pOriginal, const
Reference< XComponentContext>& _rxFactory, const bool _bCloneAggregate, const
bool _bSetDelegator )
:OComponentHelper( m_aMutex )
- ,OPropertySetAggregationHelper( OComponentHelper::rBHelper )
+ ,OPropertySetAggregationHelper( OComponentHelper::m_rBHelper )
,m_xContext( _rxFactory )
,m_lockCount( 0 )
,m_aPropertyBagHelper( *this )
@@ -1200,7 +1200,7 @@ OBoundControlModel::OBoundControlModel(
OBoundControlModel::~OBoundControlModel()
{
- if ( !OComponentHelper::rBHelper.bDisposed )
+ if ( !OComponentHelper::m_rBHelper.bDisposed )
{
acquire();
dispose();
diff --git a/forms/source/component/FormattedField.cxx
b/forms/source/component/FormattedField.cxx
index 05ad52cb2561..3c7e807ea912 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -166,7 +166,7 @@ OFormattedControl::~OFormattedControl()
{
if( m_nKeyEvent )
Application::RemoveUserEvent( m_nKeyEvent );
- if (!OComponentHelper::rBHelper.bDisposed)
+ if (!OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
@@ -264,7 +264,7 @@ void OFormattedModel::implConstruct()
OFormattedModel::OFormattedModel(const Reference<XComponentContext>&
_rxFactory)
:OEditBaseModel(_rxFactory, VCL_CONTROLMODEL_FORMATTEDFIELD,
FRM_SUN_CONTROL_FORMATTEDFIELD, true, true )
// use the old control name for compatibility reasons
- ,OErrorBroadcaster( OComponentHelper::rBHelper )
+ ,OErrorBroadcaster( OComponentHelper::m_rBHelper )
{
implConstruct();
m_nClassId = FormComponentType::TEXTFIELD;
@@ -272,7 +272,7 @@ OFormattedModel::OFormattedModel(const
Reference<XComponentContext>& _rxFactory)
}
OFormattedModel::OFormattedModel( const OFormattedModel* _pOriginal, const
Reference< XComponentContext >& _rxFactory )
:OEditBaseModel( _pOriginal, _rxFactory )
- ,OErrorBroadcaster( OComponentHelper::rBHelper )
+ ,OErrorBroadcaster( OComponentHelper::m_rBHelper )
{
implConstruct();
}
diff --git a/forms/source/component/FormsCollection.cxx
b/forms/source/component/FormsCollection.cxx
index 0b5b2f0e1eb6..7d3076c1f494 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -60,7 +60,7 @@ OFormsCollection::OFormsCollection( const OFormsCollection&
_cloneSource )
OFormsCollection::~OFormsCollection()
{
- if (!::cppu::OComponentHelper::rBHelper.bDisposed)
+ if (!::cppu::OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 41935d366959..67957dbfff88 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -64,7 +64,7 @@ const sal_uInt16 BACKGROUNDCOLOR = 0x0100;
OGridControlModel::OGridControlModel(const Reference<XComponentContext>&
_rxFactory)
:OControlModel(_rxFactory, OUString())
,OInterfaceContainer(_rxFactory, m_aMutex,
cppu::UnoType<XPropertySet>::get())
- ,OErrorBroadcaster( OComponentHelper::rBHelper )
+ ,OErrorBroadcaster( OComponentHelper::m_rBHelper )
,FontControlModel( false )
,m_aSelectListeners(m_aMutex)
,m_aResetListeners(m_aMutex)
@@ -87,7 +87,7 @@ OGridControlModel::OGridControlModel(const
Reference<XComponentContext>& _rxFact
OGridControlModel::OGridControlModel( const OGridControlModel* _pOriginal,
const Reference< XComponentContext >& _rxFactory )
:OControlModel( _pOriginal, _rxFactory )
,OInterfaceContainer( _rxFactory, m_aMutex,
cppu::UnoType<XPropertySet>::get() )
- ,OErrorBroadcaster( OComponentHelper::rBHelper )
+ ,OErrorBroadcaster( OComponentHelper::m_rBHelper )
,FontControlModel( _pOriginal )
,m_aSelectListeners( m_aMutex )
,m_aResetListeners( m_aMutex )
@@ -111,7 +111,7 @@ OGridControlModel::OGridControlModel( const
OGridControlModel* _pOriginal, const
OGridControlModel::~OGridControlModel()
{
- if (!OComponentHelper::rBHelper.bDisposed)
+ if (!OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
diff --git a/forms/source/component/ImageControl.cxx
b/forms/source/component/ImageControl.cxx
index 289b39c70424..5de759cc0142 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -169,7 +169,7 @@ void OImageControlModel::implConstruct()
OImageControlModel::~OImageControlModel()
{
- if (!OComponentHelper::rBHelper.bDisposed)
+ if (!OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
diff --git a/forms/source/component/ListBox.cxx
b/forms/source/component/ListBox.cxx
index 35e63a69e935..305bccf64935 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -149,7 +149,7 @@ namespace frm
:OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_LISTBOX,
FRM_SUN_CONTROL_LISTBOX, true, true, true )
// use the old control name for compatibility reasons
,OEntryListHelper( static_cast<OControlModel&>(*this) )
- ,OErrorBroadcaster( OComponentHelper::rBHelper )
+ ,OErrorBroadcaster( OComponentHelper::m_rBHelper )
,m_nConvertedBoundValuesType(0)
,m_nNULLPos(-1)
,m_nBoundColumnType( DataType::SQLNULL )
@@ -167,7 +167,7 @@ namespace frm
OListBoxModel::OListBoxModel( const OListBoxModel* _pOriginal, const
Reference<XComponentContext>& _rxFactory )
:OBoundControlModel( _pOriginal, _rxFactory )
,OEntryListHelper( *_pOriginal, static_cast<OControlModel&>(*this) )
- ,OErrorBroadcaster( OComponentHelper::rBHelper )
+ ,OErrorBroadcaster( OComponentHelper::m_rBHelper )
,m_eListSourceType( _pOriginal->m_eListSourceType )
,m_aBoundColumn( _pOriginal->m_aBoundColumn )
,m_aListSourceValues( _pOriginal->m_aListSourceValues )
@@ -184,7 +184,7 @@ namespace frm
OListBoxModel::~OListBoxModel()
{
- if (!OComponentHelper::rBHelper.bDisposed)
+ if (!OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
@@ -1837,7 +1837,7 @@ namespace frm
OListBoxControl::~OListBoxControl()
{
- if (!OComponentHelper::rBHelper.bDisposed)
+ if (!OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
@@ -2008,7 +2008,7 @@ namespace frm
Reference< XListBox > xKeepAlive( this );
{
::osl::MutexGuard aGuard( m_aMutex );
- if ( OComponentHelper::rBHelper.bDisposed )
+ if ( OComponentHelper::m_rBHelper.bDisposed )
return;
}
const ItemEventDescription& rItemEvent = static_cast< const
ItemEventDescription& >( _rEvent );
diff --git a/forms/source/component/clickableimage.cxx
b/forms/source/component/clickableimage.cxx
index 7a6d709241a6..7f4ccc69e490 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -94,7 +94,7 @@ namespace frm
OClickableImageBaseControl::~OClickableImageBaseControl()
{
- if (!OComponentHelper::rBHelper.bDisposed)
+ if (!OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
@@ -498,7 +498,7 @@ namespace frm
OClickableImageBaseModel::~OClickableImageBaseModel()
{
- if (!OComponentHelper::rBHelper.bDisposed)
+ if (!OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
diff --git a/forms/source/component/navigationbar.cxx
b/forms/source/component/navigationbar.cxx
index f210ecd0d175..70d4431caea6 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -135,7 +135,7 @@ namespace frm
ONavigationBarModel::~ONavigationBarModel()
{
- if ( !OComponentHelper::rBHelper.bDisposed )
+ if ( !OComponentHelper::m_rBHelper.bDisposed )
{
acquire();
dispose();
diff --git a/forms/source/inc/FormComponent.hxx
b/forms/source/inc/FormComponent.hxx
index 45d6837d1b2c..ee28dcc8a42a 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -350,7 +350,7 @@ protected:
*/
virtual void clonedFrom( const OControlModel* _pOriginal );
- using OComponentHelper::rBHelper;
+ using OComponentHelper::m_rBHelper;
virtual css::uno::Sequence< css::uno::Type> _getTypes();
diff --git a/forms/source/misc/InterfaceContainer.cxx
b/forms/source/misc/InterfaceContainer.cxx
index 259629dafb0b..50935403e6fe 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -1269,7 +1269,7 @@ OFormComponents::OFormComponents( const OFormComponents&
_cloneSource )
OFormComponents::~OFormComponents()
{
- if (! ::cppu::OComponentHelper::rBHelper.bDisposed)
+ if (! ::cppu::OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
diff --git a/forms/source/richtext/richtextmodel.cxx
b/forms/source/richtext/richtextmodel.cxx
index fa2900f11903..f74bc0954f37 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -230,7 +230,7 @@ namespace frm
ORichTextModel::~ORichTextModel( )
{
- if ( !OComponentHelper::rBHelper.bDisposed )
+ if ( !OComponentHelper::m_rBHelper.bDisposed )
{
acquire();
dispose();
diff --git a/include/cppuhelper/component.hxx b/include/cppuhelper/component.hxx
index e59e1b9d450a..559c644b15a0 100644
--- a/include/cppuhelper/component.hxx
+++ b/include/cppuhelper/component.hxx
@@ -94,7 +94,7 @@ protected:
virtual void SAL_CALL disposing();
/// @cond INTERNAL
- OBroadcastHelper rBHelper;
+ OBroadcastHelper m_rBHelper;
/// @endcond
private:
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 16736bd18b76..f8c294c47ccd 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3230,7 +3230,7 @@ svt::ControlBase* FmXGridCell::getEventWindow() const
FmXGridCell::~FmXGridCell()
{
- if (!OComponentHelper::rBHelper.bDisposed)
+ if (!OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
@@ -3309,7 +3309,7 @@ Reference< XInterface > FmXGridCell::getContext()
Reference< css::awt::XControlModel > FmXGridCell::getModel()
{
- checkDisposed(OComponentHelper::rBHelper.bDisposed);
+ checkDisposed(OComponentHelper::m_rBHelper.bDisposed);
return Reference< css::awt::XControlModel > (m_pColumn->getModel(),
UNO_QUERY);
}
@@ -3317,14 +3317,14 @@ Reference< css::awt::XControlModel >
FmXGridCell::getModel()
sal_Bool FmXGridCell::getLock()
{
- checkDisposed(OComponentHelper::rBHelper.bDisposed);
+ checkDisposed(OComponentHelper::m_rBHelper.bDisposed);
return m_pColumn->isLocked();
}
void FmXGridCell::setLock(sal_Bool _bLock)
{
- checkDisposed(OComponentHelper::rBHelper.bDisposed);
+ checkDisposed(OComponentHelper::m_rBHelper.bDisposed);
if (getLock() == _bLock)
return;
else
@@ -3372,70 +3372,70 @@ void SAL_CALL FmXGridCell::setFocus( )
void SAL_CALL FmXGridCell::addWindowListener( const Reference<
awt::XWindowListener >& _rxListener )
{
- checkDisposed(OComponentHelper::rBHelper.bDisposed);
+ checkDisposed(OComponentHelper::m_rBHelper.bDisposed);
m_aWindowListeners.addInterface( _rxListener );
}
void SAL_CALL FmXGridCell::removeWindowListener( const Reference<
awt::XWindowListener >& _rxListener )
{
- checkDisposed(OComponentHelper::rBHelper.bDisposed);
+ checkDisposed(OComponentHelper::m_rBHelper.bDisposed);
m_aWindowListeners.removeInterface( _rxListener );
}
void SAL_CALL FmXGridCell::addFocusListener( const Reference<
awt::XFocusListener >& _rxListener )
{
- checkDisposed(OComponentHelper::rBHelper.bDisposed);
+ checkDisposed(OComponentHelper::m_rBHelper.bDisposed);
m_aFocusListeners.addInterface( _rxListener );
}
void SAL_CALL FmXGridCell::removeFocusListener( const Reference<
awt::XFocusListener >& _rxListener )
{
- checkDisposed(OComponentHelper::rBHelper.bDisposed);
+ checkDisposed(OComponentHelper::m_rBHelper.bDisposed);
m_aFocusListeners.removeInterface( _rxListener );
}
void SAL_CALL FmXGridCell::addKeyListener( const Reference< awt::XKeyListener
>& _rxListener )
{
- checkDisposed(OComponentHelper::rBHelper.bDisposed);
+ checkDisposed(OComponentHelper::m_rBHelper.bDisposed);
m_aKeyListeners.addInterface( _rxListener );
}
void SAL_CALL FmXGridCell::removeKeyListener( const Reference<
awt::XKeyListener >& _rxListener )
{
- checkDisposed(OComponentHelper::rBHelper.bDisposed);
+ checkDisposed(OComponentHelper::m_rBHelper.bDisposed);
m_aKeyListeners.removeInterface( _rxListener );
}
void SAL_CALL FmXGridCell::addMouseListener( const Reference<
awt::XMouseListener >& _rxListener )
{
- checkDisposed(OComponentHelper::rBHelper.bDisposed);
+ checkDisposed(OComponentHelper::m_rBHelper.bDisposed);
m_aMouseListeners.addInterface( _rxListener );
}
void SAL_CALL FmXGridCell::removeMouseListener( const Reference<
awt::XMouseListener >& _rxListener )
{
- checkDisposed(OComponentHelper::rBHelper.bDisposed);
+ checkDisposed(OComponentHelper::m_rBHelper.bDisposed);
m_aMouseListeners.removeInterface( _rxListener );
}
void SAL_CALL FmXGridCell::addMouseMotionListener( const Reference<
awt::XMouseMotionListener >& _rxListener )
{
- checkDisposed(OComponentHelper::rBHelper.bDisposed);
+ checkDisposed(OComponentHelper::m_rBHelper.bDisposed);
m_aMouseMotionListeners.addInterface( _rxListener );
}
void SAL_CALL FmXGridCell::removeMouseMotionListener( const Reference<
awt::XMouseMotionListener >& _rxListener )
{
- checkDisposed(OComponentHelper::rBHelper.bDisposed);
+ checkDisposed(OComponentHelper::m_rBHelper.bDisposed);
m_aMouseMotionListeners.removeInterface( _rxListener );
}
@@ -3451,13 +3451,13 @@ void SAL_CALL FmXGridCell::removePaintListener( const
Reference< awt::XPaintList
void FmXGridCell::onFocusGained( const awt::FocusEvent& _rEvent )
{
- checkDisposed(OComponentHelper::rBHelper.bDisposed);
+ checkDisposed(OComponentHelper::m_rBHelper.bDisposed);
m_aFocusListeners.notifyEach( &awt::XFocusListener::focusGained, _rEvent );
}
void FmXGridCell::onFocusLost( const awt::FocusEvent& _rEvent )
{
- checkDisposed(OComponentHelper::rBHelper.bDisposed);
+ checkDisposed(OComponentHelper::m_rBHelper.bDisposed);
m_aFocusListeners.notifyEach( &awt::XFocusListener::focusLost, _rEvent );
}
@@ -3634,7 +3634,7 @@ FmXEditCell::FmXEditCell( DbGridColumn* pColumn,
std::unique_ptr<DbCellControl>
FmXEditCell::~FmXEditCell()
{
- if (!OComponentHelper::rBHelper.bDisposed)
+ if (!OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
@@ -3848,7 +3848,7 @@ FmXCheckBoxCell::FmXCheckBoxCell( DbGridColumn* pColumn,
std::unique_ptr<DbCellC
FmXCheckBoxCell::~FmXCheckBoxCell()
{
- if (!OComponentHelper::rBHelper.bDisposed)
+ if (!OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
@@ -3996,7 +3996,7 @@ FmXListBoxCell::FmXListBoxCell(DbGridColumn* pColumn,
std::unique_ptr<DbCellCont
FmXListBoxCell::~FmXListBoxCell()
{
- if (!OComponentHelper::rBHelper.bDisposed)
+ if (!OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
@@ -4320,7 +4320,7 @@ FmXComboBoxCell::FmXComboBoxCell( DbGridColumn* pColumn,
std::unique_ptr<DbCellC
FmXComboBoxCell::~FmXComboBoxCell()
{
- if ( !OComponentHelper::rBHelper.bDisposed )
+ if ( !OComponentHelper::m_rBHelper.bDisposed )
{
acquire();
dispose();
@@ -4492,7 +4492,7 @@ FmXFilterCell::FmXFilterCell(DbGridColumn* pColumn,
std::unique_ptr<DbFilterFiel
FmXFilterCell::~FmXFilterCell()
{
- if (!OComponentHelper::rBHelper.bDisposed)
+ if (!OComponentHelper::m_rBHelper.bDisposed)
{
acquire();
dispose();
