dev/null |binary extras/source/templates/presnt/lang/vi/prs-novelty.otp |binary offapi/com/sun/star/document/MacroExecMode.idl | 10 +++++----- sfx2/source/doc/docmacromode.cxx | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 36283b11af115fda9d600cd3b4f0ea0e8837b01c Author: Matthias Seidel <[email protected]> Date: Thu Jun 21 09:56:22 2018 +0000 Fixed typo: conformation -> confirmation diff --git a/offapi/com/sun/star/document/MacroExecMode.idl b/offapi/com/sun/star/document/MacroExecMode.idl index 1b4dbcc7aa8b..7eea2dafd77f 100644 --- a/offapi/com/sun/star/document/MacroExecMode.idl +++ b/offapi/com/sun/star/document/MacroExecMode.idl @@ -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; diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index 102468fbd986..a8b6483d7af2 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -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 ) commit 2247e3d487b279347a3b6a06875ff15bacabc9aa Author: Matthias Seidel <[email protected]> Date: Thu Jun 21 08:56:12 2018 +0000 Cleaned up Vietnamese templates diff --git a/extras/source/templates/presnt/lang/vi/prs-novelty.otp b/extras/source/templates/presnt/lang/vi/prs-novelty.otp index b9b90d94d4f3..aa6a50dc3cb0 100644 Binary files a/extras/source/templates/presnt/lang/vi/prs-novelty.otp and b/extras/source/templates/presnt/lang/vi/prs-novelty.otp differ diff --git a/extras/source/templates/presnt/lang/vi/prs-novelty_new.otp b/extras/source/templates/presnt/lang/vi/prs-novelty_new.otp deleted file mode 100644 index aa6a50dc3cb0..000000000000 Binary files a/extras/source/templates/presnt/lang/vi/prs-novelty_new.otp and /dev/null differ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
