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

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Mar  4 16:22:15 2009
New Revision: 15462
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15462&view=rev

Log:
2009-03-04  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/chart-skip-hidden-cells-sc.diff: fixed two more build 
	breakages.  Now the sc module builds.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/chart-skip-hidden-cells-sc.diff

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	Wed Mar  4 16:22:15 2009
@@ -716,25 +716,30 @@
      }
  
      delete m_pValueListener;
-@@ -2717,6 +2836,18 @@ void ScChart2DataSequence::RefChanged()
+@@ -2827,6 +2827,14 @@ void ScChart2DataSequence::RefChanged()
  
-                 m_pDocument->StartListeningArea(aRange, m_pValueListener);
-             }
-+
+         if( m_pDocument )
+         {
++            ScChartListenerCollection* pCLC = NULL;
 +            if (m_pHiddenListener.get())
 +            {
-+                ScChartListenerCollection* pCLC = m_pDocument->GetChartListenerCollection();
++                pCLC = m_pDocument->GetChartListenerCollection();
 +                if (pCLC)
-+                {
 +                    pCLC->EndListeningHiddenRange(m_pHiddenListener.get());
-+                    ULONG nCount = m_xRanges->Count();
-+                    for (ULONG i = 0; i < nCount; ++i)
-+                        pCLC->StartListeningHiddenRange(*m_xRanges->GetObject(i), m_pHiddenListener.get());
-+                }
 +            }
++
+             vector<ScSharedTokenRef>::const_iterator itr = m_pTokens->begin(), itrEnd = m_pTokens->end();
+             for (; itr != itrEnd; ++itr)
+             {
+@@ -2835,6 +2843,8 @@ void ScChart2DataSequence::RefChanged()
+                     continue;
+ 
+                 m_pDocument->StartListeningArea(aRange, m_pValueListener);
++                if (pCLC)
++                    pCLC->StartListeningHiddenRange(aRange, m_pHiddenListener.get());
+             }
          }
      }
- }
 @@ -3118,7 +3249,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.
@@ -753,7 +758,7 @@
      p->CopyData(*this);
      Reference< util::XCloneable > xClone(p.release());
  
-@@ -3535,11 +3666,20 @@ void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< uti
+@@ -3654,11 +3664,23 @@ void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< uti
  		if (!m_pValueListener)
  			m_pValueListener = new ScLinkListener( LINK( this, ScChart2DataSequence, ValueListenerHdl ) );
  
@@ -762,13 +767,18 @@
 +
          if( m_pDocument )
          {
-             ULONG nCount = aRanges.Count();
-             for (ULONG i=0; i<nCount; i++)
+-            ULONG nCount = aRanges.Count();
+-            for (ULONG i=0; i<nCount; i++)
 -                m_pDocument->StartListeningArea( *aRanges.GetObject(i), m_pValueListener );
++            ScChartListenerCollection* pCLC = m_pDocument->GetChartListenerCollection();
++            vector<ScSharedTokenRef>::const_iterator itr = m_pTokens->begin(), itrEnd = m_pTokens->end();
++            for (; itr != itrEnd; ++itr)
 +            {
-+                ScRange aRange = *m_xRanges->GetObject(i);    
++                ScRange aRange;
++                if (!ScRefTokenHelper::getRangeFromToken(aRange, *itr))
++                    continue;
++
 +                m_pDocument->StartListeningArea( aRange, m_pValueListener );
-+                ScChartListenerCollection* pCLC = m_pDocument->GetChartListenerCollection();
 +                if (pCLC)
 +                    pCLC->StartListeningHiddenRange(aRange, m_pHiddenListener.get());
 +            }