diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 11:30:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 14:12:07 +0100 |
| commit | ddc280920282ff3e2801e9a79f9dfa8a6c6f5699 (patch) | |
| tree | 4b477c76374f2f36659ba674c2e5d6796629d45b /sw/source/core/txtnode | |
| parent | 63e7b7afa75252298606c84e8ec82adaee5fa28a (diff) | |
boost->std
Change-Id: Idfbcfa1e5ba7bff92e98693c33c4b33a6beda08f
Diffstat (limited to 'sw/source/core/txtnode')
| -rw-r--r-- | sw/source/core/txtnode/atrfld.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/txtnode/fmtatr2.cxx | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 4445da495c54..7ec67802ab31 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -473,7 +473,7 @@ void SwTextField::NotifyContentChange(SwFormatField& rFormatField) /*static*/ void SwTextField::GetPamForTextField( const SwTextField& rTextField, - boost::shared_ptr< SwPaM >& rPamForTextField ) + std::shared_ptr< SwPaM >& rPamForTextField ) { if (rTextField.GetpTextNode() == NULL) { @@ -495,7 +495,7 @@ void SwTextField::DeleteTextField( const SwTextField& rTextField ) { if (rTextField.GetpTextNode() != NULL) { - boost::shared_ptr< SwPaM > pPamForTextField; + std::shared_ptr< SwPaM > pPamForTextField; GetPamForTextField(rTextField, pPamForTextField); if (pPamForTextField.get() != NULL) { diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index 9bdc06a39d56..26d212917b68 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -531,7 +531,7 @@ SwFormatMeta::SwFormatMeta(const sal_uInt16 i_nWhich) "ERROR: SwFormatMeta: invalid which id!"); } -SwFormatMeta::SwFormatMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta, +SwFormatMeta::SwFormatMeta( std::shared_ptr< ::sw::Meta > const & i_pMeta, const sal_uInt16 i_nWhich ) : SfxPoolItem( i_nWhich ) , m_pMeta( i_pMeta ) @@ -608,7 +608,7 @@ void SwFormatMeta::DoCopy(::sw::MetaFieldManager & i_rTargetDocManager, OSL_ENSURE(m_pMeta, "DoCopy called for SwFormatMeta with no sw::Meta?"); if (m_pMeta) { - const ::boost::shared_ptr< ::sw::Meta> pOriginal( m_pMeta ); + const std::shared_ptr< ::sw::Meta> pOriginal( m_pMeta ); if (RES_TXTATR_META == Which()) { m_pMeta.reset( new ::sw::Meta(this) ); @@ -778,11 +778,11 @@ MetaFieldManager::MetaFieldManager() { } -::boost::shared_ptr<MetaField> +std::shared_ptr<MetaField> MetaFieldManager::makeMetaField(SwFormatMeta * const i_pFormat, const sal_uInt32 nNumberFormat, const bool bIsFixedLanguage) { - const ::boost::shared_ptr<MetaField> pMetaField( + const std::shared_ptr<MetaField> pMetaField( new MetaField(i_pFormat, nNumberFormat, bIsFixedLanguage) ); m_MetaFields.push_back(pMetaField); return pMetaField; @@ -790,7 +790,7 @@ MetaFieldManager::makeMetaField(SwFormatMeta * const i_pFormat, struct IsInUndo { - bool operator()(::boost::weak_ptr<MetaField> const & pMetaField) { + bool operator()(std::weak_ptr<MetaField> const & pMetaField) { return pMetaField.lock()->IsInUndo(); } }; @@ -798,7 +798,7 @@ struct IsInUndo struct MakeUnoObject { uno::Reference<text::XTextField> - operator()(::boost::weak_ptr<MetaField> const & pMetaField) { + operator()(std::weak_ptr<MetaField> const & pMetaField) { return uno::Reference<text::XTextField>( pMetaField.lock()->MakeUnoObject(), uno::UNO_QUERY); } @@ -810,7 +810,7 @@ MetaFieldManager::getMetaFields() // erase deleted fields const MetaFieldList_t::iterator iter( ::std::remove_if(m_MetaFields.begin(), m_MetaFields.end(), - [] (::boost::weak_ptr<MetaField> const& rField) { return rField.expired(); })); + [] (std::weak_ptr<MetaField> const& rField) { return rField.expired(); })); m_MetaFields.erase(iter, m_MetaFields.end()); // filter out fields in UNDO MetaFieldList_t filtered(m_MetaFields.size()); |