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

From: kyoshida svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r15180 - in trunk: . patches/dev300
Date: Tue, 27 Jan 2009 21:30:06 +0000 (UTC)
Author: kyoshida
Date: Tue Jan 27 21:30:06 2009
New Revision: 15180
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15180&view=rev

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

	* patches/dev300/chart-odf-always-calc-a1-m39.diff:
	* patches/dev300/chart-odf-always-calc-a1.diff:
	* patches/dev300/apply: adjusted for dev300-m40.



Added:
   trunk/patches/dev300/chart-odf-always-calc-a1-m39.diff   (props changed)
      - copied unchanged from r15169, /trunk/patches/dev300/chart-odf-always-calc-a1.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/chart-odf-always-calc-a1.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 27 21:30:06 2009
@@ -1051,9 +1051,15 @@
 # fixed chart wizard failure when the formula syntax is set to Excel A1/R1C1.
 chart-wizard-xls-address-convention-fix.diff, n#411450, i#94696, kohei
 
+[ CalcFixes <= dev300-m39 ]
+# always store ranges in ODF using Calc A1 formula syntax.
+chart-odf-always-calc-a1-m39.diff, n#463305, kohei
+
+[ CalcFixes > dev300-m39 ]
 # always store ranges in ODF using Calc A1 formula syntax.
 chart-odf-always-calc-a1.diff, n#463305, kohei
 
+[ CalcFixes ]
 # fixed change track export to xls files wrt cell change records.
 calc-change-track-xls-export-fix.diff, n#416045, i#93839, kohei
 

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	Tue Jan 27 21:30:06 2009
@@ -1,5 +1,5 @@
 diff --git sc/inc/rangeutl.hxx sc/inc/rangeutl.hxx
-index 8576bbf..66f6cb3 100644
+index 7b5d77b..9657be0 100644
 --- sc/inc/rangeutl.hxx
 +++ sc/inc/rangeutl.hxx
 @@ -38,6 +38,11 @@
@@ -127,7 +127,7 @@
  							sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) );
  };
 diff --git sc/source/core/tool/rangeutl.cxx sc/source/core/tool/rangeutl.cxx
-index 8e873e7..76f6e26 100644
+index 55a18b0..76f6e26 100644
 --- sc/source/core/tool/rangeutl.cxx
 +++ sc/source/core/tool/rangeutl.cxx
 @@ -456,6 +456,7 @@ sal_Bool ScRangeStringConverter::GetAddressFromString(
@@ -327,7 +327,7 @@
  		ScAddress aEndAddress( rRange.aEnd );
  		String sStartAddress;
  		String sEndAddress;
--        ScAddress::Convention eConv = pDocument->GetAddressConvention();
+-        formula::FormulaGrammar::AddressConvention eConv = pDocument->GetAddressConvention();
  		aStartAddress.Format( sStartAddress, nFormatFlags, (ScDocument*) pDocument, eConv );
  		aEndAddress.Format( sEndAddress, nFormatFlags, (ScDocument*) pDocument, eConv );
  		OUString sOUStartAddress( sStartAddress );
@@ -410,10 +410,10 @@
  	rString = sRangeListStr;
  }
 diff --git sc/source/filter/excel/xechart.cxx sc/source/filter/excel/xechart.cxx
-index d986b48..1ddc45e 100644
+index 7e48666..48f1029 100644
 --- sc/source/filter/excel/xechart.cxx
 +++ sc/source/filter/excel/xechart.cxx
