From 871426533f7afe31bc451fa6b407b83db8e52827 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 22 Sep 2011 15:00:08 +0100
Subject: just silence the auto_ptr deprecations in isolation

---
 sc/source/ui/view/viewfun3.cxx | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'sc/source/ui/view/viewfun3.cxx')

diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 028b68cdb97d..64848e7c1925 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -436,7 +436,9 @@ sal_Bool ScViewFunc::CopyToClip( ScDocument* pClipDoc, const ScRangeList& rRange
                 // TODO: What's this for?
                 break;
 
+            SAL_WNODEPRECATED_DECLARATIONS_PUSH
             ::std::auto_ptr<ScDocument> pDocClip(new ScDocument(SCDOCMODE_CLIP));
+            SAL_WNODEPRECATED_DECLARATIONS_POP
 
             // Check for geometrical feasibility of the ranges.
             bool bValidRanges = true;
@@ -989,7 +991,9 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc,
 
     ScDocShellRef aTransShellRef;   // for objects in xTransClip - must remain valid as long as xTransClip
     ScDocument* pOrigClipDoc = NULL;
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ScDocument > xTransClip;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     if ( bTranspose )
     {
         SCCOL nX;
@@ -1556,7 +1560,9 @@ bool ScViewFunc::PasteMultiRangesFromClip(
             return false;
         }
 
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr<ScDocument> pTransClip(new ScDocument(SCDOCMODE_CLIP));
+        SAL_WNODEPRECATED_DECLARATIONS_POP
         pClipDoc->TransposeClip(pTransClip.get(), nFlags, bAsLink);
         pClipDoc = pTransClip.release();
         SCCOL nTempColSize = nColSize;
@@ -1612,7 +1618,9 @@ bool ScViewFunc::PasteMultiRangesFromClip(
             return false;
     }
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<ScDocument> pUndoDoc;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     if (pDoc->IsUndoEnabled())
     {
         pUndoDoc.reset(new ScDocument(SCDOCMODE_UNDO));
@@ -1620,7 +1628,9 @@ bool ScViewFunc::PasteMultiRangesFromClip(
         pDoc->CopyToDocument(aMarkedRange, nUndoFlags, false, pUndoDoc.get(), &aMark, true);
     }
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<ScDocument> pMixDoc;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     if ( bSkipEmpty || nFunction )
     {
         if ( nFlags & IDF_CONTENTS )
@@ -1757,7 +1767,9 @@ bool ScViewFunc::PasteFromClipToMultiRanges(
             return false;
     }
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     std::auto_ptr<ScDocument> pUndoDoc;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     if (pDoc->IsUndoEnabled())
     {
         pUndoDoc.reset(new ScDocument(SCDOCMODE_UNDO));
@@ -1769,7 +1781,9 @@ bool ScViewFunc::PasteFromClipToMultiRanges(
         }
     }
 
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     std::auto_ptr<ScDocument> pMixDoc;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     if (bSkipEmpty || nFunction)
     {
         if (nFlags & IDF_CONTENTS)
-- 
cgit