From 91c99daaaec9354222e6f1ae2b7d71130a3eb8f1 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Wed, 7 Jan 2009 06:33:02 +0000
Subject: Correct integration of CWS mav43 (wrongly resolved merge conflict).

---
 svx/source/options/optinet2.src | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'svx/source/options')

diff --git a/svx/source/options/optinet2.src b/svx/source/options/optinet2.src
index 2737ae2fb3bb..2ef6dc59c2e4 100644
--- a/svx/source/options/optinet2.src
+++ b/svx/source/options/optinet2.src
@@ -468,13 +468,13 @@ TabPage RID_SVXPAGE_INET_SECURITY
     };
     PushButton PB_SEC_CONNECTIONS
     {
-        Pos = MAP_APPFONT( COL_3, ROW_3-3 );
+        Pos = MAP_APPFONT( COL_3, ROW_3-1 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Connections...";
     };
     CheckBox CB_SEC_MASTERPASSWORD
     {
-        Pos = MAP_APPFONT( COL_1a, ROW_4 + 2);
+        Pos = MAP_APPFONT( COL_1a, ROW_4 );
         Size = MAP_APPFONT( COL_2-COL_1a, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Protected by a master password (recommended)";
     };
-- 
cgit