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

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Feb 18 21:01:27 2009
New Revision: 15373
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15373&view=rev

Log:
2009-02-18  Kohei Yoshida  <kyoshida novell com>


	* patches/dev300/cws-scsheetprotection02-sc.diff: fixed the build 
	breakage on win32 regarding MSVC implementation of ::std::auto_ptr, by
	switching to using ::boost::shared_ptr instead.
	
	* patches/dev300/sc-winbuild-tweak.diff:
	* patches/dev300/sc-winbuild-tweak-m0.diff:
	* patches/dev300/apply: removed these patches.


Removed:
   trunk/patches/dev300/sc-winbuild-tweak-m0.diff
   trunk/patches/dev300/sc-winbuild-tweak.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	Wed Feb 18 21:01:27 2009
@@ -888,19 +888,6 @@
 
 fix-formulaaccess-core.diff, noelpwer, i#98240
 
-[ CalcFixes <= dev300-m41 <= ooo310-m0 ]
-
-sc-winbuild-tweak-m0.diff
-
-[ CalcFixes > dev300-m41 > ooo310-m0 ]
-
-# some visibilty specifications have changed on m40, looks like
-# some cws(s) are based off earlier versions which make methods
-# of now public classes visible ( windows doesn't like that )
-# additionally there is another tweak for ScTableProtectionImpl from
-# cws-scsheetprotectxxxx.diff to move it to the header file ( so auto_ptr is happy )
-sc-winbuild-tweak.diff
-
 [ LinuxOnly ]
 # accelerate linking, by extreme cunning i#63927
 # this is an increasingly marginal win ...

Modified: trunk/patches/dev300/cws-scsheetprotection02-sc.diff
==============================================================================
--- trunk/patches/dev300/cws-scsheetprotection02-sc.diff	(original)
+++ trunk/patches/dev300/cws-scsheetprotection02-sc.diff	Wed Feb 18 21:01:27 2009
@@ -140,11 +140,10 @@
  
  	Size			GetPageSize() const;
  	void			SetPageSize( const Size& rSize );
-diff --git sc/inc/tabprotection.hxx sc/inc/tabprotection.hxx
-new file mode 100644
-index 0000000..f49a471
---- /dev/null
-+++ sc/inc/tabprotection.hxx
+Index: inc/tabprotection.hxx
+===================================================================
+--- sc/inc/tabprotection.hxx	(.../tags/DEV300_m41/sc)	(revision 0)
++++ sc/inc/tabprotection.hxx	(.../cws/scsheetprotection02/sc)	(revision 268255)
 @@ -0,0 +1,180 @@
 +/*************************************************************************
 + *
@@ -184,7 +183,7 @@
 +
 +#include "global.hxx"
 +#include <vector>
-+#include <memory>
++#include <boost/shared_ptr.hpp>
 +
 +#define ENABLE_SHEET_PROTECTION 0
 +
@@ -250,21 +249,21 @@
 +
 +    virtual bool isProtected() const;
 +    virtual bool isProtectedWithPass() const;
-+    SC_DLLPUBLIC virtual void setProtected(bool bProtected);
++    virtual void setProtected(bool bProtected);
 +            
 +    virtual bool isPasswordEmpty() const;
 +    virtual bool hasPasswordHash(ScPasswordHash eHash) const;
-+    SC_DLLPUBLIC virtual void setPassword(const String& aPassText);
++    virtual void setPassword(const String& aPassText);
 +    virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(ScPasswordHash eHash) const;
 +    virtual void setPasswordHash(const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, 
 +                                 ScPasswordHash eHash = PASSHASH_OOO);
 +    virtual bool verifyPassword(const String& aPassText) const;
 +    
-+    SC_DLLPUBLIC bool isOptionEnabled(Option eOption) const;
++    bool isOptionEnabled(Option eOption) const;
 +    void setOption(Option eOption, bool bEnabled);
 +
 +private:
-+    ::std::auto_ptr<ScTableProtectionImpl> mpImpl;
++    ::boost::shared_ptr<ScTableProtectionImpl> mpImpl;
 +};
 +
 +// ============================================================================
@@ -307,21 +306,21 @@
 +
 +    virtual bool isProtected() const;
 +    virtual bool isProtectedWithPass() const;
-+    SC_DLLPUBLIC virtual void setProtected(bool bProtected);
++    virtual void setProtected(bool bProtected);
 +            
 +    virtual bool isPasswordEmpty() const;
 +    virtual bool hasPasswordHash(ScPasswordHash eHash) const;
-+    SC_DLLPUBLIC virtual void setPassword(const String& aPassText);
++    virtual void setPassword(const String& aPassText);
 +    virtual ::com::sun::star::uno::Sequence<sal_Int8> getPasswordHash(ScPasswordHash eHash) const;
 +    virtual void setPasswordHash(const ::com::sun::star::uno::Sequence<sal_Int8>& aPassword, 
 +                                 ScPasswordHash eHash = PASSHASH_OOO);
 +    virtual bool verifyPassword(const String& aPassText) const;
 +    
-+    SC_DLLPUBLIC bool isOptionEnabled(Option eOption) const;
-+    SC_DLLPUBLIC void setOption(Option eOption, bool bEnabled);
++    bool isOptionEnabled(Option eOption) const;
++    void setOption(Option eOption, bool bEnabled);
 +
 +private:
-+    ::std::auto_ptr<ScTableProtectionImpl> mpImpl;
++    ::boost::shared_ptr<ScTableProtectionImpl> mpImpl;
 +};
 +
 +
@@ -610,12 +609,11 @@
  Size ScTable::GetPageSize() const
  {
  	if ( bPageSizeValid )
-diff --git sc/source/core/data/tabprotection.cxx sc/source/core/data/tabprotection.cxx
-new file mode 100644
-index 0000000..d4f983b
---- /dev/null
-+++ sc/source/core/data/tabprotection.cxx
-@@ -0,0 +1,463 @@
+Index: source/core/data/tabprotection.cxx
+===================================================================
+--- sc/source/core/data/tabprotection.cxx	(.../tags/DEV300_m41/sc)	(revision 0)
++++ sc/source/core/data/tabprotection.cxx	(.../cws/scsheetprotection02/sc)	(revision 268255)
+@@ -0,0 +1,465 @@
 +/*************************************************************************
 + *
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -937,7 +935,8 @@
 +}
 +
 +ScDocProtection::ScDocProtection(const ScDocProtection& r) :
-+    mpImpl(new ScTableProtectionImpl(*r.mpImpl.get()))
++    ScPassHashProtectable(),
++    mpImpl(new ScTableProtectionImpl(*r.mpImpl))
 +{
 +}
 +
@@ -1016,7 +1015,8 @@
 +}
 +
 +ScTableProtection::ScTableProtection(const ScTableProtection& r) :
-+    mpImpl(new ScTableProtectionImpl(*r.mpImpl.get()))
++    ScPassHashProtectable(),
++    mpImpl(new ScTableProtectionImpl(*r.mpImpl))
 +{
 +}
 +