[ooo-build-commit] .: patches/dev300

[Muthu Subramanian]

 patches/dev300/xlsx-shared-oox-chart-export-part1.diff |   28 ++++++++---------
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 78f380e1e74c30c21ac8d5d5cb3e9c4caed68998
Author: Muthu Subramanian K <sumuthu at novell.com>
Date:   Tue Jul 20 14:17:48 2010 +0530

    Updated chart export patch to apply with m83.
    
    * patches/dev300/xlsx-shared-oox-chart-export-part1.diff:

diff --git a/patches/dev300/xlsx-shared-oox-chart-export-part1.diff b/patches/dev300/xlsx-shared-oox-chart-export-part1.diff
index f495daf..d9d66b8 100644
--- a/patches/dev300/xlsx-shared-oox-chart-export-part1.diff
+++ b/patches/dev300/xlsx-shared-oox-chart-export-part1.diff
@@ -4242,9 +4242,9 @@ diff --git sc/source/filter/inc/xcl97rec.hxx sc/source/filter/inc/xcl97rec.hxx
 index 01adc19..0ab5c3c 100644
 --- sc/source/filter/inc/xcl97rec.hxx
 +++ sc/source/filter/inc/xcl97rec.hxx
-@@ -316,6 +316,8 @@ public:
+@@ -251,6 +251,8 @@ public:
  
-     virtual	void				Save( XclExpStream& rStrm );
+    virtual	void				Save( XclExpStream& rStrm );
  	virtual	void				SaveXml( XclExpXmlStream& rStrm );
 +    static void                 WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj ); 
 +    static void                 WriteFromTo( XclExpXmlStream& rStrm, const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, SCTAB nTab );        
@@ -4263,15 +4263,15 @@ index 3e5493a..3633d77 100644
  
  namespace com { namespace sun { namespace star {
      namespace script { struct ScriptEventDescriptor; }
-@@ -191,6 +192,7 @@ class XclExpChartObj : public XclObj, protected XclExpRoot
+@@ -312,5 +313,7 @@ class XclExpChartObj : public XclObj, protected XclExpRoot
  {
  public:
-     typedef ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > XShapeRef;
 +    typedef ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDocument > XChartDocRef;
- 
- public:
-     explicit            XclExpChartObj( const XclExpRoot& rRoot, XShapeRef xShape );
-@@ -198,10 +200,15 @@ public:
++    typedef ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > XShapeRef;
+     explicit            XclExpChartObj(
+                             XclExpObjectManager& rObjMgr,
+                             ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape,
+@@ -319,10 +321,15 @@ public:
  
      /** Writes the OBJ record and the entire chart substream. */
      virtual void        Save( XclExpStream& rStrm );
@@ -4291,10 +4291,10 @@ index 3e5493a..3633d77 100644
 index 2c73dff..e463be9 100644
 --- sc/source/filter/xcl97/xcl97rec.cxx
 +++ sc/source/filter/xcl97/xcl97rec.cxx
-@@ -1065,19 +1065,17 @@ void XclObjAny::Save( XclExpStream& rStrm )
-     XclObj::Save( rStrm );
+@@ -924,19 +924,17 @@ void XclObjAny::Save( XclExpStream& rStrm )
+     nFileHistory  	= 0x00000000;
+     nLowestBiffVer	= 0x00000006;	// Biff8
  }
- 
 -
 -static void
 -WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj )
@@ -4370,9 +4370,9 @@ index e224fc2..897373c 100644
 @@ -798,7 +808,7 @@ void XclExpTbxControlObj::WriteSbs( XclExpStream& /*rStrm*/ )
  
  XclExpChartObj::XclExpChartObj( const XclExpRoot& rRoot, Reference< XShape > xShape ) :
-     XclObj( rRoot, EXC_OBJTYPE_CHART ),
--    XclExpRoot( rRoot )
-+    XclExpRoot( rRoot ), mxShape( xShape )
+     XclObj( rObjMgr, EXC_OBJTYPE_CHART ),
+-    XclExpRoot( rObjMgr.GetRoot() )
++    XclExpRoot( rObjMgr.GetRoot() ), mxShape( xShape )
  {
      // create the MSODRAWING record contents for the chart object
      XclEscherEx& rEscherEx = *pMsodrawing->GetEscherEx();