just silence the auto_ptr deprecations in isolation

1 files changed, 20 insertions, 0 deletions

diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx
index 3566eb8687de..2ad17e49498a 100644
--- a/sw/source/core/inc/UndoAttribute.hxx
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -52,9 +52,11 @@ class SwEndNoteInfo;
 class SwUndoAttr : public SwUndo, private SwUndRng
 {
     SfxItemSet m_AttrSet;                           // attributes for Redo
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     const ::std::auto_ptr<SwHistory> m_pHistory;    // History for Undo
     ::std::auto_ptr<SwRedlineData> m_pRedlineData;  // Redlining
     ::std::auto_ptr<SwRedlineSaveDatas> m_pRedlineSaveData;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     sal_uLong m_nNodeIndex;                             // Offset: for Redlining
     const SetAttrMode m_nInsertFlags;               // insert flags
 
@@ -78,7 +80,9 @@ public:
 
 class SwUndoResetAttr : public SwUndo, private SwUndRng
 {
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     const ::std::auto_ptr<SwHistory> m_pHistory;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     std::set<sal_uInt16> m_Ids;
     const sal_uInt16 m_nFormatId;             // Format-Id for Redo
 
@@ -102,7 +106,9 @@ class SwUndoFmtAttr : public SwUndo
 {
     friend class SwUndoDefaultAttr;
     SwFmt * m_pFmt;
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<SfxItemSet> m_pOldSet;    // old attributes
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     sal_uLong m_nNodeIndex;
     const sal_uInt16 m_nFmtWhich;
     const bool m_bSaveDrawPt;
@@ -160,7 +166,9 @@ class SwUndoFmtResetAttr : public SwUndo
         // which ID of the reset attribute
         const sal_uInt16 m_nWhichId;
         // old attribute which has been reset - needed for undo.
+        SAL_WNODEPRECATED_DECLARATIONS_PUSH
         ::std::auto_ptr<SfxPoolItem> m_pOldItem;
+        SAL_WNODEPRECATED_DECLARATIONS_POP
 };
 
 class SwUndoDontExpandFmt : public SwUndo
@@ -179,7 +187,9 @@ public:
 // helper class to receive changed attribute sets
 class SwUndoFmtAttrHelper : public SwClient
 {
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<SwUndoFmtAttr> m_pUndo;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     const bool m_bSaveDrawPt;
 
 public:
@@ -195,7 +205,9 @@ public:
 
 class SwUndoMoveLeftMargin : public SwUndo, private SwUndRng
 {
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     const ::std::auto_ptr<SwHistory> m_pHistory;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     const bool m_bModulus;
 
 public:
@@ -216,8 +228,10 @@ public:
 
 class SwUndoDefaultAttr : public SwUndo
 {
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<SfxItemSet> m_pOldSet;        // the old attributes
     ::std::auto_ptr<SvxTabStopItem> m_pTabStop;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
 public:
     // registers at the format and saves old attributes
@@ -234,7 +248,9 @@ public:
 
 class SwUndoChangeFootNote : public SwUndo, private SwUndRng
 {
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     const ::std::auto_ptr<SwHistory> m_pHistory;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
     const String m_Text;
     const sal_uInt16 m_nNumber;
     const bool m_bEndNote;
@@ -253,7 +269,9 @@ public:
 
 class SwUndoFootNoteInfo : public SwUndo
 {
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<SwFtnInfo> m_pFootNoteInfo;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
 public:
     SwUndoFootNoteInfo( const SwFtnInfo &rInfo );
@@ -266,7 +284,9 @@ public:
 
 class SwUndoEndNoteInfo : public SwUndo
 {
+    SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr<SwEndNoteInfo> m_pEndNoteInfo;
+    SAL_WNODEPRECATED_DECLARATIONS_POP
 
 public:
     SwUndoEndNoteInfo( const SwEndNoteInfo &rInfo );