diff options
author | Eike Rathke <erack@redhat.com> | 2016-08-03 15:14:34 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2016-08-03 15:16:50 +0200 |
commit | 4afd35f691ffbf369e90e031b17379f52a31c510 (patch) | |
tree | 4b09406762b7c2af31becbc4d77150ac2de0b562 /sc/source/ui/unoobj | |
parent | InitSymbolsAPI() for FormulaLanguage::API (diff) | |
download | core-4afd35f691ffbf369e90e031b17379f52a31c510.tar.gz core-4afd35f691ffbf369e90e031b17379f52a31c510.zip |
use GRAM_API instead of GRAM_PODF_A1 in API context
... which right now is identical but may get corrections in future.
Change-Id: Id4e1707afb32a3d8e073705072e5e65105f2a14a
Diffstat (limited to 'sc/source/ui/unoobj')
-rw-r--r-- | sc/source/ui/unoobj/cellsuno.cxx | 18 | ||||
-rw-r--r-- | sc/source/ui/unoobj/fmtuno.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/unoobj/funcuno.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/unoobj/nameuno.cxx | 28 |
4 files changed, 27 insertions, 27 deletions
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 9162faaaa090..182f8eaf3159 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -5129,8 +5129,8 @@ void SAL_CALL ScCellRangeObj::setArrayFormula( const OUString& aFormula ) throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; - // GRAM_PODF_A1 for API compatibility. - SetArrayFormula_Impl( aFormula, OUString(), formula::FormulaGrammar::GRAM_PODF_A1); + // GRAM_API for API compatibility. + SetArrayFormula_Impl( aFormula, OUString(), formula::FormulaGrammar::GRAM_API); } // XArrayFormulaTokens @@ -5186,10 +5186,10 @@ void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::Formula ScTokenArray aTokenArray; (void)ScTokenConversion::ConvertToTokenArray( rDoc, aTokenArray, rTokens ); - // Actually GRAM_PODF_A1 is a don't-care here because of the token + // Actually GRAM_API is a don't-care here because of the token // array being set, it fits with other API compatibility grammars // though. - pDocSh->GetDocFunc().EnterMatrix( aRange, nullptr, &aTokenArray, EMPTY_OUSTRING, true, true, EMPTY_OUSTRING, formula::FormulaGrammar::GRAM_PODF_A1 ); + pDocSh->GetDocFunc().EnterMatrix( aRange, nullptr, &aTokenArray, EMPTY_OUSTRING, true, true, EMPTY_OUSTRING, formula::FormulaGrammar::GRAM_API ); } else { @@ -5304,8 +5304,8 @@ void SAL_CALL ScCellRangeObj::setFormulaArray( { ScExternalRefManager::ApiGuard aExtRefGuard(&pDocSh->GetDocument()); - // GRAM_PODF_A1 for API compatibility. - bDone = lcl_PutFormulaArray( *pDocSh, aRange, aArray, formula::FormulaGrammar::GRAM_PODF_A1 ); + // GRAM_API for API compatibility. + bDone = lcl_PutFormulaArray( *pDocSh, aRange, aArray, formula::FormulaGrammar::GRAM_API ); } if (!bDone) @@ -6188,9 +6188,9 @@ void ScCellObj::SetString_Impl(const OUString& rString, bool bInterpret, bool bE ScDocShell* pDocSh = GetDocShell(); if ( pDocSh ) { - // GRAM_PODF_A1 for API compatibility. + // GRAM_API for API compatibility. (void)pDocSh->GetDocFunc().SetCellText( - aCellPos, rString, bInterpret, bEnglish, true, formula::FormulaGrammar::GRAM_PODF_A1 ); + aCellPos, rString, bInterpret, bEnglish, true, formula::FormulaGrammar::GRAM_API ); } } @@ -6256,7 +6256,7 @@ void ScCellObj::InputEnglishString( const OUString& rText ) case ScInputStringType::Formula: rFunc.SetFormulaCell( aCellPos, - new ScFormulaCell(&rDoc, aCellPos, aRes.maText, formula::FormulaGrammar::GRAM_PODF_A1), + new ScFormulaCell(&rDoc, aCellPos, aRes.maText, formula::FormulaGrammar::GRAM_API), false); break; case ScInputStringType::Number: diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 417c97bb3900..edc5e48a3aa7 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -182,8 +182,8 @@ FormulaGrammar::Grammar lclResolveGrammar( FormulaGrammar::Grammar eExtGrammar, { if( eExtGrammar != FormulaGrammar::GRAM_UNSPECIFIED ) return eExtGrammar; - OSL_ENSURE( eIntGrammar != FormulaGrammar::GRAM_UNSPECIFIED, "lclResolveGrammar - unspecified grammar, using GRAM_PODF_A1" ); - return (eIntGrammar == FormulaGrammar::GRAM_UNSPECIFIED) ? FormulaGrammar::GRAM_PODF_A1 : eIntGrammar; + OSL_ENSURE( eIntGrammar != FormulaGrammar::GRAM_UNSPECIFIED, "lclResolveGrammar - unspecified grammar, using GRAM_API" ); + return (eIntGrammar == FormulaGrammar::GRAM_UNSPECIFIED) ? FormulaGrammar::GRAM_API : eIntGrammar; } } // namespace diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 24af4217a7ef..23ff3d526912 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -610,10 +610,10 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, if ( !bArgErr && !bOverflow && nDocRow <= MAXROWCOUNT ) { ScAddress aFormulaPos( 0, 0, nTempSheet ); - // GRAM_PODF_A1 doesn't really matter for the token array but fits with + // GRAM_API doesn't really matter for the token array but fits with // other API compatibility grammars. ScFormulaCell* pFormula = new ScFormulaCell( - pDoc, aFormulaPos, aTokenArr, formula::FormulaGrammar::GRAM_PODF_A1, + pDoc, aFormulaPos, aTokenArr, formula::FormulaGrammar::GRAM_API, (sal_uInt8)(mbArray ? MM_FORMULA : MM_NONE) ); pFormula = pDoc->SetFormulaCell(aFormulaPos, pFormula); diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index df1c88d67842..fa61a677e211 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -224,8 +224,8 @@ void SAL_CALL ScNamedRangeObj::setName( const OUString& aNewName ) //! adapt formulas ????? OUString aNewStr(aNewName); - // GRAM_PODF_A1 for API compatibility. - Modify_Impl( &aNewStr, nullptr, nullptr, nullptr, nullptr,formula::FormulaGrammar::GRAM_PODF_A1 ); + // GRAM_API for API compatibility. + Modify_Impl( &aNewStr, nullptr, nullptr, nullptr, nullptr,formula::FormulaGrammar::GRAM_API ); if ( aName != aNewStr ) // some error occurred... throw uno::RuntimeException(); // no other exceptions specified @@ -237,8 +237,8 @@ OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException, std OUString aContent; ScRangeData* pData = GetRangeData_Impl(); if (pData) - // GRAM_PODF_A1 for API compatibility. - pData->GetSymbol( aContent,formula::FormulaGrammar::GRAM_PODF_A1); + // GRAM_API for API compatibility. + pData->GetSymbol( aContent,formula::FormulaGrammar::GRAM_API); return aContent; } @@ -247,8 +247,8 @@ void SAL_CALL ScNamedRangeObj::setContent( const OUString& aContent ) { SolarMutexGuard aGuard; OUString aContStr(aContent); - // GRAM_PODF_A1 for API compatibility. - Modify_Impl( nullptr, nullptr, &aContStr, nullptr, nullptr,formula::FormulaGrammar::GRAM_PODF_A1 ); + // GRAM_API for API compatibility. + Modify_Impl( nullptr, nullptr, &aContStr, nullptr, nullptr,formula::FormulaGrammar::GRAM_API ); } table::CellAddress SAL_CALL ScNamedRangeObj::getReferencePosition() @@ -282,8 +282,8 @@ void SAL_CALL ScNamedRangeObj::setReferencePosition( const table::CellAddress& a { SolarMutexGuard aGuard; ScAddress aPos( (SCCOL)aReferencePosition.Column, (SCROW)aReferencePosition.Row, aReferencePosition.Sheet ); - // GRAM_PODF_A1 for API compatibility. - Modify_Impl( nullptr, nullptr, nullptr, &aPos, nullptr,formula::FormulaGrammar::GRAM_PODF_A1 ); + // GRAM_API for API compatibility. + Modify_Impl( nullptr, nullptr, nullptr, &aPos, nullptr,formula::FormulaGrammar::GRAM_API ); } sal_Int32 SAL_CALL ScNamedRangeObj::getType() throw(uno::RuntimeException, std::exception) @@ -312,8 +312,8 @@ void SAL_CALL ScNamedRangeObj::setType( sal_Int32 nUnoType ) if ( nUnoType & sheet::NamedRangeFlag::COLUMN_HEADER ) nNewType |= ScRangeData::Type::ColHeader; if ( nUnoType & sheet::NamedRangeFlag::ROW_HEADER ) nNewType |= ScRangeData::Type::RowHeader; - // GRAM_PODF_A1 for API compatibility. - Modify_Impl( nullptr, nullptr, nullptr, nullptr, &nNewType,formula::FormulaGrammar::GRAM_PODF_A1 ); + // GRAM_API for API compatibility. + Modify_Impl( nullptr, nullptr, nullptr, nullptr, &nNewType,formula::FormulaGrammar::GRAM_API ); } // XFormulaTokens @@ -341,8 +341,8 @@ void SAL_CALL ScNamedRangeObj::setTokens( const uno::Sequence<sheet::FormulaToke { ScTokenArray aTokenArray; (void)ScTokenConversion::ConvertToTokenArray( pDocShell->GetDocument(), aTokenArray, rTokens ); - // GRAM_PODF_A1 for API compatibility. - Modify_Impl( nullptr, &aTokenArray, nullptr, nullptr, nullptr, formula::FormulaGrammar::GRAM_PODF_A1 ); + // GRAM_API for API compatibility. + Modify_Impl( nullptr, &aTokenArray, nullptr, nullptr, nullptr, formula::FormulaGrammar::GRAM_API ); } } @@ -515,9 +515,9 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const OUString& aName, if (pNames && !pNames->findByUpperName(ScGlobal::pCharClass->uppercase(aName))) { ScRangeName* pNewRanges = new ScRangeName( *pNames ); - // GRAM_PODF_A1 for API compatibility. + // GRAM_API for API compatibility. ScRangeData* pNew = new ScRangeData( &rDoc, aName, aContent, - aPos, nNewType,formula::FormulaGrammar::GRAM_PODF_A1 ); + aPos, nNewType,formula::FormulaGrammar::GRAM_API ); if ( pNewRanges->insert(pNew) ) { pDocShell->GetDocFunc().SetNewRangeNames(pNewRanges, mbModifyAndBroadcast, GetTab_Impl()); |