ooo-build r13840 - in trunk: . patches/dev300 patches/vba

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Sep  8 15:08:13 2008
New Revision: 13840
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13840&view=rev

Log:
2008-09-08  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/cws-scsheetprotection02-sc.diff: added SC_DLLPUBLIC to
	several methods used by VBA.
	
	* patches/vba/vba-worksheet-enableselection.diff: removed the hunks 
	that previously added SC_DLLPUBLIC to methods added by the first patch. 


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/cws-scsheetprotection02-sc.diff
   trunk/patches/vba/vba-worksheet-enableselection.diff

Modified: trunk/patches/dev300/cws-scsheetprotection02-sc.diff
==============================================================================
--- trunk/patches/dev300/cws-scsheetprotection02-sc.diff	(original)
+++ trunk/patches/dev300/cws-scsheetprotection02-sc.diff	Mon Sep  8 15:08:13 2008
@@ -53,7 +53,7 @@
  	BOOL			IsTabProtected( SCTAB nTab ) const;
 -	const com::sun::star::uno::Sequence <sal_Int8>&	GetDocPassword() const;
 -	const com::sun::star::uno::Sequence <sal_Int8>&	GetTabPassword( SCTAB nTab ) const;
-+    ScTableProtection* GetTabProtection( SCTAB nTab ) const;
++    SC_DLLPUBLIC ScTableProtection* GetTabProtection( SCTAB nTab ) const;
 +    void            SetTabProtection(SCTAB nTab, bool bProtect, const String& aPassText);
 +    void            SetTabProtection(SCTAB nTab, const ScTableProtection* pProtect);
 +    void            CopyTabProtection(SCTAB nTabSrc, SCTAB nTabDest);
@@ -335,8 +335,8 @@
 +                                 ScPasswordHash eHash = PASSHASH_OOO);
 +    virtual bool verifyPassword(const String& aPassText) const;
 +    
-+    bool isOptionEnabled(Option eOption) const;
-+    void setOption(Option eOption, bool bEnabled);
++    SC_DLLPUBLIC bool isOptionEnabled(Option eOption) const;
++    SC_DLLPUBLIC void setOption(Option eOption, bool bEnabled);
 +
 +private:
 +    ::std::auto_ptr<ScTableProtectionImpl> mpImpl;

Modified: trunk/patches/vba/vba-worksheet-enableselection.diff
==============================================================================
--- trunk/patches/vba/vba-worksheet-enableselection.diff	(original)
+++ trunk/patches/vba/vba-worksheet-enableselection.diff	Mon Sep  8 15:08:13 2008
@@ -8,17 +8,6 @@
  	
  	void Activate();
  	void Calculate( );
---- sc/inc/document.hxx.orig	2008-07-29 18:14:33.000000000 +0800
-+++ sc/inc/document.hxx	2008-07-29 18:16:04.000000000 +0800
-@@ -544,7 +544,7 @@ SC_DLLPUBLIC	ScDBCollection*	GetDBCollec
- 	BOOL			IsDocProtected() const;
- 	BOOL			IsDocEditable() const;
- 	BOOL			IsTabProtected( SCTAB nTab ) const;
--    ScTableProtection* GetTabProtection( SCTAB nTab ) const;
-+    SC_DLLPUBLIC    ScTableProtection* GetTabProtection( SCTAB nTab ) const;
-     void            SetTabProtection(SCTAB nTab, bool bProtect, const String& aPassText);
-     void            SetTabProtection(SCTAB nTab, const ScTableProtection* pProtect);
-     void            CopyTabProtection(SCTAB nTabSrc, SCTAB nTabDest);
 --- sc/source/ui/vba/vbaworksheet.hxx.orig	2008-07-29 18:14:09.000000000 +0800
 +++ sc/source/ui/vba/vbaworksheet.hxx	2008-07-29 18:17:49.000000000 +0800
 @@ -96,6 +96,8 @@ public:
@@ -124,16 +113,4 @@
  uno::Reference< excel::XRange > 
  ScVbaWorksheet::getUsedRange() throw (uno::RuntimeException)
  {
---- sc/inc/tabprotection.hxx.orig	2008-07-29 18:14:17.000000000 +0800
-+++ sc/inc/tabprotection.hxx	2008-07-29 18:16:04.000000000 +0800
-@@ -155,8 +155,8 @@ public:
-                                  ScPasswordHash eHash = PASSHASH_OOO);
-     virtual bool verifyPassword(const String& aPassText) const;
-     
--    bool isOptionEnabled(Option eOption) const;
--    void setOption(Option eOption, bool bEnabled);
-+    SC_DLLPUBLIC    bool isOptionEnabled(Option eOption) const;
-+    SC_DLLPUBLIC    void setOption(Option eOption, bool bEnabled);
- 
- private:
-     ::std::auto_ptr<ScTableProtectionImpl> mpImpl;
+