ooo-build r15011 - in branches/opensuse-11-1: . patches/dev300
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r15011 - in branches/opensuse-11-1: . patches/dev300
- Date: Wed, 7 Jan 2009 06:32:43 +0000 (UTC)
Author: kyoshida
Date: Wed Jan 7 06:32:43 2009
New Revision: 15011
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15011&view=rev
Log:
2009-01-07 Kohei Yoshida <kyoshida novell com>
* patches/dev300/chart-odf-always-calc-a1.diff: a couple of more places
to hard-code the Calc A1 address convention, to make xls chart import
and export to work. (n#461263, n#463305)
Modified:
branches/opensuse-11-1/ChangeLog
branches/opensuse-11-1/patches/dev300/chart-odf-always-calc-a1.diff
Modified: branches/opensuse-11-1/patches/dev300/chart-odf-always-calc-a1.diff
==============================================================================
--- branches/opensuse-11-1/patches/dev300/chart-odf-always-calc-a1.diff (original)
+++ branches/opensuse-11-1/patches/dev300/chart-odf-always-calc-a1.diff Wed Jan 7 06:32:43 2009
@@ -1,5 +1,5 @@
diff --git sc/inc/rangeutl.hxx sc/inc/rangeutl.hxx
-index e34a268..a182cd4 100644
+index 8576bbf..66f6cb3 100644
--- sc/inc/rangeutl.hxx
+++ sc/inc/rangeutl.hxx
@@ -38,6 +38,11 @@
@@ -14,7 +14,7 @@
//------------------------------------------------------------------------
class SvStream;
-@@ -151,6 +156,7 @@ public:
+@@ -146,6 +151,7 @@ public:
ScAddress& rAddress,
const ::rtl::OUString& rAddressStr,
const ScDocument* pDocument,
@@ -22,7 +22,7 @@
sal_Int32& nOffset,
sal_Unicode cSeperator = ' ',
sal_Unicode cQuote = '\'');
-@@ -158,6 +164,7 @@ public:
+@@ -153,6 +159,7 @@ public:
ScRange& rRange,
const ::rtl::OUString& rRangeStr,
const ScDocument* pDocument,
@@ -30,7 +30,7 @@
sal_Int32& nOffset,
sal_Unicode cSeperator = ' ',
sal_Unicode cQuote = '\'');
-@@ -165,6 +172,7 @@ public:
+@@ -160,6 +167,7 @@ public:
ScRangeList& rRangeList,
const ::rtl::OUString& rRangeListStr,
const ScDocument* pDocument,
@@ -38,7 +38,7 @@
sal_Unicode cSeperator = ' ',
sal_Unicode cQuote = '\'');
-@@ -172,6 +180,7 @@ public:
+@@ -167,6 +175,7 @@ public:
ScArea& rArea,
const ::rtl::OUString& rRangeStr,
const ScDocument* pDocument,
@@ -46,7 +46,7 @@
sal_Int32& nOffset,
sal_Unicode cSeperator = ' ',
sal_Unicode cQuote = '\'');
-@@ -181,6 +190,7 @@ public:
+@@ -176,6 +185,7 @@ public:
::com::sun::star::table::CellAddress& rAddress,
const ::rtl::OUString& rAddressStr,
const ScDocument* pDocument,
@@ -54,7 +54,7 @@
sal_Int32& nOffset,
sal_Unicode cSeperator = ' ',
sal_Unicode cQuote = '\'');
-@@ -188,6 +198,7 @@ public:
+@@ -183,6 +193,7 @@ public:
::com::sun::star::table::CellRangeAddress& rRange,
const ::rtl::OUString& rRangeStr,
const ScDocument* pDocument,
@@ -62,7 +62,7 @@
sal_Int32& nOffset,
sal_Unicode cSeperator = ' ',
sal_Unicode cQuote = '\'');
-@@ -195,6 +206,7 @@ public:
+@@ -190,6 +201,7 @@ public:
::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRangeSeq,
const ::rtl::OUString& rRangeListStr,
const ScDocument* pDocument,
@@ -70,7 +70,7 @@
sal_Unicode cSeperator = ' ',
sal_Unicode cQuote = '\'');
-@@ -203,6 +215,7 @@ public:
+@@ -198,6 +210,7 @@ public:
::rtl::OUString& rString,
const ScAddress& rAddress,
const ScDocument* pDocument,
@@ -78,7 +78,7 @@
sal_Unicode cSeperator = ' ',
sal_Bool bAppendStr = sal_False,
sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) );
-@@ -210,6 +223,7 @@ public:
+@@ -205,6 +218,7 @@ public:
::rtl::OUString& rString,
const ScRange& rRange,
const ScDocument* pDocument,
@@ -86,7 +86,7 @@
sal_Unicode cSeperator = ' ',
sal_Bool bAppendStr = sal_False,
sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) );
-@@ -217,6 +231,7 @@ public:
+@@ -212,6 +226,7 @@ public:
::rtl::OUString& rString,
const ScRangeList* pRangeList,
const ScDocument* pDocument,
@@ -94,7 +94,7 @@
sal_Unicode cSeperator = ' ',
sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D));
-@@ -224,6 +239,7 @@ public:
+@@ -219,6 +234,7 @@ public:
::rtl::OUString& rString,
const ScArea& rArea,
const ScDocument* pDocument,
@@ -102,7 +102,7 @@
sal_Unicode cSeperator = ' ',
sal_Bool bAppendStr = sal_False,
sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) );
-@@ -233,6 +249,7 @@ public:
+@@ -228,6 +244,7 @@ public:
::rtl::OUString& rString,
const ::com::sun::star::table::CellAddress& rAddress,
const ScDocument* pDocument,
@@ -110,7 +110,7 @@
sal_Unicode cSeperator = ' ',
sal_Bool bAppendStr = sal_False,
sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) );
-@@ -240,6 +257,7 @@ public:
+@@ -235,6 +252,7 @@ public:
::rtl::OUString& rString,
const ::com::sun::star::table::CellRangeAddress& rRange,
const ScDocument* pDocument,
@@ -118,7 +118,7 @@
sal_Unicode cSeperator = ' ',
sal_Bool bAppendStr = sal_False,
sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) );
-@@ -247,6 +265,7 @@ public:
+@@ -242,6 +260,7 @@ public:
::rtl::OUString& rString,
const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRangeSeq,
const ScDocument* pDocument,
@@ -127,10 +127,10 @@
sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) );
};
diff --git sc/source/core/tool/rangeutl.cxx sc/source/core/tool/rangeutl.cxx
-index 4869f52..0290ffd 100644
+index 8e873e7..76f6e26 100644
--- sc/source/core/tool/rangeutl.cxx
+++ sc/source/core/tool/rangeutl.cxx
-@@ -461,6 +461,7 @@ sal_Bool ScRangeStringConverter::GetAddressFromString(
+@@ -456,6 +456,7 @@ sal_Bool ScRangeStringConverter::GetAddressFromString(
ScAddress& rAddress,
const OUString& rAddressStr,
const ScDocument* pDocument,
@@ -138,7 +138,7 @@
sal_Int32& nOffset,
sal_Unicode cSeperator,
sal_Unicode cQuote )
-@@ -468,7 +469,15 @@ sal_Bool ScRangeStringConverter::GetAddressFromString(
+@@ -463,7 +464,15 @@ sal_Bool ScRangeStringConverter::GetAddressFromString(
OUString sToken;
GetTokenByOffset( sToken, rAddressStr, nOffset, cSeperator, cQuote );
if( nOffset >= 0 )
@@ -155,7 +155,7 @@
return sal_False;
}
-@@ -476,12 +485,14 @@ sal_Bool ScRangeStringConverter::GetRangeFromString(
+@@ -471,12 +480,14 @@ sal_Bool ScRangeStringConverter::GetRangeFromString(
ScRange& rRange,
const OUString& rRangeStr,
const ScDocument* pDocument,
@@ -170,7 +170,7 @@
GetTokenByOffset( sToken, rRangeStr, nOffset, cSeperator, cQuote );
if( nOffset >= 0 )
{
-@@ -492,7 +503,12 @@ sal_Bool ScRangeStringConverter::GetRangeFromString(
+@@ -487,7 +498,12 @@ sal_Bool ScRangeStringConverter::GetRangeFromString(
{
if ( aUIString.GetChar(0) == (sal_Unicode) '.' )
aUIString.Erase( 0, 1 );
@@ -184,7 +184,7 @@
rRange.aEnd = rRange.aStart;
}
else
-@@ -507,15 +523,28 @@ sal_Bool ScRangeStringConverter::GetRangeFromString(
+@@ -502,15 +518,28 @@ sal_Bool ScRangeStringConverter::GetRangeFromString(
aUIString.GetChar((xub_StrLen)nIndex + 1) == (sal_Unicode) '.' )
aUIString.Erase( (xub_StrLen)nIndex + 1, 1 );
@@ -216,7 +216,7 @@
}
}
return bResult;
-@@ -525,6 +554,7 @@ sal_Bool ScRangeStringConverter::GetRangeListFromString(
+@@ -520,6 +549,7 @@ sal_Bool ScRangeStringConverter::GetRangeListFromString(
ScRangeList& rRangeList,
const OUString& rRangeListStr,
const ScDocument* pDocument,
@@ -224,7 +224,7 @@
sal_Unicode cSeperator,
sal_Unicode cQuote )
{
-@@ -534,7 +564,7 @@ sal_Bool ScRangeStringConverter::GetRangeListFromString(
+@@ -529,7 +559,7 @@ sal_Bool ScRangeStringConverter::GetRangeListFromString(
while( nOffset >= 0 )
{
ScRange* pRange = new ScRange;
@@ -233,7 +233,7 @@
rRangeList.Insert( pRange, LIST_APPEND );
else if (nOffset > -1)
bRet = sal_False;
-@@ -549,13 +579,14 @@ sal_Bool ScRangeStringConverter::GetAreaFromString(
+@@ -544,13 +574,14 @@ sal_Bool ScRangeStringConverter::GetAreaFromString(
ScArea& rArea,
const OUString& rRangeStr,
const ScDocument* pDocument,
@@ -249,7 +249,7 @@
{
rArea.nTab = aScRange.aStart.Tab();
rArea.nColStart = aScRange.aStart.Col();
-@@ -574,13 +605,14 @@ sal_Bool ScRangeStringConverter::GetAddressFromString(
+@@ -569,13 +600,14 @@ sal_Bool ScRangeStringConverter::GetAddressFromString(
table::CellAddress& rAddress,
const OUString& rAddressStr,
const ScDocument* pDocument,
@@ -265,7 +265,7 @@
{
ScUnoConversion::FillApiAddress( rAddress, aScAddress );
bResult = sal_True;
-@@ -592,13 +624,14 @@ sal_Bool ScRangeStringConverter::GetRangeFromString(
+@@ -587,13 +619,14 @@ sal_Bool ScRangeStringConverter::GetRangeFromString(
table::CellRangeAddress& rRange,
const OUString& rRangeStr,
const ScDocument* pDocument,
@@ -281,7 +281,7 @@
{
ScUnoConversion::FillApiRange( rRange, aScRange );
bResult = sal_True;
-@@ -610,6 +643,7 @@ sal_Bool ScRangeStringConverter::GetRangeListFromString(
+@@ -605,6 +638,7 @@ sal_Bool ScRangeStringConverter::GetRangeListFromString(
uno::Sequence< table::CellRangeAddress >& rRangeSeq,
const OUString& rRangeListStr,
const ScDocument* pDocument,
@@ -289,7 +289,7 @@
sal_Unicode cSeperator,
sal_Unicode cQuote )
{
-@@ -619,7 +653,7 @@ sal_Bool ScRangeStringConverter::GetRangeListFromString(
+@@ -614,7 +648,7 @@ sal_Bool ScRangeStringConverter::GetRangeListFromString(
sal_Int32 nOffset = 0;
while( nOffset >= 0 )
{
@@ -298,7 +298,7 @@
{
rRangeSeq.realloc( rRangeSeq.getLength() + 1 );
rRangeSeq[ rRangeSeq.getLength() - 1 ] = aRange;
-@@ -637,6 +671,7 @@ void ScRangeStringConverter::GetStringFromAddress(
+@@ -632,6 +666,7 @@ void ScRangeStringConverter::GetStringFromAddress(
OUString& rString,
const ScAddress& rAddress,
const ScDocument* pDocument,
@@ -306,7 +306,7 @@
sal_Unicode cSeperator,
sal_Bool bAppendStr,
sal_uInt16 nFormatFlags )
-@@ -644,7 +679,7 @@ void ScRangeStringConverter::GetStringFromAddress(
+@@ -639,7 +674,7 @@ void ScRangeStringConverter::GetStringFromAddress(
if (pDocument && pDocument->HasTable(rAddress.Tab()))
{
String sAddress;
@@ -315,7 +315,7 @@
AssignString( rString, sAddress, bAppendStr, cSeperator );
}
}
-@@ -653,6 +688,7 @@ void ScRangeStringConverter::GetStringFromRange(
+@@ -648,6 +683,7 @@ void ScRangeStringConverter::GetStringFromRange(
OUString& rString,
const ScRange& rRange,
const ScDocument* pDocument,
@@ -323,7 +323,7 @@
sal_Unicode cSeperator,
sal_Bool bAppendStr,
sal_uInt16 nFormatFlags )
-@@ -663,7 +699,6 @@ void ScRangeStringConverter::GetStringFromRange(
+@@ -658,7 +694,6 @@ void ScRangeStringConverter::GetStringFromRange(
ScAddress aEndAddress( rRange.aEnd );
String sStartAddress;
String sEndAddress;
@@ -331,7 +331,7 @@
aStartAddress.Format( sStartAddress, nFormatFlags, (ScDocument*) pDocument, eConv );
aEndAddress.Format( sEndAddress, nFormatFlags, (ScDocument*) pDocument, eConv );
OUString sOUStartAddress( sStartAddress );
-@@ -677,6 +712,7 @@ void ScRangeStringConverter::GetStringFromRangeList(
+@@ -672,6 +707,7 @@ void ScRangeStringConverter::GetStringFromRangeList(
OUString& rString,
const ScRangeList* pRangeList,
const ScDocument* pDocument,
@@ -339,7 +339,7 @@
sal_Unicode cSeperator,
sal_uInt16 nFormatFlags )
{
-@@ -688,7 +724,7 @@ void ScRangeStringConverter::GetStringFromRangeList(
+@@ -683,7 +719,7 @@ void ScRangeStringConverter::GetStringFromRangeList(
{
const ScRange* pRange = pRangeList->GetObject( nIndex );
if( pRange )
@@ -348,7 +348,7 @@
}
}
rString = sRangeListStr;
-@@ -701,12 +737,13 @@ void ScRangeStringConverter::GetStringFromArea(
+@@ -696,12 +732,13 @@ void ScRangeStringConverter::GetStringFromArea(
OUString& rString,
const ScArea& rArea,
const ScDocument* pDocument,
@@ -363,7 +363,7 @@
}
-@@ -716,31 +753,34 @@ void ScRangeStringConverter::GetStringFromAddress(
+@@ -711,31 +748,34 @@ void ScRangeStringConverter::GetStringFromAddress(
OUString& rString,
const table::CellAddress& rAddress,
const ScDocument* pDocument,
@@ -400,7 +400,7 @@
sal_Unicode cSeperator,
sal_uInt16 nFormatFlags )
{
-@@ -749,7 +789,7 @@ void ScRangeStringConverter::GetStringFromRangeList(
+@@ -744,7 +784,7 @@ void ScRangeStringConverter::GetStringFromRangeList(
for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ )
{
const table::CellRangeAddress& rRange = rRangeSeq[ nIndex ];
@@ -410,35 +410,35 @@
rString = sRangeListStr;
}
diff --git sc/source/filter/excel/xechart.cxx sc/source/filter/excel/xechart.cxx
-index f04d57a..7238d62 100644
+index d986b48..1ddc45e 100644
--- sc/source/filter/excel/xechart.cxx
+++ sc/source/filter/excel/xechart.cxx
-@@ -665,7 +665,8 @@ sal_uInt16 XclExpChSourceLink::ConvertDataSequence( Reference< XDataSequence > x
+@@ -679,7 +679,8 @@ sal_uInt16 XclExpChSourceLink::ConvertDataSequence( Reference< XDataSequence > x
{
OUString aRangeRepr = xDataSeq->getSourceRangeRepresentation();
ScRangeList aScRanges;
- if( ScRangeStringConverter::GetRangeListFromString( aScRanges, aRangeRepr, GetDocPtr(), ';' ) )
+ ScDocument* pDoc = GetDocPtr();
-+ if( ScRangeStringConverter::GetRangeListFromString( aScRanges, aRangeRepr, pDoc, pDoc->GetAddressConvention(), ';' ) )
++ if( ScRangeStringConverter::GetRangeListFromString( aScRanges, aRangeRepr, pDoc, ScAddress::CONV_OOO, ';' ) )
{
// split 3-dimensional ranges into single sheets
ScRangeList aNewScRanges;
diff --git sc/source/filter/excel/xichart.cxx sc/source/filter/excel/xichart.cxx
-index 46cb411..b3f5a35 100644
+index 473d1b0..255c7e7 100644
--- sc/source/filter/excel/xichart.cxx
+++ sc/source/filter/excel/xichart.cxx
-@@ -655,7 +655,8 @@ Reference< XDataSequence > XclImpChSourceLink::CreateDataSequence( const OUStrin
+@@ -695,7 +695,8 @@ Reference< XDataSequence > XclImpChSourceLink::CreateDataSequence( const OUStrin
{
// create the string representation of the range list
OUString aRangeRep;
- ScRangeStringConverter::GetStringFromRangeList( aRangeRep, &maScRanges, GetDocPtr(), ';' );
+ ScDocument* pDoc = GetDocPtr();
-+ ScRangeStringConverter::GetStringFromRangeList( aRangeRep, &maScRanges, pDoc, pDoc->GetAddressConvention(), ';' );
++ ScRangeStringConverter::GetStringFromRangeList( aRangeRep, &maScRanges, pDoc, ScAddress::CONV_OOO, ';' );
// create the data sequence
try
diff --git sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
-index 24898f8..ec8a434 100644
+index 9983eb6..def9694 100644
--- sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
+++ sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
@@ -395,7 +395,7 @@ void ScChangeTrackingExportHelper::WriteFormulaCell(const ScBaseCell* pCell, con
@@ -451,10 +451,10 @@
const ScGrammar::Grammar eGrammar = pDoc->GetStorageGrammar();
sal_uInt16 nNamespacePrefix = (eGrammar == ScGrammar::GRAM_ODFF ? XML_NAMESPACE_OF : XML_NAMESPACE_OOOC);
diff --git sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
-index d1fa57b..368de6f 100644
+index 1c386a4..37528b2 100644
--- sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
-@@ -88,7 +88,7 @@ ScBaseCell* ScMyCellInfo::CreateCell(ScDocument* pDoc)
+@@ -74,7 +74,7 @@ ScBaseCell* ScMyCellInfo::CreateCell(ScDocument* pDoc)
{
ScAddress aPos;
sal_Int32 nOffset(0);
@@ -592,10 +592,10 @@
}
diff --git sc/source/filter/xml/XMLTableShapeImportHelper.cxx sc/source/filter/xml/XMLTableShapeImportHelper.cxx
-index bb6fe74..57e5464 100644
+index 7f9fb3f..9546914 100644
--- sc/source/filter/xml/XMLTableShapeImportHelper.cxx
+++ sc/source/filter/xml/XMLTableShapeImportHelper.cxx
-@@ -105,7 +105,7 @@ void XMLTableShapeImportHelper::finishShape(
+@@ -106,7 +106,7 @@ void XMLTableShapeImportHelper::finishShape(
if (IsXMLToken(aLocalName, XML_END_CELL_ADDRESS))
{
sal_Int32 nOffset(0);
@@ -618,10 +618,10 @@
{
ScChartListener* pCL(new ScChartListener(rName, pDoc, aRangeListRef ));
diff --git sc/source/filter/xml/xmldpimp.cxx sc/source/filter/xml/xmldpimp.cxx
-index ea577d2..2129837 100644
+index 9d79e15..457e7d0 100644
--- sc/source/filter/xml/xmldpimp.cxx
+++ sc/source/filter/xml/xmldpimp.cxx
-@@ -174,7 +174,7 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
+@@ -175,7 +175,7 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport,
case XML_TOK_DATA_PILOT_TABLE_ATTR_TARGET_RANGE_ADDRESS :
{
sal_Int32 nOffset(0);
@@ -630,7 +630,7 @@
}
break;
case XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS :
-@@ -271,7 +271,7 @@ void ScXMLDataPilotTableContext::SetButtons()
+@@ -272,7 +272,7 @@ void ScXMLDataPilotTableContext::SetButtons()
{
ScAddress aScAddress;
sal_Int32 nAddrOffset(0);
@@ -639,7 +639,7 @@
{
ScMergeFlagAttr aAttr( SC_MF_BUTTON );
pDoc->ApplyAttr( aScAddress.Col(), aScAddress.Row(), aScAddress.Tab(), aAttr );
-@@ -674,7 +674,7 @@ ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport,
+@@ -675,7 +675,7 @@ ScXMLSourceCellRangeContext::ScXMLSourceCellRangeContext( ScXMLImport& rImport,
{
ScRange aSourceRangeAddress;
sal_Int32 nOffset(0);
@@ -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 fcf3e8b..b29578f 100644
+index 8fd5b19..85a5e54 100644
--- sc/source/filter/xml/xmlexprt.cxx
+++ sc/source/filter/xml/xmlexprt.cxx
-@@ -1351,7 +1351,7 @@ void ScXMLExport::GetColumnRowHeader(sal_Bool& rHasColumnHeader, table::CellRang
+@@ -1422,7 +1422,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 @@
}
}
-@@ -2581,7 +2581,7 @@ void ScXMLExport::WriteShapes(const ScMyCell& rMyCell)
+@@ -2687,7 +2687,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();
-@@ -2811,7 +2811,7 @@ void ScXMLExport::WriteDetective( const ScMyCell& rMyCell )
+@@ -2917,7 +2917,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 );
-@@ -3202,7 +3202,7 @@ void ScXMLExport::WriteScenario()
+@@ -3308,7 +3308,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));
-@@ -3244,10 +3244,10 @@ void ScXMLExport::WriteLabelRanges( const uno::Reference< container::XIndexAcces
+@@ -3350,10 +3350,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 );
-@@ -3288,7 +3288,7 @@ void ScXMLExport::WriteNamedExpressions(const com::sun::star::uno::Reference <co
+@@ -3394,7 +3394,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;
-@@ -3359,10 +3359,10 @@ void ScXMLExport::WriteConsolidation()
+@@ -3668,10 +3668,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 )
-@@ -3432,7 +3432,7 @@ void ScXMLExport::GetChangeTrackViewSettings(uno::Sequence<beans::PropertyValue>
+@@ -3741,7 +3741,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,10 +786,10 @@
}
break;
diff --git sc/source/filter/xml/xmlimprt.cxx sc/source/filter/xml/xmlimprt.cxx
-index 2299598..c21e3ca 100644
+index 635b53d..f2ba5bd 100644
--- sc/source/filter/xml/xmlimprt.cxx
+++ sc/source/filter/xml/xmlimprt.cxx
-@@ -1940,7 +1940,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque
+@@ -2019,7 +2019,7 @@ void ScXMLImport::SetChangeTrackingViewSettings(const com::sun::star::uno::Seque
if ((rChangeProps[i].Value >>= sRanges) && sRanges.getLength())
{
ScRangeList aRangeList;
@@ -798,7 +798,7 @@
pViewSettings->SetTheRangeList(aRangeList);
}
}
-@@ -2439,8 +2439,8 @@ void ScXMLImport::SetLabelRanges()
+@@ -2518,8 +2518,8 @@ void ScXMLImport::SetLabelRanges()
sal_Int32 nOffset1(0);
sal_Int32 nOffset2(0);
@@ -809,7 +809,7 @@
{
if ( (*aItr)->bColumnOrientation )
xColRanges->addNew( aLabelRange, aDataRange );
-@@ -2475,7 +2475,7 @@ void ScXMLImport::SetNamedRanges()
+@@ -2554,7 +2554,7 @@ void ScXMLImport::SetNamedRanges()
{
sal_Int32 nOffset(0);
if (ScRangeStringConverter::GetAddressFromString(
@@ -818,7 +818,7 @@
{
try
{
-@@ -2516,7 +2516,7 @@ void ScXMLImport::SetNamedRanges()
+@@ -2595,7 +2595,7 @@ void ScXMLImport::SetNamedRanges()
{
sal_Int32 nOffset(0);
if (ScRangeStringConverter::GetAddressFromString(
@@ -828,10 +828,10 @@
uno::Reference <sheet::XNamedRange> xNamedRange(xNamedRanges->getByName((*aItr)->sName), uno::UNO_QUERY);
if (xNamedRange.is())
diff --git sc/source/filter/xml/xmlsceni.cxx sc/source/filter/xml/xmlsceni.cxx
-index cfe859d..6165d6a 100644
+index 525c6de..fe17351 100644
--- sc/source/filter/xml/xmlsceni.cxx
+++ sc/source/filter/xml/xmlsceni.cxx
-@@ -113,7 +113,7 @@ ScXMLTableScenarioContext::ScXMLTableScenarioContext(
+@@ -114,7 +114,7 @@ ScXMLTableScenarioContext::ScXMLTableScenarioContext(
case XML_TOK_TABLE_SCENARIO_ATTR_SCENARIO_RANGES:
{
ScRangeStringConverter::GetRangeListFromString(
@@ -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 7aec632..9385621 100644
+index 6ef1632..2d51ccc 100644
--- sc/source/filter/xml/xmlstyle.cxx
+++ sc/source/filter/xml/xmlstyle.cxx
-@@ -706,8 +706,9 @@ void ScXMLAutoStylePoolP::exportStyleContent(
+@@ -708,8 +708,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);
}
-@@ -760,7 +761,7 @@ void ScXMLAutoStylePoolP::exportStyleContent(
+@@ -762,7 +763,7 @@ void ScXMLAutoStylePoolP::exportStyleContent(
rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_APPLY_STYLE_NAME, rScXMLExport.EncodeStyleName( sStyleName ));
OUString sOUBaseAddress;
ScRangeStringConverter::GetStringFromAddress( sOUBaseAddress,
@@ -878,10 +878,10 @@
SvXMLElementExport aMElem(rScXMLExport, XML_NAMESPACE_STYLE, XML_MAP, sal_True, sal_True);
}
diff --git sc/source/filter/xml/xmltabi.cxx sc/source/filter/xml/xmltabi.cxx
-index 4a0f83e..6d23650 100644
+index f665b56..8b081be 100644
--- sc/source/filter/xml/xmltabi.cxx
+++ sc/source/filter/xml/xmltabi.cxx
-@@ -216,7 +216,7 @@ void ScXMLTableContext::EndElement()
+@@ -331,7 +331,7 @@ void ScXMLTableContext::EndElement()
if( xPrintAreas.is() )
{
uno::Sequence< table::CellRangeAddress > aRangeList;
@@ -891,19 +891,19 @@
}
}
diff --git sc/source/ui/unoobj/chart2uno.cxx sc/source/ui/unoobj/chart2uno.cxx
-index 3c6979b..6b40365 100644
+index 763cc1a..534cdd5 100644
--- sc/source/ui/unoobj/chart2uno.cxx
+++ sc/source/ui/unoobj/chart2uno.cxx
-@@ -1007,7 +1007,7 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL
+@@ -1008,7 +1008,7 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL
return xResult;
ScRangeListRef aRangeList = new ScRangeList();
- if (ScRangeStringConverter::GetRangeListFromString( *aRangeList, aRangeRepresentation, m_pDocument, ';' ))
-+ if (ScRangeStringConverter::GetRangeListFromString( *aRangeList, aRangeRepresentation, m_pDocument, m_pDocument->GetAddressConvention(), ';' ))
++ if (ScRangeStringConverter::GetRangeListFromString( *aRangeList, aRangeRepresentation, m_pDocument, ScAddress::CONV_OOO, ';' ))
xResult.set(new ScChart2DataSequence(m_pDocument, this, aRangeList));
return xResult;
-@@ -1041,9 +1041,9 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const rtl::OUStr
+@@ -1042,9 +1042,9 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const rtl::OUStr
if( m_pDocument )
{
ScRangeList aList;
@@ -915,7 +915,7 @@
}
return sRet;
-@@ -1052,12 +1052,64 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const rtl::OUStr
+@@ -1053,12 +1053,64 @@ rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const rtl::OUStr
rtl::OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const rtl::OUString& sXMLRange )
throw ( uno::RuntimeException, lang::IllegalArgumentException )
{
@@ -984,10 +984,10 @@
sal_Int32 nOffset = 0;
while( nOffset >= 0 )
diff --git sc/source/ui/unoobj/docuno.cxx sc/source/ui/unoobj/docuno.cxx
-index 56019c0..875259a 100644
+index 7a49274..6717cd6 100644
--- sc/source/ui/unoobj/docuno.cxx
+++ sc/source/ui/unoobj/docuno.cxx
-@@ -2284,7 +2284,8 @@ uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj:
+@@ -2268,7 +2268,8 @@ uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj:
uno::Sequence < uno::Reference < table::XCellRange > > xRet;
ScRangeList aRangeList;
@@ -998,10 +998,10 @@
sal_Int32 nCount = aRangeList.Count();
if (nCount)
diff --git sc/source/ui/view/tabview3.cxx sc/source/ui/view/tabview3.cxx
-index 6475869..897cfea 100644
+index 82ab33f..abc3a87 100644
--- sc/source/ui/view/tabview3.cxx
+++ sc/source/ui/view/tabview3.cxx
-@@ -2331,8 +2331,9 @@ void ScTabView::DoChartSelection(
+@@ -2236,8 +2236,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]
