Author: mseidel
Date: Thu Jun 21 09:56:22 2018
New Revision: 1833991
URL: http://svn.apache.org/viewvc?rev=1833991&view=rev
Log:
Fixed typo:
conformation -> confirmation
Modified:
openoffice/trunk/main/offapi/com/sun/star/document/MacroExecMode.idl
openoffice/trunk/main/sfx2/source/doc/docmacromode.cxx
Modified: openoffice/trunk/main/offapi/com/sun/star/document/MacroExecMode.idl
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/document/MacroExecMode.idl?rev=1833991&r1=1833990&r2=1833991&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/document/MacroExecMode.idl
(original)
+++ openoffice/trunk/main/offapi/com/sun/star/document/MacroExecMode.idl Thu
Jun 21 09:56:22 2018
@@ -45,7 +45,7 @@ published constants MacroExecMode
/** Execute macros from secure list quietly.
<p>
- If a macro is not in the list a conformation for it executing
will
+ If a macro is not in the list a confirmation for it executing
will
appear.
</p>
*/
@@ -57,7 +57,7 @@ published constants MacroExecMode
from secure list are executed quietly.
<p>
- If the macro is neither in secure list nor signed a
conformation
+ If the macro is neither in secure list nor signed a
confirmation
will be requested.
</p>
*/
@@ -73,7 +73,7 @@ published constants MacroExecMode
//-------------------------------------------------------------------------
- /** A macro should be executed always no conformation should be
provided.
+ /** A macro should be executed always no confirmation should be
provided.
*/
const short ALWAYS_EXECUTE_NO_WARN = 4;
@@ -108,14 +108,14 @@ published constants MacroExecMode
<p> If the macro is signed with unknown certificate a warning
will
appear. The macro either will not be executed or if the
warning
- allows conformation, it will be executed after user
agrees.
+ allows confirmation, it will be executed after user
agrees.
</p>
*/
const short FROM_LIST_AND_SIGNED_WARN = 8;
//-------------------------------------------------------------------------
/** Execute only macros from secure list or macros that are signed by
- trusted certificates. No warning/conformation should be shown.
+ trusted certificates. No warning/confirmation should be shown.
*/
const short FROM_LIST_AND_SIGNED_NO_WARN = 9;
Modified: openoffice/trunk/main/sfx2/source/doc/docmacromode.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/doc/docmacromode.cxx?rev=1833991&r1=1833990&r2=1833991&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/doc/docmacromode.cxx (original)
+++ openoffice/trunk/main/sfx2/source/doc/docmacromode.cxx Thu Jun 21 09:56:22
2018
@@ -249,7 +249,7 @@ namespace sfx2
// check whether the document is signed with trusted certificate
if ( nMacroExecutionMode != MacroExecMode::FROM_LIST )
{
- // the trusted macro check will also retrieve the signature
state ( small optimization )
+ // the trusted macro check will also retrieve the signature
state (small optimization)
sal_Bool bHasTrustedMacroSignature =
m_pData->m_rDocumentAccess.hasTrustedScriptingSignature( nMacroExecutionMode !=
MacroExecMode::FROM_LIST_AND_SIGNED_NO_WARN );
sal_uInt16 nSignatureState =
m_pData->m_rDocumentAccess.getScriptingSignatureState();
@@ -296,7 +296,7 @@ namespace sfx2
}
}
- // conformation is required
+ // confirmation is required
sal_Bool bSecure = sal_False;
if ( eAutoConfirm == eNoAutoConfirm )
