diff options
Diffstat (limited to 'sd/source/ui')
-rw-r--r-- | sd/source/ui/dlg/inspagob.cxx | 27 | ||||
-rw-r--r-- | sd/source/ui/dlg/sddlgfact.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/dlg/sddlgfact.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/dlg/sdtreelb.cxx | 30 | ||||
-rw-r--r-- | sd/source/ui/inc/inspagob.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/sdtreelb.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/view/sdview2.cxx | 73 |
7 files changed, 0 insertions, 138 deletions
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx index f9770fd1bc14..90e41a996998 100644 --- a/sd/source/ui/dlg/inspagob.cxx +++ b/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 diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 9837d70bcccd..fb08787f4ac9 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/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) { diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index db5c9c9c7c57..34d9a6cbfd77 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/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; diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 492c44c596a0..f44032d26ecf 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/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(); diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx index c6d2f49bcd70..deea96c87687 100644 --- a/sd/source/ui/inc/inspagob.hxx +++ b/sd/source/ui/inc/inspagob.hxx @@ -61,8 +61,6 @@ public: const String& rFileName ); ~SdInsertPagesObjsDlg(); - List* GetList( sal_uInt16 nType ); - /************************************************************************* |* |* Liefert die Liste zurueck diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 509fbbd5e199..5a26745b0d1e 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/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 ); /************************************************************************* |* diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 4e192e698f4b..fc366db8357f 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/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) |