adapt code to use paste special .ui

Change-Id: Iaac28f442aa38dd6610c89ba04ea2d1ccfca35c5

5 files changed, 16 insertions, 95 deletions

diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index fd18c1ba0306..795dae49cb1b 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -28,7 +28,6 @@
 #include <vcl/group.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/msgbox.hxx>
-#include "svuidlg.hrc"
 #include <sot/formats.hxx>
 #include <sot/stg.hxx>
 #include <svtools/sores.hxx>
@@ -37,37 +36,26 @@
 #include <dialmgr.hxx>
 
 SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent )
-
-    : ModalDialog( pParent, CUI_RES( MD_PASTE_OBJECT ) ),
-    aFtSource( this, CUI_RES( FT_SOURCE ) ),
-    aFtObjectSource( this, CUI_RES( FT_OBJECT_SOURCE ) ),
-    aFlChoice( this, CUI_RES( FL_CHOICE ) ),
-    aLbInsertList( this, CUI_RES( LB_INSERT_LIST ) ),
-    aOKButton1( this, CUI_RES( 1 ) ),
-    aCancelButton1( this, CUI_RES( 1 ) ),
-    aHelpButton1( this, CUI_RES( 1 ) )
+    : ModalDialog(pParent, "PasteSpecialDialog", "cui/ui/pastespecial.ui")
 {
-    FreeResource();
-    SetHelpId( HID_PASTE_DLG );
-    SetUniqueId( HID_PASTE_DLG );
+    get(m_pFtObjectSource, "source");
+    get(m_pLbInsertList, "list");
+    get(m_pOKButton, "ok");
 
-    Font aFont = aFtObjectSource.GetFont();
-    aFont.SetWeight( WEIGHT_LIGHT );
-    aFtObjectSource.SetFont( aFont );
-    aOKButton1.Disable();
+    m_pLbInsertList->SetDropDownLineCount(8);
+    m_pLbInsertList->set_width_request(m_pLbInsertList->approximate_char_width() * 32);
+    m_pOKButton->Disable();
 
     ObjectLB().SetSelectHdl( LINK( this, SvPasteObjectDialog, SelectHdl ) );
     ObjectLB().SetDoubleClickHdl( LINK( this, SvPasteObjectDialog, DoubleClickHdl ) );
-
-    aLbInsertList.SetAccessibleName(aFlChoice.GetText());
 }
 
 void SvPasteObjectDialog::SelectObject()
 {
     if (m_pLbInsertList->GetEntryCount())
     {
-        aLbInsertList.SelectEntryPos(0);
-        SelectHdl( &aLbInsertList );
+        m_pLbInsertList->SelectEntryPos(0);
+        SelectHdl(m_pLbInsertList);
     }
 }
 
@@ -75,8 +63,8 @@ IMPL_LINK( SvPasteObjectDialog, SelectHdl, ListBox *, pListBox )
 {
     (void)pListBox;
 
-    if ( !aOKButton1.IsEnabled() )
-        aOKButton1.Enable();
+    if ( !m_pOKButton->IsEnabled() )
+        m_pOKButton->Enable();
     return 0;
 }
 
diff --git a/cui/source/dialogs/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc
index 1d0658897849..704017c4ec5f 100644
--- a/cui/source/dialogs/svuidlg.hrc
+++ b/cui/source/dialogs/svuidlg.hrc
@@ -32,14 +32,6 @@
 #define STR_WAITINGLINK                         32028
 
 
-#define FL_CHOICE              15
-#define LB_INSERT_LIST          7
-
-#define MD_PASTE_OBJECT     32001
-#define S_OBJECT               1
-#define FT_OBJECT_SOURCE       22
-#define FT_SOURCE              23
-
 #define MD_UPDATE_BASELINKS 32002
 #define LB_LINKS               30
 #define FT_FILES               31
diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src
index 19d7dad11afb..d8c019489b62 100644
--- a/cui/source/dialogs/svuidlg.src
+++ b/cui/source/dialogs/svuidlg.src
@@ -20,60 +20,6 @@
 #include <svtools/controldims.hrc>
 #include "svuidlg.hrc"
 
