[Libreoffice-commits] .: binfilter/bf_forms binfilter/bf_sc binfilter/bf_svx binfilter/inc

[Caolán McNamara]

 binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx |    8 ++++++++
 binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx             |    4 ++++
 binfilter/bf_svx/source/svdraw/svx_svdobj.cxx               |    5 ++++-
 binfilter/bf_svx/source/unoedit/svx_unoedprx.cxx            |    4 ++++
 binfilter/inc/bf_sc/editsrc.hxx                             |    4 ++++
 5 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit 0e3e1fa165680e7cd21cfe12371c213e4202f8c6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 22 15:00:25 2011 +0100

    just silence the auto_ptr deprecations in isolation

diff --git a/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx b/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
index 7d913ad..53811e1 100644
--- a/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
+++ b/binfilter/bf_forms/source/misc/forms_InterfaceContainer.cxx
@@ -628,7 +628,9 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
 
     ::osl::ClearableMutexGuard aGuard( m_rMutex );
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ElementDescription > aAutoDeleteMetaData;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     ElementDescription* pElementMetaData = _pApprovalResult;
     if ( !pElementMetaData )
     {   // not yet approved by the caller -> do ourself
@@ -636,7 +638,9 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
         DBG_ASSERT( pElementMetaData, "OInterfaceContainer::implInsert: createElementMetaData returned nonsense!" );
 
         // ensure that the meta data structure will be deleted later on
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         aAutoDeleteMetaData = ::std::auto_ptr< ElementDescription >( pElementMetaData );
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 
         // will throw an exception if necessary
         approveNewElement( _rxElement, pElementMetaData );
@@ -729,7 +733,9 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any
     OSL_PRECOND( ( _nIndex >= 0 ) && ( _nIndex < (sal_Int32)m_aItems.size() ), "OInterfaceContainer::implReplaceByIndex: precondition not met (index)!" );
 
     // approve the new object
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ElementDescription > aElementMetaData( createElementMetaData() );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     DBG_ASSERT( aElementMetaData.get(), "OInterfaceContainer::implReplaceByIndex: createElementMetaData returned nonsense!" );
     {
         Reference< XPropertySet > xElementProps;
@@ -873,7 +879,9 @@ void SAL_CALL OInterfaceContainer::insertByName(const ::rtl::OUString& _rName, c
 {
     Reference< XPropertySet > xElementProps;
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ElementDescription > aElementMetaData( createElementMetaData() );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     DBG_ASSERT( aElementMetaData.get(), "OInterfaceContainer::insertByName: createElementMetaData returned nonsense!" );
 
     // ensure the correct name of the element
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx
index 5c34a33..4bbf3a8 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx
@@ -304,19 +304,23 @@ void ScSimpleEditSource::UpdateData()
 }
 
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ScAccessibilityEditSource::ScAccessibilityEditSource( ::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData )
     : mpAccessibleTextData(pAccessibleCellTextData)
 {
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 ScAccessibilityEditSource::~ScAccessibilityEditSource()
 {
 }
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 SvxEditSource* ScAccessibilityEditSource::Clone() const
 {
     return new ScAccessibilityEditSource(::std::auto_ptr < ScAccessibleTextData > (mpAccessibleTextData->Clone()));
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 SvxTextForwarder* ScAccessibilityEditSource::GetTextForwarder()
 {
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
index 113efa3..3c414e7 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
@@ -1408,6 +1408,7 @@ static double SMALLEST_DASH_WIDTH(26.95);
 /*N*/   return TRUE;
 /*N*/ }
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 /*N*/ ::std::auto_ptr< SdrLineGeometry >  SdrObject::CreateLinePoly( OutputDevice&      rOut,
 /*N*/                                                                BOOL               bForceOnePixel,
 /*N*/                                                                BOOL               bForceTwoPixel,
@@ -1442,6 +1443,7 @@ static double SMALLEST_DASH_WIDTH(26.95);
 /*N*/     else
 /*?*/       return ::std::auto_ptr< SdrLineGeometry > (NULL);
 /*N*/ }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
@@ -1479,6 +1481,7 @@ class ImpSkeleton;
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 /*N*/ ::std::auto_ptr< SdrLineGeometry > SdrObject::ImpPrepareLineGeometry( ExtOutputDevice& rXOut, const SfxItemSet& rSet,
 /*N*/                                                                       BOOL bIsLineDraft) const
 /*N*/ {
@@ -1511,7 +1514,7 @@ class ImpSkeleton;
 /*N*/
 /*N*/   return ::std::auto_ptr< SdrLineGeometry > (0L);
 /*N*/ }
-
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 /*N*/ void SdrObject::ImpDrawColorLineGeometry(
 /*N*/   ExtOutputDevice& rXOut, const SfxItemSet& rSet, SdrLineGeometry& rLineGeometry) const
diff --git a/binfilter/bf_svx/source/unoedit/svx_unoedprx.cxx b/binfilter/bf_svx/source/unoedit/svx_unoedprx.cxx
index d4be18f..f56e5b8 100644
--- a/binfilter/bf_svx/source/unoedit/svx_unoedprx.cxx
+++ b/binfilter/bf_svx/source/unoedit/svx_unoedprx.cxx
@@ -320,7 +320,9 @@ SvxEditSource* SvxEditSourceAdapter::Clone() const
 {
     if( mbEditSourceValid && mpAdaptee.get() )
     {
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr< SvxEditSource > pClonedAdaptee( mpAdaptee->Clone() );
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 
         if( pClonedAdaptee.get() )
         {
@@ -408,6 +410,7 @@ SfxBroadcaster& SvxEditSourceAdapter::GetBroadcaster() const
     return maDummyBroadcaster;
 }
 
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 void SvxEditSourceAdapter::SetEditSource( ::std::auto_ptr< SvxEditSource > pAdaptee )
 {
     if( pAdaptee.get() )
@@ -423,6 +426,7 @@ void SvxEditSourceAdapter::SetEditSource( ::std::auto_ptr< SvxEditSource > pAdap
         mbEditSourceValid = sal_False;
     }
 }
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 //--------------------------------------------------------------------------------------
 
diff --git a/binfilter/inc/bf_sc/editsrc.hxx b/binfilter/inc/bf_sc/editsrc.hxx
index 62b7df9..d091161 100644
--- a/binfilter/inc/bf_sc/editsrc.hxx
+++ b/binfilter/inc/bf_sc/editsrc.hxx
@@ -179,10 +179,14 @@ public:
 class ScAccessibilityEditSource : public SvxEditSource
 {
 private:
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr < ScAccessibleTextData > mpAccessibleTextData;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
 public:
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
                         ScAccessibilityEditSource( ::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData );
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     virtual             ~ScAccessibilityEditSource();
 
     virtual SvxEditSource*      Clone() const;