IconBox checkbox is always hidden and always disabled

Change-Id: I4aad1568501e4ecb2758c19ee62f78388abb6fcf

Change icon button is always hidden, and hooked to nothing

Change-Id: I8b8e290908223467b76b0a861a8285e9a87e9fe4

ShouldLink never called...

so bLink is never used
so the always hidden aRbPasteLink is unneccessary

Change-Id: Ic48c9856a8750706262c883a079e0374fc9bb59c

GetAspect never called...

so nAspect is unnecessary,
so SetDefault becomes a no-op and unnecessary

Change-Id: I4a2d0af2eae2a822ecc2d71c84b26b8a2a2de210

aRbPaste is always hidden

Change-Id: I2b1c6eefee5dada29ad5952010b7121e5bcadcde

1 files changed, 1 insertions, 21 deletions

diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index a2997915bbe8..fd18c1ba0306 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -41,10 +41,6 @@ SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent )
     : ModalDialog( pParent, CUI_RES( MD_PASTE_OBJECT ) ),
     aFtSource( this, CUI_RES( FT_SOURCE ) ),
     aFtObjectSource( this, CUI_RES( FT_OBJECT_SOURCE ) ),
-    aRbPaste( this, CUI_RES( RB_PASTE ) ),
-    aRbPasteLink( this, CUI_RES( RB_PASTE_LINK ) ),
-    aCbDisplayAsIcon( this, CUI_RES( CB_DISPLAY_AS_ICON ) ),
-    aPbChangeIcon( this, CUI_RES( PB_CHANGE_ICON ) ),
     aFlChoice( this, CUI_RES( FL_CHOICE ) ),
     aLbInsertList( this, CUI_RES( LB_INSERT_LIST ) ),
     aOKButton1( this, CUI_RES( 1 ) ),
@@ -62,15 +58,13 @@ SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent )
 
     ObjectLB().SetSelectHdl( LINK( this, SvPasteObjectDialog, SelectHdl ) );
     ObjectLB().SetDoubleClickHdl( LINK( this, SvPasteObjectDialog, DoubleClickHdl ) );
-    SetDefault();
 
     aLbInsertList.SetAccessibleName(aFlChoice.GetText());
 }
 
 void SvPasteObjectDialog::SelectObject()
 {
-    if ( aLbInsertList.GetEntryCount() &&
-         !aRbPaste.IsVisible() && !aRbPasteLink.IsVisible() )
+    if (m_pLbInsertList->GetEntryCount())
     {
         aLbInsertList.SelectEntryPos(0);
         SelectHdl( &aLbInsertList );
@@ -95,12 +89,6 @@ IMPL_LINK_INLINE_START( SvPasteObjectDialog, DoubleClickHdl, ListBox *, pListBox
 }
 IMPL_LINK_INLINE_END( SvPasteObjectDialog, DoubleClickHdl, ListBox *, pListBox )
 
-void SvPasteObjectDialog::SetDefault()
-{
-    bLink   = sal_False;
-    nAspect = (sal_uInt16)::com::sun::star::embed::Aspects::MSOLE_CONTENT;
-}
-
 SvPasteObjectDialog::~SvPasteObjectDialog()
 {
 }
@@ -177,7 +165,6 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
             }
             else if( SOT_FORMATSTR_ID_LINK_SOURCE == nFormat )
             {
-                PasteLink().Enable();
                 continue;
             }
             else if( !aName.Len() )
@@ -221,15 +208,8 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
 
     ObjectSource().SetText( aTypeName );
 
-    SetDefault();
-
     if( Dialog::Execute() == RET_OK )
     {
-        bLink = PasteLink().IsChecked();
-
-        if( AsIconBox().IsChecked() )
-            nAspect = (sal_uInt16)com::sun::star::embed::Aspects::MSOLE_ICON;
-
         nSelFormat  = (sal_uLong)ObjectLB().GetEntryData( ObjectLB().GetSelectEntryPos() );
     }