ooo-build r15246 - in trunk: . patches/dev300
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r15246 - in trunk: . patches/dev300
- Date: Thu, 29 Jan 2009 19:37:07 +0000 (UTC)
Author: kyoshida
Date: Thu Jan 29 19:37:07 2009
New Revision: 15246
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15246&view=rev
Log:
2009-01-29 Kohei Yoshida <kyoshida novell com>
* patches/dev300/chart-odf-always-calc-a1.diff: another build breakage
for dev300-m40.
Modified:
trunk/ChangeLog
trunk/patches/dev300/chart-odf-always-calc-a1.diff
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 Thu Jan 29 19:37:07 2009
@@ -419,7 +419,7 @@
ScRangeList aScRanges;
- if( ScRangeStringConverter::GetRangeListFromString( aScRanges, aRangeRepr, GetDocPtr(), ';' ) )
+ ScDocument* pDoc = GetDocPtr();
-+ if( ScRangeStringConverter::GetRangeListFromString( aScRanges, aRangeRepr, pDoc, ScAddress::CONV_OOO, ';' ) )
++ if( ScRangeStringConverter::GetRangeListFromString( aScRanges, aRangeRepr, pDoc, ::formula::FormulaGrammar::CONV_OOO, ';' ) )
{
// split 3-dimensional ranges into single sheets
ScRangeList aNewScRanges;
@@ -433,7 +433,7 @@
OUString aRangeRep;
- ScRangeStringConverter::GetStringFromRangeList( aRangeRep, &maScRanges, GetDocPtr(), ';' );
+ ScDocument* pDoc = GetDocPtr();
-+ ScRangeStringConverter::GetStringFromRangeList( aRangeRep, &maScRanges, pDoc, ScAddress::CONV_OOO, ';' );
++ ScRangeStringConverter::GetStringFromRangeList( aRangeRep, &maScRanges, pDoc, ::formula::FormulaGrammar::CONV_OOO, ';' );
// create the data sequence
try
@@ -446,7 +446,7 @@
rtl::OUString sAddress;
const ScDocument* pDoc = rExport.GetDocument();
- ScRangeStringConverter::GetStringFromAddress(sAddress, pFormulaCell->aPos, pDoc);
-+ ScRangeStringConverter::GetStringFromAddress(sAddress, pFormulaCell->aPos, pDoc, ScAddress::CONV_OOO);
++ ScRangeStringConverter::GetStringFromAddress(sAddress, pFormulaCell->aPos, pDoc, ::formula::FormulaGrammar::CONV_OOO);
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CELL_ADDRESS, sAddress);
const formula::FormulaGrammar::Grammar eGrammar = pDoc->GetStorageGrammar();
sal_uInt16 nNamespacePrefix = (eGrammar == formula::FormulaGrammar::GRAM_ODFF ? XML_NAMESPACE_OF : XML_NAMESPACE_OOOC);
@@ -459,7 +459,7 @@
ScAddress aPos;
sal_Int32 nOffset(0);
- ScRangeStringConverter::GetAddressFromString(aPos, sFormulaAddress, pDoc, nOffset);
-+ ScRangeStringConverter::GetAddressFromString(aPos, sFormulaAddress, pDoc, ScAddress::CONV_OOO, nOffset);
++ ScRangeStringConverter::GetAddressFromString(aPos, sFormulaAddress, pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset);
pCell = new ScFormulaCell(pDoc, aPos, sFormula, eGrammar, nMatrixFlag);
static_cast<ScFormulaCell*>(pCell)->SetMatColsRows(static_cast<SCCOL>(nMatrixCols), static_cast<SCROW>(nMatrixRows));
}
@@ -472,7 +472,7 @@
sal_Int32 nOffset(0);
bTargetAddr = ScRangeStringConverter::GetAddressFromString(
- aTargetAddr, sValue, GetScImport().GetDocument(), nOffset );
-+ aTargetAddr, sValue, GetScImport().GetDocument(), ScAddress::CONV_OOO, nOffset );
++ aTargetAddr, sValue, GetScImport().GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset );
}
break;
case XML_TOK_CONSOLIDATION_ATTR_USE_LABEL:
@@ -481,7 +481,7 @@
ppAreas[ nIndex ] = new ScArea;
if ( !ScRangeStringConverter::GetAreaFromString(
- *ppAreas[ nIndex ], sSourceList, GetScImport().GetDocument(), nOffset ) )
-+ *ppAreas[ nIndex ], sSourceList, GetScImport().GetDocument(), ScAddress::CONV_OOO, nOffset ) )
++ *ppAreas[ nIndex ], sSourceList, GetScImport().GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset ) )
{
bError = sal_True; //! handle error
}
@@ -494,7 +494,7 @@
sal_Int32 nOffset(0);
GetScImport().LockSolarMutex();
- bValid = ScRangeStringConverter::GetRangeFromString( aDetectiveObj.aSourceRange, sValue, GetScImport().GetDocument(), nOffset );
-+ bValid = ScRangeStringConverter::GetRangeFromString( aDetectiveObj.aSourceRange, sValue, GetScImport().GetDocument(), ScAddress::CONV_OOO, nOffset );
++ bValid = ScRangeStringConverter::GetRangeFromString( aDetectiveObj.aSourceRange, sValue, GetScImport().GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset );
GetScImport().UnlockSolarMutex();
}
break;
@@ -507,7 +507,7 @@
aQueryParam.nCol2, aQueryParam.nRow2, aQueryParam.nTab);
rtl::OUString sConditionRange;
- ScRangeStringConverter::GetStringFromRange( sConditionRange, aConditionRange, pDoc );
-+ ScRangeStringConverter::GetStringFromRange( sConditionRange, aConditionRange, pDoc, ScAddress::CONV_OOO );
++ ScRangeStringConverter::GetStringFromRange( sConditionRange, aConditionRange, pDoc, ::formula::FormulaGrammar::CONV_OOO );
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS, sConditionRange);
}
if (!aQueryParam.bDuplicate)
@@ -516,7 +516,7 @@
ScRange aOutRange((*pDPs)[i]->GetOutRange());
rtl::OUString sTargetRangeAddress;
- ScRangeStringConverter::GetStringFromRange( sTargetRangeAddress, aOutRange, pDoc );
-+ ScRangeStringConverter::GetStringFromRange( sTargetRangeAddress, aOutRange, pDoc, ScAddress::CONV_OOO );
++ ScRangeStringConverter::GetStringFromRange( sTargetRangeAddress, aOutRange, pDoc, ::formula::FormulaGrammar::CONV_OOO );
ScDocAttrIterator aAttrItr(pDoc, aOutRange.aStart.Tab(),
aOutRange.aStart.Col(), aOutRange.aStart.Row(),
aOutRange.aEnd.Col(), aOutRange.aEnd.Row());
@@ -525,7 +525,7 @@
ScAddress aButtonAddr(nCol, nButtonRow, aOutRange.aStart.Tab());
ScRangeStringConverter::GetStringFromAddress(
- sOUButtonList, aButtonAddr, pDoc, ' ', sal_True );
-+ sOUButtonList, aButtonAddr, pDoc, ScAddress::CONV_OOO, ' ', sal_True );
++ sOUButtonList, aButtonAddr, pDoc, ::formula::FormulaGrammar::CONV_OOO, ' ', sal_True );
}
}
pAttr = aAttrItr.GetNext(nCol, nRow1, nRow2);
@@ -534,7 +534,7 @@
const ScSheetSourceDesc* pSheetSource = (*pDPs)[i]->GetSheetDesc();
rtl::OUString sCellRangeAddress;
- ScRangeStringConverter::GetStringFromRange( sCellRangeAddress, pSheetSource->aSourceRange, pDoc );
-+ ScRangeStringConverter::GetStringFromRange( sCellRangeAddress, pSheetSource->aSourceRange, pDoc, ScAddress::CONV_OOO );
++ ScRangeStringConverter::GetStringFromRange( sCellRangeAddress, pSheetSource->aSourceRange, pDoc, ::formula::FormulaGrammar::CONV_OOO );
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, sCellRangeAddress);
SvXMLElementExport aElemSCR(rExport, XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE, sal_True, sal_True);
rExport.CheckAttrList();
@@ -547,7 +547,7 @@
{
rtl::OUString sOUCellAddress;
- ScRangeStringConverter::GetStringFromAddress( sOUCellAddress, aOutputPosition, pDoc );
-+ ScRangeStringConverter::GetStringFromAddress( sOUCellAddress, aOutputPosition, pDoc, ScAddress::CONV_OOO );
++ ScRangeStringConverter::GetStringFromAddress( sOUCellAddress, aOutputPosition, pDoc, ::formula::FormulaGrammar::CONV_OOO );
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, sOUCellAddress);
}
}
@@ -556,7 +556,7 @@
{
rtl::OUString sOUCellAddress;
- ScRangeStringConverter::GetStringFromRange( sOUCellAddress, aAdvSource, pDoc );
-+ ScRangeStringConverter::GetStringFromRange( sOUCellAddress, aAdvSource, pDoc, ScAddress::CONV_OOO );
++ ScRangeStringConverter::GetStringFromRange( sOUCellAddress, aAdvSource, pDoc, ::formula::FormulaGrammar::CONV_OOO );
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS, sOUCellAddress);
}
@@ -565,7 +565,7 @@
{
rtl::OUString sOUCellAddress;
- ScRangeStringConverter::GetStringFromAddress( sOUCellAddress, aOutputPosition, pDoc );
-+ ScRangeStringConverter::GetStringFromAddress( sOUCellAddress, aOutputPosition, pDoc, ScAddress::CONV_OOO );
++ ScRangeStringConverter::GetStringFromAddress( sOUCellAddress, aOutputPosition, pDoc, ::formula::FormulaGrammar::CONV_OOO );
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, sOUCellAddress);
}
// no longer supported
@@ -574,7 +574,7 @@
table::CellRangeAddress aRangeAddress(xDatabaseRange->getDataArea());
rtl::OUString sOUAddress;
- ScRangeStringConverter::GetStringFromRange( sOUAddress, aRangeAddress, pDoc );
-+ ScRangeStringConverter::GetStringFromRange( sOUAddress, aRangeAddress, pDoc, ScAddress::CONV_OOO );
++ ScRangeStringConverter::GetStringFromRange( sOUAddress, aRangeAddress, pDoc, ::formula::FormulaGrammar::CONV_OOO );
rExport.AddAttribute (XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, sOUAddress);
ScDBCollection* pDBCollection = pDoc->GetDBCollection();
sal_uInt16 nIndex;
@@ -587,7 +587,7 @@
{
rtl::OUString sAddress;
- ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc );
-+ ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc, ScAddress::CONV_OOO );
++ ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc, ::formula::FormulaGrammar::CONV_OOO );
return sAddress;
}
@@ -600,7 +600,7 @@
{
sal_Int32 nOffset(0);
- ScRangeStringConverter::GetAddressFromString(aEndCell, rValue, static_cast<ScXMLImport&>(mrImporter).GetDocument(), nOffset);
-+ ScRangeStringConverter::GetAddressFromString(aEndCell, rValue, static_cast<ScXMLImport&>(mrImporter).GetDocument(), ScAddress::CONV_OOO, nOffset);
++ ScRangeStringConverter::GetAddressFromString(aEndCell, rValue, static_cast<ScXMLImport&>(mrImporter).GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset);
}
else if (IsXMLToken(aLocalName, XML_END_X))
static_cast<ScXMLImport&>(mrImporter).GetMM100UnitConverter().convertMeasure(nEndX, rValue);
@@ -613,7 +613,7 @@
{
ScRangeListRef aRangeListRef(new ScRangeList());
- ScRangeStringConverter::GetRangeListFromString(*aRangeListRef, *pRangeList, pDoc);
-+ ScRangeStringConverter::GetRangeListFromString(*aRangeListRef, *pRangeList, pDoc, ScAddress::CONV_OOO);
++ ScRangeStringConverter::GetRangeListFromString(*aRangeListRef, *pRangeList, pDoc, ::formula::FormulaGrammar::CONV_OOO);
if (aRangeListRef->Count())
{
ScChartListener* pCL(new ScChartListener(rName, pDoc, aRangeListRef ));
@@ -626,7 +626,7 @@
{
sal_Int32 nOffset(0);
- bTargetRangeAddress = ScRangeStringConverter::GetRangeFromString( aTargetRangeAddress, sValue, pDoc, nOffset );
-+ bTargetRangeAddress = ScRangeStringConverter::GetRangeFromString( aTargetRangeAddress, sValue, pDoc, ScAddress::CONV_OOO, nOffset );
++ bTargetRangeAddress = ScRangeStringConverter::GetRangeFromString( aTargetRangeAddress, sValue, pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset );
}
break;
case XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS :
@@ -635,7 +635,7 @@
ScAddress aScAddress;
sal_Int32 nAddrOffset(0);
- if (pDoc && ScRangeStringConverter::GetAddressFromString( aScAddress, sAddress, pDoc, nAddrOffset ))
-+ if (pDoc && ScRangeStringConverter::GetAddressFromString( aScAddress, sAddress, pDoc, ScAddress::CONV_OOO, nAddrOffset ))
++ if (pDoc && ScRangeStringConverter::GetAddressFromString( aScAddress, sAddress, pDoc, ::formula::FormulaGrammar::CONV_OOO, nAddrOffset ))
{
ScMergeFlagAttr aAttr( SC_MF_BUTTON );
pDoc->ApplyAttr( aScAddress.Col(), aScAddress.Row(), aScAddress.Tab(), aAttr );
@@ -644,7 +644,7 @@
ScRange aSourceRangeAddress;
sal_Int32 nOffset(0);
- if (ScRangeStringConverter::GetRangeFromString( aSourceRangeAddress, sValue, GetScImport().GetDocument(), nOffset ))
-+ if (ScRangeStringConverter::GetRangeFromString( aSourceRangeAddress, sValue, GetScImport().GetDocument(), ScAddress::CONV_OOO, nOffset ))
++ if (ScRangeStringConverter::GetRangeFromString( aSourceRangeAddress, sValue, GetScImport().GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset ))
pDataPilotTable->SetSourceCellRangeAddress(aSourceRangeAddress);
}
break;
@@ -657,7 +657,7 @@
table::CellRangeAddress aCellRangeAddress;
sal_Int32 nOffset(0);
- if (ScRangeStringConverter::GetRangeFromString( aCellRangeAddress, sRangeAddress, pDoc, nOffset ))
-+ if (ScRangeStringConverter::GetRangeFromString( aCellRangeAddress, sRangeAddress, pDoc, ScAddress::CONV_OOO, nOffset ))
++ if (ScRangeStringConverter::GetRangeFromString( aCellRangeAddress, sRangeAddress, pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset ))
{
sal_Bool bInsert(sal_True);
try
@@ -670,7 +670,7 @@
rColumnHeaderRange = xPrintAreas->getTitleColumns();
uno::Sequence< table::CellRangeAddress > aRangeList( xPrintAreas->getPrintAreas() );
- ScRangeStringConverter::GetStringFromRangeList( rPrintRanges, aRangeList, pDoc );
-+ ScRangeStringConverter::GetStringFromRangeList( rPrintRanges, aRangeList, pDoc, ScAddress::CONV_OOO );
++ ScRangeStringConverter::GetStringFromRangeList( rPrintRanges, aRangeList, pDoc, ::formula::FormulaGrammar::CONV_OOO );
}
}
@@ -679,7 +679,7 @@
aItr->aEndAddress.Col(), aItr->aEndAddress.Row(), aItr->aEndAddress.Tab()));
rtl::OUString sEndAddress;
- ScRangeStringConverter::GetStringFromAddress(sEndAddress, aItr->aEndAddress, pDoc);
-+ ScRangeStringConverter::GetStringFromAddress(sEndAddress, aItr->aEndAddress, pDoc, ScAddress::CONV_OOO);
++ ScRangeStringConverter::GetStringFromAddress(sEndAddress, aItr->aEndAddress, pDoc, ::formula::FormulaGrammar::CONV_OOO);
AddAttribute(XML_NAMESPACE_TABLE, XML_END_CELL_ADDRESS, sEndAddress);
if (bNegativePage)
aEndPoint.X = -aEndRec.Right();
@@ -688,7 +688,7 @@
if( (aObjItr->eObjType == SC_DETOBJ_ARROW) || (aObjItr->eObjType == SC_DETOBJ_TOOTHERTAB))
{
- ScRangeStringConverter::GetStringFromRange( sString, aObjItr->aSourceRange, pDoc );
-+ ScRangeStringConverter::GetStringFromRange( sString, aObjItr->aSourceRange, pDoc, ScAddress::CONV_OOO );
++ ScRangeStringConverter::GetStringFromRange( sString, aObjItr->aSourceRange, pDoc, ::formula::FormulaGrammar::CONV_OOO );
AddAttribute( XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, sString );
}
ScXMLConverter::GetStringFromDetObjType( sString, aObjItr->eObjType );
@@ -697,7 +697,7 @@
const ScRangeList* pRangeList = pDoc->GetScenarioRanges(static_cast<SCTAB>(nCurrentTable));
rtl::OUString sRangeListStr;
- ScRangeStringConverter::GetStringFromRangeList( sRangeListStr, pRangeList, pDoc );
-+ ScRangeStringConverter::GetStringFromRangeList( sRangeListStr, pRangeList, pDoc, ScAddress::CONV_OOO );
++ ScRangeStringConverter::GetStringFromRangeList( sRangeListStr, pRangeList, pDoc, ::formula::FormulaGrammar::CONV_OOO );
AddAttribute(XML_NAMESPACE_TABLE, XML_SCENARIO_RANGES, sRangeListStr);
if (sComment.Len())
AddAttribute(XML_NAMESPACE_TABLE, XML_COMMENT, rtl::OUString(sComment));
@@ -706,11 +706,11 @@
OUString sRangeStr;
table::CellRangeAddress aCellRange( xRange->getLabelArea() );
- ScRangeStringConverter::GetStringFromRange( sRangeStr, aCellRange, pDoc );
-+ ScRangeStringConverter::GetStringFromRange( sRangeStr, aCellRange, pDoc, ScAddress::CONV_OOO );
++ ScRangeStringConverter::GetStringFromRange( sRangeStr, aCellRange, pDoc, ::formula::FormulaGrammar::CONV_OOO );
AddAttribute( XML_NAMESPACE_TABLE, XML_LABEL_CELL_RANGE_ADDRESS, sRangeStr );
aCellRange = xRange->getDataArea();
- ScRangeStringConverter::GetStringFromRange( sRangeStr, aCellRange, pDoc );
-+ ScRangeStringConverter::GetStringFromRange( sRangeStr, aCellRange, pDoc, ScAddress::CONV_OOO );
++ ScRangeStringConverter::GetStringFromRange( sRangeStr, aCellRange, pDoc, ::formula::FormulaGrammar::CONV_OOO );
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 );
@@ -719,7 +719,7 @@
OUString sOUBaseCellAddress;
ScRangeStringConverter::GetStringFromAddress( sOUBaseCellAddress,
- xNamedRange->getReferencePosition(), pDoc, ' ', sal_False, SCA_ABS_3D );
-+ xNamedRange->getReferencePosition(), pDoc, ScAddress::CONV_OOO, ' ', sal_False, SCA_ABS_3D );
++ xNamedRange->getReferencePosition(), pDoc, ::formula::FormulaGrammar::CONV_OOO, ' ', sal_False, SCA_ABS_3D );
AddAttribute(XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, sOUBaseCellAddress);
sal_uInt16 nRangeIndex;
@@ -728,11 +728,11 @@
sStrData = OUString();
for( sal_Int32 nIndex = 0; nIndex < pCons->nDataAreaCount; ++nIndex )
- ScRangeStringConverter::GetStringFromArea( sStrData, *pCons->ppDataAreas[ nIndex ], pDoc, sal_True );
-+ ScRangeStringConverter::GetStringFromArea( sStrData, *pCons->ppDataAreas[ nIndex ], pDoc, ScAddress::CONV_OOO, sal_True );
++ ScRangeStringConverter::GetStringFromArea( sStrData, *pCons->ppDataAreas[ nIndex ], pDoc, ::formula::FormulaGrammar::CONV_OOO, sal_True );
AddAttribute( XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE_ADDRESSES, sStrData );
- ScRangeStringConverter::GetStringFromAddress( sStrData, ScAddress( pCons->nCol, pCons->nRow, pCons->nTab ), pDoc );
-+ ScRangeStringConverter::GetStringFromAddress( sStrData, ScAddress( pCons->nCol, pCons->nRow, pCons->nTab ), pDoc, ScAddress::CONV_OOO );
++ ScRangeStringConverter::GetStringFromAddress( sStrData, ScAddress( pCons->nCol, pCons->nRow, pCons->nTab ), pDoc, ::formula::FormulaGrammar::CONV_OOO );
AddAttribute( XML_NAMESPACE_TABLE, XML_TARGET_CELL_ADDRESS, sStrData );
if( pCons->bByCol && !pCons->bByRow )
@@ -741,7 +741,7 @@
pChangeProps[SC_SHOW_CHANGES_BY_RANGES].Value <<= pViewSettings->HasRange();
rtl::OUString sRangeList;
- ScRangeStringConverter::GetStringFromRangeList(sRangeList, &(pViewSettings->GetTheRangeList()), GetDocument());
-+ ScRangeStringConverter::GetStringFromRangeList(sRangeList, &(pViewSettings->GetTheRangeList()), GetDocument(), ScAddress::CONV_OOO);
++ ScRangeStringConverter::GetStringFromRangeList(sRangeList, &(pViewSettings->GetTheRangeList()), GetDocument(), ::formula::FormulaGrammar::CONV_OOO);
pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowChangesByRangesList"));
pChangeProps[SC_SHOW_CHANGES_BY_RANGES_LIST].Value <<= sRangeList;
@@ -754,7 +754,7 @@
ScRange aScRange;
sal_Int32 nOffset(0);
- if (ScRangeStringConverter::GetRangeFromString( aScRange, sValue, pDoc, nOffset ))
-+ if (ScRangeStringConverter::GetRangeFromString( aScRange, sValue, pDoc, ScAddress::CONV_OOO, nOffset ))
++ if (ScRangeStringConverter::GetRangeFromString( aScRange, sValue, pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset ))
{
ScUnoConversion::FillApiAddress( aOutputPosition, aScRange.aStart );
bCopyOutputData = sal_True;
@@ -763,7 +763,7 @@
{
sal_Int32 nOffset(0);
- if (ScRangeStringConverter::GetRangeFromString( aConditionSourceRangeAddress, sValue, pDoc, nOffset ))
-+ if (ScRangeStringConverter::GetRangeFromString( aConditionSourceRangeAddress, sValue, pDoc, ScAddress::CONV_OOO, nOffset ))
++ if (ScRangeStringConverter::GetRangeFromString( aConditionSourceRangeAddress, sValue, pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset ))
bConditionSourceRange = sal_True;
}
break;
@@ -772,7 +772,7 @@
ScRange aScRange;
sal_Int32 nOffset(0);
- if (ScRangeStringConverter::GetRangeFromString( aScRange, sValue, pDoc, nOffset ))
-+ if (ScRangeStringConverter::GetRangeFromString( aScRange, sValue, pDoc, ScAddress::CONV_OOO, nOffset ))
++ if (ScRangeStringConverter::GetRangeFromString( aScRange, sValue, pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset ))
{
aOutputPosition = aScRange.aStart;
bCopyOutputData = sal_True;
@@ -781,7 +781,7 @@
{
sal_Int32 nOffset(0);
- if(ScRangeStringConverter::GetRangeFromString( aConditionSourceRangeAddress, sValue, pDoc, nOffset ))
-+ if(ScRangeStringConverter::GetRangeFromString( aConditionSourceRangeAddress, sValue, pDoc, ScAddress::CONV_OOO, nOffset ))
++ if(ScRangeStringConverter::GetRangeFromString( aConditionSourceRangeAddress, sValue, pDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset ))
bConditionSourceRange = sal_True;
}
break;
@@ -794,7 +794,7 @@
{
ScRangeList aRangeList;
- ScRangeStringConverter::GetRangeListFromString(aRangeList, sRanges, GetDocument());
-+ ScRangeStringConverter::GetRangeListFromString(aRangeList, sRanges, GetDocument(), ScAddress::CONV_OOO);
++ ScRangeStringConverter::GetRangeListFromString(aRangeList, sRanges, GetDocument(), ::formula::FormulaGrammar::CONV_OOO);
pViewSettings->SetTheRangeList(aRangeList);
}
}
@@ -804,8 +804,8 @@
- if (ScRangeStringConverter::GetRangeFromString( aLabelRange, (*aItr)->sLabelRangeStr, GetDocument(), nOffset1 ) &&
- ScRangeStringConverter::GetRangeFromString( aDataRange, (*aItr)->sDataRangeStr, GetDocument(), nOffset2 ))
-+ if (ScRangeStringConverter::GetRangeFromString( aLabelRange, (*aItr)->sLabelRangeStr, GetDocument(), ScAddress::CONV_OOO, nOffset1 ) &&
-+ ScRangeStringConverter::GetRangeFromString( aDataRange, (*aItr)->sDataRangeStr, GetDocument(), ScAddress::CONV_OOO, nOffset2 ))
++ if (ScRangeStringConverter::GetRangeFromString( aLabelRange, (*aItr)->sLabelRangeStr, GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset1 ) &&
++ ScRangeStringConverter::GetRangeFromString( aDataRange, (*aItr)->sDataRangeStr, GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset2 ))
{
if ( (*aItr)->bColumnOrientation )
xColRanges->addNew( aLabelRange, aDataRange );
@@ -814,7 +814,7 @@
sal_Int32 nOffset(0);
if (ScRangeStringConverter::GetAddressFromString(
- aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), nOffset ))
-+ aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), ScAddress::CONV_OOO, nOffset ))
++ aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset ))
{
try
{
@@ -823,7 +823,7 @@
sal_Int32 nOffset(0);
if (ScRangeStringConverter::GetAddressFromString(
- aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), nOffset ))
-+ aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), ScAddress::CONV_OOO, nOffset ))
++ aCellAddress, (*aItr)->sBaseCellAddress, GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset ))
{
uno::Reference <sheet::XNamedRange> xNamedRange(xNamedRanges->getByName((*aItr)->sName), uno::UNO_QUERY);
if (xNamedRange.is())
@@ -836,7 +836,7 @@
{
ScRangeStringConverter::GetRangeListFromString(
- aScenarioRanges, sValue, GetScImport().GetDocument() );
-+ aScenarioRanges, sValue, GetScImport().GetDocument(), ScAddress::CONV_OOO );
++ aScenarioRanges, sValue, GetScImport().GetDocument(), ::formula::FormulaGrammar::CONV_OOO );
}
break;
case XML_TOK_TABLE_SCENARIO_ATTR_COMMENT:
@@ -849,7 +849,7 @@
ScRange aScRange;
sal_Int32 nOffset(0);
- if (ScRangeStringConverter::GetRangeFromString( aScRange, sValue, GetScImport().GetDocument(), nOffset ))
-+ if (ScRangeStringConverter::GetRangeFromString( aScRange, sValue, GetScImport().GetDocument(), ScAddress::CONV_OOO, nOffset ))
++ if (ScRangeStringConverter::GetRangeFromString( aScRange, sValue, GetScImport().GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset ))
{
ScUnoConversion::FillApiAddress( aOutputPosition, aScRange.aStart );
bCopyOutputData = sal_True;
@@ -864,7 +864,7 @@
+ ScDocument* pDoc = rScXMLExport.GetDocument();
ScRangeStringConverter::GetStringFromAddress( sOUBaseAddress,
- xSheetCondition->getSourcePosition(), rScXMLExport.GetDocument() );
-+ xSheetCondition->getSourcePosition(), pDoc, ScAddress::CONV_OOO );
++ xSheetCondition->getSourcePosition(), pDoc, ::formula::FormulaGrammar::CONV_OOO );
rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_BASE_CELL_ADDRESS, sOUBaseAddress);
SvXMLElementExport aMElem(rScXMLExport, XML_NAMESPACE_STYLE, XML_MAP, sal_True, sal_True);
}
@@ -873,7 +873,7 @@
OUString sOUBaseAddress;
ScRangeStringConverter::GetStringFromAddress( sOUBaseAddress,
- xSheetCondition->getSourcePosition(), rScXMLExport.GetDocument() );
-+ xSheetCondition->getSourcePosition(), rScXMLExport.GetDocument(), ScAddress::CONV_OOO );
++ xSheetCondition->getSourcePosition(), rScXMLExport.GetDocument(), ::formula::FormulaGrammar::CONV_OOO );
rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_BASE_CELL_ADDRESS, sOUBaseAddress);
SvXMLElementExport aMElem(rScXMLExport, XML_NAMESPACE_STYLE, XML_MAP, sal_True, sal_True);
}
@@ -886,7 +886,7 @@
{
uno::Sequence< table::CellRangeAddress > aRangeList;
- ScRangeStringConverter::GetRangeListFromString( aRangeList, sPrintRanges, pDoc );
-+ ScRangeStringConverter::GetRangeListFromString( aRangeList, sPrintRanges, pDoc, ScAddress::CONV_OOO );
++ ScRangeStringConverter::GetRangeListFromString( aRangeList, sPrintRanges, pDoc, ::formula::FormulaGrammar::CONV_OOO );
xPrintAreas->setPrintAreas( aRangeList );
}
}
@@ -899,7 +899,7 @@
ScRangeListRef aRangeList = new ScRangeList();
- if (ScRangeStringConverter::GetRangeListFromString( *aRangeList, aRangeRepresentation, m_pDocument, ';' ))
-+ if (ScRangeStringConverter::GetRangeListFromString( *aRangeList, aRangeRepresentation, m_pDocument, ScAddress::CONV_OOO, ';' ))
++ if (ScRangeStringConverter::GetRangeListFromString( *aRangeList, aRangeRepresentation, m_pDocument, ::formula::FormulaGrammar::CONV_OOO, ';' ))
xResult.set(new ScChart2DataSequence(m_pDocument, this, aRangeList));
return xResult;
@@ -911,7 +911,7 @@
+ if( !ScRangeStringConverter::GetRangeListFromString(aList, sRangeRepresentation, m_pDocument, m_pDocument->GetAddressConvention(), ';'))
throw lang::IllegalArgumentException();
- ScRangeStringConverter::GetStringFromRangeList(sRet, &aList, m_pDocument);
-+ ScRangeStringConverter::GetStringFromRangeList(sRet, &aList, m_pDocument, ScAddress::CONV_OOO);
++ ScRangeStringConverter::GetStringFromRangeList(sRet, &aList, m_pDocument, ::formula::FormulaGrammar::CONV_OOO);
}
return sRet;
@@ -973,12 +973,12 @@
+
+ // Chart always saves ranges using CONV_OOO convention.
+ sal_Int32 nSepPos = ScRangeStringConverter::IndexOf(aToken, ':', 0, cQuote);
-+ bool bSuccess = lcl_parseSingleRangeToken(aRange, aToken, m_pDocument, ScAddress::CONV_OOO, cSep, cQuote);
++ bool bSuccess = lcl_parseSingleRangeToken(aRange, aToken, m_pDocument, ::formula::FormulaGrammar::CONV_OOO, cSep, cQuote);
+
+ if (bSuccess)
+ {
+ String aNewToken;
-+ aRange.Format(aNewToken, SCA_ABS_3D, m_pDocument, ScAddress::CONV_OOO);
++ aRange.Format(aNewToken, SCA_ABS_3D, m_pDocument, ::formula::FormulaGrammar::CONV_OOO);
+ if (bFirst)
+ bFirst = false;
+ else
@@ -987,7 +987,7 @@
+ continue;
+ }
+
-+ if (eConvUI == ScAddress::CONV_OOO)
++ if (eConvUI == ::formula::FormulaGrammar::CONV_OOO)
+ // convertion failed !
+ continue;
+
@@ -1001,7 +1001,7 @@
+ continue;
+
+ String aNewToken;
-+ aRange.Format(aNewToken, SCA_ABS_3D, m_pDocument, ScAddress::CONV_OOO);
++ aRange.Format(aNewToken, SCA_ABS_3D, m_pDocument, ::formula::FormulaGrammar::CONV_OOO);
+ if (bFirst)
+ bFirst = false;
+ else
@@ -1028,7 +1028,7 @@
ScRangeList aRangeList;
- if (ScRangeStringConverter::GetRangeListFromString( aRangeList, aRange, pDocShell->GetDocument(), ';' ))
+ ScDocument* pDoc = pDocShell->GetDocument();
-+ if (ScRangeStringConverter::GetRangeListFromString( aRangeList, aRange, pDoc, ScAddress::CONV_OOO, ';' ))
++ if (ScRangeStringConverter::GetRangeListFromString( aRangeList, aRange, pDoc, ::formula::FormulaGrammar::CONV_OOO, ';' ))
{
sal_Int32 nCount = aRangeList.Count();
if (nCount)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
