diff options
Diffstat (limited to 'sc/source/ui/unoobj')
-rw-r--r-- | sc/source/ui/unoobj/chart2uno.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/unoobj/condformatuno.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/unoobj/funcuno.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/servuno.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/tokenuno.cxx | 8 |
5 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index a888ebc4ccbe..2d3a61972efa 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -824,7 +824,7 @@ public: void operator() (const ScTokenRef& rToken) { - ScCompiler aCompiler(mpDoc, ScAddress(0,0,0), meGrammar); + ScCompiler aCompiler(*mpDoc, ScAddress(0,0,0), meGrammar); OUString aStr; aCompiler.CreateStringFromToken(aStr, rToken.get()); if (mbFirst) @@ -877,7 +877,7 @@ public: OSL_ENSURE(bValidToken, "invalid token"); if (!bValidToken) return; - ScCompiler aCompiler(mpDoc, ScAddress(0,0,0), FormulaGrammar::GRAM_ENGLISH); + ScCompiler aCompiler(*mpDoc, ScAddress(0,0,0), FormulaGrammar::GRAM_ENGLISH); { OUString aStr; aCompiler.CreateStringFromToken(aStr, aStart.get()); diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx index ed037323e819..241c443d040d 100644 --- a/sc/source/ui/unoobj/condformatuno.cxx +++ b/sc/source/ui/unoobj/condformatuno.cxx @@ -720,7 +720,7 @@ void SAL_CALL ScConditionEntryObj::setPropertyValue( OUString aFormula; if ((aValue >>= aFormula) && !aFormula.isEmpty()) { - ScCompiler aComp(&mpDocShell->GetDocument(), getCoreObject()->GetSrcPos()); + ScCompiler aComp(mpDocShell->GetDocument(), getCoreObject()->GetSrcPos()); aComp.SetGrammar(mpDocShell->GetDocument().GetGrammar()); std::unique_ptr<ScTokenArray> pArr(aComp.CompileString(aFormula)); getCoreObject()->SetFormula1(*pArr); @@ -732,7 +732,7 @@ void SAL_CALL ScConditionEntryObj::setPropertyValue( OUString aFormula; if ((aValue >>= aFormula) && !aFormula.isEmpty()) { - ScCompiler aComp(&mpDocShell->GetDocument(), getCoreObject()->GetSrcPos()); + ScCompiler aComp(mpDocShell->GetDocument(), getCoreObject()->GetSrcPos()); aComp.SetGrammar(mpDocShell->GetDocument().GetGrammar()); std::unique_ptr<ScTokenArray> pArr(aComp.CompileString(aFormula)); getCoreObject()->SetFormula2(*pArr); diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 7e853fea6f07..89ea794a3583 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -467,7 +467,7 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, /// TODO: check ScAddress aAdr; - ScCompiler aCompiler(pDoc, aAdr, pDoc->GetGrammar()); + ScCompiler aCompiler(*pDoc, aAdr, pDoc->GetGrammar()); // find function diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 3a009a977bef..b3e650d5d41e 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -558,7 +558,7 @@ uno::Reference<uno::XInterface> ScServiceProvider::MakeInstance( { ScDocument& rDoc = pDocShell->GetDocument(); ScAddress aAddress; - ScCompiler* pComp = new ScCompiler(&rDoc, aAddress, rDoc.GetGrammar()); + ScCompiler* pComp = new ScCompiler(rDoc, aAddress, rDoc.GetGrammar()); xRet.set(static_cast<sheet::XFormulaOpCodeMapper*>(new ScFormulaOpCodeMapperObj(::std::unique_ptr<formula::FormulaCompiler> (pComp)))); break; } diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index 713d924e28c7..4f461777c056 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -135,7 +135,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScFormulaParserObj::parseFormula( ScAddress aRefPos( ScAddress::UNINITIALIZED ); ScUnoConversion::FillScAddress( aRefPos, rReferencePos ); - ScCompiler aCompiler( &rDoc, aRefPos, rDoc.GetGrammar()); + ScCompiler aCompiler( rDoc, aRefPos, rDoc.GetGrammar()); SetCompilerFlags( aCompiler ); std::unique_ptr<ScTokenArray> pCode = aCompiler.CompileString( aFormula ); @@ -158,7 +158,7 @@ OUString SAL_CALL ScFormulaParserObj::printFormula( (void)ScTokenConversion::ConvertToTokenArray( rDoc, aCode, aTokens ); ScAddress aRefPos( ScAddress::UNINITIALIZED ); ScUnoConversion::FillScAddress( aRefPos, rReferencePos ); - ScCompiler aCompiler( &rDoc, aRefPos, aCode, rDoc.GetGrammar()); + ScCompiler aCompiler(rDoc, aRefPos, aCode, rDoc.GetGrammar()); SetCompilerFlags( aCompiler ); OUStringBuffer aBuffer; @@ -198,7 +198,7 @@ void SAL_CALL ScFormulaParserObj::setPropertyValue( if (mxOpCodeMap && mbEnglish != bOldEnglish) { ScDocument& rDoc = mpDocShell->GetDocument(); - ScCompiler aCompiler( &rDoc, ScAddress(), rDoc.GetGrammar()); + ScCompiler aCompiler( rDoc, ScAddress(), rDoc.GetGrammar()); mxOpCodeMap = formula::FormulaCompiler::CreateOpCodeMap( maOpCodeMapping, mbEnglish); } @@ -217,7 +217,7 @@ void SAL_CALL ScFormulaParserObj::setPropertyValue( throw lang::IllegalArgumentException(); ScDocument& rDoc = mpDocShell->GetDocument(); - ScCompiler aCompiler( &rDoc, ScAddress(), rDoc.GetGrammar()); + ScCompiler aCompiler(rDoc, ScAddress(), rDoc.GetGrammar()); mxOpCodeMap = formula::FormulaCompiler::CreateOpCodeMap( maOpCodeMapping, mbEnglish); } |