[Libreoffice-commits] .: cui/source

[Caolán McNamara]

 cui/source/options/optinet2.hrc |    4 ++--
 cui/source/options/optinet2.src |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6b0280acb864fc74a20e067e97363b4159e542e1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Apr 26 12:39:30 2012 +0100

    adjust rows so options and macro security frames are laid out the same

diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc
index 34dce4f..d39495f 100644
--- a/cui/source/options/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -116,9 +116,9 @@
 #define ROW_4a                      (ROW_4+RSC_CD_CHECKBOX_HEIGHT+1)
 #define ROW_5                       (ROW_4a+4*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
 #define ROW_6                       (ROW_5+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_7                       (ROW_6+2*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
+#define ROW_7                       (ROW_6+3*RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
+#define ROW_7a                      (ROW_7-RSC_SP_FLGR_SPACE_Y-RSC_CD_PUSHBUTTON_HEIGHT)
 #define ROW_8                       (ROW_7+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_9                       (ROW_8+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_DESC_Y)
 
 // Defines - JavaScriptDisableQueryBox_Impl -------------------------------
 
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 9ac8dc1..353eded 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -367,7 +367,7 @@ TabPage RID_SVXPAGE_INET_SECURITY
     PushButton PB_SEC_MACROSEC
     {
         HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC";
-        Pos = MAP_APPFONT( COL_3, ROW_6-2 );
+        Pos = MAP_APPFONT( COL_3, ROW_7a );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Macro Security...";
     };