summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/source/dialogs/certificatechooser.src1
-rw-r--r--xmlsecurity/source/dialogs/certificateviewer.src3
-rw-r--r--xmlsecurity/source/dialogs/digitalsignaturesdialog.src3
-rw-r--r--xmlsecurity/source/dialogs/helpids.hrc44
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.cxx1
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.src10
-rw-r--r--xmlsecurity/source/dialogs/warnings.src3
7 files changed, 36 insertions, 29 deletions
diff --git a/xmlsecurity/source/dialogs/certificatechooser.src b/xmlsecurity/source/dialogs/certificatechooser.src
index 13ce734e46df..be0585d2bcd8 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.src
+++ b/xmlsecurity/source/dialogs/certificatechooser.src
@@ -59,6 +59,7 @@ ModalDialog RID_XMLSECDLG_CERTCHOOSER
};
PushButton BTN_VIEWCERT
{
+ HelpID = "xmlsecurity:PushButton:RID_XMLSECDLG_CERTCHOOSER:BTN_VIEWCERT";
Pos = MAP_APPFONT( CS_COL_1, CS_ROW_3 );
Size = MAP_APPFONT( CS_COL_2-CS_COL_1, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "View Certificate...";
diff --git a/xmlsecurity/source/dialogs/certificateviewer.src b/xmlsecurity/source/dialogs/certificateviewer.src
index 3a9466aeb9a8..637d3a7f45fe 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.src
+++ b/xmlsecurity/source/dialogs/certificateviewer.src
@@ -212,6 +212,7 @@ TabPage RID_XMLSECTP_DETAILS
};
MultiLineEdit ML_ELEMENT
{
+ HelpID = "xmlsecurity:MultiLineEdit:RID_XMLSECTP_DETAILS:ML_ELEMENT";
Pos = MAP_APPFONT( CV_COL_0, CV_ROW_2 );
Size = MAP_APPFONT( CV_CONT_WIDTH, CV_ROW_3-CV_ROW_2 );
ReadOnly = TRUE;
@@ -299,6 +300,7 @@ TabPage RID_XMLSECTP_CERTPATH
};
PushButton BTN_VIEWCERT
{
+ HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_CERTPATH:BTN_VIEWCERT";
Pos = MAP_APPFONT( CV_COL_1-(CV_COL_B-CV_COL_A), CVP_ROW_2 );
Size = MAP_APPFONT( CV_COL_B-CV_COL_A, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "View Certificate...";
@@ -311,6 +313,7 @@ TabPage RID_XMLSECTP_CERTPATH
};
MultiLineEdit ML_CERTSTATUS
{
+ HelpID = "xmlsecurity:MultiLineEdit:RID_XMLSECTP_CERTPATH:ML_CERTSTATUS";
Pos = MAP_APPFONT( CV_COL_0, CVP_ROW_4 );
Size = MAP_APPFONT( CV_CONT_WIDTH, REST_HEIGHT/3 );
ReadOnly = TRUE;
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
index 87d2de520103..54ef5ce17eeb 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.src
@@ -145,18 +145,21 @@ ModalDialog RID_XMLSECDLG_DIGSIG
};
PushButton BTN_VIEWCERT
{
+ HelpID = "xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_VIEWCERT";
Pos = MAP_APPFONT( 6, 142 );
Size = MAP_APPFONT( 70, 14 );
Text [ en-US ] = "View Certificate...";
};
PushButton BTN_ADDCERT
{
+ HelpID = "xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_ADDCERT";
Pos = MAP_APPFONT( 82, 142 );
Size = MAP_APPFONT( 70, 14 );
Text [ en-US ] = "Sign Document...";
};
PushButton BTN_REMOVECERT
{
+ HelpID = "xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_REMOVECERT";
Pos = MAP_APPFONT( 158, 142 );
Size = MAP_APPFONT( 70, 14 );
Text [ en-US ] = "Remove";
diff --git a/xmlsecurity/source/dialogs/helpids.hrc b/xmlsecurity/source/dialogs/helpids.hrc
index 6456dddb47b9..7c4514607f57 100644
--- a/xmlsecurity/source/dialogs/helpids.hrc
+++ b/xmlsecurity/source/dialogs/helpids.hrc
@@ -34,34 +34,22 @@
// Help-Ids --------------------------------------------------------------
-#define HID_XMLSEC_TP_MACROSEC (HID_XMLSECURITY_START + 0)
-#define HID_XMLSEC_TP_SECLEVEL (HID_XMLSECURITY_START + 1)
-#define HID_XMLSEC_TP_TRUSTSOURCES (HID_XMLSECURITY_START + 2)
-#define HID_XMLSEC_DLG_CERTVIEWER (HID_XMLSECURITY_START + 3)
-#define HID_XMLSEC_TP_GENERAL (HID_XMLSECURITY_START + 4)
-#define HID_XMLSEC_TP_DETAILS (HID_XMLSECURITY_START + 5)
-#define HID_XMLSEC_TP_CERTPATH (HID_XMLSECURITY_START + 6)
-#define HID_XMLSEC_DLG_DIGSIG (HID_XMLSECURITY_START + 7)
-#define HID_XMLSEC_TP_MACROWARN (HID_XMLSECURITY_START + 8)
-#define HID_XMLSEC_DLG_CERTCHOOSER (HID_XMLSECURITY_START + 9)
-#define HID_XMLSEC_CTRL_TRUSTSOURCES (HID_XMLSECURITY_START + 10)
-#define HID_XMLSEC_CTRL_ELEMENTS (HID_XMLSECURITY_START + 11)
-#define HID_XMLSEC_CTRL_VIEWSIGNATURES (HID_XMLSECURITY_START + 12)
-#define HID_XMLSEC_CTRL_SIGNATURESDLG (HID_XMLSECURITY_START + 13)
-#define HID_XMLSEC_CTRL_CHOOSESIGNATURES (HID_XMLSECURITY_START + 14)
-#define HID_XMLSEC_TREE_SIGNATURESDLG (HID_XMLSECURITY_START + 15)
-
-// pb: please update ACT_XMLSECURITY_HID_END below, thx.
-
-// -----------------------------------------------------------------------
-// overflow check --------------------------------------------------------
-// -----------------------------------------------------------------------
-
-#define ACT_XMLSECURITY_HID_END HID_XMLSEC_TREE_SIGNATURESDLG
-
-#if ACT_XMLSECURITY_HID_END > HID_XMLSECURITY_END
-#error helpids overflow in #line, #file
-#endif
+#define HID_XMLSEC_TP_MACROSEC "XMLSECURITY_HID_XMLSEC_TP_MACROSEC"
+#define HID_XMLSEC_TP_SECLEVEL "XMLSECURITY_HID_XMLSEC_TP_SECLEVEL"
+#define HID_XMLSEC_TP_TRUSTSOURCES "XMLSECURITY_HID_XMLSEC_TP_TRUSTSOURCES"
+#define HID_XMLSEC_DLG_CERTVIEWER "XMLSECURITY_HID_XMLSEC_DLG_CERTVIEWER"
+#define HID_XMLSEC_TP_GENERAL "XMLSECURITY_HID_XMLSEC_TP_GENERAL"
+#define HID_XMLSEC_TP_DETAILS "XMLSECURITY_HID_XMLSEC_TP_DETAILS"
+#define HID_XMLSEC_TP_CERTPATH "XMLSECURITY_HID_XMLSEC_TP_CERTPATH"
+#define HID_XMLSEC_DLG_DIGSIG "XMLSECURITY_HID_XMLSEC_DLG_DIGSIG"
+#define HID_XMLSEC_TP_MACROWARN "XMLSECURITY_HID_XMLSEC_TP_MACROWARN"
+#define HID_XMLSEC_DLG_CERTCHOOSER "XMLSECURITY_HID_XMLSEC_DLG_CERTCHOOSER"
+#define HID_XMLSEC_CTRL_TRUSTSOURCES "XMLSECURITY_HID_XMLSEC_CTRL_TRUSTSOURCES"
+#define HID_XMLSEC_CTRL_ELEMENTS "XMLSECURITY_HID_XMLSEC_CTRL_ELEMENTS"
+#define HID_XMLSEC_CTRL_VIEWSIGNATURES "XMLSECURITY_HID_XMLSEC_CTRL_VIEWSIGNATURES"
+#define HID_XMLSEC_CTRL_SIGNATURESDLG "XMLSECURITY_HID_XMLSEC_CTRL_SIGNATURESDLG"
+#define HID_XMLSEC_CTRL_CHOOSESIGNATURES "XMLSECURITY_HID_XMLSEC_CTRL_CHOOSESIGNATURES"
+#define HID_XMLSEC_TREE_SIGNATURESDLG "XMLSECURITY_HID_XMLSEC_TREE_SIGNATURESDLG"
#endif // #ifndef _XMLSEC_HELPIDS_HRC
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 0bee4e2011e7..9c554d023018 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -41,7 +41,6 @@
#include <com/sun/star/security/SerialNumberAdapter.hpp>
#include <comphelper/sequence.hxx>
#include <sfx2/filedlghelper.hxx>
-#include <svl/pickerhelper.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/xmlsecurity/source/dialogs/macrosecurity.src b/xmlsecurity/source/dialogs/macrosecurity.src
index 0683606f500c..5a4ab4f12b10 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.src
+++ b/xmlsecurity/source/dialogs/macrosecurity.src
@@ -101,6 +101,7 @@ TabPage RID_XMLSECTP_SECLEVEL
};
RadioButton RB_VERYHIGH
{
+ HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_VERYHIGH";
Pos = MAP_APPFONT( SL_COL_1, SL_ROW_0 );
Size = MAP_APPFONT( SL_COL_2-SL_COL_1, RSC_BIG_RADIOBUTTON );
WordBreak = TRUE;
@@ -108,6 +109,7 @@ TabPage RID_XMLSECTP_SECLEVEL
};
RadioButton RB_HIGH
{
+ HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_HIGH";
Pos = MAP_APPFONT( SL_COL_1, SL_ROW_1 );
Size = MAP_APPFONT( SL_COL_2-SL_COL_1, RSC_BIG_RADIOBUTTON );
WordBreak = TRUE;
@@ -115,6 +117,7 @@ TabPage RID_XMLSECTP_SECLEVEL
};
RadioButton RB_MEDIUM
{
+ HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_MEDIUM";
Pos = MAP_APPFONT( SL_COL_1, SL_ROW_2 );
Size = MAP_APPFONT( SL_COL_2-SL_COL_1, RSC_BIG_RADIOBUTTON );
WordBreak = TRUE;
@@ -122,6 +125,7 @@ TabPage RID_XMLSECTP_SECLEVEL
};
RadioButton RB_LOW
{
+ HelpID = "xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_LOW";
Pos = MAP_APPFONT( SL_COL_1, SL_ROW_3 );
Size = MAP_APPFONT( SL_COL_2-SL_COL_1, SL_ROW_4-SL_ROW_3 );
WordBreak = TRUE;
@@ -161,18 +165,21 @@ TabPage RID_XMLSECTP_TRUSTSOURCES
};
PushButton PB_ADD_TRUSTCERT
{
+ HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_ADD_TRUSTCERT";
Pos = MAP_APPFONT( TS_COL_2, TS_ROW_2 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "Add...";
};
PushButton PB_VIEW_TRUSTCERT
{
+ HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_VIEW_TRUSTCERT";
Pos = MAP_APPFONT( TS_COL_4, TS_ROW_2 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "View...";
};
PushButton PB_REMOVE_TRUSTCERT
{
+ HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_REMOVE_TRUSTCERT";
Pos = MAP_APPFONT( TS_COL_6, TS_ROW_2 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "Remove";
@@ -197,6 +204,7 @@ TabPage RID_XMLSECTP_TRUSTSOURCES
};
ListBox LB_TRUSTFILELOC
{
+ HelpID = "xmlsecurity:ListBox:RID_XMLSECTP_TRUSTSOURCES:LB_TRUSTFILELOC";
Pos = MAP_APPFONT( TS_COL_1, TS_ROW_5 );
Size = MAP_APPFONT( TS_COL_7-TS_COL_1, TS_ROW_6-TS_ROW_5 );
SVLook = TRUE;
@@ -206,12 +214,14 @@ TabPage RID_XMLSECTP_TRUSTSOURCES
};
PushButton FL_ADD_TRUSTFILELOC
{
+ HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_ADD_TRUSTFILELOC";
Pos = MAP_APPFONT( TS_COL_4, TS_ROW_7 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "Add...";
};
PushButton FL_REMOVE_TRUSTFILELOC
{
+ HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_REMOVE_TRUSTFILELOC";
Pos = MAP_APPFONT( TS_COL_6, TS_ROW_7 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "Remove";
diff --git a/xmlsecurity/source/dialogs/warnings.src b/xmlsecurity/source/dialogs/warnings.src
index 2e0e697dae1f..bac25c3dd492 100644
--- a/xmlsecurity/source/dialogs/warnings.src
+++ b/xmlsecurity/source/dialogs/warnings.src
@@ -69,6 +69,7 @@ ModalDialog RID_XMLSECTP_MACROWARN
};
PushButton PB_VIEWSIGNS
{
+ HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_MACROWARN:PB_VIEWSIGNS";
Pos = MAP_APPFONT( MW_COL_3, MW_ROW_2 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "View Signatures...";
@@ -82,6 +83,7 @@ ModalDialog RID_XMLSECTP_MACROWARN
};
CheckBox CB_ALWAYSTRUST
{
+ HelpID = "xmlsecurity:CheckBox:RID_XMLSECTP_MACROWARN:CB_ALWAYSTRUST";
Pos = MAP_APPFONT( MW_COL_1, MW_ROW_4 );
Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "Always trust macros from this source";
@@ -93,6 +95,7 @@ ModalDialog RID_XMLSECTP_MACROWARN
};
PushButton PB_ENABLE
{
+ HelpID = "xmlsecurity:PushButton:RID_XMLSECTP_MACROWARN:PB_ENABLE";
Pos = MAP_APPFONT( DLGS_BOTTOM_OK_X( MW_WIDTH ), DLGS_BOTTOM_BTN_Y( MW_HEIGHT ) );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
Text [ en-US ] = "Enable Macros";