2 files changed, 4 insertions, 23 deletions
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 351a9d8171ef..ba1164783737 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -45,8 +45,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow, SdDrawDocument* pActDoc)
     get(pCancelBtn, "cancel_btn");
     get(pCreateBtn, "create_btn");
 
-    get(pFileBtn, "file_btn");
-    get(pTextBtn, "textbox_btn");
+    get(pAddBtn, "add_btn");
     get(pUpBtn, "up_btn");
     get(pDownBtn, "down_btn");
     get(pRemoveBtn, "rem_btn");
@@ -60,8 +59,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow, SdDrawDocument* pActDoc)
     pCancelBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, CancelHdl));
     pCreateBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, CreateHdl));
 
-    pFileBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, FileHdl));
-    pTextBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, TextHdl));
+    pAddBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, FileHdl));
     pUpBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, UpHdl));
     pUpBtn->Disable();
     pDownBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, DownHdl));
@@ -72,7 +70,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow, SdDrawDocument* pActDoc)
 
     mpGraphicFilter = new GraphicFilter;
     sDirUrl = "";
-    pFileBtn->GrabFocus();
+    pAddBtn->GrabFocus();
     pImagesLst->Clear();
 }
 
@@ -610,22 +608,6 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl)
     return 0;
 }
 
-IMPL_LINK_NOARG(SdPhotoAlbumDialog, TextHdl)
-{
-    sal_Int16 nPos;
-    sal_Int16 nInsertPos = pImagesLst->GetSelectEntryPos();
-    if (nInsertPos < 0)
-        nPos = pImagesLst->InsertEntry( OUString(SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX)));
-    else
-        nPos = pImagesLst->InsertEntry( OUString(SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX)), nInsertPos);
-
-    OUString sStr(SD_RESSTR(STR_PHOTO_ALBUM_TEXTBOX));
-    pImagesLst->SetEntryData(nPos, (void*)new OUString(sStr));
-
-    EnableDisableButtons();
-    return 0;
-}
-
 IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl)
 {
     if (pImagesLst->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
index 3e751285beb1..d49ec34ffb9b 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
@@ -54,8 +54,7 @@ private:
     CancelButton*   pCancelBtn;
     PushButton*     pCreateBtn;
 
-    PushButton*     pFileBtn;
-    PushButton*     pTextBtn;
+    PushButton*     pAddBtn;
     PushButton*     pUpBtn;
     PushButton*     pDownBtn;
     PushButton*     pRemoveBtn;