Author: mseidel
Date: Tue Jul 16 09:35:18 2019
New Revision: 1863120
URL: http://svn.apache.org/viewvc?rev=1863120&view=rev
Log:
Merged r1863107 from trunk
Cleaned up whitespace, minor changes
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/svx/source/stbctrls/stbctrls.src
openoffice/branches/AOO42X/main/xmlsecurity/source/dialogs/certificatechooser.src
openoffice/branches/AOO42X/main/xmlsecurity/source/dialogs/warnings.src
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 16 09:35:18 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857222,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,185
9839,1860288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567,1861660,1861664-1861665,1861790,1861946,1861956,1862194,1862234,1862415-1862416,1862420,1862666,1862697,1862776,1862940,1862964,1862974,1863005,1863007,1863057,1863087-1863088
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857222,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,185
9839,1860288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567,1861660,1861664-1861665,1861790,1861946,1861956,1862194,1862234,1862415-1862416,1862420,1862666,1862697,1862776,1862940,1862964,1862974,1863005,1863007,1863057,1863087-1863088,1863107
Modified: openoffice/branches/AOO42X/main/svx/source/stbctrls/stbctrls.src
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/svx/source/stbctrls/stbctrls.src?rev=1863120&r1=1863119&r2=1863120&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/svx/source/stbctrls/stbctrls.src (original)
+++ openoffice/branches/AOO42X/main/svx/source/stbctrls/stbctrls.src Tue Jul 16
09:35:18 2019
@@ -72,7 +72,7 @@ String RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIF
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
Modified:
openoffice/branches/AOO42X/main/xmlsecurity/source/dialogs/certificatechooser.src
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/xmlsecurity/source/dialogs/certificatechooser.src?rev=1863120&r1=1863119&r2=1863120&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/xmlsecurity/source/dialogs/certificatechooser.src
(original)
+++
openoffice/branches/AOO42X/main/xmlsecurity/source/dialogs/certificatechooser.src
Tue Jul 16 09:35:18 2019
@@ -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
Modified:
openoffice/branches/AOO42X/main/xmlsecurity/source/dialogs/warnings.src
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/xmlsecurity/source/dialogs/warnings.src?rev=1863120&r1=1863119&r2=1863120&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/xmlsecurity/source/dialogs/warnings.src
(original)
+++ openoffice/branches/AOO42X/main/xmlsecurity/source/dialogs/warnings.src Tue
Jul 16 09:35:18 2019
@@ -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