-@@ -679,7 +679,8 @@ sal_uInt16 XclExpChSourceLink::ConvertDataSequence( Reference< XDataSequence > x
+@@ -678,7 +678,8 @@ sal_uInt16 XclExpChSourceLink::ConvertDataSequence( Reference< XDataSequence > x
      {
          OUString aRangeRepr = xDataSeq->getSourceRangeRepresentation();
          ScRangeList aScRanges;
@@ -438,7 +438,7 @@
          // create the data sequence
          try
 diff --git sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
-index 9983eb6..def9694 100644
+index 1213a43..a510dba 100644
 --- sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
 +++ sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
 @@ -395,7 +395,7 @@ void ScChangeTrackingExportHelper::WriteFormulaCell(const ScBaseCell* pCell, con
@@ -448,13 +448,13 @@
 -		ScRangeStringConverter::GetStringFromAddress(sAddress, pFormulaCell->aPos, pDoc);
 +		ScRangeStringConverter::GetStringFromAddress(sAddress, pFormulaCell->aPos, pDoc, ScAddress::CONV_OOO);
  		rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CELL_ADDRESS, sAddress);
-         const ScGrammar::Grammar eGrammar = pDoc->GetStorageGrammar();
-         sal_uInt16 nNamespacePrefix = (eGrammar == ScGrammar::GRAM_ODFF ? XML_NAMESPACE_OF : XML_NAMESPACE_OOOC);
+         const formula::FormulaGrammar::Grammar eGrammar = pDoc->GetStorageGrammar();
+         sal_uInt16 nNamespacePrefix = (eGrammar == formula::FormulaGrammar::GRAM_ODFF ? XML_NAMESPACE_OF : XML_NAMESPACE_OOOC);
 diff --git sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
-index 1c386a4..37528b2 100644
+index d48f31d..407df3c 100644
 --- sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
 +++ sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
-@@ -74,7 +74,7 @@ ScBaseCell* ScMyCellInfo::CreateCell(ScDocument* pDoc)
+@@ -88,7 +88,7 @@ ScBaseCell* ScMyCellInfo::CreateCell(ScDocument* pDoc)
  		{
  			ScAddress aPos;
  			sal_Int32 nOffset(0);
@@ -579,18 +579,18 @@
  							ScDBCollection* pDBCollection = pDoc->GetDBCollection();
  							sal_uInt16 nIndex;
 diff --git sc/source/filter/xml/XMLStylesExportHelper.cxx sc/source/filter/xml/XMLStylesExportHelper.cxx
-index 8c2ee06..e314835 100644
+index deb1e33..b9354c3 100644
 --- sc/source/filter/xml/XMLStylesExportHelper.cxx
 +++ sc/source/filter/xml/XMLStylesExportHelper.cxx
 @@ -306,7 +306,7 @@ rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const
- rtl::OUString ScMyValidationsContainer::GetBaseCellAddress(ScDocument* pDoc, const table::CellAddress& aCell)
- {
- 	rtl::OUString sAddress;
--	ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc );
-+	ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc, ScAddress::CONV_OOO );
- 	return sAddress;
- }
- 
+ rtl::OUString ScMyValidationsContainer::GetBaseCellAddress(ScDocument* pDoc, const table::CellAddress& aCell)
+ {
+ 	rtl::OUString sAddress;
+-	ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc );
++	ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc, ScAddress::CONV_OOO );
+ 	return sAddress;
+ }
+ 
 diff --git sc/source/filter/xml/XMLTableShapeImportHelper.cxx sc/source/filter/xml/XMLTableShapeImportHelper.cxx
 index 7f9fb3f..9546914 100644
 --- sc/source/filter/xml/XMLTableShapeImportHelper.cxx
@@ -662,10 +662,10 @@
  					sal_Bool bInsert(sal_True);
  					try
 diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx
-index 8fd5b19..85a5e54 100644
+index 5c7a39a..207b685 100644
 --- sc/source/filter/xml/xmlexprt.cxx
 +++ sc/source/filter/xml/xmlexprt.cxx
