summaryrefslogtreecommitdiff
path: root/sc/source/ui/view
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/view')
-rw-r--r--sc/source/ui/view/cellsh1.cxx2
-rw-r--r--sc/source/ui/view/gridwin.cxx8
-rw-r--r--sc/source/ui/view/output.cxx4
-rw-r--r--sc/source/ui/view/output2.cxx16
-rw-r--r--sc/source/ui/view/tabvwsh.cxx2
-rw-r--r--sc/source/ui/view/tabvwsh5.cxx4
-rw-r--r--sc/source/ui/view/tabvwsha.cxx2
-rw-r--r--sc/source/ui/view/viewfun2.cxx2
8 files changed, 20 insertions, 20 deletions
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 30a796e9f646..3c8e0fa061eb 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -3431,7 +3431,7 @@ void ScCellShell::ExecuteFillSingleEdit()
if (aCell.getType() == CELLTYPE_FORMULA)
{
aInit = "=";
- const ScTokenArray* pCode = aCell.mpFormula->GetCode();
+ const ScTokenArray* pCode = aCell.getFormula()->GetCode();
sc::TokenStringContext aCxt(rDoc, rDoc.GetGrammar());
aInit += pCode->CreateString(aCxt, aCurPos);
}
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 3bab80f8e94e..0d585cc430df 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -288,7 +288,7 @@ static bool lcl_IsEditableMatrix( ScDocument& rDoc, const ScRange& rRange )
ScRefCellValue aCell(rDoc, rRange.aEnd);
ScAddress aPos;
- return (aCell.getType() == CELLTYPE_FORMULA && aCell.mpFormula->GetMatrixOrigin(rDoc, aPos) && aPos == rRange.aStart);
+ return (aCell.getType() == CELLTYPE_FORMULA && aCell.getFormula()->GetMatrixOrigin(rDoc, aPos) && aPos == rRange.aStart);
}
static void lcl_UnLockComment( ScDrawView* pView, const Point& rPos, const ScViewData& rViewData )
@@ -335,7 +335,7 @@ static bool lcl_GetHyperlinkCell(
}
else if (rCell.getType() == CELLTYPE_EDIT)
bFound = true;
- else if (rCell.getType() == CELLTYPE_FORMULA && rCell.mpFormula->IsHyperLinkCell())
+ else if (rCell.getType() == CELLTYPE_FORMULA && rCell.getFormula()->IsHyperLinkCell())
bFound = true;
else
return false; // other cell
@@ -5728,7 +5728,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos,
// cell ( or other type ? ) with a hyperlink associated with it.
{
if (sURL.isEmpty())
- pTextObj = aCell.mpFormula->CreateURLObject();
+ pTextObj = aCell.getFormula()->CreateURLObject();
else
{
OUString aRepres = sURL;
@@ -5737,7 +5737,7 @@ bool ScGridWindow::GetEditUrl( const Point& rPos,
if (aCell.hasNumeric())
aRepres = OUString::number(aCell.getValue());
else if (aCell.getType() == CELLTYPE_FORMULA)
- aRepres = aCell.mpFormula->GetString().getString();
+ aRepres = aCell.getFormula()->GetString().getString();
pTextObj = ScEditUtil::CreateURLObjectFromURL(rDoc, sURL, aRepres);
}
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index a9bdc4c3baef..24c94fd993f2 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -1837,7 +1837,7 @@ void ScOutputData::FindChanged()
if (rCell.getType() != CELLTYPE_FORMULA)
continue;
- ScFormulaCell* pFCell = rCell.mpFormula;
+ ScFormulaCell* pFCell = rCell.getFormula();
if (pFCell->IsRunning())
// still being interpreted. Skip it.
continue;
@@ -1886,7 +1886,7 @@ void ScOutputData::FindChanged()
if (rCell.getType() != CELLTYPE_FORMULA)
continue;
- ScFormulaCell* pFCell = rCell.mpFormula;
+ ScFormulaCell* pFCell = rCell.getFormula();
if (pFCell->IsRunning())
// still being interpreted. Skip it.
continue;
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 64bb99ffc098..bd757cb7581f 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -611,7 +611,7 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScRefCellValue& rCell, tools::Long
if (eType == CELLTYPE_FORMULA)
{
- ScFormulaCell* pFCell = rCell.mpFormula;
+ ScFormulaCell* pFCell = rCell.getFormula();
if (pFCell->GetErrCode() != FormulaError::NONE || pOutput->mbShowFormulas)
{
SetHashText(); // If the error string doesn't fit, always use "###". Also for "display formulas" (#i116691#)
@@ -864,7 +864,7 @@ static void lcl_DoHyperlinkResult( const OutputDevice* pDev, const tools::Rectan
OUString aURL;
if (rCell.getType() == CELLTYPE_FORMULA)
{
- ScFormulaCell* pFCell = rCell.mpFormula;
+ ScFormulaCell* pFCell = rCell.getFormula();
OUString aCellText;
if ( pFCell->IsHyperLinkCell() )
pFCell->GetURLResult( aURL, aCellText );
@@ -1724,10 +1724,10 @@ tools::Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, co
{
bool bFormulaCell = (aCell.getType() == CELLTYPE_FORMULA);
if ( bFormulaCell )
- lcl_CreateInterpretProgress(bProgress, mpDoc, aCell.mpFormula);
+ lcl_CreateInterpretProgress(bProgress, mpDoc, aCell.getFormula());
if ( aVars.SetText(aCell) )
pOldPattern = nullptr;
- bUseEditEngine = aVars.HasEditCharacters() || (bFormulaCell && aCell.mpFormula->IsMultilineResult());
+ bUseEditEngine = aVars.HasEditCharacters() || (bFormulaCell && aCell.getFormula()->IsMultilineResult());
}
tools::Long nTotalMargin = 0;
SvxCellHorJustify eOutHorJust = SvxCellHorJustify::Standard;
@@ -1737,7 +1737,7 @@ tools::Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, co
bCellIsValue = ( eCellType == CELLTYPE_VALUE );
if ( eCellType == CELLTYPE_FORMULA )
{
- ScFormulaCell* pFCell = aCell.mpFormula;
+ ScFormulaCell* pFCell = aCell.getFormula();
bCellIsValue = pFCell->IsRunning() || pFCell->IsValue();
}
@@ -2130,7 +2130,7 @@ tools::Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, co
}
// PDF: whole-cell hyperlink from formula?
- bool bHasURL = pPDFData && aCell.getType() == CELLTYPE_FORMULA && aCell.mpFormula->IsHyperLinkCell();
+ bool bHasURL = pPDFData && aCell.getType() == CELLTYPE_FORMULA && aCell.getFormula()->IsHyperLinkCell();
if (bPaint && bHasURL)
{
tools::Rectangle aURLRect( aURLStart, aVars.GetTextSize() );
@@ -2192,7 +2192,7 @@ static bool lcl_SafeIsValue( ScRefCellValue& rCell )
return true;
case CELLTYPE_FORMULA:
{
- ScFormulaCell* pFCell = rCell.mpFormula;
+ ScFormulaCell* pFCell = rCell.getFormula();
if (pFCell->IsRunning() || pFCell->IsValue())
return true;
}
@@ -2559,7 +2559,7 @@ bool ScOutputData::DrawEditParam::isHyperlinkCell() const
if (maCell.getType() != CELLTYPE_FORMULA)
return false;
- return maCell.mpFormula->IsHyperLinkCell();
+ return maCell.getFormula()->IsHyperLinkCell();
}
bool ScOutputData::DrawEditParam::isVerticallyOriented() const
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 666d07a66fc7..f948d8326002 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -112,7 +112,7 @@ OUString ScTabViewShell::GetFormula(const ScAddress& rAddress)
ScRefCellValue aCell(rDoc, rAddress);
if (!aCell.isEmpty() && aCell.getType() == CELLTYPE_FORMULA)
{
- return aCell.mpFormula->GetFormula();
+ return aCell.getFormula()->GetFormula();
}
return OUString();
}
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 6b35721986a8..b701cc327e5e 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -339,9 +339,9 @@ std::unique_ptr<SvxNumberInfoItem> ScTabViewShell::MakeNumberInfoItem( ScDocumen
case CELLTYPE_FORMULA:
{
- if (aCell.mpFormula->IsValue())
+ if (aCell.getFormula()->IsValue())
{
- nCellValue = aCell.mpFormula->GetValue();
+ nCellValue = aCell.getFormula()->GetValue();
eValType = SvxNumberValueType::Number;
}
else
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 461f31ff7d08..f559732fff74 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -708,7 +708,7 @@ void ScTabViewShell::UpdateInputHandler( bool bForce /* = sal_False */, bool bSt
if (rCell.getType() == CELLTYPE_FORMULA)
{
if (!bHideFormula)
- aString = rCell.mpFormula->GetFormula();
+ aString = rCell.getFormula()->GetFormula();
}
else if (rCell.getType() == CELLTYPE_EDIT)
{
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 16230b5a17a6..30f3d3fe083f 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -277,7 +277,7 @@ static ScAutoSum lcl_IsAutoSumData( ScDocument& rDoc, SCCOL nCol, SCROW nRow,
if (aCell.getType() == CELLTYPE_FORMULA)
{
ScAutoSum val = ScAutoSumNone;
- ScTokenArray* pCode = aCell.mpFormula->GetCode();
+ ScTokenArray* pCode = aCell.getFormula()->GetCode();
if ( pCode )
{
switch( pCode->GetOuterFuncOpCode() )
generated by cgit (git 2.34.1) at 2025-01-01 09:11:39 +0000