Remove deprecated and unused methods.

sd/inc/drawdoc.hxx

@@ -268,10 +268,6 @@ public:
 
     SD_DLLPUBLIC SdDrawDocument* OpenBookmarkDoc(const String& rBookmarkFile);
     SdDrawDocument*     OpenBookmarkDoc(SfxMedium& rMedium);
-    sal_Bool                InsertBookmark(List* pBookmarkList, List* pExchangeList, sal_Bool bLink,
-                                        sal_Bool bReplace, sal_uInt16 nPgPos, sal_Bool bNoDialogs,
-                                        ::sd::DrawDocShell* pBookmarkDocSh, sal_Bool bCopy,
-                                        Point* pObjPos);
 
     sal_Bool InsertBookmark(const std::vector<rtl::OUString> &rBookmarkList,
                             std::vector<rtl::OUString> &rExchangeList, sal_Bool bLink,
@@ -282,57 +278,6 @@ public:
     bool IsStartWithPresentation() const;
     void SetStartWithPresentation( bool bStartWithPresentation );
 
-    /** Insert pages into this document
-
-        This method inserts whole pages into this document, either
-        selected ones (specified via pBookmarkList/pExchangeList), or
-        all from the source document.
-
-        @attention Beware! This method in it's current state does not
-        handle all combinations of their input parameters
-        correctly. For example, for pBookmarkList=NULL, bReplace=sal_True
-        is ignored (no replace happens).
-
-        @param pBookmarkList
-        A list of strings, denoting the names of the pages to be copied
-
-        @param pExchangeList
-        A list of strings, denoting the names of the pages to be renamed
-
-        @param bLink
-        Whether the inserted pages should be links to the bookmark document
-
-        @param bReplace
-        Whether the pages should not be inserted, but replace the pages in
-        the destination document
-
-        @param nPgPos
-        Insertion point/start of replacement
-
-        @param bNoDialogs
-        Whether query dialogs are allowed (e.g. for page scaling)
-
-        @param pBookmarkDocSh
-        DocShell of the source document (used e.g. to extract the filename
-        for linked pages)
-
-        @param bCopy
-        Whether the source document should be treated as immutable (i.e.
-        inserted pages are not removed from it, but cloned)
-
-        @param bMergeMasterPages
-        Whether the source document's master pages should be copied, too.
-
-        @param bPreservePageNames
-        Whether the replace operation should take the name from the new
-        page, or preserve the old name
-     */
-    sal_Bool                InsertBookmarkAsPage(List* pBookmarkList, List* pExchangeList,
-                                              sal_Bool bLink, sal_Bool bReplace, sal_uInt16 nPgPos,
-                                              sal_Bool bNoDialogs, ::sd::DrawDocShell* pBookmarkDocSh,
-                                              sal_Bool bCopy, sal_Bool bMergeMasterPages,
-                                              sal_Bool bPreservePageNames);
-
     /** Insert pages into this document
 
         This method inserts whole pages into this document, either
@@ -385,10 +330,6 @@ public:
                               sal_Bool bCopy, sal_Bool bMergeMasterPages,
                               sal_Bool bPreservePageNames);
 
-    sal_Bool                InsertBookmarkAsObject(List* pBookmarkList, List* pExchangeListL,
-                                                sal_Bool bLink, ::sd::DrawDocShell* pBookmarkDocSh,
-                                                Point* pObjPos);
-
     sal_Bool InsertBookmarkAsObject(const std::vector<rtl::OUString> &rBookmarkList,
                                     std::vector<rtl::OUString> &rExchangeList,
                                     sal_Bool bLink, ::sd::DrawDocShell* pBookmarkDocSh,

sd/inc/sdabstdlg.hxx

@@ -139,7 +139,6 @@ class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog  //add for SdInser
 {
 public:
     virtual ::Window*   GetWindow() = 0;  //this method is added for return a ::Window type pointer
-    virtual List*       GetList( sal_uInt16 nType ) = 0;
     virtual void GetList ( const sal_uInt16 nType, std::vector<rtl::OUString> &rEntries ) = 0;
     virtual sal_Bool        IsLink() = 0;
     virtual sal_Bool        IsRemoveUnnessesaryMasterPages() const = 0;

sd/source/ui/dlg/inspagob.cxx

@@ -115,33 +115,6 @@ void SdInsertPagesObjsDlg::Reset()
     aCbxMasters.Check( sal_True );
 }
 
-/*************************************************************************
-|*
-|*  Liefert die Liste zurueck
-|*  nType == 0 -> Seiten
-|*  nType == 1 -> Objekte
-|*
-\************************************************************************/
-
-List* SdInsertPagesObjsDlg::GetList( sal_uInt16 nType )
-{
-    // Bei Draw-Dokumenten muss bei der Selektion des Dokumentes NULL
-    // zurueckgegeben werden
-    if( pMedium )
-    {
-        // Um zu gewaehrleisten, dass die Bookmarks geoeffnet sind
-        // (Wenn gesamtes Dokument ausgewaehlt wurde)
-        aLbTree.GetBookmarkDoc();
-
-        // Wenn das Dokument (mit-)selektiert oder nichst selektiert ist,
-        // wird das gesamte Dokument (und nicht mehr!) eingefuegt.
-        if( aLbTree.GetSelectionCount() == 0 ||
-            ( aLbTree.IsSelected( aLbTree.First() ) ) )
-            return( NULL );
-    }
-    return( aLbTree.GetSelectEntryList( nType ) );
-}
-
 void SdInsertPagesObjsDlg::GetList( const sal_uInt16 nType, std::vector<rtl::OUString> &rEntries )
 {
     // Bei Draw-Dokumenten muss bei der Selektion des Dokumentes NULL

sd/source/ui/dlg/sddlgfact.cxx

@@ -282,10 +282,6 @@ sal_Bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const
 {
     return (::Window*)pDlg;
 }
-List* AbstractSdInsertPagesObjsDlg_Impl::GetList( sal_uInt16 nType )
-{
-    return pDlg->GetList( nType );
-}
 
 void AbstractSdInsertPagesObjsDlg_Impl::GetList (const sal_uInt16 nType, std::vector<rtl::OUString> &rEntries)
 {

sd/source/ui/dlg/sddlgfact.hxx

@@ -187,7 +187,6 @@ class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg
 {
     DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg)
     virtual ::Window *  GetWindow(); //this method is added for return a Window type pointer
-    virtual List*       GetList( sal_uInt16 nType );
     virtual void GetList ( const sal_uInt16 nType, std::vector<rtl::OUString> &rEntries);
     virtual sal_Bool        IsLink();
     virtual sal_Bool        IsRemoveUnnessesaryMasterPages() const;

sd/source/ui/dlg/sdtreelb.cxx

@@ -663,36 +663,6 @@ String SdPageObjsTLB::GetSelectEntry()
     return( GetEntryText( GetCurEntry() ) );
 }
 
-/*************************************************************************
-|*
-|* Selektierte Eintrage zurueckgeben
-|* nDepth == 0 -> Seiten
-|* nDepth == 1 -> Objekte
-|*
-\************************************************************************/
-
-List* SdPageObjsTLB::GetSelectEntryList( sal_uInt16 nDepth )
-{
-    List*        pList  = NULL;
-    SvLBoxEntry* pEntry = FirstSelected();
-
-    while( pEntry )
-    {
-        sal_uInt16 nListDepth = GetModel()->GetDepth( pEntry );
-        if( nListDepth == nDepth )
-        {
-            if( !pList )
-                pList = new List();
-
-            const String aEntryText( GetEntryText( pEntry ) );
-            pList->Insert( new String( aEntryText ), LIST_APPEND );
-        }
-        pEntry = NextSelected( pEntry );
-    }
-
-    return( pList );
-}
-
 void SdPageObjsTLB::GetSelectEntryList( sal_uInt16 nDepth, std::vector<rtl::OUString> &rEntries ) const
 {
     SvLBoxEntry* pEntry = FirstSelected();

sd/source/ui/inc/inspagob.hxx

@@ -61,8 +61,6 @@ public:
                                 const String& rFileName );
                 ~SdInsertPagesObjsDlg();
 
-    List*       GetList( sal_uInt16 nType );
-
     /*************************************************************************
     |*
     |*  Liefert die Liste zurueck

sd/source/ui/inc/sdtreelb.hxx

@@ -206,7 +206,6 @@ public:
     sal_Bool                    HasSelectedChildren( const String& rName );
     sal_Bool                    SelectEntry( const String& rName );
     String                  GetSelectEntry();
-    List*                   GetSelectEntryList( sal_uInt16 nDepth );
 
     /*************************************************************************
     |*

sd/source/ui/view/sdview2.cxx

@@ -919,79 +919,6 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv
 |*
 \************************************************************************/
 
-sal_Bool View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, sal_uInt16 nType )
-{
-    DBG_ASSERT( !rpExchangeList, "ExchangeList muss NULL sein!");
-
-    sal_Bool bListIdentical = sal_True; // BookmarkList und ExchangeList sind gleich
-    sal_Bool bNameOK = sal_True;        // Name ist eindeutig
-
-    rpExchangeList = new List();
-
-    if( pBookmarkList )
-    {
-        String* pString = (String*) pBookmarkList->First();
-
-        while( pString && bNameOK )
-        {
-            String* pNewName = new String( *pString );
-
-            if( nType == 0  || nType == 2 )
-                bNameOK = mpDocSh->CheckPageName (
-                    mpViewSh->GetActiveWindow(), *pNewName);
-
-            if( bNameOK && ( nType == 1  || nType == 2 ) )
-            {
-                if( mrDoc.GetObj( *pNewName ) )
-                {
-                    String          aTitle( SdResId( STR_TITLE_NAMEGROUP ) );
-                    String          aDesc( SdResId( STR_DESC_NAMEGROUP ) );
-                    SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-                    AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), *pNewName, aDesc ) : 0;
-                    if( pDlg )
-                    {
-                        pDlg->SetEditHelpId( HID_SD_NAMEDIALOG_OBJECT );
-
-                        bNameOK = sal_False;
-                        pDlg->SetText( aTitle );
-
-                        while( !bNameOK && pDlg->Execute() == RET_OK )
-                        {
-                            pDlg->GetName( *pNewName );
-
-                            if( !mrDoc.GetObj( *pNewName ) )
-                                bNameOK = sal_True;
-                        }
-
-                        delete pDlg;
-                    }
-                }
-            }
-
-            if( bListIdentical )
-                bListIdentical = ( *pString == *pNewName );
-
-            rpExchangeList->Insert( pNewName, LIST_APPEND );
-            pString = (String*) pBookmarkList->Next();
-        }
-    }
-
-    // ExchangeList ist mit BookmarkList identisch
-    if( rpExchangeList && bListIdentical )
-    {
-        String* pString = (String*) rpExchangeList->First();
-        while( pString )
-        {
-            delete pString;
-            pString = (String*) rpExchangeList->Next();
-        }
-        delete rpExchangeList;
-        rpExchangeList = NULL;
-    }
-
-    return( bNameOK );
-}
-
 bool View::GetExchangeList (std::vector<rtl::OUString> &rExchangeList,
                             std::vector<rtl::OUString> &rBookmarkList,
                             const sal_uInt16 nType)