ooo-build r14724 - in trunk: . patches/dev300
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14724 - in trunk: . patches/dev300
- Date: Wed, 3 Dec 2008 19:33:33 +0000 (UTC)
Author: kyoshida
Date: Wed Dec 3 19:33:33 2008
New Revision: 14724
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14724&view=rev
Log:
2008-12-03 Kohei Yoshida <kyoshida novell com>
* patches/dev300/calc-formula-asian-phonetic.diff: failed to apply
again... fixed.
Modified:
trunk/ChangeLog
trunk/patches/dev300/calc-formula-asian-phonetic.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 Wed Dec 3 19:33:33 2008
@@ -1,5 +1,5 @@
diff --git sc/inc/cell.hxx sc/inc/cell.hxx
-index a5aa3cf..816104c 100644
+index 9dcf5d7..0328c25 100644
--- sc/inc/cell.hxx
+++ sc/inc/cell.hxx
@@ -43,6 +43,7 @@
@@ -430,7 +430,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 c330826..df5e777 100644
+index 21c35f8..c1a7317 100644
--- sc/source/core/data/cell.cxx
+++ sc/source/core/data/cell.cxx
@@ -75,10 +75,14 @@ const USHORT nMemPoolValueCell = (0x8000 - 64) / sizeof(ScValueCell);
@@ -494,7 +494,7 @@
{
//! eingefuegte Zeilen / Spalten beruecksichtigen !!!!!
diff --git sc/source/core/data/cell2.cxx sc/source/core/data/cell2.cxx
-index f770a60..91dd93a 100644
+index 23ea97f..d68124b 100644
--- sc/source/core/data/cell2.cxx
+++ sc/source/core/data/cell2.cxx
@@ -143,6 +143,11 @@ void ScEditCell::GetString( String& rString ) const
@@ -600,10 +600,10 @@
+}
+
diff --git sc/source/core/inc/interpre.hxx sc/source/core/inc/interpre.hxx
-index f9c5df5..ae73a6f 100644
+index c95063e..05bae1c 100644
--- sc/source/core/inc/interpre.hxx
+++ sc/source/core/inc/interpre.hxx
-@@ -179,6 +179,7 @@ double GetValueCellValue( const ScAddress&, const ScValueCell* );
+@@ -190,6 +190,7 @@ double GetValueCellValue( const ScAddress&, const ScValueCell* );
ScBaseCell* GetCell( const ScAddress& rPos )
{ return pDok->GetCell( rPos ); }
void GetCellString( String& rStr, const ScBaseCell* pCell );
@@ -611,7 +611,7 @@
inline USHORT GetCellErrCode( const ScBaseCell* pCell )
{ return pCell ? pCell->GetErrorCode() : 0; }
inline CellType GetCellType( const ScBaseCell* pCell )
-@@ -508,6 +509,7 @@ void ScExternalRef();
+@@ -519,6 +520,7 @@ void ScExternalRef();
void ScGetPivotData();
void ScHyperLink();
void ScBahtText();
@@ -651,10 +651,10 @@
String SC_OPCODE_EUROCONVERT { Text = "EUROCONVERT" ; };
String SC_OPCODE_NUMBERVALUE { Text = "NUMBERVALUE" ; };
diff --git sc/source/core/tool/interpr2.cxx sc/source/core/tool/interpr2.cxx
-index 17ee3a4..30bf04b 100644
+index 9d75e1b..a11e2a6 100644
--- sc/source/core/tool/interpr2.cxx
+++ sc/source/core/tool/interpr2.cxx
-@@ -2667,6 +2667,76 @@ void ScInterpreter::ScBahtText()
+@@ -2668,6 +2668,76 @@ void ScInterpreter::ScBahtText()
// ============================================================================
@@ -732,10 +732,10 @@
{
BYTE nParamCount = GetByte();
diff --git sc/source/core/tool/interpr4.cxx sc/source/core/tool/interpr4.cxx
-index 9350576..64359c8 100644
+index 811b9da..893eb7a 100644
--- sc/source/core/tool/interpr4.cxx
+++ sc/source/core/tool/interpr4.cxx
-@@ -341,6 +341,189 @@ void ScInterpreter::GetCellString( String& rStr, const ScBaseCell* pCell )
+@@ -349,6 +349,189 @@ void ScInterpreter::GetCellString( String& rStr, const ScBaseCell* pCell )
SetError(nErr);
}
@@ -925,7 +925,7 @@
BOOL ScInterpreter::CreateDoubleArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2, BYTE* pCellArr)
-@@ -3779,6 +3962,7 @@ StackVar ScInterpreter::Interpret()
+@@ -3787,6 +3970,7 @@ StackVar ScInterpreter::Interpret()
case ocInfo : ScInfo(); break;
case ocHyperLink : ScHyperLink(); break;
case ocBahtText : ScBahtText(); break;
@@ -934,10 +934,10 @@
case ocJis : ScJis(); break;
case ocAsc : ScAsc(); break;
diff --git sc/source/filter/excel/xehelper.cxx sc/source/filter/excel/xehelper.cxx
-index 37bab79..6159835 100644
+index f27907e..48eeb94 100644
--- sc/source/filter/excel/xehelper.cxx
+++ sc/source/filter/excel/xehelper.cxx
-@@ -587,7 +587,16 @@ XclExpStringRef XclExpStringHelper::CreateCellString(
+@@ -600,7 +600,16 @@ XclExpStringRef XclExpStringHelper::CreateCellString(
{
String aCellText;
rStringCell.GetString( aCellText );
@@ -955,7 +955,7 @@
}
XclExpStringRef XclExpStringHelper::CreateCellString(
-@@ -618,6 +627,15 @@ XclExpStringRef XclExpStringHelper::CreateCellString(
+@@ -631,6 +640,15 @@ XclExpStringRef XclExpStringHelper::CreateCellString(
rEditCell.GetString( aCellText );
xString = lclCreateFormattedString( rRoot, aCellText, pCellAttr, nFlags, nMaxLen );
}
@@ -972,10 +972,10 @@
}
diff --git sc/source/filter/excel/xestring.cxx sc/source/filter/excel/xestring.cxx
-index a367647..78bca3e 100644
+index 4d6efc0..dac338a 100644
--- sc/source/filter/excel/xestring.cxx
+++ sc/source/filter/excel/xestring.cxx
-@@ -253,7 +253,8 @@ bool XclExpString::IsEqual( const XclExpString& rCmp ) const
+@@ -291,7 +291,8 @@ bool XclExpString::IsEqual( const XclExpString& rCmp ) const
( mbIsBiff8 && (maUniBuffer == rCmp.maUniBuffer)) ||
(!mbIsBiff8 && (maCharBuffer == rCmp.maCharBuffer))
) &&
@@ -985,7 +985,7 @@
}
bool XclExpString::IsLessThan( const XclExpString& rCmp ) const
-@@ -264,6 +265,18 @@ bool XclExpString::IsLessThan( const XclExpString& rCmp ) const
+@@ -302,6 +303,18 @@ bool XclExpString::IsLessThan( const XclExpString& rCmp ) const
return (nResult != 0) ? (nResult < 0) : (maFormats < rCmp.maFormats);
}
@@ -1004,7 +1004,7 @@
// get data -------------------------------------------------------------------
sal_uInt16 XclExpString::GetFormatsCount() const
-@@ -271,17 +284,25 @@ sal_uInt16 XclExpString::GetFormatsCount() const
+@@ -309,17 +322,25 @@ sal_uInt16 XclExpString::GetFormatsCount() const
return static_cast< sal_uInt16 >( maFormats.size() );
}
@@ -1034,7 +1034,7 @@
}
sal_Size XclExpString::GetBufferSize() const
-@@ -292,9 +313,10 @@ sal_Size XclExpString::GetBufferSize() const
+@@ -330,9 +351,10 @@ sal_Size XclExpString::GetBufferSize() const
sal_Size XclExpString::GetSize() const
{
return
@@ -1048,7 +1048,7 @@
}
sal_uInt16 XclExpString::GetChar( sal_uInt16 nCharIdx ) const
-@@ -342,6 +364,10 @@ void XclExpString::WriteHeader( XclExpStream& rStrm ) const
+@@ -380,6 +402,10 @@ void XclExpString::WriteHeader( XclExpStream& rStrm ) const
// format run count
if( IsWriteFormats() )
rStrm << GetFormatsCount();
@@ -1059,7 +1059,7 @@
rStrm.SetSliceSize( 0 );
}
-@@ -378,12 +404,54 @@ void XclExpString::WriteFormats( XclExpStream& rStrm, bool bWriteSize ) const
+@@ -416,6 +442,46 @@ void XclExpString::WriteFormats( XclExpStream& rStrm, bool bWriteSize ) const
}
}
@@ -1105,7 +1105,8 @@
+
void XclExpString::Write( XclExpStream& rStrm ) const
{
- WriteHeader( rStrm );
+ if (!mbSkipHeader)
+@@ -423,6 +489,8 @@ void XclExpString::Write( XclExpStream& rStrm ) const
WriteBuffer( rStrm );
if( IsWriteFormats() ) // only in BIFF8 included in string
WriteFormats( rStrm );
@@ -1114,7 +1115,7 @@
}
void XclExpString::WriteHeaderToMem( sal_uInt8* pnMem ) const
-@@ -449,6 +517,11 @@ bool XclExpString::IsWriteFormats() const
+@@ -488,6 +556,11 @@ bool XclExpString::IsWriteFormats() const
return mbIsBiff8 && !mbSkipFormats && IsRich();
}
@@ -1155,7 +1156,7 @@
return pCell;
diff --git sc/source/filter/excel/xistring.cxx sc/source/filter/excel/xistring.cxx
-index 3d77ae0..48f8e87 100644
+index d6e0b31..45834b1 100644
--- sc/source/filter/excel/xistring.cxx
+++ sc/source/filter/excel/xistring.cxx
@@ -94,7 +94,8 @@ void XclImpString::Read( XclImpStream& rStrm, XclStrFlags nFlags )
@@ -1168,7 +1169,7 @@
}
break;
-@@ -146,6 +147,31 @@ void XclImpString::ReadFormats( XclImpStream& rStrm, XclFormatRunVec& rFormats,
+@@ -161,6 +162,31 @@ void XclImpString::ReadObjFormats( XclImpStream& rStrm, XclFormatRunVec& rFormat
}
}
@@ -1220,7 +1221,7 @@
{ ocMaxA, 362, 1, 30, V, { R }, 0, 0 },
{ ocMinA, 363, 1, 30, V, { R }, 0, 0 },
diff --git sc/source/filter/inc/xestring.hxx sc/source/filter/inc/xestring.hxx
-index d4ce93d..ac80cf6 100644
+index 81bf8dc..0168b81 100644
--- sc/source/filter/inc/xestring.hxx
+++ sc/source/filter/inc/xestring.hxx
@@ -32,11 +32,13 @@
@@ -1237,7 +1238,7 @@
class EditTextObject;
class XclExpStream;
-@@ -161,6 +163,12 @@ public:
+@@ -194,6 +196,12 @@ public:
/** Removes and returns the font index for the first char from the formatting runs, otherwise EXC_FONT_NOTFOUND. */
sal_uInt16 RemoveLeadingFont();
@@ -1250,7 +1251,7 @@
// get data ---------------------------------------------------------------
/** Returns the character count of the string. */
-@@ -181,6 +189,11 @@ public:
+@@ -214,6 +222,11 @@ public:
/** Returns the vector with all formatting runs. */
inline const XclFormatRunVec& GetFormats() const { return maFormats; }
@@ -1262,7 +1263,7 @@
/** Returns the current string flags field to export. */
sal_uInt8 GetFlagField() const;
/** Returns the byte count the header will take on export. */
-@@ -207,6 +220,8 @@ public:
+@@ -240,6 +253,8 @@ public:
void WriteBuffer( XclExpStream& rStrm ) const;
/** Writes the raw formatting run buffer. */
void WriteFormats( XclExpStream& rStrm, bool bWriteSize = false ) const;
@@ -1271,7 +1272,7 @@
/** Writes the complete Unicode string. */
void Write( XclExpStream& rStrm ) const;
-@@ -223,6 +238,8 @@ private:
+@@ -256,6 +271,8 @@ private:
bool IsWriteFlags() const;
/** Returns true, if the formatting run vector should be written. */
bool IsWriteFormats() const;
@@ -1280,7 +1281,7 @@
/** Sets the string length but regards the limit given in mnMaxLen. */
void SetStrLen( sal_Int32 nNewLen );
-@@ -277,6 +294,7 @@ private:
+@@ -310,6 +327,7 @@ private:
ScfUInt16Vec maUniBuffer; /// The Unicode character buffer.
ScfUInt8Vec maCharBuffer; /// The byte character buffer.
XclFormatRunVec maFormats; /// All formatting runs.
@@ -1289,7 +1290,7 @@
sal_uInt16 mnMaxLen; /// Maximum allowed number of characters.
bool mbIsBiff8; /// true = BIFF8 Unicode string, false = BIFF2-7 bytestring.
diff --git sc/source/filter/inc/xistring.hxx sc/source/filter/inc/xistring.hxx
-index 1be9886..046121f 100644
+index 66bc885..a46564f 100644
--- sc/source/filter/inc/xistring.hxx
+++ sc/source/filter/inc/xistring.hxx
@@ -32,6 +32,7 @@
@@ -1300,9 +1301,9 @@
// Byte/Unicode strings =======================================================
-@@ -79,9 +80,19 @@ public:
- /** Reads and appends nRunCount formatting runs from stream. */
- static void ReadFormats( XclImpStream& rStrm, XclFormatRunVec& rFormats, sal_uInt16 nRunCount );
+@@ -83,9 +84,19 @@ public:
+ /** Reads and appends formatting runs from an OBJ or TXO record. */
+ static void ReadObjFormats( XclImpStream& rStrm, XclFormatRunVec& rFormats, sal_uInt16 nFormatSize );
+ /** Returns true, if the string has phonetic information. */
+ inline bool HasPhonetic() const { return !maPhonetic.IsEmpty(); }
@@ -1321,10 +1322,10 @@
// String iterator ============================================================
diff --git sc/source/filter/inc/xlstring.hxx sc/source/filter/inc/xlstring.hxx
-index 626b11b..0b30049 100644
+index 0a078a4..89f8275 100644
--- sc/source/filter/inc/xlstring.hxx
+++ sc/source/filter/inc/xlstring.hxx
-@@ -93,7 +93,68 @@ inline bool operator<( const XclFormatRun& rLeft, const XclFormatRun& rRight )
+@@ -94,7 +94,68 @@ inline bool operator<( const XclFormatRun& rLeft, const XclFormatRun& rRight )
/** A vector with all formatting runs for a rich-string. */
typedef ::std::vector< XclFormatRun > XclFormatRunVec;
@@ -1636,7 +1637,7 @@
$(SLO)$/xmllabri.obj \
$(SLO)$/XMLTableHeaderFooterContext.obj \
diff --git sc/source/filter/xml/xmlcelli.cxx sc/source/filter/xml/xmlcelli.cxx
-index a990e54..7ae6ee0 100644
+index cc0a6a2..bac6564 100644
--- sc/source/filter/xml/xmlcelli.cxx
+++ sc/source/filter/xml/xmlcelli.cxx
@@ -38,6 +38,7 @@
@@ -1678,7 +1679,7 @@
}
if (!pContext && !bTextP)
-@@ -755,6 +766,81 @@ bool lcl_IsEmptyOrNote( ScDocument* pDoc, const table::CellAddress& rCurrentPos
+@@ -765,6 +776,81 @@ bool lcl_IsEmptyOrNote( ScDocument* pDoc, const table::CellAddress& rCurrentPos
return ( !pCell || pCell->GetCellType() == CELLTYPE_NOTE );
}
@@ -1760,7 +1761,7 @@
void ScXMLTableRowCellContext::EndElement()
{
if (!bHasSubTable)
-@@ -925,11 +1011,11 @@ void ScXMLTableRowCellContext::EndElement()
+@@ -935,11 +1021,11 @@ void ScXMLTableRowCellContext::EndElement()
ScBaseCell* pNewCell = NULL;
ScDocument* pDoc = rXMLImport.GetDocument();
if (pOUTextValue && pOUTextValue->getLength())
@@ -1775,7 +1776,7 @@
if ( pNewCell )
{
ScAddress aScAddress;
-@@ -1016,6 +1102,18 @@ void ScXMLTableRowCellContext::EndElement()
+@@ -1026,6 +1112,18 @@ void ScXMLTableRowCellContext::EndElement()
}
else
{
@@ -1794,7 +1795,7 @@
// #i56027# If the child context put formatted text into the cell,
// bIsEmpty is TRUE and ProgressBarIncrement has to be called
// with bEditCell = TRUE.
-@@ -1122,3 +1220,10 @@ void ScXMLTableRowCellContext::EndElement()
+@@ -1132,3 +1230,10 @@ void ScXMLTableRowCellContext::EndElement()
nMergedRows = 1;
nCellsRepeated = 1;
}
@@ -1832,10 +1833,10 @@
#endif
diff --git sc/source/filter/xml/xmlexprt.cxx sc/source/filter/xml/xmlexprt.cxx
-index 2baaac4..e286f06 100644
+index 7604afa..29b4fa1 100644
--- sc/source/filter/xml/xmlexprt.cxx
+++ sc/source/filter/xml/xmlexprt.cxx
-@@ -2270,11 +2270,27 @@ sal_Bool ScXMLExport::GetCellText (ScMyCell& rMyCell, const ScAddress& aPos) con
+@@ -2332,11 +2332,27 @@ sal_Bool ScXMLExport::GetCellText (ScMyCell& rMyCell, const ScAddress& aPos) con
// {
rMyCell.sStringValue = ScCellObj::GetOutputString_Impl(pDoc, aPos);
rMyCell.bHasStringValue = sal_True;
@@ -1863,7 +1864,7 @@
void ScXMLExport::WriteCell (ScMyCell& aCell)
{
ScAddress aCellPos;
-@@ -2418,13 +2434,20 @@ void ScXMLExport::WriteCell (ScMyCell& aCell)
+@@ -2480,13 +2496,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);
@@ -1886,10 +1887,10 @@
}
WriteShapes(aCell);
diff --git sc/source/filter/xml/xmlexprt.hxx sc/source/filter/xml/xmlexprt.hxx
-index 03e3469..119c79a 100644
+index 7d55e81..a15a3ab 100644
--- sc/source/filter/xml/xmlexprt.hxx
+++ sc/source/filter/xml/xmlexprt.hxx
-@@ -183,6 +183,12 @@ class ScXMLExport : public SvXMLExport
+@@ -186,6 +186,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();
@@ -1903,7 +1904,7 @@
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 6d4bc86..095d7f0 100644
+index 99beb2d..635b53d 100644
--- sc/source/filter/xml/xmlimprt.cxx
+++ sc/source/filter/xml/xmlimprt.cxx
@@ -415,7 +415,28 @@ static __FAR_DATA SvXMLTokenMapEntry aTableRowCellTokenMap[] =
@@ -1936,7 +1937,7 @@
};
static __FAR_DATA SvXMLTokenMapEntry aTableRowCellAttrTokenMap[] =
-@@ -1097,6 +1118,27 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTokenMap()
+@@ -1120,6 +1141,27 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTokenMap()
return *pTableRowCellElemTokenMap;
}
@@ -1963,8 +1964,8 @@
+
const SvXMLTokenMap& ScXMLImport::GetTableRowCellAttrTokenMap()
{
- if( !pTableRowCellAttrTokenMap )
-@@ -1464,6 +1506,9 @@ ScXMLImport::ScXMLImport(
+ if ( !pTableRowCellAttrTokenMap )
+@@ -1487,6 +1529,9 @@ ScXMLImport::ScXMLImport(
pTableRowElemTokenMap( 0 ),
pTableRowAttrTokenMap( 0 ),
pTableRowCellElemTokenMap( 0 ),
@@ -1974,7 +1975,7 @@
pTableRowCellAttrTokenMap( 0 ),
pTableAnnotationAttrTokenMap( 0 ),
pDetectiveElemTokenMap( 0 ),
-@@ -1590,6 +1635,9 @@ ScXMLImport::~ScXMLImport() throw()
+@@ -1613,6 +1658,9 @@ ScXMLImport::~ScXMLImport() throw()
delete pTableRowElemTokenMap;
delete pTableRowAttrTokenMap;
delete pTableRowCellElemTokenMap;
@@ -1985,7 +1986,7 @@
delete pTableAnnotationAttrTokenMap;
delete pDetectiveElemTokenMap;
diff --git sc/source/filter/xml/xmlimprt.hxx sc/source/filter/xml/xmlimprt.hxx
-index be0bc22..f9bdcf1 100644
+index 6e028f5..31f2b99 100644
--- sc/source/filter/xml/xmlimprt.hxx
+++ sc/source/filter/xml/xmlimprt.hxx
@@ -248,7 +248,25 @@ enum ScXMLTableRowCellTokens
@@ -2025,14 +2026,14 @@
SvXMLTokenMap *pTableRowCellAttrTokenMap;
SvXMLTokenMap *pTableAnnotationAttrTokenMap;
SvXMLTokenMap *pDetectiveElemTokenMap;
-@@ -851,6 +872,9 @@ public:
+@@ -854,6 +875,9 @@ public:
const SvXMLTokenMap& GetTableRowElemTokenMap();
const SvXMLTokenMap& GetTableRowAttrTokenMap();
const SvXMLTokenMap& GetTableRowCellElemTokenMap();
+ const SvXMLTokenMap& GetTableRowCellElemTextTokenMap();
+ const SvXMLTokenMap& GetTableRowCellElemTextRubyTokenMap();
+ const SvXMLTokenMap& GetTableRowCellElemTextRubyAttrTokenMap();
- const SvXMLTokenMap& GetTableRowCellAttrTokenMap();
+ const SvXMLTokenMap& GetTableRowCellAttrTokenMap();
const SvXMLTokenMap& GetTableAnnotationAttrTokenMap();
const SvXMLTokenMap& GetDetectiveElemTokenMap();
diff --git sc/source/filter/xml/xmlrubyi.cxx sc/source/filter/xml/xmlrubyi.cxx
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
