[Libreoffice-commits] core.git: basic/source cui/source dbaccess/source idl/source include/tools sfx2/source sot/source svtools/source sw/source tools/source xmloff/source
Noel Grandin
noel at peralex.com
Thu Oct 2 22:26:19 PDT 2014
basic/source/classes/sbxmod.cxx | 4 ++--
basic/source/runtime/runtime.cxx | 6 +++---
basic/source/sbx/sbxexec.cxx | 12 ++++++------
basic/source/sbx/sbxvalue.cxx | 6 +++---
cui/source/dialogs/linkdlg.cxx | 2 +-
dbaccess/source/ui/misc/TokenWriter.cxx | 4 ++--
dbaccess/source/ui/misc/WTypeSelect.cxx | 2 +-
idl/source/cmptools/hash.cxx | 2 +-
include/tools/ref.hxx | 6 +++---
sfx2/source/appl/appbas.cxx | 2 +-
sfx2/source/notify/hintpost.cxx | 2 +-
sot/source/base/object.cxx | 2 +-
sot/source/sdstor/stgcache.cxx | 2 +-
sot/source/sdstor/ucbstorage.cxx | 14 +++++++-------
svtools/source/svhtml/parhtml.cxx | 2 +-
svtools/source/svrtf/parrtf.cxx | 2 +-
sw/source/filter/xml/xmlfmt.cxx | 2 +-
sw/source/filter/xml/xmltbli.cxx | 2 +-
tools/source/ref/pstm.cxx | 2 +-
xmloff/source/core/xmlimp.cxx | 2 +-
xmloff/source/draw/sdxmlimp.cxx | 2 +-
xmloff/source/draw/shapeimport.cxx | 4 ++--
xmloff/source/draw/ximp3dscene.cxx | 2 +-
xmloff/source/draw/ximpstyl.cxx | 6 +++---
xmloff/source/forms/layerimport.cxx | 4 ++--
xmloff/source/style/xmlnumi.cxx | 2 +-
xmloff/source/style/xmlstyle.cxx | 2 +-
xmloff/source/style/xmltabi.cxx | 2 +-
xmloff/source/text/XMLTextColumnsContext.cxx | 4 ++--
xmloff/source/text/txtparaimphint.hxx | 2 +-
xmloff/source/text/txtstyli.cxx | 2 +-
31 files changed, 55 insertions(+), 55 deletions(-)
New commits:
commit c625525ddcc5bd1ceb1be95031da6047280d623c
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 2 14:37:06 2014 +0200
rename SvRef::AddRef to AddFirstRef
to make it's intended purpose clearly distinguishable from AddNextRef
Change-Id: I5da780b48b19fd873667b648031bc394113f953b
Reviewed-on: https://gerrit.libreoffice.org/11763
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 5ff0767..351508c 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2103,11 +2103,11 @@ ErrCode SbMethod::Call( SbxValue* pRet, SbxVariable* pCaller )
}
// RefCount vom Modul hochzaehlen
SbModule* pMod_ = static_cast<SbModule*>(GetParent());
- pMod_->AddRef();
+ pMod_->AddFirstRef();
// Increment the RefCount of the Basic
StarBASIC* pBasic = static_cast<StarBASIC*>(pMod_->GetParent());
- pBasic->AddRef();
+ pBasic->AddFirstRef();
// Establish the values to get the return value
SbxValues aVals;
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index e8354d6..8cae088 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1406,7 +1406,7 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
{
pNULL = new SbxVariable;
pNULL->PutNull();
- pNULL->AddRef();
+ pNULL->AddFirstRef();
}
PushVar( pNULL );
}
@@ -1416,7 +1416,7 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
{
pTRUE = new SbxVariable;
pTRUE->PutBool( true );
- pTRUE->AddRef();
+ pTRUE->AddFirstRef();
}
PushVar( pTRUE );
}
@@ -1426,7 +1426,7 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
{
pFALSE = new SbxVariable;
pFALSE->PutBool( false );
- pFALSE->AddRef();
+ pFALSE->AddFirstRef();
}
PushVar( pFALSE );
}
diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx
index c777193..1afee57 100644
--- a/basic/source/sbx/sbxexec.cxx
+++ b/basic/source/sbx/sbxexec.cxx
@@ -108,7 +108,7 @@ static SbxVariable* QualifiedName
SbxBase::SetError( SbxERR_SYNTAX );
*ppBuf = p;
if( refVar.Is() )
- refVar->AddRef();
+ refVar->AddFirstRef();
return refVar;
}
@@ -166,7 +166,7 @@ static SbxVariable* Operand
}
*ppBuf = p;
if( refVar.Is() )
- refVar->AddRef();
+ refVar->AddFirstRef();
return refVar;
}
@@ -201,7 +201,7 @@ static SbxVariable* MulDiv( SbxObject* pObj, SbxObject* pGbl, const sal_Unicode*
}
*ppBuf = p;
if( refVar.Is() )
- refVar->AddRef();
+ refVar->AddFirstRef();
return refVar;
}
@@ -233,7 +233,7 @@ static SbxVariable* PlusMinus( SbxObject* pObj, SbxObject* pGbl, const sal_Unico
}
*ppBuf = p;
if( refVar.Is() )
- refVar->AddRef();
+ refVar->AddFirstRef();
return refVar;
}
@@ -271,7 +271,7 @@ static SbxVariable* Assign( SbxObject* pObj, SbxObject* pGbl, const sal_Unicode*
}
*ppBuf = p;
if( refVar.Is() )
- refVar->AddRef();
+ refVar->AddFirstRef();
return refVar;
}
@@ -339,7 +339,7 @@ static SbxVariable* Element
}
*ppBuf = p;
if( refVar.Is() )
- refVar->AddRef();
+ refVar->AddFirstRef();
return refVar;
}
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index be6bd87..605cfe3 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -68,7 +68,7 @@ SbxValue::SbxValue( SbxDataType t, void* p ) : SbxBase()
case SbxOBJECT:
aData.pObj = (SbxBase*) p;
if( p )
- aData.pObj->AddRef();
+ aData.pObj->AddFirstRef();
break;
case SbxDECIMAL:
aData.pDecimal = (SbxDecimal*) p;
@@ -107,7 +107,7 @@ SbxValue::SbxValue( const SbxValue& r )
break;
case SbxOBJECT:
if( aData.pObj )
- aData.pObj->AddRef();
+ aData.pObj->AddFirstRef();
break;
case SbxDECIMAL:
if( aData.pDecimal )
@@ -542,7 +542,7 @@ bool SbxValue::Put( const SbxValues& rVal )
bool bParentProp = pThisVar && 5345 ==
( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) );
if ( !bParentProp )
- p->aData.pObj->AddRef();
+ p->aData.pObj->AddFirstRef();
}
}
else
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index ce20785..a6909d6 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -74,7 +74,7 @@ public:
void push_back(SvBaseLink* p)
{
mLinks.push_back(p);
- p->AddRef();
+ p->AddFirstRef();
}
};
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 35bbc30..1c1b8952 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -607,7 +607,7 @@ bool ORTFImportExport::Read()
if ( m_pStream )
{
m_pReader = new ORTFReader((*m_pStream),m_xConnection,m_xFormatter,m_xContext);
- ((ORTFReader*)m_pReader)->AddRef();
+ ((ORTFReader*)m_pReader)->AddFirstRef();
if ( isCheckEnabled() )
m_pReader->enableCheckOnly();
eState = ((ORTFReader*)m_pReader)->CallParser();
@@ -678,7 +678,7 @@ bool OHTMLImportExport::Read()
if ( m_pStream )
{
m_pReader = new OHTMLReader((*m_pStream),m_xConnection,m_xFormatter,m_xContext);
- ((OHTMLReader*)m_pReader)->AddRef();
+ ((OHTMLReader*)m_pReader)->AddFirstRef();
if ( isCheckEnabled() )
m_pReader->enableCheckOnly();
m_pReader->SetTableName(m_sDefaultTableName);
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 46f952f..3bb89f9 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -443,7 +443,7 @@ void OWizTypeSelect::fillColumnList(sal_uInt32 nRows)
SvParser *pReader = createReader(nRows);
if(pReader)
{
- pReader->AddRef();
+ pReader->AddFirstRef();
pReader->CallParser();
pReader->ReleaseRef();
}
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index 4e41c89..dc513e4 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -92,7 +92,7 @@ SvStringHashTable::SvStringHashTable( sal_uInt32 nMaxEntries )
pEnd = pEntries + nMaxEntries;
while( pPos != pEnd )
{
- pPos->AddRef();
+ pPos->AddFirstRef();
pPos++;
}
}
diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index 3b8b320..b18ce05 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -40,7 +40,7 @@ public:
SvRef(T * pObjP): pObj(pObjP)
{
- if (pObj != 0) pObj->AddRef();
+ if (pObj != 0) pObj->AddFirstRef();
}
~SvRef()
@@ -121,7 +121,7 @@ public:
inline void push_back( T p )
{
base_t::push_back( p );
- p->AddRef();
+ p->AddFirstRef();
}
inline void insert(const SvRefMemberList& rOther)
@@ -171,7 +171,7 @@ public:
++nRefCount;
}
- void AddRef()
+ void AddFirstRef()
{
assert( nRefCount < (1 << 30) && "Do not add refs to dead objects" );
if( bNoDelete )
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 0501d5a..5f48908 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -155,7 +155,7 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
if ( pItem )
{
SbxObject* pObject = SbxBase::CreateObject( pItem->GetValue() );
- pObject->AddRef();
+ pObject->AddFirstRef();
rReq.Done();
}
break;
diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx
index f139538..f0b127a 100644
--- a/sfx2/source/notify/hintpost.cxx
+++ b/sfx2/source/notify/hintpost.cxx
@@ -42,7 +42,7 @@ SfxHintPoster::~SfxHintPoster()
void SfxHintPoster::Post( SfxHint* pHintToPost )
{
Application::PostUserEvent( ( LINK(this, SfxHintPoster, DoEvent_Impl) ), pHintToPost );
- AddRef();
+ AddFirstRef();
}
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index 7b12750..2e5a781 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.cxx
@@ -88,7 +88,7 @@ void SotObject::OwnerLock
if( bLock )
{
nOwnerLockCount++;
- AddRef();
+ AddFirstRef();
}
else if ( nOwnerLockCount )
{
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index e073dc8..cbed63a 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -262,7 +262,7 @@ void StgCache::SetStrm( UCBStorageStream* pStgStream )
if ( pStorageStream )
{
- pStorageStream->AddRef();
+ pStorageStream->AddFirstRef();
pStrm = pStorageStream->GetModifySvStream();
}
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index fc8b368..b5c12cd 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -1264,14 +1264,14 @@ UCBStorageStream::UCBStorageStream( const OUString& rName, StreamMode nMode, boo
// pImp must be initialized in the body, because otherwise the vtable of the stream is not initialized
// to class UCBStorageStream !
pImp = new UCBStorageStream_Impl( rName, nMode, this, bDirect, pKey, bRepair, xProgress );
- pImp->AddRef(); // use direct refcounting because in header file only a pointer should be used
+ pImp->AddFirstRef(); // use direct refcounting because in header file only a pointer should be used
StorageBase::m_nMode = pImp->m_nMode;
}
UCBStorageStream::UCBStorageStream( UCBStorageStream_Impl *pImpl )
: pImp( pImpl )
{
- pImp->AddRef(); // use direct refcounting because in header file only a pointer should be used
+ pImp->AddFirstRef(); // use direct refcounting because in header file only a pointer should be used
pImp->m_pAntiImpl = this;
SetError( pImp->m_nError );
StorageBase::m_nMode = pImp->m_nMode;
@@ -1474,7 +1474,7 @@ UCBStorage::UCBStorage( SvStream& rStrm, bool bDirect )
pImp = new UCBStorage_Impl( rStrm, this, bDirect );
}
- pImp->AddRef();
+ pImp->AddFirstRef();
pImp->Init();
StorageBase::m_nMode = pImp->m_nMode;
}
@@ -1484,7 +1484,7 @@ UCBStorage::UCBStorage( const ::ucbhelper::Content& rContent, const OUString& rN
// pImp must be initialized in the body, because otherwise the vtable of the stream is not initialized
// to class UCBStorage !
pImp = new UCBStorage_Impl( rContent, rName, nMode, this, bDirect, bIsRoot );
- pImp->AddRef();
+ pImp->AddFirstRef();
pImp->Init();
StorageBase::m_nMode = pImp->m_nMode;
}
@@ -1494,7 +1494,7 @@ UCBStorage::UCBStorage( const OUString& rName, StreamMode nMode, bool bDirect, b
// pImp must be initialized in the body, because otherwise the vtable of the stream is not initialized
// to class UCBStorage !
pImp = new UCBStorage_Impl( rName, nMode, this, bDirect, bIsRoot, bIsRepair, xProgressHandler );
- pImp->AddRef();
+ pImp->AddFirstRef();
pImp->Init();
StorageBase::m_nMode = pImp->m_nMode;
}
@@ -1504,7 +1504,7 @@ UCBStorage::UCBStorage( const OUString& rName, StreamMode nMode, bool bDirect, b
// pImp must be initialized in the body, because otherwise the vtable of the stream is not initialized
// to class UCBStorage !
pImp = new UCBStorage_Impl( rName, nMode, this, bDirect, bIsRoot, false, Reference< XProgressHandler >() );
- pImp->AddRef();
+ pImp->AddFirstRef();
pImp->Init();
StorageBase::m_nMode = pImp->m_nMode;
}
@@ -1514,7 +1514,7 @@ UCBStorage::UCBStorage( UCBStorage_Impl *pImpl )
{
pImp->m_pAntiImpl = this;
SetError( pImp->m_nError );
- pImp->AddRef(); // use direct refcounting because in header file only a pointer should be used
+ pImp->AddFirstRef(); // use direct refcounting because in header file only a pointer should be used
StorageBase::m_nMode = pImp->m_nMode;
}
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index bf40213..47f7701 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -317,7 +317,7 @@ SvParserState HTMLParser::CallParser()
nPre_LinePos = 0;
bPre_IgnoreNewPara = false;
- AddRef();
+ AddFirstRef();
Continue( 0 );
if( SVPAR_PENDING != eState )
ReleaseRef(); // Parser not needed anymore
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 5c74f72..49a612e 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -553,7 +553,7 @@ SvParserState SvRTFParser::CallParser()
// the first two tokens should be '{' and \\rtf !!
if( '{' == GetNextToken() && RTF_RTF == GetNextToken() )
{
- AddRef();
+ AddFirstRef();
Continue( 0 );
if( SVPAR_PENDING != eState )
ReleaseRef(); // now parser is not needed anymore
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 8b359b6..bbb8ae3 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -351,7 +351,7 @@ SvXMLImportContext *SwXMLTextStyleContext_Impl::CreateChildContext(
if( !pConditions )
pConditions = new SwXMLConditions_Impl;
pConditions->push_back( pCond );
- pCond->AddRef();
+ pCond->AddFirstRef();
}
pContext = pCond;
}
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 0b0bd94..3aa355b 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1499,7 +1499,7 @@ SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
}
pDDESource = new SwXMLDDETableContext_Impl( GetSwImport(), nPrefix,
rLocalName );
- pDDESource->AddRef();
+ pDDESource->AddFirstRef();
pContext = pDDESource;
}
break;
diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx
index 1e9dfba..bba75a2 100644
--- a/tools/source/ref/pstm.cxx
+++ b/tools/source/ref/pstm.cxx
@@ -587,7 +587,7 @@ sal_uInt32 SvPersistStream::ReadObj
}
pFunc( &rpObj );
// Save reference
- rpObj->AddRef();
+ rpObj->AddFirstRef();
if( bRegister )
{
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 33d84b1..97df9ab 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -717,7 +717,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName,
if( !pContext )
pContext = new SvXMLImportContext( *this, nPrefix, aLocalName );
- pContext->AddRef();
+ pContext->AddFirstRef();
// Remember old namespace map.
if( pRewindMap )
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 4b21bca..b55a0c9 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -739,7 +739,7 @@ SvXMLImportContext* SdXMLImport::CreateMasterStylesContext(const OUString& rLoca
mpMasterStylesContext = new SdXMLMasterStylesContext(
*this, XML_NAMESPACE_OFFICE, rLocalName);
- mpMasterStylesContext->AddRef();
+ mpMasterStylesContext->AddFirstRef();
return mpMasterStylesContext;
}
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index d552b3f..29d768d 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -467,14 +467,14 @@ void XMLShapeImportHelper::SetStylesContext(SvXMLStylesContext* pNew)
{
mpStylesContext = pNew;
if (mpStylesContext)
- mpStylesContext->AddRef();
+ mpStylesContext->AddFirstRef();
}
void XMLShapeImportHelper::SetAutoStylesContext(SvXMLStylesContext* pNew)
{
mpAutoStylesContext = pNew;
if (mpAutoStylesContext)
- mpAutoStylesContext->AddRef();
+ mpAutoStylesContext->AddFirstRef();
}
SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext(
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index ce1d863..dc05038 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -233,7 +233,7 @@ SvXMLImportContext * SdXML3DSceneAttributesHelper::create3DLightContext( sal_uIn
// remember SdXML3DLightContext for later evaluation
if(pContext)
{
- pContext->AddRef();
+ pContext->AddFirstRef();
maList.push_back( static_cast<SdXML3DLightContext*>(pContext) );
}
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 3e3ddd3..ecaf396 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -437,7 +437,7 @@ SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext(
// remember SdXMLPresentationPlaceholderContext for later evaluation
if(pContext)
{
- pContext->AddRef();
+ pContext->AddFirstRef();
DBG_ASSERT(!mpPageMasterStyle, "PageMasterStyle is set, there seem to be two of them (!)");
mpPageMasterStyle = static_cast<SdXMLPageMasterStyleContext*>(pContext);
}
@@ -497,7 +497,7 @@ SvXMLImportContext *SdXMLPresentationPageLayoutContext::CreateChildContext(
// remember SdXMLPresentationPlaceholderContext for later evaluation
if(pContext)
{
- pContext->AddRef();
+ pContext->AddFirstRef();
maList.push_back( static_cast<SdXMLPresentationPlaceholderContext*>(pContext) );
}
}
@@ -1534,7 +1534,7 @@ SvXMLImportContext* SdXMLMasterStylesContext::CreateChildContext(
if(pContext)
{
- pContext->AddRef();
+ pContext->AddFirstRef();
maMasterPageList.push_back( static_cast<SdXMLMasterPageContext*>(pContext) );
}
}
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 57703c1..55e58a3 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -240,7 +240,7 @@ void OFormLayerXMLImport_Impl::setAutoStyleContext(SvXMLStylesContext* _pNewCont
OSL_ENSURE(!m_pAutoStyles, "OFormLayerXMLImport_Impl::setAutoStyleContext: not to be called twice!");
m_pAutoStyles = _pNewContext;
if (m_pAutoStyles)
- m_pAutoStyles->AddRef();
+ m_pAutoStyles->AddFirstRef();
}
void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const OUString& _rControlNumerStyleName)
@@ -253,7 +253,7 @@ void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropert
{
m_pAutoStyles = m_rImporter.GetShapeImport()->GetAutoStylesContext();
if (m_pAutoStyles)
- m_pAutoStyles->AddRef();
+ m_pAutoStyles->AddFirstRef();
}
if (m_pAutoStyles)
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 41e51d8..7ae70dc 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -1075,7 +1075,7 @@ SvXMLImportContext *SvxXMLListStyleContext::CreateChildContext(
if( !pLevelStyles )
pLevelStyles = new SvxXMLListStyle_Impl;
pLevelStyles->push_back( pLevelStyle );
- pLevelStyle->AddRef();
+ pLevelStyle->AddFirstRef();
pContext = pLevelStyle;
}
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index c0a5f86..40a052d 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -304,7 +304,7 @@ SvXMLStylesContext_Impl::~SvXMLStylesContext_Impl()
inline void SvXMLStylesContext_Impl::AddStyle( SvXMLStyleContext *pStyle )
{
aStyles.push_back( pStyle );
- pStyle->AddRef();
+ pStyle->AddFirstRef();
FlushIndex();
}
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index ab9a9af..39ceff7 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -215,7 +215,7 @@ SvXMLImportContext *SvxXMLTabStopImportContext::CreateChildContext(
mpTabStops = new SvxXMLTabStopArray_Impl;
mpTabStops->push_back( pTabStopContext );
- pTabStopContext->AddRef();
+ pTabStopContext->AddFirstRef();
pContext = pTabStopContext;
}
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index badf922..986b84f71 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -352,7 +352,7 @@ SvXMLImportContext *XMLTextColumnsContext::CreateChildContext(
pColumns = new XMLTextColumnsArray_Impl;
pColumns->push_back( pColumn );
- pColumn->AddRef();
+ pColumn->AddFirstRef();
pContext = pColumn;
}
@@ -362,7 +362,7 @@ SvXMLImportContext *XMLTextColumnsContext::CreateChildContext(
pColumnSep =
new XMLTextColumnSepContext_Impl( GetImport(), nPrefix, rLocalName,
xAttrList, *pColumnSepAttrTokenMap );
- pColumnSep->AddRef();
+ pColumnSep->AddFirstRef();
pContext = pColumnSep;
}
diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx
index 8c7d8d1..de10748 100644
--- a/xmloff/source/text/txtparaimphint.hxx
+++ b/xmloff/source/text/txtparaimphint.hxx
@@ -149,7 +149,7 @@ public:
{
pEvents = pCtxt;
if (pEvents != NULL)
- pEvents->AddRef();
+ pEvents->AddFirstRef();
}
};
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index af0fba4..5167c6b 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -193,7 +193,7 @@ SvXMLImportContext *XMLTextStyleContext::CreateChildContext(
// (for delayed processing of events)
pEventContext = new XMLEventsImportContext( GetImport(), nPrefix,
rLocalName);
- pEventContext->AddRef();
+ pEventContext->AddFirstRef();
pContext = pEventContext;
}
More information about the Libreoffice-commits
mailing list