[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/calc-dp-custom-names-sc.diff |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 5174c4eb4710a38611ec9dd28e43f70e348eca98
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 13:21:02 2009 +0300

    Adapt calc-dp-custom-names-sc.diff to dev300-m57

diff --git a/patches/dev300/calc-dp-custom-names-sc.diff b/patches/dev300/calc-dp-custom-names-sc.diff
index 0ed7adc..2036b12 100644
--- a/patches/dev300/calc-dp-custom-names-sc.diff
+++ b/patches/dev300/calc-dp-custom-names-sc.diff
@@ -60,8 +60,6 @@ index 2eff673..854e1da 100644
  	static BOOL			HasRegisteredSources();
  	static com::sun::star::uno::Sequence<rtl::OUString> GetRegisteredSources();
  	static com::sun::star::uno::Reference<com::sun::star::sheet::XDimensionsSupplier>
-diff --git sc/inc/dpsave.hxx sc/inc/dpsave.hxx
-index ead2c05..cb381fb 100644
 --- sc/inc/dpsave.hxx
 +++ sc/inc/dpsave.hxx
 @@ -34,9 +34,11 @@
@@ -118,13 +116,12 @@ index ead2c05..cb381fb 100644
  	BOOL		bIsDataLayout;
  	BOOL		bDupFlag;
  	USHORT		nOrientation;
-@@ -127,39 +136,44 @@ public:
+@@ -127,38 +136,43 @@ public:
  
      void                    SetName( const String& rNew );  // used if the source dim was renamed (groups)
  
 -    SC_DLLPUBLIC void					SetOrientation(USHORT nNew);
 +    void					SetOrientation(USHORT nNew);
- 	void					SetSubTotals(BOOL bSet);		// to be removed!
 -    SC_DLLPUBLIC void					SetSubTotals(long nCount, const USHORT* pFuncs);
 +    void					SetSubTotals(long nCount, const USHORT* pFuncs);
      long                    GetSubTotalsCount() const { return nSubTotalCount; }
@@ -135,7 +132,7 @@ index ead2c05..cb381fb 100644
 -    SC_DLLPUBLIC void					SetFunction(USHORT nNew);		// enum GeneralFunction
 +    void					SetFunction(USHORT nNew);		// enum GeneralFunction
      USHORT                  GetFunction() const { return nFunction; }
- 	void					SetUsedHierarchy(long nNew);
+     void					SetUsedHierarchy(long nNew);
      long                    GetUsedHierarchy() const { return nUsedHierarchy; }
 -    SC_DLLPUBLIC void					SetLayoutName(const String* pName);
 -    SC_DLLPUBLIC const String&			GetLayoutName() const;
@@ -149,7 +146,7 @@ index ead2c05..cb381fb 100644
 +
 +    bool                    IsMemberNameInUse(const ::rtl::OUString& rName) const;
  
- 	const ::com::sun::star::sheet::DataPilotFieldReference* GetReferenceValue() const	{ return pReferenceValue; }
+     const ::com::sun::star::sheet::DataPilotFieldReference* GetReferenceValue() const	{ return pReferenceValue; }
 -    SC_DLLPUBLIC void					SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew);
 +    void					SetReferenceValue(const ::com::sun::star::sheet::DataPilotFieldReference* pNew);
  
@@ -170,9 +167,9 @@ index ead2c05..cb381fb 100644
 +    BOOL					HasCurrentPage() const;
 +    const String&			GetCurrentPage() const;
  
- 	USHORT					GetOrientation() const	{ return nOrientation; }
+     USHORT					GetOrientation() const	{ return nOrientation; }
  
- 	ScDPSaveMember* 		GetExistingMemberByName(const String& rName);
+     ScDPSaveMember* 		GetExistingMemberByName(const String& rName);
 -    SC_DLLPUBLIC ScDPSaveMember*			GetMemberByName(const String& rName);
 +    ScDPSaveMember*			GetMemberByName(const String& rName);