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

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Mar  4 07:23:53 2009
New Revision: 15458
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15458&view=rev

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

	* patches/dev300/chart-odf-always-calc-a1.diff:
	* patches/dev300/chart-skip-hidden-cells-sc.diff: fixed lots of build 
	breakages in sc.  BTW sc still is not buildable yet.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/chart-odf-always-calc-a1.diff
   trunk/patches/dev300/chart-skip-hidden-cells-sc.diff

Modified: trunk/patches/dev300/chart-odf-always-calc-a1.diff
==============================================================================
--- trunk/patches/dev300/chart-odf-always-calc-a1.diff	(original)
+++ trunk/patches/dev300/chart-odf-always-calc-a1.diff	Wed Mar  4 07:23:53 2009
@@ -18,6 +18,14 @@
 index 82d07bc..84a410c 100644
 --- sc/source/core/tool/rangeutl.cxx
 +++ sc/source/core/tool/rangeutl.cxx
+@@ -46,6 +46,7 @@
+ #include "globstr.hrc"
+ #include "convuno.hxx"
+ #include "externalrefmgr.hxx"
++#include "compiler.hxx"
+ 
+ using ::rtl::OUString;
+ using ::rtl::OUStringBuffer;
 @@ -480,6 +480,11 @@ sal_Bool ScRangeStringConverter::GetAddressFromString(
      {
          if ((rAddress.Parse( sToken, const_cast<ScDocument*>(pDocument), eConv ) & SCA_VALID) == SCA_VALID)
@@ -35,26 +43,24 @@
                  aUIString.Erase( 0, 1 );
              bResult = ((rRange.aStart.Parse( aUIString, const_cast<ScDocument*> (pDocument), eConv) & SCA_VALID) == SCA_VALID);
 +#if CHART_ADDRESS_CONV_WORKAROUND
-+            if (!bResult && eConv != eConvUI)
++            if (!bResult && eConv != eConv)
 +                bResult = ((rRange.aStart.Parse(
-+                    aUIString, const_cast<ScDocument*>(pDocument), eConvUI) & SCA_VALID) == SCA_VALID);
++                    aUIString, const_cast<ScDocument*>(pDocument), eConv) & SCA_VALID) == SCA_VALID);
 +#endif
              rRange.aEnd = rRange.aStart;
          }
          else
-@@ -530,6 +540,17 @@ sal_Bool ScRangeStringConverter::GetRangeFromString(
+@@ -530,6 +540,15 @@ sal_Bool ScRangeStringConverter::GetRangeFromString(
                                  eConv) & SCA_VALID) == SCA_VALID) &&
                            ((rRange.aEnd.Parse( aUIString.Copy((xub_StrLen)nIndex+1), const_cast<ScDocument*>(pDocument),
                                  eConv) & SCA_VALID) == SCA_VALID);
 +#if CHART_ADDRESS_CONV_WORKAROUND
-+                if (!bResult && eConv != eConvUI)
++                if (!bResult && eConv != eConv)
 +                {
 +                    bResult = ((rRange.aStart.Parse( aUIString.Copy(0, (xub_StrLen)nIndex), const_cast<ScDocument*>(pDocument),
-+                                    eConvUI) & SCA_VALID) == SCA_VALID) &&
++                                    eConv) & SCA_VALID) == SCA_VALID) &&
 +                              ((rRange.aEnd.Parse( aUIString.Copy((xub_StrLen)nIndex+1), const_cast<ScDocument*>(pDocument),
-+                                    eConvUI) & SCA_VALID) == SCA_VALID);
-+                    String aFoo;
-+                    rRange.Format(aFoo, SCA_VALID, const_cast<ScDocument*>(pDocument));
++                                    eConv) & SCA_VALID) == SCA_VALID);
 +                }
 +#endif
              }
@@ -136,7 +142,7 @@
                  bFirst = false;
              else
 -                aRetStr.appendAscii(";");
-+                aRetStr.appendAscii(aRangeSep);
++                aRetStr.append(aRangeSep);
  
              lcl_appendCellAddress(aRetStr, pDoc, aCell, aExtInfo);
          }

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 07:23:53 2009
@@ -551,6 +551,15 @@
          pHeader->setValues(xSeq);
      }
      if (pHeader)
+@@ -1579,7 +1579,7 @@ ScChart2DataProvider::createDataSource(
+                 auto_ptr< vector<ScSharedTokenRef> > pTokens(new vector<ScSharedTokenRef>);
+                 pTokens->reserve(1);
+                 pTokens->push_back(pHeaderCell);
+-                xLabelSeq.set(new ScChart2DataSequence(m_pDocument, this, pTokens.release()));
++                xLabelSeq.set(new ScChart2DataSequence(m_pDocument, this, pTokens.release(), m_bIncludeHiddenCells));
+                 uno::Reference< beans::XPropertySet > xLabelProps(xLabelSeq, uno::UNO_QUERY);
+                 if (xLabelProps.is())
+                     xLabelProps->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ROLE)), uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("label"))));
 @@ -1582,7 +1596,7 @@ ScChart2DataProvider::createDataSource(
  
          // FIXME: if there are no labels the column or row name should be taken
@@ -560,6 +569,15 @@
  
          pLabeled->setValues(xSeq);
          pLabeled->setLabel(xLabelSeq);
+@@ -2205,7 +2205,7 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL
+     // ScChart2DataSequence manages the life cycle of pRefTokens.
+     vector<ScSharedTokenRef>* pRefTokens = new vector<ScSharedTokenRef>();
+     pRefTokens->swap(aRefTokens);
+-    xResult.set(new ScChart2DataSequence(m_pDocument, this, pRefTokens));
++    xResult.set(new ScChart2DataSequence(m_pDocument, this, pRefTokens, m_bIncludeHiddenCells));
+ 
+     return xResult;
+ }
 @@ -2416,6 +2430,88 @@ void ScChart2DataProvider::detectRangesFromDataSource(vector<ScSharedTokenRef>&
      }
  }