-@@ -1422,7 +1422,7 @@ void ScXMLExport::GetColumnRowHeader(sal_Bool& rHasColumnHeader, table::CellRang
+@@ -1423,7 +1423,7 @@ void ScXMLExport::GetColumnRowHeader(sal_Bool& rHasColumnHeader, table::CellRang
  		rRowHeaderRange = xPrintAreas->getTitleRows();
  		rColumnHeaderRange = xPrintAreas->getTitleColumns();
  		uno::Sequence< table::CellRangeAddress > aRangeList( xPrintAreas->getPrintAreas() );
@@ -674,7 +674,7 @@
  	}
  }
  
-@@ -2687,7 +2687,7 @@ void ScXMLExport::WriteShapes(const ScMyCell& rMyCell)
+@@ -2665,7 +2665,7 @@ void ScXMLExport::WriteShapes(const ScMyCell& rMyCell)
  					Rectangle aEndRec(pDoc->GetMMRect(aItr->aEndAddress.Col(), aItr->aEndAddress.Row(),
  						aItr->aEndAddress.Col(), aItr->aEndAddress.Row(), aItr->aEndAddress.Tab()));
  					rtl::OUString sEndAddress;
@@ -683,7 +683,7 @@
  					AddAttribute(XML_NAMESPACE_TABLE, XML_END_CELL_ADDRESS, sEndAddress);
                      if (bNegativePage)
                          aEndPoint.X = -aEndRec.Right();
