[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-dirty-cells-after-load-fix.diff |   40 ++++++++++++++++++++
 1 file changed, 40 insertions(+)

New commits:
commit 94b0c6242a7950824d865ce99fbdba5c33a79b24
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Jun 17 15:55:03 2009 -0400

    Fixed a build breakage in sc.
    
    * patches/dev300/calc-dirty-cells-after-load-fix.diff:

diff --git a/patches/dev300/calc-dirty-cells-after-load-fix.diff b/patches/dev300/calc-dirty-cells-after-load-fix.diff
index b581a2f..4a2e9a3 100644
--- a/patches/dev300/calc-dirty-cells-after-load-fix.diff
+++ b/patches/dev300/calc-dirty-cells-after-load-fix.diff
@@ -227,3 +227,43 @@ index 05932de..32b8105 100644
  
  private:
      /** Reads the CHCHART group (entire chart data). */
+diff --git sc/source/filter/xlsx/xlsx-xichart.cxx sc/source/filter/xlsx/xlsx-xichart.cxx
+index fb19b0c..b3abc77 100644
+--- sc/source/filter/xlsx/xlsx-xichart.cxx
++++ sc/source/filter/xlsx/xlsx-xichart.cxx
+@@ -3402,7 +3402,7 @@ XclImpChTextRef XclImpChChart::GetDefaultText( XclChTextType eTextType ) const
+     return maDefTexts.get( nDefTextId );
+ }
+ 
+-void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc, ScfProgressBar& rProgress ) const
++void XclImpChChart::Convert( Reference< XChartDocument > xChartDoc, ScfProgressBar& rProgress, const OUString& /*rObjName*/ ) const
+ {
+     // initialize conversion (locks the model to suppress any internal updates)
+     InitConversion( xChartDoc );
+@@ -3654,11 +3654,11 @@ sal_Size XclImpChart::GetProgressSize() const
+     return mxChartData.is() ? mxChartData->GetProgressSize() : 0;
+ }
+ 
+-void XclImpChart::Convert( Reference< XModel > xModel, ScfProgressBar& rProgress ) const
++void XclImpChart::Convert( Reference< XModel > xModel, ScfProgressBar& rProgress, const OUString& rObjName ) const
+ {
+     Reference< XChartDocument > xChartDoc( xModel, UNO_QUERY );
+     if( mxChartData.is() && xChartDoc.is() )
+-        mxChartData->Convert( xChartDoc, rProgress );
++        mxChartData->Convert( xChartDoc, rProgress, rObjName );
+ }
+ 
+ void XclImpChart::ReadChChart( XclImpStream& rStrm )
+diff --git sc/source/filter/xlsx/xlsx-xiescher.cxx sc/source/filter/xlsx/xlsx-xiescher.cxx
+index 3751674..1637ab1 100644
+--- sc/source/filter/xlsx/xlsx-xiescher.cxx
++++ sc/source/filter/xlsx/xlsx-xiescher.cxx
+@@ -1584,7 +1584,7 @@ SdrObject* XclImpChartObj::DoCreateSdrObj( const Rectangle& rAnchorRect, ScfProg
+         if( svt::EmbeddedObjectRef::TryRunningState( xEmbObj ) )
+         {
+             Reference< XModel > xModel( xEmbObj->getComponent(), UNO_QUERY );
+-            mxChart->Convert( xModel, rProgress );
++            mxChart->Convert( xModel, rProgress, aEmbObjName );
+ 
+             Reference< XEmbedPersist > xPers( xEmbObj, UNO_QUERY );
+             if( xPers.is() )