summaryrefslogtreecommitdiff
path: root/svx/source/options
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2009-01-07 06:33:02 +0000
committerRüdiger Timm <rt@openoffice.org>2009-01-07 06:33:02 +0000
commit91c99daaaec9354222e6f1ae2b7d71130a3eb8f1 (patch)
tree20c0b7e367e7be018f053fef9bc91afa669e316d /svx/source/options
parent980442418868a7a187988bba0660b9d0e4d8af96 (diff)
Correct integration of CWS mav43 (wrongly resolved merge conflict).
Diffstat (limited to 'svx/source/options')
-rw-r--r--svx/source/options/optinet2.src4
1 files changed, 2 insertions, 2 deletions
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)";
};