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

From: kyoshida svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r15402 - in trunk: . patches/dev300
Date: Tue, 24 Feb 2009 05:42:14 +0000 (UTC)
Author: kyoshida
Date: Tue Feb 24 05:42:13 2009
New Revision: 15402
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15402&view=rev

Log:
2009-02-24  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-formula-asian-phonetic.diff:
	* patches/dev300/calc-multiline-formula-ref.diff: fixed build 
	breakages.  BTW the sc module still doesn't build.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/calc-formula-asian-phonetic.diff
   trunk/patches/dev300/calc-multiline-formula-ref.diff

Modified: trunk/patches/dev300/calc-formula-asian-phonetic.diff
==============================================================================
--- trunk/patches/dev300/calc-formula-asian-phonetic.diff	(original)
+++ trunk/patches/dev300/calc-formula-asian-phonetic.diff	Tue Feb 24 05:42:13 2009
@@ -1,62 +1,5 @@
-diff --git formula/inc/formula/compiler.hrc formula/inc/formula/compiler.hrc
-index 8c402c2..9aea242 100644
---- formula/inc/formula/compiler.hrc
-+++ formula/inc/formula/compiler.hrc
-@@ -193,7 +193,8 @@
- #define SC_OPCODE_UNICODE           155
- #define SC_OPCODE_UNICHAR           156
- #define SC_OPCODE_GAMMA             157
--#define SC_OPCODE_STOP_1_PAR        158
-+#define SC_OPCODE_PHONETIC          158
-+#define SC_OPCODE_STOP_1_PAR        159
- 
- /*** Functions with more than one parameters ***/
- #define SC_OPCODE_START_2_PAR       201
-diff --git formula/inc/formula/opcode.hxx formula/inc/formula/opcode.hxx
-index 4b93aab..6171a59 100644
---- formula/inc/formula/opcode.hxx
-+++ formula/inc/formula/opcode.hxx
-@@ -186,6 +186,7 @@ enum OpCodeEnum
-         ocAsc               = SC_OPCODE_ASC,
-         ocUnicode           = SC_OPCODE_UNICODE,
-         ocUnichar           = SC_OPCODE_UNICHAR,
-+        ocPhonetic          = SC_OPCODE_PHONETIC,
- 	// Functions with more than one parameters
- 		ocArcTan2			= SC_OPCODE_ARC_TAN_2,
- 		ocCeil				= SC_OPCODE_CEIL,
-diff --git formula/source/core/resource/core_resource.src formula/source/core/resource/core_resource.src
-index b1b79a5..0aa767c 100644
---- formula/source/core/resource/core_resource.src
-+++ formula/source/core/resource/core_resource.src
-@@ -337,6 +337,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
- 	String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; };
-     String SC_OPCODE_INFO { Text = "INFO" ; };
-     String SC_OPCODE_BAHTTEXT { Text = "COM.MICROSOFT.BAHTTEXT" ; };
-+    String SC_OPCODE_PHONETIC { Text = "PHONETIC" ; };
-     String SC_OPCODE_GET_PIVOT_DATA { Text = "GETPIVOTDATA" ; };
- 	String SC_OPCODE_EUROCONVERT { Text = "EUROCONVERT" ; };
- 	String SC_OPCODE_NUMBERVALUE { Text = "NUMBERVALUE" ; };
-@@ -661,6 +662,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
- 	String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; };
-     String SC_OPCODE_INFO { Text = "INFO" ; };
-     String SC_OPCODE_BAHTTEXT { Text = "BAHTTEXT" ; };
-+    String SC_OPCODE_PHONETIC { Text = "PHONETIC" ; };
-     String SC_OPCODE_GET_PIVOT_DATA { Text = "GETPIVOTDATA" ; };
- 	String SC_OPCODE_EUROCONVERT { Text = "EUROCONVERT" ; };
- 	String SC_OPCODE_NUMBERVALUE { Text = "NUMBERVALUE" ; };
-@@ -1815,6 +1817,10 @@ Resource RID_STRLIST_FUNCTION_NAMES
-     {
-         Text [ en-US ] = "BAHTTEXT";
-     };
-+    String SC_OPCODE_PHONETIC
-+    {
-+        Text [ en-US ] = "PHONETIC";
-+    };
-     String SC_OPCODE_GET_PIVOT_DATA
-     {
-         Text [ en-US ] = "GETPIVOTDATA";
 diff --git sc/inc/cell.hxx sc/inc/cell.hxx
-index 9124b81..87bb8cb 100644
+index 5b95f8f..d240861 100644
 --- sc/inc/cell.hxx
 +++ sc/inc/cell.hxx
 @@ -43,6 +43,7 @@
@@ -75,7 +18,7 @@
  
  class ScMultipleReadHeader;
  class ScMultipleWriteHeader;
-@@ -246,12 +246,77 @@ public:
+@@ -250,12 +252,64 @@ public:
      inline void		GetString( String& rString ) const { rString = maString; }
  	inline const String& GetString() const { return maString; }
  
@@ -115,25 +58,12 @@
 +
 +    /**
 +     * A constructor of ScAsianStringCell
-+     * @param rAsianStringCell a reference of ScAsianStringCell.
-+     * @param pDoc a pointer of ScDocument.
-+     */
-+    ScAsianStringCell( const ScAsianStringCell& rScAsianStringCell, ScDocument* pDoc );
-+
-+    /**
-+     * A constructor of ScAsianStringCell
 +     * @param rStream a reference of SvStream.
 +     * @param nVer the number of vesion.
 +     */
 +    ScAsianStringCell( SvStream& rStream, USHORT nVer );
 +
 +    /**
-+     * Creates a new ScAsianStringCell.
-+     * @return a pointer of the ScBaseCell.
-+     */
-+    ScBaseCell*     Clone(ScDocument* pDoc) const;
-+
-+    /**
 +     * Sets ScPhonetic:
 +     * @param rPhonetic a reference of ScPhonetic.
 +     */
@@ -153,7 +83,7 @@
  class SC_DLLPUBLIC ScEditCell : public ScBaseCell
  {
  private:
-@@ -206,6 +271,8 @@ public:
+@@ -288,6 +359,8 @@ public:
  	void			GetData( const EditTextObject*& rpObject ) const;
  	void			GetString( String& rString ) const;
  
@@ -162,9 +92,9 @@
  	const EditTextObject* GetData() const	{ return pData; }
  
      /** Removes character attribute based on new pattern attributes. */
-@@ -258,6 +325,73 @@ private:
+@@ -340,6 +413,60 @@ private:
  
- // ----------------------------------------------------------------------------
+ // ============================================================================
  
 +
 +/**
@@ -187,18 +117,11 @@
 +
 +    /**
 +     * A constructor of ScAsianEditCell
-+     * @param rEditCell a reference of SCAsianEditCell.
-+     * @param pDoc a pointer of ScDocument.
-+     */
-+    ScAsianEditCell( const ScAsianEditCell& rEditCell, ScDocument* pDoc );
-+
-+    /**
-+     * A constructor of ScAsianEditCell
 +     * @param rEditCell a reference of ScEditCell.
 +     * @param pDoc a pointer of ScDocument.
 +     * @param rPhonetic a reference of ScPhonetic.
 +     */
-+    ScAsianEditCell( const ScEditCell& rEditCell, ScDocument *pDoc, const ScPhonetic& rPhonetic );
++    ScAsianEditCell( const ScEditCell& rEditCell, ScDocument& rDoc, const ScPhonetic& rPhonetic );
 +
 +    /**
 +     * A constructor of ScAsianEditCell
@@ -211,12 +134,6 @@
 +                     const SfxItemPool* pFromPool, const ScPhonetic& rPhonetic );
 +
 +    /**
-+     * Creates a new ScAsianStringCell.
-+     * @return a pointer of the ScBaseCell.
-+     */
-+    ScBaseCell*     Clone(ScDocument* pDoc) const;
-+
-+    /**
 +     * Sets ScPhonetic:
 +     * @param rPhonetic a reference of ScPhonetic.
 +     */
@@ -236,7 +153,7 @@
  enum ScMatrixMode {
      MM_NONE      = 0,                   // No matrix formula
      MM_FORMULA   = 1,                   // Upper left matrix formula cell
-@@ -611,5 +611,89 @@ public:
+@@ -553,5 +693,67 @@ public:
  
  // ============================================================================
  
@@ -251,23 +168,12 @@
 +{
 +}
 +
-+inline ScAsianStringCell::ScAsianStringCell( const ScAsianStringCell& rScAsianStringCell, ScDocument* pDoc ) :
-+    ScStringCell( rScAsianStringCell, pDoc ),
-+    aPhonetic ( rScAsianStringCell.aPhonetic )
-+{
-+}
-+
 +inline ScAsianStringCell::ScAsianStringCell( const String& rString, const ScPhonetic& rPhonetic ) :
 +    ScStringCell ( rString ),
 +    aPhonetic ( rPhonetic )
 +{
 +}
 +
-+inline ScBaseCell* ScAsianStringCell::Clone(ScDocument* pDoc) const
-+{
-+    return new ScAsianStringCell(*this, pDoc);
-+}
-+
 +inline void ScAsianStringCell::GetPhonetic( ScPhonetic& rPhonetic ) const
 +{
 +    rPhonetic = aPhonetic;
@@ -285,14 +191,8 @@
 +
 +//      ScAsianEditCell
 +
-+inline ScAsianEditCell::ScAsianEditCell( const ScAsianEditCell& rEditCell, ScDocument* pDocP) :
-+    ScEditCell( (const ScEditCell&)rEditCell, pDocP ),
-+    aPhonetic( rEditCell.aPhonetic )
-+{
-+}
-+
-+inline ScAsianEditCell::ScAsianEditCell( const ScEditCell& rEditCell, ScDocument* pDocP, const ScPhonetic& rPhonetic ) :
-+    ScEditCell( rEditCell, pDocP ),
++inline ScAsianEditCell::ScAsianEditCell( const ScEditCell& rEditCell, ScDocument& rDoc, const ScPhonetic& rPhonetic ) :
++    ScEditCell( rEditCell, rDoc ),
 +    aPhonetic( rPhonetic )
 +{
 +}
@@ -304,11 +204,6 @@
 +{
 +}
 +
-+inline ScBaseCell* ScAsianEditCell::Clone(ScDocument* pDocP) const
-+{
-+    return new ScAsianEditCell(*this, pDocP);
-+}
-+
 +inline void ScAsianEditCell::GetPhonetic( ScPhonetic& rPhonetic ) const
 +{
 +    rPhonetic = aPhonetic;
@@ -327,10 +222,10 @@
  #endif
  
 diff --git sc/inc/cellsuno.hxx sc/inc/cellsuno.hxx
-index 376e758..17b226d 100644
+index b48590f..ed38458 100644
 --- sc/inc/cellsuno.hxx
 +++ sc/inc/cellsuno.hxx
-@@ -981,6 +981,14 @@ public:
+@@ -984,6 +984,14 @@ public:
  
  	static String		GetInputString_Impl(ScDocument* pDoc, const ScAddress& aPos, BOOL bEnglish);
  	static String		GetOutputString_Impl(ScDocument* pDoc, const ScAddress& aPos);
@@ -347,7 +242,7 @@
  
 diff --git sc/inc/phonetic.hxx sc/inc/phonetic.hxx
 new file mode 100644
-index 0000000..9a369d8
+index 0000000..3d7d542
 --- /dev/null
 +++ sc/inc/phonetic.hxx
 @@ -0,0 +1,107 @@
@@ -468,7 +363,7 @@
  #define HID_FUNC_NUMBERVALUE        (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+33)
 +#define HID_FUNC_PHONETIC           (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+34)
 diff --git sc/source/core/data/cell.cxx sc/source/core/data/cell.cxx
-index 4796477..084a3a0 100644
+index abe319f..f26401e 100644
 --- sc/source/core/data/cell.cxx
 +++ sc/source/core/data/cell.cxx
 @@ -76,10 +76,14 @@ const USHORT nMemPoolValueCell = (0x8000 - 64) / sizeof(ScValueCell);
@@ -485,8 +380,8 @@
 +IMPL_FIXEDMEMPOOL_NEWDEL( ScAsianEditCell, nMemPoolAsianEditCell, nMemPoolAsianEditCell )
  #endif
  
- // -----------------------------------------------------------------------
-@@ -478,19 +482,31 @@ BOOL ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 )
+ // ============================================================================
+@@ -512,19 +516,31 @@ BOOL ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 )
  			return ( ((const ScValueCell*)pCell1)->GetValue() ==
  					 ((const ScValueCell*)pCell2)->GetValue() );
  		case CELLTYPE_STRING:		// String oder Edit
@@ -532,10 +427,10 @@
  			{
  				//!	eingefuegte Zeilen / Spalten beruecksichtigen !!!!!
 diff --git sc/source/core/data/cell2.cxx sc/source/core/data/cell2.cxx
-index af14bfc..2e4bda5 100644
+index 7e29ed7..ddd2bef 100644
 --- sc/source/core/data/cell2.cxx
 +++ sc/source/core/data/cell2.cxx
-@@ -145,6 +145,11 @@ void ScEditCell::GetString( String& rString ) const
+@@ -140,6 +140,11 @@ void ScEditCell::GetString( String& rString ) const
          rString.Erase();
  }
  
@@ -548,7 +443,7 @@
  {
      const struct {
 diff --git sc/source/core/data/makefile.mk sc/source/core/data/makefile.mk
-index 3836d4c..3b8c7c4 100644
+index 63b1f73..bd0ded7 100644
 --- sc/source/core/data/makefile.mk
 +++ sc/source/core/data/makefile.mk
 @@ -97,6 +97,7 @@ SLOFILES =  \
@@ -658,10 +553,10 @@
  void ScAnswer();
  void ScTTT();
 diff --git sc/source/core/tool/interpr2.cxx sc/source/core/tool/interpr2.cxx
-index 44f1668..550f43b 100644
+index e27c631..3fa563f 100644
 --- sc/source/core/tool/interpr2.cxx
 +++ sc/source/core/tool/interpr2.cxx
-@@ -2853,6 +2853,76 @@ void ScInterpreter::ScBahtText()
+@@ -2848,6 +2848,76 @@ void ScInterpreter::ScBahtText()
  
  // ============================================================================
  
@@ -739,10 +634,10 @@
  {
      RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "Eike Rathke sun com", "ScInterpreter::ScGetPivotData" );
 diff --git sc/source/core/tool/interpr4.cxx sc/source/core/tool/interpr4.cxx
-index 665e4da..a5c7de8 100644
+index ccc2b01..baa5152 100644
 --- sc/source/core/tool/interpr4.cxx
 +++ sc/source/core/tool/interpr4.cxx
-@@ -359,6 +359,189 @@ void ScInterpreter::GetCellString( String& rStr, const ScBaseCell* pCell )
+@@ -360,6 +360,189 @@ void ScInterpreter::GetCellString( String& rStr, const ScBaseCell* pCell )
      SetError(nErr);
  }
  
@@ -932,7 +827,7 @@
  
  BOOL ScInterpreter::CreateDoubleArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                              SCCOL nCol2, SCROW nRow2, SCTAB nTab2, BYTE* pCellArr)
-@@ -3870,6 +4053,7 @@ StackVar ScInterpreter::Interpret()
+@@ -3864,6 +4047,7 @@ StackVar ScInterpreter::Interpret()
                  case ocInfo             : ScInfo();                     break;
                  case ocHyperLink        : ScHyperLink();                break;
                  case ocBahtText         : ScBahtText();                 break;
@@ -1644,7 +1539,7 @@
  		$(SLO)$/xmllabri.obj \
  		$(SLO)$/XMLTableHeaderFooterContext.obj \
 diff --git sc/source/filter/xml/xmlcelli.cxx sc/source/filter/xml/xmlcelli.cxx
-index 7801505..5973a34 100644
+index 45ca0c3..0c08fd6 100644
 --- sc/source/filter/xml/xmlcelli.cxx
 +++ sc/source/filter/xml/xmlcelli.cxx
 @@ -38,6 +38,7 @@
@@ -1655,7 +1550,7 @@
  #include "global.hxx"
  #include "document.hxx"
  #include "cellsuno.hxx"
-@@ -445,6 +446,12 @@ SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( USHORT nPrefix
+@@ -447,6 +448,12 @@ SvXMLImportContext *ScXMLTableRowCellContext::CreateChildContext( USHORT nPrefix
  				rXMLImport, nPrefix, rLName, xAttrList, pCellRangeSource );
  		}
  		break;
@@ -1668,7 +1563,7 @@
  	}
  
  	if (!pContext && !bTextP)
-@@ -741,6 +748,82 @@ bool lcl_IsEmptyOrNote( ScDocument* pDoc, const table::CellAddress& rCurrentPos
+@@ -726,6 +733,82 @@ bool lcl_IsEmptyOrNote( ScDocument* pDoc, const table::CellAddress& rCurrentPos
      return ( !pCell || pCell->GetCellType() == CELLTYPE_NOTE );
  }
  
@@ -1751,7 +1646,7 @@
  void ScXMLTableRowCellContext::EndElement()
  {
  	if (!bHasSubTable)
-@@ -911,11 +994,11 @@ void ScXMLTableRowCellContext::EndElement()
+@@ -896,11 +979,11 @@ void ScXMLTableRowCellContext::EndElement()
                                                  ScBaseCell* pNewCell = NULL;
                                                  ScDocument* pDoc = rXMLImport.GetDocument();
                                                  if (pOUTextValue && pOUTextValue->getLength())
@@ -1766,7 +1661,7 @@
  
                                                  bDoIncrement = pNewCell != NULL;
                                                  if ( bDoIncrement )
-@@ -1002,6 +1085,18 @@ void ScXMLTableRowCellContext::EndElement()
+@@ -987,6 +1070,18 @@ void ScXMLTableRowCellContext::EndElement()
  					}
  					else
  					{
@@ -1779,13 +1674,13 @@
 +                            PhoneticPortionVec xPortions;
 +                            sal_uInt16 aKanaType = lcl_GetKanaType ( pOUPhoneticText );
 +                            ScPhonetic aPhonetic ( 0, 0x30 | aKanaType , 0, *pOUPhoneticText, xPortions );
-+                            ScBaseCell *pNewCell = new ScAsianEditCell( (const ScEditCell&) *pBaseCell, pDoc, aPhonetic );
++                            ScBaseCell *pNewCell = new ScAsianEditCell( (const ScEditCell&) *pBaseCell, *pDoc, aPhonetic );
 +                            pDoc->PutCell( aScAddress, pNewCell );
 +                        }
                          // #i56027# If the child context put formatted text into the cell,
                          // bIsEmpty is TRUE and ProgressBarIncrement has to be called
                          // with bEditCell = TRUE.
-@@ -1106,3 +1201,9 @@ void ScXMLTableRowCellContext::EndElement()
+@@ -1091,3 +1186,9 @@ void ScXMLTableRowCellContext::EndElement()
  	nMergedRows = 1;
  	nCellsRepeated = 1;
  }
@@ -1796,7 +1691,7 @@
 +}
 +
 diff --git sc/source/filter/xml/xmlcelli.hxx sc/source/filter/xml/xmlcelli.hxx
-index 46dfdd9..80fda8f 100644
+index 960a317..c643ba8 100644
 --- sc/source/filter/xml/xmlcelli.hxx
 +++ sc/source/filter/xml/xmlcelli.hxx
 @@ -71,6 +71,7 @@ class ScXMLTableRowCellContext : public SvXMLImportContext
@@ -1822,10 +1717,10 @@
  
  #endif
 diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx
-index 207b685..8b6c0cf 100644
+index d5088ae..cd2d911 100644
 --- sc/source/filter/xml/xmlexprt.cxx
 +++ sc/source/filter/xml/xmlexprt.cxx
-@@ -2333,11 +2333,27 @@ sal_Bool ScXMLExport::GetCellText (ScMyCell& rMyCell, const ScAddress& aPos) con
+@@ -2295,11 +2295,27 @@ sal_Bool ScXMLExport::GetCellText (ScMyCell& rMyCell, const ScAddress& aPos) con
  //		{
              rMyCell.sStringValue = ScCellObj::GetOutputString_Impl(pDoc, aPos);
  			rMyCell.bHasStringValue = sal_True;
@@ -1853,7 +1748,7 @@
  void ScXMLExport::WriteCell (ScMyCell& aCell)
  {
      ScAddress aCellPos;
-@@ -2481,13 +2497,20 @@ void ScXMLExport::WriteCell (ScMyCell& aCell)
+@@ -2443,13 +2459,20 @@ void ScXMLExport::WriteCell (ScMyCell& aCell)
              uno::Reference<text::XText> xText(xCurrentTableCellRange->getCellByPosition(aCell.aCellAddress.Column, aCell.aCellAddress.Row), uno::UNO_QUERY);
  			if ( xText.is())
  				GetTextParagraphExport()->exportText(xText, sal_False, sal_False);
@@ -1876,10 +1771,10 @@
  	}
  	WriteShapes(aCell);
 diff --git sc/source/filter/xml/xmlexprt.hxx sc/source/filter/xml/xmlexprt.hxx
-index 7d55e81..a15a3ab 100644
+index 5bd2db4..d98151c 100644
 --- sc/source/filter/xml/xmlexprt.hxx
 +++ sc/source/filter/xml/xmlexprt.hxx
-@@ -186,6 +186,12 @@ class ScXMLExport : public SvXMLExport
+@@ -185,6 +185,12 @@ class ScXMLExport : public SvXMLExport
  	void ExportShape(const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape, com::sun::star::awt::Point* pPoint);
  	void WriteShapes(const ScMyCell& rMyCell);
  	void WriteTableShapes();
@@ -1893,10 +1788,10 @@
  
  	sal_Bool IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2) const;
 diff --git sc/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlimprt.cxx
