fdo#49921 make sure all tab pages have the same dimensions

The reason is that they can be combined arbitrarily in dialogs, so
changing, e.g., height of one tab can lead to "interesting" results. Cf.
commits 8631dbf85fb5ed56d225e32ea5a9c36c96b0d649 and
29042d096a2c5812ae179e1553367afd21b0f71e that were the cause of the
problem described fdo#49921.

Change-Id: I9995002a2bd5c3604bdfa06dc817916ce61c558d

7 files changed, 53 insertions, 8 deletions

diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 4dd559d4a65f..4c2594c258fb 100644
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -122,6 +122,7 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabpage.hrc,sfx2/tabpage.hrc))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/taskpane.hxx,sfx2/taskpane.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx))
diff --git a/sfx2/inc/sfx2/dialogs.hrc b/sfx2/inc/sfx2/dialogs.hrc
index 97e9dd725c9a..17ebfdd18b1e 100644
--- a/sfx2/inc/sfx2/dialogs.hrc
+++ b/sfx2/inc/sfx2/dialogs.hrc
@@ -30,6 +30,7 @@
 // include ------------------------------------------------------------------
 
 #include <sfx2/sfxsids.hrc>
+#include <sfx2/tabpage.hrc>
 
 #define RID_OFA_AUTOCORR_DLG            (RID_OFA_START + 101)
 #define RID_SVXDLG_CUSTOMIZE            (RID_SVX_START + 291)
diff --git a/sfx2/inc/sfx2/tabpage.hrc b/sfx2/inc/sfx2/tabpage.hrc
new file mode 100644
index 000000000000..e4fdea1b05a0
--- /dev/null
+++ b/sfx2/inc/sfx2/tabpage.hrc
@@ -0,0 +1,39 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_SFX2_TABPAGE_HRC
+#define INCLUDED_SFX2_TABPAGE_HRC
+
+// Width and height of all tab pages used in dialogs. Because tab pages
+// can be combined arbitrarily in tab dialogs, they have to have the
+// same dimensions. If you need to adjust either dimension of any tab
+// page (when adding new controls), do the change here.
+
+#define TP_WIDTH                    260
+#define TP_HEIGHT                   199
+
+#endif
diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src
index 45ef821ace2d..7d5c297a2919 100644
--- a/sfx2/source/dialog/dinfdlg.src
+++ b/sfx2/source/dialog/dinfdlg.src
@@ -28,6 +28,7 @@
  // include ---------------------------------------------------------------
 
 #include "sfx2/sfx.hrc"
+#include "sfx2/tabpage.hrc"
 #include "helpid.hrc"
 #include "sfxlocal.hrc"
 #include "dinfdlg.hrc"
@@ -43,7 +44,7 @@ TabPage TP_DOCINFODESC
 {
     HelpId = HID_DOCINFODESC ;
     Hide = TRUE ;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
+    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
     FixedText FT_TITLE
     {
         Pos = MAP_APPFONT ( 6 , 7 ) ;
@@ -117,7 +118,7 @@ TabPage TP_DOCINFODOC
 {
     HelpId = HID_DOCINFODOC ;
     Hide = TRUE ;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
+    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
     FixedImage BMP_FILE_1
     {
         Pos = MAP_APPFONT ( 6 , 7 ) ;
@@ -323,7 +324,7 @@ TabPage TP_DOCINFOUSER
 {
     HelpId = HID_DOCINFOUSER ;
     Hide = TRUE ;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
+    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
     FixedText FT_INFO1
     {
         Pos = MAP_APPFONT ( 6 , 6 ) ;
@@ -395,7 +396,7 @@ TabPage TP_DOCINFORELOAD
 {
     HelpId = HID_DOCINFORELOAD ;
     Hide = TRUE ;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
+    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
     RadioButton RB_NOAUTOUPDATE
     {
         HelpID = "sfx2:RadioButton:TP_DOCINFORELOAD:RB_NOAUTOUPDATE";
@@ -520,7 +521,7 @@ TabPage TP_CUSTOMPROPERTIES
 {
     HelpId = HID_TP_CUSTOMPROPERTIES ;
     Hide = TRUE ;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
+    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
     FixedText FT_PROPERTIES
     {
         Pos = MAP_APPFONT ( 6 , 7 ) ;
diff --git a/sfx2/source/dialog/mgetempl.src b/sfx2/source/dialog/mgetempl.src
index df024cab00e7..9d0a8e269234 100644
--- a/sfx2/source/dialog/mgetempl.src
+++ b/sfx2/source/dialog/mgetempl.src
@@ -26,6 +26,7 @@
  ************************************************************************/
 
 #include <sfx2/sfx.hrc>
+#include <sfx2/tabpage.hrc>
 #include "helpid.hrc"
 #include "mgetempl.hrc"
 
@@ -34,7 +35,7 @@ TabPage TP_MANAGE_STYLES
 {
     HelpId = HID_MANAGE_STYLES ;
     Hide = TRUE ;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
+    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
     FixedText FT_NAME
     {
         Pos = MAP_APPFONT ( 6 , 8 ) ;
diff --git a/sfx2/source/dialog/printopt.src b/sfx2/source/dialog/printopt.src
index 586d8a8479c3..e3d75ab3ff82 100644
--- a/sfx2/source/dialog/printopt.src
+++ b/sfx2/source/dialog/printopt.src
@@ -28,6 +28,7 @@
 // include ---------------------------------------------------------------
 
 #include <sfx2/sfx.hrc>
+#include <sfx2/tabpage.hrc>
 #include "printopt.hrc"
 #include "dialog.hrc"
 #include "helpid.hrc"
@@ -40,7 +41,7 @@ TabPage TP_COMMONPRINTOPTIONS
 {
     HelpID = HID_TP_COMMONPRINTOPTIONS;
     SVLook = TRUE ;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
+    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
     Hide = TRUE ;
 
     FixedLine GB_REDUCE
diff --git a/sfx2/source/dialog/securitypage.src b/sfx2/source/dialog/securitypage.src
index 87cc2e1af8d8..b4a3be1feb14 100644
--- a/sfx2/source/dialog/securitypage.src
+++ b/sfx2/source/dialog/securitypage.src
@@ -26,6 +26,7 @@
  ************************************************************************/
 
 #include "sfx2/sfx.hrc"
+#include "sfx2/tabpage.hrc"
 #include "securitypage.hrc"
 #include "helpid.hrc"
 #include "dialog.hrc"
@@ -38,7 +39,7 @@ TabPage TP_DOCINFOSECURITY
 {
     HelpId = HID_DOCINFOSECURITY ;
     Hide = TRUE ;
-    Size = MAP_APPFONT ( 260 , 185 ) ;
+    Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
 
     FixedLine PASSWORD_TO_OPEN_FL
     {