ooo-build r13955 - in branches/ooo-build-3-0: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Sep 18 22:33:17 2008
New Revision: 13955
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13955&view=rev

Log:
2008-09-18  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-multiline-formula-ref.diff: check for a multi-line
	state only when the cell type is of formula.


Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/calc-multiline-formula-ref.diff

Modified: branches/ooo-build-3-0/patches/dev300/calc-multiline-formula-ref.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/calc-multiline-formula-ref.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/calc-multiline-formula-ref.diff	Thu Sep 18 22:33:17 2008
@@ -386,12 +386,13 @@
 index 18b2bd1..7a3679a 100644
 --- sc/source/filter/xml/xmlexprt.cxx
 +++ sc/source/filter/xml/xmlexprt.cxx
-@@ -2348,7 +2348,7 @@ void ScXMLExport::WriteCell (ScMyCell& aCell)
+@@ -2348,7 +2348,8 @@ void ScXMLExport::WriteCell (ScMyCell& aCell)
  
  	if (!bIsEmpty)
  	{
 -		if ((aCell.nType == table::CellContentType_TEXT) && IsEditCell(aCell))
-+        if ((aCell.nType == table::CellContentType_TEXT && IsEditCell(aCell)) || IsMultiLineFormulaCell(aCell))
++        if ((aCell.nType == table::CellContentType_TEXT && IsEditCell(aCell)) || 
++            (aCell.nType == table::CellContentType_FORMULA && IsMultiLineFormulaCell(aCell)))
  		{
              bEditCell = sal_True;
              uno::Reference<text::XText> xText(xCurrentTableCellRange->getCellByPosition(aCell.aCellAddress.Column, aCell.aCellAddress.Row), uno::UNO_QUERY);