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

More SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP around std::auto_ptr

Browse Source 
...as needed by Clang trunk towards 3.4.

Change-Id: Ibbfe9cb0ec03e0aed939d769feee9e046af4741f
This commit is contained in:
Stephan Bergmann
2013-10-02 16:43:02 +02:00
parent 075d472a9d
commit d3ca36915e
7 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editeng/source/uno/unoedhlp.cxx
View File

@@ -56,6 +56,7 @@ sal_Int32 SvxEditSourceHint::GetEndValue() const
//------------------------------------------------------------------------ //------------------------------------------------------------------------
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxHint> SvxEditSourceHelper::EENotification2Hint( EENotify* aNotify ) ::std::auto_ptr<SfxHint> SvxEditSourceHelper::EENotification2Hint( EENotify* aNotify )
{ {
if( aNotify ) if( aNotify )
@@ -103,6 +104,7 @@ sal_Int32 SvxEditSourceHint::GetEndValue() const
return ::std::auto_ptr<SfxHint>( new SfxHint() ); return ::std::auto_ptr<SfxHint>( new SfxHint() );
} }
SAL_WNODEPRECATED_DECLARATIONS_POP
sal_Bool SvxEditSourceHelper::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_Int32 nPara, sal_uInt16 nIndex ) sal_Bool SvxEditSourceHelper::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_Int32 nPara, sal_uInt16 nIndex )
{ {

2
sc/source/ui/unoobj/servuno.cxx
View File

@@ -604,7 +604,9 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance(
ScAddress aAddress; ScAddress aAddress;
ScCompiler* pComp = new ScCompiler(pDoc,aAddress); ScCompiler* pComp = new ScCompiler(pDoc,aAddress);
pComp->SetGrammar( pDoc->GetGrammar() ); pComp->SetGrammar( pDoc->GetGrammar() );
SAL_WNODEPRECATED_DECLARATIONS_PUSH
xRet.set(static_cast<sheet::XFormulaOpCodeMapper*>(new ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> (pComp)))); xRet.set(static_cast<sheet::XFormulaOpCodeMapper*>(new ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> (pComp))));
SAL_WNODEPRECATED_DECLARATIONS_POP
break; break;
} }
#ifndef DISABLE_SCRIPTING #ifndef DISABLE_SCRIPTING

4
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
View File

@@ -110,8 +110,10 @@ void AccessibleDrawDocumentView::Init (void)
{ {
pPage->acquire(); pPage->acquire();
pPage->Init(); pPage->Init();
SAL_WNODEPRECATED_DECLARATIONS_PUSH
mpChildrenManager->AddAccessibleShape ( mpChildrenManager->AddAccessibleShape (
std::auto_ptr<AccessibleShape>(pPage)); std::auto_ptr<AccessibleShape>(pPage));
SAL_WNODEPRECATED_DECLARATIONS_POP
pPage->release(); pPage->release();
mpChildrenManager->Update (); mpChildrenManager->Update ();
} }
@@ -304,8 +306,10 @@ void SAL_CALL
{ {
pPage->acquire(); pPage->acquire();
pPage->Init(); pPage->Init();
SAL_WNODEPRECATED_DECLARATIONS_PUSH
mpChildrenManager->AddAccessibleShape ( mpChildrenManager->AddAccessibleShape (
std::auto_ptr<AccessibleShape>(pPage)); std::auto_ptr<AccessibleShape>(pPage));
SAL_WNODEPRECATED_DECLARATIONS_POP
mpChildrenManager->Update (false); mpChildrenManager->Update (false);
pPage->release(); pPage->release();
} }

2
sd/source/ui/accessibility/AccessibleOutlineView.cxx
View File

@@ -84,8 +84,10 @@ AccessibleOutlineView::AccessibleOutlineView (
if( pOutlineView && pOutliner ) if( pOutlineView && pOutliner )
{ {
SAL_WNODEPRECATED_DECLARATIONS_PUSH
maTextHelper.SetEditSource( ::std::auto_ptr< SvxEditSource >( new AccessibleOutlineEditSource( maTextHelper.SetEditSource( ::std::auto_ptr< SvxEditSource >( new AccessibleOutlineEditSource(
*pOutliner, *pView, *pOutlineView, *pSdWindow ) ) ); *pOutliner, *pView, *pOutlineView, *pSdWindow ) ) );
SAL_WNODEPRECATED_DECLARATIONS_POP
} }
} }
} }

2
sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
View File

@@ -84,7 +84,9 @@ public:
protected: protected:
friend class ::SdModule; friend class ::SdModule;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
friend class ::std::auto_ptr<SdGlobalResourceContainer>; friend class ::std::auto_ptr<SdGlobalResourceContainer>;
SAL_WNODEPRECATED_DECLARATIONS_POP
class Implementation; class Implementation;
::std::auto_ptr<Implementation> mpImpl; ::std::auto_ptr<Implementation> mpImpl;

2
starmath/source/accessibility.cxx
View File

@@ -1672,7 +1672,9 @@ void SmEditAccessible::ClearWin()
pWin = 0; // implicitly results in AccessibleStateType::DEFUNC set pWin = 0; // implicitly results in AccessibleStateType::DEFUNC set
//! make TextHelper implicitly release C++ references to some core objects //! make TextHelper implicitly release C++ references to some core objects
SAL_WNODEPRECATED_DECLARATIONS_PUSH
pTextHelper->SetEditSource( ::std::auto_ptr<SvxEditSource>(NULL) ); pTextHelper->SetEditSource( ::std::auto_ptr<SvxEditSource>(NULL) );
SAL_WNODEPRECATED_DECLARATIONS_POP
//! make TextHelper release references //! make TextHelper release references
//! (e.g. the one set by the 'SetEventSource' call) //! (e.g. the one set by the 'SetEventSource' call)
pTextHelper->Dispose(); pTextHelper->Dispose();

2
sw/source/core/doc/docnew.cxx
View File

@@ -185,8 +185,10 @@ SwDoc::SwDoc()
mpAttrPool(new SwAttrPool(this)), mpAttrPool(new SwAttrPool(this)),
mpMarkManager(new ::sw::mark::MarkManager(*this)), mpMarkManager(new ::sw::mark::MarkManager(*this)),
m_pMetaFieldManager(new ::sw::MetaFieldManager()), m_pMetaFieldManager(new ::sw::MetaFieldManager()),
SAL_WNODEPRECATED_DECLARATIONS_PUSH
m_pUndoManager(new ::sw::UndoManager( m_pUndoManager(new ::sw::UndoManager(
::std::auto_ptr<SwNodes>(new SwNodes(this)), *this, *this, *this)), ::std::auto_ptr<SwNodes>(new SwNodes(this)), *this, *this, *this)),
SAL_WNODEPRECATED_DECLARATIONS_POP
mpDfltFrmFmt( new SwFrmFmt( GetAttrPool(), sFrmFmtStr, 0 ) ), mpDfltFrmFmt( new SwFrmFmt( GetAttrPool(), sFrmFmtStr, 0 ) ),
mpEmptyPageFmt( new SwFrmFmt( GetAttrPool(), sEmptyPageStr, mpDfltFrmFmt ) ), mpEmptyPageFmt( new SwFrmFmt( GetAttrPool(), sEmptyPageStr, mpDfltFrmFmt ) ),
mpColumnContFmt( new SwFrmFmt( GetAttrPool(), sColumnCntStr, mpDfltFrmFmt ) ), mpColumnContFmt( new SwFrmFmt( GetAttrPool(), sColumnCntStr, mpDfltFrmFmt ) ),