-index 1702bcc..4cff9f1 100644
+index d424b8f..b9eee05 100644
 --- sc/source/filter/xml/xmlimprt.cxx
 +++ sc/source/filter/xml/xmlimprt.cxx
-@@ -811,6 +811,55 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTokenMap()
+@@ -812,6 +812,55 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTokenMap()
      return *pTableRowCellElemTokenMap;
  }
  
@@ -1952,7 +1847,7 @@
  const SvXMLTokenMap& ScXMLImport::GetTableAnnotationAttrTokenMap()
  {
      if( !pTableAnnotationAttrTokenMap )
-@@ -1642,6 +1685,9 @@ ScXMLImport::ScXMLImport(
+@@ -1643,6 +1692,9 @@ ScXMLImport::ScXMLImport(
  	pTableRowElemTokenMap( 0 ),
  	pTableRowAttrTokenMap( 0 ),
  	pTableRowCellElemTokenMap( 0 ),
@@ -1962,7 +1857,7 @@
  	pTableRowCellAttrTokenMap( 0 ),
  	pTableAnnotationAttrTokenMap( 0 ),
  	pDetectiveElemTokenMap( 0 ),
-@@ -1766,6 +1812,9 @@ ScXMLImport::~ScXMLImport() throw()
+@@ -1766,6 +1818,9 @@ ScXMLImport::~ScXMLImport() throw()
      delete pTableRowElemTokenMap;
      delete pTableRowAttrTokenMap;
      delete pTableRowCellElemTokenMap;
@@ -1973,7 +1868,7 @@
      delete pTableAnnotationAttrTokenMap;
      delete pDetectiveElemTokenMap;
 diff --git sc/source/filter/xml/xmlimprt.hxx sc/source/filter/xml/xmlimprt.hxx
-index 2219b0a..30ef849 100644
+index 7239222..093846a 100644
 --- sc/source/filter/xml/xmlimprt.hxx
 +++ sc/source/filter/xml/xmlimprt.hxx
 @@ -248,7 +248,25 @@ enum ScXMLTableRowCellTokens
@@ -2003,7 +1898,7 @@
  };
  
  enum ScXMLTableRowCellAttrTokens
-@@ -690,6 +708,9 @@ class ScXMLImport: public SvXMLImport
+@@ -689,6 +707,9 @@ class ScXMLImport: public SvXMLImport
  	SvXMLTokenMap			*pTableRowElemTokenMap;
  	SvXMLTokenMap			*pTableRowAttrTokenMap;
  	SvXMLTokenMap			*pTableRowCellElemTokenMap;
@@ -2013,7 +1908,7 @@
  	SvXMLTokenMap			*pTableRowCellAttrTokenMap;
  	SvXMLTokenMap			*pTableAnnotationAttrTokenMap;
  	SvXMLTokenMap			*pDetectiveElemTokenMap;
-@@ -854,6 +875,9 @@ public:
+@@ -852,6 +873,9 @@ public:
  	const SvXMLTokenMap& GetTableRowElemTokenMap();
  	const SvXMLTokenMap& GetTableRowAttrTokenMap();
  	const SvXMLTokenMap& GetTableRowCellElemTokenMap();
@@ -2434,7 +2329,7 @@
 +
 +#endif
 diff --git sc/source/filter/xml/xmlstyle.cxx sc/source/filter/xml/xmlstyle.cxx
-index b3af684..2d51ccc 100644
+index d12b7a2..555962d 100644
 --- sc/source/filter/xml/xmlstyle.cxx
 +++ sc/source/filter/xml/xmlstyle.cxx
 @@ -140,6 +140,7 @@ const XMLPropertyMapEntry aXMLScRowStylesImportProperties[] =
@@ -2713,10 +2608,10 @@
  	Resource SC_OPCODE_CODE
  	{
 diff --git sc/source/ui/unoobj/cellsuno.cxx sc/source/ui/unoobj/cellsuno.cxx
-index c33166a..79d5e40 100644
+index 353c2c3..c2eb810 100644
 --- sc/source/ui/unoobj/cellsuno.cxx
 +++ sc/source/ui/unoobj/cellsuno.cxx
-@@ -6253,6 +6253,32 @@ String ScCellObj::GetOutputString_Impl(ScDocument* pDoc, const ScAddress& aCellP
+@@ -6258,6 +6258,32 @@ String ScCellObj::GetOutputString_Impl(ScDocument* pDoc, const ScAddress& aCellP
  	return aVal;
  }
  

Modified: trunk/patches/dev300/calc-multiline-formula-ref.diff
==============================================================================
--- trunk/patches/dev300/calc-multiline-formula-ref.diff	(original)
+++ trunk/patches/dev300/calc-multiline-formula-ref.diff	Tue Feb 24 05:42:13 2009
@@ -242,9 +242,9 @@
                      if (aString.Len() > 0)
 -                        pNew = new ScStringCell( aString );
 +                    {
-+                        if ( pForm->IsMultilineResult() )
++                        if ( rForm.IsMultilineResult() )
 +                        {
-+                            pNew = new ScEditCell( aString, pDestDoc );
++                            pNew = new ScEditCell( aString, &rDestDoc );
 +                        }
 +                        else
 +                        {
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]