[Libreoffice-commits] core.git: sw/inc sw/source
Miklos Vajna (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jan 13 09:26:03 UTC 2020
sw/inc/ndgrf.hxx | 32 ++++----
sw/inc/unochart.hxx | 10 +-
sw/source/core/graphic/ndgrf.cxx | 130 ++++++++++++++++++------------------
sw/source/core/unocore/unochart.cxx | 78 ++++++++++-----------
4 files changed, 125 insertions(+), 125 deletions(-)
New commits:
commit 467e355c6a947e12bc23b6d93e1a2cc0c778dc71
Author: Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon Jan 13 09:33:03 2020 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Jan 13 10:25:28 2020 +0100
sw: prefix members of SwGrfNode and SwChartLabeledDataSequence
See tdf#94879 for motivation.
Change-Id: I6a752a952e41302620463682c3361fad7e639df4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86656
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
Tested-by: Jenkins
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 1a266ab7ee17..4bc668049d4b 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -37,13 +37,13 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode
GraphicObject maGrfObj;
std::unique_ptr<GraphicObject> mpReplacementGraphic;
- tools::SvRef<sfx2::SvBaseLink> refLink; ///< If graphics only as link then pointer is set.
- Size nGrfSize;
- bool bInSwapIn :1;
+ tools::SvRef<sfx2::SvBaseLink> mxLink; ///< If graphics only as link then pointer is set.
+ Size mnGrfSize;
+ bool mbInSwapIn :1;
- bool bChgTwipSize :1;
- bool bFrameInPaint :1; ///< To avoid Start-/EndActions in Paint via SwapIn.
- bool bScaleImageMap :1; ///< Scale image map in SetTwipSize.
+ bool mbChangeTwipSize :1;
+ bool mbFrameInPaint :1; ///< To avoid Start-/EndActions in Paint via SwapIn.
+ bool mbScaleImageMap :1; ///< Scale image map in SetTwipSize.
std::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
bool mbLinkedInputStreamReady;
@@ -92,17 +92,17 @@ public:
bool IsAnimated() const { return maGrfObj.IsAnimated(); }
- bool IsChgTwipSize() const { return bChgTwipSize; }
+ bool IsChgTwipSize() const { return mbChangeTwipSize; }
void SetChgTwipSize( bool b)
{
- bChgTwipSize = b;
+ mbChangeTwipSize = b;
}
- bool IsFrameInPaint() const { return bFrameInPaint; }
- void SetFrameInPaint( bool b ) { bFrameInPaint = b; }
+ bool IsFrameInPaint() const { return mbFrameInPaint; }
+ void SetFrameInPaint( bool b ) { mbFrameInPaint = b; }
- bool IsScaleImageMap() const { return bScaleImageMap; }
- void SetScaleImageMap( bool b ) { bScaleImageMap = b; }
+ bool IsScaleImageMap() const { return mbScaleImageMap; }
+ void SetScaleImageMap( bool b ) { mbScaleImageMap = b; }
/// in ndcopy.cxx
virtual SwContentNode* MakeCopy(SwDoc*, const SwNodeIndex&, bool bNewFrames) const override;
@@ -124,10 +124,10 @@ public:
virtual bool RestorePersistentData() override;
/// Query link-data.
- bool IsGrfLink() const { return refLink.is(); }
+ bool IsGrfLink() const { return mxLink.is(); }
bool IsLinkedFile() const;
bool IsLinkedDDE() const;
- const tools::SvRef<sfx2::SvBaseLink>& GetLink() const { return refLink; }
+ const tools::SvRef<sfx2::SvBaseLink>& GetLink() const { return mxLink; }
bool GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm ) const;
void ReleaseLink();
@@ -161,12 +161,12 @@ inline const SwGrfNode *SwNode::GetGrfNode() const
inline bool SwGrfNode::IsLinkedFile() const
{
- return refLink.is() && OBJECT_CLIENT_GRF == refLink->GetObjType();
+ return mxLink.is() && OBJECT_CLIENT_GRF == mxLink->GetObjType();
}
inline bool SwGrfNode::IsLinkedDDE() const
{
- return refLink.is() && OBJECT_CLIENT_DDE == refLink->GetObjType();
+ return mxLink.is() && OBJECT_CLIENT_DDE == mxLink->GetObjType();
}
#endif
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index d52b5ebf7730..d7c87a53db88 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -328,13 +328,13 @@ SwChartLabeledDataSequenceBaseClass;
class SwChartLabeledDataSequence final :
public SwChartLabeledDataSequenceBaseClass
{
- ::comphelper::OInterfaceContainerHelper2 aEvtListeners;
- ::comphelper::OInterfaceContainerHelper2 aModifyListeners;
+ ::comphelper::OInterfaceContainerHelper2 m_aEventListeners;
+ ::comphelper::OInterfaceContainerHelper2 m_aModifyListeners;
- css::uno::Reference< css::chart2::data::XDataSequence > xData;
- css::uno::Reference< css::chart2::data::XDataSequence > xLabels;
+ css::uno::Reference< css::chart2::data::XDataSequence > m_xData;
+ css::uno::Reference< css::chart2::data::XDataSequence > m_xLabels;
- bool bDisposed;
+ bool m_bDisposed;
SwChartLabeledDataSequence( const SwChartLabeledDataSequence & ) = delete;
SwChartLabeledDataSequence & operator = ( const SwChartLabeledDataSequence & ) = delete;
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 66649cde6312..b0c5a3111047 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -63,8 +63,8 @@ SwGrfNode::SwGrfNode(
mbLinkedInputStreamReady( false ),
mbIsStreamReadOnly( false )
{
- bInSwapIn = bChgTwipSize =
- bFrameInPaint = bScaleImageMap = false;
+ mbInSwapIn = mbChangeTwipSize =
+ mbFrameInPaint = mbScaleImageMap = false;
ReRead(rGrfName, rFltName, pGraphic, false);
}
@@ -79,8 +79,8 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
mbLinkedInputStreamReady( false ),
mbIsStreamReadOnly( false )
{
- bInSwapIn = bChgTwipSize =
- bFrameInPaint = bScaleImageMap = false;
+ mbInSwapIn = mbChangeTwipSize =
+ mbFrameInPaint = mbScaleImageMap = false;
}
/** Create new SW/G reader.
@@ -103,8 +103,8 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
Graphic aGrf; aGrf.SetDefaultType();
maGrfObj.SetGraphic( aGrf, rGrfName );
- bInSwapIn = bChgTwipSize =
- bFrameInPaint = bScaleImageMap = false;
+ mbInSwapIn = mbChangeTwipSize =
+ mbFrameInPaint = mbScaleImageMap = false;
InsertLink( rGrfName, rFltName );
if( IsLinkedFile() )
@@ -114,7 +114,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
FStatHelper::IsDocument( aUrl.GetMainURL( INetURLObject::DecodeMechanism::NONE ) ))
{
// file exists, so create connection without an update
- static_cast<SwBaseLink*>( refLink.get() )->Connect();
+ static_cast<SwBaseLink*>( mxLink.get() )->Connect();
}
}
}
@@ -149,9 +149,9 @@ bool SwGrfNode::ReRead(
}
// with name
- if( refLink.is() )
+ if( mxLink.is() )
{
- OSL_ENSURE( !bInSwapIn, "ReRead: I am still in SwapIn" );
+ OSL_ENSURE( !mbInSwapIn, "ReRead: I am still in SwapIn" );
if( !sURLLink.isEmpty() )
{
@@ -168,19 +168,19 @@ bool SwGrfNode::ReRead(
nNewType = OBJECT_CLIENT_GRF;
}
- if( nNewType != refLink->GetObjType() )
+ if( nNewType != mxLink->GetObjType() )
{
- refLink->Disconnect();
- static_cast<SwBaseLink*>( refLink.get() )->SetObjType( nNewType );
+ mxLink->Disconnect();
+ static_cast<SwBaseLink*>( mxLink.get() )->SetObjType( nNewType );
}
}
- refLink->SetLinkSourceName( sCmd );
+ mxLink->SetLinkSourceName( sCmd );
}
else // no name anymore, so remove link
{
- GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
- refLink.clear();
+ GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( mxLink.get() );
+ mxLink.clear();
}
if( pGraphic )
@@ -196,7 +196,7 @@ bool SwGrfNode::ReRead(
Graphic aGrf; aGrf.SetDefaultType();
maGrfObj.SetGraphic( aGrf, sURLLink );
- if( refLink.is() )
+ if( mxLink.is() )
{
if( getLayoutFrame( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) )
{
@@ -206,7 +206,7 @@ bool SwGrfNode::ReRead(
else if ( bNewGrf )
{
//TODO refLink->setInputStream(getInputStream());
- static_cast<SwBaseLink*>( refLink.get() )->SwapIn();
+ static_cast<SwBaseLink*>( mxLink.get() )->SwapIn();
}
}
onGraphicChanged();
@@ -235,7 +235,7 @@ bool SwGrfNode::ReRead(
onGraphicChanged();
bReadGrf = true;
// create connection without update, as we have the graphic
- static_cast<SwBaseLink*>( refLink.get() )->Connect();
+ static_cast<SwBaseLink*>( mxLink.get() )->Connect();
}
else
{
@@ -245,7 +245,7 @@ bool SwGrfNode::ReRead(
onGraphicChanged();
if ( bNewGrf )
{
- static_cast<SwBaseLink*>( refLink.get() )->SwapIn();
+ static_cast<SwBaseLink*>( mxLink.get() )->SwapIn();
}
}
}
@@ -274,11 +274,11 @@ SwGrfNode::~SwGrfNode()
mpThreadConsumer.reset();
SwDoc* pDoc = GetDoc();
- if( refLink.is() )
+ if( mxLink.is() )
{
- OSL_ENSURE( !bInSwapIn, "DTOR: I am still in SwapIn" );
- pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
- refLink->Disconnect();
+ OSL_ENSURE( !mbInSwapIn, "DTOR: I am still in SwapIn" );
+ pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( mxLink.get() );
+ mxLink->Disconnect();
}
else
{
@@ -418,11 +418,11 @@ SwGrfNode * SwNodes::MakeGrfNode( const SwNodeIndex & rWhere,
Size SwGrfNode::GetTwipSize() const
{
- if( !nGrfSize.Width() && !nGrfSize.Height() )
+ if( !mnGrfSize.Width() && !mnGrfSize.Height() )
{
const_cast<SwGrfNode*>(this)->SwapIn();
}
- return nGrfSize;
+ return mnGrfSize;
}
/**
@@ -431,12 +431,12 @@ Size SwGrfNode::GetTwipSize() const
*/
bool SwGrfNode::SwapIn(bool bWaitForData)
{
- if(bInSwapIn) // not recursively!
+ if(mbInSwapIn) // not recursively!
return true;
bool bRet = false;
- bInSwapIn = true;
- SwBaseLink* pLink = static_cast<SwBaseLink*>( refLink.get() );
+ mbInSwapIn = true;
+ SwBaseLink* pLink = static_cast<SwBaseLink*>( mxLink.get() );
if( pLink )
{
@@ -469,29 +469,29 @@ bool SwGrfNode::SwapIn(bool bWaitForData)
if (bRet)
{
- if( !nGrfSize.Width() && !nGrfSize.Height() )
+ if( !mnGrfSize.Width() && !mnGrfSize.Height() )
SetTwipSize( ::GetGraphicSizeTwip( maGrfObj.GetGraphic(), nullptr ) );
}
- bInSwapIn = false;
+ mbInSwapIn = false;
return bRet;
}
bool SwGrfNode::GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm ) const
{
bool bRet = false;
- if( refLink.is() && refLink->GetLinkManager() )
+ if( mxLink.is() && mxLink->GetLinkManager() )
{
- sal_uInt16 nType = refLink->GetObjType();
+ sal_uInt16 nType = mxLink->GetObjType();
if( OBJECT_CLIENT_GRF == nType )
bRet = sfx2::LinkManager::GetDisplayNames(
- refLink.get(), nullptr, pFileNm, nullptr, pFilterNm );
+ mxLink.get(), nullptr, pFileNm, nullptr, pFilterNm );
else if( OBJECT_CLIENT_DDE == nType && pFileNm && pFilterNm )
{
OUString sApp;
OUString sTopic;
OUString sItem;
if( sfx2::LinkManager::GetDisplayNames(
- refLink.get(), &sApp, &sTopic, &sItem ) )
+ mxLink.get(), &sApp, &sTopic, &sItem ) )
{
*pFileNm = sApp + OUStringChar(sfx2::cTokenSeparator)
+ sTopic + OUStringChar(sfx2::cTokenSeparator)
@@ -510,10 +510,10 @@ bool SwGrfNode::GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm ) const
*/
bool SwGrfNode::SavePersistentData()
{
- if( refLink.is() )
+ if( mxLink.is() )
{
- OSL_ENSURE( !bInSwapIn, "SavePersistentData: I am still in SwapIn" );
- GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
+ OSL_ENSURE( !mbInSwapIn, "SavePersistentData: I am still in SwapIn" );
+ GetDoc()->getIDocumentLinksAdministration().GetLinkManager().Remove( mxLink.get() );
return true;
}
@@ -538,40 +538,40 @@ bool SwGrfNode::SavePersistentData()
bool SwGrfNode::RestorePersistentData()
{
- if( refLink.is() )
+ if( mxLink.is() )
{
IDocumentLinksAdministration& rIDLA = getIDocumentLinksAdministration();
- refLink->SetVisible( rIDLA.IsVisibleLinks() );
- rIDLA.GetLinkManager().InsertDDELink( refLink.get() );
+ mxLink->SetVisible( rIDLA.IsVisibleLinks() );
+ rIDLA.GetLinkManager().InsertDDELink( mxLink.get() );
if( getIDocumentLayoutAccess().GetCurrentLayout() )
- refLink->Update();
+ mxLink->Update();
}
return true;
}
void SwGrfNode::InsertLink( const OUString& rGrfName, const OUString& rFltName )
{
- refLink = new SwBaseLink( SfxLinkUpdateMode::ONCALL, SotClipboardFormatId::GDIMETAFILE, this );
+ mxLink = new SwBaseLink( SfxLinkUpdateMode::ONCALL, SotClipboardFormatId::GDIMETAFILE, this );
IDocumentLinksAdministration& rIDLA = getIDocumentLinksAdministration();
if( GetNodes().IsDocNodes() )
{
- refLink->SetVisible( rIDLA.IsVisibleLinks() );
+ mxLink->SetVisible( rIDLA.IsVisibleLinks() );
if( rFltName == "DDE" )
{
sal_Int32 nTmp = 0;
const OUString sApp{ rGrfName.getToken( 0, sfx2::cTokenSeparator, nTmp ) };
const OUString sTopic{ rGrfName.getToken( 0, sfx2::cTokenSeparator, nTmp ) };
const OUString sItem{ rGrfName.copy( nTmp ) };
- rIDLA.GetLinkManager().InsertDDELink( refLink.get(), sApp, sTopic, sItem );
+ rIDLA.GetLinkManager().InsertDDELink( mxLink.get(), sApp, sTopic, sItem );
}
else
{
const bool bSync = rFltName == "SYNCHRON";
- refLink->SetSynchron( bSync );
- refLink->SetContentType( SotClipboardFormatId::SVXB );
+ mxLink->SetSynchron( bSync );
+ mxLink->SetContentType( SotClipboardFormatId::SVXB );
- rIDLA.GetLinkManager().InsertFileLink( *refLink,
+ rIDLA.GetLinkManager().InsertFileLink( *mxLink,
OBJECT_CLIENT_GRF, rGrfName,
(!bSync && !rFltName.isEmpty() ? &rFltName : nullptr) );
}
@@ -580,20 +580,20 @@ void SwGrfNode::InsertLink( const OUString& rGrfName, const OUString& rFltName )
void SwGrfNode::ReleaseLink()
{
- if( refLink.is() )
+ if( mxLink.is() )
{
Graphic aLocalGraphic(maGrfObj.GetGraphic());
const bool bHasOriginalData(aLocalGraphic.IsGfxLink());
{
- bInSwapIn = true;
- SwBaseLink* pLink = static_cast<SwBaseLink*>( refLink.get() );
+ mbInSwapIn = true;
+ SwBaseLink* pLink = static_cast<SwBaseLink*>( mxLink.get() );
pLink->SwapIn( true, true );
- bInSwapIn = false;
+ mbInSwapIn = false;
}
- getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
- refLink.clear();
+ getIDocumentLinksAdministration().GetLinkManager().Remove( mxLink.get() );
+ mxLink.clear();
aLocalGraphic.setOriginURL("");
// #i15508# added extra processing after getting rid of the link. Use whatever is
@@ -616,8 +616,8 @@ void SwGrfNode::ReleaseLink()
void SwGrfNode::SetTwipSize( const Size& rSz )
{
- nGrfSize = rSz;
- if( IsScaleImageMap() && nGrfSize.Width() && nGrfSize.Height() )
+ mnGrfSize = rSz;
+ if( IsScaleImageMap() && mnGrfSize.Width() && mnGrfSize.Height() )
{
// resize Image-Map to size of the graphic
ScaleImageMap();
@@ -629,7 +629,7 @@ void SwGrfNode::SetTwipSize( const Size& rSz )
void SwGrfNode::ScaleImageMap()
{
- if( !nGrfSize.Width() || !nGrfSize.Height() )
+ if( !mnGrfSize.Width() || !mnGrfSize.Height() )
return;
// re-scale Image-Map
@@ -658,9 +658,9 @@ void SwGrfNode::ScaleImageMap()
OSL_ENSURE( nWidth>0, "Do any 0 twip wide graphics exist!?" );
- if( nGrfSize.Width() != nWidth )
+ if( mnGrfSize.Width() != nWidth )
{
- aScaleX = Fraction( nGrfSize.Width(), nWidth );
+ aScaleX = Fraction( mnGrfSize.Width(), nWidth );
bScale = true;
}
}
@@ -673,9 +673,9 @@ void SwGrfNode::ScaleImageMap()
OSL_ENSURE( nHeight>0, "Do any 0 twip high graphics exist!?" );
- if( nGrfSize.Height() != nHeight )
+ if( mnGrfSize.Height() != nHeight )
{
- aScaleY = Fraction( nGrfSize.Height(), nHeight );
+ aScaleY = Fraction( mnGrfSize.Height(), nHeight );
bScale = true;
}
}
@@ -696,11 +696,11 @@ SwContentNode* SwGrfNode::MakeCopy(SwDoc* pDoc, const SwNodeIndex& rIdx, bool) c
OUString sFile, sFilter;
if( IsLinkedFile() )
- sfx2::LinkManager::GetDisplayNames( refLink.get(), nullptr, &sFile, nullptr, &sFilter );
+ sfx2::LinkManager::GetDisplayNames( mxLink.get(), nullptr, &sFile, nullptr, &sFilter );
else if( IsLinkedDDE() )
{
OUString sTmp1, sTmp2;
- sfx2::LinkManager::GetDisplayNames( refLink.get(), &sTmp1, &sTmp2, &sFilter );
+ sfx2::LinkManager::GetDisplayNames( mxLink.get(), &sTmp1, &sTmp2, &sFilter );
sfx2::MakeLnkName( sFile, &sTmp1, sTmp2, sFilter );
sFilter = "DDE";
}
@@ -802,7 +802,7 @@ void SwGrfNode::TriggerAsyncRetrieveInputStream()
mpThreadConsumer.reset(new SwAsyncRetrieveInputStreamThreadConsumer(*this), o3tl::default_delete<SwAsyncRetrieveInputStreamThreadConsumer>());
OUString sGrfNm;
- sfx2::LinkManager::GetDisplayNames( refLink.get(), nullptr, &sGrfNm );
+ sfx2::LinkManager::GetDisplayNames( mxLink.get(), nullptr, &sGrfNm );
OUString sReferer;
SfxObjectShell * sh = GetDoc()->GetPersist();
if (sh != nullptr && sh->HasName())
@@ -834,7 +834,7 @@ void SwGrfNode::ApplyInputStream(
void SwGrfNode::UpdateLinkWithInputStream()
{
// do not work on link, if a <SwapIn> has been triggered.
- if ( !bInSwapIn && IsLinkedFile() )
+ if ( !mbInSwapIn && IsLinkedFile() )
{
GetLink()->setStreamToLoadFrom( mxInputStream, mbIsStreamReadOnly );
GetLink()->Update();
@@ -857,7 +857,7 @@ bool SwGrfNode::IsAsyncRetrieveInputStreamPossible() const
if ( IsLinkedFile() )
{
OUString sGrfNm;
- sfx2::LinkManager::GetDisplayNames( refLink.get(), nullptr, &sGrfNm );
+ sfx2::LinkManager::GetDisplayNames( mxLink.get(), nullptr, &sGrfNm );
if ( !sGrfNm.startsWith( "vnd.sun.star.pkg:" ) )
{
bRet = true;
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index ccc246ab8404..628322cc3732 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -2516,10 +2516,10 @@ void SwChartDataSequence::ExtendTo( bool bExtendCol,
}
SwChartLabeledDataSequence::SwChartLabeledDataSequence() :
- aEvtListeners( GetChartMutex() ),
- aModifyListeners( GetChartMutex() )
+ m_aEventListeners( GetChartMutex() ),
+ m_aModifyListeners( GetChartMutex() )
{
- bDisposed = false;
+ m_bDisposed = false;
}
SwChartLabeledDataSequence::~SwChartLabeledDataSequence()
@@ -2529,9 +2529,9 @@ SwChartLabeledDataSequence::~SwChartLabeledDataSequence()
uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartLabeledDataSequence::getValues( )
{
SolarMutexGuard aGuard;
- if (bDisposed)
+ if (m_bDisposed)
throw lang::DisposedException();
- return xData;
+ return m_xData;
}
void SwChartLabeledDataSequence::SetDataSequence(
@@ -2564,50 +2564,50 @@ void SAL_CALL SwChartLabeledDataSequence::setValues(
const uno::Reference< chart2::data::XDataSequence >& rxSequence )
{
SolarMutexGuard aGuard;
- if (bDisposed)
+ if (m_bDisposed)
throw lang::DisposedException();
- if (xData != rxSequence)
+ if (m_xData != rxSequence)
{
- SetDataSequence( xData, rxSequence );
+ SetDataSequence( m_xData, rxSequence );
// inform listeners of changes
- LaunchModifiedEvent( aModifyListeners, dynamic_cast< XModifyBroadcaster * >(this) );
+ LaunchModifiedEvent( m_aModifyListeners, dynamic_cast< XModifyBroadcaster * >(this) );
}
}
uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartLabeledDataSequence::getLabel( )
{
SolarMutexGuard aGuard;
- if (bDisposed)
+ if (m_bDisposed)
throw lang::DisposedException();
- return xLabels;
+ return m_xLabels;
}
void SAL_CALL SwChartLabeledDataSequence::setLabel(
const uno::Reference< chart2::data::XDataSequence >& rxSequence )
{
SolarMutexGuard aGuard;
- if (bDisposed)
+ if (m_bDisposed)
throw lang::DisposedException();
- if (xLabels != rxSequence)
+ if (m_xLabels != rxSequence)
{
- SetDataSequence( xLabels, rxSequence );
+ SetDataSequence( m_xLabels, rxSequence );
// inform listeners of changes
- LaunchModifiedEvent( aModifyListeners, dynamic_cast< XModifyBroadcaster * >(this) );
+ LaunchModifiedEvent( m_aModifyListeners, dynamic_cast< XModifyBroadcaster * >(this) );
}
}
uno::Reference< util::XCloneable > SAL_CALL SwChartLabeledDataSequence::createClone( )
{
SolarMutexGuard aGuard;
- if (bDisposed)
+ if (m_bDisposed)
throw lang::DisposedException();
uno::Reference< util::XCloneable > xRes;
- uno::Reference< util::XCloneable > xDataCloneable( xData, uno::UNO_QUERY );
- uno::Reference< util::XCloneable > xLabelsCloneable( xLabels, uno::UNO_QUERY );
+ uno::Reference< util::XCloneable > xDataCloneable( m_xData, uno::UNO_QUERY );
+ uno::Reference< util::XCloneable > xLabelsCloneable( m_xLabels, uno::UNO_QUERY );
SwChartLabeledDataSequence *pRes = new SwChartLabeledDataSequence();
if (xDataCloneable.is())
{
@@ -2645,20 +2645,20 @@ void SAL_CALL SwChartLabeledDataSequence::disposing(
{
osl::MutexGuard aGuard( GetChartMutex() );
uno::Reference< uno::XInterface > xRef( rSource.Source );
- if (xRef == xData)
- xData.clear();
- if (xRef == xLabels)
- xLabels.clear();
- if (!xData.is() && !xLabels.is())
+ if (xRef == m_xData)
+ m_xData.clear();
+ if (xRef == m_xLabels)
+ m_xLabels.clear();
+ if (!m_xData.is() && !m_xLabels.is())
dispose();
}
void SAL_CALL SwChartLabeledDataSequence::modified(
const lang::EventObject& rEvent )
{
- if (rEvent.Source == xData || rEvent.Source == xLabels)
+ if (rEvent.Source == m_xData || rEvent.Source == m_xLabels)
{
- LaunchModifiedEvent( aModifyListeners, dynamic_cast< XModifyBroadcaster * >(this) );
+ LaunchModifiedEvent( m_aModifyListeners, dynamic_cast< XModifyBroadcaster * >(this) );
}
}
@@ -2666,16 +2666,16 @@ void SAL_CALL SwChartLabeledDataSequence::addModifyListener(
const uno::Reference< util::XModifyListener >& rxListener )
{
osl::MutexGuard aGuard( GetChartMutex() );
- if (!bDisposed && rxListener.is())
- aModifyListeners.addInterface( rxListener );
+ if (!m_bDisposed && rxListener.is())
+ m_aModifyListeners.addInterface( rxListener );
}
void SAL_CALL SwChartLabeledDataSequence::removeModifyListener(
const uno::Reference< util::XModifyListener >& rxListener )
{
osl::MutexGuard aGuard( GetChartMutex() );
- if (!bDisposed && rxListener.is())
- aModifyListeners.removeInterface( rxListener );
+ if (!m_bDisposed && rxListener.is())
+ m_aModifyListeners.removeInterface( rxListener );
}
void SAL_CALL SwChartLabeledDataSequence::dispose( )
@@ -2683,18 +2683,18 @@ void SAL_CALL SwChartLabeledDataSequence::dispose( )
bool bMustDispose( false );
{
osl::MutexGuard aGuard( GetChartMutex() );
- bMustDispose = !bDisposed;
- if (!bDisposed)
- bDisposed = true;
+ bMustDispose = !m_bDisposed;
+ if (!m_bDisposed)
+ m_bDisposed = true;
}
if (bMustDispose)
{
- bDisposed = true;
+ m_bDisposed = true;
// require listeners to release references to this object
lang::EventObject aEvtObj( dynamic_cast< chart2::data::XLabeledDataSequence * >(this) );
- aModifyListeners.disposeAndClear( aEvtObj );
- aEvtListeners.disposeAndClear( aEvtObj );
+ m_aModifyListeners.disposeAndClear( aEvtObj );
+ m_aEventListeners.disposeAndClear( aEvtObj );
}
}
@@ -2702,16 +2702,16 @@ void SAL_CALL SwChartLabeledDataSequence::addEventListener(
const uno::Reference< lang::XEventListener >& rxListener )
{
osl::MutexGuard aGuard( GetChartMutex() );
- if (!bDisposed && rxListener.is())
- aEvtListeners.addInterface( rxListener );
+ if (!m_bDisposed && rxListener.is())
+ m_aEventListeners.addInterface( rxListener );
}
void SAL_CALL SwChartLabeledDataSequence::removeEventListener(
const uno::Reference< lang::XEventListener >& rxListener )
{
osl::MutexGuard aGuard( GetChartMutex() );
- if (!bDisposed && rxListener.is())
- aEvtListeners.removeInterface( rxListener );
+ if (!m_bDisposed && rxListener.is())
+ m_aEventListeners.removeInterface( rxListener );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list