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 /sfx2/source | |
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 'sfx2/source')
-rw-r--r-- | sfx2/source/dialog/dinfdlg.src | 11 | ||||
-rw-r--r-- | sfx2/source/dialog/mgetempl.src | 3 | ||||
-rw-r--r-- | sfx2/source/dialog/printopt.src | 3 | ||||
-rw-r--r-- | sfx2/source/dialog/securitypage.src | 3 |
4 files changed, 12 insertions, 8 deletions
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 { |