move security options to cui and adapt code

Change-Id: I7f53b9486d95f539fe893f7ab72c2eee64449064

cui/UI_cui.mk

@@ -36,6 +36,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
 	cui/uiconfig/ui/optappearancepage \
 	cui/uiconfig/ui/optfontspage \
 	cui/uiconfig/ui/optpathspage \
+	cui/uiconfig/ui/optsecuritypage \
 	cui/uiconfig/ui/personalization_tab \
 	cui/uiconfig/ui/pickbulletpage \
 	cui/uiconfig/ui/pickgraphicpage \

cui/source/options/optinet2.hrc

@@ -55,49 +55,6 @@
 #define ST_MSG_255_0                111
 #define ST_MSG_255_1                112
 
-// Security  -------------------------------------------------------------
-
-#define FL_SEC_SECURITYOPTIONS      10
-#define FI_SEC_SECURITYOPTIONS      11
-#define PB_SEC_SECURITYOPTIONS      12
-#define FL_SEC_PASSWORDS            13
-#define CB_SEC_SAVEPASSWORDS        14
-#define PB_SEC_CONNECTIONS          15
-#define CB_SEC_MASTERPASSWORD       16
-#define FI_SEC_MASTERPASSWORD       17
-#define PB_SEC_MASTERPASSWORD       18
-#define FL_SEC_MACROSEC             19
-#define FI_SEC_MACROSEC             20
-#define PB_SEC_MACROSEC             21
-#define FL_SEC_CERTPATH             22
-#define FI_SEC_CERTPATH             23
-#define PB_SEC_CERTPATH             24
-
-#define STR_SEC_NOPASSWDSAVE        12
-
-#define BORDER_OFFSET               8
-#define COL_0                       (RSC_SP_TBPG_INNERBORDER_LEFT)
-#define COL_1                       (COL_0+RSC_SP_FLGR_SPACE_X)
-#define COL_1a                      (COL_1+RSC_SP_CHK_TEXTINDENT)
-#define COL_4                       (TP_WIDTH-RSC_SP_TBPG_INNERBORDER_RIGHT)
-#define COL_3                       (COL_4-RSC_CD_PUSHBUTTON_WIDTH)
-#define COL_2                       (COL_3-RSC_SP_CTRL_DESC_X)
-
-#define ROW_0                       (RSC_SP_FLGR_INNERBORDER_TOP)
-#define ROW_1                       (ROW_0+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_2                       (ROW_1+3*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_2a                      (ROW_2-RSC_SP_FLGR_SPACE_Y-RSC_CD_PUSHBUTTON_HEIGHT)
-#define ROW_3                       (ROW_2+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_4                       (ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_DESC_Y-1)
-#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+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+3*RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_9a                      (ROW_9-RSC_SP_FLGR_SPACE_Y-RSC_CD_PUSHBUTTON_HEIGHT)
-
 // Defines - JavaScriptDisableQueryBox_Impl -------------------------------
 
 #define IMG_JSCPT_WARNING           220

cui/source/options/optinet2.hxx

@@ -20,9 +20,10 @@
 #define _SVX_OPTINET_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <vcl/lstbox.hxx>
-#include <vcl/group.hxx>
 #include <vcl/field.hxx>
+#include <vcl/group.hxx>
+#include <vcl/layout.hxx>
+#include <vcl/lstbox.hxx>
 #include <svtools/stdctrl.hxx>
 #include <svtools/svtabbx.hxx>
 #include <sfx2/tabdlg.hxx>
@@ -145,31 +146,27 @@ class SvxSecurityTabPage : public SfxTabPage
     using TabPage::DeactivatePage;
 
 private:
-    FixedLine           maSecurityOptionsFL;
-    FixedInfo           maSecurityOptionsFI;
-    PushButton          maSecurityOptionsPB;
+    PushButton*         m_pSecurityOptionsPB;
+
+    CheckBox*           m_pSavePasswordsCB;
+    PushButton*         m_pShowConnectionsPB;
 
-    FixedLine           maPasswordsFL;
-    CheckBox            maSavePasswordsCB;
-    PushButton          maShowConnectionsPB;
-    CheckBox            maMasterPasswordCB;
-    FixedInfo           maMasterPasswordFI;
-    PushButton          maMasterPasswordPB;
+    CheckBox*           m_pMasterPasswordCB;
+    FixedText*          m_pMasterPasswordFT;
+    PushButton*         m_pMasterPasswordPB;
 
-    FixedLine           maMacroSecFL;
-    FixedInfo           maMacroSecFI;
-    PushButton          maMacroSecPB;
+    VclContainer*       m_pMacroSecFrame;
+    PushButton*         m_pMacroSecPB;
 
-    FixedLine           m_aCertPathFL;
-    FixedInfo           m_aCertPathFI;
-    PushButton          m_aCertPathPB;
+    VclContainer*       m_pCertFrame;
+    PushButton*         m_pCertPathPB;
 
     SvtSecurityOptions*         mpSecOptions;
     svx::SecurityOptionsDialog* mpSecOptDlg;
 
     CertPathDialog* mpCertPathDlg;
 
