[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-ods-sheet-protection-sc.diff |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2c9d23e697585809c9111cbb5f95104f7ad72609
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Sep 11 18:14:09 2009 -0400

    Use SHA1 hash algorithm for sheet and doc password by default.
    
    * patches/dev300/calc-ods-sheet-protection-sc.diff: documents created
      by the older versions of Go-OO or the upstream OOo may not specify
      hash algorithm in the document.  Under that circumstnce, use SHA1
      to hash the password for backword compatibility.

diff --git a/patches/dev300/calc-ods-sheet-protection-sc.diff b/patches/dev300/calc-ods-sheet-protection-sc.diff
index 77602f9..dbde08f 100644
--- a/patches/dev300/calc-ods-sheet-protection-sc.diff
+++ b/patches/dev300/calc-ods-sheet-protection-sc.diff
@@ -425,7 +425,7 @@ index fa993ef..c118998 100644
  											  const uno::Reference<xml::sax::XAttributeList>& xAttrList ) :
  	SvXMLImportContext( rImport, nPrfx, rLName ),
  	sPassword(),
-+    meHash1(PASSHASH_UNSPECIFIED),
++    meHash1(PASSHASH_SHA1),
 +    meHash2(PASSHASH_UNSPECIFIED),
  	bProtected(sal_False),
      bHadCalculationSettings(sal_False),
@@ -713,7 +713,7 @@ index 72ddec3..3a001e9 100644
  /*******************************************************************************************************************************/
  
 +ScXMLTabProtectionData::ScXMLTabProtectionData() :
-+    meHash1(PASSHASH_UNSPECIFIED), 
++    meHash1(PASSHASH_SHA1), 
 +    meHash2(PASSHASH_UNSPECIFIED),
 +    mbProtected(false), 
 +    mbSelectProtectedCells(false),