CWS-TOOLING: integrate CWS fwk92

2008-12-04 14:43:28 +0100 oc  r264844 : #i96788#
2008-12-03 02:15:17 +0100 fredrikh  r264734 : i96817
2008-12-02 16:42:46 +0100 tbo  r264720 : #i96763# changes to password dialog for framework, math, global
2008-11-26 16:26:28 +0100 mav  r264418 : #i93617# fix typo
2008-11-26 16:13:03 +0100 mav  r264411 : #i93617# fix the linux scenario
2008-11-25 17:58:01 +0100 mav  r264323 : #i93617# fix the windows problems
2008-11-25 17:51:33 +0100 mav  r264321 : #i93617# fix the windows problems
2008-11-21 16:01:18 +0100 mav  r264145 : #i78753# integrate the patch
2008-11-21 14:08:32 +0100 mav  r264136 : #i93617# integrate the patch
2008-11-21 13:01:56 +0100 mav  r264127 : #i82947# integrate the patch
2008-11-20 18:14:19 +0100 mav  r264092 : #i95793# look for import filter
2008-11-18 15:23:44 +0100 pb  r263776 : fix: #i92579# #i92583# SvxSecurity/SearchPage: more space for controls
2008-11-18 15:21:39 +0100 pb  r263774 : fix: #i92579# #i92583# SvxSecurity/SearchPage: more space for controls
2008-11-18 15:18:54 +0100 pb  r263772 : fix: #i92583# SvxSearchPage::InitControls_Impl() added
2008-11-18 15:16:07 +0100 pb  r263771 : fix: #i92579# columns calculated newly
2008-11-18 11:09:28 +0100 mav  r263751 : #i21923# small fixes
2008-11-17 17:22:04 +0100 mav  r263730 : #i21923# integrate the patch
2008-11-17 14:29:02 +0100 mav  r263723 : #i21923# integrate the patch
2008-11-13 16:46:08 +0100 mav  r263653 : #i88127# integrate the patch
2008-11-13 14:46:56 +0100 mav  r263645 : #i54638# integrate the patch
2008-11-11 13:11:03 +0100 pb  r263554 : fix: #i93142# disable maRecommReadOnlyCB on read-only documents
2008-11-10 13:30:58 +0100 pb  r263516 : fix: #i93833# Mozilla Plug-in -> Browser Plug-in
2008-11-10 13:29:10 +0100 pb  r263515 : fix: #i93833# Mozilla Plug-in -> Browser Plug-in
2008-11-10 06:10:11 +0100 pb  r263505 : fix: #i94937# now .uno.ExtendedHelp without image
2008-11-04 20:52:50 +0100 mav  r263337 : migrate cws fwk92 to svn

1 files changed, 29 insertions, 28 deletions

diff --git a/svx/source/options/optinet2.src b/svx/source/options/optinet2.src
index a51b506def0f..b4591a56d657 100644
--- a/svx/source/options/optinet2.src
+++ b/svx/source/options/optinet2.src
@@ -53,14 +53,14 @@ TabPage RID_SVXPAGE_INET_MOZPLUGIN
     {
         Pos = MAP_APPFONT ( 6 , 3 ) ;
         Size = MAP_APPFONT (  248 , 8  ) ;
-        Text[ en-US ] = "Mozilla Plug-in";
+        Text[ en-US ] = "Browser Plug-in";
     };
     CheckBox CB_MOZPLUGIN_CODE
     {
         Pos = MAP_APPFONT ( 12 , 14 ) ;
         Size = MAP_APPFONT (  236 , 10  ) ;
         TabStop = TRUE ;
-        Text [ en-US ] = "~Enable" ;
+        Text [ en-US ] = "~Display documents in browser" ;
     };
 };
 
@@ -319,67 +319,67 @@ TabPage RID_SVXPAGE_INET_SEARCH
     RadioButton RB_AND
     {
         Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 26 ) ;
