tidy dialog a bit

Change-Id: I301e24aeb3f8b49dbf9902b7fb00c2992ece5e42

5 files changed, 19 insertions, 151 deletions

diff --git a/cui/source/dialogs/cuires.src b/cui/source/dialogs/cuires.src
index 2e6e6ed01b42..8fa9695cd509 100644
--- a/cui/source/dialogs/cuires.src
+++ b/cui/source/dialogs/cuires.src
@@ -31,12 +31,22 @@ String RID_SVXSTR_PRODMACROS
 
 String RID_SVXSTR_SELECTOR_ADD_COMMANDS
 {
-  TEXT [ en-US ] = "Add Commands" ;
+    TEXT [ en-US ] = "Add Commands" ;
 };
 
 String RID_SVXSTR_SELECTOR_RUN
 {
-  TEXT [ en-US ] = "Run" ;
+    TEXT [ en-US ] = "Run" ;
+};
+
+String RID_SVXSTR_ROW
+{
+    Text [ en-US ] = "Insert Rows" ;
+};
+
+String RID_SVXSTR_COL
+{
+    Text [ en-US ] = "Insert Columns" ;
 };
 
 #define MASKCOLOR  MaskColor = \
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index e48a8eb0967a..7efbc486fe80 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -21,7 +21,6 @@
 #include <svx/svxdlg.hxx>
 #include <cuires.hrc>
 #include "insrc.hxx"
-#include "insrc.hrc"
 
 bool SvxInsRowColDlg::isInsertBefore() const
 {
@@ -34,10 +33,10 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const
 }
 
 SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const rtl::OString& sHelpId )
-    : ModalDialog( pParent, "insert_row_dialog", "cui/ui/insrc.ui" ),
-    aRow(CUI_RESSTR(STR_ROW)),
-    aCol(CUI_RESSTR(STR_COL)),
-    bColumn( bCol )
+    : ModalDialog(pParent, "InsertRowColumnDialog", "cui/ui/insertrowcolumn.ui")
+    , aRow(CUI_RESSTR(RID_SVXSTR_ROW))
+    , aCol(CUI_RESSTR(RID_SVXSTR_COL))
+    , bColumn(bCol)
 {
     get(m_pCountEdit, "insert_number");
     get(m_pBeforeBtn, "insert_before");
diff --git a/cui/source/dialogs/insrc.hrc b/cui/source/dialogs/insrc.hrc
deleted file mode 100644
index d024cfe92e71..000000000000
--- a/cui/source/dialogs/insrc.hrc
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#define FT_COUNT    1
-#define ED_COUNT    2
-#define FL_INS          3
-
-#define CB_POS_BEFORE   10
-#define CB_POS_AFTER    11
-#define FL_POS                  12
-
-#define STR_ROW         20
-#define STR_COL         21
-
-#define BT_OK       100
-#define BT_CANCEL   101
-#define BT_HELP     102
diff --git a/cui/source/dialogs/insrc.src b/cui/source/dialogs/insrc.src
deleted file mode 100644
index 101dca68a25f..000000000000
--- a/cui/source/dialogs/insrc.src
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <cuires.hrc>
-#include "insrc.hrc"
-
-ModalDialog DLG_INS_ROW_COL
-{
-    HelpID = "cui:ModalDialog:DLG_INS_ROW_COL";
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 136 , 84 ) ;
-    Moveable = TRUE ;
-    OKButton BT_OK
-    {
-        Pos = MAP_APPFONT ( 80 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BT_CANCEL
-    {
-        Pos = MAP_APPFONT ( 80 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BT_HELP
-    {
-        Pos = MAP_APPFONT ( 80 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    RadioButton CB_POS_BEFORE
-    {
-        HelpID = "cui:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE";
-        Pos = MAP_APPFONT ( 12 , 49 ) ;
-        Size = MAP_APPFONT ( 56 , 10 ) ;
-        Text [ en-US ] = "~Before" ;
-        TabStop = TRUE ;
-    };
-    RadioButton CB_POS_AFTER
-    {
-        HelpID = "cui:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER";
-        Pos = MAP_APPFONT ( 12 , 62 ) ;
-        Size = MAP_APPFONT ( 56 , 10 ) ;
-        Text [ en-US ] = "A~fter" ;
-        TabStop = TRUE ;
-        Check = TRUE ;
-    };
-    NumericField ED_COUNT
-    {
-        HelpID = "cui:NumericField:DLG_INS_ROW_COL:ED_COUNT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 44 , 14 ) ;
-        Size = MAP_APPFONT ( 24 , 12 ) ;
-        TabStop = TRUE ;
-        Left = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 1 ;
-        Maximum = 99 ;
-        Value = 1 ;
-        First = 1 ;
-        Last = 5 ;
-    };
-    FixedLine FL_INS
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 68 , 8 ) ;
-        Text [ en-US ] = "Insert" ;
-    };
-    FixedLine FL_POS
-    {
-        Pos = MAP_APPFONT ( 6 , 38 ) ;
-        Size = MAP_APPFONT ( 68 , 8 ) ;
-        Text [ en-US ] = "Position";
-    };
-    FixedText FT_COUNT
-    {
-        Pos = MAP_APPFONT ( 12 , 16 ) ;
-        Size = MAP_APPFONT ( 30 , 8 ) ;
-        Text [ en-US ] = "~Number" ;
-        Left = TRUE ;
-    };
-    String STR_ROW
-    {
-        Text [ en-US ] = "Insert Rows" ;
-    };
-    String STR_COL
-    {
-        Text [ en-US ] = "Insert Columns" ;
-    };
-};
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 710f6cff183a..c497fda23f2f 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -259,9 +259,6 @@
 // icon choice
 #define RID_SVXSTR_ICONCHOICEDLG_RESETBUT   (RID_SVX_START + 580)
 
-// insert rows&cols
-#define DLG_INS_ROW_COL                     (RID_SVX_START + 156)
-
 // SvxMultiFileDialog
 #define RID_SVXSTR_FILE_TITLE               (RID_SVX_START + 482)
 #define RID_SVXSTR_FILE_HEADLINE            (RID_SVX_START + 483)
@@ -429,7 +426,9 @@
 #define RID_SVXSTR_PRODMACROS                               (RID_SVX_START + 1198)
 #define RID_SVXSTR_SELECTOR_ADD_COMMANDS                    (RID_SVX_START + 1199)
 #define RID_SVXSTR_SELECTOR_RUN                             (RID_SVX_START + 1200)
+#define RID_SVXSTR_ROW                                      (RID_SVX_START + 1201)
+#define RID_SVXSTR_COL                                      (RID_SVX_START + 1202)
 
-#define RID_SVXDLG_CERTPATH                                 (RID_SVX_START + 1201)
+#define RID_SVXDLG_CERTPATH                                 (RID_SVX_START + 1203)
 
 #endif