-@@ -2917,7 +2917,7 @@ void ScXMLExport::WriteDetective( const ScMyCell& rMyCell )
+@@ -2895,7 +2895,7 @@ void ScXMLExport::WriteDetective( const ScMyCell& rMyCell )
  				{
  					if( (aObjItr->eObjType == SC_DETOBJ_ARROW) || (aObjItr->eObjType == SC_DETOBJ_TOOTHERTAB))
  					{
@@ -692,7 +692,7 @@
  						AddAttribute( XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, sString );
  					}
  					ScXMLConverter::GetStringFromDetObjType( sString, aObjItr->eObjType );
-@@ -3308,7 +3308,7 @@ void ScXMLExport::WriteScenario()
+@@ -3286,7 +3286,7 @@ void ScXMLExport::WriteScenario()
  		AddAttribute(XML_NAMESPACE_TABLE, XML_IS_ACTIVE, aBuffer.makeStringAndClear());
  		const ScRangeList* pRangeList = pDoc->GetScenarioRanges(static_cast<SCTAB>(nCurrentTable));
  		rtl::OUString sRangeListStr;
@@ -701,7 +701,7 @@
  		AddAttribute(XML_NAMESPACE_TABLE, XML_SCENARIO_RANGES, sRangeListStr);
  		if (sComment.Len())
  			AddAttribute(XML_NAMESPACE_TABLE, XML_COMMENT, rtl::OUString(sComment));
-@@ -3350,10 +3350,10 @@ void ScXMLExport::WriteLabelRanges( const uno::Reference< container::XIndexAcces
+@@ -3328,10 +3328,10 @@ void ScXMLExport::WriteLabelRanges( const uno::Reference< container::XIndexAcces
  		{
  			OUString sRangeStr;
  			table::CellRangeAddress aCellRange( xRange->getLabelArea() );
@@ -714,7 +714,7 @@
  			AddAttribute( XML_NAMESPACE_TABLE, XML_DATA_CELL_RANGE_ADDRESS, sRangeStr );
  			AddAttribute( XML_NAMESPACE_TABLE, XML_ORIENTATION, bColumn ? XML_COLUMN : XML_ROW );
  			SvXMLElementExport aElem( *this, XML_NAMESPACE_TABLE, XML_LABEL_RANGE, sal_True, sal_True );
-@@ -3394,7 +3394,7 @@ void ScXMLExport::WriteNamedExpressions(const com::sun::star::uno::Reference <co
+@@ -3372,7 +3372,7 @@ void ScXMLExport::WriteNamedExpressions(const com::sun::star::uno::Reference <co
  
  								OUString sOUBaseCellAddress;
  								ScRangeStringConverter::GetStringFromAddress( sOUBaseCellAddress,
@@ -723,7 +723,7 @@
  								AddAttribute(XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, sOUBaseCellAddress);
  
  								sal_uInt16 nRangeIndex;
-@@ -3668,10 +3668,10 @@ void ScXMLExport::WriteConsolidation()
+@@ -3646,10 +3646,10 @@ void ScXMLExport::WriteConsolidation()
  
  			sStrData = OUString();
  			for( sal_Int32 nIndex = 0; nIndex < pCons->nDataAreaCount; ++nIndex )
@@ -736,7 +736,7 @@
  			AddAttribute( XML_NAMESPACE_TABLE, XML_TARGET_CELL_ADDRESS, sStrData );
  
  			if( pCons->bByCol && !pCons->bByRow )
-@@ -3741,7 +3741,7 @@ void ScXMLExport::GetChangeTrackViewSettings(uno::Sequence<beans::PropertyValue>
+@@ -3719,7 +3719,7 @@ void ScXMLExport::GetChangeTrackViewSettings(uno::Sequence<beans::PropertyValue>
  				pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByRanges"));
  				pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Value <<= pViewSettings->HasRange();
  				rtl::OUString sRangeList;
@@ -786,19 +786,19 @@
  			}
  			break;
 diff --git sc/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlimprt.cxx
-index 635b53d..f2ba5bd 100644
+index ef60730..1702bcc 100644
 --- sc/source/filter/xml/xmlimprt.cxx
 +++ sc/source/filter/xml/xmlimprt.cxx
-@@ -2019,7 +2019,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque
- 					if ((rChangeProps[i].Value >>= sRanges) && sRanges.getLength())
- 					{
- 						ScRangeList aRangeList;
--						ScRangeStringConverter::GetRangeListFromString(aRangeList, sRanges, GetDocument());
-+						ScRangeStringConverter::GetRangeListFromString(aRangeList, sRanges, GetDocument(), ScAddress::CONV_OOO);
- 						pViewSettings->SetTheRangeList(aRangeList);
- 					}
- 				}
-@@ -2518,8 +2518,8 @@ void ScXMLImport::SetLabelRanges()
+@@ -2124,7 +2124,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque
+                     if ((rChangeProps[i].Value >>= sRanges) && sRanges.getLength())
+                     {
+                         ScRangeList aRangeList;
+-                        ScRangeStringConverter::GetRangeListFromString(aRangeList, sRanges, GetDocument());
++                        ScRangeStringConverter::GetRangeListFromString(aRangeList, sRanges, GetDocument(), ScAddress::CONV_OOO);
+                         pViewSettings->SetTheRangeList(aRangeList);
+                     }
+                 }
+@@ -2623,8 +2623,8 @@ void ScXMLImport::SetLabelRanges()
                      sal_Int32 nOffset1(0);
                      sal_Int32 nOffset2(0);
  
@@ -809,24 +809,24 @@
                      {
                          if ( (*aItr)->bColumnOrientation )
                              xColRanges->addNew( aLabelRange, aDataRange );
-@@ -2554,7 +2554,7 @@ void ScXMLImport::SetNamedRanges()
- 			    {
- 				    sal_Int32 nOffset(0);
- 				    if (ScRangeStringConverter::GetAddressFromString(
--					    aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), nOffset ))
-+					    aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), ScAddress::CONV_OOO, nOffset ))
+@@ -2659,7 +2659,7 @@ void ScXMLImport::SetNamedRanges()
+                 {
+                     sal_Int32 nOffset(0);
+                     if (ScRangeStringConverter::GetAddressFromString(
+-                        aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), nOffset ))
++                        aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), ScAddress::CONV_OOO, nOffset ))
                      {
                          try
                          {
-@@ -2595,7 +2595,7 @@ void ScXMLImport::SetNamedRanges()
- 			    {
- 				    sal_Int32 nOffset(0);
- 				    if (ScRangeStringConverter::GetAddressFromString(
--					    aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), nOffset ))
-+					    aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), ScAddress::CONV_OOO, nOffset ))
- 				    {
+@@ -2700,7 +2700,7 @@ void ScXMLImport::SetNamedRanges()
+                 {
+                     sal_Int32 nOffset(0);
+                     if (ScRangeStringConverter::GetAddressFromString(
+-                        aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), nOffset ))
++                        aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), ScAddress::CONV_OOO, nOffset ))
+                     {
                          uno::Reference <sheet::XNamedRange> xNamedRange(xNamedRanges->getByName((*aItr)->sName), uno::UNO_QUERY);
- 					    if (xNamedRange.is())
+                         if (xNamedRange.is())
 diff --git sc/source/filter/xml/xmlsceni.cxx sc/source/filter/xml/xmlsceni.cxx
 index 525c6de..fe17351 100644
 --- sc/source/filter/xml/xmlsceni.cxx
@@ -854,10 +854,10 @@
  					ScUnoConversion::FillApiAddress( aOutputPosition, aScRange.aStart );
  					bCopyOutputData = sal_True;
 diff --git sc/source/filter/xml/xmlstyle.cxx sc/source/filter/xml/xmlstyle.cxx
-index 6ef1632..2d51ccc 100644
+index 99550dd..b3af684 100644
 --- sc/source/filter/xml/xmlstyle.cxx
 +++ sc/source/filter/xml/xmlstyle.cxx
-@@ -708,8 +708,9 @@ void ScXMLAutoStylePoolP::exportStyleContent(
+@@ -707,8 +707,9 @@ void ScXMLAutoStylePoolP::exportStyleContent(
  											    rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_CONDITION, sCondition);
                                                  rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_APPLY_STYLE_NAME, rScXMLExport.EncodeStyleName( sStyleName ));
  											    OUString sOUBaseAddress;
@@ -868,7 +868,7 @@
  											    rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_BASE_CELL_ADDRESS, sOUBaseAddress);
  											    SvXMLElementExport aMElem(rScXMLExport, XML_NAMESPACE_STYLE, XML_MAP, sal_True, sal_True);
  										    }
