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

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Jan 27 21:02:59 2009
New Revision: 15178
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15178&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/chart-skip-hidden-cells-sc-m39.diff:
	* patches/dev300/chart-skip-hidden-cells-sc.diff:
	* patches/dev300/apply: adjusted dev300-m40.



Added:
   trunk/patches/dev300/chart-skip-hidden-cells-sc-m39.diff   (props changed)
      - copied unchanged from r15169, /trunk/patches/dev300/chart-skip-hidden-cells-sc.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/chart-skip-hidden-cells-sc.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 27 21:02:59 2009
@@ -1017,9 +1017,14 @@
 [ CalcFixes >= dev300-m38 ]
 # skip data in hidden cells when rendering charts.
 chart-skip-hidden-cells-chart2.diff, n#404190, i#81209, n#427545, kohei
-chart-skip-hidden-cells-sc.diff, n#404190, i#81209, n#425617, kohei
 chart-skip-hidden-cells-xmloff.diff, n#404190, i#81209, n#425617, kohei
 
+[ CalcFixes >= dev300-m38 <= dev300-m39 ]
+chart-skip-hidden-cells-sc-m39.diff, n#404190, i#81209, n#425617, kohei
+
+[ CalcFixes > dev300-m39 ]
+chart-skip-hidden-cells-sc.diff, n#404190, i#81209, n#425617, kohei
+
 [ CalcFixes ]
 # render charts with multiple chart types correctly for xls interop.
 chart-axis-multi-chart-types-chart2.diff, n#437322, i#95934, kohei

Modified: trunk/patches/dev300/chart-skip-hidden-cells-sc.diff
==============================================================================
--- trunk/patches/dev300/chart-skip-hidden-cells-sc.diff	(original)
+++ trunk/patches/dev300/chart-skip-hidden-cells-sc.diff	Tue Jan 27 21:02:59 2009
@@ -77,7 +77,7 @@
      sal_Bool                    m_bGotDataChangedHint;
      XModifyListenerArr_Impl     m_aValueListeners;
 diff --git sc/inc/chartlis.hxx sc/inc/chartlis.hxx
-index 0069085..60e77ce 100644
+index ce92808..fdcf130 100644
 --- sc/inc/chartlis.hxx
 +++ sc/inc/chartlis.hxx
 @@ -37,6 +37,8 @@
@@ -105,7 +105,7 @@
 +
 +// ============================================================================
 +
- class ScChartListenerCollection : public StrCollection
+ class ScChartListenerCollection : public ScStrCollection
  {
 +public:
 +    struct RangeListenerItem
@@ -147,10 +147,10 @@
  
  
 diff --git sc/inc/unonames.hxx sc/inc/unonames.hxx
-index 35cf347..7cd2954 100644
+index cc4cb2e..504ff00 100644
 --- sc/inc/unonames.hxx
 +++ sc/inc/unonames.hxx
-@@ -608,6 +608,7 @@
+@@ -612,6 +612,7 @@
  // Chart2
  #define SC_UNONAME_ISHIDDEN         "IsHidden"
  #define SC_UNONAME_ROLE             "Role"
@@ -159,7 +159,7 @@
  // Solver
  #define SC_UNONAME_TIMEOUT          "Timeout"
 diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
-index 1aad7a0..0e00586 100644
+index 33fcc3a..ed7dc94 100644
 --- sc/source/core/data/table2.cxx
 +++ sc/source/core/data/table2.cxx
 @@ -626,8 +626,6 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
@@ -217,7 +217,7 @@
  		}
  
 diff --git sc/source/core/tool/chartlis.cxx sc/source/core/tool/chartlis.cxx
-index 4d6b1b3..0196c9e 100644
+index 6a864a1..6c663ff 100644
 --- sc/source/core/tool/chartlis.cxx
 +++ sc/source/core/tool/chartlis.cxx
 @@ -40,7 +40,7 @@
@@ -252,7 +252,7 @@
 +}
 +
  ScChartListenerCollection::ScChartListenerCollection( ScDocument* pDocP ) :
- 	StrCollection( 4, 4, FALSE ),
+ 	ScStrCollection( 4, 4, FALSE ),
  	pDoc( pDocP )
 @@ -454,6 +469,14 @@ void ScChartListenerCollection::SetRangeDirty( const ScRange& rRange )
  	}