-    String              msPasswordStoringDeactivateStr;
+    OUString            m_sPasswordStoringDeactivateStr;
 
     DECL_LINK(SecurityOptionsHdl, void *);
     DECL_LINK(SavePasswordHdl, void* );

cui/source/options/optinet2.src

@@ -265,128 +265,6 @@ TabPage RID_SVXPAGE_INET_PROXY
     };
 };
 
-
-/************************************************************************/
-/*                                                                      */
-/*  Scripting                                                           */
-/*                                                                      */
-/************************************************************************/
-
-TabPage RID_SVXPAGE_INET_SECURITY
-{
-    HelpID = "cui:TabPage:RID_SVXPAGE_INET_SECURITY";
-    OutputSize = TRUE ;
-    Size = MAP_APPFONT( TP_WIDTH , TP_HEIGHT );
-    SVLook = TRUE;
-    Hide = TRUE;
-    Text [ en-US ] = "Security";
-    FixedLine FL_SEC_SECURITYOPTIONS
-    {
-        Pos = MAP_APPFONT( COL_0, ROW_0 );
-        Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "Security options and warnings";
-    };
-    FixedText FI_SEC_SECURITYOPTIONS
-    {
-        Pos = MAP_APPFONT( COL_1, ROW_1 );
-        Size = MAP_APPFONT( COL_2-COL_1, 3*RSC_CD_FIXEDLINE_HEIGHT );
-        Wordbreak = TRUE;
-        Text [ en-US ] = "Adjust security related options and define warnings for hidden information in documents.";
-    };
-    PushButton PB_SEC_SECURITYOPTIONS
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_SECURITYOPTIONS";
-        Pos = MAP_APPFONT( COL_3, ROW_2a );
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
-        Text [ en-US ] = "Options...";
-    };
-    FixedLine FL_SEC_PASSWORDS
-    {
-        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
-    {
-        HelpID = "cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_SAVEPASSWORDS";
-        Pos = MAP_APPFONT( COL_1, ROW_3 - 4 );
-        Size = MAP_APPFONT( COL_2-COL_1, 16 );
-        Wordbreak = TRUE;
-        Text [ en-US ] = "Persistently save passwords for web connections";
-    };
-    PushButton PB_SEC_CONNECTIONS
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_CONNECTIONS";
-        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
-    {
-        HelpID = "cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_MASTERPASSWORD";
-        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)";
-    };
-    FixedText FI_SEC_MASTERPASSWORD
-    {
-        Pos = MAP_APPFONT( COL_1a, ROW_4a );
-        Size = MAP_APPFONT( COL_2-COL_1a, 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.";
-    };
-    PushButton PB_SEC_MASTERPASSWORD
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MASTERPASSWORD";
-        Pos = MAP_APPFONT( COL_3, ROW_4a );
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
-        Text [ en-US ] = "Master Password...";
-    };
-    FixedLine FL_SEC_MACROSEC
-    {
-        Pos = MAP_APPFONT( COL_0, ROW_5 );
-        Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "Macro security";
-    };
-    FixedText FI_SEC_MACROSEC
-    {
-        Pos = MAP_APPFONT( COL_1, ROW_6 );
-        Size = MAP_APPFONT( COL_2-COL_1, 3*RSC_CD_FIXEDLINE_HEIGHT );
-        Wordbreak = TRUE;
-        Text [ en-US ] = "Adjust the security level for executing macros and specify trusted macro developers.";
-    };
-    PushButton PB_SEC_MACROSEC
-    {
-        HelpID = "cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC";
-        Pos = MAP_APPFONT( COL_3, ROW_7a );
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
-        Text [ en-US ] = "Macro Security...";
-    };
-    FixedLine FL_SEC_CERTPATH
-    {
-        Pos = MAP_APPFONT( COL_0, ROW_7 );
-        Size = MAP_APPFONT( COL_4-COL_0, RSC_CD_FIXEDLINE_HEIGHT );
-        Text [ en-US ] = "Certificate Path";
-    };
-    FixedText FI_SEC_CERTPATH
-    {
-        Pos = MAP_APPFONT( COL_1, ROW_8 );
-        Size = MAP_APPFONT( COL_2-COL_1, 3*RSC_CD_FIXEDLINE_HEIGHT );
-        Wordbreak = TRUE;
-        Text [ en-US ] = "Select the Network Security Services certificate directory to use for digital signatures.";
-    };
-    PushButton PB_SEC_CERTPATH
-    {
-        Pos = MAP_APPFONT( COL_3, ROW_9a );
-        Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
-        Text [ en-US ] = "Certificate...";
-    };
-    String STR_SEC_NOPASSWDSAVE
-    {
-        Text [ en-US ] = "Disabling the function to persistently store passwords deletes the list of passwords stored and resets the master password.\n\nDo you want to delete password list and reset master password?";
-    };
-};
-
 ErrorBox RID_SVXERR_OPT_PROXYPORTS
 {
     BUTTONS = WB_OK ;