svx/source/stbctrls/stbctrls.src | 2
xmlsecurity/source/dialogs/certificatechooser.src | 58 +++++++-------
xmlsecurity/source/dialogs/warnings.src | 91 +++++++++++-----------
3 files changed, 77 insertions(+), 74 deletions(-)
New commits:
commit dbe83f86f2830e0544a0fb3929f485c51c569716
Author: Matthias Seidel <msei...@apache.org>
AuthorDate: Mon Jul 15 23:28:51 2019 +0000
Commit: Matthias Seidel <msei...@apache.org>
CommitDate: Mon Jul 15 23:28:51 2019 +0000
Cleaned up whitespace, minor changes
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 6886c1539725..31409c145dd8 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -72,7 +72,7 @@ String RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY
String RID_SVXSTR_XMLSEC_SIG_NOT_OK
{
- Text [ en-US ] = "Digital Signature: The document signature does not match
the document content. We strongly recommend you not to trust this document." ;
+ Text [ en-US ] = "Digital Signature: The document signature does not match
the document content. We strongly recommend that you do not trust this
document." ;
};
String RID_SVXSTR_XMLSEC_NO_SIG
diff --git a/xmlsecurity/source/dialogs/certificatechooser.src
b/xmlsecurity/source/dialogs/certificatechooser.src
index ddb259d95411..11759d544142 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.src
+++ b/xmlsecurity/source/dialogs/certificatechooser.src
@@ -27,58 +27,60 @@
ModalDialog RID_XMLSECDLG_CERTCHOOSER
{
HelpId = HID_XMLSEC_DLG_CERTCHOOSER;
- Size = MAP_APPFONT( CS_WIDTH, CS_HEIGHT );
- OutputSize = TRUE;
- Closeable = TRUE;
- Moveable = TRUE;
- SVLook = TRUE;
+ Size = MAP_APPFONT ( CS_WIDTH, CS_HEIGHT ) ;
+ OutputSize = TRUE ;
+ Closeable = TRUE ;
+ Moveable = TRUE ;
+ SVLook = TRUE ;
- Text [ en-US ] = "Select Certificate";
+ Text [ en-US ] = "Select Certificate" ;
FixedText FT_HINT_SELECT
{
- Pos = MAP_APPFONT( CS_COL_0, CS_ROW_0 );
- Size = MAP_APPFONT( CS_COL_2-CS_COL_0, RSC_CD_FIXEDTEXT_HEIGHT );
- Text [ en-US ] = "Select the certificate you want to use for signing";
+ Pos = MAP_APPFONT ( CS_COL_0, CS_ROW_0 ) ;
+ Size = MAP_APPFONT ( CS_COL_2-CS_COL_0, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "Select the certificate you want to use for signing" ;
};
Control LB_SIGNATURES
{
- HelpId = HID_XMLSEC_CTRL_CHOOSESIGNATURES;
- Pos = MAP_APPFONT( CS_COL_0, CS_ROW_1 );
- Size = MAP_APPFONT( CS_LB_WIDTH, CS_ROW_2-CS_ROW_1 );
- SVLook = TRUE;
- Border = TRUE;
+ HelpId = HID_XMLSEC_CTRL_CHOOSESIGNATURES ;
+ Pos = MAP_APPFONT ( CS_COL_0, CS_ROW_1 ) ;
+ Size = MAP_APPFONT ( CS_LB_WIDTH, CS_ROW_2-CS_ROW_1 ) ;
+ SVLook = TRUE ;
+ Border = TRUE ;
};
String STR_HEADERBAR
{
- Text [ en-US ] = "Issued to\tIssued by\tExpiration date";
+ Text [ en-US ] = "Issued to\tIssued by\tExpiration date" ;
};
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...";
+ 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..." ;
};
FixedLine FL_BOTTOM_SEP
{
- Pos = MAP_APPFONT( 0, DLGS_BOTTOM_FL_Y( CS_HEIGHT ) );
- Size = MAP_APPFONT( CS_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
+ Pos = MAP_APPFONT ( 0, DLGS_BOTTOM_FL_Y( CS_HEIGHT ) ) ;
+ Size = MAP_APPFONT ( CS_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
};
OKButton BTN_OK
{
- DefButton = TRUE;
- Pos = MAP_APPFONT( DLGS_BOTTOM_OK_X( CS_WIDTH ), DLGS_BOTTOM_BTN_Y(
CS_HEIGHT ) );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
);
+ DefButton = TRUE ;
+ Pos = MAP_APPFONT ( DLGS_BOTTOM_OK_X( CS_WIDTH ), DLGS_BOTTOM_BTN_Y(
CS_HEIGHT ) ) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
) ;
};
CancelButton BTN_CANCEL
{
- Pos = MAP_APPFONT( DLGS_BOTTOM_CANCEL_X( CS_WIDTH ),
DLGS_BOTTOM_BTN_Y( CS_HEIGHT ) );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
);
+ Pos = MAP_APPFONT ( DLGS_BOTTOM_CANCEL_X( CS_WIDTH ),
DLGS_BOTTOM_BTN_Y( CS_HEIGHT ) ) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
) ;
};
HelpButton BTN_HELP
{
- Pos = MAP_APPFONT( DLGS_BOTTOM_HELP_X( CS_WIDTH ), DLGS_BOTTOM_BTN_Y(
CS_HEIGHT ) );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
);
+ Pos = MAP_APPFONT ( DLGS_BOTTOM_HELP_X( CS_WIDTH ), DLGS_BOTTOM_BTN_Y(
CS_HEIGHT ) ) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
) ;
};
};
+
+// ********************************************************************** EOF
diff --git a/xmlsecurity/source/dialogs/warnings.src
b/xmlsecurity/source/dialogs/warnings.src
index d6d6b311601b..40df583d22d7 100644
--- a/xmlsecurity/source/dialogs/warnings.src
+++ b/xmlsecurity/source/dialogs/warnings.src
@@ -26,86 +26,87 @@
ModalDialog RID_XMLSECTP_MACROWARN
{
- HelpId = HID_XMLSEC_TP_MACROWARN;
- Size = MAP_APPFONT( MW_WIDTH, MW_HEIGHT );
- OutputSize = TRUE;
- Closeable = TRUE;
- Moveable = TRUE;
- SVLook = TRUE;
+ HelpId = HID_XMLSEC_TP_MACROWARN ;
+ Size = MAP_APPFONT ( MW_WIDTH, MW_HEIGHT ) ;
+ OutputSize = TRUE ;
+ Closeable = TRUE ;
+ Moveable = TRUE ;
+ SVLook = TRUE ;
- Text [ en-US ] = "Security Warning";
+ Text [ en-US ] = "Security Warning" ;
FixedText FI_DOCNAME
{
- Pos = MAP_APPFONT( MW_COL_1, MW_ROW_0 );
- Size = MAP_APPFONT( MW_COL_4-MW_COL_1, 3*RSC_CD_FIXEDTEXT_HEIGHT );
- Wordbreak = TRUE;
- Text [ en-US ] = "";
+ Pos = MAP_APPFONT ( MW_COL_1, MW_ROW_0 ) ;
+ Size = MAP_APPFONT ( MW_COL_4-MW_COL_1, 3*RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ Wordbreak = TRUE ;
+ Text [ en-US ] = "" ;
};
FixedText FI_DESCR1A
{
- Pos = MAP_APPFONT( MW_COL_1, MW_ROW_1 );
- Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT );
- Wordbreak = TRUE;
- Text [ en-US ] = "The document contains document macros signed by:";
+ Pos = MAP_APPFONT ( MW_COL_1, MW_ROW_1 ) ;
+ Size = MAP_APPFONT ( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ Wordbreak = TRUE ;
+ Text [ en-US ] = "The document contains document macros signed by:" ;
};
FixedText FI_DESCR1B
{
- Pos = MAP_APPFONT( MW_COL_1, MW_ROW_1 );
- Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT );
- Wordbreak = TRUE;
- Text [ en-US ] = "The document contains document macros.";
+ Pos = MAP_APPFONT ( MW_COL_1, MW_ROW_1 ) ;
+ Size = MAP_APPFONT ( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ Wordbreak = TRUE ;
+ Text [ en-US ] = "The document contains document macros." ;
};
FixedText FI_SIGNS
{
- Pos = MAP_APPFONT( MW_COL_1, MW_ROW_2 );
- Size = MAP_APPFONT( MW_COL_4-MW_COL_2, MW_ROW_3-MW_ROW_2 );
+ Pos = MAP_APPFONT ( MW_COL_1, MW_ROW_2 );
+ Size = MAP_APPFONT ( MW_COL_4-MW_COL_2, MW_ROW_3-MW_ROW_2 );
Wordbreak = TRUE;
- Text [ en-US ] = "";
+ Text [ en-US ] = "" ;
};
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...";
+ 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..." ;
};
FixedText FI_DESCR2
{
- Pos = MAP_APPFONT( MW_COL_1, MW_ROW_3 );
- Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT );
- Wordbreak = TRUE;
- Text [ en-US ] = "Macros may contain viruses. Disabling macros for a
document is always safe. If you disable macros you may lose functionality
provided by the document macros.";
+ Pos = MAP_APPFONT ( MW_COL_1, MW_ROW_3 ) ;
+ Size = MAP_APPFONT ( MW_COL_4-MW_COL_1, RSC_CD_FIXEDTEXT_HEIGHT ) ;
+ Wordbreak = TRUE ;
+ Text [ en-US ] = "Macros may contain viruses. Disabling macros for a
document is always safe. If you disable macros you may lose functionality
provided by the document macros." ;
};
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";
+ 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" ;
};
FixedLine FL_BOTTOM_SEP
{
- Pos = MAP_APPFONT( 0, DLGS_BOTTOM_FL_Y( MW_HEIGHT ) );
- Size = MAP_APPFONT( MW_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
+ Pos = MAP_APPFONT ( 0, DLGS_BOTTOM_FL_Y( MW_HEIGHT ) ) ;
+ Size = MAP_APPFONT ( MW_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ;
};
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";
+ 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" ;
};
CancelButton PB_DISABLE
{
- Pos = MAP_APPFONT( DLGS_BOTTOM_CANCEL_X( MW_WIDTH ),
DLGS_BOTTOM_BTN_Y( MW_HEIGHT ) );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
);
- Text [ en-US ] = "Disable Macros";
+ Pos = MAP_APPFONT ( DLGS_BOTTOM_CANCEL_X( MW_WIDTH ),
DLGS_BOTTOM_BTN_Y( MW_HEIGHT ) ) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
) ;
+ Text [ en-US ] = "Disable Macros" ;
};
HelpButton BTN_HELP
{
- Pos = MAP_APPFONT( DLGS_BOTTOM_HELP_X( MW_WIDTH ), DLGS_BOTTOM_BTN_Y(
MW_HEIGHT ) );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
);
+ Pos = MAP_APPFONT ( DLGS_BOTTOM_HELP_X( MW_WIDTH ), DLGS_BOTTOM_BTN_Y(
MW_HEIGHT ) ) ;
+ Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT
) ;
};
};
+// ********************************************************************** EOF
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
