-Werror,-Wdeprecated-declarations

Change-Id: I22101fec4b75e567153c6401ab754e1a5e158a77

2 files changed, 28 insertions, 0 deletions

diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 2da3fccd35bf..b797592eed33 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -311,12 +311,14 @@ void TreeListBox::ImpCreateLibEntries( SvTreeListEntry* pDocumentRootEntry, cons
             }
             else
             {
+                SAL_WNODEPRECATED_DECLARATIONS_PUSH
                 pLibRootEntry = AddEntry(
                     aLibName,
                     Image( IDEResId( nId ) ),
                     pDocumentRootEntry, true,
                     std::auto_ptr<Entry>(new Entry(OBJ_TYPE_LIBRARY))
                 );
+                SAL_WNODEPRECATED_DECLARATIONS_POP
             }
         }
     }
@@ -347,12 +349,16 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const
                         OUString aModName = pModNames[ i ];
                         SvTreeListEntry* pModuleEntry = FindEntry( pLibRootEntry, aModName, OBJ_TYPE_MODULE );
                         if ( !pModuleEntry )
+                        {
+                            SAL_WNODEPRECATED_DECLARATIONS_PUSH
                             pModuleEntry = AddEntry(
                                 aModName,
                                 Image( IDEResId( RID_IMG_MODULE ) ),
                                 pLibRootEntry, false,
                                 std::auto_ptr<Entry>(new Entry(OBJ_TYPE_MODULE))
                             );
+                            SAL_WNODEPRECATED_DECLARATIONS_POP
+                        }
 
                         // methods
                         if ( nMode & BROWSEMODE_SUBS )
@@ -366,12 +372,16 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const
                                 OUString aName = pNames[ j ];
                                 SvTreeListEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
                                 if ( !pEntry )
+                                {
+                                    SAL_WNODEPRECATED_DECLARATIONS_PUSH
                                     pEntry = AddEntry(
                                         aName,
                                         Image( IDEResId( RID_IMG_MACRO ) ),
                                         pModuleEntry, false,
                                         std::auto_ptr<Entry>(new Entry(OBJ_TYPE_METHOD))
                                     );
+                                    SAL_WNODEPRECATED_DECLARATIONS_POP
+                                }
                             }
                         }
                     }
@@ -403,12 +413,16 @@ void TreeListBox::ImpCreateLibSubEntries( SvTreeListEntry* pLibRootEntry, const
                     OUString aDlgName = pDlgNames[ i ];
                     SvTreeListEntry* pDialogEntry = FindEntry( pLibRootEntry, aDlgName, OBJ_TYPE_DIALOG );
                     if ( !pDialogEntry )
+                    {
+                        SAL_WNODEPRECATED_DECLARATIONS_PUSH
                         pDialogEntry = AddEntry(
                             aDlgName,
                             Image( IDEResId( RID_IMG_DIALOG ) ),
                             pLibRootEntry, false,
                             std::auto_ptr<Entry>(new Entry(OBJ_TYPE_DIALOG))
                         );
+                        SAL_WNODEPRECATED_DECLARATIONS_POP
+                    }
                 }
             }
             catch (const container::NoSuchElementException& )
@@ -442,12 +456,14 @@ void TreeListBox::ImpCreateLibSubEntriesInVBAMode( SvTreeListEntry* pLibRootEntr
         }
         else
         {
+            SAL_WNODEPRECATED_DECLARATIONS_PUSH
             pLibSubRootEntry = AddEntry(
                 aEntryName,
                 Image( IDEResId( RID_IMG_MODLIB ) ),
                 pLibRootEntry, true,
                 std::auto_ptr<Entry>(new Entry(eType))
             );
+            SAL_WNODEPRECATED_DECLARATIONS_POP
         }
     }
 }
@@ -504,12 +520,16 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvTreeListEntry* pLibSubRo
             }
             SvTreeListEntry* pModuleEntry = FindEntry( pLibSubRootEntry, aEntryName, OBJ_TYPE_MODULE );
             if ( !pModuleEntry )
+            {
+                SAL_WNODEPRECATED_DECLARATIONS_PUSH
                 pModuleEntry = AddEntry(
                     aEntryName,
                     Image( IDEResId( RID_IMG_MODULE ) ),
                     pLibSubRootEntry, false,
                     std::auto_ptr<Entry>(new Entry(OBJ_TYPE_MODULE))
                 );
+                SAL_WNODEPRECATED_DECLARATIONS_POP
+            }
 
             // methods
             if ( nMode & BROWSEMODE_SUBS )
@@ -523,12 +543,16 @@ void TreeListBox::ImpCreateLibSubSubEntriesInVBAMode( SvTreeListEntry* pLibSubRo
                     OUString aName = pNames[ j ];
                     SvTreeListEntry* pEntry = FindEntry( pModuleEntry, aName, OBJ_TYPE_METHOD );
                     if ( !pEntry )
+                    {
+                        SAL_WNODEPRECATED_DECLARATIONS_PUSH
                         pEntry = AddEntry(
                             aName,
                             Image( IDEResId( RID_IMG_MACRO ) ),
                             pModuleEntry, false,
                             std::auto_ptr<Entry>(new Entry(OBJ_TYPE_METHOD))
                         );
+                        SAL_WNODEPRECATED_DECLARATIONS_POP
+                    }
                 }
             }
         }
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index b75309253168..c1b76c5ea91f 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1620,22 +1620,26 @@ void createLibImpl( Window* pWin, const ScriptDocument& rDocument,
                     sal_uInt16 nMode = pBasicBox->GetMode();
                     bool bDlgMode = ( nMode & BROWSEMODE_DIALOGS ) && !( nMode & BROWSEMODE_MODULES );
                     sal_uInt16 nId = bDlgMode ? RID_IMG_DLGLIB : RID_IMG_MODLIB;
+                    SAL_WNODEPRECATED_DECLARATIONS_PUSH
                     SvTreeListEntry* pNewLibEntry = pBasicBox->AddEntry(
                         aLibName,
                         Image( IDEResId( nId ) ),
                         pRootEntry, false,
                         std::auto_ptr<Entry>(new Entry(OBJ_TYPE_LIBRARY))
                     );
+                    SAL_WNODEPRECATED_DECLARATIONS_POP
                     DBG_ASSERT( pNewLibEntry, "InsertEntry fehlgeschlagen!" );
 
                     if( pNewLibEntry )
                     {
+                        SAL_WNODEPRECATED_DECLARATIONS_PUSH
                         SvTreeListEntry* pEntry_ = pBasicBox->AddEntry(
                             aModName,
                             Image( IDEResId( RID_IMG_MODULE ) ),
                             pNewLibEntry, false,
                             std::auto_ptr<Entry>(new Entry(OBJ_TYPE_MODULE))
                         );
+                        SAL_WNODEPRECATED_DECLARATIONS_POP
                         DBG_ASSERT( pEntry_, "InsertEntry fehlgeschlagen!" );
                         pBasicBox->SetCurEntry( pEntry_ );
                         pBasicBox->Select( pBasicBox->GetCurEntry() );      // OV-Bug?!