[Libreoffice-commits] .: Branch 'libreoffice-3-5' - officecfg/registry

[Petr Mladek]

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8475d4e14ce068b5eae155aa26f40f79ebadc0e2
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Tue Apr 17 17:12:09 2012 +0200

    Fix fdo#47484 - use older ODF encryption by default
    
    As recently discussed, 3.5.x will use the older, more backwards-
    compatible encryption methods, as a way to transition people over.
    Starting with 3.6, the stronger AES will be the default. In all
    versions, this is configurable though.
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index c74e508..0f2918d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2705,17 +2705,17 @@
             <author>MAV</author>
             <desc>Specifies whether SHA1 algorithm instead of SHA256 should be
             used in ODF12 for StartKey and Checksum generation during
-            encryption.</desc>
+            encryption. If true, compatible with older OOo/LibO versions.</desc>
           </info>
-          <value>false</value>
+          <value>true</value>
         </prop>
         <prop oor:name="UseBlowfishInODF12" oor:type="xs:boolean">
           <info>
             <author>MAV</author>
             <desc>Specifies whether Blowfish algorithm instead of AES should be
-            used in ODF12 for encryption.</desc>
+            used in ODF12 for encryption. If true, compatible with older OOo/LibO versions.</desc>
           </info>
-          <value>false</value>
+          <value>true</value>
         </prop>
       </group>
     </group>