[ooo-build-commit] patches/dev300 patches/vba

[Noel Power]

 patches/dev300/apply                               |    1 
 patches/vba/vba-reenable-cwssheetproctectbits.diff |   35 +++++++++++++++++++++
 2 files changed, 36 insertions(+)

New commits:
commit 17210ae7c3a441fc9a8cc87e138825272e2960aa
Author: Noel Power <noel.power at novell.com>
Date:   Mon Nov 16 12:32:46 2009 +0000

    reenable erroneously ifdefed out code
    
    * patches/dev300/apply:
    * patches/vba/vba-reenable-cwssheetproctectbits.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index fa2c45c..bfd6dc7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1687,6 +1687,7 @@ vba-fix-override-exportproblem.diff
 vba-thiscomponent-fix.diff
 # more Writer VBA support, need to merger into cws-vbasupportdev
 vba-word-support-m4.diff, Fong
+vba-reenable-cwssheetproctectbits.diff
 [VBAUntested]
 SectionOwner => noelpwer
 # doesn't work
diff --git a/patches/vba/vba-reenable-cwssheetproctectbits.diff b/patches/vba/vba-reenable-cwssheetproctectbits.diff
new file mode 100644
index 0000000..8d2025d
--- /dev/null
+++ b/patches/vba/vba-reenable-cwssheetproctectbits.diff
@@ -0,0 +1,35 @@
+diff --git sc/source/ui/vba/vbaworksheet.cxx sc/source/ui/vba/vbaworksheet.cxx
+index 3a38bd3..5584cab 100644
+--- sc/source/ui/vba/vbaworksheet.cxx
++++ sc/source/ui/vba/vbaworksheet.cxx
+@@ -77,9 +77,7 @@
+ 
+ #include "cellsuno.hxx"
+ #include "drwlayer.hxx"
+-#ifdef CWSSCSHEETPROTECTION
+ #include "tabprotection.hxx"
+-#endif
+ #include "scextopt.hxx"
+ #include "vbaoutline.hxx"
+ #include "vbarange.hxx"
+@@ -411,7 +409,6 @@ ScVbaWorksheet::getProtectContents()throw (uno::RuntimeException)
+ sal_Bool 
+ ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException) 
+ {
+-#ifdef CWSSCSHEETPROTECTION
+ 	SCTAB nTab = 0;
+ 	rtl::OUString aSheetName = getName();
+ 	uno::Reference <sheet::XSpreadsheetDocument> xSpreadDoc( getModel(), uno::UNO_QUERY_THROW );
+@@ -422,11 +419,8 @@ ScVbaWorksheet::getProtectDrawingObjects() throw (uno::RuntimeException)
+ 		ScDocument* pDoc = excel::getDocShell( xModel )->GetDocument();
+ 		ScTableProtection* pProtect = pDoc->GetTabProtection(nTab);
+ 		if ( pProtect )
+-			return pProtect->getOption( ScTableProtection::OBJECTS ); 
++			return pProtect->isOptionEnabled( ScTableProtection::OBJECTS ); 
+         }
+-#else
+-	return getProtectContents(); // fallback
+-#endif 
+     return false;
+ }
+