-        Size = MAP_APPFONT ( 39 , 10 ) ;
+        Size = MAP_APPFONT ( 125 , 10 ) ;
         Check = TRUE ;
         Text [ en-US ] = "And" ;
     };
     RadioButton RB_OR
     {
-        Pos = MAP_APPFONT ( EDIT_START_XPOS + 39 + 3 , GB_SEARCH_TOP + 26 ) ;
-        Size = MAP_APPFONT ( 38 , 10 ) ;
+        Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 39 ) ;
+        Size = MAP_APPFONT ( 125 , 10 ) ;
         Text [ en-US ] = "~Or" ;
     };
     RadioButton RB_EXACT
     {
-        Pos = MAP_APPFONT ( EDIT_START_XPOS + 39 + 3 + 38 + 3 , GB_SEARCH_TOP + 26 ) ;
-        Size = MAP_APPFONT ( 42 , 10 ) ;
+        Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 52 ) ;
+        Size = MAP_APPFONT ( 125 , 10 ) ;
         Text [ en-US ] = "E~xact" ;
     };
     FixedText FT_URL
     {
-        Pos = MAP_APPFONT ( LABEL_START_XPOS , GB_SEARCH_TOP + 41 ) ;
+        Pos = MAP_APPFONT ( LABEL_START_XPOS , GB_SEARCH_TOP + 67 ) ;
         Size = MAP_APPFONT ( LABEL_LEN , 8 ) ;
         Text [ en-US ] = "~Prefix" ;
     };
     Edit ED_URL
     {
-        Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 39 ) ;
+        Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 65 ) ;
         Size = MAP_APPFONT ( 125 , 12 ) ;
         Border = TRUE ;
     };
     FixedText FT_POSTFIX
     {
-        Pos = MAP_APPFONT ( LABEL_START_XPOS , GB_SEARCH_TOP + 56 ) ;
+        Pos = MAP_APPFONT ( LABEL_START_XPOS , GB_SEARCH_TOP + 82 ) ;
         Size = MAP_APPFONT ( LABEL_LEN , 8 ) ;
         Text [ en-US ] = "Su~ffix" ;
     };
     Edit ED_POSTFIX
     {
-        Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 54 ) ;
+        Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 80 ) ;
         Size = MAP_APPFONT ( 125 , 12 ) ;
         Border = TRUE ;
     };
     FixedText FT_SEPARATOR
     {
-        Pos = MAP_APPFONT ( LABEL_START_XPOS , GB_SEARCH_TOP + 71 ) ;
+        Pos = MAP_APPFONT ( LABEL_START_XPOS , GB_SEARCH_TOP + 97 ) ;
         Size = MAP_APPFONT ( LABEL_LEN , 8 ) ;
         Text [ en-US ] = "~Separator" ;
     };
     Edit ED_SEPARATOR
     {
-        Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 69 ) ;
+        Pos = MAP_APPFONT ( EDIT_START_XPOS , GB_SEARCH_TOP + 95 ) ;
         Size = MAP_APPFONT ( 42 , 12 ) ;
         Border = TRUE ;
     };
     FixedText FT_CASE
     {
-        Pos = MAP_APPFONT ( LABEL_START_XPOS, GB_SEARCH_TOP + 86 ) ;
+        Pos = MAP_APPFONT ( LABEL_START_XPOS, GB_SEARCH_TOP + 112 ) ;
         Size = MAP_APPFONT ( LABEL_LEN , 8 ) ;
         Text [ en-US ] = "~Case match" ;
     };
     ListBox ED_CASE
     {
-        Pos = MAP_APPFONT ( EDIT_START_XPOS, GB_SEARCH_TOP + 84 ) ;
+        Pos = MAP_APPFONT ( EDIT_START_XPOS, GB_SEARCH_TOP + 110 ) ;
         Size = MAP_APPFONT ( 42 , 48 ) ;
         Border = TRUE ;
         DropDown = TRUE ;
@@ -392,25 +392,25 @@ TabPage RID_SVXPAGE_INET_SEARCH
     };
     PushButton PB_NEW
     {
-        Pos = MAP_APPFONT ( 39 , 158 ) ;
+        Pos = MAP_APPFONT ( 39 , GB_SEARCH_TOP + 131 + 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "N~ew";
     };
     PushButton PB_ADD
     {
-        Pos = MAP_APPFONT ( 92 , 158 ) ;
+        Pos = MAP_APPFONT ( 92 , GB_SEARCH_TOP + 131 + 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Add" ;
     };
     PushButton PB_CHANGE
     {
-        Pos = MAP_APPFONT ( 145 , 158 ) ;
+        Pos = MAP_APPFONT ( 145 , GB_SEARCH_TOP + 131 + 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Modify" ;
     };
     PushButton PB_DELETE
     {
-        Pos = MAP_APPFONT ( 198 , 158 ) ;
+        Pos = MAP_APPFONT ( 198 , GB_SEARCH_TOP + 131 + 6 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Delete" ;
     };
@@ -438,7 +438,7 @@ TabPage RID_SVXPAGE_INET_SECURITY
     FixedLine FL_SEC_SECURITYOPTIONS
     {
         Pos = MAP_APPFONT( COL_0, ROW_0 );
-        Size = MAP_APPFONT( COL_5-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
+        Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
         Text [ en-US ] = "Security options and warnings";
     };
     FixedText FI_SEC_SECURITYOPTIONS
@@ -456,25 +456,26 @@ TabPage RID_SVXPAGE_INET_SECURITY
     };
     FixedLine FL_SEC_PASSWORDS
     {
-        Pos = MAP_APPFONT( COL_0, ROW_2 );
-        Size = MAP_APPFONT( COL_5-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
+        Pos = MAP_APPFONT( COL_0, ROW_2 - 2 );
+        Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
         Text [ en-US ] = "Passwords for web connections";
     };
     CheckBox CB_SEC_SAVEPASSWORDS
     {
-        Pos = MAP_APPFONT( COL_1, ROW_3 );
-        Size = MAP_APPFONT( COL_2-COL_1, RSC_CD_CHECKBOX_HEIGHT );
+        Pos = MAP_APPFONT( COL_1, ROW_3 - 4 );
+        Size = MAP_APPFONT( COL_2-COL_1, 16 );
+        Wordbreak = TRUE;
         Text [ en-US ] = "Persistently save passwords protected by a master password";
     };
     PushButton PB_SEC_MASTERPASSWORD
     {
-        Pos = MAP_APPFONT( COL_3, ROW_3 - 2 );
+        Pos = MAP_APPFONT( COL_3, ROW_3 - 4 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "Master Password...";
     };
     FixedText FI_SEC_MASTERPASSWORD
     {
-        Pos = MAP_APPFONT( COL_1, ROW_4 );
+        Pos = MAP_APPFONT( COL_1, ROW_4 + 2 );
         Size = MAP_APPFONT( COL_2-COL_1, 4*RSC_CD_FIXEDLINE_HEIGHT );
         Wordbreak = TRUE;
         Text [ en-US ] = "Passwords are protected by a master password. You will be asked to enter it once per session, if %PRODUCTNAME retrieves a password from the protected password list.";
@@ -488,7 +489,7 @@ TabPage RID_SVXPAGE_INET_SECURITY
     FixedLine FL_SEC_MACROSEC
     {
         Pos = MAP_APPFONT( COL_0, ROW_5 );
-        Size = MAP_APPFONT( COL_5-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
+        Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
         Text [ en-US ] = "Macro security";
     };
     FixedText FI_SEC_MACROSEC
@@ -507,7 +508,7 @@ TabPage RID_SVXPAGE_INET_SECURITY
     FixedLine FL_SEC_FILESHARING
     {
         Pos = MAP_APPFONT( COL_0, ROW_8 );
-        Size = MAP_APPFONT( COL_5-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
+        Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
         Text [ en-US ] = "File sharing options for this document";
     };
     CheckBox CB_SEC_RECOMMREADONLY