-@@ -762,7 +763,7 @@ void ScXMLAutoStylePoolP::exportStyleContent(
+@@ -761,7 +762,7 @@ void ScXMLAutoStylePoolP::exportStyleContent(
  											    rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_APPLY_STYLE_NAME, rScXMLExport.EncodeStyleName( sStyleName ));
  											    OUString sOUBaseAddress;
  											    ScRangeStringConverter::GetStringFromAddress( sOUBaseAddress,
@@ -1019,10 +1019,10 @@
      sal_Int32 nOffset = 0;
      while( nOffset >= 0 )
 diff --git sc/source/ui/unoobj/docuno.cxx sc/source/ui/unoobj/docuno.cxx
-index 7a49274..6717cd6 100644
+index 25eef4b..f521d81 100644
 --- sc/source/ui/unoobj/docuno.cxx
 +++ sc/source/ui/unoobj/docuno.cxx
-@@ -2268,7 +2268,8 @@ uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj:
+@@ -2185,7 +2185,8 @@ uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj:
      uno::Sequence < uno::Reference < table::XCellRange > > xRet;
  
  	ScRangeList aRangeList;
@@ -1033,10 +1033,10 @@
  	    sal_Int32 nCount = aRangeList.Count();
          if (nCount)
 diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx
-index 82ab33f..abc3a87 100644
+index edf4c95..e820f10 100644
 --- sc/source/ui/view/tabview3.cxx
 +++ sc/source/ui/view/tabview3.cxx
-@@ -2236,8 +2236,9 @@ void ScTabView::DoChartSelection(
+@@ -2211,8 +2211,9 @@ void ScTabView::DoChartSelection(
      {
          Color aSelColor( rHilightRanges[i].PreferredColor );
          ScRangeList aRangeList;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]