summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-05-15 10:10:18 +0200
committerDavid Tardon <dtardon@redhat.com>2012-05-17 07:57:59 +0200
commitf70fe6e651eefbc69c434256f7e74ad53519a36c (patch)
treeb249e3372dcc14b618868b1f0b7a3916b50f2312 /sc/source
parent9baeb0bd8f621457d265f09bd377d7147141030d (diff)
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
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/ui/dbgui/validate.src8
-rw-r--r--sc/source/ui/docshell/tpstat.src2
-rw-r--r--sc/source/ui/pagedlg/hfedtdlg.src2
-rw-r--r--sc/source/ui/pagedlg/pagedlg.src2
-rw-r--r--sc/source/ui/src/attrdlg.src2
-rw-r--r--sc/source/ui/src/opredlin.src2
-rw-r--r--sc/source/ui/src/optdlg.src16
-rw-r--r--sc/source/ui/src/sortdlg.src4
-rw-r--r--sc/source/ui/src/subtdlg.src4
9 files changed, 22 insertions, 20 deletions
diff --git a/sc/source/ui/dbgui/validate.src b/sc/source/ui/dbgui/validate.src
index 62e7f597ca25..46112248d037 100644
--- a/sc/source/ui/dbgui/validate.src
+++ b/sc/source/ui/dbgui/validate.src
@@ -25,6 +25,8 @@
*
************************************************************************/
+#include <sfx2/tabpage.hrc>
+
#include "validate.hrc"
TabDialog TAB_DLG_VALIDATION
@@ -69,7 +71,7 @@ TabPage TP_VALIDATION_VALUES
HelpID = "sc:TabPage:TP_VALIDATION_VALUES";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = "Values" ;
FixedText FT_ALLOW
{
@@ -204,7 +206,7 @@ TabPage TP_VALIDATION_INPUTHELP
HelpID = "sc:TabPage:TP_VALIDATION_INPUTHELP";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text = "Eingabehilfe" ;
TriStateBox TSB_HELP
{
@@ -257,7 +259,7 @@ TabPage TP_VALIDATION_ERROR
HelpID = "sc:TabPage:TP_VALIDATION_ERROR";
Hide = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_CONTENT
{
Pos = MAP_APPFONT ( 6 , 22 ) ;
diff --git a/sc/source/ui/docshell/tpstat.src b/sc/source/ui/docshell/tpstat.src
index 3ee5b91a7b2e..90beef2ce11c 100644
--- a/sc/source/ui/docshell/tpstat.src
+++ b/sc/source/ui/docshell/tpstat.src
@@ -30,7 +30,7 @@ TabPage RID_SCPAGE_STAT
{
// HelpID = HID_DOC_STAT;
Hide = TRUE ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_TABLES_LBL
{
Pos = MAP_APPFONT ( 12 , 17 ) ;
diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src
index bcfdef66b613..3c3236ddf483 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.src
+++ b/sc/source/ui/pagedlg/hfedtdlg.src
@@ -445,7 +445,7 @@ TabPage RID_HFBASE
Hide = TRUE ;
HelpId = HID_SCPAGE_HFEDIT ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_LEFT
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
diff --git a/sc/source/ui/pagedlg/pagedlg.src b/sc/source/ui/pagedlg/pagedlg.src
index 0a56d70f966a..d1026a1c739d 100644
--- a/sc/source/ui/pagedlg/pagedlg.src
+++ b/sc/source/ui/pagedlg/pagedlg.src
@@ -164,7 +164,7 @@ TabPage RID_SCPAGE_TABLE
HelpId = HID_SCPAGE_TABLE ;
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
CheckBox BTN_HEADER
{
HelpID = "sc:CheckBox:RID_SCPAGE_TABLE:BTN_HEADER";
diff --git a/sc/source/ui/src/attrdlg.src b/sc/source/ui/src/attrdlg.src
index d228a0cb03cb..a96bad9483dc 100644
--- a/sc/source/ui/src/attrdlg.src
+++ b/sc/source/ui/src/attrdlg.src
@@ -106,7 +106,7 @@ TabPage RID_SCPAGE_PROTECTION
SVLook = TRUE ;
HelpId = HID_SCPAGE_PROTECTION ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
TriStateBox BTN_PROTECTED
{
HelpID = "sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_PROTECTED";
diff --git a/sc/source/ui/src/opredlin.src b/sc/source/ui/src/opredlin.src
index fc29e8b0a0a1..c37de89507e5 100644
--- a/sc/source/ui/src/opredlin.src
+++ b/sc/source/ui/src/opredlin.src
@@ -32,7 +32,7 @@ TabPage RID_SCPAGE_OPREDLINE
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_CONTENT
{
HelpID = HID_SCPAGE_OPREDLINBE_FT_CONTENT ;
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index 013c4762248a..7bb561da1375 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -38,7 +38,7 @@ TabPage RID_SCPAGE_CALC
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
CheckBox BTN_ITERATE
{
HelpID = "sc:CheckBox:RID_SCPAGE_CALC:BTN_ITERATE";
@@ -191,7 +191,7 @@ TabPage RID_SCPAGE_FORMULA
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_FORMULA_OPTIONS
{
@@ -291,7 +291,7 @@ TabPage RID_SCPAGE_COMPATIBILITY
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_KEY_BINDINGS
{
@@ -334,7 +334,7 @@ TabPage RID_SCPAGE_USERLISTS
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedText FT_LISTS
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -439,7 +439,7 @@ TabPage RID_SCPAGE_CONTENT
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine GB_LINES
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -696,7 +696,7 @@ TabPage RID_SCPAGE_LAYOUT
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine GB_UNIT
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -881,7 +881,7 @@ TabPage RID_SCPAGE_PRINT
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_PAGES
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
@@ -916,7 +916,7 @@ TabPage RID_SCPAGE_DEFAULTS
SVLook = TRUE ;
Hide = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
FixedLine FL_INIT_SPREADSHEET
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
diff --git a/sc/source/ui/src/sortdlg.src b/sc/source/ui/src/sortdlg.src
index 466ab7a5d990..7d7a19b716fc 100644
--- a/sc/source/ui/src/sortdlg.src
+++ b/sc/source/ui/src/sortdlg.src
@@ -31,7 +31,7 @@ TabPage RID_SCPAGE_SORT_FIELDS
Hide = TRUE ;
SVLook = TRUE ;
HelpId = HID_SCPAGE_SORT_FIELDS ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
ListBox LB_SORT1
{
HelpID = "sc:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT1";
@@ -133,7 +133,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS
SVLook = TRUE ;
HelpId = HID_SCPAGE_SORT_OPTIONS ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
CheckBox BTN_CASESENSITIVE
{
HelpID = "sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_CASESENSITIVE";
diff --git a/sc/source/ui/src/subtdlg.src b/sc/source/ui/src/subtdlg.src
index 7f3d01e7d99b..7b9f8f1292cb 100644
--- a/sc/source/ui/src/subtdlg.src
+++ b/sc/source/ui/src/subtdlg.src
@@ -31,7 +31,7 @@ TabPage RID_SCPAGE_SUBT_OPTIONS
{
HelpId = HID_SCPAGE_SUBT_OPTIONS ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedLine FL_GROUP
{
@@ -119,7 +119,7 @@ TabPage RID_SUBTBASE
// aus den Ableitungen nicht in der HID-Liste auftauchen wuerden
HelpId = HID_SCPAGE_SUBT_GROUP ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( 260 , 185 ) ;
+ Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedText FT_GROUP
{