diff options
author | David Tardon <dtardon@redhat.com> | 2012-05-15 10:10:18 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2012-05-17 07:57:59 +0200 |
commit | f70fe6e651eefbc69c434256f7e74ad53519a36c (patch) | |
tree | b249e3372dcc14b618868b1f0b7a3916b50f2312 /cui/source/options | |
parent | 9baeb0bd8f621457d265f09bd377d7147141030d (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 'cui/source/options')
-rw-r--r-- | cui/source/options/dbregister.src | 2 | ||||
-rw-r--r-- | cui/source/options/fontsubs.src | 2 | ||||
-rw-r--r-- | cui/source/options/optasian.src | 2 | ||||
-rw-r--r-- | cui/source/options/optchart.src | 2 | ||||
-rw-r--r-- | cui/source/options/optcolor.src | 2 | ||||
-rw-r--r-- | cui/source/options/optctl.src | 2 | ||||
-rw-r--r-- | cui/source/options/optfltr.src | 4 | ||||
-rw-r--r-- | cui/source/options/optgdlg.src | 6 | ||||
-rw-r--r-- | cui/source/options/optgenrl.src | 2 | ||||
-rw-r--r-- | cui/source/options/opthtml.src | 2 | ||||
-rw-r--r-- | cui/source/options/optinet2.hrc | 4 | ||||
-rw-r--r-- | cui/source/options/optinet2.src | 6 | ||||
-rw-r--r-- | cui/source/options/optjava.src | 2 | ||||
-rw-r--r-- | cui/source/options/optjsearch.src | 2 | ||||
-rw-r--r-- | cui/source/options/optlingu.src | 2 | ||||
-rw-r--r-- | cui/source/options/optmemory.src | 2 | ||||
-rw-r--r-- | cui/source/options/optpath.src | 2 | ||||
-rw-r--r-- | cui/source/options/optsave.src | 2 | ||||
-rw-r--r-- | cui/source/options/optupdt.src | 2 |
19 files changed, 25 insertions, 25 deletions
diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src index e2ad56ceedd0..3b518eea91d0 100644 --- a/cui/source/options/dbregister.src +++ b/cui/source/options/dbregister.src @@ -38,7 +38,7 @@ TabPage RID_SFXPAGE_DBREGISTER OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; Text [ en-US ] = "Registered databases" ; FixedText FT_TYPE diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src index 5938efe4be11..a99f9efbda69 100644 --- a/cui/source/options/fontsubs.src +++ b/cui/source/options/fontsubs.src @@ -35,7 +35,7 @@ TabPage RID_SVX_FONT_SUBSTITUTION HelpID = HID_OFA_FONT_SUBSTITUTION ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; CheckBox CB_USETABLE { HelpID = "cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE"; diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src index 80da6310695b..82ebe288fb70 100644 --- a/cui/source/options/optasian.src +++ b/cui/source/options/optasian.src @@ -34,7 +34,7 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT { HelpId = HID_OPTIONS_ASIAN_LAYOUT ; OutputSize = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; SVLook = TRUE ; Hide = TRUE ; FixedLine GB_KERNING diff --git a/cui/source/options/optchart.src b/cui/source/options/optchart.src index 7c95d04cabad..5b5fe3450463 100644 --- a/cui/source/options/optchart.src +++ b/cui/source/options/optchart.src @@ -34,7 +34,7 @@ TabPage RID_OPTPAGE_CHART_DEFCOLORS { HelpID = HID_OPTIONS_CHART_DEFCOLORS; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; Hide = TRUE; Text [ en-US ] = "Default Colors"; FixedLine FL_CHART_COLOR_LIST diff --git a/cui/source/options/optcolor.src b/cui/source/options/optcolor.src index 4313415280b9..fdfb1094fa10 100644 --- a/cui/source/options/optcolor.src +++ b/cui/source/options/optcolor.src @@ -36,7 +36,7 @@ TabPage RID_SVXPAGE_COLORCONFIG OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; FixedLine FL_COLORSCHEME { Pos = MAP_APPFONT ( 6 , 3 ) ; diff --git a/cui/source/options/optctl.src b/cui/source/options/optctl.src index a9207701fd52..97769ce51817 100644 --- a/cui/source/options/optctl.src +++ b/cui/source/options/optctl.src @@ -35,7 +35,7 @@ TabPage RID_SVXPAGE_OPTIONS_CTL { HelpId = HID_OPTIONS_CTL ; OutputSize = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; SVLook = TRUE ; Hide = TRUE ; Text [ en-US ] = "Complex Text Layout" ; diff --git a/cui/source/options/optfltr.src b/cui/source/options/optfltr.src index 60c40306b48c..1523a01e7424 100644 --- a/cui/source/options/optfltr.src +++ b/cui/source/options/optfltr.src @@ -33,7 +33,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT { HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT"; OutputSize = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; SVLook = TRUE ; Hide = TRUE ; @@ -127,7 +127,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT2 { HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT2"; OutputSize = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; SVLook = TRUE ; Hide = TRUE ; diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index 0e01fe0981b4..4319a95212af 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -40,7 +40,7 @@ TabPage OFA_TP_MISC { HelpID = HID_OFA_TP_MISC ; SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; Hide = TRUE ; FixedLine FL_HELP { @@ -204,7 +204,7 @@ TabPage OFA_TP_VIEW { HelpID = HID_OFA_TP_VIEW ; SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; Hide = TRUE ; FixedLine FL_USERINTERFACE { @@ -485,7 +485,7 @@ TabPage OFA_TP_LANGUAGES { HelpID = HID_OFA_TP_LANGUAGES ; SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; Hide = TRUE ; FixedLine FL_UI_LANG { diff --git a/cui/source/options/optgenrl.src b/cui/source/options/optgenrl.src index bc5721024c1a..5e40efe97d18 100644 --- a/cui/source/options/optgenrl.src +++ b/cui/source/options/optgenrl.src @@ -41,7 +41,7 @@ TabPage RID_SFXPAGE_GENERAL OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; Text [ en-US ] = "User Data" ; FixedText FT_COMPANY { diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src index 4d8c0b5547f2..cc471034dfae 100644 --- a/cui/source/options/opthtml.src +++ b/cui/source/options/opthtml.src @@ -34,7 +34,7 @@ TabPage RID_OFAPAGE_HTMLOPT { HelpID = "cui:TabPage:RID_OFAPAGE_HTMLOPT"; OutputSize = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; SVLook = TRUE ; Hide = TRUE ; FixedText FT_SIZE1 diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc index a4c1781aadfe..64bf526beadb 100644 --- a/cui/source/options/optinet2.hrc +++ b/cui/source/options/optinet2.hrc @@ -27,6 +27,8 @@ #ifndef _SVX_OPTINET_HRC #define _SVX_OPTINET_HRC +#include <sfx2/tabpage.hrc> + #ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> #endif @@ -99,8 +101,6 @@ #define STR_SEC_NOPASSWDSAVE 12 -#define TP_WIDTH 260 -#define TP_HEIGHT 185 #define OFFS_BUTTON_Y (-6) #define BORDER_OFFSET 8 #define COL_0 (RSC_SP_TBPG_INNERBORDER_LEFT) diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src index 029c46e311bb..03688e2554e7 100644 --- a/cui/source/options/optinet2.src +++ b/cui/source/options/optinet2.src @@ -40,7 +40,7 @@ TabPage RID_SVXPAGE_INET_MOZPLUGIN { HelpID = "cui:TabPage:RID_SVXPAGE_INET_MOZPLUGIN"; OutputSize = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; SVLook = TRUE ; Hide = TRUE ; @@ -64,7 +64,7 @@ TabPage RID_SVXPAGE_INET_PROXY { HelpId = HID_OPTIONS_PROXY ; OutputSize = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; SVLook = TRUE ; Hide = TRUE ; Text [ en-US ] = "Proxy" ; @@ -450,7 +450,7 @@ TabPage RID_SVXPAGE_INET_MAIL { HelpID = HID_OPTIONS_MAIL ; SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; Hide = TRUE ; FixedLine FL_MAIL diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src index 6e7a42931571..0044646e359c 100644 --- a/cui/source/options/optjava.src +++ b/cui/source/options/optjava.src @@ -39,7 +39,7 @@ TabPage RID_SVXPAGE_OPTIONS_JAVA OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; Text [ en-US ] = "Java" ; FixedLine FL_JAVA diff --git a/cui/source/options/optjsearch.src b/cui/source/options/optjsearch.src index 463e68881e4c..21f97c0b3036 100644 --- a/cui/source/options/optjsearch.src +++ b/cui/source/options/optjsearch.src @@ -36,7 +36,7 @@ TabPage RID_SVXPAGE_JSEARCH_OPTIONS HelpId = HID_SVXPAGE_JSEARCH_OPTIONS ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; FixedLine FL_TREAT_AS_EQUAL { Pos = MAP_APPFONT( 6, 3 ); diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src index 1187295b2ac3..cc8fb16ef574 100644 --- a/cui/source/options/optlingu.src +++ b/cui/source/options/optlingu.src @@ -201,7 +201,7 @@ TabPage RID_SFXPAGE_LINGU HelpId = HID_OPTIONS_LINGU ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; Text [ en-US ] = "Options"; FixedLine FL_LINGUISTIC { diff --git a/cui/source/options/optmemory.src b/cui/source/options/optmemory.src index c1e748bc7673..3d0570989e64 100644 --- a/cui/source/options/optmemory.src +++ b/cui/source/options/optmemory.src @@ -35,7 +35,7 @@ TabPage OFA_TP_MEMORY { HelpID = HID_OFA_TP_MEMORY ; SVLook = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; Hide = TRUE ; FixedLine GB_UNDO { diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src index c6400a2246ba..60fc5b1bc44e 100644 --- a/cui/source/options/optpath.src +++ b/cui/source/options/optpath.src @@ -40,7 +40,7 @@ TabPage RID_SFXPAGE_PATH OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; Text [ en-US ] = "Paths" ; FixedText FT_TYPE { diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src index eafb980cdaf2..8bce711411c0 100644 --- a/cui/source/options/optsave.src +++ b/cui/source/options/optsave.src @@ -42,7 +42,7 @@ TabPage RID_SFXPAGE_SAVE SVLook = TRUE ; Hide = TRUE ; TEXT_SAVEPAGE - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; FixedLine LB_LOAD { Pos = MAP_APPFONT ( 6 , 2 ) ; diff --git a/cui/source/options/optupdt.src b/cui/source/options/optupdt.src index 6b271b91c71c..900ece49322e 100644 --- a/cui/source/options/optupdt.src +++ b/cui/source/options/optupdt.src @@ -37,7 +37,7 @@ TabPage RID_SVXPAGE_ONLINEUPDATE OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; - Size = MAP_APPFONT ( 260 , 185 ) ; + Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; Text [ en-US ] = "OnlineUpdate" ; FixedLine FL_OPTIONS { |