ooo-build r14974 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Dec 30 20:50:14 2008
New Revision: 14974
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14974&view=rev

Log:
2008-12-30  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/cws-scsheetprotection02-sc.diff: turn off the sheet 
	protection options.
	
	* patches/dev300/enable-sheet-protection-options.diff:
	* patches/dev300/enable-xls-export-encryption.diff:
	* patches/dev300/apply: enable Excel export encryption and sheet 
	protection options.


Added:
   trunk/patches/dev300/enable-sheet-protection-options.diff
   trunk/patches/dev300/enable-xls-export-encryption.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/cws-scsheetprotection02-sc.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Dec 30 20:50:14 2008
@@ -820,6 +820,10 @@
 cws-scsheetprotection02-sfx2.diff, i#97515, kohei
 cws-scsheetprotection02-svx.diff,  i#97515, kohei
 
+# Enable these in ooo-build.  They are still disabled upstream.
+enable-xls-export-encryption.diff, kohei
+enable-sheet-protection-options.diff, kohei
+
 [ CalcFixes ]
 # Ensure that Print Preview is consistent with Print output.
 sc-print-selected-sheets.diff, n#335684, i#45497, jonp

Modified: trunk/patches/dev300/cws-scsheetprotection02-sc.diff
==============================================================================
--- trunk/patches/dev300/cws-scsheetprotection02-sc.diff	(original)
+++ trunk/patches/dev300/cws-scsheetprotection02-sc.diff	Tue Dec 30 20:50:14 2008
@@ -186,7 +186,7 @@
 +#include <vector>
 +#include <memory>
 +
-+#define ENABLE_SHEET_PROTECTION 1
++#define ENABLE_SHEET_PROTECTION 0
 +
 +class ScDocument;
 +class ScTableProtectionImpl;

Added: trunk/patches/dev300/enable-sheet-protection-options.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/enable-sheet-protection-options.diff	Tue Dec 30 20:50:14 2008
@@ -0,0 +1,13 @@
+diff --git sc/inc/tabprotection.hxx sc/inc/tabprotection.hxx
+index f49a471..50b4798 100644
+--- sc/inc/tabprotection.hxx
++++ sc/inc/tabprotection.hxx
+@@ -38,7 +38,7 @@
+ #include <vector>
+ #include <memory>
+ 
+-#define ENABLE_SHEET_PROTECTION 0
++#define ENABLE_SHEET_PROTECTION 1
+ 
+ class ScDocument;
+ class ScTableProtectionImpl;

Added: trunk/patches/dev300/enable-xls-export-encryption.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/enable-xls-export-encryption.diff	Tue Dec 30 20:50:14 2008
@@ -0,0 +1,13 @@
+diff --git sfx2/source/dialog/filedlghelper.cxx sfx2/source/dialog/filedlghelper.cxx
+index 5fb497e..08b2469 100644
+--- sfx2/source/dialog/filedlghelper.cxx
++++ sfx2/source/dialog/filedlghelper.cxx
+@@ -562,7 +562,7 @@ struct CheckPasswordCapability
+         if (!_pFilter)
+             return false;
+ 
+-#if 0 // to be enabled in the future
++#if 1
+         if (_pFilter->GetFilterName().EqualsAscii("MS Excel 97"))
+             // For now, we eanble password protection for Excel 97 as a 
+             // special case.  If we start having more filters supporting