@@ -400,7 +400,7 @@
      void                ReadChAxesSet( XclImpStream& rStrm );
      /** Reads a CHTEXT group (chart title and series/point captions). */
 diff --git sc/source/ui/unoobj/chart2uno.cxx sc/source/ui/unoobj/chart2uno.cxx
-index 9f7dd8a..439700f 100644
+index 9f7dd8a..388b86b 100644
 --- sc/source/ui/unoobj/chart2uno.cxx
 +++ sc/source/ui/unoobj/chart2uno.cxx
 @@ -43,6 +43,7 @@
@@ -576,7 +576,7 @@
  
  void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
  {
-@@ -1385,7 +1505,8 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
+@@ -1385,7 +1511,8 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint
              // delayed broadcast as in ScCellRangesBase
  
              if ( m_bGotDataChangedHint && m_pDocument )
@@ -586,7 +586,7 @@
                  lang::EventObject aEvent;
                  aEvent.Source.set((cppu::OWeakObject*)this);
  
-@@ -1448,7 +1569,7 @@ IMPL_LINK( ScChart2DataSequence, ValueListenerHdl, SfxHint*, pHint )
+@@ -1448,7 +1575,7 @@ IMPL_LINK( ScChart2DataSequence, ValueListenerHdl, SfxHint*, pHint )
          //  in the range are notified. So only a flag is set that is checked when
          //  SFX_HINT_DATACHANGED is received.
  
@@ -595,7 +595,7 @@
      }
      return 0;
  }
-@@ -1461,72 +1582,19 @@ uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData()
+@@ -1461,72 +1588,19 @@ uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData()
      if ( !m_pDocument)
          throw uno::RuntimeException();
  
@@ -678,7 +678,7 @@
      return aSeq;
  }
  
-@@ -1539,67 +1607,18 @@ uno::Sequence< double > SAL_CALL ScChart2DataSequence::getNumericalData()
+@@ -1539,67 +1613,18 @@ uno::Sequence< double > SAL_CALL ScChart2DataSequence::getNumericalData()
      if ( !m_pDocument)
          throw uno::RuntimeException();
  
@@ -754,7 +754,7 @@
      return aSeq;
  }
  
-@@ -1611,49 +1630,15 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData(  )
+@@ -1611,49 +1636,15 @@ uno::Sequence< rtl::OUString > SAL_CALL ScChart2DataSequence::getTextualData(  )
      if ( !m_pDocument)
          throw uno::RuntimeException();
  
@@ -812,7 +812,7 @@
      return aSeq;
  }
  
-@@ -1878,11 +1863,20 @@ void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< uti
+@@ -1878,11 +1869,20 @@ void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< uti
  		if (!m_pValueListener)
  			m_pValueListener = new ScLinkListener( LINK( this, ScChart2DataSequence, ValueListenerHdl ) );
  
@@ -834,7 +834,7 @@
          }
  
  		acquire();	// don't lose this object (one ref for all listeners)
-@@ -1914,6 +1908,13 @@ void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference<
+@@ -1914,6 +1914,13 @@ void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference<
  				if (m_pValueListener)
  					m_pValueListener->EndListeningAll();
  
@@ -848,7 +848,7 @@
  				release();		// release the ref for the listeners
  			}
  
-@@ -1969,6 +1970,13 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(
+@@ -1969,6 +1976,13 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(
          aRet <<= m_aRole;
      else if ( rPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SC_UNONAME_ISHIDDEN)))
          aRet <<= m_bHidden;
@@ -862,7 +862,7 @@
      else
          throw beans::UnknownPropertyException();
      // TODO: support optional properties
-@@ -2023,6 +2031,11 @@ void SAL_CALL ScChart2DataSequence::removeVetoableChangeListener(
+@@ -2023,6 +2037,11 @@ void SAL_CALL ScChart2DataSequence::removeVetoableChangeListener(
      OSL_ENSURE( false, "Not yet implemented" );
  }
  
@@ -874,6 +874,3 @@
  // XUnoTunnel
  
  // sal_Int64 SAL_CALL ScChart2DataSequence::getSomething(
-diff --git sc/workben/celltrans/keywords_utf16.txt sc/workben/celltrans/keywords_utf16.txt
-index 52e71ed..b563c8d 100644
-Binary files sc/workben/celltrans/keywords_utf16.txt and sc/workben/celltrans/keywords_utf16.txt differ