drop RID_SCDLG_INSCONT, etc. now

Change-Id: Iee2eaf89f662b61fc4ec32b353b13417ee6b2610

sc/inc/sc.hrc

@@ -1003,9 +1003,6 @@
 
 #define RID_SCDLG_INSCELL       (SC_DIALOGS_START + 12)
 
-#define RID_SCDLG_INSCONT       (SC_DIALOGS_START + 14)
-
-
 #define RID_SCDLG_SELENTRY      (SC_DIALOGS_START + 18)
 #define RID_SCDLG_AUTOFORMAT    (SC_DIALOGS_START + 20)
 #define RID_SCDLG_NAMES         (SC_DIALOGS_START + 22)

sc/inc/scabstdlg.hxx

@@ -383,7 +383,6 @@ public:
                                                             sal_Bool bDisallowCellMove = false ) = 0;
 
     virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window*        pParent,
-                                                                    int nId,
                                                                     sal_uInt16      nCheckDefaults = 0,
                                                                     const OUString* pStrTitle = NULL ) = 0;
 

sc/source/ui/attrdlg/scdlgfact.cxx

@@ -788,23 +788,11 @@ AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( W
 }
 
 AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( Window*      pParent,
-                                                                                    int nId,
                                                                                     sal_uInt16      nCheckDefaults,
                                                                                     const OUString* pStrTitle )
 {
-    ScInsertContentsDlg * pDlg=NULL;
-    switch ( nId )
-    {
-        case RID_SCDLG_INSCONT :
-            pDlg = new ScInsertContentsDlg( pParent, nCheckDefaults,pStrTitle );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractScInsertContentsDlg_Impl( pDlg );
-    return 0;
+    ScInsertContentsDlg * pDlg = new ScInsertContentsDlg(pParent, nCheckDefaults, pStrTitle);
+    return new AbstractScInsertContentsDlg_Impl( pDlg );
 }
 
 AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg(Window* pParent, ScViewData& rViewData,

sc/source/ui/attrdlg/scdlgfact.hxx

@@ -451,7 +451,6 @@ public:
                                                             sal_Bool bDisallowCellMove = false );
 
     virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window*        pParent,
-                                                                    int nId,
                                                                     sal_uInt16      nCheckDefaults = 0,
                                                                     const OUString* pStrTitle = NULL );
 

sc/source/ui/inc/miscdlgs.hrc

@@ -18,7 +18,6 @@
  */
 
 #include "sc.hrc"
-                    // -> RID_SCDLG_INSCONT
                     // -> RID_SCDLG_MOVETAB
                     // -> RID_SCDLG_SELENTRY
                     // -> RID_SCDLG_FILLSERIES
@@ -36,32 +35,6 @@
 #define STR_BTN_CLOSE   200
 
 
-// Insert Contents Dialog
-#define BTN_INSALL      20
-#define BTN_INSSTRINGS  21
-#define BTN_INSNUMBERS  22
-#define BTN_INSDATETIME 23
-#define BTN_INSFORMULAS 24
-#define BTN_INSATTRS    25
-#define BTN_INSNOTES    26
-#define BTN_OP_NOOP     27
-#define BTN_OP_ADD      28
-#define BTN_OP_SUB      29
-#define BTN_OP_MUL      30
-#define BTN_OP_DIV      31
-#define FL_OPERATION    32
-#define BTN_SKIP_EMPTY  33
-#define BTN_TRANSPOSE   34
-#define BTN_LINK        35
-#define FL_OPTIONS      36
-#define BTN_MV_NONE     37
-#define BTN_MV_DOWN     38
-#define BTN_MV_RIGHT    39
-#define FL_MOVE         40
-#define BTN_INSOBJECTS  41
-#define FL_SEP1         51
-#define FL_SEP2         52
-
 // String input
 #define ED_INPUT        10
 

sc/source/ui/view/cellsh1.cxx

@@ -470,7 +470,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
 
                     AbstractScInsertContentsDlg* pDlg = pFact->CreateScInsertContentsDlg( pTabViewShell->GetDialogParent(),
-                                                                                            RID_SCDLG_INSCONT, 0, /* nCheckDefaults */
+                                                                                            0, /* nCheckDefaults */
                                                                                             &ScGlobal::GetRscString(STR_FILL_TAB));
                     OSL_ENSURE(pDlg, "Dialog create fail!");
                     pDlg->SetFillMode(true);
@@ -1333,8 +1333,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                             ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
                             OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
 
-                            AbstractScInsertContentsDlg* pDlg = pFact->CreateScInsertContentsDlg( pTabViewShell->GetDialogParent(),
-                                                                                                    RID_SCDLG_INSCONT);
+                            AbstractScInsertContentsDlg* pDlg = pFact->CreateScInsertContentsDlg(pTabViewShell->GetDialogParent());
                             OSL_ENSURE(pDlg, "Dialog create fail!");
                             pDlg->SetOtherDoc( bOtherDoc );
                             // if ChangeTrack MoveMode disable

sc/uiconfig/scalc/ui/pastespecial.ui

 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Tue Jan 28 13:14:40 2014 -->
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="PasteSpecial">
@@ -70,7 +71,7 @@
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="row_spacing">6</property>
+            <property name="row_spacing">12</property>
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkFrame" id="frame1">
@@ -84,8 +85,8 @@
                   <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="left_padding">12</property>
                     <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
                     <child>
                       <object class="GtkBox" id="box1">
                         <property name="visible">True</property>
@@ -254,8 +255,8 @@
                   <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="left_padding">12</property>
                     <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
                     <child>
                       <object class="GtkBox" id="box4">
                         <property name="visible">True</property>
@@ -386,8 +387,8 @@
                   <object class="GtkAlignment" id="alignment3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="left_padding">12</property>
                     <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
                     <child>
                       <object class="GtkBox" id="box3">
                         <property name="visible">True</property>
@@ -401,7 +402,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
@@ -419,7 +419,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
@@ -437,7 +436,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
@@ -482,8 +480,8 @@
                   <object class="GtkAlignment" id="alignment4">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="left_padding">12</property>
                     <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
                     <child>
                       <object class="GtkBox" id="box2">
                         <property name="visible">True</property>
@@ -533,7 +531,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="use_action_appearance">False</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>