Cleaned up whitespace, minor changes
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1863107 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main/svx/source/stbctrls/stbctrls.src b/main/svx/source/stbctrls/stbctrls.src
index c37bf99..1d1ea63 100644
--- a/main/svx/source/stbctrls/stbctrls.src
+++ b/main/svx/source/stbctrls/stbctrls.src
@@ -72,7 +72,7 @@
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/main/xmlsecurity/source/dialogs/certificatechooser.src b/main/xmlsecurity/source/dialogs/certificatechooser.src
index b2db7c9..50f6d99 100644
--- a/main/xmlsecurity/source/dialogs/certificatechooser.src
+++ b/main/xmlsecurity/source/dialogs/certificatechooser.src
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -26,59 +26,61 @@
ModalDialog RID_XMLSECDLG_CERTCHOOSER
{
- HelpId = HID_XMLSEC_DLG_CERTCHOOSER;
- Size = MAP_APPFONT( CS_WIDTH, CS_HEIGHT );
- OutputSize = TRUE;
- Closeable = TRUE;
- Moveable = TRUE;
- SVLook = TRUE;
+ HelpId = HID_XMLSEC_DLG_CERTCHOOSER;
+ 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
+ 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/main/xmlsecurity/source/dialogs/warnings.src b/main/xmlsecurity/source/dialogs/warnings.src
index 30db7fa..f6327e6 100644
--- a/main/xmlsecurity/source/dialogs/warnings.src
+++ b/main/xmlsecurity/source/dialogs/warnings.src
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -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 );
- Wordbreak = TRUE;
- Text [ en-US ] = "";
+ 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 ] = "" ;
};
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
+ 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