-ModalDialog MD_PASTE_OBJECT
-{
-    HelpID = "cui:ModalDialog:MD_PASTE_OBJECT";
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Moveable = TRUE ;
-    Size = MAP_APPFONT ( 282 , 135 ) ;  // 12 under listbox
-    Text [ en-US ] = "Paste Special" ;
-    FixedText FT_SOURCE
-    {
-        Pos = MAP_APPFONT ( 6 , 11 ) ;
-        Size = MAP_APPFONT ( 30 , 10 ) ;
-        Text [ en-US ] = "Source:" ;
-    };
-    FixedText FT_OBJECT_SOURCE
-    {
-        Pos = MAP_APPFONT ( 42 , 11 ) ;
-        Size = MAP_APPFONT ( 166 , 20 ) ;
-        WordBreak = TRUE ;
-    };
-    ListBox LB_INSERT_LIST
-    {
-        HelpID = "cui:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 12 , 49 ) ;
-        Size = MAP_APPFONT ( 202 , 74 ) ;
-    };
-    FixedLine FL_CHOICE
-    {
-        Pos = MAP_APPFONT ( 6 , 38 ) ;
-        Size = MAP_APPFONT ( 214 , RSC_CD_FIXEDLINE_HEIGHT ) ;
-        Text [ en-US ] = "Selection" ;
-    };
-    OKButton 1
-    {
-        Pos = MAP_APPFONT ( 226 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        DefButton = TRUE ;
-    };
-    CancelButton 1
-    {
-        Pos = MAP_APPFONT ( 226 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    HelpButton 1
-    {
-        Pos = MAP_APPFONT ( 226 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    String S_OBJECT
-    {
-        Text [ en-US ] = "Object" ;
-    };
-};
 ModalDialog MD_UPDATE_BASELINKS
 {
     HelpID = "cui:ModalDialog:MD_UPDATE_BASELINKS";
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index f3b95fd73787..c2cd4a96759d 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -285,7 +285,6 @@
 #define HID_HYPERLINK_MARKWND_CLOSE "CUI_HID_HYPERLINK_MARKWND_CLOSE"
 #define HID_HYPERLINK_MARKWND_TREE "CUI_HID_HYPERLINK_MARKWND_TREE"
 #define HID_GRFFILTER_EMBOSS_LIGHT "CUI_HID_GRFFILTER_EMBOSS_LIGHT"
-#define HID_PASTE_DLG "CUI_HID_PASTE_DLG"
 #define HID_LINKDLG_TABLB "CUI_HID_LINKDLG_TABLB"
 #define HID_MACRO_HEADERTABLISTBOX "CUI_HID_MACRO_HEADERTABLISTBOX"
 #define HID_GALLERY_TITLE_EDIT "CUI_HID_GALLERY_TITLE_EDIT"
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index f5366e053e93..30be129e9faa 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -39,19 +39,15 @@ class TransferableDataHelper;
 
 class SvPasteObjectDialog : public ModalDialog
 {
-    FixedText aFtSource;
-    FixedText aFtObjectSource;
-    FixedLine aFlChoice;
-    ListBox aLbInsertList;
-    OKButton aOKButton1;
-    CancelButton aCancelButton1;
-    HelpButton aHelpButton1;
+    FixedText* m_pFtObjectSource;
+    ListBox* m_pLbInsertList;
+    OKButton* m_pOKButton;
     ::std::map< SotFormatStringId, String > aSupplementMap;
     SvGlobalName    aObjClassName;
     String          aObjName;
 
-    ListBox&        ObjectLB()      { return aLbInsertList; }
-    FixedText&      ObjectSource()  { return aFtObjectSource; }
+    ListBox&        ObjectLB()      { return *m_pLbInsertList; }
+    FixedText&      ObjectSource()  { return *m_pFtObjectSource; }
 
     void            SelectObject();
     DECL_LINK( SelectHdl, ListBox * );